[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

- change the default action in plugin dialog from delete to save
- make kstdataobject KShared because eventually all dataobjects will be
  KShared probably.
- return const QString& from accessor in kstdataobject
- note about vector and scalar lists moving into kstdataobject eventually


  M +2 -2      kstdataobject.cpp   1.2
  M +8 -3      kstdataobject.h   1.2
  M +2 -4      kstplugin.cpp   1.8
  M +1 -3      kstplugin.h   1.6
  M +3 -0      plugindialog.ui   1.4


--- kdeextragear-2/kst/kst/kstdataobject.cpp  #1.1:1.2
@@ -18,6 +18,5 @@
 #include "kstdataobject.h"
 
-KstDataObject::KstDataObject() {
-  Tag="";
+KstDataObject::KstDataObject() : KShared() {
   LastUpdateCounter = 0;
 }

--- kdeextragear-2/kst/kst/kstdataobject.h  #1.1:1.2
@@ -19,7 +19,8 @@
 #define KSTDATAOBJECT_H
 
+#include <ksharedptr.h>
 #include <qstring.h>
 
-class KstDataObject {
+class KstDataObject : public KShared {
 public:
   KstDataObject();
@@ -27,6 +28,10 @@ public:
 
   virtual void update(int update_counter = -1) = 0;
-  virtual QString tagName() const { return Tag; }
-  virtual void setTagName(const QString& new_tag) { Tag = new_tag;}
+  virtual const QString& tagName() const { return Tag; }
+  virtual void setTagName(const QString& new_tag) { Tag = new_tag; }
+
+  // FIXME:
+  //  - add input and output lists of vectors and scalars since this is
+  //    common amongst all data objects
 
 protected:

--- kdeextragear-2/kst/kst/kstplugin.cpp  #1.7:1.8
@@ -23,12 +23,10 @@
 
 
-KstPlugin::KstPlugin()
-: KShared() {
+KstPlugin::KstPlugin() {
   commonConstructor();
 }
 
 
-KstPlugin::KstPlugin(QDomElement &e, const KstVectorList& vectors, const KstScalarList& scalars)
-: KShared() {
+KstPlugin::KstPlugin(QDomElement &e, const KstVectorList& vectors, const KstScalarList& scalars) {
   commonConstructor();
   Q_UNUSED(vectors);

--- kdeextragear-2/kst/kst/kstplugin.h  #1.5:1.6
@@ -26,9 +26,7 @@
 #include <qstring.h>
 #include <qdom.h>
-#include <ksharedptr.h>
-
 
 
-class KstPlugin : public KstDataObject, public KShared {
+class KstPlugin : public KstDataObject {
 public:
   KstPlugin();

--- kdeextragear-2/kst/kst/plugindialog.ui  #1.3:1.4
@@ -213,4 +213,7 @@
                                 <string>Apply Edits</string>
                             </property>
+                            <property name="default">
+                                <bool>true</bool>
+                            </property>
                         </widget>
                     </hbox>