summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2019-06-01 19:44:57 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2019-06-01 19:44:57 +0900
commitfd634b0c147bef3af1fa68454e4d8a9cda4f9243 (patch)
treecab9beb8519adda0bfb69ae97b586151c498d704
parentd795939c03a8250fa654992ff4ae807831c9292c (diff)
downloadtqt3-fd634b0c147bef3af1fa68454e4d8a9cda4f9243.tar.gz
tqt3-fd634b0c147bef3af1fa68454e4d8a9cda4f9243.zip
Adjusted to use new TQStringVariantMap type.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--src/sql/ntqsqlquery.h2
-rw-r--r--src/sql/qsqlextension_p.cpp4
-rw-r--r--src/sql/qsqlextension_p.h2
-rw-r--r--src/sql/qsqlquery.cpp8
-rw-r--r--tools/designer/designer/metadatabase.cpp6
-rw-r--r--tools/designer/designer/metadatabase.h2
-rw-r--r--tools/designer/designer/resource.cpp4
7 files changed, 14 insertions, 14 deletions
diff --git a/src/sql/ntqsqlquery.h b/src/sql/ntqsqlquery.h
index 80776251b..7cba01016 100644
--- a/src/sql/ntqsqlquery.h
+++ b/src/sql/ntqsqlquery.h
@@ -114,7 +114,7 @@ public:
void addBindValue( const TQVariant& val, TQSql::ParameterType type );
TQVariant boundValue( const TQString& placeholder ) const;
TQVariant boundValue( int pos ) const;
- TQMap<TQString, TQVariant> boundValues() const;
+ TQStringVariantMap boundValues() const;
TQString executedQuery() const;
protected:
diff --git a/src/sql/qsqlextension_p.cpp b/src/sql/qsqlextension_p.cpp
index 190f6d21b..1ce7b23f4 100644
--- a/src/sql/qsqlextension_p.cpp
+++ b/src/sql/qsqlextension_p.cpp
@@ -128,10 +128,10 @@ TQVariant TQSqlExtension::boundValue( int pos ) const
return values[ index[ pos ] ].value;
}
-TQMap<TQString, TQVariant> TQSqlExtension::boundValues() const
+TQStringVariantMap TQSqlExtension::boundValues() const
{
TQMap<TQString, TQSqlParam>::ConstIterator it;
- TQMap<TQString, TQVariant> m;
+ TQStringVariantMap m;
if ( bindm == BindByName ) {
for ( it = values.begin(); it != values.end(); ++it )
m.insert( it.key(), it.data().value );
diff --git a/src/sql/qsqlextension_p.h b/src/sql/qsqlextension_p.h
index aafc88347..d4eb8d778 100644
--- a/src/sql/qsqlextension_p.h
+++ b/src/sql/qsqlextension_p.h
@@ -102,7 +102,7 @@ public:
virtual TQVariant parameterValue( int pos );
TQVariant boundValue( const TQString& holder ) const;
TQVariant boundValue( int pos ) const;
- TQMap<TQString, TQVariant> boundValues() const;
+ TQStringVariantMap boundValues() const;
void clear();
void clearValues();
void clearIndex();
diff --git a/src/sql/qsqlquery.cpp b/src/sql/qsqlquery.cpp
index 829e46947..35d22b5d8 100644
--- a/src/sql/qsqlquery.cpp
+++ b/src/sql/qsqlquery.cpp
@@ -1173,8 +1173,8 @@ TQVariant TQSqlQuery::boundValue( int pos ) const
TQSqlQuery query;
...
// Examine the bound values - bound using named binding
- TQMap<TQString, TQVariant>::ConstIterator it;
- TQMap<TQString, TQVariant> vals = query.boundValues();
+ TQStringVariantMap::ConstIterator it;
+ TQStringVariantMap vals = query.boundValues();
for ( it = vals.begin(); it != vals.end(); ++it )
tqWarning( "Placeholder: " + it.key() + ", Value: " + (*it).toString() );
...
@@ -1189,10 +1189,10 @@ TQVariant TQSqlQuery::boundValue( int pos ) const
\endcode
*/
-TQMap<TQString,TQVariant> TQSqlQuery::boundValues() const
+TQStringVariantMap TQSqlQuery::boundValues() const
{
if ( !d->sqlResult || !d->sqlResult->extension() )
- return TQMap<TQString,TQVariant>();
+ return TQStringVariantMap();
return d->sqlResult->extension()->boundValues();
}
diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp
index 0afd4b428..bdfd5cb97 100644
--- a/tools/designer/designer/metadatabase.cpp
+++ b/tools/designer/designer/metadatabase.cpp
@@ -64,7 +64,7 @@ class MetaDataBaseRecord
public:
TQObject *object;
TQStringList changedProperties;
- TQMap<TQString,TQVariant> fakeProperties;
+ TQStringVariantMap fakeProperties;
TQMap<TQString, TQString> propertyComments;
int spacing, margin;
TQString resizeMode;
@@ -272,14 +272,14 @@ TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property)
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 );
diff --git a/tools/designer/designer/metadatabase.h b/tools/designer/designer/metadatabase.h
index 92e989000..21711c51d 100644
--- a/tools/designer/designer/metadatabase.h
+++ b/tools/designer/designer/metadatabase.h
@@ -162,7 +162,7 @@ public:
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 );
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index 682da9e8a..63ac33f6b 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -1501,8 +1501,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
}
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") ) {