From: Peter Penz Date: Thu, 8 Feb 2007 20:33:49 +0000 (+0000) Subject: Fixed issue that the filterbar and the menu state have not been synchronized (a not... X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/ee4e21530b21efe7a3b6fa108ec186f553ed4b65?ds=sidebyside Fixed issue that the filterbar and the menu state have not been synchronized (a not existing signal name has been used) svn path=/trunk/playground/utils/dolphin/; revision=631709 --- diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 93cda320b..9b2286c87 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -116,7 +116,7 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow, m_filterBar->hide(); connect(m_filterBar, SIGNAL(filterChanged(const QString&)), this, SLOT(changeNameFilter(const QString&))); - connect(m_filterBar, SIGNAL(closed()), + connect(m_filterBar, SIGNAL(closeRequest()), this, SLOT(closeFilterBar())); m_topLayout->addWidget(m_urlNavigator); diff --git a/src/filterbar.cpp b/src/filterbar.cpp index 99616c29e..cdb1b713b 100644 --- a/src/filterbar.cpp +++ b/src/filterbar.cpp @@ -60,7 +60,7 @@ FilterBar::FilterBar(QWidget* parent) : 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" diff --git a/src/filterbar.h b/src/filterbar.h index b1d60232c..2dd02d28d 100644 --- a/src/filterbar.h +++ b/src/filterbar.h @@ -51,7 +51,7 @@ signals: /** * Emitted as soon as the filterbar should get closed. */ - void closed(); + void closeRequest(); protected: virtual void hideEvent(QHideEvent* event); @@ -59,7 +59,7 @@ protected: virtual void keyReleaseEvent(QKeyEvent* event); private slots: - void emitClose(); + void emitCloseRequest(); private: QLabel* m_filter;