[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

fixes to come in these places


  M +1 -0      kstscalar.cpp   1.38
  M +5 -0      kstscalar.h   1.29
  M +1 -0      kststring.cpp   1.6
  M +5 -0      kststring.h   1.6


--- kdeextragear-2/kst/kst/kststring.cpp  #1.5:1.6
@@ -88,4 +88,5 @@ KstObject::UpdateType KstString::update(
     return lastUpdateResult();
   }
+  // FIXME: we need to update our provider if we have one
   return setLastUpdateResult(NO_CHANGE);
 }

--- kdeextragear-2/kst/kst/kststring.h  #1.5:1.6
@@ -20,4 +20,5 @@
 
 #include <qdom.h>
+#include <qguardedptr.h>
 #include "kstobject.h"
 #include "kst_export.h"
@@ -56,4 +57,8 @@ class KST_EXPORT KstString : public KstO
     QString _value;
     bool _orphan : 1;
+    /** Possibly null.  Be careful, this is non-standard usage of a KstShared.
+     * The purpose of this is to trigger hierarchical updates properly.
+     */
+    QGuardedPtr<KstObject> _provider;
 };
 

--- kdeextragear-2/kst/kst/kstscalar.cpp  #1.37:1.38
@@ -90,4 +90,5 @@ KstObject::UpdateType KstScalar::update(
   }
   // FIXME: if we're provided by a vector, we need to propagate upward.
+  //        also clean up the flags like "orphan".
   return setLastUpdateResult(NO_CHANGE);
 }

--- kdeextragear-2/kst/kst/kstscalar.h  #1.28:1.29
@@ -20,4 +20,5 @@
 
 #include <qdom.h>
+#include <qguardedptr.h>
 #include "kstobject.h"
 
@@ -74,4 +75,8 @@ class KST_EXPORT KstScalar : public KstO
     bool _displayable;
     bool _editable;
+    /** Possibly null.  Be careful, this is non-standard usage of a KstShared.
+     * The purpose of this is to trigger hierarchical updates properly.
+     */
+    QGuardedPtr<KstObject> _provider;
 };