Utils: Merge FilterLineEdit into FancyLineEdit

Change-Id: Ic53836dade3985c36b0f6767e43b5af0ddb80d72
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

19 files changed, 39 insertions, 63 deletions

diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp
index 53a96cbab4..0b31e5cfb3 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp
@@ -59,6 +59,9 @@ QWidget *CommandMappings::widget()
         m_page->targetEdit->setAutoHideButton(Utils::FancyLineEdit::Right, true);
         m_page->targetEdit->setPlaceholderText(QString());
         m_page->targetEdit->installEventFilter(this);
+        m_page->targetEdit->setFiltering(true);
+
+        m_page->filterEdit->setFiltering(true);
 
         connect(m_page->targetEdit, SIGNAL(buttonClicked(Utils::FancyLineEdit::Side)),
             this, SLOT(removeTargetIdentifier()));
diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.ui b/src/plugins/coreplugin/actionmanager/commandmappings.ui
index ee4f1119cd..3eabb66bdf 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.ui
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.ui
@@ -20,7 +20,7 @@
       <item>
        <layout class="QHBoxLayout">
         <item>
-         <widget class="Utils::FilterLineEdit" name="filterEdit"/>
+         <widget class="Utils::FancyLineEdit" name="filterEdit"/>
         </item>
        </layout>
       </item>
@@ -115,7 +115,7 @@
          </widget>
         </item>
         <item>
-         <widget class="Utils::FilterLineEdit" name="targetEdit"/>
+         <widget class="Utils::FancyLineEdit" name="targetEdit"/>
         </item>
         <item>
          <widget class="QPushButton" name="resetButton">
@@ -159,11 +159,6 @@
    <extends>QLineEdit</extends>
    <header location="global">utils/fancylineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>Utils::FilterLineEdit</class>
-   <extends>Utils::FancyLineEdit</extends>
-   <header location="global">utils/filterlineedit.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
index e2de47cf98..c28f390766 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -33,7 +33,7 @@
 
 #include <extensionsystem/pluginmanager.h>
 #include <utils/hostosinfo.h>
-#include <utils/filterlineedit.h>
+#include <utils/fancylineedit.h>
 
 #include <QApplication>
 #include <QDialogButtonBox>
@@ -304,7 +304,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
     m_proxyModel(new CategoryFilterModel(this)),
     m_model(new CategoryModel(this)),
     m_stackedLayout(new QStackedLayout),
-    m_filterLineEdit(new Utils::FilterLineEdit),
+    m_filterLineEdit(new Utils::FancyLineEdit),
     m_categoryList(new CategoryListView),
     m_headerLabel(new QLabel),
     m_running(false),
@@ -312,6 +312,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
     m_finished(false)
 {
     m_applied = false;
+    m_filterLineEdit->setFiltering(true);
 
     createGui();
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.h b/src/plugins/coreplugin/dialogs/settingsdialog.h
index ce0d62de40..0809f25b20 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.h
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.h
@@ -45,7 +45,7 @@ class QLabel;
 class QListView;
 QT_END_NAMESPACE
 
-namespace Utils { class FilterLineEdit; }
+namespace Utils { class FancyLineEdit; }
 
 namespace Core {
 namespace Internal {
@@ -99,7 +99,7 @@ private:
     Id m_currentCategory;
     Id m_currentPage;
     QStackedLayout *m_stackedLayout;
-    Utils::FilterLineEdit *m_filterLineEdit;
+    Utils::FancyLineEdit *m_filterLineEdit;
     QListView *m_categoryList;
     QLabel *m_headerLabel;
     bool m_running;
diff --git a/src/plugins/coreplugin/find/finddialog.ui b/src/plugins/coreplugin/find/finddialog.ui
index 19d41c938c..1f3c900b3f 100644
--- a/src/plugins/coreplugin/find/finddialog.ui
+++ b/src/plugins/coreplugin/find/finddialog.ui
@@ -171,7 +171,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="Utils::FilterLineEdit" name="searchTerm"/>
+    <widget class="Utils::FancyLineEdit" name="searchTerm"/>
    </item>
    <item row="3" column="0" colspan="2">
     <widget class="QWidget" name="configWidget" native="true">
@@ -191,11 +191,6 @@
    <extends>QLineEdit</extends>
    <header location="global">utils/fancylineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>Utils::FilterLineEdit</class>
-   <extends>Utils::FancyLineEdit</extends>
-   <header location="global">utils/filterlineedit.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>filterList</tabstop>
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index e686c3fd48..69861b648f 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -104,6 +104,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     m_ui.findEdit->setButtonMenu(Utils::FancyLineEdit::Left, lineEditMenu);
     m_ui.findEdit->setButtonVisible(Utils::FancyLineEdit::Left, true);
     m_ui.findEdit->setPlaceholderText(QString());
+    m_ui.findEdit->setFiltering(true);
     m_ui.replaceEdit->setPlaceholderText(QString());
 
     connect(m_ui.findEdit, SIGNAL(textChanged(QString)), this, SLOT(invokeFindIncremental()));
diff --git a/src/plugins/coreplugin/find/findwidget.ui b/src/plugins/coreplugin/find/findwidget.ui
index 4472102781..1278a8f8d7 100644
--- a/src/plugins/coreplugin/find/findwidget.ui
+++ b/src/plugins/coreplugin/find/findwidget.ui
@@ -40,7 +40,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="Utils::FilterLineEdit" name="findEdit">
+    <widget class="Utils::FancyLineEdit" name="findEdit">
      <property name="minimumSize">
       <size>
        <width>100</width>
@@ -137,7 +137,7 @@
       <number>0</number>
      </property>
      <item>
-      <widget class="Utils::FilterLineEdit" name="replaceEdit">
+      <widget class="Utils::FancyLineEdit" name="replaceEdit">
        <property name="minimumSize">
         <size>
          <width>100</width>
@@ -275,11 +275,6 @@
    <extends>QLineEdit</extends>
    <header location="global">utils/fancylineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>Utils::FilterLineEdit</class>
-   <extends>Utils::FancyLineEdit</extends>
-   <header location="global">utils/filterlineedit.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>findEdit</tabstop>
diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp
index 19a5cd38b1..66ee96094a 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.cpp
+++ b/src/plugins/coreplugin/locator/locatorwidget.cpp
@@ -40,7 +40,7 @@
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/icontext.h>
 #include <utils/appmainwindow.h>
-#include <utils/filterlineedit.h>
+#include <utils/fancylineedit.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 #include <utils/runextensions.h>
@@ -224,7 +224,7 @@ LocatorWidget::LocatorWidget(Locator *qop) :
     m_filterMenu(new QMenu(this)),
     m_refreshAction(new QAction(tr("Refresh"), this)),
     m_configureAction(new QAction(tr("Configure..."), this)),
-    m_fileLineEdit(new Utils::FilterLineEdit),
+    m_fileLineEdit(new Utils::FancyLineEdit),
     m_updateRequested(false),
     m_acceptRequested(false),
     m_possibleToolTipRequest(false)
@@ -248,6 +248,7 @@ LocatorWidget::LocatorWidget(Locator *qop) :
 
     setWindowIcon(QIcon(QLatin1String(":/locator/images/locator.png")));
     const QPixmap image = QPixmap(QLatin1String(Core::Constants::ICON_MAGNIFIER));
+    m_fileLineEdit->setFiltering(true);
     m_fileLineEdit->setButtonPixmap(Utils::FancyLineEdit::Left, image);
     m_fileLineEdit->setButtonToolTip(Utils::FancyLineEdit::Left, tr("Options"));
     m_fileLineEdit->setFocusPolicy(Qt::ClickFocus);
diff --git a/src/plugins/coreplugin/locator/locatorwidget.h b/src/plugins/coreplugin/locator/locatorwidget.h
index 491d5a112f..a7e6021f6b 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.h
+++ b/src/plugins/coreplugin/locator/locatorwidget.h
@@ -42,7 +42,7 @@ class QMenu;
 class QTreeView;
 QT_END_NAMESPACE
 
-namespace Utils { class FilterLineEdit; }
+namespace Utils { class FancyLineEdit; }
 
 namespace Core {
 namespace Internal {
@@ -90,7 +90,7 @@ private:
     QMenu *m_filterMenu;
     QAction *m_refreshAction;
     QAction *m_configureAction;
-    Utils::FilterLineEdit *m_fileLineEdit;
+    Utils::FancyLineEdit *m_fileLineEdit;
     QTimer *m_showPopupTimer;
     QFutureWatcher<LocatorFilterEntry> *m_entriesWatcher;
     QMap<Core::Id, QAction *> m_filterActionMap;
diff --git a/src/plugins/git/gerrit/gerritdialog.cpp b/src/plugins/git/gerrit/gerritdialog.cpp
index 58e402bc5a..2cf712dc56 100644
--- a/src/plugins/git/gerrit/gerritdialog.cpp
+++ b/src/plugins/git/gerrit/gerritdialog.cpp
@@ -57,11 +57,12 @@ static const int layoutSpacing  = 5;
 static const int maxTitleWidth = 350;
 
 QueryValidatingLineEdit::QueryValidatingLineEdit(QWidget *parent)
-    : Utils::FilterLineEdit(parent)
+    : Utils::FancyLineEdit(parent)
     , m_valid(true)
     , m_okTextColor(palette().color(QPalette::Active, QPalette::Text))
     , m_errorTextColor(Qt::red)
 {
+    setFiltering(true);
     connect(this, SIGNAL(textChanged(QString)), this, SLOT(setValid()));
 }
 
@@ -98,7 +99,7 @@ GerritDialog::GerritDialog(const QSharedPointer<GerritParameters> &p,
     , m_treeView(new QTreeView)
     , m_detailsBrowser(new QTextBrowser)
     , m_queryLineEdit(new QueryValidatingLineEdit)
-    , m_filterLineEdit(new Utils::FilterLineEdit)
+    , m_filterLineEdit(new Utils::FancyLineEdit)
     , m_repositoryChooser(new Utils::PathChooser)
     , m_buttonBox(new QDialogButtonBox(QDialogButtonBox::Close))
     , m_repositoryChooserLabel(new QLabel(tr("Apply in:") + QLatin1Char(' '), this))
@@ -123,6 +124,7 @@ GerritDialog::GerritDialog(const QSharedPointer<GerritParameters> &p,
     filterLayout->addWidget(m_queryLineEdit);
     filterLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::MinimumExpanding, QSizePolicy::Ignored));
     m_filterLineEdit->setFixedWidth(300);
+    m_filterLineEdit->setFiltering(true);
     filterLayout->addWidget(m_filterLineEdit);
     connect(m_filterLineEdit, SIGNAL(filterChanged(QString)),
             m_filterModel, SLOT(setFilterFixedString(QString)));
diff --git a/src/plugins/git/gerrit/gerritdialog.h b/src/plugins/git/gerrit/gerritdialog.h
index 1a7fc3d532..ebb1fcf0b5 100644
--- a/src/plugins/git/gerrit/gerritdialog.h
+++ b/src/plugins/git/gerrit/gerritdialog.h
@@ -30,7 +30,7 @@
 #ifndef GERRIT_INTERNAL_GERRITDIALOG_H
 #define GERRIT_INTERNAL_GERRITDIALOG_H
 
-#include <utils/filterlineedit.h>
+#include <utils/fancylineedit.h>
 #include <utils/pathchooser.h>
 
 #include <QDialog>
@@ -54,7 +54,7 @@ class GerritParameters;
 class GerritModel;
 class GerritChange;
 
-class QueryValidatingLineEdit : public Utils::FilterLineEdit
+class QueryValidatingLineEdit : public Utils::FancyLineEdit
 {
     Q_OBJECT
 
@@ -117,7 +117,7 @@ private:
     QTreeView *m_treeView;
     QTextBrowser *m_detailsBrowser;
     QueryValidatingLineEdit *m_queryLineEdit;
-    Utils::FilterLineEdit *m_filterLineEdit;
+    Utils::FancyLineEdit *m_filterLineEdit;
     Utils::PathChooser *m_repositoryChooser;
     QDialogButtonBox *m_buttonBox;
     QPushButton *m_displayButton;
diff --git a/src/plugins/git/gitorious/gitoriousprojectwidget.ui b/src/plugins/git/gitorious/gitoriousprojectwidget.ui
index 822cd5993c..b72c1bf610 100644
--- a/src/plugins/git/gitorious/gitoriousprojectwidget.ui
+++ b/src/plugins/git/gitorious/gitoriousprojectwidget.ui
@@ -49,7 +49,7 @@
     </widget>
    </item>
    <item row="0" column="0">
-    <widget class="Utils::FilterLineEdit" name="filterLineEdit"/>
+    <widget class="Utils::FancyLineEdit" name="filterLineEdit"/>
    </item>
   </layout>
  </widget>
@@ -59,11 +59,6 @@
    <extends>QLineEdit</extends>
    <header location="global">utils/fancylineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>Utils::FilterLineEdit</class>
-   <extends>Utils::FancyLineEdit</extends>
-   <header location="global">utils/filterlineedit.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.ui b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.ui
index 057f513c8f..f1d46bc02c 100644
--- a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.ui
+++ b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="Utils::FilterLineEdit" name="filterLineEdit">
+    <widget class="Utils::FancyLineEdit" name="filterLineEdit">
      <property name="focusPolicy">
       <enum>Qt::ClickFocus</enum>
      </property>
@@ -32,11 +32,6 @@
    <extends>QLineEdit</extends>
    <header location="global">utils/fancylineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>Utils::FilterLineEdit</class>
-   <extends>Utils::FancyLineEdit</extends>
-   <header location="global">utils/filterlineedit.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>filterLineEdit</tabstop>
diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp
index 644e0001cd..f0df45edf6 100644
--- a/src/plugins/git/stashdialog.cpp
+++ b/src/plugins/git/stashdialog.cpp
@@ -115,6 +115,7 @@ StashDialog::StashDialog(QWidget *parent) :
     setAttribute(Qt::WA_DeleteOnClose, true);  // Do not update unnecessarily
 
     ui->setupUi(this);
+    ui->filterLineEdit->setFiltering(true);
     // Buttons
     ui->buttonBox->addButton(m_showCurrentButton, QDialogButtonBox::ActionRole);
     connect(m_showCurrentButton, SIGNAL(clicked()), this, SLOT(showCurrent()));
diff --git a/src/plugins/git/stashdialog.ui b/src/plugins/git/stashdialog.ui
index 3231755701..cbece9c6c6 100644
--- a/src/plugins/git/stashdialog.ui
+++ b/src/plugins/git/stashdialog.ui
@@ -24,7 +24,7 @@
       </widget>
      </item>
      <item>
-      <widget class="Utils::FilterLineEdit" name="filterLineEdit"/>
+      <widget class="Utils::FancyLineEdit" name="filterLineEdit"/>
      </item>
      <item>
       <widget class="QTreeView" name="stashView"/>
@@ -49,11 +49,6 @@
    <extends>QLineEdit</extends>
    <header location="global">utils/fancylineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>Utils::FilterLineEdit</class>
-   <extends>Utils::FancyLineEdit</extends>
-   <header location="global">utils/filterlineedit.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections>
diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
index c31a8fb7a5..f6105e41b8 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
+++ b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
@@ -32,7 +32,7 @@
 #include <projectexplorer/kitchooser.h>
 #include <projectexplorer/kitinformation.h>
 
-#include <utils/filterlineedit.h>
+#include <utils/fancylineedit.h>
 #include <utils/qtcassert.h>
 
 #include <QDialogButtonBox>
@@ -115,7 +115,7 @@ public:
 
     QTreeView *procView;
     QTextBrowser *errorText;
-    FilterLineEdit *processFilterLineEdit;
+    FancyLineEdit *processFilterLineEdit;
     QPushButton *updateListButton;
     QPushButton *killProcessButton;
     QPushButton *acceptButton;
@@ -135,10 +135,11 @@ DeviceProcessesDialogPrivate::DeviceProcessesDialogPrivate(KitChooser *chooser,
 
     processList = 0;
 
-    processFilterLineEdit = new FilterLineEdit(q);
+    processFilterLineEdit = new FancyLineEdit(q);
     processFilterLineEdit->setPlaceholderText(DeviceProcessesDialog::tr("Filter"));
     processFilterLineEdit->setFocus(Qt::TabFocusReason);
     processFilterLineEdit->setHistoryCompleter(QLatin1String("DeviceProcessDialogFilter"));
+    processFilterLineEdit->setFiltering(true);
 
     kitChooser->populate();
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index 4f73ead353..d3e15e01cd 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -115,12 +115,13 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
     connect(tabBar, SIGNAL(currentChanged(int)), this, SLOT(setCurrentIndexOfStackedWidget(int)));
     connect(tabBar, SIGNAL(currentChanged(int)), this, SLOT(updateSearch()));
 
-    m_filterLineEdit = new Utils::FilterLineEdit(this);
+    m_filterLineEdit = new Utils::FancyLineEdit(this);
     m_filterLineEdit->setObjectName(QLatin1String("itemLibrarySearchInput"));
     m_filterLineEdit->setPlaceholderText(tr("<Filter>", "Library search input hint text"));
     m_filterLineEdit->setDragEnabled(false);
     m_filterLineEdit->setMinimumWidth(75);
     m_filterLineEdit->setTextMargins(0, 0, 20, 0);
+    m_filterLineEdit->setFiltering(true);
     QWidget *lineEditFrame = new QWidget(this);
     lineEditFrame->setObjectName(QLatin1String("itemLibrarySearchInputFrame"));
     QGridLayout *lineEditLayout = new QGridLayout(lineEditFrame);
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
index 44ef45139e..bbbb7f1956 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
@@ -33,7 +33,7 @@
 #include "itemlibraryinfo.h"
 #include "itemlibrarycomponents.h"
 
-#include <utils/filterlineedit.h>
+#include <utils/fancylineedit.h>
 
 #include <QFrame>
 #include <QToolButton>
@@ -132,7 +132,7 @@ private:
 
     QWeakPointer<QStackedWidget> m_stackedWidget;
 
-    QWeakPointer<Utils::FilterLineEdit> m_filterLineEdit;
+    QWeakPointer<Utils::FancyLineEdit> m_filterLineEdit;
     QScopedPointer<QQuickView> m_itemsView;
     QScopedPointer<Internal::ItemLibraryTreeView> m_resourcesView;
 
diff --git a/src/plugins/vcsbase/nicknamedialog.ui b/src/plugins/vcsbase/nicknamedialog.ui
index 8cc4b2af45..35293e1bcf 100644
--- a/src/plugins/vcsbase/nicknamedialog.ui
+++ b/src/plugins/vcsbase/nicknamedialog.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="Utils::FilterLineEdit" name="filterLineEdit"/>
+    <widget class="Utils::FancyLineEdit" name="filterLineEdit"/>
    </item>
    <item>
     <widget class="QTreeView" name="filterTreeView"/>
@@ -38,11 +38,6 @@
    <extends>QLineEdit</extends>
    <header location="global">utils/fancylineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>Utils::FilterLineEdit</class>
-   <extends>Utils::FancyLineEdit</extends>
-   <header location="global">utils/filterlineedit.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections>