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

[Peter Kümmel]

SVN commit 1300610 by kuemmel:

DataSourceFactory has been moved to libkstapp

 M  +2 -2      libkst/datasourcefactory.h  
 M  +1 -1      libkstapp/application.cpp  
 M  +1 -2      libkstapp/builtindatasources.h  


--- branches/work/kst/portto4/kst/src/libkst/datasourcefactory.h #1300609:1300610
@@ -23,7 +23,7 @@
 
 class ObjectStore;
 
-class DataSourceFactory {
+class KSTCORE_EXPORT DataSourceFactory {
   public:
     DataSourceFactory();
     virtual ~DataSourceFactory();
@@ -31,7 +31,7 @@
     // This takes ownership
     static void registerFactory(const QString& node, DataSourceFactory *factory);
     static void registerFactory(const QStringList& nodes, DataSourceFactory *factory);
-    KSTCORE_EXPORT static DataSourcePtr parse(ObjectStore *store, QXmlStreamReader& stream);
+    static DataSourcePtr parse(ObjectStore *store, QXmlStreamReader& stream);
     virtual DataSourcePtr generateDataSource(ObjectStore *store, QXmlStreamReader& stream) = 0;
 };
 
--- branches/work/kst/portto4/kst/src/libkstapp/application.cpp #1300609:1300610
@@ -39,7 +39,7 @@
   _dialogDefaults = new QSettings("kst", "dialog");
 
   Builtins::initPrimitives(); //libkst
-  Builtins::initDataSources(); //libkst
+  Builtins::initDataSources(); //libkstapp
   Builtins::initObjects();    //libkstmath
   Builtins::initRelations();  //libkstmath
   Builtins::initGraphics();   //libkstapp
--- branches/work/kst/portto4/kst/src/libkstapp/builtindatasources.h #1300609:1300610
@@ -13,13 +13,12 @@
 #ifndef BUILTINDATASOURCES_H
 #define BUILTINDATASOURCES_H
 
-#include "kst_export.h"
 
 namespace Kst {
   class ObjectStore;
 
   namespace Builtins {
-    KSTCORE_EXPORT void initDataSources();
+    void initDataSources();
   }
 }