Rename old tq methods that no longer need a unique name

5 files changed, 20 insertions, 20 deletions

diff --git a/kexi/kexiutils/identifier.cpp b/kexi/kexiutils/identifier.cpp
index da5f7f96..dc1754ca 100644
--- a/kexi/kexiutils/identifier.cpp
+++ b/kexi/kexiutils/identifier.cpp
@@ -48,7 +48,7 @@ inline TQString char2Identifier(const TQChar& c)
 	if (c.tqunicode() >= TRANSLITERATION_TABLE_SIZE)
 		return TQString(TQChar('_'));
 	const char *const s = transliteration_table[c.tqunicode()];
-	return s ? TQString::tqfromLatin1(s) : TQString(TQChar('_'));
+	return s ? TQString::fromLatin1(s) : TQString(TQChar('_'));
 }
 
 TQString KexiUtils::string2Identifier(const TQString &s)
diff --git a/kexi/kexiutils/longlongvalidator.cpp b/kexi/kexiutils/longlongvalidator.cpp
index ca3a42dd..e7cce867 100644
--- a/kexi/kexiutils/longlongvalidator.cpp
+++ b/kexi/kexiutils/longlongvalidator.cpp
@@ -53,7 +53,7 @@ TQValidator::State LongLongValidator::validate( TQString &str, int & ) const
 	if (m_base > 10)
 		newStr = newStr.upper();
 
-	if (newStr == TQString::tqfromLatin1("-")) {// a special case
+	if (newStr == TQString::fromLatin1("-")) {// a special case
 		if ((m_min || m_max) && m_min >= 0)
 			ok = false;
 		else
diff --git a/kexi/kexiutils/styleproxy.h b/kexi/kexiutils/styleproxy.h
index 867ef23d..cf3eea50 100644
--- a/kexi/kexiutils/styleproxy.h
+++ b/kexi/kexiutils/styleproxy.h
@@ -67,10 +67,10 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 
 		virtual void polishPopupMenu( TQPopupMenu* p ) { m_style->polishPopupMenu(p); }
 
-		virtual TQRect tqitemRect( TQPainter *p, const TQRect &r,
+		virtual TQRect itemRect( TQPainter *p, const TQRect &r,
 			int flags, bool enabled, const TQPixmap *pixmap, const TQString &text, int len = -1 ) const
 		{
-			return m_style->tqitemRect( p, r, flags, enabled, pixmap, text, len );
+			return m_style->itemRect( p, r, flags, enabled, pixmap, text, len );
 		}
 
 		virtual void drawItem( TQPainter *p, const TQRect &r,
@@ -87,18 +87,18 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 			m_style->tqdrawPrimitive( pe, p, r, cg, flags, option );
 		}
 
-		virtual void tqdrawControl( TQ_ControlElement element,
+		virtual void drawControl( TQ_ControlElement element,
 			TQPainter *p, const TQWidget *widget, const TQRect &r, const TQColorGroup &cg,
 			SFlags how = Style_Default, const TQStyleOption& option = TQStyleOption::Default ) const
 		{
-			m_style->tqdrawControl( element, p, widget, r, cg, how, option );
+			m_style->drawControl( element, p, widget, r, cg, how, option );
 		}
 
-		virtual void tqdrawControlMask( TQ_ControlElement element,
+		virtual void drawControlMask( TQ_ControlElement element,
 			TQPainter *p, const TQWidget *widget, const TQRect &r, 
 			const TQStyleOption& option = TQStyleOption::Default ) const
 		{
-			m_style->tqdrawControlMask( element, p, widget, r, option );
+			m_style->drawControlMask( element, p, widget, r, option );
 		}
 
 		virtual TQRect subRect( SubRect r, const TQWidget *widget ) const
@@ -106,7 +106,7 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 			return m_style->subRect( r, widget );
 		}
 
-		virtual void tqdrawComplexControl( TQ_ComplexControl control,
+		virtual void drawComplexControl( TQ_ComplexControl control,
 			TQPainter *p, const TQWidget *widget, const TQRect &r,
 			const TQColorGroup &cg, SFlags how = Style_Default,
 #ifdef TQ_TQDOC
@@ -116,14 +116,14 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 #endif
 			SCFlags subActive = SC_None, const TQStyleOption& option = TQStyleOption::Default ) const
 		{
-			tqdrawComplexControl( control, p, widget, r, cg, how, sub, subActive, option );
+			drawComplexControl( control, p, widget, r, cg, how, sub, subActive, option );
 		}
 
-		virtual void tqdrawComplexControlMask( TQ_ComplexControl control,
+		virtual void drawComplexControlMask( TQ_ComplexControl control,
 			TQPainter *p, const TQWidget *widget, const TQRect &r,
 			const TQStyleOption& option = TQStyleOption::Default ) const
 		{
-			m_style->tqdrawComplexControlMask( control, p, widget, r, option );
+			m_style->drawComplexControlMask( control, p, widget, r, option );
 		}
 
 		virtual TQRect querySubControlMetrics( TQ_ComplexControl control,
@@ -140,10 +140,10 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 			return m_style->querySubControl( control, widget, pos, option );
 		}
 
-		virtual int tqpixelMetric( PixelMetric metric,
+		virtual int pixelMetric( PixelMetric metric,
 			const TQWidget *widget = 0 ) const
 		{
-			return m_style->tqpixelMetric( metric, widget );
+			return m_style->pixelMetric( metric, widget );
 		}
 
 		virtual TQSize tqsizeFromContents( ContentsType contents,
@@ -153,11 +153,11 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 			return m_style->tqsizeFromContents( contents, widget, contentsSize, option );
 		}
 
-		virtual int tqstyleHint( TQ_StyleHint stylehint,
+		virtual int styleHint( TQ_StyleHint stylehint,
 			const TQWidget *widget = 0, const TQStyleOption& option = TQStyleOption::Default,
 			TQStyleHintReturn* returnData = 0 ) const
 		{
-			return m_style->tqstyleHint( stylehint, widget, option, returnData );
+			return m_style->styleHint( stylehint, widget, option, returnData );
 		}
 
 		virtual TQPixmap stylePixmap( StylePixmap stylepixmap,
diff --git a/kexi/kexiutils/tristate.h b/kexi/kexiutils/tristate.h
index 0a8df95c..f3864849 100644
--- a/kexi/kexiutils/tristate.h
+++ b/kexi/kexiutils/tristate.h
@@ -165,8 +165,8 @@ public:
 	 */
 	TQString toString() const {
 		if (m_value==False)
-			return TQString::tqfromLatin1("false");
-		return m_value==True ? TQString::tqfromLatin1("true") : TQString::tqfromLatin1("cancelled");
+			return TQString::fromLatin1("false");
+		return m_value==True ? TQString::fromLatin1("true") : TQString::fromLatin1("cancelled");
 	}
 
 private:
diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp
index 7a1ab0f7..729312de 100644
--- a/kexi/kexiutils/utils.cpp
+++ b/kexi/kexiutils/utils.cpp
@@ -339,8 +339,8 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 		bitBlt( p.device(), 
 //			pos.x(), 
 //			pos.y(), 
-			(int)p.tqworldMatrix().dx() + rect.x() + lineWidth + pos.x(), 
-			(int)p.tqworldMatrix().dy() + rect.y() + lineWidth + pos.y(), 
+			(int)p.worldMatrix().dx() + rect.x() + lineWidth + pos.x(), 
+			(int)p.worldMatrix().dy() + rect.y() + lineWidth + pos.y(), 
 			&pixmapBuffer);
 	}
 }