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/thread/qthread.h        | 14 +++++++++++---
 src/corelib/thread/qthread_unix.cpp |  4 ++--
 src/corelib/thread/qthread_win.cpp  |  4 ++--
 3 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'src/corelib/thread')

diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h
index 058091baf4..f7ae95f009 100644
--- a/src/corelib/thread/qthread.h
+++ b/src/corelib/thread/qthread.h
@@ -58,6 +58,7 @@ class QAbstractEventDispatcher;
 #ifndef QT_NO_THREAD
 class Q_CORE_EXPORT QThread : public QObject
 {
+    Q_OBJECT
 public:
     static Qt::HANDLE currentThreadId() Q_DECL_NOTHROW;
     static QThread *currentThread();
@@ -111,8 +112,16 @@ public:
     static void usleep(unsigned long);
 
 Q_SIGNALS:
-    void started();
-    void finished();
+    void started(
+#if !defined(qdoc)
+      QPrivateSignal
+#endif
+    );
+    void finished(
+#if !defined(qdoc)
+      QPrivateSignal
+#endif
+    );
 
 protected:
     virtual void run();
@@ -124,7 +133,6 @@ protected:
     QThread(QThreadPrivate &dd, QObject *parent = 0);
 
 private:
-    Q_OBJECT
     Q_DECLARE_PRIVATE(QThread)
 
     friend class QCoreApplication;
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index 2213b8f71a..b80653c07e 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -325,7 +325,7 @@ void *QThreadPrivate::start(void *arg)
 
 #endif
 
-    emit thr->started();
+    emit thr->started(QThread::QPrivateSignal());
 #if !defined(Q_OS_LINUX_ANDROID)
     pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
     pthread_testcancel();
@@ -348,7 +348,7 @@ void QThreadPrivate::finish(void *arg)
     d->priority = QThread::InheritPriority;
     void *data = &d->data->tls;
     locker.unlock();
-    emit thr->finished();
+    emit thr->finished(QThread::QPrivateSignal());
     QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
     QThreadStorageData::finish((void **)data);
     locker.relock();
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp
index 56e58fbcc3..cd627d10c9 100644
--- a/src/corelib/thread/qthread_win.cpp
+++ b/src/corelib/thread/qthread_win.cpp
@@ -336,7 +336,7 @@ unsigned int __stdcall QT_ENSURE_STACK_ALIGNED_FOR_SSE QThreadPrivate::start(voi
                        thr->metaObject()->className() : objectName.constData());
 #endif
 
-    emit thr->started();
+    emit thr->started(QThread::QPrivateSignal());
     QThread::setTerminationEnabled(true);
     thr->run();
 
@@ -354,7 +354,7 @@ void QThreadPrivate::finish(void *arg, bool lockAnyway)
     d->priority = QThread::InheritPriority;
     void **tls_data = reinterpret_cast<void **>(&d->data->tls);
     locker.unlock();
-    emit thr->finished();
+    emit thr->finished(QThread::QPrivateSignal());
     QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
     QThreadStorageData::finish(tls_data);
     locker.relock();
-- 
cgit v1.2.3