From 020412c0e3f41132d30e7db94e6a12e95553c5e0 Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Tue, 15 Dec 2015 16:50:14 +0100 Subject: 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 --- src/core/nodes/qcomponent.h | 8 ++++---- src/core/nodes/qnode.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src') 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 -- cgit v1.2.3