From kde-commits Thu Jan 24 22:07:37 2008 From: Sebastian Sauer Date: Thu, 24 Jan 2008 22:07:37 +0000 To: kde-commits Subject: branches/KDE/4.0/kdebase/workspace/plasma/applets/kickoff (silent) Message-Id: <1201212457.036402.21060.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=120121246526779 SVN commit 765925 by sebsauer: uh, what a good sample for doing something not needed. So, use the same solution r761346 uses since we don't need to be bc here :-/ SVN_SILENT M +1 -1 applet/applet.cpp M +0 -5 ui/launcher.cpp M +3 -6 ui/launcher.h --- branches/KDE/4.0/kdebase/workspace/plasma/applets/kickoff/applet/applet.cpp #765924:765925 @@ -176,7 +176,7 @@ d->launcher->setApplet(this); connect(d->launcher, SIGNAL(aboutToHide()), d->icon, SLOT(setUnpressed())); } - d->launcher->doFocusFavoritesView(); + d->launcher->focusFavoritesView(); // try to position the launcher alongside the top or bottom edge of the // applet with and aligned to the left or right of the applet --- branches/KDE/4.0/kdebase/workspace/plasma/applets/kickoff/ui/launcher.cpp #765924:765925 @@ -486,10 +486,5 @@ p.drawRect(rect().adjusted(0, 0, -1, -1)); } -void Launcher::doFocusFavoritesView() -{ - focusFavoritesView(); -} - #include "launcher.moc" --- branches/KDE/4.0/kdebase/workspace/plasma/applets/kickoff/ui/launcher.h #765924:765925 @@ -62,11 +62,6 @@ virtual bool eventFilter(QObject *object, QEvent *event); virtual QSize sizeHint() const; - /** This calls the \a focusFavoritesView() below and is only here to keep binary - compatibility. In KDE 4.1 the \a focusFavoritesView() below got just changed to - a public slot. */ - void doFocusFavoritesView(); - signals: void aboutToHide(); @@ -79,9 +74,11 @@ private Q_SLOTS: void focusSearchView(const QString& query); - void focusFavoritesView(); void showViewContextMenu(const QPoint& pos); +public Q_SLOTS: + void focusFavoritesView(); + private: class Private; Private * const d;