Move the constants where they belong.

4 files changed, 12 insertions, 11 deletions

diff --git a/src/plugins/help/helpconstants.h b/src/plugins/help/helpconstants.h
index 2e013452ef..36195359db 100644
--- a/src/plugins/help/helpconstants.h
+++ b/src/plugins/help/helpconstants.h
@@ -33,10 +33,17 @@
 #include <QtCore/QtGlobal>
 
 namespace Help {
-namespace Constants {
+    namespace Constants {
+
+const int          P_MODE_HELP    = 70;
+const char * const ID_MODE_HELP   = "Help";
 const char * const HELP_CATEGORY = "H.Help";
 const char * const HELP_TR_CATEGORY = QT_TRANSLATE_NOOP("Help", "Help");
-}
-}
+
+const char * const C_MODE_HELP    = "Help Mode";
+const char * const C_HELP_SIDEBAR = "Help Sidebar";
+
+    }   // Constants
+}   // Help
 
 #endif // HELPCONSTANTS_H
diff --git a/src/plugins/help/helpmode.cpp b/src/plugins/help/helpmode.cpp
index 2cb84fd8d7..7162264134 100644
--- a/src/plugins/help/helpmode.cpp
+++ b/src/plugins/help/helpmode.cpp
@@ -28,7 +28,7 @@
 **************************************************************************/
 
 #include "helpmode.h"
-#include "helpplugin.h"
+#include "helpconstants.h"
 
 #include <coreplugin/findplaceholder.h>
 
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index dc3e9909f7..901085a764 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -34,6 +34,7 @@
 #include "docsettingspage.h"
 #include "filtersettingspage.h"
 #include "generalsettingspage.h"
+#include "helpconstants.h"
 #include "helpfindsupport.h"
 #include "helpindexfilter.h"
 #include "helpmanager.h"
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index 396b58e325..b7bf4e5491 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -60,13 +60,6 @@ class SideBarItem;
 namespace Help {
 class HelpManager;
 
-namespace Constants {
-const char * const C_MODE_HELP    = "Help Mode";
-const char * const C_HELP_SIDEBAR = "Help Sidebar";
-const int          P_MODE_HELP    = 70;
-const char * const ID_MODE_HELP   = "Help";
-}   // Constants
-
 namespace Internal {
 class CentralWidget;
 class DocSettingsPage;