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

[Adam Treat]

SVN commit 638398 by treat:

QMap<T>::Iterator data -> value


 M  +4 -4      extensionmgr.cpp  
 M  +7 -7      ksteventmonitorentry.cpp  
 M  +6 -6      kstfilterdialog.cpp  
 M  +5 -5      kstfitdialog.cpp  
 M  +4 -4      kstiface_impl.cpp  
 M  +1 -1      ksttoplevelview.cpp  


--- branches/work/kst/portto4/kst/src/libkstapp/extensionmgr.cpp #638397:638398
@@ -46,7 +46,7 @@
   QStringList disabled;
   QStringList enabled;
   for (QMap<QString,bool>::ConstIterator i = _extensions.begin(); i != _extensions.end(); ++i) {
-    if (i.data()) {
+    if (i.value()) {
       enabled += i.key();
     } else {
       disabled += i.key();
@@ -116,13 +116,13 @@
 void ExtensionMgr::updateExtensions() {
   for (QMap<QString,bool>::ConstIterator i = _extensions.begin(); i != _extensions.end(); ++i) {
     QMap<QString,KstExtension*>::Iterator j = _registry.find(i.key());
-    if (i.data()) {
+    if (i.value()) {
       if (j == _registry.end()) {      
         loadExtension(i.key());
       }
     } else {
       if (j != _registry.end()) {      
-        delete j.data();
+        delete j.value();
         // Does this automatically
         //_registry.remove(j);
       }
@@ -139,7 +139,7 @@
 
 void ExtensionMgr::unregister(KstExtension *inst) {
   for (QMap<QString,KstExtension*>::Iterator i = _registry.begin(); i != _registry.end(); ++i) {
-    if (i.data() == inst) {
+    if (i.value() == inst) {
       _registry.remove(i);
       break;
     }
--- branches/work/kst/portto4/kst/src/libkstapp/ksteventmonitorentry.cpp #638397:638398
@@ -200,7 +200,7 @@
   int ns = 1;
 
   for (KstVectorMap::ConstIterator i = _vectorsUsed.begin(); i != _vectorsUsed.end(); ++i) {
-    ns = qMax(ns, i.data()->length());
+    ns = qMax(ns, i.value()->length());
   }
 
   double *rawValuesX = 0L;
@@ -483,13 +483,13 @@
 
   // replace all occurences of outputVectors, outputScalars from oldObject
   for (KstVectorMap::ConstIterator j = oldObject->outputVectors().begin(); j != oldObject->outputVectors().end(); ++j) {
-    const QString oldTag = j.data()->tagName();
+    const QString oldTag = j.value()->tagName();
     const QString newTag = newObject->outputVectors()[j.key()]->tagName();
     newExp = newExp.replace("[" + oldTag + "]", "[" + newTag + "]");
   }
 
   for (KstScalarMap::ConstIterator j = oldObject->outputScalars().begin(); j != oldObject->outputScalars().end(); ++j) {
-    const QString oldTag = j.data()->tagName();
+    const QString oldTag = j.value()->tagName();
     const QString newTag = newObject->outputScalars()[j.key()]->tagName();
     newExp = newExp.replace("[" + oldTag + "]", "[" + newTag + "]");
   }
@@ -497,7 +497,7 @@
   // and dependencies on vector stats
   for (KstVectorMap::ConstIterator j = oldObject->outputVectors().begin(); j != oldObject->outputVectors().end(); ++j) {
     const Q3Dict<KstScalar>& scalarMap(newObject->outputVectors()[j.key()]->scalars());
-    Q3DictIterator<KstScalar> scalarDictIter(j.data()->scalars());
+    Q3DictIterator<KstScalar> scalarDictIter(j.value()->scalars());
     for (; scalarDictIter.current(); ++scalarDictIter) {
       const QString oldTag = scalarDictIter.current()->tagName();
       const QString newTag = scalarMap[scalarDictIter.currentKey()]->tagName();
@@ -508,7 +508,7 @@
   // and dependencies on matrix stats
   for (KstMatrixMap::ConstIterator j = oldObject->outputMatrices().begin(); j != oldObject->outputMatrices().end(); ++j) {
     const Q3Dict<KstScalar>& scalarMap(newObject->outputMatrices()[j.key()]->scalars());
-    Q3DictIterator<KstScalar> scalarDictIter(j.data()->scalars());
+    Q3DictIterator<KstScalar> scalarDictIter(j.value()->scalars());
     for (; scalarDictIter.current(); ++scalarDictIter) {
       const QString oldTag = scalarDictIter.current()->tagName();
       const QString newTag = scalarMap[scalarDictIter.currentKey()]->tagName();
@@ -562,7 +562,7 @@
   // check VectorsUsed in addition to _input*'s
   if (KstVectorPtr vect = kst_cast<KstVector>(p)) {
     for (KstVectorMap::ConstIterator j = _vectorsUsed.begin(); j != _vectorsUsed.end(); ++j) {
-      if (j.data() == vect) {
+      if (j.value() == vect) {
         return true;
       }
     }
@@ -570,7 +570,7 @@
     // check all connections from this expression to p
     for (KstVectorMap::ConstIterator j = obj->outputVectors().begin(); j != obj->outputVectors().end(); ++j) {
       for (KstVectorMap::ConstIterator k = _vectorsUsed.begin(); k != _vectorsUsed.end(); ++k) {
-        if (j.data() == k.data()) {
+        if (j.value() == k.value()) {
           return true;
         }
       }
--- branches/work/kst/portto4/kst/src/libkstapp/kstfilterdialog.cpp #638397:638398
@@ -99,12 +99,12 @@
   _w->PluginCombo->clear();
   _pluginList.clear();
   for (QMap<QString,Plugin::Data>::ConstIterator it = _pluginMap.begin(); it != _pluginMap.end(); ++it) {
-    if (it.data()._isFilter) {
-      _pluginList += it.data()._name;
-      _w->PluginCombo->insertItem(i18n("%1 (v%2) - %3").arg(it.data()._readableName)
-                              .arg(it.data()._version)
-                              .arg(it.data()._description));
-      if (it.data()._name == previous) {
+    if (it.value()._isFilter) {
+      _pluginList += it.value()._name;
+      _w->PluginCombo->insertItem(i18n("%1 (v%2) - %3").arg(it.value()._readableName)
+                              .arg(it.value()._version)
+                              .arg(it.value()._description));
+      if (it.value()._name == previous) {
         newFocus = cnt;
       }
       ++cnt;
--- branches/work/kst/portto4/kst/src/libkstapp/kstfitdialog.cpp #638397:638398
@@ -106,11 +106,11 @@
   _w->PluginCombo->clear();
   _pluginList.clear();
   for (it = _pluginMap.begin(); it != _pluginMap.end(); ++it) {
-    if (it.data()._isFit) {
-      if (!it.data()._isFitWeighted || _evector != "<None>") {
-        _pluginList += it.data()._name;
-        _w->PluginCombo->insertItem(i18n("%1 (v%2)").arg(it.data()._readableName).arg(it.data()._version));
-        if (it.data()._name == previous) {
+    if (it.value()._isFit) {
+      if (!it.value()._isFitWeighted || _evector != "<None>") {
+        _pluginList += it.value()._name;
+        _w->PluginCombo->insertItem(i18n("%1 (v%2)").arg(it.data()._readableName).arg(it.value()._version));
+        if (it.value()._name == previous) {
           newFocus = cnt;
         }
         ++cnt;
--- branches/work/kst/portto4/kst/src/libkstapp/kstiface_impl.cpp #638397:638398
@@ -161,8 +161,8 @@
   QMap<QString,Plugin::Data>::ConstIterator it;
 
   for (it = pluginList.begin(); it != pluginList.end(); ++it) {
-    if (it.data()._isFilter == false) {
-      rc += it.data()._name;
+    if (it.value()._isFilter == false) {
+      rc += it.value()._name;
     }
   }
 
@@ -177,8 +177,8 @@
   QMap<QString,Plugin::Data>::ConstIterator it;
 
   for (it = pluginList.begin(); it != pluginList.end(); ++it) {
-    if (it.data()._isFilter) {
-      rc += it.data()._name;
+    if (it.value()._isFilter) {
+      rc += it.value()._name;
     }
   }
 
--- branches/work/kst/portto4/kst/src/libkstapp/ksttoplevelview.cpp #638397:638398
@@ -1831,7 +1831,7 @@
 KstGfxMouseHandler *KstTopLevelView::handlerForObject(const QString& objType) {
   QMap<QString,KstGfxMouseHandler*>::Iterator i = _handlers.find(objType);
   if (i != _handlers.end()) {
-    return i.data();
+    return i.value();
   }
 
   KstGfxMouseHandler *rc = KstViewObjectFactory::self()->createHandlerFor(objType);