From 11191ef0b9908604d1d7aaca382b011ef22c454c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:12:30 -0600
Subject: Rename old tq methods that no longer need a unique name

---
 kexi/kexidb/utils.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'kexi/kexidb/utils.cpp')

diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp
index 9fa9ca018..8551a0ef3 100644
--- a/kexi/kexidb/utils.cpp
+++ b/kexi/kexidb/utils.cpp
@@ -159,9 +159,9 @@ void KexiDB::getHTMLErrorMesage(Object* obj, TQString& msg, TQString &details)
 
 	if (!details.isEmpty() && !details.startsWith("<qt>")) {
 		if (details.startsWith("<p>"))
-			details = TQString::tqfromLatin1("<qt>")+details;
+			details = TQString::fromLatin1("<qt>")+details;
 		else
-			details = TQString::tqfromLatin1("<qt><p>")+details;
+			details = TQString::fromLatin1("<qt><p>")+details;
 	}
 }
 
@@ -493,7 +493,7 @@ void KexiDB::connectionTestDialog(TQWidget* parent, const KexiDB::ConnectionData
 int KexiDB::rowCount(Connection &conn, const TQString& sql)
 {
 	int count = -1; //will be changed only on success of querySingleNumber()
-	TQString selectSql( TQString::tqfromLatin1("SELECT COUNT() FROM (") + sql + ")" );
+	TQString selectSql( TQString::fromLatin1("SELECT COUNT() FROM (") + sql + ")" );
 	conn.querySingleNumber(selectSql, count);
 	return count;
 }
@@ -507,7 +507,7 @@ int KexiDB::rowCount(const KexiDB::TableSchema& tableSchema)
 	}
 	int count = -1; //will be changed only on success of querySingleNumber()
 	tableSchema.connection()->querySingleNumber(
-		TQString::tqfromLatin1("SELECT COUNT(*) FROM ") 
+		TQString::fromLatin1("SELECT COUNT(*) FROM ") 
 		+ tableSchema.connection()->driver()->escapeIdentifier(tableSchema.name()), 
 		count
 	);
@@ -523,7 +523,7 @@ int KexiDB::rowCount(KexiDB::QuerySchema& querySchema)
 	}
 	int count = -1; //will be changed only on success of querySingleNumber()
 	querySchema.connection()->querySingleNumber(
-		TQString::tqfromLatin1("SELECT COUNT(*) FROM (") 
+		TQString::fromLatin1("SELECT COUNT(*) FROM (") 
 		+ querySchema.connection()->selectStatement(querySchema) + ")",
 		count
 	);
@@ -965,7 +965,7 @@ TQDomElement KexiDB::saveBooleanElementToDom(TQDomDocument& doc, TQDomElement& p
 	TQDomElement numberEl( doc.createElement("bool") );
 	el.appendChild( numberEl );
 	numberEl.appendChild( doc.createTextNode( 
-		value ? TQString::tqfromLatin1("true") : TQString::tqfromLatin1("false") ) );
+		value ? TQString::fromLatin1("true") : TQString::fromLatin1("false") ) );
 	return el;
 }
 
@@ -998,9 +998,9 @@ TQVariant KexiDB::emptyValueForType( KexiDB::Field::Type type )
 		return val;
 	else { //special cases
 		if (type==Field::Date)
-			return TQDate::tqcurrentDate();
+			return TQDate::currentDate();
 		if (type==Field::DateTime)
-			return TQDateTime::tqcurrentDateTime();
+			return TQDateTime::currentDateTime();
 		if (type==Field::Time)
 			return TQTime::currentTime();
 	}
@@ -1047,9 +1047,9 @@ TQVariant KexiDB::notEmptyValueForType( KexiDB::Field::Type type )
 		return val;
 	else { //special cases
 		if (type==Field::Date)
-			return TQDate::tqcurrentDate();
+			return TQDate::currentDate();
 		if (type==Field::DateTime)
-			return TQDateTime::tqcurrentDateTime();
+			return TQDateTime::currentDateTime();
 		if (type==Field::Time)
 			return TQTime::currentTime();
 	}
@@ -1076,11 +1076,11 @@ TQString KexiDB::escapeBLOB(const TQByteArray& array, BLOBEscapingType type)
 		return TQString();
 	}
 	if (type == BLOBEscapeXHex)
-		str = TQString::tqfromLatin1("X'");
+		str = TQString::fromLatin1("X'");
 	else if (type == BLOBEscape0xHex)
-		str = TQString::tqfromLatin1("0x");
+		str = TQString::fromLatin1("0x");
 	else if (type == BLOBEscapeOctal)
-		str = TQString::tqfromLatin1("'");
+		str = TQString::fromLatin1("'");
 	
 	int new_length = str.length(); //after X' or 0x, etc.
 	if (type == BLOBEscapeOctal) {
-- 
cgit v1.2.3