Adjusted to use new TQStringVariantMap type.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

3 files changed, 6 insertions, 6 deletions

diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index c6d689f78..47021959e 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -340,8 +340,8 @@ void KexiFormView::updateValuesForSubproperties()
 			= dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>( it.current()->widget() );
 		if (subpropIface && subpropIface->subwidget() && it.current()->subproperties() ) {
 			TQWidget *subwidget = subpropIface->subwidget();
-			TQMap<TQString, TQVariant>* subprops = it.current()->subproperties();
-			for (TQMapConstIterator<TQString, TQVariant> subpropIt = subprops->constBegin(); subpropIt!=subprops->constEnd(); ++subpropIt) {
+			TQStringVariantMap* subprops = it.current()->subproperties();
+			for (TQStringVariantMapConstIterator subpropIt = subprops->constBegin(); subpropIt!=subprops->constEnd(); ++subpropIt) {
 				kexipluginsdbg << "KexiFormView::loadForm(): delayed setting of the subproperty: widget="
 					<< it.current()->widget()->name() << " prop=" << subpropIt.key() << " val=" << subpropIt.data() << endl;
 
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index c87cb5b4d..3bb5629d1 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -436,8 +436,8 @@ class ListBox : public TQListBox
 					//kdDebug() << "  child name=" << n << " value=" << v << endl;
 					switch( v.type() ) {
 						/* case TQVariant::Map: {
-							const TQMap<TQString,TQVariant> map = v.toMap();
-							for(TQMap<TQString,TQVariant>::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it)
+							const TQStringVariantMap map = v.toMap();
+							for(TQStringVariantMap::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it)
 								m_items.append(it.key());
 						} break; */
 						case TQVariant::List: {
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
index d44c59b9c..e991d61dc 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
@@ -318,8 +318,8 @@ tristate KexiScriptDesignView::storeData(bool /*dontAsk*/)
     Kross::Api::InterpreterInfo* info = Kross::Api::Manager::scriptManager()->getInterpreterInfo(language);
     if(info) {
         Kross::Api::InterpreterInfo::Option::Map defoptions = info->getOptions();
-        TQMap<TQString, TQVariant>& options = d->scriptaction->getOptions();
-	TQMap<TQString, TQVariant>::ConstIterator it, end( options.constEnd() );
+        TQStringVariantMap& options = d->scriptaction->getOptions();
+	TQStringVariantMap::ConstIterator it, end( options.constEnd() );
         for( it = options.constBegin(); it != end; ++it) {
             if( defoptions.contains(it.key()) ) { // only remember options which the InterpreterInfo knows about...
                 scriptelem.setAttribute(it.key(), it.data().toString());