Merge branch 'master' into featureQt5.6Support

common/BaseObject.hh

@@ -96,6 +96,7 @@ class DLLEXPORTONLY BaseObject : public QObject {
   Q_OBJECT 
   
   friend class BaseObjectData;
+  friend class Core;
 
   public :
 
@@ -292,6 +293,20 @@ class DLLEXPORTONLY BaseObject : public QObject {
   //===========================================================================
 
   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
      *
      * If the object changes, the core will call this function. Normally this will update
@@ -302,12 +317,6 @@ class DLLEXPORTONLY BaseObject : public QObject {
      */
     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();
-
   /** @} */
 
 

common/BaseObjectData.hh

@@ -289,7 +289,7 @@ class DLLEXPORT BaseObjectData : public BaseObject
    * @{ */
   //===========================================================================
 
-  private:
+  protected:
     /** \brief  This function is called to update the object
     *
     * If the object changes, the core will call this function. Normally this will update