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

[Peter Kümmel]

SVN commit 1049697 by kuemmel:

build test also under windows

 M  +2 -3      kst.pro  
 M  +5 -0      src/libkst/datavector.h  
 M  +2 -2      tests/testcsd.cpp  
 M  +1 -2      tests/testdatasource.cpp  
 M  +2 -2      tests/testhistogram.cpp  
 M  +2 -2      tests/testpsd.cpp  
 M  +1 -1      tests/tests.pro  
 M  +0 -2      tests/testscalar.cpp  


--- branches/work/kst/portto4/kst/kst.pro #1049696:1049697
@@ -9,6 +9,5 @@
     src/libkstapp \
     src/kst \
     src/d2asc \
-    src/plugins
-
-!win32:SUBDIRS += tests
+    src/plugins \
+    tests
--- branches/work/kst/portto4/kst/src/libkst/datavector.h #1049696:1049697
@@ -156,6 +156,11 @@
     QHash<QString, Scalar*> _fieldScalars;
     QHash<QString, String*> _fieldStrings;
 
+    friend class TestDataSource;
+    friend class TestHistogram;
+    friend class TestCSD;
+    friend class TestPSD;
+    friend class TestScalar;
 };
 
 typedef SharedPtr<DataVector> DataVectorPtr;
--- branches/work/kst/portto4/kst/tests/testcsd.cpp #1049696:1049697
@@ -20,10 +20,10 @@
 #include <datacollection.h>
 #include <objectstore.h>
 
-#define protected public
+
 #include <csd.h>
-#undef protected
 
+
 static Kst::ObjectStore _store;
 
 void TestCSD::cleanupTestCase() {
--- branches/work/kst/portto4/kst/tests/testdatasource.cpp #1049696:1049697
@@ -24,11 +24,10 @@
 #include <datacollection.h>
 #include <objectstore.h>
 
-#define protected public
 #include <datavector.h>
 #include <datamatrix.h>
-#undef protected
 
+
 static Kst::ObjectStore _store;
 
 void TestDataSource::initTestCase() {
--- branches/work/kst/portto4/kst/tests/testhistogram.cpp #1049696:1049697
@@ -17,10 +17,10 @@
 #include <datacollection.h>
 #include <objectstore.h>
 
-#define protected public
+
 #include <histogram.h>
-#undef protected
 
+
 static Kst::ObjectStore _store;
 
 void TestHistogram::cleanupTestCase() {
--- branches/work/kst/portto4/kst/tests/testpsd.cpp #1049696:1049697
@@ -18,10 +18,10 @@
 #include <QTemporaryFile>
 #include <QXmlStreamWriter>
 
-#define protected public
+
 #include <psd.h>
-#undef protected
 
+
 #include <datacollection.h>
 #include <objectstore.h>
 
--- branches/work/kst/portto4/kst/tests/tests.pro #1049696:1049697
@@ -1,6 +1,6 @@
 include($$PWD/../kst.pri)
 
-QT += gui network svg xml opengl qt3support
+QT += gui network svg xml opengl
 
 macx:CONFIG -= app_bundle
 CONFIG += qtestlib
--- branches/work/kst/portto4/kst/tests/testscalar.cpp #1049696:1049697
@@ -15,9 +15,7 @@
 
 #include <QDomDocument>
 
-#define protected public
 #include <scalar.h>
-#undef protected
 
 #include <math_kst.h>
 #include <kst_inf.h>