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

[Barth Netterfield]

SVN commit 1196663 by netterfield:

Revert some changes I didn't mean to make...


 M  +1 -1      datasources/dirfilesource/dirfilesource.cpp  
 M  +2 -6      libkst/datasource.cpp  
 M  +1 -2      libkst/datasource.h  
 M  +1 -1      libkst/datasourcepluginmanager.cpp  


--- branches/work/kst/portto4/kst/src/datasources/dirfilesource/dirfilesource.cpp #1196662:1196663
@@ -19,7 +19,7 @@
 #include "kst_i18n.h"
 
 #include <QXmlStreamWriter>
-//#include <QFileSystemWatcher>
+#include <QFileSystemWatcher>
 #include <QDir>
 
 using namespace Kst;
--- branches/work/kst/portto4/kst/src/libkst/datasource.cpp #1196662:1196663
@@ -30,7 +30,7 @@
 #include <QUrl>
 #include <QXmlStreamWriter>
 #include <QTimer>
-//#include <QFileSystemWatcher>
+#include <QFileSystemWatcher>
 #include <QFSFileEngine>
 
 #include "kst_i18n.h"
@@ -166,14 +166,12 @@
 
 
 void DataSource::resetFileWatcher() {
-#if 0
   if (_watcher) {
     disconnect(_watcher, SIGNAL(fileChanged ( const QString & )), this, SLOT(checkUpdate()));
     disconnect(_watcher, SIGNAL(directoryChanged ( const QString & )), this, SLOT(checkUpdate()));
     delete _watcher;
     _watcher = 0L;
   }
-#endif
 }
 
 
@@ -208,9 +206,8 @@
 {
   _updateCheckType = updateType;
   resetFileWatcher();
-  //if (_updateCheckType == Timer) {
+  if (_updateCheckType == Timer) {
     QTimer::singleShot(UpdateManager::self()->minimumUpdatePeriod()-1, this, SLOT(checkUpdate()));
-#if 0
   } else if (_updateCheckType == File) {
     // TODO only works on local files:
     // http://bugreports.qt.nokia.com/browse/QTBUG-8351
@@ -221,7 +218,6 @@
     connect(_watcher, SIGNAL(fileChanged ( const QString & )), this, SLOT(checkUpdate()));
     connect(_watcher, SIGNAL(directoryChanged ( const QString & )), this, SLOT(checkUpdate()));
   } 
-#endif
 }
 
 
--- branches/work/kst/portto4/kst/src/libkst/datasource.h #1196662:1196663
@@ -235,9 +235,8 @@
     DataInterface<DataVector>* interf_vector;
     DataInterface<DataMatrix>* interf_matrix;
 
-    //QFileSystemWatcher *_watcher;
+    QFileSystemWatcher *_watcher;
 
-    int _watcher;
     // NOTE: You must bump the version key if you add new member variables
     //       or change or add virtual functions.
 };
--- branches/work/kst/portto4/kst/src/libkst/datasourcepluginmanager.cpp #1196662:1196663
@@ -28,7 +28,7 @@
 #include <QUrl>
 #include <QXmlStreamWriter>
 #include <QTimer>
-//#include <QFileSystemWatcher>
+#include <QFileSystemWatcher>
 
 #include "kst_i18n.h"
 #include "datacollection.h"