summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorKevin Ottens <kevin.ottens@kdab.com>2015-12-15 12:30:34 +0100
committerKevin Ottens <kevin.ottens@kdab.com>2015-12-17 09:17:40 +0000
commita7f544f5d644cb0d42da6270f74e400d8fffc944 (patch)
treee901323bc18f69fa2dc5d38ab92e238526321012 /src/core
parent0684f372062c7e71f549e4d896bf9a05e1bec77a (diff)
executeCommand is meant to be reimpl not called
We make sure it can be reimplemented in sub-classes but it will be called only by QAspectEngine own executeCommand method. Change-Id: I777889fd082a56af70cdadbba9b55d2532db8869 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/aspects/qabstractaspect.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index 87d5bcee2..67edd2cf9 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
namespace Qt3DCore {
+class QAspectEngine;
class QAspectManager;
class QNode;
class QBackendNode;
@@ -68,8 +69,6 @@ class QT3DCORESHARED_EXPORT QAbstractAspect
public:
explicit QAbstractAspect(QObject *parent = 0);
- virtual QVariant executeCommand(const QStringList &args);
-
protected:
QAbstractAspect(QAbstractAspectPrivate &dd, QObject *parent = 0);
@@ -81,6 +80,8 @@ protected:
void clearBackendNode(QNode *frontend) const;
private:
+ virtual QVariant executeCommand(const QStringList &args);
+
void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
@@ -93,6 +94,7 @@ private:
virtual void onRootEntityChanged(QEntity *rootEntity);
Q_DECLARE_PRIVATE(QAbstractAspect)
+ friend class QAspectEngine;
friend class QAspectManager;
};