Adjusted to use new TQStringVariantMap type.

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

chalk/core/kis_filter_configuration.cc

@@ -82,7 +82,7 @@ TQString KisFilterConfiguration::toString()
 
     doc.appendChild( root );
 
-    TQMap<TQString, TQVariant>::Iterator it;
+    TQStringVariantMap::Iterator it;
     for ( it = m_properties.begin(); it != m_properties.end(); ++it ) {
         TQDomElement e = doc.createElement( "property" );
         e.setAttribute( "name", it.key().latin1() );
@@ -178,7 +178,7 @@ TQString KisFilterConfiguration::getString(const TQString & name, TQString def)
 
 void KisFilterConfiguration::dump()
 {
-    TQMap<TQString, TQVariant>::Iterator it;
+    TQStringVariantMap::Iterator it;
     for ( it = m_properties.begin(); it != m_properties.end(); ++it ) {
     }
 

chalk/core/kis_filter_configuration.h

@@ -98,7 +98,7 @@ protected:
 
     TQString m_name;
     TQ_INT32 m_version;
-    TQMap<TQString, TQVariant> m_properties;
+    TQStringVariantMap m_properties;
     
 };
 

kexi/formeditor/formIO.cpp

@@ -987,9 +987,9 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
 		savePropertyElement(tclass, domDoc, "property", "buddy", ((TQLabel*)item->widget())->buddy()->name());
 
 	// We save every property in the modifProp list of the ObjectTreeItem
-	TQVariantMap *map = new TQVariantMap( *(item->modifiedProperties()) );
-	TQMap<TQString,TQVariant>::ConstIterator endIt = map->constEnd();
-	for(TQMap<TQString,TQVariant>::ConstIterator it = map->constBegin(); it != endIt; ++it)
+	TQStringVariantMap *map = new TQStringVariantMap( *(item->modifiedProperties()) );
+	TQStringVariantMap::ConstIterator endIt = map->constEnd();
+	for(TQStringVariantMap::ConstIterator it = map->constBegin(); it != endIt; ++it)
 	{
 		const TQCString name( it.key().latin1() );
 		if(name == "hAlign" || name == "vAlign" || name == "wordbreak" || name == "alignment") {

kexi/formeditor/objecttree.cpp

@@ -90,7 +90,7 @@ void
 ObjectTreeItem::addSubproperty(const TQCString &property, const TQVariant& value)
 {
 	if (!m_subprops)
-		m_subprops = new TQMap<TQString, TQVariant>();
+		m_subprops = new TQStringVariantMap();
 	if (!m_props.contains(property))
 		m_subprops->insert( property, value );
 }

kexi/formeditor/objecttree.h

@@ -50,12 +50,6 @@ typedef TQDict<ObjectTreeItem> ObjectTreeDict;
 //! @short An iterator for ObjectTreeDict.
 typedef TQDictIterator<ObjectTreeItem> ObjectTreeDictIterator;
 
-//! @short A TQString -> TQVarinat map.
-typedef TQMap<TQString, TQVariant> TQVariantMap;
-
-//! @short A const iterator for TQVariantMap.
-typedef TQMapConstIterator<TQString, TQVariant> TQVariantMapConstIterator;
-
 /*! 
  @short An item representing a widget
  Holds the properties of a widget (classname, name, parent, children ..).
@@ -74,9 +68,9 @@ class KFORMEDITOR_EXPORT ObjectTreeItem
 		ObjectTreeItem* parent() const { return m_parent; }
 		ObjectTreeList* children() { return &m_children; }
 
-		/*! \return a TQMap<TQString, TQVariant> of all modified properties for this widget.
+		/*! \return a TQStringVariantMap of all modified properties for this widget.
 		  The TQVariant is the old value (ie first value) of the property whose name is the TQString. */
-		const TQVariantMap* modifiedProperties() const { return &m_props;}
+		const TQStringVariantMap* modifiedProperties() const { return &m_props;}
 
 		//! \return the widget's Container, or 0 if the widget is not a Container.
 		Container* container() const { return m_container;}
@@ -103,7 +97,7 @@ class KFORMEDITOR_EXPORT ObjectTreeItem
 
 		/*! \return subproperties for this item, added by addSubproperty() 
 		 or 0 is there are no subproperties. */
-		TQMap<TQString, TQVariant>* subproperties() const { return m_subprops; }
+		TQStringVariantMap* subproperties() const { return m_subprops; }
 
 		void setPixmapName(const TQCString &property, const TQString &name);
 		TQString pixmapName(const TQCString &property);
@@ -123,8 +117,8 @@ class KFORMEDITOR_EXPORT ObjectTreeItem
 		TQString m_name;
 		ObjectTreeList	m_children;
 		TQGuardedPtr<Container> m_container;
-		TQMap<TQString, TQVariant> m_props;
-		TQMap<TQString, TQVariant> *m_subprops;
+		TQStringVariantMap m_props;
+		TQStringVariantMap *m_subprops;
 		TQString  m_unknownProps;
 		TQMap<TQCString, TQString> m_pixmapNames;
 		ObjectTreeItem* m_parent;

kexi/formeditor/widgetpropertyset.cpp

@@ -275,8 +275,8 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w)
 	if(!tree)
 		return;
 
-	const TQVariantMap* modifiedProperties = tree->modifiedProperties();
-	TQVariantMapConstIterator modifiedPropertiesIt;
+	const TQStringVariantMap* modifiedProperties = tree->modifiedProperties();
+	TQStringVariantMapConstIterator modifiedPropertiesIt;
 	bool isTopLevel = KFormDesigner::FormManager::self()->isTopLevel(w);
 //	int count = 0;
 	KoProperty::Property *newProp = 0;
@@ -416,7 +416,7 @@ WidgetPropertySet::updatePropertyValue(ObjectTreeItem *tree, const char *propert
 	KoProperty::Property p( d->set[propertyName] );
 
 //! \todo what about set properties, and lists properties
-	TQMap<TQString, TQVariant>::ConstIterator it( tree->modifiedProperties()->find(propertyName) );
+	TQStringVariantMap::ConstIterator it( tree->modifiedProperties()->find(propertyName) );
 	if (it != tree->modifiedProperties()->constEnd()) {
 		blockSignals(true);
 		if(meta && meta->isEnumType()) {
@@ -1081,7 +1081,7 @@ WidgetPropertySet::valueCaption(const TQCString &name)
 KoProperty::Property::ListData*
 WidgetPropertySet::createValueList(WidgetInfo *winfo, const TQStringList &list)
 {
-//	TQMap <TQString, TQVariant> map;
+//	TQStringVariantMap map;
 	TQStringList names;
 	TQStringList::ConstIterator endIt = list.end();
 	for(TQStringList::ConstIterator it = list.begin(); it != endIt; ++it) {

kexi/kexidb/roweditbuffer.h

@@ -73,7 +73,7 @@ namespace KexiDB {
 */
 class KEXI_DB_EXPORT RowEditBuffer {
 public:
-	typedef TQMap<TQString,TQVariant> SimpleMap;
+	typedef TQStringVariantMap SimpleMap;
 	typedef TQMap<QueryColumnInfo*,TQVariant> DBMap;
 
 	RowEditBuffer(bool dbAwareBuffer);

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;
 

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: {

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());

lib/koproperty/customproperty.cpp

@@ -270,7 +270,7 @@ SizePolicyCustomProperty::SizePolicyCustomProperty(Property *property)
 : CustomProperty(property)
 {
 	if(property && (property->type() == SizePolicy) ) {
-//		TQMap<TQString, TQVariant> spValues;
+//		TQStringVariantMap spValues;
 		TQValueList<TQVariant> keys;
 		keys << TQSizePolicy::Fixed
 			<< TQSizePolicy::Minimum

lib/koproperty/editors/combobox.cpp

@@ -178,7 +178,7 @@ ComboBox::setReadOnlyInternal(bool readOnly)
 /*TQString
 ComboBox::keyForValue(const TQVariant &value)
 {
-	const TQMap<TQString, TQVariant> *list = property()->valueList();
+	const TQStringVariantMap *list = property()->valueList();
 	Property::ListData *list = property()->listData();
 
 	if (!list)
@@ -186,8 +186,8 @@ ComboBox::keyForValue(const TQVariant &value)
 	int idx = listData->keys.findIndex( value );
 
 
-	TQMap<TQString, TQVariant>::ConstIterator endIt = list->constEnd();
-	for(TQMap<TQString, TQVariant>::ConstIterator it = list->constBegin(); it != endIt; ++it) {
+	TQStringVariantMap::ConstIterator endIt = list->constEnd();
+	for(TQStringVariantMap::ConstIterator it = list->constBegin(); it != endIt; ++it) {
 		if(it.data() == value)
 			return it.key();
 	}

lib/koproperty/editors/cursoredit.cpp

@@ -31,7 +31,7 @@
 
 using namespace KoProperty;
 
-//TQMap<TQString, TQVariant> *CursorEdit::m_spValues = 0;
+//TQStringVariantMap *CursorEdit::m_spValues = 0;
 Property::ListData *m_cursorListData = 0;
 
 
@@ -40,7 +40,7 @@ CursorEdit::CursorEdit(Property *property, TQWidget *parent, const char *name)
 {
 	/*
 	if(!m_spValues) {
-		m_spValues = new TQMap<TQString, TQVariant>();
+		m_spValues = new TQStringVariantMap();
 		(*m_spValues)[i18n("Arrow")] = TQt::ArrowCursor;
 		(*m_spValues)[i18n("Up Arrow")] = TQt::UpArrowCursor;
 		(*m_spValues)[i18n("Cross")] = TQt::CrossCursor;

lib/koproperty/editors/cursoredit.h

@@ -43,7 +43,7 @@ class KOPROPERTY_EXPORT CursorEdit : public ComboBox
 		virtual void drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value);
 
 	private:
-		static TQMap<TQString, TQVariant> *m_spValues;
+		static TQStringVariantMap *m_spValues;
 };
 
 }

lib/koproperty/editors/sizepolicyedit.cpp

@@ -32,7 +32,7 @@
 
 using namespace KoProperty;
 
-TQMap<TQString, TQVariant> *SizePolicyEdit::m_spValues = 0;
+TQStringVariantMap *SizePolicyEdit::m_spValues = 0;
 
 SizePolicyEdit::SizePolicyEdit(Property *property, TQWidget *parent, const char *name)
  : Widget(property, parent, name)
@@ -50,7 +50,7 @@ SizePolicyEdit::SizePolicyEdit(Property *property, TQWidget *parent, const char
 
 
 	if(!m_spValues) {
-		m_spValues = new TQMap<TQString, TQVariant>();
+		m_spValues = new TQStringVariantMap();
 		(*m_spValues)[i18n("Size Policy", "Fixed")] = TQSizePolicy::Fixed;
 		(*m_spValues)[i18n("Size Policy", "Minimum")] = TQSizePolicy::Minimum;
 		(*m_spValues)[i18n("Size Policy", "Maximum")] = TQSizePolicy::Maximum;
@@ -105,8 +105,8 @@ SizePolicyEdit::findDescription(const TQVariant &value) const
 	if(!m_spValues)
 		return TQString();
 
-	TQMap<TQString, TQVariant>::ConstIterator endIt = m_spValues->constEnd();
-	for (TQMap<TQString, TQVariant>::ConstIterator it = m_spValues->constBegin(); it != endIt; ++ it) {
+	TQStringVariantMap::ConstIterator endIt = m_spValues->constEnd();
+	for (TQStringVariantMap::ConstIterator it = m_spValues->constBegin(); it != endIt; ++ it) {
 		if (it.data() == value)
 			return it.key();
 	}

lib/koproperty/editors/sizepolicyedit.h

@@ -52,7 +52,7 @@ class KOPROPERTY_EXPORT SizePolicyEdit : public Widget
 	private:
 		TQVariant  m_value;
 		TQLabel  *m_edit;
-		static TQMap<TQString, TQVariant> *m_spValues;
+		static TQStringVariantMap *m_spValues;
 };
 
 }

lib/koproperty/property.cpp

@@ -78,7 +78,7 @@ class PropertyPrivate
 	TQVariant oldValue;
 	/*! The string-to-value correspondence list of the property.*/
 	Property::ListData* listData;
-//	TQMap<TQString, TQVariant> *valueList;
+//	TQStringVariantMap *valueList;
 	TQString icon;
 
 	bool changed : 1;
@@ -153,10 +153,10 @@ TQStringList Property::ListData::keysAsStringList() const
 /////////////////////////////////////////////////////////////////
 
 /*
-KOPROPERTY_EXPORT TQMap<TQString, TQVariant>
+KOPROPERTY_EXPORT TQStringVariantMap
 KoProperty::createValueListFromStringLists(const TQStringList &keys, const TQStringList &values)
 {
-	TQMap<TQString, TQVariant> map;
+	TQStringVariantMap map;
 	if(keys.count() != values.count())
 		return map;
 
@@ -423,7 +423,7 @@ Property::resetValue()
 	}
 }
 
-//const TQMap<TQString, TQVariant>*
+//const TQStringVariantMap*
 Property::ListData*
 Property::listData() const
 {
@@ -431,10 +431,10 @@ Property::listData() const
 }
 
 void
-Property::setListData(ListData* list) //const TQMap<TQString, TQVariant> &list)
+Property::setListData(ListData* list) //const TQStringVariantMap &list)
 {
 //	if(!d->valueList)
-//		d->valueList = new TQMap<TQString, TQVariant>();
+//		d->valueList = new TQStringVariantMap();
 	if (list == d->listData)
 		return;
 	delete d->listData;
@@ -448,7 +448,7 @@ Property::setListData(const TQStringList &keys, const TQStringList &names)
 	setListData(list);
 
 //	if(!d->valueList)
-//		d->valueList = new TQMap<TQString, TQVariant>();
+//		d->valueList = new TQStringVariantMap();
 //	*(d->valueList) = createValueListFromStringLists(keys, values);
 }
 
@@ -590,7 +590,7 @@ Property::operator= (const Property &property)
 	d->options = property.d->options;
 
 	if(property.d->listData) {
-		d->listData = new ListData(*property.d->listData); //TQMap<TQString, TQVariant>(*(property.d->valueList));
+		d->listData = new ListData(*property.d->listData); //TQStringVariantMap(*(property.d->valueList));
 	}
 	if(property.d->custom) {
 		d->custom = FactoryManager::self()->createCustomProperty(this);

lib/koproperty/property.h

@@ -56,7 +56,7 @@ class CustomProperty;
 class Set;
 
 ///*! Helper function to create a value list from two string lists. */
-//KOPROPERTY_EXPORT TQMap<TQString, TQVariant> createValueListFromStringLists(
+//KOPROPERTY_EXPORT TQStringVariantMap createValueListFromStringLists(
 //	const TQStringList &keys, const TQStringList &values);
 
 /*! PropertyType.
@@ -66,7 +66,7 @@ enum PropertyType {
 	//standard supported TQVariant types
 	Auto = TQVariant::Invalid - 1,
 	Invalid = TQVariant::Invalid   /**<invalid property type*/,
-	Map = TQVariant::Map           /**<TQMap<TQString, TQVariant>*/,
+	Map = TQVariant::Map           /**<TQStringVariantMap*/,
 	List = TQVariant::List         /**<TQValueList<TQVariant>*/,
 	String = TQVariant::String     /**<string*/,
 	StringList = TQVariant::StringList  /**<string list*/,

lib/kross/main/scriptcontainer.cpp

@@ -77,7 +77,7 @@ namespace Kross { namespace Api {
             * Map of options that overwritte the \a InterpreterInfo::Option::Map
             * standard options.
             */
-            TQMap<TQString, TQVariant> options;
+            TQStringVariantMap options;
 
     };
 
@@ -144,7 +144,7 @@ void ScriptContainer::setFile(const TQString& scriptfile)
     d->scriptfile = scriptfile;
 }
 
-TQMap<TQString, TQVariant>& ScriptContainer::getOptions()
+TQStringVariantMap& ScriptContainer::getOptions()
 {
     return d->options;
 }

lib/kross/main/scriptcontainer.h

@@ -132,7 +132,7 @@ namespace Kross { namespace Api {
              * The options are returned call-by-ref, so you are able to
              * manipulate them.
              */
-            TQMap<TQString, TQVariant>& getOptions();
+            TQStringVariantMap& getOptions();
 
             /**
              * \return the value of the option defined with \p name .

lib/kross/python/pythonextension.cpp

@@ -262,13 +262,13 @@ const Py::List PythonExtension::toPyObject(const TQStringList& list)
     return l;
 }
 
-const Py::Dict PythonExtension::toPyObject(const TQMap<TQString, TQVariant>& map)
+const Py::Dict PythonExtension::toPyObject(const TQStringVariantMap& map)
 {
 #ifdef KROSS_PYTHON_EXTENSION_TOPYOBJECT_DEBUG
-    krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(TQMap<TQString,TQVariant>)") );
+    krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(TQStringVariantMap)") );
 #endif
     Py::Dict d;
-    for(TQMap<TQString, TQVariant>::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it)
+    for(TQStringVariantMap::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it)
         d.setItem(it.key().latin1(), toPyObject(it.data()));
     return d;
 }

lib/kross/python/pythonextension.h

@@ -158,7 +158,7 @@ namespace Kross { namespace Python {
              * \param map The TQMap to convert.
              * \return The to a Py::Dict converted TQMap.
              */
-            static const Py::Dict toPyObject(const TQMap<TQString, TQVariant>& map);
+            static const Py::Dict toPyObject(const TQStringVariantMap& map);
 
             /**
              * Converts a TQValueList to a Py::List.

lib/kross/ruby/rubyextension.cpp

@@ -286,10 +286,10 @@ VALUE RubyExtension::toVALUE(TQStringList list)
 }
 
 
-VALUE RubyExtension::toVALUE(TQMap<TQString, TQVariant> map)
+VALUE RubyExtension::toVALUE(TQStringVariantMap map)
 {
     VALUE h = rb_hash_new();
-    for(TQMap<TQString, TQVariant>::Iterator it = map.begin(); it != map.end(); ++it)
+    for(TQStringVariantMap::Iterator it = map.begin(); it != map.end(); ++it)
         rb_hash_aset(h, toVALUE(it.key()), toVALUE(it.data()) );
     return h;
 

lib/kross/ruby/rubyextension.h

@@ -122,7 +122,7 @@ class RubyExtension{
          * \param map The TQMap to convert.
          * \return The converted TQMap.
          */
-        static VALUE toVALUE(TQMap<TQString, TQVariant> map);
+        static VALUE toVALUE(TQStringVariantMap map);
 
         /**
          * Converts a TQValueList to a VALUE.

lib/kross/ruby/rubyvariant.h

@@ -496,28 +496,28 @@ namespace Kross {
 #if 0
     /// \internal
     template<>
-    struct RubyType<TQVariantMap>
+    struct RubyType<TQStringVariantMap>
     {
-        inline static VALUE toVALUE(const TQVariantMap& map) {
+        inline static VALUE toVALUE(const TQStringVariantMap& map) {
             VALUE h = rb_hash_new();
-            TQMap<TQString, TQVariant>::ConstIterator it(map.constBegin()), end(map.end());
+            TQStringVariantMap::ConstIterator it(map.constBegin()), end(map.end());
             for(; it != end; ++it)
                 rb_hash_aset(h, RubyType<TQString>::toVALUE(it.key()), RubyType<TQVariant>::toVALUE(it.value()) );
             return h;
         }
         inline static int convertHash(VALUE key, VALUE value, VALUE  vmap) {
-            TQVariantMap* map; 
-            Data_Get_Struct(vmap, TQVariantMap, map);
+            TQStringVariantMap* map;
+            Data_Get_Struct(vmap, TQStringVariantMap, map);
             if (key != TQundef)
                 map->insert(STR2CSTR(key), RubyType<TQVariant>::toVariant(value));
             return ST_CONTINUE;
         }
-        inline static TQVariantMap toVariant(VALUE value) {
+        inline static TQStringVariantMap toVariant(VALUE value) {
             if( TYPE(value) != T_HASH ) {
-                rb_raise(rb_eTypeError, "TQVariantMap must be a hash");
-                return TQVariantMap();
+                rb_raise(rb_eTypeError, "TQStringVariantMap must be a hash");
+                return TQStringVariantMap();
             }
-            TQVariantMap map;
+            TQStringVariantMap map;
             VALUE vmap = Data_Wrap_Struct(rb_cObject, 0,0, &map);
             rb_hash_foreach(value, (int (*)(...))convertHash, vmap);
             return map;