From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 19 Jan 2011 01:42:14 +0000
Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break
 compatibility with TQt for Qt3; if it does please fix it ASAP!

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdm/kfrontend/kdmconfig.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'kdm/kfrontend/kdmconfig.cpp')

diff --git a/kdm/kfrontend/kdmconfig.cpp b/kdm/kfrontend/kdmconfig.cpp
index 15a63fa67..0916eb881 100644
--- a/kdm/kfrontend/kdmconfig.cpp
+++ b/kdm/kfrontend/kdmconfig.cpp
@@ -41,7 +41,7 @@ TQString _stsFile;
 bool _isLocal;
 bool _authorized;
 
-static QString
+static TQString
 GetCfgQStr( int id )
 {
 	char *tmp = GetCfgStr( id );
@@ -50,7 +50,7 @@ GetCfgQStr( int id )
 	return qs;
 }
 
-static QStringList
+static TQStringList
 GetCfgQStrList( int id )
 {
 	int i, len;
@@ -65,14 +65,14 @@ GetCfgQStrList( int id )
 }
 
 // Based on kconfigbase.cpp
-static QFont
+static TQFont
 Str2Font( const TQString &aValue )
 {
 	uint nFontBits;
 	TQFont aRetFont;
 	TQString chStr;
 
-	TQStringList sl = TQStringList::split( TQString::fromLatin1(","), aValue );
+	TQStringList sl = TQStringList::split( TQString::tqfromLatin1(","), aValue );
 
 	if (sl.count() == 1) {
 		/* X11 font spec */
@@ -160,7 +160,7 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc )
 			sess->vt ?
 				TQString("vt%1").arg( sess->vt ) :
 #endif
-				TQString::fromLatin1( *sess->from ? sess->from : sess->display );
+				TQString::tqfromLatin1( *sess->from ? sess->from : sess->display );
 	} else {
 		user =
 			!sess->user ?
@@ -174,6 +174,6 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc )
 			sess->vt ?
 				TQString("%1, vt%2").arg( sess->display ).arg( sess->vt ) :
 #endif
-				TQString::fromLatin1( sess->display );
+				TQString::tqfromLatin1( sess->display );
 	}
 }
-- 
cgit v1.2.3