.krazy

@@ -0,0 +1,2 @@
+IGNORESUBS old_tests old_datasources
+

cmake/src/datasources/CMakeLists.txt

@@ -29,29 +29,29 @@ if(cfitsio)
 	kst_link(${CFITSIO_LIBRARIES})
 endif()
 
-if(healpix)
-	kst_add_plugin(. healpix)
-endif()
+#if(healpix)
+#	kst_add_plugin(. healpix)
+#endif()
 
-if(lfioo)
-	kst_add_plugin(. lfiio)
-endif()
+#if(lfioo)
+#	kst_add_plugin(. lfiio)
+#endif()
 
 if(netcdf)
 	include_directories(${NETCDF_INCLUDE_DIR})
 	kst_add_plugin(. netcdf)
 	kst_link(${NETCDF_LIBRARIES})
 endif()
 
-if(planckIDEF)
-	kst_add_plugin(. planckIDEF)
-endif()
-
-if(dmc)
-  include_directories(${DMC_INCLUDE_DIR})
-  kst_add_plugin(. dmc)
-  #kst_link(${DMC_LIBRARIES})
-endif()
+#if(planckIDEF)
+#	kst_add_plugin(. planckIDEF)
+#endif()
+
+#if(dmc)
+#  include_directories(${DMC_INCLUDE_DIR})
+#  kst_add_plugin(. dmc)
+#  #kst_link(${DMC_LIBRARIES})
+#endif()
 
 if(matio)
 	include_directories(${MATIO_INCLUDE_DIR})

old_datasources/README

@@ -0,0 +1,4 @@
+This file has non-functioning data sources from kst1.x which have not been
+ported, and which do not compile.  If you decide to port them, feel free to 
+move them back to datasources.
+

src/datasources/ascii/asciiconfigwidget.h

@@ -25,7 +25,7 @@ class AsciiConfigWidgetInternal : public QWidget, public Ui_AsciiConfig
   Q_OBJECT
 
   public:
-    AsciiConfigWidgetInternal(QWidget *parent);
+    explicit AsciiConfigWidgetInternal(QWidget *parent);
 
     AsciiSourceConfig config();
     void setConfig(const AsciiSourceConfig&);
@@ -53,7 +53,7 @@ class AsciiConfigWidget : public Kst::DataSourceConfigWidget
   Q_OBJECT
 
   public:
-    AsciiConfigWidget(QSettings&);
+    explicit AsciiConfigWidget(QSettings&);
     ~AsciiConfigWidget();
 
     void load();

src/datasources/ascii/asciidatainterfaces.h

@@ -33,7 +33,7 @@ using namespace Kst;
 class DataInterfaceAsciiVector : public DataSource::DataInterface<DataVector>
 {
 public:
-  DataInterfaceAsciiVector(AsciiSource& a) : ascii(a) {}
+  explicit DataInterfaceAsciiVector(AsciiSource& a) : ascii(a) {}
 
   void prepareRead(int);
   // read one element
@@ -106,7 +106,7 @@ QMap<QString, QString> DataInterfaceAsciiVector::metaStrings(const QString& fiel
 class DataInterfaceAsciiString : public DataSource::DataInterface<DataString>
 {
 public:
-  DataInterfaceAsciiString(AsciiSource& s) : ascii(s) {}
+  explicit DataInterfaceAsciiString(AsciiSource& s) : ascii(s) {}
 
   // read one element
   int read(const QString&, DataString::ReadInfo&);

src/datasources/ascii/asciidatareader.h

@@ -27,7 +27,7 @@ class AsciiSourceConfig;
 class AsciiDataReader
 {
   public:
-    AsciiDataReader(AsciiSourceConfig& config);
+    explicit AsciiDataReader(AsciiSourceConfig& config);
     ~AsciiDataReader();
 
     void clear();

src/libkst/datasource.cpp

@@ -183,8 +183,8 @@ QMap<QString, QString> DataSource::fileMetas() const
 
 void DataSource::resetFileWatcher() {
   if (_watcher) {
-    disconnect(_watcher, SIGNAL(fileChanged ( const QString & )), this, SLOT(checkUpdate()));
-    disconnect(_watcher, SIGNAL(directoryChanged ( const QString & )), this, SLOT(checkUpdate()));
+    disconnect(_watcher, SIGNAL(fileChanged(QString)), this, SLOT(checkUpdate()));
+    disconnect(_watcher, SIGNAL(directoryChanged(QString)), this, SLOT(checkUpdate()));
     delete _watcher;
     _watcher = 0L;
   }
@@ -231,8 +231,8 @@ void DataSource::setUpdateType(UpdateCheckType updateType, const QString& file)
     _watcher = new QFileSystemWatcher();
     const QString usedfile = (file.isEmpty() ? _filename : file);      
     _watcher->addPath(usedfile);
-    connect(_watcher, SIGNAL(fileChanged ( const QString & )), this, SLOT(checkUpdate()));
-    connect(_watcher, SIGNAL(directoryChanged ( const QString & )), this, SLOT(checkUpdate()));
+    connect(_watcher, SIGNAL(fileChanged(QString)), this, SLOT(checkUpdate()));
+    connect(_watcher, SIGNAL(directoryChanged(QString)), this, SLOT(checkUpdate()));
   }
 }
 

src/libkst/ksttimezone.h

@@ -23,7 +23,7 @@ namespace Kst {
 class KSTCORE_EXPORT KstTimeZone
 {
 public:
-    KstTimeZone(QString name = "GMT");
+    explicit KstTimeZone(QString name = "GMT");
     int gmtOffset(time_t t);
     bool setTZ(QString name);
     QString tzName() const {return _tzName;}

src/libkst/measuretime.h

@@ -21,7 +21,7 @@
 class KSTCORE_EXPORT MeasureTime
 {
   public:
-    MeasureTime(const QString& name);
+    explicit MeasureTime(const QString& name);
     ~MeasureTime();
 
     void restart();

src/libkst/rwlock.h

@@ -65,7 +65,7 @@ class KSTCORE_EXPORT KstRWLock {
 
 class KSTCORE_EXPORT KstReadLocker {
   public:
-    KstReadLocker(KstRWLock *l) : _l(l) { _l->readLock(); }
+    explicit KstReadLocker(KstRWLock *l) : _l(l) { _l->readLock(); }
     ~KstReadLocker() { _l->unlock(); }
   private:
     KstRWLock *_l;
@@ -74,7 +74,7 @@ class KSTCORE_EXPORT KstReadLocker {
 
 class KSTCORE_EXPORT KstWriteLocker {
   public:
-    KstWriteLocker(KstRWLock *l) : _l(l) { _l->writeLock(); }
+    explicit KstWriteLocker(KstRWLock *l) : _l(l) { _l->writeLock(); }
     ~KstWriteLocker() { _l->unlock(); }
   private:
     KstRWLock *_l;