merge kdelibs-strigi: a new KFileMetaInfo implementation

[dolphin.git] / src / filterbar.cpp

diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index 99616c29e9175570c404a660d604a484734e1868..8708af3efef2f60f83a2c2080c57105485223d5b 100644 (file)
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -54,13 +54,13 @@ FilterBar::FilterBar(QWidget* parent) :
 
     m_close = new QToolButton(this);
     m_close->setAutoRaise(true);
-    m_close->setIcon(QIcon(SmallIcon("fileclose")));
+    m_close->setIcon(QIcon(SmallIcon("window-close")));
     hLayout->addWidget(m_close);
     hLayout->addSpacing(gap);
 
     connect(m_filterInput, SIGNAL(textChanged(const QString&)),
             this, SIGNAL(filterChanged(const QString&)));
-    connect(m_close, SIGNAL(clicked()), this, SLOT(emitClose()));
+    connect(m_close, SIGNAL(clicked()), this, SLOT(emitCloseRequest()));
 }
 
 FilterBar::~FilterBar()
@@ -86,13 +86,13 @@ void FilterBar::keyReleaseEvent(QKeyEvent* event)
 {
     QWidget::keyReleaseEvent(event);
     if ((event->key() == Qt::Key_Escape)) {
-        emitClose();
+        emitCloseRequest();
     }
 }
 
-void FilterBar::emitClose()
+void FilterBar::emitCloseRequest()
 {
-    emit close();
+    emit closeRequest();
 }
 
 #include "filterbar.moc"