move animator.[c|cpp] -> animationdriver.[h|cpp]
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=800872
This commit is contained in:
parent
6e80fe4354
commit
202e01e44d
@ -18,7 +18,7 @@ set(plasmagik_SRCS
|
|||||||
set(plasma_LIB_SRCS
|
set(plasma_LIB_SRCS
|
||||||
${plasmagik_SRCS}
|
${plasmagik_SRCS}
|
||||||
abstractrunner.cpp
|
abstractrunner.cpp
|
||||||
animator.cpp
|
animationdriver.cpp
|
||||||
applet.cpp
|
applet.cpp
|
||||||
appletbrowser.cpp
|
appletbrowser.cpp
|
||||||
appletbrowser/customdragtreeview.cpp
|
appletbrowser/customdragtreeview.cpp
|
||||||
@ -99,7 +99,7 @@ install(FILES ${plasmagik_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/)
|
|||||||
|
|
||||||
set(plasma_LIB_INCLUDES
|
set(plasma_LIB_INCLUDES
|
||||||
abstractrunner.h
|
abstractrunner.h
|
||||||
animator.h
|
animationdriver.h
|
||||||
applet.h
|
applet.h
|
||||||
appletbrowser.h
|
appletbrowser.h
|
||||||
configxml.h
|
configxml.h
|
||||||
@ -154,7 +154,7 @@ install(FILES
|
|||||||
|
|
||||||
install(FILES
|
install(FILES
|
||||||
includes/AbstractRunner
|
includes/AbstractRunner
|
||||||
includes/Animator
|
includes/AnimationDriver
|
||||||
includes/Applet
|
includes/Applet
|
||||||
includes/AppletBrowser
|
includes/AppletBrowser
|
||||||
includes/ConfigXml
|
includes/ConfigXml
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "animator.h"
|
#include "animationdriver.h"
|
||||||
|
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QGraphicsItem>
|
#include <QGraphicsItem>
|
||||||
@ -143,4 +143,4 @@ void AnimationDriver::itemSlideOut(qreal progress, QGraphicsItem *item, const QP
|
|||||||
|
|
||||||
} // Plasma namespace
|
} // Plasma namespace
|
||||||
|
|
||||||
#include "animator.moc"
|
#include "animationdriver.moc"
|
1
includes/AnimationDriver
Normal file
1
includes/AnimationDriver
Normal file
@ -0,0 +1 @@
|
|||||||
|
#include "../../plasma/animationdriver.h"
|
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/animator.h"
|
|
@ -28,7 +28,7 @@
|
|||||||
#include <KServiceTypeTrader>
|
#include <KServiceTypeTrader>
|
||||||
#include <KGlobalSettings>
|
#include <KGlobalSettings>
|
||||||
|
|
||||||
#include "animator.h"
|
#include "animationdriver.h"
|
||||||
|
|
||||||
namespace Plasma
|
namespace Plasma
|
||||||
{
|
{
|
||||||
@ -475,6 +475,8 @@ QPixmap Animator::currentPixmap(int id)
|
|||||||
case DisappearAnimation:
|
case DisappearAnimation:
|
||||||
return d->driver->elementDisappear(progress, state->pixmap);
|
return d->driver->elementDisappear(progress, state->pixmap);
|
||||||
break;
|
break;
|
||||||
|
case ActivateAnimation:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return state->pixmap;
|
return state->pixmap;
|
||||||
|
Loading…
Reference in New Issue
Block a user