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

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/plasma/layouts
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-01-13 8:18:27
Message-ID: 1200212307.060075.22173.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 760653 by aseigo:

to be easily usable outside of libplasma, signals need full namespace usage. we \
really ought to do a good review of libplasma for this issue


 M  +7 -8      layoutanimator.cpp  
 M  +2 -2      layoutanimator.h  


--- trunk/KDE/kdebase/workspace/libs/plasma/layouts/layoutanimator.cpp #760652:760653
@@ -113,11 +113,11 @@
     d->autoDeleteOnRemoval = autoDelete;
 
     if ( autoDelete ) { 
-        connect( this , SIGNAL(stateChanged(LayoutItem*,State,State)) , this , 
-                 SLOT(itemAutoDeleter(LayoutItem*,State,State)) );
+        connect( this , \
SIGNAL(stateChanged(Plasma::LayoutItem*,Plasma::LayoutAnimator::State,Plasma::LayoutAnimator::State)) \
, this ,  +                 \
SLOT(itemAutoDeleter(Plasma::LayoutItem*,Plasma::LayoutAnimator::State,Plasma::LayoutAnimator::State)) \
);  } else { 
-        disconnect( this , SIGNAL(stateChanged(LayoutItem*,State,State)) , this , 
-                SLOT(itemAutoDeleter(LayoutItem*,State,State)) );
+        disconnect( this , \
SIGNAL(stateChanged(Plasma::LayoutItem*,Plasma::LayoutAnimator::State,Plasma::LayoutAnimator::State)) \
, this ,  +                \
SLOT(itemAutoDeleter(Plasma::LayoutItem*,Plasma::LayoutAnimator::State,Plasma::LayoutAnimator::State)) \
);  } 
 }
 
@@ -126,7 +126,7 @@
     return d->autoDeleteOnRemoval;
 }
 
-void LayoutAnimator::itemAutoDeleter(LayoutItem *item , State oldState , State \
newState) +void LayoutAnimator::itemAutoDeleter(Plasma::LayoutItem *item, \
Plasma::LayoutAnimator::State oldState, Plasma::LayoutAnimator::State newState)  {
     if ( oldState == RemovedState && newState == DeadState ) {
         if ( item->graphicsItem() ) {
@@ -275,11 +275,10 @@
         case RemovedState:
                 d->states.remove(item);
                 d->geometries.remove(item);
-
-                emit stateChanged( item , RemovedState , DeadState );
+                emit stateChanged(item, RemovedState, DeadState);
             break;
         case StandardState:
-                    d->geometries[item].startGeometry = \
d->geometries[item].endGeometry; +                d->geometries[item].startGeometry = \
d->geometries[item].endGeometry;  break;
         default:
             Q_ASSERT(false);
--- trunk/KDE/kdebase/workspace/libs/plasma/layouts/layoutanimator.h #760652:760653
@@ -184,7 +184,7 @@
 
 Q_SIGNALS:
     /** This signal is emitted when the state of an item in the animator changes. */
-    void stateChanged( LayoutItem *item , State oldState , State newState );
+    void stateChanged(Plasma::LayoutItem *item, Plasma::LayoutAnimator::State \
oldState, Plasma::LayoutAnimator::State newState);  
 protected:
     virtual void updateItem( qreal value , LayoutItem* item );
@@ -192,7 +192,7 @@
 private Q_SLOTS:
     void valueChanged(qreal value);
     void animationCompleted();
-    void itemAutoDeleter( LayoutItem *item , State oldState , State newState );
+    void itemAutoDeleter(Plasma::LayoutItem *item, Plasma::LayoutAnimator::State \
oldState, Plasma::LayoutAnimator::State newState);  
 private:
     void moveEffectUpdateItem(qreal value,LayoutItem* item,Effect effect);


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