diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-06-01 20:03:50 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-06-01 20:03:50 +0900 |
| commit | 09f45583d97c73e309a93447707b0acebfbddea8 (patch) | |
| tree | d0941a11d3399f967e2c8ff8c10e6d0dff845e0f /tools/designer | |
| parent | 8e3ec3023bdb4e1c61f0b5db945a09628e4fbae2 (diff) | |
| download | qt3-09f45583d97c73e309a93447707b0acebfbddea8.tar.gz qt3-09f45583d97c73e309a93447707b0acebfbddea8.zip | |
Adjusted to use new QStringVariantMap type.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tools/designer')
| -rw-r--r-- | tools/designer/designer/metadatabase.cpp | 6 | ||||
| -rw-r--r-- | tools/designer/designer/metadatabase.h | 2 | ||||
| -rw-r--r-- | tools/designer/designer/resource.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp index 48422b1..9aba982 100644 --- a/tools/designer/designer/metadatabase.cpp +++ b/tools/designer/designer/metadatabase.cpp @@ -64,7 +64,7 @@ class MetaDataBaseRecord public: QObject *object; QStringList changedProperties; - QMap<QString,QVariant> fakeProperties; + QStringVariantMap fakeProperties; QMap<QString, QString> propertyComments; int spacing, margin; QString resizeMode; @@ -272,14 +272,14 @@ QVariant MetaDataBase::fakeProperty( QObject * o, const QString &property) o, o->name(), o->className() ); return QVariant(); } - QMap<QString, QVariant>::Iterator it = r->fakeProperties.find( property ); + QStringVariantMap::Iterator it = r->fakeProperties.find( property ); if ( it != r->fakeProperties.end() ) return r->fakeProperties[property]; return WidgetFactory::defaultValue( o, property ); } -QMap<QString,QVariant>* MetaDataBase::fakeProperties( QObject* o ) +QStringVariantMap* MetaDataBase::fakeProperties( QObject* o ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); diff --git a/tools/designer/designer/metadatabase.h b/tools/designer/designer/metadatabase.h index 707cc69..dc34d24 100644 --- a/tools/designer/designer/metadatabase.h +++ b/tools/designer/designer/metadatabase.h @@ -162,7 +162,7 @@ public: static void setFakeProperty( QObject *o, const QString &property, const QVariant& value ); static QVariant fakeProperty( QObject * o, const QString &property ); - static QMap<QString,QVariant>* fakeProperties( QObject* o ); + static QStringVariantMap* fakeProperties( QObject* o ); static void setSpacing( QObject *o, int spacing ); static int spacing( QObject *o ); diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp index b6fc689..2ba2eb1 100644 --- a/tools/designer/designer/resource.cpp +++ b/tools/designer/designer/resource.cpp @@ -1501,8 +1501,8 @@ void Resource::saveObjectProperties( QObject *w, QTextStream &ts, int indent ) } if ( w->isWidgetType() && MetaDataBase::fakeProperties( w ) ) { - QMap<QString, QVariant>* fakeProperties = MetaDataBase::fakeProperties( w ); - for ( QMap<QString, QVariant>::Iterator fake = fakeProperties->begin(); + QStringVariantMap* fakeProperties = MetaDataBase::fakeProperties( w ); + for ( QStringVariantMap::Iterator fake = fakeProperties->begin(); fake != fakeProperties->end(); ++fake ) { if ( MetaDataBase::isPropertyChanged( w, fake.key() ) ) { if ( w->inherits("CustomWidget") ) { |