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

* constructor + destructor private

Browse Source 
* init -> pimpl

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=802607
This commit is contained in:
Aaron J. Seigo 2008-04-29 23:24:09 +00:00
parent 0c2b74e11d
commit 67f44e6f0a
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
animator.cpp
View File

@ -163,6 +163,8 @@ class Animator::Private
}
}
void init(Animator *q);
AnimationDriver* driver;
int animId;
int timerId;
@ -195,7 +197,7 @@ Animator::Animator(QObject * parent)
: QObject(parent),
d(new Private)
{
init();
d->init(this);
}
Animator::~Animator()
@ -652,8 +654,9 @@ void Animator::timerEvent(QTimerEvent *event)
}
}
void Animator::init()
void Animator::Private::init(Animator *q)
{
//FIXME: usage between different applications?
KConfig c("plasmarc");
KConfigGroup cg(&c, "Animator");
QString pluginName = cg.readEntry("driver", "default");
@ -664,15 +667,15 @@ void Animator::init()
if (!offers.isEmpty()) {
QString error;
d->driver = offers.first()->createInstance<Plasma::AnimationDriver>(0, QVariantList(), &error);
if (!d->driver) {
driver = offers.first()->createInstance<Plasma::AnimationDriver>(0, QVariantList(), &error);
if (!driver) {
kDebug() << "Could not load requested animator " << offers.first() << ". Error given: " << error;
}
}
}
if (!d->driver) {
d->driver = new AnimationDriver(this);
if (!driver) {
driver = new AnimationDriver(q);
}
}

7
animator.h
View File

@ -72,9 +72,6 @@ public:
**/
static Animator* self();
explicit Animator(QObject * parent = 0);
~Animator();
/**
* Starts a standard animation on a QGraphicsItem.
*
@ -166,7 +163,9 @@ protected Q_SLOTS:
void customAnimReceiverDestroyed(QObject*);
private:
void init();
friend class AnimatorSingleton;
explicit Animator(QObject * parent = 0);
~Animator();
class Private;
Private * const d;