From a5bfacecb7aa926e6685708eb15d4817c14b6901 Mon Sep 17 00:00:00 2001 From: con <qtc-committer@nokia.com> Date: Fri, 16 Oct 2009 11:44:18 +0200 Subject: [PATCH] Rename directory quickopen --> locator --- doc/api/qtcreator-api.qdocconf | 10 +++++----- src/plugins/cpptools/cppcurrentdocumentfilter.h | 2 +- src/plugins/cpptools/cpplocatorfilter.h | 2 +- src/plugins/cpptools/cpptools.pro | 2 +- src/plugins/help/help_dependencies.pri | 2 +- src/plugins/help/helpindexfilter.h | 2 +- .../{quickopen => locator}/QuickOpen.pluginspec | 0 .../{quickopen => locator}/basefilefilter.cpp | 0 src/plugins/{quickopen => locator}/basefilefilter.h | 0 .../{quickopen => locator}/directoryfilter.cpp | 0 .../{quickopen => locator}/directoryfilter.h | 0 .../{quickopen => locator}/directoryfilter.ui | 0 .../{quickopen => locator}/directoryparser.cpp | 0 .../{quickopen => locator}/directoryparser.h | 0 .../{quickopen => locator}/filesystemfilter.cpp | 0 .../{quickopen => locator}/filesystemfilter.h | 0 .../{quickopen => locator}/filesystemfilter.ui | 0 .../{quickopen => locator}/ilocatorfilter.cpp | 0 src/plugins/{quickopen => locator}/ilocatorfilter.h | 0 .../{quickopen => locator}/images/locator.png | Bin .../{quickopen => locator}/images/reload.png | Bin .../quickopen.pro => locator/locator.pro} | 0 src/plugins/{quickopen => locator}/locator.qrc | 0 src/plugins/{quickopen => locator}/locator_global.h | 0 .../{quickopen => locator}/locatorconstants.h | 0 .../{quickopen => locator}/locatorfiltersfilter.cpp | 0 .../{quickopen => locator}/locatorfiltersfilter.h | 0 .../{quickopen => locator}/locatormanager.cpp | 0 src/plugins/{quickopen => locator}/locatormanager.h | 0 .../{quickopen => locator}/locatorplugin.cpp | 0 src/plugins/{quickopen => locator}/locatorplugin.h | 0 .../{quickopen => locator}/locatorwidget.cpp | 0 src/plugins/{quickopen => locator}/locatorwidget.h | 0 .../{quickopen => locator}/opendocumentsfilter.cpp | 0 .../{quickopen => locator}/opendocumentsfilter.h | 0 src/plugins/{quickopen => locator}/quickopen.cp | 0 src/plugins/{quickopen => locator}/quickopen.pri | 0 .../quickopen_dependencies.pri | 0 src/plugins/{quickopen => locator}/settingspage.cpp | 0 src/plugins/{quickopen => locator}/settingspage.h | 0 src/plugins/{quickopen => locator}/settingspage.ui | 0 .../{quickopen => locator}/settingswidget.ui | 0 src/plugins/plugins.pro | 12 ++++++------ src/plugins/projectexplorer/allprojectsfilter.h | 2 +- src/plugins/projectexplorer/currentprojectfilter.h | 2 +- .../projectexplorer_dependencies.pri | 2 +- src/plugins/texteditor/linenumberfilter.h | 2 +- src/plugins/texteditor/texteditor_dependencies.pri | 2 +- src/plugins/texteditor/texteditoractionhandler.cpp | 2 +- 49 files changed, 22 insertions(+), 22 deletions(-) rename src/plugins/{quickopen => locator}/QuickOpen.pluginspec (100%) rename src/plugins/{quickopen => locator}/basefilefilter.cpp (100%) rename src/plugins/{quickopen => locator}/basefilefilter.h (100%) rename src/plugins/{quickopen => locator}/directoryfilter.cpp (100%) rename src/plugins/{quickopen => locator}/directoryfilter.h (100%) rename src/plugins/{quickopen => locator}/directoryfilter.ui (100%) rename src/plugins/{quickopen => locator}/directoryparser.cpp (100%) rename src/plugins/{quickopen => locator}/directoryparser.h (100%) rename src/plugins/{quickopen => locator}/filesystemfilter.cpp (100%) rename src/plugins/{quickopen => locator}/filesystemfilter.h (100%) rename src/plugins/{quickopen => locator}/filesystemfilter.ui (100%) rename src/plugins/{quickopen => locator}/ilocatorfilter.cpp (100%) rename src/plugins/{quickopen => locator}/ilocatorfilter.h (100%) rename src/plugins/{quickopen => locator}/images/locator.png (100%) rename src/plugins/{quickopen => locator}/images/reload.png (100%) rename src/plugins/{quickopen/quickopen.pro => locator/locator.pro} (100%) rename src/plugins/{quickopen => locator}/locator.qrc (100%) rename src/plugins/{quickopen => locator}/locator_global.h (100%) rename src/plugins/{quickopen => locator}/locatorconstants.h (100%) rename src/plugins/{quickopen => locator}/locatorfiltersfilter.cpp (100%) rename src/plugins/{quickopen => locator}/locatorfiltersfilter.h (100%) rename src/plugins/{quickopen => locator}/locatormanager.cpp (100%) rename src/plugins/{quickopen => locator}/locatormanager.h (100%) rename src/plugins/{quickopen => locator}/locatorplugin.cpp (100%) rename src/plugins/{quickopen => locator}/locatorplugin.h (100%) rename src/plugins/{quickopen => locator}/locatorwidget.cpp (100%) rename src/plugins/{quickopen => locator}/locatorwidget.h (100%) rename src/plugins/{quickopen => locator}/opendocumentsfilter.cpp (100%) rename src/plugins/{quickopen => locator}/opendocumentsfilter.h (100%) rename src/plugins/{quickopen => locator}/quickopen.cp (100%) rename src/plugins/{quickopen => locator}/quickopen.pri (100%) rename src/plugins/{quickopen => locator}/quickopen_dependencies.pri (100%) rename src/plugins/{quickopen => locator}/settingspage.cpp (100%) rename src/plugins/{quickopen => locator}/settingspage.h (100%) rename src/plugins/{quickopen => locator}/settingspage.ui (100%) rename src/plugins/{quickopen => locator}/settingswidget.ui (100%) diff --git a/doc/api/qtcreator-api.qdocconf b/doc/api/qtcreator-api.qdocconf index bd0212e989c..74ff036df9a 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 a72a75fea4f..905f1da4fb8 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 39dde0f8dc1..c33fcf45ae4 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 c39ec6f0954..056757f2afd 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 2b46febe3b5..412f99efb6d 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 038670792a0..7094e9adf21 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 similarity index 100% rename from src/plugins/quickopen/QuickOpen.pluginspec rename to src/plugins/locator/QuickOpen.pluginspec diff --git a/src/plugins/quickopen/basefilefilter.cpp b/src/plugins/locator/basefilefilter.cpp similarity index 100% rename from src/plugins/quickopen/basefilefilter.cpp rename to src/plugins/locator/basefilefilter.cpp diff --git a/src/plugins/quickopen/basefilefilter.h b/src/plugins/locator/basefilefilter.h similarity index 100% rename from src/plugins/quickopen/basefilefilter.h rename to src/plugins/locator/basefilefilter.h diff --git a/src/plugins/quickopen/directoryfilter.cpp b/src/plugins/locator/directoryfilter.cpp similarity index 100% rename from src/plugins/quickopen/directoryfilter.cpp rename to src/plugins/locator/directoryfilter.cpp diff --git a/src/plugins/quickopen/directoryfilter.h b/src/plugins/locator/directoryfilter.h similarity index 100% rename from src/plugins/quickopen/directoryfilter.h rename to src/plugins/locator/directoryfilter.h diff --git a/src/plugins/quickopen/directoryfilter.ui b/src/plugins/locator/directoryfilter.ui similarity index 100% rename from src/plugins/quickopen/directoryfilter.ui rename to src/plugins/locator/directoryfilter.ui diff --git a/src/plugins/quickopen/directoryparser.cpp b/src/plugins/locator/directoryparser.cpp similarity index 100% rename from src/plugins/quickopen/directoryparser.cpp rename to src/plugins/locator/directoryparser.cpp diff --git a/src/plugins/quickopen/directoryparser.h b/src/plugins/locator/directoryparser.h similarity index 100% rename from src/plugins/quickopen/directoryparser.h rename to src/plugins/locator/directoryparser.h diff --git a/src/plugins/quickopen/filesystemfilter.cpp b/src/plugins/locator/filesystemfilter.cpp similarity index 100% rename from src/plugins/quickopen/filesystemfilter.cpp rename to src/plugins/locator/filesystemfilter.cpp diff --git a/src/plugins/quickopen/filesystemfilter.h b/src/plugins/locator/filesystemfilter.h similarity index 100% rename from src/plugins/quickopen/filesystemfilter.h rename to src/plugins/locator/filesystemfilter.h diff --git a/src/plugins/quickopen/filesystemfilter.ui b/src/plugins/locator/filesystemfilter.ui similarity index 100% rename from src/plugins/quickopen/filesystemfilter.ui rename to src/plugins/locator/filesystemfilter.ui diff --git a/src/plugins/quickopen/ilocatorfilter.cpp b/src/plugins/locator/ilocatorfilter.cpp similarity index 100% rename from src/plugins/quickopen/ilocatorfilter.cpp rename to src/plugins/locator/ilocatorfilter.cpp diff --git a/src/plugins/quickopen/ilocatorfilter.h b/src/plugins/locator/ilocatorfilter.h similarity index 100% rename from src/plugins/quickopen/ilocatorfilter.h rename to src/plugins/locator/ilocatorfilter.h diff --git a/src/plugins/quickopen/images/locator.png b/src/plugins/locator/images/locator.png similarity index 100% rename from src/plugins/quickopen/images/locator.png rename to src/plugins/locator/images/locator.png diff --git a/src/plugins/quickopen/images/reload.png b/src/plugins/locator/images/reload.png similarity index 100% rename from src/plugins/quickopen/images/reload.png rename to src/plugins/locator/images/reload.png diff --git a/src/plugins/quickopen/quickopen.pro b/src/plugins/locator/locator.pro similarity index 100% rename from src/plugins/quickopen/quickopen.pro rename to src/plugins/locator/locator.pro diff --git a/src/plugins/quickopen/locator.qrc b/src/plugins/locator/locator.qrc similarity index 100% rename from src/plugins/quickopen/locator.qrc rename to src/plugins/locator/locator.qrc diff --git a/src/plugins/quickopen/locator_global.h b/src/plugins/locator/locator_global.h similarity index 100% rename from src/plugins/quickopen/locator_global.h rename to src/plugins/locator/locator_global.h diff --git a/src/plugins/quickopen/locatorconstants.h b/src/plugins/locator/locatorconstants.h similarity index 100% rename from src/plugins/quickopen/locatorconstants.h rename to src/plugins/locator/locatorconstants.h diff --git a/src/plugins/quickopen/locatorfiltersfilter.cpp b/src/plugins/locator/locatorfiltersfilter.cpp similarity index 100% rename from src/plugins/quickopen/locatorfiltersfilter.cpp rename to src/plugins/locator/locatorfiltersfilter.cpp diff --git a/src/plugins/quickopen/locatorfiltersfilter.h b/src/plugins/locator/locatorfiltersfilter.h similarity index 100% rename from src/plugins/quickopen/locatorfiltersfilter.h rename to src/plugins/locator/locatorfiltersfilter.h diff --git a/src/plugins/quickopen/locatormanager.cpp b/src/plugins/locator/locatormanager.cpp similarity index 100% rename from src/plugins/quickopen/locatormanager.cpp rename to src/plugins/locator/locatormanager.cpp diff --git a/src/plugins/quickopen/locatormanager.h b/src/plugins/locator/locatormanager.h similarity index 100% rename from src/plugins/quickopen/locatormanager.h rename to src/plugins/locator/locatormanager.h diff --git a/src/plugins/quickopen/locatorplugin.cpp b/src/plugins/locator/locatorplugin.cpp similarity index 100% rename from src/plugins/quickopen/locatorplugin.cpp rename to src/plugins/locator/locatorplugin.cpp diff --git a/src/plugins/quickopen/locatorplugin.h b/src/plugins/locator/locatorplugin.h similarity index 100% rename from src/plugins/quickopen/locatorplugin.h rename to src/plugins/locator/locatorplugin.h diff --git a/src/plugins/quickopen/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp similarity index 100% rename from src/plugins/quickopen/locatorwidget.cpp rename to src/plugins/locator/locatorwidget.cpp diff --git a/src/plugins/quickopen/locatorwidget.h b/src/plugins/locator/locatorwidget.h similarity index 100% rename from src/plugins/quickopen/locatorwidget.h rename to src/plugins/locator/locatorwidget.h diff --git a/src/plugins/quickopen/opendocumentsfilter.cpp b/src/plugins/locator/opendocumentsfilter.cpp similarity index 100% rename from src/plugins/quickopen/opendocumentsfilter.cpp rename to src/plugins/locator/opendocumentsfilter.cpp diff --git a/src/plugins/quickopen/opendocumentsfilter.h b/src/plugins/locator/opendocumentsfilter.h similarity index 100% rename from src/plugins/quickopen/opendocumentsfilter.h rename to src/plugins/locator/opendocumentsfilter.h diff --git a/src/plugins/quickopen/quickopen.cp b/src/plugins/locator/quickopen.cp similarity index 100% rename from src/plugins/quickopen/quickopen.cp rename to src/plugins/locator/quickopen.cp diff --git a/src/plugins/quickopen/quickopen.pri b/src/plugins/locator/quickopen.pri similarity index 100% rename from src/plugins/quickopen/quickopen.pri rename to src/plugins/locator/quickopen.pri diff --git a/src/plugins/quickopen/quickopen_dependencies.pri b/src/plugins/locator/quickopen_dependencies.pri similarity index 100% rename from src/plugins/quickopen/quickopen_dependencies.pri rename to src/plugins/locator/quickopen_dependencies.pri diff --git a/src/plugins/quickopen/settingspage.cpp b/src/plugins/locator/settingspage.cpp similarity index 100% rename from src/plugins/quickopen/settingspage.cpp rename to src/plugins/locator/settingspage.cpp diff --git a/src/plugins/quickopen/settingspage.h b/src/plugins/locator/settingspage.h similarity index 100% rename from src/plugins/quickopen/settingspage.h rename to src/plugins/locator/settingspage.h diff --git a/src/plugins/quickopen/settingspage.ui b/src/plugins/locator/settingspage.ui similarity index 100% rename from src/plugins/quickopen/settingspage.ui rename to src/plugins/locator/settingspage.ui diff --git a/src/plugins/quickopen/settingswidget.ui b/src/plugins/locator/settingswidget.ui similarity index 100% rename from src/plugins/quickopen/settingswidget.ui rename to src/plugins/locator/settingswidget.ui diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 44c0ddd032b..c74bda15a2a 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 71b948b6f0d..9d2455e5600 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 1d9d3fcee09..aefc8f58189 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 674c8bbb362..99d163d6f1b 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 9147908eed1..54bb858bfe7 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 87f23e9eede..60c22f84776 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 ffa93436871..5043583a469 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> -- GitLab