Branch: master

f70ffdc4 2019-06-01 07:21:25 Michele Calgaro
Adjusted to use new TQStringVariantMap type.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M kommander/editor/metadatabase.cpp
M kommander/editor/metadatabase.h
M kommander/editor/resource.cpp

kommander/editor/metadatabase.cpp

diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp
index 23e9761..c84e115 100644
--- a/kommander/editor/metadatabase.cpp
+++ b/kommander/editor/metadatabase.cpp
@@ -48,7 +48,7 @@
 public:
     TQObject *object;
     TQStringList changedProperties;
-    TQMap<TQString,TQVariant> fakeProperties;
+    TQStringVariantMap fakeProperties;
     TQMap<TQString, TQString> propertyComments;
     int spacing, margin;
     TQValueList<MetaDataBase::Connection> connections;
@@ -237,14 +237,14 @@
                   o, o->name(), o->className() );
         return TQVariant();
     }
-    TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.find( property );
+    TQStringVariantMap::Iterator it = r->fakeProperties.find( property );
     if ( it != r->fakeProperties.end() )
         return r->fakeProperties[property];
     return WidgetFactory::defaultValue( o, property );
 
 }
 
-TQMap<TQString,TQVariant>* MetaDataBase::fakeProperties( TQObject* o )
+TQStringVariantMap* MetaDataBase::fakeProperties( TQObject* o )
 {
     setupDataBase();
     MetaDataBaseRecord *r = db->find( (void*)o );

kommander/editor/metadatabase.h

diff --git a/kommander/editor/metadatabase.h b/kommander/editor/metadatabase.h
index 11254f0..cb73130 100644
--- a/kommander/editor/metadatabase.h
+++ b/kommander/editor/metadatabase.h
@@ -143,7 +143,7 @@
 
     static void setFakeProperty( TQObject *o, const TQString &property, const TQVariant& value );
     static TQVariant fakeProperty( TQObject * o, const TQString &property );
-    static TQMap<TQString,TQVariant>* fakeProperties( TQObject* o );
+    static TQStringVariantMap* fakeProperties( TQObject* o );
 
     static void setSpacing( TQObject *o, int spacing );
     static int spacing( TQObject *o );

kommander/editor/resource.cpp

diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp
index d9d3fa7..e08d25c 100644
--- a/kommander/editor/resource.cpp
+++ b/kommander/editor/resource.cpp
@@ -1044,8 +1044,8 @@
     }
 
     if ( w->isWidgetType() && MetaDataBase::fakeProperties( w ) ) {
-	TQMap<TQString, TQVariant>* fakeProperties = MetaDataBase::fakeProperties( w );
-	for ( TQMap<TQString, TQVariant>::Iterator fake = fakeProperties->begin();
+	TQStringVariantMap* fakeProperties = MetaDataBase::fakeProperties( w );
+	for ( TQStringVariantMap::Iterator fake = fakeProperties->begin();
 	      fake != fakeProperties->end(); ++fake ) {
 	    if ( MetaDataBase::isPropertyChanged( w, fake.key() ) ) {
 		if ( w->inherits( "CustomWidget" ) ) {