diff options
author | con <qtc-committer@nokia.com> | 2009-10-16 11:44:18 +0200 |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2009-10-16 11:44:18 +0200 |
commit | a5bfacecb7aa926e6685708eb15d4817c14b6901 (patch) | |
tree | 90237b1527ebc36fb2ee5ecea2f349012351efd9 | |
parent | 450a18b1cb637def7531731fa712248edc966cdc (diff) | |
download | qt-creator-a5bfacecb7aa926e6685708eb15d4817c14b6901.tar.gz |
Rename directory quickopen --> locator
-rw-r--r-- | doc/api/qtcreator-api.qdocconf | 10 | ||||
-rw-r--r-- | src/plugins/cpptools/cppcurrentdocumentfilter.h | 2 | ||||
-rw-r--r-- | src/plugins/cpptools/cpplocatorfilter.h | 2 | ||||
-rw-r--r-- | src/plugins/cpptools/cpptools.pro | 2 | ||||
-rw-r--r-- | src/plugins/help/help_dependencies.pri | 2 | ||||
-rw-r--r-- | src/plugins/help/helpindexfilter.h | 2 | ||||
-rw-r--r-- | src/plugins/locator/QuickOpen.pluginspec (renamed from src/plugins/quickopen/QuickOpen.pluginspec) | 0 | ||||
-rw-r--r-- | src/plugins/locator/basefilefilter.cpp (renamed from src/plugins/quickopen/basefilefilter.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/locator/basefilefilter.h (renamed from src/plugins/quickopen/basefilefilter.h) | 0 | ||||
-rw-r--r-- | src/plugins/locator/directoryfilter.cpp (renamed from src/plugins/quickopen/directoryfilter.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/locator/directoryfilter.h (renamed from src/plugins/quickopen/directoryfilter.h) | 0 | ||||
-rw-r--r-- | src/plugins/locator/directoryfilter.ui (renamed from src/plugins/quickopen/directoryfilter.ui) | 0 | ||||
-rw-r--r-- | src/plugins/locator/directoryparser.cpp (renamed from src/plugins/quickopen/directoryparser.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/locator/directoryparser.h (renamed from src/plugins/quickopen/directoryparser.h) | 0 | ||||
-rw-r--r-- | src/plugins/locator/filesystemfilter.cpp (renamed from src/plugins/quickopen/filesystemfilter.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/locator/filesystemfilter.h (renamed from src/plugins/quickopen/filesystemfilter.h) | 0 | ||||
-rw-r--r-- | src/plugins/locator/filesystemfilter.ui (renamed from src/plugins/quickopen/filesystemfilter.ui) | 0 | ||||
-rw-r--r-- | src/plugins/locator/ilocatorfilter.cpp (renamed from src/plugins/quickopen/ilocatorfilter.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/locator/ilocatorfilter.h (renamed from src/plugins/quickopen/ilocatorfilter.h) | 0 | ||||
-rw-r--r-- | src/plugins/locator/images/locator.png (renamed from src/plugins/quickopen/images/locator.png) | bin | 767 -> 767 bytes | |||
-rw-r--r-- | src/plugins/locator/images/reload.png (renamed from src/plugins/quickopen/images/reload.png) | bin | 735 -> 735 bytes | |||
-rw-r--r-- | src/plugins/locator/locator.pro (renamed from src/plugins/quickopen/quickopen.pro) | 0 | ||||
-rw-r--r-- | src/plugins/locator/locator.qrc (renamed from src/plugins/quickopen/locator.qrc) | 0 | ||||
-rw-r--r-- | src/plugins/locator/locator_global.h (renamed from src/plugins/quickopen/locator_global.h) | 0 | ||||
-rw-r--r-- | src/plugins/locator/locatorconstants.h (renamed from src/plugins/quickopen/locatorconstants.h) | 0 | ||||
-rw-r--r-- | src/plugins/locator/locatorfiltersfilter.cpp (renamed from src/plugins/quickopen/locatorfiltersfilter.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/locator/locatorfiltersfilter.h (renamed from src/plugins/quickopen/locatorfiltersfilter.h) | 0 | ||||
-rw-r--r-- | src/plugins/locator/locatormanager.cpp (renamed from src/plugins/quickopen/locatormanager.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/locator/locatormanager.h (renamed from src/plugins/quickopen/locatormanager.h) | 0 | ||||
-rw-r--r-- | src/plugins/locator/locatorplugin.cpp (renamed from src/plugins/quickopen/locatorplugin.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/locator/locatorplugin.h (renamed from src/plugins/quickopen/locatorplugin.h) | 0 | ||||
-rw-r--r-- | src/plugins/locator/locatorwidget.cpp (renamed from src/plugins/quickopen/locatorwidget.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/locator/locatorwidget.h (renamed from src/plugins/quickopen/locatorwidget.h) | 0 | ||||
-rw-r--r-- | src/plugins/locator/opendocumentsfilter.cpp (renamed from src/plugins/quickopen/opendocumentsfilter.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/locator/opendocumentsfilter.h (renamed from src/plugins/quickopen/opendocumentsfilter.h) | 0 | ||||
-rw-r--r-- | src/plugins/locator/quickopen.cp (renamed from src/plugins/quickopen/quickopen.cp) | 0 | ||||
-rw-r--r-- | src/plugins/locator/quickopen.pri (renamed from src/plugins/quickopen/quickopen.pri) | 0 | ||||
-rw-r--r-- | src/plugins/locator/quickopen_dependencies.pri (renamed from src/plugins/quickopen/quickopen_dependencies.pri) | 0 | ||||
-rw-r--r-- | src/plugins/locator/settingspage.cpp (renamed from src/plugins/quickopen/settingspage.cpp) | 0 | ||||
-rw-r--r-- | src/plugins/locator/settingspage.h (renamed from src/plugins/quickopen/settingspage.h) | 0 | ||||
-rw-r--r-- | src/plugins/locator/settingspage.ui (renamed from src/plugins/quickopen/settingspage.ui) | 0 | ||||
-rw-r--r-- | src/plugins/locator/settingswidget.ui (renamed from src/plugins/quickopen/settingswidget.ui) | 0 | ||||
-rw-r--r-- | src/plugins/plugins.pro | 12 | ||||
-rw-r--r-- | src/plugins/projectexplorer/allprojectsfilter.h | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/currentprojectfilter.h | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/projectexplorer_dependencies.pri | 2 | ||||
-rw-r--r-- | src/plugins/texteditor/linenumberfilter.h | 2 | ||||
-rw-r--r-- | src/plugins/texteditor/texteditor_dependencies.pri | 2 | ||||
-rw-r--r-- | src/plugins/texteditor/texteditoractionhandler.cpp | 2 |
49 files changed, 22 insertions, 22 deletions
diff --git a/doc/api/qtcreator-api.qdocconf b/doc/api/qtcreator-api.qdocconf index bd0212e989..74ff036df9 100644 --- a/doc/api/qtcreator-api.qdocconf +++ b/doc/api/qtcreator-api.qdocconf @@ -9,7 +9,7 @@ headerdirs = . \ ../../src/libs/extensionsystem \ ../../src/plugins/coreplugin \ ../../src/plugins/find \ - ../../src/plugins/quickopen + ../../src/plugins/locator sourcedirs = . \ ../../src/libs/aggregation \ @@ -17,7 +17,7 @@ sourcedirs = . \ ../../src/libs/extensionsystem \ ../../src/plugins/coreplugin \ ../../src/plugins/find \ - ../../src/plugins/quickopen + ../../src/plugins/locator headers.fileextesnions = "*.h" sources.fileextensions = "*.cpp *.qdoc" @@ -62,7 +62,7 @@ macro.endquote = "\\endquotation" macro.relatesto = "\\relates" spurious = "Missing comma in .*" \ - "Missing pattern .*" + "Missing pattern .*" ## macros.qdocconf macro.aring.HTML = "å" @@ -224,7 +224,7 @@ defines = Q_QDOC \ Q_WS_.* \ Q_OS_.* \ Q_BYTE_ORDER \ - QT_DEPRECATED \ + QT_DEPRECATED \ Q_NO_USING_KEYWORD \ __cplusplus @@ -232,4 +232,4 @@ defines = Q_QDOC \ # See also qhp.Qt.extraFiles extraimages.HTML = qt-logo \ trolltech-logo - + diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.h b/src/plugins/cpptools/cppcurrentdocumentfilter.h index a72a75fea4..905f1da4fb 100644 --- a/src/plugins/cpptools/cppcurrentdocumentfilter.h +++ b/src/plugins/cpptools/cppcurrentdocumentfilter.h @@ -30,7 +30,7 @@ #define CPPCURRENTDOCUMENTFILTER_H #include "searchsymbols.h" -#include <quickopen/ilocatorfilter.h> +#include <locator/ilocatorfilter.h> namespace Core { class EditorManager; diff --git a/src/plugins/cpptools/cpplocatorfilter.h b/src/plugins/cpptools/cpplocatorfilter.h index 39dde0f8dc..c33fcf45ae 100644 --- a/src/plugins/cpptools/cpplocatorfilter.h +++ b/src/plugins/cpptools/cpplocatorfilter.h @@ -32,7 +32,7 @@ #include "searchsymbols.h" -#include <quickopen/ilocatorfilter.h> +#include <locator/ilocatorfilter.h> namespace Core { class EditorManager; diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro index c39ec6f095..056757f2af 100644 --- a/src/plugins/cpptools/cpptools.pro +++ b/src/plugins/cpptools/cpptools.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = CppTools include(../../qtcreatorplugin.pri) -include(../../plugins/quickopen/quickopen.pri) +include(../../plugins/locator/quickopen.pri) include(cpptools_dependencies.pri) # DEFINES += QT_NO_CAST_FROM_ASCII diff --git a/src/plugins/help/help_dependencies.pri b/src/plugins/help/help_dependencies.pri index 2b46febe3b..412f99efb6 100644 --- a/src/plugins/help/help_dependencies.pri +++ b/src/plugins/help/help_dependencies.pri @@ -1,4 +1,4 @@ include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/find/find.pri) -include(../../plugins/quickopen/quickopen.pri) +include(../../plugins/locator/quickopen.pri) diff --git a/src/plugins/help/helpindexfilter.h b/src/plugins/help/helpindexfilter.h index 038670792a..7094e9adf2 100644 --- a/src/plugins/help/helpindexfilter.h +++ b/src/plugins/help/helpindexfilter.h @@ -30,7 +30,7 @@ #ifndef HELPINDEXFILTER_H #define HELPINDEXFILTER_H -#include <quickopen/ilocatorfilter.h> +#include <locator/ilocatorfilter.h> #include <QtGui/QIcon> diff --git a/src/plugins/quickopen/QuickOpen.pluginspec b/src/plugins/locator/QuickOpen.pluginspec index d9a45e89ba..d9a45e89ba 100644 --- a/src/plugins/quickopen/QuickOpen.pluginspec +++ b/src/plugins/locator/QuickOpen.pluginspec diff --git a/src/plugins/quickopen/basefilefilter.cpp b/src/plugins/locator/basefilefilter.cpp index ed5e02f76a..ed5e02f76a 100644 --- a/src/plugins/quickopen/basefilefilter.cpp +++ b/src/plugins/locator/basefilefilter.cpp diff --git a/src/plugins/quickopen/basefilefilter.h b/src/plugins/locator/basefilefilter.h index ee2e4248c9..ee2e4248c9 100644 --- a/src/plugins/quickopen/basefilefilter.h +++ b/src/plugins/locator/basefilefilter.h diff --git a/src/plugins/quickopen/directoryfilter.cpp b/src/plugins/locator/directoryfilter.cpp index 983b51c92e..983b51c92e 100644 --- a/src/plugins/quickopen/directoryfilter.cpp +++ b/src/plugins/locator/directoryfilter.cpp diff --git a/src/plugins/quickopen/directoryfilter.h b/src/plugins/locator/directoryfilter.h index 2140a18d1f..2140a18d1f 100644 --- a/src/plugins/quickopen/directoryfilter.h +++ b/src/plugins/locator/directoryfilter.h diff --git a/src/plugins/quickopen/directoryfilter.ui b/src/plugins/locator/directoryfilter.ui index 8b8ddfe59a..8b8ddfe59a 100644 --- a/src/plugins/quickopen/directoryfilter.ui +++ b/src/plugins/locator/directoryfilter.ui diff --git a/src/plugins/quickopen/directoryparser.cpp b/src/plugins/locator/directoryparser.cpp index 6bd8f431d5..6bd8f431d5 100644 --- a/src/plugins/quickopen/directoryparser.cpp +++ b/src/plugins/locator/directoryparser.cpp diff --git a/src/plugins/quickopen/directoryparser.h b/src/plugins/locator/directoryparser.h index 35618f33e3..35618f33e3 100644 --- a/src/plugins/quickopen/directoryparser.h +++ b/src/plugins/locator/directoryparser.h diff --git a/src/plugins/quickopen/filesystemfilter.cpp b/src/plugins/locator/filesystemfilter.cpp index 99506b0760..99506b0760 100644 --- a/src/plugins/quickopen/filesystemfilter.cpp +++ b/src/plugins/locator/filesystemfilter.cpp diff --git a/src/plugins/quickopen/filesystemfilter.h b/src/plugins/locator/filesystemfilter.h index 319637192a..319637192a 100644 --- a/src/plugins/quickopen/filesystemfilter.h +++ b/src/plugins/locator/filesystemfilter.h diff --git a/src/plugins/quickopen/filesystemfilter.ui b/src/plugins/locator/filesystemfilter.ui index 0c56a86032..0c56a86032 100644 --- a/src/plugins/quickopen/filesystemfilter.ui +++ b/src/plugins/locator/filesystemfilter.ui diff --git a/src/plugins/quickopen/ilocatorfilter.cpp b/src/plugins/locator/ilocatorfilter.cpp index fb9c682eac..fb9c682eac 100644 --- a/src/plugins/quickopen/ilocatorfilter.cpp +++ b/src/plugins/locator/ilocatorfilter.cpp diff --git a/src/plugins/quickopen/ilocatorfilter.h b/src/plugins/locator/ilocatorfilter.h index 4957eecd05..4957eecd05 100644 --- a/src/plugins/quickopen/ilocatorfilter.h +++ b/src/plugins/locator/ilocatorfilter.h diff --git a/src/plugins/quickopen/images/locator.png b/src/plugins/locator/images/locator.png Binary files differindex 000ee1c018..000ee1c018 100644 --- a/src/plugins/quickopen/images/locator.png +++ b/src/plugins/locator/images/locator.png diff --git a/src/plugins/quickopen/images/reload.png b/src/plugins/locator/images/reload.png Binary files differindex b5afefb32b..b5afefb32b 100644 --- a/src/plugins/quickopen/images/reload.png +++ b/src/plugins/locator/images/reload.png diff --git a/src/plugins/quickopen/quickopen.pro b/src/plugins/locator/locator.pro index 73de643c9c..73de643c9c 100644 --- a/src/plugins/quickopen/quickopen.pro +++ b/src/plugins/locator/locator.pro diff --git a/src/plugins/quickopen/locator.qrc b/src/plugins/locator/locator.qrc index 4cd5df4f13..4cd5df4f13 100644 --- a/src/plugins/quickopen/locator.qrc +++ b/src/plugins/locator/locator.qrc diff --git a/src/plugins/quickopen/locator_global.h b/src/plugins/locator/locator_global.h index 7dc95b7fde..7dc95b7fde 100644 --- a/src/plugins/quickopen/locator_global.h +++ b/src/plugins/locator/locator_global.h diff --git a/src/plugins/quickopen/locatorconstants.h b/src/plugins/locator/locatorconstants.h index 4a78341f79..4a78341f79 100644 --- a/src/plugins/quickopen/locatorconstants.h +++ b/src/plugins/locator/locatorconstants.h diff --git a/src/plugins/quickopen/locatorfiltersfilter.cpp b/src/plugins/locator/locatorfiltersfilter.cpp index 4b81b73e5d..4b81b73e5d 100644 --- a/src/plugins/quickopen/locatorfiltersfilter.cpp +++ b/src/plugins/locator/locatorfiltersfilter.cpp diff --git a/src/plugins/quickopen/locatorfiltersfilter.h b/src/plugins/locator/locatorfiltersfilter.h index 622b653f1a..622b653f1a 100644 --- a/src/plugins/quickopen/locatorfiltersfilter.h +++ b/src/plugins/locator/locatorfiltersfilter.h diff --git a/src/plugins/quickopen/locatormanager.cpp b/src/plugins/locator/locatormanager.cpp index d1df7d8746..d1df7d8746 100644 --- a/src/plugins/quickopen/locatormanager.cpp +++ b/src/plugins/locator/locatormanager.cpp diff --git a/src/plugins/quickopen/locatormanager.h b/src/plugins/locator/locatormanager.h index d3f296c85e..d3f296c85e 100644 --- a/src/plugins/quickopen/locatormanager.h +++ b/src/plugins/locator/locatormanager.h diff --git a/src/plugins/quickopen/locatorplugin.cpp b/src/plugins/locator/locatorplugin.cpp index c37d218a1c..c37d218a1c 100644 --- a/src/plugins/quickopen/locatorplugin.cpp +++ b/src/plugins/locator/locatorplugin.cpp diff --git a/src/plugins/quickopen/locatorplugin.h b/src/plugins/locator/locatorplugin.h index 525f291f4a..525f291f4a 100644 --- a/src/plugins/quickopen/locatorplugin.h +++ b/src/plugins/locator/locatorplugin.h diff --git a/src/plugins/quickopen/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp index da15cd1100..da15cd1100 100644 --- a/src/plugins/quickopen/locatorwidget.cpp +++ b/src/plugins/locator/locatorwidget.cpp diff --git a/src/plugins/quickopen/locatorwidget.h b/src/plugins/locator/locatorwidget.h index 4fefd4cb12..4fefd4cb12 100644 --- a/src/plugins/quickopen/locatorwidget.h +++ b/src/plugins/locator/locatorwidget.h diff --git a/src/plugins/quickopen/opendocumentsfilter.cpp b/src/plugins/locator/opendocumentsfilter.cpp index a85da7fee9..a85da7fee9 100644 --- a/src/plugins/quickopen/opendocumentsfilter.cpp +++ b/src/plugins/locator/opendocumentsfilter.cpp diff --git a/src/plugins/quickopen/opendocumentsfilter.h b/src/plugins/locator/opendocumentsfilter.h index fc040971f7..fc040971f7 100644 --- a/src/plugins/quickopen/opendocumentsfilter.h +++ b/src/plugins/locator/opendocumentsfilter.h diff --git a/src/plugins/quickopen/quickopen.cp b/src/plugins/locator/quickopen.cp index e69de29bb2..e69de29bb2 100644 --- a/src/plugins/quickopen/quickopen.cp +++ b/src/plugins/locator/quickopen.cp diff --git a/src/plugins/quickopen/quickopen.pri b/src/plugins/locator/quickopen.pri index a5645e529e..a5645e529e 100644 --- a/src/plugins/quickopen/quickopen.pri +++ b/src/plugins/locator/quickopen.pri diff --git a/src/plugins/quickopen/quickopen_dependencies.pri b/src/plugins/locator/quickopen_dependencies.pri index 96d71e68c8..96d71e68c8 100644 --- a/src/plugins/quickopen/quickopen_dependencies.pri +++ b/src/plugins/locator/quickopen_dependencies.pri diff --git a/src/plugins/quickopen/settingspage.cpp b/src/plugins/locator/settingspage.cpp index 99453132fe..99453132fe 100644 --- a/src/plugins/quickopen/settingspage.cpp +++ b/src/plugins/locator/settingspage.cpp diff --git a/src/plugins/quickopen/settingspage.h b/src/plugins/locator/settingspage.h index 1fb55661e0..1fb55661e0 100644 --- a/src/plugins/quickopen/settingspage.h +++ b/src/plugins/locator/settingspage.h diff --git a/src/plugins/quickopen/settingspage.ui b/src/plugins/locator/settingspage.ui index f2f055c57b..f2f055c57b 100644 --- a/src/plugins/quickopen/settingspage.ui +++ b/src/plugins/locator/settingspage.ui diff --git a/src/plugins/quickopen/settingswidget.ui b/src/plugins/locator/settingswidget.ui index 03653fe6a0..03653fe6a0 100644 --- a/src/plugins/quickopen/settingswidget.ui +++ b/src/plugins/locator/settingswidget.ui diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 44c0ddd032..c74bda15a2 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -19,7 +19,7 @@ SUBDIRS = plugin_coreplugin \ plugin_cpptools \ plugin_qt4projectmanager \ # plugin_snippets \ # buggy and annoying - plugin_quickopen \ + plugin_locator \ plugin_debugger \ # plugin_qtestlib \ # this seems to be dead # plugin_helloworld \ # sample plugin @@ -46,7 +46,7 @@ plugin_find.depends += plugin_coreplugin plugin_texteditor.subdir = texteditor plugin_texteditor.depends = plugin_find -plugin_texteditor.depends += plugin_quickopen +plugin_texteditor.depends += plugin_locator plugin_texteditor.depends += plugin_coreplugin plugin_cppeditor.subdir = cppeditor @@ -88,7 +88,7 @@ plugin_subversion.depends += plugin_projectexplorer plugin_subversion.depends += plugin_coreplugin plugin_projectexplorer.subdir = projectexplorer -plugin_projectexplorer.depends = plugin_quickopen +plugin_projectexplorer.depends = plugin_locator plugin_projectexplorer.depends += plugin_find plugin_projectexplorer.depends += plugin_coreplugin plugin_projectexplorer.depends += plugin_texteditor @@ -102,8 +102,8 @@ plugin_qt4projectmanager.depends += plugin_help plugin_qt4projectmanager.depends += plugin_designer plugin_qt4projectmanager.depends += plugin_debugger -plugin_quickopen.subdir = quickopen -plugin_quickopen.depends = plugin_coreplugin +plugin_locator.subdir = locator +plugin_locator.depends = plugin_coreplugin plugin_cpptools.subdir = cpptools plugin_cpptools.depends = plugin_projectexplorer @@ -139,7 +139,7 @@ plugin_helloworld.depends = plugin_coreplugin plugin_help.subdir = help plugin_help.depends = plugin_find -plugin_help.depends += plugin_quickopen +plugin_help.depends += plugin_locator plugin_help.depends += plugin_coreplugin plugin_resourceeditor.subdir = resourceeditor diff --git a/src/plugins/projectexplorer/allprojectsfilter.h b/src/plugins/projectexplorer/allprojectsfilter.h index 71b948b6f0..9d2455e560 100644 --- a/src/plugins/projectexplorer/allprojectsfilter.h +++ b/src/plugins/projectexplorer/allprojectsfilter.h @@ -30,7 +30,7 @@ #ifndef ALLPROJECTSFILTER_H #define ALLPROJECTSFILTER_H -#include <quickopen/basefilefilter.h> +#include <locator/basefilefilter.h> #include <QtCore/QFutureInterface> #include <QtCore/QString> diff --git a/src/plugins/projectexplorer/currentprojectfilter.h b/src/plugins/projectexplorer/currentprojectfilter.h index 1d9d3fcee0..aefc8f5818 100644 --- a/src/plugins/projectexplorer/currentprojectfilter.h +++ b/src/plugins/projectexplorer/currentprojectfilter.h @@ -30,7 +30,7 @@ #ifndef CURRENTPROJECTFILTER_H #define CURRENTPROJECTFILTER_H -#include <quickopen/basefilefilter.h> +#include <locator/basefilefilter.h> #include <QtCore/QString> #include <QtCore/QByteArray> diff --git a/src/plugins/projectexplorer/projectexplorer_dependencies.pri b/src/plugins/projectexplorer/projectexplorer_dependencies.pri index 674c8bbb36..99d163d6f1 100644 --- a/src/plugins/projectexplorer/projectexplorer_dependencies.pri +++ b/src/plugins/projectexplorer/projectexplorer_dependencies.pri @@ -1,5 +1,5 @@ include(../../libs/utils/utils.pri) -include(../../plugins/quickopen/quickopen.pri) +include(../../plugins/locator/quickopen.pri) include(../../plugins/find/find.pri) include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/texteditor/texteditor.pri) diff --git a/src/plugins/texteditor/linenumberfilter.h b/src/plugins/texteditor/linenumberfilter.h index 9147908eed..54bb858bfe 100644 --- a/src/plugins/texteditor/linenumberfilter.h +++ b/src/plugins/texteditor/linenumberfilter.h @@ -30,7 +30,7 @@ #ifndef LINENUMBERFILTER_H #define LINENUMBERFILTER_H -#include <quickopen/ilocatorfilter.h> +#include <locator/ilocatorfilter.h> #include <QtCore/QString> #include <QtCore/QList> diff --git a/src/plugins/texteditor/texteditor_dependencies.pri b/src/plugins/texteditor/texteditor_dependencies.pri index 87f23e9eed..60c22f8477 100644 --- a/src/plugins/texteditor/texteditor_dependencies.pri +++ b/src/plugins/texteditor/texteditor_dependencies.pri @@ -1,4 +1,4 @@ include(../../libs/utils/utils.pri) include(../../plugins/find/find.pri) -include(../../plugins/quickopen/quickopen.pri) +include(../../plugins/locator/quickopen.pri) include(../../plugins/coreplugin/coreplugin.pri) diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index ffa9343687..5043583a46 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -33,7 +33,7 @@ #include "texteditorplugin.h" #include "linenumberfilter.h" -#include <quickopen/locatormanager.h> +#include <locator/locatormanager.h> #include <coreplugin/icore.h> #include <coreplugin/coreconstants.h> #include <coreplugin/uniqueidmanager.h> |