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

Task-number: QTCREATORBUG-3090
Reviewed-by: ck
This commit is contained in:
kh1
2010-11-16 14:15:23 +01:00
parent 5f196cf5b8
commit 0985f9c1c4
15 changed files with 14 additions and 15 deletions

View File

@@ -29,8 +29,8 @@
#include "centralwidget.h" #include "centralwidget.h"
#include "helpmanager.h"
#include "helpviewer.h" #include "helpviewer.h"
#include "localhelpmanager.h"
#include "topicchooser.h" #include "topicchooser.h"
#include <QtCore/QEvent> #include <QtCore/QEvent>

View File

@@ -32,8 +32,8 @@
#include "bookmarkmanager.h" #include "bookmarkmanager.h"
#include "centralwidget.h" #include "centralwidget.h"
#include "helpconstants.h" #include "helpconstants.h"
#include "helpmanager.h"
#include "helpviewer.h" #include "helpviewer.h"
#include "localhelpmanager.h"
#include "xbelsupport.h" #include "xbelsupport.h"
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>

View File

@@ -19,7 +19,7 @@ HEADERS += \
helpconstants.h \ helpconstants.h \
helpfindsupport.h \ helpfindsupport.h \
helpindexfilter.h \ helpindexfilter.h \
helpmanager.h \ localhelpmanager.h \
helpmode.h \ helpmode.h \
helpplugin.h \ helpplugin.h \
helpviewer.h \ helpviewer.h \
@@ -40,7 +40,7 @@ SOURCES += \
generalsettingspage.cpp \ generalsettingspage.cpp \
helpfindsupport.cpp \ helpfindsupport.cpp \
helpindexfilter.cpp \ helpindexfilter.cpp \
helpmanager.cpp \ localhelpmanager.cpp \
helpmode.cpp \ helpmode.cpp \
helpplugin.cpp \ helpplugin.cpp \
helpviewer.cpp \ helpviewer.cpp \

View File

@@ -39,10 +39,10 @@
#include "helpconstants.h" #include "helpconstants.h"
#include "helpfindsupport.h" #include "helpfindsupport.h"
#include "helpindexfilter.h" #include "helpindexfilter.h"
#include "helpmanager.h"
#include "helpmode.h" #include "helpmode.h"
#include "helpviewer.h" #include "helpviewer.h"
#include "indexwindow.h" #include "indexwindow.h"
#include "localhelpmanager.h"
#include "openpagesmanager.h" #include "openpagesmanager.h"
#include "openpagesmodel.h" #include "openpagesmodel.h"
#include "remotehelpfilter.h" #include "remotehelpfilter.h"

View File

@@ -29,7 +29,7 @@
#include "helpviewer.h" #include "helpviewer.h"
#include "helpconstants.h" #include "helpconstants.h"
#include "helpmanager.h" #include "localhelpmanager.h"
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>

View File

@@ -33,7 +33,7 @@
#include "helpconstants.h" #include "helpconstants.h"
#include "helpviewer_p.h" #include "helpviewer_p.h"
#include "helpmanager.h" #include "localhelpmanager.h"
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <QtGui/QClipboard> #include <QtGui/QClipboard>

View File

@@ -33,7 +33,7 @@
#include "centralwidget.h" #include "centralwidget.h"
#include "helpconstants.h" #include "helpconstants.h"
#include "helpmanager.h" #include "localhelpmanager.h"
#include "openpagesmanager.h" #include "openpagesmanager.h"
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>

View File

@@ -27,7 +27,7 @@
** **
**************************************************************************/ **************************************************************************/
#include "helpmanager.h" #include "localhelpmanager.h"
#include "bookmarkmanager.h" #include "bookmarkmanager.h"
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>

View File

@@ -31,8 +31,8 @@
#include "centralwidget.h" #include "centralwidget.h"
#include "helpconstants.h" #include "helpconstants.h"
#include "helpmanager.h"
#include "helpviewer.h" #include "helpviewer.h"
#include "localhelpmanager.h"
#include "openpagesmodel.h" #include "openpagesmodel.h"
#include "openpagesswitcher.h" #include "openpagesswitcher.h"
#include "openpageswidget.h" #include "openpageswidget.h"

View File

@@ -28,7 +28,7 @@
**************************************************************************/ **************************************************************************/
#include "searchwidget.h" #include "searchwidget.h"
#include "helpmanager.h" #include "localhelpmanager.h"
#include "openpagesmanager.h" #include "openpagesmanager.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>

View File

@@ -48,7 +48,6 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/helpmanager.h> #include <coreplugin/helpmanager.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <help/helpmanager.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
# include <utils/winutils.h> # include <utils/winutils.h>

View File

@@ -30,7 +30,7 @@
#include "bookmarkmanager.h" #include "bookmarkmanager.h"
#include "centralwidget.h" #include "centralwidget.h"
#include "helpmanager.h" #include "localhelpmanager.h"
#include "openpagesmanager.h" #include "openpagesmanager.h"
#include <utils/filterlineedit.h> #include <utils/filterlineedit.h>

View File

@@ -31,8 +31,8 @@
#include "centralwidget.h" #include "centralwidget.h"
#include "helpviewer.h" #include "helpviewer.h"
#include "localhelpmanager.h"
#include "openpagesmanager.h" #include "openpagesmanager.h"
#include <help/helpmanager.h>
#include <QtGui/QLayout> #include <QtGui/QLayout>
#include <QtGui/QFocusEvent> #include <QtGui/QFocusEvent>

View File

@@ -29,9 +29,9 @@
#include "centralwidget.h" #include "centralwidget.h"
#include "helpmanager.h"
#include "helpviewer.h" #include "helpviewer.h"
#include "indexwindow.h" #include "indexwindow.h"
#include "localhelpmanager.h"
#include "openpagesmanager.h" #include "openpagesmanager.h"
#include "topicchooser.h" #include "topicchooser.h"