From 2e05a1578428fd8268512e12d88d90e93dcf5dff Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Mon, 22 Oct 2012 10:59:32 +0200
Subject: QtCore: Make more signals private.

Change-Id: Ida190e8b9c1ff47a6f54a5bf68673ab50a2f1bfe
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
---
 src/corelib/tools/qtimeline.cpp | 10 +++++-----
 src/corelib/tools/qtimeline.h   | 24 ++++++++++++++++++++----
 2 files changed, 25 insertions(+), 9 deletions(-)

(limited to 'src/corelib/tools')

diff --git a/src/corelib/tools/qtimeline.cpp b/src/corelib/tools/qtimeline.cpp
index 69e3fb7b74..e3df9a2de3 100644
--- a/src/corelib/tools/qtimeline.cpp
+++ b/src/corelib/tools/qtimeline.cpp
@@ -79,7 +79,7 @@ public:
     {
         Q_Q(QTimeLine);
         if (newState != state)
-            emit q->stateChanged(state = newState);
+            emit q->stateChanged(state = newState, QTimeLine::QPrivateSignal());
     }
 
     void setCurrentTime(int msecs);
@@ -126,14 +126,14 @@ void QTimeLinePrivate::setCurrentTime(int msecs)
     qDebug() << "QTimeLinePrivate::setCurrentTime: frameForTime" << currentTime << currentFrame;
 #endif
     if (!qFuzzyCompare(lastValue, q->currentValue()))
-        emit q->valueChanged(q->currentValue());
+        emit q->valueChanged(q->currentValue(), QTimeLine::QPrivateSignal());
     if (lastFrame != currentFrame) {
         const int transitionframe = (direction == QTimeLine::Forward ? endFrame : startFrame);
         if (looping && !finished && transitionframe != currentFrame) {
 #ifdef QTIMELINE_DEBUG
             qDebug() << "QTimeLinePrivate::setCurrentTime: transitionframe";
 #endif
-            emit q->frameChanged(transitionframe);
+            emit q->frameChanged(transitionframe, QTimeLine::QPrivateSignal());
         }
 #ifdef QTIMELINE_DEBUG
         else {
@@ -153,11 +153,11 @@ void QTimeLinePrivate::setCurrentTime(int msecs)
             qDebug("QTimeLinePrivate::setCurrentTime: not transitionframe because %s",  reason.constData());
         }
 #endif
-        emit q->frameChanged(currentFrame);
+        emit q->frameChanged(currentFrame, QTimeLine::QPrivateSignal());
     }
     if (finished && state == QTimeLine::Running) {
         q->stop();
-        emit q->finished();
+        emit q->finished(QTimeLine::QPrivateSignal());
     }
 }
 
diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h
index 3d2b53f465..04ad5490c6 100644
--- a/src/corelib/tools/qtimeline.h
+++ b/src/corelib/tools/qtimeline.h
@@ -125,10 +125,26 @@ public Q_SLOTS:
     void toggleDirection();
 
 Q_SIGNALS:
-    void valueChanged(qreal x);
-    void frameChanged(int);
-    void stateChanged(QTimeLine::State newState);
-    void finished();
+    void valueChanged(qreal x
+#if !defined(qdoc)
+      , QPrivateSignal
+#endif
+    );
+    void frameChanged(int
+#if !defined(qdoc)
+      , QPrivateSignal
+#endif
+    );
+    void stateChanged(QTimeLine::State newState
+#if !defined(qdoc)
+      , QPrivateSignal
+#endif
+    );
+    void finished(
+#if !defined(qdoc)
+      QPrivateSignal
+#endif
+    );
 
 protected:
     void timerEvent(QTimerEvent *event);
-- 
cgit v1.2.3