compile fix for namespaced Qt

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;

src/plugins/help/contentstoolwindow.h

@@ -43,6 +43,7 @@ class ContentsToolWindow;
 class ContentsToolWidget : public QTreeWidget
 {
     Q_OBJECT
+
 public:
     ContentsToolWidget();
 

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 {

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 {

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

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

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

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

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

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

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

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