From 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 2 Mar 2012 02:11:59 -0600
Subject: Undo prior accidental commit

---
 src/sql/qsqlquery.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/sql/qsqlquery.cpp')

diff --git a/src/sql/qsqlquery.cpp b/src/sql/qsqlquery.cpp
index 44e3b67..fec2343 100644
--- a/src/sql/qsqlquery.cpp
+++ b/src/sql/qsqlquery.cpp
@@ -353,7 +353,7 @@ bool QSqlQuery::exec ( const QString& query )
     d->sqlResult->setAt( QSql::BeforeFirst );
     if ( !driver() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::exec: no driver" );
+	qWarning("QSqlQuery::exec: no driver" );
 #endif
 	return FALSE;
     }
@@ -363,18 +363,18 @@ bool QSqlQuery::exec ( const QString& query )
     d->executedQuery = d->sqlResult->lastQuery();
     if ( !driver()->isOpen() || driver()->isOpenError() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::exec: database not open" );
+	qWarning("QSqlQuery::exec: database not open" );
 #endif
 	return FALSE;
     }
     if ( query.isNull() || query.length() == 0 ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::exec: empty query" );
+	qWarning("QSqlQuery::exec: empty query" );
 #endif
 	return FALSE;
     }
 #ifdef QT_DEBUG_SQL
-    tqDebug( "\n QSqlQuery: " + query );
+    qDebug( "\n QSqlQuery: " + query );
 #endif
     return d->sqlResult->reset( query );
 }
@@ -403,7 +403,7 @@ QVariant QSqlQuery::value( int i ) const
 	return d->sqlResult->data( i );
     } else {
 #ifdef QT_CHECK_RANGE
-	tqWarning( "QSqlQuery::value: not positioned on a valid record" );
+	qWarning( "QSqlQuery::value: not positioned on a valid record" );
 #endif
     }
     return QVariant();
@@ -544,7 +544,7 @@ bool QSqlQuery::seek( int i, bool relative )
     // let drivers optimize
     if ( isForwardOnly() && actualIdx < at() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
+	qWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
 #endif
 	afterSeek();
 	return FALSE;
@@ -661,7 +661,7 @@ bool QSqlQuery::prev()
 	return FALSE;
     if ( isForwardOnly() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
+	qWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
 #endif
 	return FALSE;
     }
@@ -705,7 +705,7 @@ bool QSqlQuery::first()
 	return FALSE;
     if ( isForwardOnly() && at() > QSql::BeforeFirst ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
+	qWarning("QSqlQuery::seek: cannot seek backwards in a forward only query" );
 #endif
 	return FALSE;
     }
@@ -937,7 +937,7 @@ bool QSqlQuery::prepare( const QString& query )
     d->sqlResult->extension()->clear();
     if ( !driver() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::prepare: no driver" );
+	qWarning("QSqlQuery::prepare: no driver" );
 #endif
 	return FALSE;
     }
@@ -946,18 +946,18 @@ bool QSqlQuery::prepare( const QString& query )
     d->sqlResult->setQuery( query.stripWhiteSpace() );
     if ( !driver()->isOpen() || driver()->isOpenError() ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::prepare: database not open" );
+	qWarning("QSqlQuery::prepare: database not open" );
 #endif
 	return FALSE;
     }
     if ( query.isNull() || query.length() == 0 ) {
 #ifdef QT_CHECK_RANGE
-	tqWarning("QSqlQuery::prepare: empty query" );
+	qWarning("QSqlQuery::prepare: empty query" );
 #endif
 	return FALSE;
     }
 #ifdef QT_DEBUG_SQL
-    tqDebug( "\n QSqlQuery: " + query );
+    qDebug( "\n QSqlQuery: " + query );
 #endif
     QString q = query;
     QRegExp rx(QString::fromLatin1("'[^']*'|:([a-zA-Z0-9_]+)"));
@@ -1176,7 +1176,7 @@ QVariant QSqlQuery::boundValue( int pos ) const
     QMap<QString, QVariant>::ConstIterator it;
     QMap<QString, QVariant> vals = query.boundValues();
     for ( it = vals.begin(); it != vals.end(); ++it )
-        tqWarning( "Placeholder: " + it.key() + ", Value: " + (*it).toString() );
+        qWarning( "Placeholder: " + it.key() + ", Value: " + (*it).toString() );
     ...
 
     // Examine the bound values - bound using positional binding
@@ -1184,7 +1184,7 @@ QVariant QSqlQuery::boundValue( int pos ) const
     QValueList<QVariant> list = query.boundValues().values();
     int i = 0;
     for ( it = list.begin(); it != list.end(); ++it )
-        tqWarning( "Placeholder pos: %d, Value: " + (*it).toString(), i++ );
+        qWarning( "Placeholder pos: %d, Value: " + (*it).toString(), i++ );
     ...
 
     \endcode
-- 
cgit v1.2.1