summaryrefslogtreecommitdiffstats
path: root/src
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 /src
parentd795939c03a8250fa654992ff4ae807831c9292c (diff)
downloadtqt3-fd634b0c147bef3af1fa68454e4d8a9cda4f9243.tar.gz
tqt3-fd634b0c147bef3af1fa68454e4d8a9cda4f9243.zip
Adjusted to use new TQStringVariantMap type.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src')
-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
4 files changed, 8 insertions, 8 deletions
diff --git a/src/sql/ntqsqlquery.h b/src/sql/ntqsqlquery.h
index 80776251..7cba0101 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 190f6d21..1ce7b23f 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 aafc8834..d4eb8d77 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 829e4694..35d22b5d 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();
}