From 7c9a149f4ce92375b22e16ccfe0b348fc8547f20 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Thu, 1 Nov 2018 22:07:23 +0900
Subject: [PATCH] Fixed FTBFS caused by name conflict with new postgres server
 dev 11 package.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 src/sql/qsqlextension_p.cpp | 6 +++---
 src/sql/qsqlextension_p.h   | 8 ++++----
 src/tools/ntqwinexport.h    | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/sql/qsqlextension_p.cpp b/src/sql/qsqlextension_p.cpp
index 0a032055..23ca2adc 100644
--- a/src/sql/qsqlextension_p.cpp
+++ b/src/sql/qsqlextension_p.cpp
@@ -68,7 +68,7 @@ void TQSqlExtension::bindValue( const TQString& placeholder, const TQVariant& va
     if ( index.contains( (int)values.count() ) ) {
 	index[ (int)values.count() ] = placeholder;
     }
-    values[ placeholder ] = Param( val, tp );
+    values[ placeholder ] = TQtParam( val, tp );
 }
 
 void TQSqlExtension::bindValue( int pos, const TQVariant& val, TQSql::ParameterType tp )
@@ -76,7 +76,7 @@ void TQSqlExtension::bindValue( int pos, const TQVariant& val, TQSql::ParameterT
     bindm = BindByPosition;
     index[ pos ] = TQString::number( pos );
     TQString nm = TQString::number( pos );
-    values[ nm ] = Param( val, tp );
+    values[ nm ] = TQtParam( val, tp );
 }
 
 void TQSqlExtension::addBindValue( const TQVariant& val, TQSql::ParameterType tp )
@@ -130,7 +130,7 @@ TQVariant TQSqlExtension::boundValue( int pos ) const
 
 TQMap<TQString, TQVariant> TQSqlExtension::boundValues() const
 {
-    TQMap<TQString, Param>::ConstIterator it;
+    TQMap<TQString, TQtParam>::ConstIterator it;
     TQMap<TQString, TQVariant> 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 5ca2232d..1e04578b 100644
--- a/src/sql/qsqlextension_p.h
+++ b/src/sql/qsqlextension_p.h
@@ -71,11 +71,11 @@
 #define TQM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN
 #endif
 
-struct Param {
-    Param( const TQVariant& v = TQVariant(), TQSql::ParameterType t = TQSql::In ): value( v ), typ( t ) {}
+struct TQtParam {
+    TQtParam( const TQVariant& v = TQVariant(), TQSql::ParameterType t = TQSql::In ): value( v ), typ( t ) {}
     TQVariant value;
     TQSql::ParameterType typ;
-    Q_DUMMY_COMPARISON_OPERATOR(Param)
+    Q_DUMMY_COMPARISON_OPERATOR(TQtParam)
 };
 
 struct Holder {
@@ -114,7 +114,7 @@ public:
     int bindCount;
 
     TQMap<int, TQString> index;
-    typedef TQMap<TQString, Param> ValueMap;
+    typedef TQMap<TQString, TQtParam> ValueMap;
     ValueMap values;
 
     // convenience container for TQSqlQuery
diff --git a/src/tools/ntqwinexport.h b/src/tools/ntqwinexport.h
index 0936ade6..504a6879 100644
--- a/src/tools/ntqwinexport.h
+++ b/src/tools/ntqwinexport.h
@@ -215,7 +215,7 @@ TQM_TEMPLATE_EXTERN_TABLE template class TQM_EXPORT_TABLE TQPtrVector<TQTableIte
 // 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
-TQM_TEMPLATE_EXTERN_SQL template class TQM_EXPORT_SQL TQMap<TQString,Param>;
+TQM_TEMPLATE_EXTERN_SQL template class TQM_EXPORT_SQL TQMap<TQString,TQtParam>;
 TQM_TEMPLATE_EXTERN_SQL template class TQM_EXPORT_SQL TQValueVector<Holder>;
 #endif