Fix ambiguity with help manager by renaming the file to match class.

Task-number: QTCREATORBUG-3090
Reviewed-by: ck

diff --git a/src/plugins/help/centralwidget.cpp b/src/plugins/help/centralwidget.cpp
index 34e234e..89bf1fe 100644 (file)
--- a/src/plugins/help/centralwidget.cpp
+++ b/src/plugins/help/centralwidget.cpp
@@ -29,8 +29,8 @@
 
 #include "centralwidget.h"
 
-#include "helpmanager.h"
 #include "helpviewer.h"
+#include "localhelpmanager.h"
 #include "topicchooser.h"
 
 #include <QtCore/QEvent>

diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp
index 04eccbc..dc4daff 100644 (file)
--- a/src/plugins/help/generalsettingspage.cpp
+++ b/src/plugins/help/generalsettingspage.cpp
@@ -32,8 +32,8 @@
 #include "bookmarkmanager.h"
 #include "centralwidget.h"
 #include "helpconstants.h"
-#include "helpmanager.h"
 #include "helpviewer.h"
+#include "localhelpmanager.h"
 #include "xbelsupport.h"
 
 #include <coreplugin/coreconstants.h>

diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro
index a52de6f..c5616d2 100644 (file)
--- a/src/plugins/help/help.pro
+++ b/src/plugins/help/help.pro
@@ -19,7 +19,7 @@ HEADERS += \
     helpconstants.h \
     helpfindsupport.h \
     helpindexfilter.h \
-    helpmanager.h \
+    localhelpmanager.h \
     helpmode.h \
     helpplugin.h \
     helpviewer.h \
@@ -40,7 +40,7 @@ SOURCES += \
     generalsettingspage.cpp \
     helpfindsupport.cpp \
     helpindexfilter.cpp \
-    helpmanager.cpp \
+    localhelpmanager.cpp \
     helpmode.cpp \
     helpplugin.cpp \
     helpviewer.cpp \

diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 5a7b6fe..b51cb16 100644 (file)
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -39,10 +39,10 @@
 #include "helpconstants.h"
 #include "helpfindsupport.h"
 #include "helpindexfilter.h"
-#include "helpmanager.h"
 #include "helpmode.h"
 #include "helpviewer.h"
 #include "indexwindow.h"
+#include "localhelpmanager.h"
 #include "openpagesmanager.h"
 #include "openpagesmodel.h"
 #include "remotehelpfilter.h"

diff --git a/src/plugins/help/helpviewer.cpp b/src/plugins/help/helpviewer.cpp
index 15a53da..fe0799b 100644 (file)
--- a/src/plugins/help/helpviewer.cpp
+++ b/src/plugins/help/helpviewer.cpp
@@ -29,7 +29,7 @@
 
 #include "helpviewer.h"
 #include "helpconstants.h"
-#include "helpmanager.h"
+#include "localhelpmanager.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QFileInfo>

diff --git a/src/plugins/help/helpviewer_qtb.cpp b/src/plugins/help/helpviewer_qtb.cpp
index 7cef9c5..34e233e 100644 (file)
--- a/src/plugins/help/helpviewer_qtb.cpp
+++ b/src/plugins/help/helpviewer_qtb.cpp
@@ -33,7 +33,7 @@
 
 #include "helpconstants.h"
 #include "helpviewer_p.h"
-#include "helpmanager.h"
+#include "localhelpmanager.h"
 
 #include <QtGui/QApplication>
 #include <QtGui/QClipboard>

diff --git a/src/plugins/help/helpviewer_qwv.cpp b/src/plugins/help/helpviewer_qwv.cpp
index 993afb0..402160c 100644 (file)
--- a/src/plugins/help/helpviewer_qwv.cpp
+++ b/src/plugins/help/helpviewer_qwv.cpp
@@ -33,7 +33,7 @@
 
 #include "centralwidget.h"
 #include "helpconstants.h"
-#include "helpmanager.h"
+#include "localhelpmanager.h"
 #include "openpagesmanager.h"
 
 #include <QtCore/QFileInfo>

diff --git a/src/plugins/help/helpmanager.cpp b/src/plugins/help/localhelpmanager.cpp
similarity index 99%
rename from src/plugins/help/helpmanager.cpp
rename to src/plugins/help/localhelpmanager.cpp
index 10f4197..b1eef36 100644 (file)
--- a/src/plugins/help/helpmanager.cpp
+++ b/src/plugins/help/localhelpmanager.cpp
@@ -27,7 +27,7 @@
 **
 **************************************************************************/
 
-#include "helpmanager.h"
+#include "localhelpmanager.h"
 #include "bookmarkmanager.h"
 
 #include <coreplugin/coreconstants.h>

diff --git a/src/plugins/help/helpmanager.h b/src/plugins/help/localhelpmanager.h
similarity index 100%
rename from src/plugins/help/helpmanager.h
rename to src/plugins/help/localhelpmanager.h

diff --git a/src/plugins/help/openpagesmanager.cpp b/src/plugins/help/openpagesmanager.cpp
index fb602b9..d1be11c 100644 (file)
--- a/src/plugins/help/openpagesmanager.cpp
+++ b/src/plugins/help/openpagesmanager.cpp
@@ -31,8 +31,8 @@
 
 #include "centralwidget.h"
 #include "helpconstants.h"
-#include "helpmanager.h"
 #include "helpviewer.h"
+#include "localhelpmanager.h"
 #include "openpagesmodel.h"
 #include "openpagesswitcher.h"
 #include "openpageswidget.h"

diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp
index b248892..b491abe 100644 (file)
--- a/src/plugins/help/searchwidget.cpp
+++ b/src/plugins/help/searchwidget.cpp
@@ -28,7 +28,7 @@
 **************************************************************************/
 
 #include "searchwidget.h"
-#include "helpmanager.h"
+#include "localhelpmanager.h"
 #include "openpagesmanager.h"
 
 #include <coreplugin/icore.h>

diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 0831705..ff9fb7a 100644 (file)
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -48,7 +48,6 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/helpmanager.h>
 #include <extensionsystem/pluginmanager.h>
-#include <help/helpmanager.h>
 #include <utils/qtcassert.h>
 #ifdef Q_OS_WIN
 #    include <utils/winutils.h>

diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp
index 6433c06..6eb1de8 100644 (file)
--- a/src/shared/help/bookmarkmanager.cpp
+++ b/src/shared/help/bookmarkmanager.cpp
@@ -30,7 +30,7 @@
 #include "bookmarkmanager.h"
 
 #include "centralwidget.h"
-#include "helpmanager.h"
+#include "localhelpmanager.h"
 #include "openpagesmanager.h"
 
 #include <utils/filterlineedit.h>

diff --git a/src/shared/help/contentwindow.cpp b/src/shared/help/contentwindow.cpp
index f71cc76..8c37473 100644 (file)
--- a/src/shared/help/contentwindow.cpp
+++ b/src/shared/help/contentwindow.cpp
@@ -31,8 +31,8 @@
 
 #include "centralwidget.h"
 #include "helpviewer.h"
+#include "localhelpmanager.h"
 #include "openpagesmanager.h"
-#include <help/helpmanager.h>
 
 #include <QtGui/QLayout>
 #include <QtGui/QFocusEvent>

diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp
index 03795f6..30390e1 100644 (file)
--- a/src/shared/help/indexwindow.cpp
+++ b/src/shared/help/indexwindow.cpp
@@ -29,9 +29,9 @@
 
 #include "centralwidget.h"
 
-#include "helpmanager.h"
 #include "helpviewer.h"
 #include "indexwindow.h"
+#include "localhelpmanager.h"
 #include "openpagesmanager.h"
 #include "topicchooser.h"