[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/desktop/containments/panel
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-06-24 21:49:55
Message-ID: 20100624214955.1DCCFAC8DD () svn ! kde ! org
[Download RAW message or body]

SVN commit 1142420 by aseigo:

disambiguate the signal (in the parent class) from the slot (in this class) names


 M  +5 -5      panel.cpp  
 M  +1 -1      panel.h  


--- trunk/KDE/kdebase/workspace/plasma/desktop/containments/panel/panel.cpp #1142419:1142420
@@ -119,7 +119,7 @@
     connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), this, SLOT(themeUpdated()));
 
     connect(this, SIGNAL(appletRemoved(Plasma::Applet*)),
-            this, SLOT(appletRemoved(Plasma::Applet*)));
+            this, SLOT(appletWasRemoved(Plasma::Applet*)));
     setContainmentType(Containment::PanelContainment);
 }
 
@@ -306,14 +306,14 @@
     QTimer::singleShot(0, this, SLOT(updateSize()));
 }
 
-void Panel::appletRemoved(Plasma::Applet* applet)
+void Panel::appletWasRemoved(Plasma::Applet* applet)
 {
+    disconnect(applet, SIGNAL(sizeHintChanged(Qt::SizeHint)), this, SLOT(delayedUpdateSize()));
+
     if (!m_layout) {
         return;
     }
 
-    disconnect(applet, SIGNAL(sizeHintChanged(Qt::SizeHint)), this, SLOT(delayedUpdateSize()));
-
     m_layout->removeItem(applet);
 
     //shrink the panel if possible
@@ -322,8 +322,8 @@
     } else {
         resize(size().width(), size().height() - applet->size().height());
     }
+
     m_layout->setMaximumSize(size());
-
     m_lastSpaceTimer->start(200);
 }
 
--- trunk/KDE/kdebase/workspace/plasma/desktop/containments/panel/panel.h #1142419:1142420
@@ -64,7 +64,7 @@
     void themeUpdated();
     void backgroundChanged();
     void layoutApplet(Plasma::Applet* applet, const QPointF &pos);
-    void appletRemoved(Plasma::Applet* applet);
+    void appletWasRemoved(Plasma::Applet* applet);
     void delayedUpdateSize();
     void updateSize();
     void adjustLastSpace();
[prev in list] [next in list] [prev in thread] [next in thread]