[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-2/kst/kst
From:       George Staikos <staikos () kde ! org>
Date:       2004-07-28 2:12:02
Message-ID: 20040728021202.65F7A9A00 () office ! kde ! org
[Download RAW message or body]

CVS commit by staikos: 

- remove kst3dplot from the build since it does nothing
- add some comments and fixmes
- casts shouldn't contain variables
- shortcircuit evaluation for if() if() {}


  M +0 -1      Makefile.am   1.130
  M +2 -0      kstplugin.cpp   1.59
  M +4 -9      plugin.cpp   1.22


--- kdeextragear-2/kst/kst/Makefile.am  #1.129:1.130
@@ -50,5 +50,4 @@
         kstplotbase.cpp \
         kst2dplot.cpp \
-        kst3dplot.cpp \
         kstbackbuffer.cpp \
         kstviewwidget.cpp \

--- kdeextragear-2/kst/kst/kstplugin.cpp  #1.58:1.59
@@ -61,4 +61,5 @@ KstPlugin::KstPlugin(QDomElement &e) : K
         KstVectorPtr v;
 
+        // FIXME: these might already exist!!
         if (e.attribute("scalarList", "0").toInt()) {
           v = new KstVector(e.text(), 0, true);
@@ -69,4 +70,5 @@ KstPlugin::KstPlugin(QDomElement &e) : K
         KST::addVectorToList(v);
       } else if (e.tagName() == "oscalar") {
+        // FIXME: these might already exist!!
         _outputScalars.insert(e.attribute("name"), new KstScalar(e.text()));
       }

--- kdeextragear-2/kst/kst/plugin.cpp  #1.21:1.22
@@ -89,13 +89,8 @@ QString Plugin::parameterName(int iIndex
   char* pName = 0L;
   
-  if (_data._isFit) {
-    if (_parameterName) {
-      if( ((int(*)(int, char** pName))_parameterName) (iIndex, &pName)) {
-        if (pName != 0L) {
-          strParameter = pName;
-
-          free( pName );
-        }
-      }
+  if (_data._isFit && _parameterName) {
+    if (((int(*)(int, char**))_parameterName)(iIndex, &pName) && pName) {
+      strParameter = pName; // deep copy into QString
+      free(pName);
     }
   }


[prev in list] [next in list] [prev in thread] [next in thread]