[Kst] branches/work/kst/portto4/kst/src/libkst

[George Staikos]

SVN commit 718461 by staikos:

libkst.dll builds now


 M  +4 -0      kstdatasource.cpp  
 M  +4 -0      kstmath.h  
 M  +4 -0      kstmatrixdefaults.cpp  
 M  +4 -4      kstobjectcollection.h  
 M  +4 -0      kstvectordefaults.cpp  


--- branches/work/kst/portto4/kst/src/libkst/kstdatasource.cpp #718460:718461
@@ -221,9 +221,11 @@
 
 
 KstDataSourcePtr KstDataSource::loadSource(const QString& filename, const QString& type) {
+#ifndef Q_WS_WIN32
   if (filename == "stdin" || filename == "-") {
     return new KstStdinSource(settingsObject);
   }
+#endif
 
   QString fn = obtainFile(filename);
   if (fn.isEmpty()) {
@@ -431,9 +433,11 @@
     return 0L;
   }
 
+#ifndef Q_WS_WIN32
   if (filename == "stdin" || filename == "-") {
     return new KstStdinSource(settingsObject);
   }
+#endif
 
   return findPluginFor(filename, type, e);
 }
--- branches/work/kst/portto4/kst/src/libkst/kstmath.h #718460:718461
@@ -85,6 +85,10 @@
 inline int isinf(double x) { return x == x && !finite(x); }
 #endif
 
+#ifdef Q_WS_WIN32
+#define isnan _isnan
+#define finite _finite
+#endif
 
 inline double logXLo(double x, double base = 10.0) {
   if (base == 10.0) {
--- branches/work/kst/portto4/kst/src/libkst/kstmatrixdefaults.cpp #718460:718461
@@ -106,7 +106,11 @@
     rmatrixList[j]->readLock();
     KstDataSourcePtr dsp = rmatrixList[j]->dataSource();
     rmatrixList[j]->unlock();
+#ifdef Q_WS_WIN32
+    if (dsp) {
+#else
     if (dsp && !kst_cast<KstStdinSource>(dsp)) {
+#endif
       break;
     }
     --j;
--- branches/work/kst/portto4/kst/src/libkst/kstobjectcollection.h #718460:718461
@@ -802,10 +802,10 @@
     }
   }
 
-  QHashIterator<int, KstObjectTreeNode<T>* > i(nodes);
-  while (i.hasNext()) {
-    i.next();
-    outNodes << i.value();
+  QHashIterator<int, KstObjectTreeNode<T>* > j(nodes);
+  while (j.hasNext()) {
+    j.next();
+    outNodes << j.value();
   }
   return outNodes;
 }
--- branches/work/kst/portto4/kst/src/libkst/kstvectordefaults.cpp #718460:718461
@@ -90,7 +90,11 @@
     vl[j]->readLock();
     KstDataSourcePtr dsp = vl[j]->dataSource();
     vl[j]->unlock();
+#ifdef Q_WS_WIN32
+    if (dsp) {
+#else
     if (dsp && !kst_cast<KstStdinSource>(dsp)) {
+#endif
       break;
     }
     --j;