From 71a05578ae34048b11e2de2a01ce932d94d9de2d Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 7 May 2009 15:57:14 +0200
Subject: [PATCH] compile fix for namespaced Qt
---
src/plugins/help/centralwidget.h | 4 ++--
src/plugins/help/contentstoolwindow.h | 1 +
src/plugins/help/helpfindsupport.h | 3 +--
src/plugins/help/helpplugin.h | 2 +-
src/shared/help/bookmarkmanager.cpp | 3 ---
src/shared/help/bookmarkmanager.h | 4 ++--
src/shared/help/contentwindow.cpp | 4 ----
src/shared/help/contentwindow.h | 4 ++--
src/shared/help/helpviewer.cpp | 3 ---
src/shared/help/helpviewer.h | 10 +++++-----
src/shared/help/indexwindow.cpp | 4 ----
src/shared/help/indexwindow.h | 4 ++--
12 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/src/plugins/help/centralwidget.h b/src/plugins/help/centralwidget.h
index 3be4fb7099f..ae77a3832cd 100644
--- a/src/plugins/help/centralwidget.h
+++ b/src/plugins/help/centralwidget.h
@@ -48,10 +48,10 @@ class QToolButton;
class QTabWidget;
class QHelpEngine;
class QFocusEvent;
-class HelpViewer;
-
QT_END_NAMESPACE
+class HelpViewer;
+
namespace Help {
namespace Internal {
class PrintHelper;
diff --git a/src/plugins/help/contentstoolwindow.h b/src/plugins/help/contentstoolwindow.h
index 993ab390827..d62eb27097d 100644
--- a/src/plugins/help/contentstoolwindow.h
+++ b/src/plugins/help/contentstoolwindow.h
@@ -43,6 +43,7 @@ class ContentsToolWindow;
class ContentsToolWidget : public QTreeWidget
{
Q_OBJECT
+
public:
ContentsToolWidget();
diff --git a/src/plugins/help/helpfindsupport.h b/src/plugins/help/helpfindsupport.h
index e7aedeb8bf7..1a5da5490cb 100644
--- a/src/plugins/help/helpfindsupport.h
+++ b/src/plugins/help/helpfindsupport.h
@@ -34,9 +34,8 @@
#include <find/ifindsupport.h>
-QT_BEGIN_NAMESPACE
+
class HelpViewer;
-QT_END_NAMESPACE
namespace Help {
namespace Internal {
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index 590421a46a1..45b895cac8b 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -44,13 +44,13 @@ class QHelpEngine;
class QShortcut;
class QToolBar;
class QUrl;
+QT_END_NAMESPACE
class IndexWindow;
class ContentWindow;
class BookmarkManager;
class BookmarkWidget;
class HelpViewer;
-QT_END_NAMESPACE
namespace Core {
diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp
index 22f6a6a2215..5f25bce77ca 100644
--- a/src/shared/help/bookmarkmanager.cpp
+++ b/src/shared/help/bookmarkmanager.cpp
@@ -48,7 +48,6 @@
#include <QtGui/QDialogButtonBox>
#include <QtGui/QSortFilterProxyModel>
-QT_BEGIN_NAMESPACE
BookmarkDialog::BookmarkDialog(BookmarkManager *manager, const QString &title,
const QString &url, QWidget *parent)
@@ -858,5 +857,3 @@ void BookmarkManager::readBookmarksRecursive(const QStandardItem *item,
readBookmarksRecursive(child, stream, (depth +1));
}
}
-
-QT_END_NAMESPACE
diff --git a/src/shared/help/bookmarkmanager.h b/src/shared/help/bookmarkmanager.h
index 0aff1efa8de..00f93f670c8 100644
--- a/src/shared/help/bookmarkmanager.h
+++ b/src/shared/help/bookmarkmanager.h
@@ -55,6 +55,8 @@ class QHelpEngineCore;
class QAbstractItemModel;
class QSortFilterProxyModel;
+QT_END_NAMESPACE
+
class BookmarkManager;
class BookmarkDialog : public QDialog
@@ -190,6 +192,4 @@ private:
QHelpEngineCore *helpEngine;
};
-QT_END_NAMESPACE
-
#endif
diff --git a/src/shared/help/contentwindow.cpp b/src/shared/help/contentwindow.cpp
index 21b13e3ad7e..1e69effb365 100644
--- a/src/shared/help/contentwindow.cpp
+++ b/src/shared/help/contentwindow.cpp
@@ -37,8 +37,6 @@
#include <QtHelp/QHelpEngine>
#include <QtHelp/QHelpContentWidget>
-QT_BEGIN_NAMESPACE
-
ContentWindow::ContentWindow(QHelpEngine *helpEngine)
: m_helpEngine(helpEngine)
, m_contentWidget(0)
@@ -157,5 +155,3 @@ void ContentWindow::itemClicked(const QModelIndex &index)
if (itm)
emit linkActivated(itm->url());
}
-
-QT_END_NAMESPACE
diff --git a/src/shared/help/contentwindow.h b/src/shared/help/contentwindow.h
index 07b5227733d..86a21197473 100644
--- a/src/shared/help/contentwindow.h
+++ b/src/shared/help/contentwindow.h
@@ -39,6 +39,8 @@ QT_BEGIN_NAMESPACE
class QHelpEngine;
class QHelpContentWidget;
+QT_END_NAMESPACE
+
class ContentWindow : public QWidget
{
Q_OBJECT
@@ -69,6 +71,4 @@ private:
int m_expandDepth;
};
-QT_END_NAMESPACE
-
#endif // CONTENTWINDOW_H
diff --git a/src/shared/help/helpviewer.cpp b/src/shared/help/helpviewer.cpp
index 83efcb56cfc..62585d7ac0c 100644
--- a/src/shared/help/helpviewer.cpp
+++ b/src/shared/help/helpviewer.cpp
@@ -49,7 +49,6 @@
#include <QNetworkReply>
#include <QNetworkRequest>
-QT_BEGIN_NAMESPACE
#if !defined(QT_NO_WEBKIT)
@@ -526,5 +525,3 @@ void HelpViewer::wheelEvent(QWheelEvent *e)
}
#endif // !defined(QT_NO_WEBKIT)
-
-QT_END_NAMESPACE
diff --git a/src/shared/help/helpviewer.h b/src/shared/help/helpviewer.h
index 74e100dbd5e..8ed876032b4 100644
--- a/src/shared/help/helpviewer.h
+++ b/src/shared/help/helpviewer.h
@@ -49,11 +49,13 @@ class QKeyEvent;
class QMouseEvent;
class QContextMenuEvent;
+QT_END_NAMESPACE
+
namespace Help {
- namespace Internal {
+namespace Internal {
class CentralWidget;
-}
-}
+} // namespace Internal
+} // namespace Help
#if !defined(QT_NO_WEBKIT)
@@ -159,6 +161,4 @@ private:
#endif
-QT_END_NAMESPACE
-
#endif
diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp
index d96d463c45f..fd01473e1eb 100644
--- a/src/shared/help/indexwindow.cpp
+++ b/src/shared/help/indexwindow.cpp
@@ -42,8 +42,6 @@
#include <QtHelp/QHelpEngine>
#include <QtHelp/QHelpIndexWidget>
-QT_BEGIN_NAMESPACE
-
IndexWindow::IndexWindow(QHelpEngine *helpEngine, QWidget *parent)
: QWidget(parent)
, m_searchLineEdit(0)
@@ -200,5 +198,3 @@ void IndexWindow::focusInEvent(QFocusEvent *e)
m_searchLineEdit->setFocus();
}
}
-
-QT_END_NAMESPACE
diff --git a/src/shared/help/indexwindow.h b/src/shared/help/indexwindow.h
index 56dd6181f08..6cb8b869324 100644
--- a/src/shared/help/indexwindow.h
+++ b/src/shared/help/indexwindow.h
@@ -39,6 +39,8 @@ QT_BEGIN_NAMESPACE
class QHelpIndexWidget;
class QHelpEngine;
+QT_END_NAMESPACE
+
class IndexWindow : public QWidget
{
Q_OBJECT
@@ -73,6 +75,4 @@ private:
QHelpEngine *m_helpEngine;
};
-QT_END_NAMESPACE
-
#endif // INDEXWINDOW_H
--
GitLab