Rename QuickOpen namespace.

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

src/plugins/cpptools/cppcurrentdocumentfilter.cpp

@@ -58,11 +58,11 @@ CppCurrentDocumentFilter::CppCurrentDocumentFilter(CppModelManager *manager, Cor
             this,          SLOT(onEditorAboutToClose(Core::IEditor*)));
 }
 
-QList<QuickOpen::FilterEntry> CppCurrentDocumentFilter::matchesFor(const QString & origEntry)
+QList<Locator::FilterEntry> CppCurrentDocumentFilter::matchesFor(const QString & origEntry)
 {
     QString entry = trimWildcards(origEntry);
-    QList<QuickOpen::FilterEntry> goodEntries;
-    QList<QuickOpen::FilterEntry> betterEntries;
+    QList<Locator::FilterEntry> goodEntries;
+    QList<Locator::FilterEntry> betterEntries;
     QStringMatcher matcher(entry, Qt::CaseInsensitive);
     const QRegExp regexp("*"+entry+"*", Qt::CaseInsensitive, QRegExp::Wildcard);
     if (!regexp.isValid())
@@ -86,7 +86,7 @@ QList<QuickOpen::FilterEntry> 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<QuickOpen::FilterEntry> CppCurrentDocumentFilter::matchesFor(const QString
     return betterEntries;
 }
 
-void CppCurrentDocumentFilter::accept(QuickOpen::FilterEntry selection) const
+void CppCurrentDocumentFilter::accept(Locator::FilterEntry selection) const
 {
     ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData);
     TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line);

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<QuickOpen::FilterEntry> matchesFor(const QString &entry);
-    void accept(QuickOpen::FilterEntry selection) const;
+    QList<Locator::FilterEntry> matchesFor(const QString &entry);
+    void accept(Locator::FilterEntry selection) const;
     void refresh(QFutureInterface<void> &future);
 
 private slots:

src/plugins/cpptools/cpplocatorfilter.cpp

@@ -73,17 +73,17 @@ void CppLocatorFilter::refresh(QFutureInterface<void> &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<QuickOpen::FilterEntry> CppLocatorFilter::matchesFor(const QString &origEntry)
+QList<Locator::FilterEntry> CppLocatorFilter::matchesFor(const QString &origEntry)
 {
     QString entry = trimWildcards(origEntry);
-    QList<QuickOpen::FilterEntry> goodEntries;
-    QList<QuickOpen::FilterEntry> betterEntries;
+    QList<Locator::FilterEntry> goodEntries;
+    QList<Locator::FilterEntry> betterEntries;
     QStringMatcher matcher(entry, Qt::CaseInsensitive);
     const QRegExp regexp("*"+entry+"*", Qt::CaseInsensitive, QRegExp::Wildcard);
     if (!regexp.isValid())
@@ -108,7 +108,7 @@ QList<QuickOpen::FilterEntry> 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<QuickOpen::FilterEntry> 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<CppTools::Internal::ModelItemInfo>(selection.internalData);
     TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line);

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<QuickOpen::FilterEntry> matchesFor(const QString &entry);
-    void accept(QuickOpen::FilterEntry selection) const;
+    QList<Locator::FilterEntry> matchesFor(const QString &entry);
+    void accept(Locator::FilterEntry selection) const;
     void refresh(QFutureInterface<void> &future);
 
 protected:

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()));

src/plugins/designer/settingspage.h

@@ -63,6 +63,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QuickOpen
+} // namespace Designer
 
 #endif // DESIGNER_SETTINGSPAGE_H

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 <utils/qtcassert.h>
 
@@ -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<int, int> 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());

src/plugins/help/helpindexfilter.cpp

@@ -37,7 +37,7 @@
 #include <QtHelp/QHelpEngine>
 #include <QtHelp/QHelpIndexModel>
 
-using namespace QuickOpen;
+using namespace Locator;
 using namespace Help;
 using namespace Help::Internal;
 

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<QuickOpen::FilterEntry> matchesFor(const QString &entry);
-    void accept(QuickOpen::FilterEntry selection) const;
+    QList<Locator::FilterEntry> matchesFor(const QString &entry);
+    void accept(Locator::FilterEntry selection) const;
     void refresh(QFutureInterface<void> &future);
 
 signals:

src/plugins/projectexplorer/allprojectsfilter.cpp

@@ -35,7 +35,7 @@
 #include <QtCore/QVariant>
 
 using namespace Core;
-using namespace QuickOpen;
+using namespace Locator;
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
 

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<void> &future);
 
 protected:

src/plugins/projectexplorer/currentprojectfilter.cpp

@@ -38,7 +38,7 @@
 #include <QtCore/QVariant>
 
 using namespace Core;
-using namespace QuickOpen;
+using namespace Locator;
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
 

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<void> &future);
 
 protected:

src/plugins/quickopen/basefilefilter.cpp

@@ -35,7 +35,7 @@
 #include <QtCore/QStringMatcher>
 
 using namespace Core;
-using namespace QuickOpen;
+using namespace Locator;
 
 BaseFileFilter::BaseFileFilter()
   : m_forceNewSearchList(false)
@@ -85,12 +85,12 @@ QList<FilterEntry> 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());

src/plugins/quickopen/basefilefilter.h

@@ -36,16 +36,16 @@
 #include <QtCore/QString>
 #include <QtCore/QList>
 
-namespace QuickOpen {
+namespace Locator {
 
-class LOCATOR_EXPORT BaseFileFilter : public QuickOpen::ILocatorFilter
+class LOCATOR_EXPORT BaseFileFilter : public Locator::ILocatorFilter
 {
     Q_OBJECT
 
 public:
     BaseFileFilter();
-    QList<QuickOpen::FilterEntry> matchesFor(const QString &entry);
-    void accept(QuickOpen::FilterEntry selection) const;
+    QList<Locator::FilterEntry> 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

src/plugins/quickopen/directoryfilter.cpp

@@ -37,8 +37,8 @@
 
 #include <qtconcurrent/QtConcurrentTools>
 
-using namespace QuickOpen;
-using namespace QuickOpen::Internal;
+using namespace Locator;
+using namespace Locator::Internal;
 
 DirectoryFilter::DirectoryFilter()
   : m_name(tr("Generic Directory Filter")),

src/plugins/quickopen/directoryfilter.h

@@ -41,7 +41,7 @@
 #include <QtGui/QWidget>
 #include <QtGui/QDialog>
 
-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

src/plugins/quickopen/directoryfilter.ui

 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>QuickOpen::Internal::DirectoryFilterOptions</class>
- <widget class="QDialog" name="QuickOpen::Internal::DirectoryFilterOptions">
+ <class>Locator::Internal::DirectoryFilterOptions</class>
+ <widget class="QDialog" name="Locator::Internal::DirectoryFilterOptions">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>393</width>
-    <height>271</height>
+    <height>275</height>
    </rect>
   </property>
   <layout class="QGridLayout">
@@ -72,12 +72,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="checked">
-        <bool>false</bool>
-       </property>
        <property name="text">
         <string>Limit to prefix</string>
        </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
       </widget>
      </item>
      <item row="1" column="3">
@@ -161,7 +161,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>QuickOpen::Internal::DirectoryFilterOptions</receiver>
+   <receiver>Locator::Internal::DirectoryFilterOptions</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -177,7 +177,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>QuickOpen::Internal::DirectoryFilterOptions</receiver>
+   <receiver>Locator::Internal::DirectoryFilterOptions</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">

src/plugins/quickopen/filesystemfilter.cpp

@@ -34,8 +34,8 @@
 #include <QtCore/QDir>
 
 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)

src/plugins/quickopen/filesystemfilter.h

@@ -40,12 +40,12 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QFutureInterface>
 
-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<QuickOpen::FilterEntry> matchesFor(const QString &entry);
-    void accept(QuickOpen::FilterEntry selection) const;
+    Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::Medium; }
+    QList<Locator::FilterEntry> 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

src/plugins/quickopen/filesystemfilter.ui

 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>QuickOpen::Internal::FileSystemFilterOptions</class>
- <widget class="QDialog" name="QuickOpen::Internal::FileSystemFilterOptions">
+ <class>Locator::Internal::FileSystemFilterOptions</class>
+ <widget class="QDialog" name="Locator::Internal::FileSystemFilterOptions">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>327</width>
+    <width>335</width>
     <height>131</height>
    </rect>
   </property>
@@ -78,7 +78,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>QuickOpen::Internal::FileSystemFilterOptions</receiver>
+   <receiver>Locator::Internal::FileSystemFilterOptions</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -94,7 +94,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>QuickOpen::Internal::FileSystemFilterOptions</receiver>
+   <receiver>Locator::Internal::FileSystemFilterOptions</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">

src/plugins/quickopen/ilocatorfilter.cpp

@@ -36,7 +36,7 @@
 #include <QtGui/QLabel>
 #include <QtGui/QLineEdit>
 
-using namespace QuickOpen;
+using namespace Locator;
 
 ILocatorFilter::ILocatorFilter(QObject *parent):
     QObject(parent),

src/plugins/quickopen/ilocatorfilter.h

@@ -37,7 +37,7 @@
 #include <QtCore/QFutureInterface>
 #include <QtGui/QIcon>
 
-namespace QuickOpen {
+namespace Locator {
 
 class ILocatorFilter;
 
@@ -151,6 +151,6 @@ private:
     bool m_hidden;
 };
 
-} // namespace QuickOpen
+} // namespace Locator
 
 #endif // ILOCATORFILTER_H

src/plugins/quickopen/locatorfiltersfilter.cpp

@@ -33,8 +33,8 @@
 
 #include <coreplugin/coreconstants.h>
 
-using namespace QuickOpen;
-using namespace QuickOpen::Internal;
+using namespace Locator;