Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 9 insertions, 9 deletions

diff --git a/kexi/migration/pqxx/pqxxmigrate.cpp b/kexi/migration/pqxx/pqxxmigrate.cpp
index 904e0c92..d6c655f9 100644
--- a/kexi/migration/pqxx/pqxxmigrate.cpp
+++ b/kexi/migration/pqxx/pqxxmigrate.cpp
@@ -135,7 +135,7 @@ bool PqxxMigrate::drv_tableNames(TQStringList& tableNames)
         for (pqxx::result::const_iterator c = m_res->begin(); c != m_res->end(); ++c)
         {
             // Copy the result into the return list
-            tableNames << TQString::fromLatin1 (c[0].c_str());
+            tableNames << TQString::tqfromLatin1 (c[0].c_str());
         }
         return true;
     }
@@ -217,15 +217,15 @@ bool PqxxMigrate::drv_connect()
     if (m_migrateData->source->port == 0)
         m_migrateData->source->port = 5432;
 
-    conninfo += TQString::fromLatin1(" port='%1'").arg(m_migrateData->source->port);
+    conninfo += TQString::tqfromLatin1(" port='%1'").tqarg(m_migrateData->source->port);
 
-    conninfo += TQString::fromLatin1(" dbname='%1'").arg(m_migrateData->sourceName);
+    conninfo += TQString::tqfromLatin1(" dbname='%1'").tqarg(m_migrateData->sourceName);
 
     if (!m_migrateData->source->userName.isNull())
-        conninfo += TQString::fromLatin1(" user='%1'").arg(m_migrateData->source->userName);
+        conninfo += TQString::tqfromLatin1(" user='%1'").tqarg(m_migrateData->source->userName);
 
     if (!m_migrateData->source->password.isNull())
-        conninfo += TQString::fromLatin1(" password='%1'").arg(m_migrateData->source->password);
+        conninfo += TQString::tqfromLatin1(" password='%1'").tqarg(m_migrateData->source->password);
 
     try
     {
@@ -377,7 +377,7 @@ bool PqxxMigrate::primaryKey(pqxx::oid table_uid, int col) const
 
     try
     {
-        statement = TQString("SELECT indkey FROM pg_index WHERE ((indisprimary = true) AND (indrelid = %1))").arg(table_uid);
+        statement = TQString("SELECT indkey FROM pg_index WHERE ((indisprimary = true) AND (indrelid = %1))").tqarg(table_uid);
 
         tran = new pqxx::nontransaction(*m_conn, "find_pkey");
         tmpres = new pqxx::result(tran->exec(statement.latin1()));
@@ -480,7 +480,7 @@ tristate PqxxMigrate::drv_queryStringListFromSQL(
 				mysql_free_result(res);
 				return false;
 			}
-			string = TQString::fromLatin1(row[columnNumber], lengths[columnNumber]);
+			string = TQString::tqfromLatin1(row[columnNumber], lengths[columnNumber]);
 			mysql_free_result(res);
 		} else {
 			kdDebug() << "PqxxMigrate::drv_querySingleStringFromSQL(): null result" << endl;
@@ -569,7 +569,7 @@ bool PqxxMigrate::uniqueKey(pqxx::oid table_uid, int col) const
 
     try
     {
-        statement = TQString("SELECT indkey FROM pg_index WHERE ((indisunique = true) AND (indrelid = %1))").arg(table_uid);
+        statement = TQString("SELECT indkey FROM pg_index WHERE ((indisunique = true) AND (indrelid = %1))").tqarg(table_uid);
 
         tran = new pqxx::nontransaction(*m_conn, "find_ukey");
         tmpres = new pqxx::result(tran->exec(statement.latin1()));
@@ -647,7 +647,7 @@ bool PqxxMigrate::notEmpty(pqxx::oid /*table_uid*/, int /*col*/) const
             // Read value of column 0 into a string N
             c[0].to(N);
             // Copy the result into the return list
-            list << TQString::fromLatin1 (N.c_str());
+            list << TQString::tqfromLatin1 (N.c_str());
 	    KexiDBDrvDbg << N.c_str() << endl;
         }
         return true;