summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-11-01 13:52:03 (GMT)
committer Michele Calgaro <michele.calgaro@yahoo.it>2018-11-01 13:52:03 (GMT)
commit19ef3e4359eed834049596c7bc07cb18b204a2f1 (patch)
tree1f7e3392a23c84f9b1472b1efb01a6906db06a7a
parent4a5da4685a8607a87602e065d1e3abdbf66c9ff9 (diff)
downloadqt3-19ef3e43.zip
qt3-19ef3e43.tar.gz
Improved class name used in previous commit. Suggestion comes from Slavek :-)HEADorigin/masterorigin/HEADmaster
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--src/sql/qsqlextension_p.cpp6
-rw-r--r--src/sql/qsqlextension_p.h8
-rw-r--r--src/tools/qwinexport.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/sql/qsqlextension_p.cpp b/src/sql/qsqlextension_p.cpp
index 137ef50..da6a2ac 100644
--- a/src/sql/qsqlextension_p.cpp
+++ b/src/sql/qsqlextension_p.cpp
@@ -68,7 +68,7 @@ void QSqlExtension::bindValue( const QString& placeholder, const QVariant& val,
if ( index.contains( (int)values.count() ) ) {
index[ (int)values.count() ] = placeholder;
}
- values[ placeholder ] = QtParam( val, tp );
+ values[ placeholder ] = QSqlParam( val, tp );
}
void QSqlExtension::bindValue( int pos, const QVariant& val, QSql::ParameterType tp )
@@ -76,7 +76,7 @@ void QSqlExtension::bindValue( int pos, const QVariant& val, QSql::ParameterType
bindm = BindByPosition;
index[ pos ] = QString::number( pos );
QString nm = QString::number( pos );
- values[ nm ] = QtParam( val, tp );
+ values[ nm ] = QSqlParam( val, tp );
}
void QSqlExtension::addBindValue( const QVariant& val, QSql::ParameterType tp )
@@ -130,7 +130,7 @@ QVariant QSqlExtension::boundValue( int pos ) const
QMap<QString, QVariant> QSqlExtension::boundValues() const
{
- QMap<QString, QtParam>::ConstIterator it;
+ QMap<QString, QSqlParam>::ConstIterator it;
QMap<QString, QVariant> m;
if ( bindm == BindByName ) {
for ( it = values.begin(); it != values.end(); ++it )
diff --git a/src/sql/qsqlextension_p.h b/src/sql/qsqlextension_p.h
index a77be75..1379d91 100644
--- a/src/sql/qsqlextension_p.h
+++ b/src/sql/qsqlextension_p.h
@@ -71,11 +71,11 @@
#define QM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN
#endif
-struct QtParam {
- QtParam( const QVariant& v = QVariant(), QSql::ParameterType t = QSql::In ): value( v ), typ( t ) {}
+struct QSqlParam {
+ QSqlParam( const QVariant& v = QVariant(), QSql::ParameterType t = QSql::In ): value( v ), typ( t ) {}
QVariant value;
QSql::ParameterType typ;
- Q_DUMMY_COMPARISON_OPERATOR(QtParam)
+ Q_DUMMY_COMPARISON_OPERATOR(QSqlParam)
};
struct Holder {
@@ -114,7 +114,7 @@ public:
int bindCount;
QMap<int, QString> index;
- typedef QMap<QString, QtParam> ValueMap;
+ typedef QMap<QString, QSqlParam> ValueMap;
ValueMap values;
// convenience container for QSqlQuery
diff --git a/src/tools/qwinexport.h b/src/tools/qwinexport.h
index 4d9e5d4..f489e35 100644
--- a/src/tools/qwinexport.h
+++ b/src/tools/qwinexport.h
@@ -215,7 +215,7 @@ QM_TEMPLATE_EXTERN_TABLE template class QM_EXPORT_TABLE QPtrVector<QTableItem>;
// qsqlextension template exports
#if defined(Q_DEFINED_QSQLEXTENSION) && defined(Q_DEFINED_QMAP) && defined(Q_DEFINED_QVALUEVECTOR) && defined(Q_DEFINED_QSTRING) && !defined(Q_EXPORTED_QSQLEXTENSION_TEMPLATES)
#define Q_EXPORTED_QSQLEXTENSION_TEMPLATES
-QM_TEMPLATE_EXTERN_SQL template class QM_EXPORT_SQL QMap<QString,QtParam>;
+QM_TEMPLATE_EXTERN_SQL template class QM_EXPORT_SQL QMap<QString,QSqlParam>;
QM_TEMPLATE_EXTERN_SQL template class QM_EXPORT_SQL QValueVector<Holder>;
#endif