.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/libkst/datasource.h

@@ -351,7 +351,7 @@ class KSTCORE_EXPORT DataSourceConfigWidget : public QWidget
   Q_OBJECT
 
   public:
-    DataSourceConfigWidget(QSettings&); // will be reparented later
+    explicit DataSourceConfigWidget(QSettings&); // will be reparented later
     virtual ~DataSourceConfigWidget();
 
     QSettings& settings() const;

src/libkst/datasourcepluginmanager.cpp

@@ -210,7 +210,7 @@ QStringList DataSourcePluginManager::pluginList() {
   init();
 
   QStringList plugins;
-  for (PluginList::ConstIterator it = _pluginList.begin(); it != _pluginList.end(); ++it) {
+  for (PluginList::ConstIterator it = _pluginList.constBegin(); it != _pluginList.constEnd(); ++it) {
     plugins += (*it).plugin->pluginName();
   }
 
@@ -220,12 +220,12 @@ QStringList DataSourcePluginManager::pluginList() {
 
 QString DataSourcePluginManager::pluginFileName(const QString& pluginName)
 {
-  for (PluginList::ConstIterator it = _pluginList.begin(); it != _pluginList.end(); ++it) {
+  for (PluginList::ConstIterator it = _pluginList.constBegin(); it != _pluginList.constEnd(); ++it) {
     if (it->plugin->pluginName() == pluginName) {
       return it->filePath;
     }
   }
-  return "not avaolable";
+  return "not available";
 }
 
 
@@ -394,7 +394,7 @@ bool DataSourcePluginManager::pluginHasConfigWidget(const QString& plugin) {
 
   PluginList info = _pluginList;
 
-  for (PluginList::ConstIterator it = info.begin(); it != info.end(); ++it) {
+  for (PluginList::ConstIterator it = info.constBegin(); it != info.constEnd(); ++it) {
     if ((*it).plugin->pluginName() == plugin) {
       return (*it).plugin->hasConfigWidget();
     }

src/libkst/debug.cpp

@@ -153,7 +153,7 @@ QString Debug::text() {
 
   body += i18n("\n\nData-source plugins:");
   QStringList dsp = dataSourcePlugins();
-  for (QStringList::ConstIterator it = dsp.begin(); it != dsp.end(); ++it) {
+  for (QStringList::ConstIterator it = dsp.constBegin(); it != dsp.constEnd(); ++it) {
     body += '\n';
     body += *it;
   }

src/libkstapp/changefiledialog.cpp

@@ -460,7 +460,7 @@ void ChangeFileDialog::apply() {
   foreach (PlotItemInterface *plot, Data::self()->plotList()) {
     PlotItem* plotItem = static_cast<PlotItem*>(plot);
     foreach (PlotRenderItem* renderItem, plotItem->renderItems()) {
-      for (QMap<RelationPtr, RelationPtr>::ConstIterator iter = duplicatedRelations.begin(); iter != duplicatedRelations.end(); ++iter) {
+      for (QMap<RelationPtr, RelationPtr>::ConstIterator iter = duplicatedRelations.constBegin(); iter != duplicatedRelations.constEnd(); ++iter) {
         if (renderItem->relationList().contains(kst_cast<Relation>(iter.key())) && !renderItem->relationList().contains(kst_cast<Relation>(iter.value()))) {
           renderItem->addRelation(kst_cast<Relation>(iter.value()));
         }

src/libkstapp/scriptserver.cpp

@@ -339,8 +339,8 @@ template<class T> QByteArray outputObjectList(
 
     ObjectList<T> vl=_store->getObjects<T>();
     QByteArray a;
-    typename ObjectList<T>::ConstIterator it = vl.begin();
-    for(; it != vl.end(); ++it) {
+    typename ObjectList<T>::ConstIterator it = vl.constBegin();
+    for(; it != vl.constEnd(); ++it) {
         SharedPtr<T> v = (*it);
         v->readLock();
         a+='['%v->Name()%']';

src/libkstmath/basicplugin.cpp

@@ -109,53 +109,53 @@ void BasicPlugin::showEditDialog() {
 
 
 VectorPtr BasicPlugin::inputVector(const QString& vector) const {
-  VectorMap::ConstIterator i = _inputVectors.find(vector);
-  if (i != _inputVectors.end())
+  VectorMap::ConstIterator i = _inputVectors.constFind(vector);
+  if (i != _inputVectors.constEnd())
     return *i;
   else
     return 0;
 }
 
 
 ScalarPtr BasicPlugin::inputScalar(const QString& scalar) const {
-  ScalarMap::ConstIterator i = _inputScalars.find(scalar);
-  if (i != _inputScalars.end())
+  ScalarMap::ConstIterator i = _inputScalars.constFind(scalar);
+  if (i != _inputScalars.constEnd())
     return *i;
   else
     return 0;
 }
 
 
 StringPtr BasicPlugin::inputString(const QString& string) const {
-  StringMap::ConstIterator i = _inputStrings.find(string);
-  if (i != _inputStrings.end())
+  StringMap::ConstIterator i = _inputStrings.constFind(string);
+  if (i != _inputStrings.constEnd())
     return *i;
   else
     return 0;
 }
 
 
 VectorPtr BasicPlugin::outputVector(const QString& vector) const {
-  VectorMap::ConstIterator i = _outputVectors.find(vector);
-  if (i != _outputVectors.end())
+  VectorMap::ConstIterator i = _outputVectors.constFind(vector);
+  if (i != _outputVectors.constEnd())
     return *i;
   else
     return 0;
 }
 
 
 ScalarPtr BasicPlugin::outputScalar(const QString& scalar) const {
-  ScalarMap::ConstIterator i = _outputScalars.find(scalar);
-  if (i != _outputScalars.end())
+  ScalarMap::ConstIterator i = _outputScalars.constFind(scalar);
+  if (i != _outputScalars.constEnd())
     return *i;
   else
     return 0;
 }
 
 
 StringPtr BasicPlugin::outputString(const QString& string) const {
-  StringMap::ConstIterator i = _outputStrings.find(string);
-  if (i != _outputStrings.end())
+  StringMap::ConstIterator i = _outputStrings.constFind(string);
+  if (i != _outputStrings.constEnd())
     return *i;
   else
     return 0;
@@ -348,24 +348,24 @@ void BasicPlugin::saveProperties(QXmlStreamWriter &s) {
 bool BasicPlugin::inputsExist() const {
   //First, check the inputVectors...
   QStringList iv = inputVectorList();
-  QStringList::ConstIterator ivI = iv.begin();
-  for (; ivI != iv.end(); ++ivI) {
+  QStringList::ConstIterator ivI = iv.constBegin();
+  for (; ivI != iv.constEnd(); ++ivI) {
     if (!inputVector(*ivI))
       return false;
   }
 
   //Now, check the inputScalars...
   QStringList is = inputScalarList();
-  QStringList::ConstIterator isI = is.begin();
-  for (; isI != is.end(); ++isI) {
+  QStringList::ConstIterator isI = is.constBegin();
+  for (; isI != is.constEnd(); ++isI) {
     if (!inputScalar(*isI))
       return false;
   }
 
   //Finally, check the inputStrings...
   QStringList istr = inputStringList();
-  QStringList::ConstIterator istrI = istr.begin();
-  for (; istrI != istr.end(); ++istrI) {
+  QStringList::ConstIterator istrI = istr.constBegin();
+  for (; istrI != istr.constEnd(); ++istrI) {
     if (!inputString(*istrI))
       return false;
   }
@@ -377,8 +377,8 @@ void BasicPlugin::updateOutput() const {
   //output vectors...
   //FIXME: _outputVectors should be used, not this string list!
   QStringList ov = outputVectorList();
-  QStringList::ConstIterator ovI = ov.begin();
-  for (; ovI != ov.end(); ++ovI) {
+  QStringList::ConstIterator ovI = ov.constBegin();
+  for (; ovI != ov.constEnd(); ++ovI) {
     if (VectorPtr o = outputVector(*ovI)) {
       Q_ASSERT(o->myLockStatus() == KstRWLock::WRITELOCKED);
       vectorRealloced(o, o->value(), o->length()); // why here?