From d8669c68e40a6571dfcbdf38e3281a4aeb8c2be6 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Fri, 8 Dec 2006 23:41:08 +0000 Subject: Cleanup of signal/slot handling between the dolphin view and the main window: now the main window listens to the signals from the dolphin view and connects to private slots (previously the dolphin view connected to public slots of the main window). Also prevent naming all slots by the prefix 'slot', describe instead what the method does. svn path=/trunk/playground/utils/dolphin/; revision=611617 --- src/filterbar.cpp | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'src/filterbar.cpp') diff --git a/src/filterbar.cpp b/src/filterbar.cpp index dda36c1c4..48624a26a 100644 --- a/src/filterbar.cpp +++ b/src/filterbar.cpp @@ -31,39 +31,36 @@ #include "dolphinmainwindow.h" -FilterBar::FilterBar(DolphinMainWindow* mainWindow, QWidget *parent, const char *name) : - QWidget(parent, name), - m_mainWindow(mainWindow) +FilterBar::FilterBar(QWidget* parent) : + QWidget(parent) { const int gap = 3; - QVBoxLayout* foo = new QVBoxLayout(this); - foo->setMargin(0); - foo->addSpacing(gap); + QVBoxLayout* vLayout = new QVBoxLayout(this); + vLayout->setMargin(0); + vLayout->addSpacing(gap); - QHBoxLayout* layout = new QHBoxLayout(foo); - layout->setMargin(0); - layout->addSpacing(gap); + QHBoxLayout* hLayout = new QHBoxLayout(vLayout); + hLayout->setMargin(0); + hLayout->addSpacing(gap); m_filter = new QLabel(i18n("Filter:"), this); - layout->addWidget(m_filter); - layout->addSpacing(KDialog::spacingHint()); + hLayout->addWidget(m_filter); + hLayout->addSpacing(KDialog::spacingHint()); m_filterInput = new KLineEdit(this); m_filter->setBuddy(m_filterInput); - layout->addWidget(m_filterInput); + hLayout->addWidget(m_filterInput); m_close = new QToolButton(this); m_close->setAutoRaise(true); m_close->setIcon(QIcon(SmallIcon("fileclose"))); - layout->addWidget(m_close); - layout->addSpacing(gap); + hLayout->addWidget(m_close); + hLayout->addSpacing(gap); connect(m_filterInput, SIGNAL(textChanged(const QString&)), this, SIGNAL(signalFilterChanged(const QString&))); - connect(m_close, SIGNAL(clicked()), this, SLOT(hide())); - connect(m_close, SIGNAL(clicked()), - mainWindow, SLOT(slotShowFilterBarChanged())); + connect(m_close, SIGNAL(clicked()), this, SLOT(emitClose())); } FilterBar::~FilterBar() @@ -89,9 +86,13 @@ void FilterBar::keyReleaseEvent(QKeyEvent* event) { QWidget::keyReleaseEvent(event); if ((event->key() == Qt::Key_Escape)) { - hide(); - m_mainWindow->slotShowFilterBarChanged(); + emitClose(); } } +void FilterBar::emitClose() +{ + emit close(); +} + #include "filterbar.moc" -- cgit v1.3