alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=760653
This commit is contained in:
Aaron J. Seigo 2008-01-13 08:18:26 +00:00
parent 6329570f8f
commit d191de06d3
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
layouts/layoutanimator.cpp
View File

@ -113,11 +113,11 @@ void LayoutAnimator::setAutoDeleteOnRemoval(bool autoDelete)
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 @@ bool LayoutAnimator::autoDeleteOnRemoval() const
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 @@ void LayoutAnimator::animationFinished(LayoutItem* item)
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);

4
layouts/layoutanimator.h
View File

@ -184,7 +184,7 @@ public:
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 @@ protected:
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);