From 5482bad2cecb42a56bf92f805e95144b7e82a2cb Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Tue, 29 Apr 2008 23:27:17 +0000
Subject: [PATCH] protected slots -> Q_PRIVATE_SLOT

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=802610
---
 animator.cpp | 20 ++++++++++++--------
 animator.h   | 11 +++++------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/animator.cpp b/animator.cpp
index 9cb4504e5..a464b44b1 100644
--- a/animator.cpp
+++ b/animator.cpp
@@ -164,6 +164,10 @@ class Animator::Private
         }
 
         void init(Animator *q);
+        void animatedItemDestroyed(QObject*);
+        void movingItemDestroyed(QObject*);
+        void animatedElementDestroyed(QObject*);
+        void customAnimReceiverDestroyed(QObject*);
 
         AnimationDriver* driver;
         int animId;
@@ -205,10 +209,10 @@ Animator::~Animator()
     delete d;
 }
 
-void Animator::animatedItemDestroyed(QObject* o)
+void Animator::Private::animatedItemDestroyed(QObject* o)
 {
     //kDebug() << "testing for" << (void*)o;
-    QMutableMapIterator<QGraphicsItem*, AnimationState*> it(d->animatedItems);
+    QMutableMapIterator<QGraphicsItem*, AnimationState*> it(animatedItems);
     while (it.hasNext()) {
         it.next();
         //kDebug() << "comparing against" << it.value()->qobj;
@@ -220,9 +224,9 @@ void Animator::animatedItemDestroyed(QObject* o)
     }
 }
 
-void Animator::movingItemDestroyed(QObject* o)
+void Animator::Private::movingItemDestroyed(QObject* o)
 {
-    QMutableMapIterator<QGraphicsItem*, MovementState*> it(d->movingItems);
+    QMutableMapIterator<QGraphicsItem*, MovementState*> it(movingItems);
     while (it.hasNext()) {
         it.next();
         if (it.value()->qobj == o) {
@@ -232,9 +236,9 @@ void Animator::movingItemDestroyed(QObject* o)
     }
 }
 
-void Animator::animatedElementDestroyed(QObject* o)
+void Animator::Private::animatedElementDestroyed(QObject* o)
 {
-    QMutableMapIterator<int, ElementAnimationState*> it(d->animatedElements);
+    QMutableMapIterator<int, ElementAnimationState*> it(animatedElements);
     while (it.hasNext()) {
         it.next();
         if (it.value()->qobj == o) {
@@ -244,9 +248,9 @@ void Animator::animatedElementDestroyed(QObject* o)
     }
 }
 
-void Animator::customAnimReceiverDestroyed(QObject* o)
+void Animator::Private::customAnimReceiverDestroyed(QObject* o)
 {
-    QMutableMapIterator<int, CustomAnimationState*> it(d->customAnims);
+    QMutableMapIterator<int, CustomAnimationState*> it(customAnims);
     while (it.hasNext()) {
         if (it.next().value()->receiver == o) {
             delete it.value()->slot;
diff --git a/animator.h b/animator.h
index 17ad18748..4411e9ded 100644
--- a/animator.h
+++ b/animator.h
@@ -156,17 +156,16 @@ Q_SIGNALS:
 protected:
     void timerEvent(QTimerEvent *event);
 
-protected Q_SLOTS:
-    void animatedItemDestroyed(QObject*);
-    void movingItemDestroyed(QObject*);
-    void animatedElementDestroyed(QObject*);
-    void customAnimReceiverDestroyed(QObject*);
-
 private:
     friend class AnimatorSingleton;
     explicit Animator(QObject * parent = 0);
     ~Animator();
 
+    Q_PRIVATE_SLOT(d, void animatedItemDestroyed(QObject*));
+    Q_PRIVATE_SLOT(d, void movingItemDestroyed(QObject*));
+    Q_PRIVATE_SLOT(d, void animatedElementDestroyed(QObject*));
+    Q_PRIVATE_SLOT(d, void customAnimReceiverDestroyed(QObject*));
+
     class Private;
     Private * const d;
 };