Commit 4e3ae3c0 authored by Martin Schultz's avatar Martin Schultz
Browse files

Merge branch 'master' into featureQt5.6Support

parents aefaa713 cdcc0dbc
...@@ -96,6 +96,7 @@ class DLLEXPORTONLY BaseObject : public QObject { ...@@ -96,6 +96,7 @@ class DLLEXPORTONLY BaseObject : public QObject {
Q_OBJECT Q_OBJECT
friend class BaseObjectData; friend class BaseObjectData;
friend class Core;
public : public :
...@@ -292,6 +293,20 @@ class DLLEXPORTONLY BaseObject : public QObject { ...@@ -292,6 +293,20 @@ class DLLEXPORTONLY BaseObject : public QObject {
//=========================================================================== //===========================================================================
public: public:
/// Debugging function, writing the subtree to output
void dumpTree();
/// Returns a full copy of the object
virtual BaseObject* copy();
//===========================================================================
/** @name Update handling
* @{ */
//===========================================================================
protected:
/** \brief This function is called to update the object /** \brief This function is called to update the object
* *
* If the object changes, the core will call this function. Normally this will update * If the object changes, the core will call this function. Normally this will update
...@@ -302,12 +317,6 @@ class DLLEXPORTONLY BaseObject : public QObject { ...@@ -302,12 +317,6 @@ class DLLEXPORTONLY BaseObject : public QObject {
*/ */
virtual void update(UpdateType _type = UPDATE_ALL); virtual void update(UpdateType _type = UPDATE_ALL);
/// Debugging function, writing the subtree to output
void dumpTree();
/// Returns a full copy of the object
virtual BaseObject* copy();
/** @} */ /** @} */
......
...@@ -289,7 +289,7 @@ class DLLEXPORT BaseObjectData : public BaseObject ...@@ -289,7 +289,7 @@ class DLLEXPORT BaseObjectData : public BaseObject
* @{ */ * @{ */
//=========================================================================== //===========================================================================
private: protected:
/** \brief This function is called to update the object /** \brief This function is called to update the object
* *
* If the object changes, the core will call this function. Normally this will update * If the object changes, the core will call this function. Normally this will update
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment