diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2015-12-15 16:50:14 +0100 |
---|---|---|
committer | Kevin Ottens <kevin.ottens@kdab.com> | 2015-12-18 15:55:42 +0000 |
commit | 020412c0e3f41132d30e7db94e6a12e95553c5e0 (patch) | |
tree | d43ddf1f4020e123256ac638f4a3c3361f331bfb | |
parent | 985d8b47a62c7c21a7fd65f9ffe813ec3d6e13ad (diff) |
Move the signals earlier in definition
Mainly to satisfy my OCD, this way we got all the public first, then
signals, then protected, then private. It's the usual ordering in most
places.
Change-Id: I63a96714e9027b3a0a7fead4bda141922d51ddff
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | src/core/nodes/qcomponent.h | 8 | ||||
-rw-r--r-- | src/core/nodes/qnode.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/core/nodes/qcomponent.h b/src/core/nodes/qcomponent.h index 9ea17e454..6751b2c64 100644 --- a/src/core/nodes/qcomponent.h +++ b/src/core/nodes/qcomponent.h @@ -62,14 +62,14 @@ public: public Q_SLOTS: void setShareable(bool shareable); -protected: - QComponent(QComponentPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; - Q_SIGNALS: void shareableChanged(bool shareable); void enabledChanged(bool enabled); +protected: + QComponent(QComponentPrivate &dd, QNode *parent = 0); + void copy(const QNode *ref) Q_DECL_OVERRIDE; + private: Q_DECLARE_PRIVATE(QComponent) }; diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h index f8096ed32..5b9761538 100644 --- a/src/core/nodes/qnode.h +++ b/src/core/nodes/qnode.h @@ -93,6 +93,10 @@ public Q_SLOTS: virtual void setParent(QNode *parent); void setEnabled(bool isEnabled); +Q_SIGNALS: + void parentChanged(QObject *parent); + void enabledChanged(bool enabled); + protected: // Clone should only be made in the main thread static QNode *clone(QNode *node); @@ -117,10 +121,6 @@ private: friend class QAspectEngine; friend class QPostman; friend class QScene; - -Q_SIGNALS: - void parentChanged(QObject *parent); - void enabledChanged(bool enabled); }; } // namespace Qt3DCore |