whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Remove #ifdef Q_QDOC for uses of QPrivateSignal 

Signals marked with QPrivateSignal had the QPrivateSignal marker
ifdefed out for qdoc. This is no longer necessary, so the #ifdefs
are removed.

Change-Id: Idb334ed311c6ed6883d7b7b5a3fcdede60c4a1f8
Task-number: QTBUG-45535
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
bb10
Martin Smith 2015-04-17 10:29:04 +02:00
parent d0c96c65ec
commit 6526a4e136
17 changed files with 48 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/io/qfilesystemwatcher.h
View File

@ -62,16 +62,8 @@ public:
QStringList directories() const;
Q_SIGNALS:
void fileChanged(const QString &path
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void directoryChanged(const QString &path
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void fileChanged(const QString &path, QPrivateSignal);
void directoryChanged(const QString &path, QPrivateSignal);
private:
Q_PRIVATE_SLOT(d_func(), void _q_fileChanged(const QString &path, bool removed))

24
src/corelib/io/qprocess.h
View File

@ -223,30 +223,14 @@ public Q_SLOTS:
void kill();
Q_SIGNALS:
void started(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void started(QPrivateSignal);
void finished(int exitCode); // ### Qt 6: merge the two signals with a default value
void finished(int exitCode, QProcess::ExitStatus exitStatus);
void error(QProcess::ProcessError error);
void stateChanged(QProcess::ProcessState state
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void stateChanged(QProcess::ProcessState state, QPrivateSignal);
void readyReadStandardOutput(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void readyReadStandardError(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void readyReadStandardOutput(QPrivateSignal);
void readyReadStandardError(QPrivateSignal);
protected:
void setProcessState(ProcessState state);

84
src/corelib/itemmodels/qabstractitemmodel.h
View File

@ -246,82 +246,26 @@ Q_SIGNALS:
void layoutChanged(const QList<QPersistentModelIndex> &parents = QList<QPersistentModelIndex>(), QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint);
void layoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents = QList<QPersistentModelIndex>(), QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint);
void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void rowsInserted(const QModelIndex &parent, int first, int last
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last, QPrivateSignal);
void rowsInserted(const QModelIndex &parent, int first, int last, QPrivateSignal);
void rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void rowsRemoved(const QModelIndex &parent, int first, int last
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last, QPrivateSignal);
void rowsRemoved(const QModelIndex &parent, int first, int last, QPrivateSignal);
void columnsAboutToBeInserted(const QModelIndex &parent, int first, int last
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void columnsInserted(const QModelIndex &parent, int first, int last
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void columnsAboutToBeInserted(const QModelIndex &parent, int first, int last, QPrivateSignal);
void columnsInserted(const QModelIndex &parent, int first, int last, QPrivateSignal);
void columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void columnsRemoved(const QModelIndex &parent, int first, int last
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last, QPrivateSignal);
void columnsRemoved(const QModelIndex &parent, int first, int last, QPrivateSignal);
void modelAboutToBeReset(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void modelReset(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void modelAboutToBeReset(QPrivateSignal);
void modelReset(QPrivateSignal);
void rowsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void rowsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void rowsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow, QPrivateSignal);
void rowsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row, QPrivateSignal);
void columnsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void columnsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void columnsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn, QPrivateSignal);
void columnsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column, QPrivateSignal);
public Q_SLOTS:
virtual bool submit();

6
src/corelib/itemmodels/qabstractproxymodel.h
View File

@ -92,11 +92,7 @@ public:
Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
Q_SIGNALS:
void sourceModelChanged(
#if !defined(qdoc)
QPrivateSignal
#endif
);
void sourceModelChanged(QPrivateSignal);
protected Q_SLOTS:
void resetInternalData();

6
src/corelib/kernel/qcoreapplication.h
View File

@ -171,11 +171,7 @@ public Q_SLOTS:
static void quit();
Q_SIGNALS:
void aboutToQuit(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void aboutToQuit(QPrivateSignal);
void organizationNameChanged();
void organizationDomainChanged();

6
src/corelib/kernel/qobject.h
View File

@ -413,11 +413,7 @@ public:
Q_SIGNALS:
void destroyed(QObject * = 0);
void objectNameChanged(const QString &objectName
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void objectNameChanged(const QString &objectName, QPrivateSignal);
public:
inline QObject *parent() const { return d_ptr->parent; }

6
src/corelib/kernel/qsocketnotifier.h
View File

@ -59,11 +59,7 @@ public Q_SLOTS:
void setEnabled(bool);
Q_SIGNALS:
void activated(int socket
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void activated(int socket, QPrivateSignal);
protected:
bool event(QEvent *) Q_DECL_OVERRIDE;

6
src/corelib/kernel/qtimer.h
View File

@ -141,11 +141,7 @@ public Q_SLOTS:
void stop();
Q_SIGNALS:
void timeout(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void timeout(QPrivateSignal);
protected:
void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;

6
src/corelib/kernel/qwineventnotifier.h
View File

@ -61,11 +61,7 @@ public Q_SLOTS:
void setEnabled(bool enable);
Q_SIGNALS:
void activated(HANDLE hEvent
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void activated(HANDLE hEvent, QPrivateSignal);
protected:
bool event(QEvent * e);

12
src/corelib/statemachine/qabstractstate.h
View File

@ -58,16 +58,8 @@ public:
bool active() const;
Q_SIGNALS:
void entered(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void exited(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void entered(QPrivateSignal);
void exited(QPrivateSignal);
void activeChanged(bool active);
protected:

18
src/corelib/statemachine/qabstracttransition.h
View File

@ -78,21 +78,9 @@ public:
#endif
Q_SIGNALS:
void triggered(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void targetStateChanged(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void targetStatesChanged(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void triggered(QPrivateSignal);
void targetStateChanged(QPrivateSignal);
void targetStatesChanged(QPrivateSignal);
protected:
virtual bool eventTest(QEvent *event) = 0;

12
src/corelib/statemachine/qhistorystate.h
View File

@ -65,16 +65,8 @@ public:
void setHistoryType(HistoryType type);
Q_SIGNALS:
void defaultStateChanged(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void historyTypeChanged(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void defaultStateChanged(QPrivateSignal);
void historyTypeChanged(QPrivateSignal);
protected:
void onEntry(QEvent *event) Q_DECL_OVERRIDE;

12
src/corelib/statemachine/qsignaltransition.h
View File

@ -67,16 +67,8 @@ protected:
bool event(QEvent *e) Q_DECL_OVERRIDE;
Q_SIGNALS:
void senderObjectChanged(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void signalChanged(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void senderObjectChanged(QPrivateSignal);
void signalChanged(QPrivateSignal);
private:
Q_DISABLE_COPY(QSignalTransition)

30
src/corelib/statemachine/qstate.h
View File

@ -103,31 +103,11 @@ public:
#endif
Q_SIGNALS:
void finished(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void propertiesAssigned(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void childModeChanged(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void initialStateChanged(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void errorStateChanged(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void finished(QPrivateSignal);
void propertiesAssigned(QPrivateSignal);
void childModeChanged(QPrivateSignal);
void initialStateChanged(QPrivateSignal);
void errorStateChanged(QPrivateSignal);
protected:
void onEntry(QEvent *event) Q_DECL_OVERRIDE;

12
src/corelib/statemachine/qstatemachine.h
View File

@ -145,16 +145,8 @@ public Q_SLOTS:
void setRunning(bool running);
Q_SIGNALS:
void started(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void stopped(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void started(QPrivateSignal);
void stopped(QPrivateSignal);
void runningChanged(bool running);

12
src/corelib/thread/qthread.h
View File

@ -106,16 +106,8 @@ public:
static void usleep(unsigned long);
Q_SIGNALS:
void started(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void finished(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void started(QPrivateSignal);
void finished(QPrivateSignal);
protected:
virtual void run();

24
src/corelib/tools/qtimeline.h
View File

@ -115,26 +115,10 @@ public Q_SLOTS:
void toggleDirection();
Q_SIGNALS:
void valueChanged(qreal x
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void frameChanged(int
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void stateChanged(QTimeLine::State newState
#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void finished(
#if !defined(Q_QDOC)
QPrivateSignal
#endif
);
void valueChanged(qreal x, QPrivateSignal);
void frameChanged(int, QPrivateSignal);
void stateChanged(QTimeLine::State newState, QPrivateSignal);
void finished(QPrivateSignal);
protected:
void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;