diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-10-22 10:59:32 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-28 08:49:38 +0100 |
commit | 2e05a1578428fd8268512e12d88d90e93dcf5dff (patch) | |
tree | 327e12635d172b12d8d126197eec54d50dff5b72 /src/corelib/io | |
parent | 5a9de4c6768e413a56f0e7b6c67ea11db761cd58 (diff) |
QtCore: Make more signals private.
Change-Id: Ida190e8b9c1ff47a6f54a5bf68673ab50a2f1bfe
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qfilesystemwatcher.cpp | 4 | ||||
-rw-r--r-- | src/corelib/io/qfilesystemwatcher.h | 12 | ||||
-rw-r--r-- | src/corelib/io/qprocess.cpp | 8 | ||||
-rw-r--r-- | src/corelib/io/qprocess.h | 24 |
4 files changed, 36 insertions, 12 deletions
diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp index 449be9b7b5..557475cd6c 100644 --- a/src/corelib/io/qfilesystemwatcher.cpp +++ b/src/corelib/io/qfilesystemwatcher.cpp @@ -128,7 +128,7 @@ void QFileSystemWatcherPrivate::_q_fileChanged(const QString &path, bool removed } if (removed) files.removeAll(path); - emit q->fileChanged(path); + emit q->fileChanged(path, QFileSystemWatcher::QPrivateSignal()); } void QFileSystemWatcherPrivate::_q_directoryChanged(const QString &path, bool removed) @@ -140,7 +140,7 @@ void QFileSystemWatcherPrivate::_q_directoryChanged(const QString &path, bool re } if (removed) directories.removeAll(path); - emit q->directoryChanged(path); + emit q->directoryChanged(path, QFileSystemWatcher::QPrivateSignal()); } diff --git a/src/corelib/io/qfilesystemwatcher.h b/src/corelib/io/qfilesystemwatcher.h index 5ac02c6e1d..6fbbdae157 100644 --- a/src/corelib/io/qfilesystemwatcher.h +++ b/src/corelib/io/qfilesystemwatcher.h @@ -72,8 +72,16 @@ public: QStringList directories() const; Q_SIGNALS: - void fileChanged(const QString &path); - void directoryChanged(const QString &path); + void fileChanged(const QString &path +#if !defined(qdoc) + , QPrivateSignal +#endif + ); + void directoryChanged(const QString &path +#if !defined(qdoc) + , QPrivateSignal +#endif + ); private: Q_PRIVATE_SLOT(d_func(), void _q_fileChanged(const QString &path, bool removed)) diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index c52053000d..ec97425d8d 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -909,7 +909,7 @@ bool QProcessPrivate::_q_canReadStandardOutput() emittedReadyRead = false; } } - emit q->readyReadStandardOutput(); + emit q->readyReadStandardOutput(QProcess::QPrivateSignal()); return didRead; } @@ -954,7 +954,7 @@ bool QProcessPrivate::_q_canReadStandardError() emittedReadyRead = false; } } - emit q->readyReadStandardError(); + emit q->readyReadStandardError(QProcess::QPrivateSignal()); return didRead; } @@ -1087,7 +1087,7 @@ bool QProcessPrivate::_q_startupNotification() startupSocketNotifier->setEnabled(false); if (processStarted()) { q->setProcessState(QProcess::Running); - emit q->started(); + emit q->started(QProcess::QPrivateSignal()); return true; } @@ -1767,7 +1767,7 @@ void QProcess::setProcessState(ProcessState state) if (d->processState == state) return; d->processState = state; - emit stateChanged(state); + emit stateChanged(state, QPrivateSignal()); } /*! diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 49b58e6a46..bf4f2fb55b 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -210,14 +210,30 @@ public Q_SLOTS: void kill(); Q_SIGNALS: - void started(); + void started( +#if !defined(qdoc) + QPrivateSignal +#endif + ); void finished(int exitCode); void finished(int exitCode, QProcess::ExitStatus exitStatus); void error(QProcess::ProcessError error); - void stateChanged(QProcess::ProcessState state); + void stateChanged(QProcess::ProcessState state +#if !defined(qdoc) + , QPrivateSignal +#endif + ); - void readyReadStandardOutput(); - void readyReadStandardError(); + void readyReadStandardOutput( +#if !defined(qdoc) + QPrivateSignal +#endif + ); + void readyReadStandardError( +#if !defined(qdoc) + QPrivateSignal +#endif + ); protected: void setProcessState(ProcessState state); |