diff --git a/src/plugins/help/centralwidget.cpp b/src/plugins/help/centralwidget.cpp index 34e234e1f9671a5c93dbf20c10d6fe608ccc27b6..89bf1fea4433cf34cf0c8dfda7ac72ee5af1b42a 100644 --- 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 04eccbc02bf538eff8393424009c1c039632fa4e..dc4daff803d407c551a214d823b02f2d4a1e4c11 100644 --- 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 a52de6ff3b58967f581822bcd95a08fd4beeec88..c5616d2df1582b980255ef99d067b69fbc02599a 100644 --- 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 5a7b6fe567082c19c473093070636612b5d86302..b51cb16f68a89fc11ebbf2e4195f0f114454b76d 100644 --- 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 15a53da81c17c33b4154de15aecd8d165db1f72e..fe0799b0e4167faf319bd747e726fed79d128882 100644 --- 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 7cef9c543ce89e5c137d4a0811af4da4dc7cd7d3..34e233efd25d0b1b0dd17dc8c97df2ecb62d2d3e 100644 --- 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 993afb09a108eb3659fdfbce54a7dd09fe70d039..402160cf6769fb820c311119d45cea5d95405be2 100644 --- 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 10f4197ab963a4dd0e9b8d17cb9ecd5203b1d1c2..b1eef36e67c579919b8ee92dbf3627445bc68bb9 100644 --- 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 fb602b979888fb24ff0d499a7cf16bdee7c71602..d1be11c00d476661db57885a61cf7e0cdad199ef 100644 --- 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 b24889248d0313d60bc3b57923d784883b6013a5..b491abeef5b4cf86d0934ef6d5794014e9c08028 100644 --- 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 08317057d40b46e57a4c81df4c3ed723ced5923f..ff9fb7ad4d0e26399691f88172f60f29e7f9bab2 100644 --- 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 6433c06e1816b743db4d5bc972cff3960c6e4f33..6eb1de8f0b35e9e17e6fcde067b9abd799f784f2 100644 --- 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 f71cc76230cf805e0f9b170671ad5b7d70f99235..8c374736f402dfae90f798448538e23843a437cf 100644 --- 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 03795f65ecd9bf9b190c38d1e671e0bc202ad3e3..30390e1b3a53bab0c1ac0ba275051cc78e03f0f7 100644 --- 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"