Initial conversion for TQt for Qt4 3.4.0 TP2

This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase.  If it does then it needs to be fixed!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 10 insertions, 10 deletions

diff --git a/kdecore/kkeyserver_x11.cpp b/kdecore/kkeyserver_x11.cpp
index 96411bca5..96bd7d67d 100644
--- a/kdecore/kkeyserver_x11.cpp
+++ b/kdecore/kkeyserver_x11.cpp
@@ -176,8 +176,8 @@ static const TransKey g_rgQtToSymX[] =
 	{ Qt::Key_Up,         XK_Up },
 	{ Qt::Key_Right,      XK_Right },
 	{ Qt::Key_Down,       XK_Down },
-	{ Qt::Key_Prior,      XK_Prior },
-	{ Qt::Key_Next,       XK_Next },
+	{ TQt::Key_Prior,      XK_Prior },
+	{ TQt::Key_Next,       XK_Next },
 	//{ Qt::Key_Shift,      0 },
 	//{ Qt::Key_Control,    0 },
 	//{ Qt::Key_Meta,       0 },
@@ -285,7 +285,7 @@ static const TransKey g_rgQtToSymX[] =
 	{ Qt::Key_VolumeUp,   XF86XK_AudioRaiseVolume },
 	{ Qt::Key_MediaPlay,  XF86XK_AudioPlay },
 	{ Qt::Key_MediaStop,  XF86XK_AudioStop },
-	{ Qt::Key_MediaPrev,  XF86XK_AudioPrev },
+	{ TQt::Key_MediaPrev,  XF86XK_AudioPrev },
 	{ Qt::Key_MediaNext,  XF86XK_AudioNext },
 	{ Qt::Key_HomePage,   XF86XK_HomePage },
 	{ Qt::Key_LaunchMail, XF86XK_Mail },
@@ -406,7 +406,7 @@ bool Sym::initQt( int keyQt )
 	int symQt = keyQt & 0xffff;
 
 	if( (keyQt & Qt::UNICODE_ACCEL) || symQt < 0x1000 ) {
-		m_sym = TQChar(symQt).lower().unicode();
+		m_sym = TQChar(symQt).lower().tqunicode();
 		return true;
 	}
 
@@ -434,9 +434,9 @@ bool Sym::initQt( int keyQt )
 
 bool Sym::init( const TQString& s )
 {
-	// If it's a single character, get unicode value.
+	// If it's a single character, get tqunicode value.
 	if( s.length() == 1 ) {
-		m_sym = s[0].lower().unicode();
+		m_sym = s[0].lower().tqunicode();
 		return true;
 	}
 
@@ -498,7 +498,7 @@ TQString Sym::toString( bool bUserSpace ) const
 	if( m_sym == 0 )
 		return TQString::null;
 
-	// If it's a unicode character,
+	// If it's a tqunicode character,
 #ifdef Q_WS_WIN
 	else if( m_sym < 0x1000 ) {
 #else
@@ -542,7 +542,7 @@ uint Sym::getModsRequired() const
 
 	if( m_sym < 0x3000 ) {
 		TQChar c(m_sym);
-		if( c.isLetter() && c.lower() != c.upper() && m_sym == c.upper().unicode() )
+		if( c.isLetter() && c.lower() != c.upper() && m_sym == c.upper().tqunicode() )
 			return KKey::SHIFT;
 	}
 
@@ -823,7 +823,7 @@ uint stringUserToMod( const TQString& mod )
 	// Get code of just the primary key
 	keySymQt = keyCombQt & 0xffff;
 
-	// If unicode value beneath 0x1000 (special Qt codes begin thereafter),
+	// If tqunicode value beneath 0x1000 (special Qt codes begin thereafter),
 	if( keySymQt < 0x1000 ) {
 		// For reasons unbeknownst to me, Qt converts 'a-z' to 'A-Z'.
 		// So convert it back to lowercase if SHIFT isn't held down.
@@ -1041,7 +1041,7 @@ void KKey::simplify()
 
 	// If this is a letter, don't remove any modifiers.
 	if( m_sym < 0x3000 && TQChar(m_sym).isLetter() )
-		m_sym = TQChar(m_sym).lower().unicode();
+		m_sym = TQChar(m_sym).lower().tqunicode();
 
 	// Remove modifers from modifier list which are implicit in the symbol.
 	// Ex. Shift+Plus => Plus (en)