Remove additional unneeded tq method conversions

4 files changed, 14 insertions, 14 deletions

diff --git a/kexi/kexiutils/identifier.cpp b/kexi/kexiutils/identifier.cpp
index dc1754ca..55fc4560 100644
--- a/kexi/kexiutils/identifier.cpp
+++ b/kexi/kexiutils/identifier.cpp
@@ -27,7 +27,7 @@ bool KexiUtils::isIdentifier(const TQString& s)
 {
 	uint i;
 	for (i=0; i<s.length(); i++) {
-		TQChar c = s.tqat(i).lower();
+		TQChar c = s.at(i).lower();
 		if (!((int)c=='_' || (int)c>='a' && (int)c<='z' || i>0 && (int)c>='0' && (int)c<='9'))
 			break;
 	}
@@ -87,8 +87,8 @@ TQString KexiUtils::string2Identifier(const TQString &s)
 
 TQString KexiUtils::identifierExpectedMessage(const TQString &valueName, const TQVariant& v)
 {
-	return "<p>"+i18n("Value of \"%1\" column must be an identifier.").tqarg(valueName)
-		+"</p><p>"+i18n("\"%1\" is not a valid identifier.").tqarg(v.toString())+"</p>";
+	return "<p>"+i18n("Value of \"%1\" column must be an identifier.").arg(valueName)
+		+"</p><p>"+i18n("\"%1\" is not a valid identifier.").arg(v.toString())+"</p>";
 }
 
 //--------------------------------------------------------------------------------
diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp
index 729312de..fd6c4e87 100644
--- a/kexi/kexiutils/utils.cpp
+++ b/kexi/kexiutils/utils.cpp
@@ -254,7 +254,7 @@ void KexiUtils::simpleDecrypt(TQString& string)
 }
 
 void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect, 
-	const TQPixmap& pixmap, int tqalignment, bool scaledContents, bool keepAspectRatio)
+	const TQPixmap& pixmap, int alignment, bool scaledContents, bool keepAspectRatio)
 {
 	if (pixmap.isNull())
 		return;
@@ -285,21 +285,21 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 			img = img.smoothScale(w, h, TQ_ScaleMin);
 			pos = rect.topLeft(); //0, 0);
 			if (img.width() < w) {
-				int hAlign = TQApplication::horizontalAlignment( tqalignment );
+				int hAlign = TQApplication::horizontalAlignment( alignment );
 				if ( hAlign & TQt::AlignRight )
 					pos.setX(pos.x() + w-img.width());
 				else if ( hAlign & TQt::AlignHCenter )
 					pos.setX(pos.x() + w/2-img.width()/2);
 			}
 			else if (img.height() < h) {
-				if ( tqalignment & TQt::AlignBottom )
+				if ( alignment & TQt::AlignBottom )
 					pos.setY(pos.y() + h-img.height());
-				else if ( tqalignment & TQt::AlignVCenter )
+				else if ( alignment & TQt::AlignVCenter )
 					pos.setY(pos.y() + h/2-img.height()/2);
 			}
 			pixmapBuffer.convertFromImage(img);
 			if (!fast) {
-				p2.tqbegin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.tqdevice());
+				p2.begin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.device());
 			}
 			else
 				target->drawPixmap(pos, pixmapBuffer);
@@ -307,7 +307,7 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 		else {
 			if (!fast) {
 				pixmapBuffer.resize(rect.size()-TQSize(lineWidth, lineWidth));
-				p2.tqbegin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.tqdevice());
+				p2.begin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.device());
 				p2.drawPixmap(TQRect(rect.x(), rect.y(), w, h), pixmap);
 			}
 			else
@@ -315,7 +315,7 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 		}
 	}
 	else {
-		int hAlign = TQApplication::horizontalAlignment( tqalignment );
+		int hAlign = TQApplication::horizontalAlignment( alignment );
 		if ( hAlign & TQt::AlignRight )
 			pos.setX(pos.x() + w-pixmap.width());
 		else if ( hAlign & TQt::AlignHCenter )
@@ -323,9 +323,9 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 		else //left, etc.
 			pos.setX(pos.x());
 
-		if ( tqalignment & TQt::AlignBottom )
+		if ( alignment & TQt::AlignBottom )
 			pos.setY(pos.y() + h-pixmap.height());
-		else if ( tqalignment & TQt::AlignVCenter )
+		else if ( alignment & TQt::AlignVCenter )
 			pos.setY(pos.y() + h/2-pixmap.height()/2);
 		else //top, etc. 
 			pos.setY(pos.y());
diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h
index d7bdbae8..ffa2a85d 100644
--- a/kexi/kexiutils/utils.h
+++ b/kexi/kexiutils/utils.h
@@ -212,7 +212,7 @@ namespace KexiUtils
 	//! Draws pixmap on painter \a p using predefined parameters.
 	//! Used in KexiDBImageBox and KexiBlobTableEdit.
 	KEXIUTILS_EXPORT void drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
-		const TQPixmap& pixmap, int tqalignment, bool scaledContents, bool keepAspectRatio);
+		const TQPixmap& pixmap, int alignment, bool scaledContents, bool keepAspectRatio);
 
 	//! @internal
 	KEXIUTILS_EXPORT TQString ptrToStringInternal(void* ptr, uint size);
diff --git a/kexi/kexiutils/validator.cpp b/kexi/kexiutils/validator.cpp
index bec7a1ec..919a3b61 100644
--- a/kexi/kexiutils/validator.cpp
+++ b/kexi/kexiutils/validator.cpp
@@ -36,7 +36,7 @@ Validator::Result Validator::check(const TQString &valueName, const TQVariant& v
 {
 	if (v.isNull() || v.type()==TQVariant::String && v.toString().isEmpty()) {
 		if (!m_acceptsEmptyValue) {
-			message = Validator::msgColumnNotEmpty().tqarg(valueName);
+			message = Validator::msgColumnNotEmpty().arg(valueName);
 			return Error;
 		}
 		return Ok;