Rename old tq methods that no longer need a unique name

6 files changed, 20 insertions, 20 deletions

diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
index 01d326af..10654e7e 100644
--- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
@@ -125,7 +125,7 @@ TQString MySqlDriver::escapeString(const TQString& str) const
 			break;
 	}
 	if (i >= old_length) { //no characters to escape
-		return TQString::tqfromLatin1("'") + str + TQString::tqfromLatin1("'");
+		return TQString::fromLatin1("'") + str + TQString::fromLatin1("'");
 	}
 
 	TQChar *new_string = new TQChar[ old_length * 3 + 1 ]; // a worst case approximation
diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
index c81f04ad..faa7b582 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
@@ -128,7 +128,7 @@ bool pqxxSqlConnection::drv_getDatabasesList( TQStringList &list )
 			// Read value of column 0 into a string N
 			c[0].to(N);
 			// Copy the result into the return list
-			list << TQString::tqfromLatin1 (N.c_str());
+			list << TQString::fromLatin1 (N.c_str());
 		}
 		return true;
 	}
@@ -190,15 +190,15 @@ bool pqxxSqlConnection::drv_useDatabase( const TQString &dbName, bool *cancelled
 	if (data()->port == 0)
 		data()->port = 5432;
 
-	conninfo += TQString::tqfromLatin1(" port='%1'").tqarg(data()->port);
+	conninfo += TQString::fromLatin1(" port='%1'").tqarg(data()->port);
 
-	conninfo += TQString::tqfromLatin1(" dbname='%1'").tqarg(dbName);
+	conninfo += TQString::fromLatin1(" dbname='%1'").tqarg(dbName);
 
 	if (!data()->userName.isNull())
-		conninfo += TQString::tqfromLatin1(" user='%1'").tqarg(data()->userName);
+		conninfo += TQString::fromLatin1(" user='%1'").tqarg(data()->userName);
 
 	if (!data()->password.isNull())
-		conninfo += TQString::tqfromLatin1(" password='%1'").tqarg(data()->password);
+		conninfo += TQString::fromLatin1(" password='%1'").tqarg(data()->password);
 
 	try
 	{
diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.h b/kexi/kexidb/drivers/pqxx/pqxxcursor.h
index 637a33f3..8a61978d 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxcursor.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.h
@@ -79,7 +79,7 @@ inline TQVariant pgsqlCStrToVariant(const pqxx::result::field& r)
 	switch(r.type())
 	{
 		case BOOLOID:
-			return TQString::tqfromLatin1(r.c_str(), r.size())=="true"; //TODO check formatting
+			return TQString::fromLatin1(r.c_str(), r.size())=="true"; //TODO check formatting
 		case INT2OID:
 		case INT4OID:
 		case INT8OID:
diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
index 333df590..8967bc5e 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
@@ -133,9 +133,9 @@ bool pqxxSqlDriver::isSystemDatabaseName( const TQString& n ) const
 //
 TQString pqxxSqlDriver::escapeString( const TQString& str) const
 {
-    return TQString::tqfromLatin1("'")
+    return TQString::fromLatin1("'")
     	+ TQString::fromAscii( pqxx::sqlesc(std::string(str.utf8())).c_str() )
-    	+ TQString::tqfromLatin1("'");
+    	+ TQString::fromLatin1("'");
 }
 
 //==================================================================================
@@ -172,7 +172,7 @@ TQString pqxxSqlDriver::valueToSQL( uint ftype, const TQVariant& v ) const
 		// use SQL compliant TRUE or FALSE as described here
 		// http://www.postgresql.org/docs/8.0/interactive/datatype-boolean.html
 		// 1 or 0 does not work
-		return v.toInt()==0 ? TQString::tqfromLatin1("FALSE") : TQString::tqfromLatin1("TRUE");
+		return v.toInt()==0 ? TQString::fromLatin1("FALSE") : TQString::fromLatin1("TRUE");
 	}
 	return Driver::valueToSQL(ftype, v);
 }
diff --git a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
index 631f3bc6..b10d5383 100644
--- a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
@@ -324,9 +324,9 @@ TQString SQLiteConnection::serverResultName()
 {
 	TQString r = 
 #ifdef SQLITE2
-		TQString::tqfromLatin1( sqlite_error_string(d->res) );
+		TQString::fromLatin1( sqlite_error_string(d->res) );
 #else //SQLITE3
-		TQString(); //tqfromLatin1( d->result_name );
+		TQString(); //fromLatin1( d->result_name );
 #endif
 	return r.isEmpty() ? Connection::serverResultName() : r;
 }
@@ -395,7 +395,7 @@ bool SQLiteConnection::drv_alterTableName(TableSchema& tableSchema, const TQStri
 //TODO indices, etc.???
 
 	// 3. copy all rows to the new table
-	if (!executeSQL(TQString::tqfromLatin1("INSERT INTO %1 SELECT * FROM %2")
+	if (!executeSQL(TQString::fromLatin1("INSERT INTO %1 SELECT * FROM %2")
 		.tqarg(escapeIdentifier(tableSchema.name())).tqarg(escapeIdentifier(oldTableName))))
 	{
 		drv_alterTableName_ERR;
diff --git a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
index 5239127c..20d80f9c 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
@@ -476,19 +476,19 @@ void SQLiteCursor::storeCurrentRow(RowData &data) const
 			case Field::Integer:
 				data[i] = TQVariant( TQCString(*col).toInt() );
 			case Field::BigInteger:
-				data[i] = TQVariant( TQString::tqfromLatin1(*col).toLongLong() );
+				data[i] = TQVariant( TQString::fromLatin1(*col).toLongLong() );
 			case Field::Boolean:
-				data[i] = TQVariant( sqliteStringToBool(TQString::tqfromLatin1(*col)), 1 );
+				data[i] = TQVariant( sqliteStringToBool(TQString::fromLatin1(*col)), 1 );
 				break;
 			case Field::Date:
-				data[i] = TQDate::fromString( TQString::tqfromLatin1(*col), Qt::ISODate );
+				data[i] = TQDate::fromString( TQString::fromLatin1(*col), Qt::ISODate );
 				break;
 			case Field::Time:
 				//TQDateTime - a hack needed because TQVariant(TQTime) has broken isNull()
-				data[i] = KexiUtils::stringToHackedTQTime(TQString::tqfromLatin1(*col));
+				data[i] = KexiUtils::stringToHackedTQTime(TQString::fromLatin1(*col));
 				break;
 			case Field::DateTime: {
-				TQString tmp( TQString::tqfromLatin1(*col) );
+				TQString tmp( TQString::fromLatin1(*col) );
 				tmp[10] = 'T';
 				data[i] = TQDateTime::fromString( tmp, Qt::ISODate );
 				break;
@@ -548,9 +548,9 @@ int SQLiteCursor::serverResult()
 TQString SQLiteCursor::serverResultName()
 {
 #ifdef SQLITE2
-	return TQString::tqfromLatin1( sqlite_error_string(d->res) );
+	return TQString::fromLatin1( sqlite_error_string(d->res) );
 #else //SQLITE3
-	return TQString::tqfromLatin1( d->result_name );
+	return TQString::fromLatin1( d->result_name );
 #endif
 }