From 17d9bd6b0ad3debbd70f3a8bc2a94db064ec3838 Mon Sep 17 00:00:00 2001 From: con Date: Fri, 16 Oct 2009 11:30:46 +0200 Subject: [PATCH] Rename QuickOpen namespace. --- doc/api/qtcreator-api.qdoc | 4 +-- .../cpptools/cppcurrentdocumentfilter.cpp | 10 +++--- .../cpptools/cppcurrentdocumentfilter.h | 6 ++-- src/plugins/cpptools/cpplocatorfilter.cpp | 14 ++++---- src/plugins/cpptools/cpplocatorfilter.h | 6 ++-- src/plugins/cpptools/cpptoolsplugin.cpp | 4 +-- src/plugins/designer/settingspage.h | 2 +- src/plugins/fakevim/fakevimhandler.cpp | 36 +++++++++---------- src/plugins/help/helpindexfilter.cpp | 2 +- src/plugins/help/helpindexfilter.h | 6 ++-- .../projectexplorer/allprojectsfilter.cpp | 2 +- .../projectexplorer/allprojectsfilter.h | 4 +-- .../projectexplorer/currentprojectfilter.cpp | 2 +- .../projectexplorer/currentprojectfilter.h | 4 +-- src/plugins/quickopen/basefilefilter.cpp | 8 ++--- src/plugins/quickopen/basefilefilter.h | 10 +++--- src/plugins/quickopen/directoryfilter.cpp | 4 +-- src/plugins/quickopen/directoryfilter.h | 6 ++-- src/plugins/quickopen/directoryfilter.ui | 16 ++++----- src/plugins/quickopen/filesystemfilter.cpp | 4 +-- src/plugins/quickopen/filesystemfilter.h | 12 +++---- src/plugins/quickopen/filesystemfilter.ui | 10 +++--- src/plugins/quickopen/ilocatorfilter.cpp | 2 +- src/plugins/quickopen/ilocatorfilter.h | 4 +-- .../quickopen/locatorfiltersfilter.cpp | 4 +-- src/plugins/quickopen/locatorfiltersfilter.h | 6 ++-- src/plugins/quickopen/locatormanager.cpp | 4 +-- src/plugins/quickopen/locatormanager.h | 4 +-- src/plugins/quickopen/locatorplugin.cpp | 12 +++---- src/plugins/quickopen/locatorplugin.h | 4 +-- src/plugins/quickopen/locatorwidget.cpp | 26 +++++++------- src/plugins/quickopen/locatorwidget.h | 4 +-- src/plugins/quickopen/opendocumentsfilter.cpp | 4 +-- src/plugins/quickopen/opendocumentsfilter.h | 12 +++---- src/plugins/quickopen/quickopenconstants.h | 14 ++++---- src/plugins/quickopen/settingspage.cpp | 12 +++---- src/plugins/quickopen/settingspage.h | 4 +-- src/plugins/quickopen/settingspage.ui | 10 +++--- src/plugins/texteditor/linenumberfilter.cpp | 2 +- src/plugins/texteditor/linenumberfilter.h | 8 ++--- .../texteditor/texteditoractionhandler.cpp | 2 +- 41 files changed, 155 insertions(+), 155 deletions(-) diff --git a/doc/api/qtcreator-api.qdoc b/doc/api/qtcreator-api.qdoc index 125d506f4d2..b1760846ffe 100644 --- a/doc/api/qtcreator-api.qdoc +++ b/doc/api/qtcreator-api.qdoc @@ -54,7 +54,7 @@ \o Support for searching text in arbitrary widgets, and arbitrary other things. \row - \o \l{QuickOpen} + \o \l{Locator} \o Hooks for providing content for Locator. \endtable @@ -162,7 +162,7 @@ \row \o Add a new filter to Locator. \o For a text typed in by the user you provide a list of things to show in the popup. When the user selects an entry you are requested to do whatever you want. - \o \l{QuickOpen::ILocatorFilter}, \l{QuickOpen::FilterEntry}, \l{QuickOpen::BaseFileFilter} + \o \l{Locator::ILocatorFilter}, \l{Locator::FilterEntry}, \l{Locator::BaseFileFilter} \row \o diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp index d13839cc967..eb6845d9656 100644 --- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp +++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp @@ -58,11 +58,11 @@ CppCurrentDocumentFilter::CppCurrentDocumentFilter(CppModelManager *manager, Cor this, SLOT(onEditorAboutToClose(Core::IEditor*))); } -QList CppCurrentDocumentFilter::matchesFor(const QString & origEntry) +QList CppCurrentDocumentFilter::matchesFor(const QString & origEntry) { QString entry = trimWildcards(origEntry); - QList goodEntries; - QList betterEntries; + QList goodEntries; + QList betterEntries; QStringMatcher matcher(entry, Qt::CaseInsensitive); const QRegExp regexp("*"+entry+"*", Qt::CaseInsensitive, QRegExp::Wildcard); if (!regexp.isValid()) @@ -86,7 +86,7 @@ QList CppCurrentDocumentFilter::matchesFor(const QString { QString symbolName = info.symbolName;// + (info.type == ModelItemInfo::Declaration ? ";" : " {...}"); QVariant id = qVariantFromValue(info); - QuickOpen::FilterEntry filterEntry(this, symbolName, id, info.icon); + Locator::FilterEntry filterEntry(this, symbolName, id, info.icon); filterEntry.extraInfo = info.symbolType; if (info.symbolName.startsWith(entry)) @@ -102,7 +102,7 @@ QList CppCurrentDocumentFilter::matchesFor(const QString return betterEntries; } -void CppCurrentDocumentFilter::accept(QuickOpen::FilterEntry selection) const +void CppCurrentDocumentFilter::accept(Locator::FilterEntry selection) const { ModelItemInfo info = qvariant_cast(selection.internalData); TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line); diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.h b/src/plugins/cpptools/cppcurrentdocumentfilter.h index 60ffb89a4c5..a72a75fea4f 100644 --- a/src/plugins/cpptools/cppcurrentdocumentfilter.h +++ b/src/plugins/cpptools/cppcurrentdocumentfilter.h @@ -42,7 +42,7 @@ namespace Internal { class CppModelManager; -class CppCurrentDocumentFilter : public QuickOpen::ILocatorFilter +class CppCurrentDocumentFilter : public Locator::ILocatorFilter { Q_OBJECT @@ -53,8 +53,8 @@ public: QString trName() const { return tr("Methods in current Document"); } QString name() const { return QLatin1String("Methods in current Document"); } Priority priority() const { return Medium; } - QList matchesFor(const QString &entry); - void accept(QuickOpen::FilterEntry selection) const; + QList matchesFor(const QString &entry); + void accept(Locator::FilterEntry selection) const; void refresh(QFutureInterface &future); private slots: diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp index 1b3366dbfea..df38a42a8d6 100644 --- a/src/plugins/cpptools/cpplocatorfilter.cpp +++ b/src/plugins/cpptools/cpplocatorfilter.cpp @@ -73,17 +73,17 @@ void CppLocatorFilter::refresh(QFutureInterface &future) Q_UNUSED(future) } -static bool compareLexigraphically(const QuickOpen::FilterEntry &a, - const QuickOpen::FilterEntry &b) +static bool compareLexigraphically(const Locator::FilterEntry &a, + const Locator::FilterEntry &b) { return a.displayName < b.displayName; } -QList CppLocatorFilter::matchesFor(const QString &origEntry) +QList CppLocatorFilter::matchesFor(const QString &origEntry) { QString entry = trimWildcards(origEntry); - QList goodEntries; - QList betterEntries; + QList goodEntries; + QList betterEntries; QStringMatcher matcher(entry, Qt::CaseInsensitive); const QRegExp regexp("*"+entry+"*", Qt::CaseInsensitive, QRegExp::Wildcard); if (!regexp.isValid()) @@ -108,7 +108,7 @@ QList CppLocatorFilter::matchesFor(const QString &origEn || (!hasWildcard && matcher.indexIn(info.symbolName) != -1)) { QVariant id = qVariantFromValue(info); - QuickOpen::FilterEntry filterEntry(this, info.symbolName, id, info.icon); + Locator::FilterEntry filterEntry(this, info.symbolName, id, info.icon); if (! info.symbolType.isEmpty()) filterEntry.extraInfo = info.symbolType; else @@ -131,7 +131,7 @@ QList CppLocatorFilter::matchesFor(const QString &origEn return betterEntries; } -void CppLocatorFilter::accept(QuickOpen::FilterEntry selection) const +void CppLocatorFilter::accept(Locator::FilterEntry selection) const { ModelItemInfo info = qvariant_cast(selection.internalData); TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line); diff --git a/src/plugins/cpptools/cpplocatorfilter.h b/src/plugins/cpptools/cpplocatorfilter.h index ec1cc65ab88..39dde0f8dc1 100644 --- a/src/plugins/cpptools/cpplocatorfilter.h +++ b/src/plugins/cpptools/cpplocatorfilter.h @@ -43,7 +43,7 @@ namespace Internal { class CppModelManager; -class CppLocatorFilter : public QuickOpen::ILocatorFilter +class CppLocatorFilter : public Locator::ILocatorFilter { Q_OBJECT public: @@ -53,8 +53,8 @@ public: QString trName() const { return tr("Classes and Methods"); } QString name() const { return QLatin1String("Classes and Methods"); } Priority priority() const { return Medium; } - QList matchesFor(const QString &entry); - void accept(QuickOpen::FilterEntry selection) const; + QList matchesFor(const QString &entry); + void accept(Locator::FilterEntry selection) const; void refresh(QFutureInterface &future); protected: diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 9f24abc1e86..bbc894390c8 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -104,9 +104,9 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error) addAutoReleasedObject(new CppQuickFixCollector(m_modelManager)); - CppLocatorFilter *quickOpenFilter = new CppLocatorFilter(m_modelManager, + CppLocatorFilter *locatorFilter = new CppLocatorFilter(m_modelManager, core->editorManager()); - addAutoReleasedObject(quickOpenFilter); + addAutoReleasedObject(locatorFilter); addAutoReleasedObject(new CppClassesFilter(m_modelManager, core->editorManager())); addAutoReleasedObject(new CppFunctionsFilter(m_modelManager, core->editorManager())); addAutoReleasedObject(new CppCurrentDocumentFilter(m_modelManager, core->editorManager())); diff --git a/src/plugins/designer/settingspage.h b/src/plugins/designer/settingspage.h index 7dfbd97a327..ee5152c2b78 100644 --- a/src/plugins/designer/settingspage.h +++ b/src/plugins/designer/settingspage.h @@ -63,6 +63,6 @@ private: }; } // namespace Internal -} // namespace QuickOpen +} // namespace Designer #endif // DESIGNER_SETTINGSPAGE_H diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index 33a6ac1be9d..abec06d97ea 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -52,7 +52,7 @@ // There is always a "current" cursor (m_tc). A current "region of interest" // spans between m_anchor (== anchor()) and m_tc.position() (== position()) // The value of m_tc.anchor() is not used. -// +// #include @@ -213,7 +213,7 @@ struct Range Range(int b, int e, RangeMode m = RangeCharMode) : beginPos(qMin(b, e)), endPos(qMax(b, e)), rangemode(m) - {} + {} int beginPos; int endPos; @@ -518,7 +518,7 @@ bool FakeVimHandler::Private::wantsOverride(QKeyEvent *ev) // We are interested in overriding most Ctrl key combinations if (mods == Qt::ControlModifier && key >= Key_A && key <= Key_Z && key != Key_K) { - // Ctrl-K is special as it is the Core's default notion of QuickOpen + // Ctrl-K is special as it is the Core's default notion of Locator if (m_passing) { KEY_DEBUG(" PASSING CTRL KEY"); // We get called twice on the same key @@ -566,7 +566,7 @@ EventResult FakeVimHandler::Private::handleEvent(QKeyEvent *ev) setTargetColumn(); m_tc.setVisualNavigation(true); - + if (m_fakeEnd) moveRight(); @@ -913,9 +913,9 @@ void FakeVimHandler::Private::updateMiniBuffer() const QString pos = QString::fromLatin1("%1,%2").arg(l + 1).arg(cursorColumnInDocument() + 1); // FIXME: physical "-" logical if (linesInDoc != 0) { - status = FakeVimHandler::tr("%1%2%").arg(pos, -10).arg(l * 100 / linesInDoc, 4); + status = FakeVimHandler::tr("%1%2%").arg(pos, -10).arg(l * 100 / linesInDoc, 4); } else { - status = FakeVimHandler::tr("%1All").arg(pos, -10); + status = FakeVimHandler::tr("%1All").arg(pos, -10); } emit q->statusDataChanged(status); } @@ -974,7 +974,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified, setDotCommand("%1dd", count()); m_submode = NoSubMode; moveToFirstNonBlankOnLine(); - setTargetColumn(); + setTargetColumn(); finishMovement(); } else if (m_submode == ShiftLeftSubMode && key == '<') { setAnchor(); @@ -1529,7 +1529,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified, m_savedYankPosition = position(); setAnchor(firstPositionInLine(line)); setPosition(lastPositionInLine(line+count() - 1)); - if (count() > 1) + if (count() > 1) showBlackMessage(QString("%1 lines yanked").arg(count())); m_rangemode = RangeLineMode; m_movetype = MoveLineWise; @@ -1666,7 +1666,7 @@ EventResult FakeVimHandler::Private::handleInsertMode(int key, int, insertAutomaticIndentation(true); setTargetColumn(); } else if (key == Key_Backspace || key == control('h')) { - if (!removeAutomaticIndentation()) + if (!removeAutomaticIndentation()) if (!m_lastInsertion.isEmpty() || hasConfig(ConfigBackspace, "start")) { m_tc.deletePreviousChar(); m_lastInsertion.chop(1); @@ -1899,7 +1899,7 @@ void FakeVimHandler::Private::handleExCommand(const QString &cmd0) static QRegExp reSet("^set?( (.*))?$"); static QRegExp reWrite("^[wx]q?a?!?( (.*))?$"); static QRegExp reSubstitute("^s(.)(.*)\\1(.*)\\1([gi]*)"); - + enterCommandMode(); showBlackMessage(QString()); @@ -2509,12 +2509,12 @@ QString FakeVimHandler::Private::text(const Range &range) const int beginColumn = 0; int endColumn = INT_MAX; if (range.rangemode == RangeBlockMode) { - int column1 = range.beginPos - firstPositionInLine(beginLine); - int column2 = range.endPos - firstPositionInLine(endLine); + int column1 = range.beginPos - firstPositionInLine(beginLine); + int column2 = range.endPos - firstPositionInLine(endLine); beginColumn = qMin(column1, column2); endColumn = qMax(column1, column2); qDebug() << "COLS: " << beginColumn << endColumn; - } + } int len = endColumn - beginColumn + 1; QString contents; QTextBlock block = m_tc.document()->findBlockByNumber(beginLine - 1); @@ -2580,8 +2580,8 @@ void FakeVimHandler::Private::removeText(const Range &range) case RangeBlockMode: { int beginLine = lineForPosition(range.beginPos); int endLine = lineForPosition(range.endPos); - int column1 = range.beginPos - firstPositionInLine(beginLine); - int column2 = range.endPos - firstPositionInLine(endLine); + int column1 = range.beginPos - firstPositionInLine(beginLine); + int column2 = range.endPos - firstPositionInLine(endLine); int beginColumn = qMin(column1, column2); int endColumn = qMax(column1, column2); qDebug() << "COLS: " << beginColumn << endColumn; @@ -2645,7 +2645,7 @@ void FakeVimHandler::Private::pasteText(bool afterCursor) tc.movePosition(EndOfLine, MoveAnchor); fixMarks(position(), QString(col - line.size() + 1, QChar(' ')).length()); tc.insertText(QString(col - line.size() + 1, QChar(' '))); - } else { + } else { tc.movePosition(Right, MoveAnchor, col); } qDebug() << "INSERT " << line << " AT " << tc.position() @@ -2673,8 +2673,8 @@ void FakeVimHandler::Private::fixMarks(int positionAction, int positionChange) QHashIterator i(m_marks); while (i.hasNext()) { i.next(); - if (i.value() >= positionAction) { - if (i.value() + positionChange > 0) + if (i.value() >= positionAction) { + if (i.value() + positionChange > 0) m_marks[i.key()] = i.value() + positionChange; else m_marks.remove(i.key()); diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp index bde3cd4d25c..162c3d57a69 100644 --- a/src/plugins/help/helpindexfilter.cpp +++ b/src/plugins/help/helpindexfilter.cpp @@ -37,7 +37,7 @@ #include #include -using namespace QuickOpen; +using namespace Locator; using namespace Help; using namespace Help::Internal; diff --git a/src/plugins/help/helpindexfilter.h b/src/plugins/help/helpindexfilter.h index 745143a5aa6..038670792a0 100644 --- a/src/plugins/help/helpindexfilter.h +++ b/src/plugins/help/helpindexfilter.h @@ -44,7 +44,7 @@ namespace Internal { class HelpPlugin; -class HelpIndexFilter : public QuickOpen::ILocatorFilter +class HelpIndexFilter : public Locator::ILocatorFilter { Q_OBJECT @@ -55,8 +55,8 @@ public: QString trName() const; QString name() const; Priority priority() const; - QList matchesFor(const QString &entry); - void accept(QuickOpen::FilterEntry selection) const; + QList matchesFor(const QString &entry); + void accept(Locator::FilterEntry selection) const; void refresh(QFutureInterface &future); signals: diff --git a/src/plugins/projectexplorer/allprojectsfilter.cpp b/src/plugins/projectexplorer/allprojectsfilter.cpp index b9ff2325793..bd7d120d428 100644 --- a/src/plugins/projectexplorer/allprojectsfilter.cpp +++ b/src/plugins/projectexplorer/allprojectsfilter.cpp @@ -35,7 +35,7 @@ #include using namespace Core; -using namespace QuickOpen; +using namespace Locator; using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/allprojectsfilter.h b/src/plugins/projectexplorer/allprojectsfilter.h index 66d70d2209a..71b948b6f0d 100644 --- a/src/plugins/projectexplorer/allprojectsfilter.h +++ b/src/plugins/projectexplorer/allprojectsfilter.h @@ -42,7 +42,7 @@ class ProjectExplorerPlugin; namespace Internal { -class AllProjectsFilter : public QuickOpen::BaseFileFilter +class AllProjectsFilter : public Locator::BaseFileFilter { Q_OBJECT @@ -50,7 +50,7 @@ public: explicit AllProjectsFilter(ProjectExplorerPlugin *pe); QString trName() const { return tr("Files in any project"); } QString name() const { return "Files in any project"; } - QuickOpen::ILocatorFilter::Priority priority() const { return QuickOpen::ILocatorFilter::Low; } + Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::Low; } void refresh(QFutureInterface &future); protected: diff --git a/src/plugins/projectexplorer/currentprojectfilter.cpp b/src/plugins/projectexplorer/currentprojectfilter.cpp index 71a6a5c2ab9..c43eba56e02 100644 --- a/src/plugins/projectexplorer/currentprojectfilter.cpp +++ b/src/plugins/projectexplorer/currentprojectfilter.cpp @@ -38,7 +38,7 @@ #include using namespace Core; -using namespace QuickOpen; +using namespace Locator; using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/projectexplorer/currentprojectfilter.h b/src/plugins/projectexplorer/currentprojectfilter.h index b5f7d770b74..1d9d3fcee09 100644 --- a/src/plugins/projectexplorer/currentprojectfilter.h +++ b/src/plugins/projectexplorer/currentprojectfilter.h @@ -45,7 +45,7 @@ class Project; namespace Internal { -class CurrentProjectFilter : public QuickOpen::BaseFileFilter +class CurrentProjectFilter : public Locator::BaseFileFilter { Q_OBJECT @@ -53,7 +53,7 @@ public: CurrentProjectFilter(ProjectExplorerPlugin *pe); QString trName() const { return tr("Files in current project"); } QString name() const { return "Files in current project"; } - QuickOpen::ILocatorFilter::Priority priority() const { return QuickOpen::ILocatorFilter::Low; } + Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::Low; } void refresh(QFutureInterface &future); protected: diff --git a/src/plugins/quickopen/basefilefilter.cpp b/src/plugins/quickopen/basefilefilter.cpp index 7b27c185acc..ed5e02f76ad 100644 --- a/src/plugins/quickopen/basefilefilter.cpp +++ b/src/plugins/quickopen/basefilefilter.cpp @@ -35,7 +35,7 @@ #include using namespace Core; -using namespace QuickOpen; +using namespace Locator; BaseFileFilter::BaseFileFilter() : m_forceNewSearchList(false) @@ -85,12 +85,12 @@ QList BaseFileFilter::matchesFor(const QString &origEntry) m_previousResultNames.append(name); } } - - matches.append(badMatches); + + matches.append(badMatches); return matches; } -void BaseFileFilter::accept(QuickOpen::FilterEntry selection) const +void BaseFileFilter::accept(Locator::FilterEntry selection) const { Core::EditorManager *em = Core::EditorManager::instance(); em->openEditor(selection.internalData.toString()); diff --git a/src/plugins/quickopen/basefilefilter.h b/src/plugins/quickopen/basefilefilter.h index 7802f67eb94..ee2e4248c9e 100644 --- a/src/plugins/quickopen/basefilefilter.h +++ b/src/plugins/quickopen/basefilefilter.h @@ -36,16 +36,16 @@ #include #include -namespace QuickOpen { +namespace Locator { -class LOCATOR_EXPORT BaseFileFilter : public QuickOpen::ILocatorFilter +class LOCATOR_EXPORT BaseFileFilter : public Locator::ILocatorFilter { Q_OBJECT public: BaseFileFilter(); - QList matchesFor(const QString &entry); - void accept(QuickOpen::FilterEntry selection) const; + QList matchesFor(const QString &entry); + void accept(Locator::FilterEntry selection) const; protected: virtual void updateFiles(); @@ -59,6 +59,6 @@ protected: QString m_previousEntry; }; -} // namespace QuickOpen +} // namespace Locator #endif // BASEFILEFILTER_H diff --git a/src/plugins/quickopen/directoryfilter.cpp b/src/plugins/quickopen/directoryfilter.cpp index fc7e1f8cea4..983b51c92e8 100644 --- a/src/plugins/quickopen/directoryfilter.cpp +++ b/src/plugins/quickopen/directoryfilter.cpp @@ -37,8 +37,8 @@ #include -using namespace QuickOpen; -using namespace QuickOpen::Internal; +using namespace Locator; +using namespace Locator::Internal; DirectoryFilter::DirectoryFilter() : m_name(tr("Generic Directory Filter")), diff --git a/src/plugins/quickopen/directoryfilter.h b/src/plugins/quickopen/directoryfilter.h index 552c0f61668..2140a18d1ff 100644 --- a/src/plugins/quickopen/directoryfilter.h +++ b/src/plugins/quickopen/directoryfilter.h @@ -41,7 +41,7 @@ #include #include -namespace QuickOpen { +namespace Locator { namespace Internal { class DirectoryFilter : public BaseFileFilter @@ -52,7 +52,7 @@ public: DirectoryFilter(); QString trName() const { return m_name; } QString name() const { return m_name; } - QuickOpen::ILocatorFilter::Priority priority() const { return QuickOpen::ILocatorFilter::Medium; } + Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::Medium; } QByteArray saveState() const; bool restoreState(const QByteArray &state); bool openConfigDialog(QWidget *parent, bool &needsRefresh); @@ -76,6 +76,6 @@ private: }; } // namespace Internal -} // namespace QuickOpen +} // namespace Locator #endif // DIRECTORYFILTER_H diff --git a/src/plugins/quickopen/directoryfilter.ui b/src/plugins/quickopen/directoryfilter.ui index fbc5f82ae26..8b8ddfe59a8 100644 --- a/src/plugins/quickopen/directoryfilter.ui +++ b/src/plugins/quickopen/directoryfilter.ui @@ -1,13 +1,13 @@ - QuickOpen::Internal::DirectoryFilterOptions - + Locator::Internal::DirectoryFilterOptions + 0 0 393 - 271 + 275 @@ -72,12 +72,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t 0 - - false - Limit to prefix + + false + @@ -161,7 +161,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t buttonBox accepted() - QuickOpen::Internal::DirectoryFilterOptions + Locator::Internal::DirectoryFilterOptions accept() @@ -177,7 +177,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t buttonBox rejected() - QuickOpen::Internal::DirectoryFilterOptions + Locator::Internal::DirectoryFilterOptions reject() diff --git a/src/plugins/quickopen/filesystemfilter.cpp b/src/plugins/quickopen/filesystemfilter.cpp index e8b39965f4b..99506b0760c 100644 --- a/src/plugins/quickopen/filesystemfilter.cpp +++ b/src/plugins/quickopen/filesystemfilter.cpp @@ -34,8 +34,8 @@ #include using namespace Core; -using namespace QuickOpen; -using namespace QuickOpen::Internal; +using namespace Locator; +using namespace Locator::Internal; FileSystemFilter::FileSystemFilter(EditorManager *editorManager, LocatorWidget *locatorWidget) : m_editorManager(editorManager), m_locatorWidget(locatorWidget), m_includeHidden(true) diff --git a/src/plugins/quickopen/filesystemfilter.h b/src/plugins/quickopen/filesystemfilter.h index cf3947f7d32..319637192a8 100644 --- a/src/plugins/quickopen/filesystemfilter.h +++ b/src/plugins/quickopen/filesystemfilter.h @@ -40,12 +40,12 @@ #include #include -namespace QuickOpen { +namespace Locator { namespace Internal { class LocatorWidget; -class FileSystemFilter : public QuickOpen::ILocatorFilter +class FileSystemFilter : public Locator::ILocatorFilter { Q_OBJECT @@ -53,9 +53,9 @@ public: FileSystemFilter(Core::EditorManager *editorManager, LocatorWidget *locatorWidget); QString trName() const { return tr("Files in file system"); } QString name() const { return "Files in file system"; } - QuickOpen::ILocatorFilter::Priority priority() const { return QuickOpen::ILocatorFilter::Medium; } - QList matchesFor(const QString &entry); - void accept(QuickOpen::FilterEntry selection) const; + Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::Medium; } + QList matchesFor(const QString &entry); + void accept(Locator::FilterEntry selection) const; QByteArray saveState() const; bool restoreState(const QByteArray &state); bool openConfigDialog(QWidget *parent, bool &needsRefresh); @@ -68,6 +68,6 @@ private: }; } // namespace Internal -} // namespace QuickOpen +} // namespace Locator #endif // FILESYSTEMFILTER_H diff --git a/src/plugins/quickopen/filesystemfilter.ui b/src/plugins/quickopen/filesystemfilter.ui index c9a3ed3a51b..0c56a860320 100644 --- a/src/plugins/quickopen/filesystemfilter.ui +++ b/src/plugins/quickopen/filesystemfilter.ui @@ -1,12 +1,12 @@ - QuickOpen::Internal::FileSystemFilterOptions - + Locator::Internal::FileSystemFilterOptions + 0 0 - 327 + 335 131 @@ -78,7 +78,7 @@ buttonBox accepted() - QuickOpen::Internal::FileSystemFilterOptions + Locator::Internal::FileSystemFilterOptions accept() @@ -94,7 +94,7 @@ buttonBox rejected() - QuickOpen::Internal::FileSystemFilterOptions + Locator::Internal::FileSystemFilterOptions reject() diff --git a/src/plugins/quickopen/ilocatorfilter.cpp b/src/plugins/quickopen/ilocatorfilter.cpp index 9098931211c..fb9c682eac5 100644 --- a/src/plugins/quickopen/ilocatorfilter.cpp +++ b/src/plugins/quickopen/ilocatorfilter.cpp @@ -36,7 +36,7 @@ #include #include -using namespace QuickOpen; +using namespace Locator; ILocatorFilter::ILocatorFilter(QObject *parent): QObject(parent), diff --git a/src/plugins/quickopen/ilocatorfilter.h b/src/plugins/quickopen/ilocatorfilter.h index 008ae237382..4957eecd053 100644 --- a/src/plugins/quickopen/ilocatorfilter.h +++ b/src/plugins/quickopen/ilocatorfilter.h @@ -37,7 +37,7 @@ #include #include -namespace QuickOpen { +namespace Locator { class ILocatorFilter; @@ -151,6 +151,6 @@ private: bool m_hidden; }; -} // namespace QuickOpen +} // namespace Locator #endif // ILOCATORFILTER_H diff --git a/src/plugins/quickopen/locatorfiltersfilter.cpp b/src/plugins/quickopen/locatorfiltersfilter.cpp index cd2e3624691..4b81b73e5d3 100644 --- a/src/plugins/quickopen/locatorfiltersfilter.cpp +++ b/src/plugins/quickopen/locatorfiltersfilter.cpp @@ -33,8 +33,8 @@ #include -using namespace QuickOpen; -using namespace QuickOpen::Internal; +using namespace Locator; +using namespace Locator::Internal; Q_DECLARE_METATYPE(ILocatorFilter*); diff --git a/src/plugins/quickopen/locatorfiltersfilter.h b/src/plugins/quickopen/locatorfiltersfilter.h index 747fb36d98c..622b653f1a8 100644 --- a/src/plugins/quickopen/locatorfiltersfilter.h +++ b/src/plugins/quickopen/locatorfiltersfilter.h @@ -34,14 +34,14 @@ #include -namespace QuickOpen { +namespace Locator { namespace Internal { class LocatorPlugin; class LocatorWidget; /*! - This filter provides the user with the list of available QuickOpen filters. + This filter provides the user with the list of available Locator filters. The list is only shown when nothing has been typed yet. */ class LocatorFiltersFilter : public ILocatorFilter @@ -68,6 +68,6 @@ private: }; } // namespace Internal -} // namespace QuickOpen +} // namespace Locator #endif // LOCATORFILTERSFILTER_H diff --git a/src/plugins/quickopen/locatormanager.cpp b/src/plugins/quickopen/locatormanager.cpp index 2c1e552baed..d1df7d8746f 100644 --- a/src/plugins/quickopen/locatormanager.cpp +++ b/src/plugins/quickopen/locatormanager.cpp @@ -33,8 +33,8 @@ #include #include -using namespace QuickOpen; -using namespace QuickOpen::Internal; +using namespace Locator; +using namespace Locator::Internal; LocatorManager *LocatorManager::m_instance = 0; diff --git a/src/plugins/quickopen/locatormanager.h b/src/plugins/quickopen/locatormanager.h index 5f00bb5d896..d3f296c85e7 100644 --- a/src/plugins/quickopen/locatormanager.h +++ b/src/plugins/quickopen/locatormanager.h @@ -34,7 +34,7 @@ #include -namespace QuickOpen { +namespace Locator { namespace Internal { class LocatorWidget; @@ -57,6 +57,6 @@ private: static LocatorManager *m_instance; }; -} // namespace QuickOpen +} // namespace Locator #endif // LOCATORMANAGER_H diff --git a/src/plugins/quickopen/locatorplugin.cpp b/src/plugins/quickopen/locatorplugin.cpp index c3eb56bdff5..5c9bb715336 100644 --- a/src/plugins/quickopen/locatorplugin.cpp +++ b/src/plugins/quickopen/locatorplugin.cpp @@ -52,16 +52,16 @@ #include /*! - \namespace QuickOpen - The QuickOpen namespace provides the hooks for Locator content. + \namespace Locator + The Locator namespace provides the hooks for Locator content. */ /*! - \namespace QuickOpen::Internal + \namespace Locator::Internal \internal */ -using namespace QuickOpen; -using namespace QuickOpen::Internal; +using namespace Locator; +using namespace Locator::Internal; namespace { static bool filterLessThan(const ILocatorFilter *first, const ILocatorFilter *second) @@ -245,7 +245,7 @@ void LocatorPlugin::refresh(QList filters) QFuture task = QtConcurrent::run(&ILocatorFilter::refresh, filters); Core::FutureProgress *progress = Core::ICore::instance() ->progressManager()->addTask(task, tr("Indexing"), - QuickOpen::Constants::TASK_INDEX, + Locator::Constants::TASK_INDEX, Core::ProgressManager::CloseOnSuccess); connect(progress, SIGNAL(finished()), this, SLOT(saveSettings())); } diff --git a/src/plugins/quickopen/locatorplugin.h b/src/plugins/quickopen/locatorplugin.h index d51f8429bc9..525f291f4ad 100644 --- a/src/plugins/quickopen/locatorplugin.h +++ b/src/plugins/quickopen/locatorplugin.h @@ -39,7 +39,7 @@ #include #include -namespace QuickOpen { +namespace Locator { namespace Internal { class LocatorWidget; @@ -121,6 +121,6 @@ void LocatorPlugin::loadSettingsHelper(S *settings) } } // namespace Internal -} // namespace QuickOpen +} // namespace Locator #endif // LOCATORPLUGIN_H diff --git a/src/plugins/quickopen/locatorwidget.cpp b/src/plugins/quickopen/locatorwidget.cpp index 88106647037..189fc57dae4 100644 --- a/src/plugins/quickopen/locatorwidget.cpp +++ b/src/plugins/quickopen/locatorwidget.cpp @@ -29,12 +29,12 @@ #include -namespace QuickOpen { +namespace Locator { struct FilterEntry; } QT_BEGIN_NAMESPACE -unsigned int qHash(const QuickOpen::FilterEntry &entry); +unsigned int qHash(const Locator::FilterEntry &entry); QT_END_NAMESPACE #include "locatorwidget.h" @@ -67,13 +67,13 @@ QT_END_NAMESPACE #include #include -Q_DECLARE_METATYPE(QuickOpen::ILocatorFilter*); -Q_DECLARE_METATYPE(QuickOpen::FilterEntry); +Q_DECLARE_METATYPE(Locator::ILocatorFilter*); +Q_DECLARE_METATYPE(Locator::FilterEntry); -namespace QuickOpen { +namespace Locator { namespace Internal { -/*! A model to represent the QuickOpen results. */ +/*! A model to represent the Locator results. */ class LocatorModel : public QAbstractListModel { public: @@ -107,10 +107,10 @@ private: }; } // namespace Internal -} // namespace QuickOpen +} // namespace Locator -using namespace QuickOpen; -using namespace QuickOpen::Internal; +using namespace Locator; +using namespace Locator::Internal; QT_BEGIN_NAMESPACE uint qHash(const FilterEntry &entry) @@ -122,7 +122,7 @@ uint qHash(const FilterEntry &entry) QT_END_NAMESPACE -// =========== QuickOpenModel =========== +// =========== LocatorModel =========== int LocatorModel::rowCount(const QModelIndex & /* parent */) const { @@ -135,7 +135,7 @@ int LocatorModel::columnCount(const QModelIndex &parent) const } /*! - * When asked for the icon via Qt::DecorationRole, the QuickOpenModel lazily + * When asked for the icon via Qt::DecorationRole, the LocatorModel lazily * resolves and caches the Greehouse-specific file icon when * FilterEntry::resolveFileIcon is true. FilterEntry::internalData is assumed * to be the filename. @@ -174,7 +174,7 @@ void LocatorModel::setEntries(const QList &entries) reset(); } #if 0 -void QuickOpenModel::setDisplayCount(int count) +void LocatorModel::setDisplayCount(int count) { // TODO: This method is meant to be used for increasing the number of items displayed at the // user's request. There is however no way yet for the user to request this. @@ -484,6 +484,6 @@ void LocatorWidget::showEvent(QShowEvent *event) void LocatorWidget::showConfigureDialog() { - Core::ICore::instance()->showOptionsDialog(Constants::QUICKOPEN_CATEGORY, + Core::ICore::instance()->showOptionsDialog(Constants::LOCATOR_CATEGORY, Constants::FILTER_OPTIONS_PAGE); } diff --git a/src/plugins/quickopen/locatorwidget.h b/src/plugins/quickopen/locatorwidget.h index f259d85e165..4fefd4cb12f 100644 --- a/src/plugins/quickopen/locatorwidget.h +++ b/src/plugins/quickopen/locatorwidget.h @@ -47,7 +47,7 @@ namespace Utils { class FancyLineEdit; } -namespace QuickOpen { +namespace Locator { namespace Internal { class LocatorModel; @@ -92,6 +92,6 @@ private: }; } // namespace Internal -} // namespace QuickOpen +} // namespace Locator #endif // LOCATORWIDGET_H diff --git a/src/plugins/quickopen/opendocumentsfilter.cpp b/src/plugins/quickopen/opendocumentsfilter.cpp index 5f7b091e0c8..a85da7fee97 100644 --- a/src/plugins/quickopen/opendocumentsfilter.cpp +++ b/src/plugins/quickopen/opendocumentsfilter.cpp @@ -32,8 +32,8 @@ Q_DECLARE_METATYPE(Core::IEditor*); using namespace Core; -using namespace QuickOpen; -using namespace QuickOpen::Internal; +using namespace Locator; +using namespace Locator::Internal; OpenDocumentsFilter::OpenDocumentsFilter(EditorManager *editorManager) : m_editorManager(editorManager) diff --git a/src/plugins/quickopen/opendocumentsfilter.h b/src/plugins/quickopen/opendocumentsfilter.h index 189fa091573..fc040971f7c 100644 --- a/src/plugins/quickopen/opendocumentsfilter.h +++ b/src/plugins/quickopen/opendocumentsfilter.h @@ -41,10 +41,10 @@ #include #include -namespace QuickOpen { +namespace Locator { namespace Internal { -class OpenDocumentsFilter : public QuickOpen::ILocatorFilter +class OpenDocumentsFilter : public Locator::ILocatorFilter { Q_OBJECT @@ -52,9 +52,9 @@ public: OpenDocumentsFilter(Core::EditorManager *editorManager); QString trName() const { return tr("Open documents"); } QString name() const { return "Open documents"; } - QuickOpen::ILocatorFilter::Priority priority() const { return QuickOpen::ILocatorFilter::Medium; } - QList matchesFor(const QString &entry); - void accept(QuickOpen::FilterEntry selection) const; + Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::Medium; } + QList matchesFor(const QString &entry); + void accept(Locator::FilterEntry selection) const; void refresh(QFutureInterface &future); public slots: @@ -67,6 +67,6 @@ private: }; } // namespace Internal -} // namespace QuickOpen +} // namespace Locator #endif // OPENDOCUMENTSFILTER_H diff --git a/src/plugins/quickopen/quickopenconstants.h b/src/plugins/quickopen/quickopenconstants.h index 37b30db9e1a..4a78341f79e 100644 --- a/src/plugins/quickopen/quickopenconstants.h +++ b/src/plugins/quickopen/quickopenconstants.h @@ -27,19 +27,19 @@ ** **************************************************************************/ -#ifndef QUICKOPENCONSTANTS_H -#define QUICKOPENCONSTANTS_H +#ifndef LOCATORCONSTANTS_H +#define LOCATORCONSTANTS_H #include -namespace QuickOpen { +namespace Locator { namespace Constants { const char * const FILTER_OPTIONS_PAGE = QT_TRANSLATE_NOOP("Locator", "Filters"); -const char * const QUICKOPEN_CATEGORY = QT_TRANSLATE_NOOP("Locator", "Locator"); -const char * const TASK_INDEX = "QuickOpen.Task.Index"; +const char * const LOCATOR_CATEGORY = QT_TRANSLATE_NOOP("Locator", "Locator"); +const char * const TASK_INDEX = "Locator.Task.Index"; } // namespace Constants -} // namespace QuickOpen +} // namespace Locator -#endif // QUICKOPENCONSTANTS_H +#endif // LOCATORCONSTANTS_H diff --git a/src/plugins/quickopen/settingspage.cpp b/src/plugins/quickopen/settingspage.cpp index 7171b559024..4d921133b04 100644 --- a/src/plugins/quickopen/settingspage.cpp +++ b/src/plugins/quickopen/settingspage.cpp @@ -39,10 +39,10 @@ #include -Q_DECLARE_METATYPE(QuickOpen::ILocatorFilter*) +Q_DECLARE_METATYPE(Locator::ILocatorFilter*) -using namespace QuickOpen; -using namespace QuickOpen::Internal; +using namespace Locator; +using namespace Locator::Internal; SettingsPage::SettingsPage(LocatorPlugin *plugin) : m_plugin(plugin), m_page(0) @@ -56,17 +56,17 @@ QString SettingsPage::id() const QString SettingsPage::trName() const { - return QCoreApplication::translate("Locator", QuickOpen::Constants::FILTER_OPTIONS_PAGE); + return QCoreApplication::translate("Locator", Locator::Constants::FILTER_OPTIONS_PAGE); } QString SettingsPage::category() const { - return Constants::QUICKOPEN_CATEGORY; + return Constants::LOCATOR_CATEGORY; } QString SettingsPage::trCategory() const { - return QCoreApplication::translate("Locator", QuickOpen::Constants::QUICKOPEN_CATEGORY); + return QCoreApplication::translate("Locator", Locator::Constants::LOCATOR_CATEGORY); } QWidget *SettingsPage::createPage(QWidget *parent) diff --git a/src/plugins/quickopen/settingspage.h b/src/plugins/quickopen/settingspage.h index 685f0522242..1fb55661e0f 100644 --- a/src/plugins/quickopen/settingspage.h +++ b/src/plugins/quickopen/settingspage.h @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE class QListWidgetItem; QT_END_NAMESPACE -namespace QuickOpen { +namespace Locator { class ILocatorFilter; @@ -88,6 +88,6 @@ private: }; } // namespace Internal -} // namespace QuickOpen +} // namespace Locator #endif // SETTINGSPAGE_H diff --git a/src/plugins/quickopen/settingspage.ui b/src/plugins/quickopen/settingspage.ui index 06d3116f08a..f2f055c57b6 100644 --- a/src/plugins/quickopen/settingspage.ui +++ b/src/plugins/quickopen/settingspage.ui @@ -1,7 +1,7 @@ - QuickOpen::Internal::SettingsWidget - + Locator::Internal::SettingsWidget + 0 @@ -91,9 +91,6 @@ QAbstractSpinBox::PlusMinus - - 60 - min @@ -103,6 +100,9 @@ 5 + + 60 + diff --git a/src/plugins/texteditor/linenumberfilter.cpp b/src/plugins/texteditor/linenumberfilter.cpp index 98518df05a0..e4eccecdf42 100644 --- a/src/plugins/texteditor/linenumberfilter.cpp +++ b/src/plugins/texteditor/linenumberfilter.cpp @@ -35,7 +35,7 @@ #include using namespace Core; -using namespace QuickOpen; +using namespace Locator; using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/linenumberfilter.h b/src/plugins/texteditor/linenumberfilter.h index a9a77f00df6..9147908eed1 100644 --- a/src/plugins/texteditor/linenumberfilter.h +++ b/src/plugins/texteditor/linenumberfilter.h @@ -42,7 +42,7 @@ class ITextEditor; namespace Internal { -class LineNumberFilter : public QuickOpen::ILocatorFilter +class LineNumberFilter : public Locator::ILocatorFilter { Q_OBJECT @@ -51,9 +51,9 @@ public: QString trName() const { return tr("Line in current document"); } QString name() const { return "Line in current document"; } - QuickOpen::ILocatorFilter::Priority priority() const { return QuickOpen::ILocatorFilter::High; } - QList matchesFor(const QString &entry); - void accept(QuickOpen::FilterEntry selection) const; + Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::High; } + QList matchesFor(const QString &entry); + void accept(Locator::FilterEntry selection) const; void refresh(QFutureInterface &) {} private: diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index 727d08d4d6c..ffa93436871 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -360,7 +360,7 @@ void TextEditorActionHandler::updateCopyAction() void TextEditorActionHandler::gotoAction() { - QuickOpen::LocatorManager *locatorManager = QuickOpen::LocatorManager::instance(); + Locator::LocatorManager *locatorManager = Locator::LocatorManager::instance(); QTC_ASSERT(locatorManager, return); const QString shortcut = TextEditorPlugin::instance()->lineNumberFilter()->shortcutString(); const QString text = tr(" ");