diff --git a/admin b/admin
deleted file mode 160000
index 822ba8d..0000000
--- a/admin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 822ba8d99ecbcd1d37cebb9a66b81c1aeb9fed0d
diff --git a/cmake b/cmake
deleted file mode 160000
index 42b03b0..0000000
--- a/cmake
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 42b03b0965a9e958b6007b49201b7793d2bd4f65
diff --git a/doc/classref/tdecore/KKeyServer.Key.html b/doc/classref/tdecore/KKeyServer.Key.html
index 8ab79c1..ae56336 100644
--- a/doc/classref/tdecore/KKeyServer.Key.html
+++ b/doc/classref/tdecore/KKeyServer.Key.html
@@ -66,7 +66,7 @@
 <li><b>mod</b> ()
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(uint)</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>setKeycodeTQt</b> (keyTQt)
+<li><b>setKeycodeQt</b> (keyTQt)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>keyTQt</td><td>int</td><td></td></tr>
diff --git a/doc/classref/tdecore/KKeyServer.Sym.html b/doc/classref/tdecore/KKeyServer.Sym.html
index 778fe9e..a91c5b2 100644
--- a/doc/classref/tdecore/KKeyServer.Sym.html
+++ b/doc/classref/tdecore/KKeyServer.Sym.html
@@ -62,7 +62,7 @@
 <tr><td>s</td><td>TQString</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>initTQt</b> (keyTQt)
+<li><b>initQt</b> (keyTQt)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(bool)</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>keyTQt</td><td>int</td><td></td></tr>
diff --git a/doc/classref/tdecore/KKeyServer.html b/doc/classref/tdecore/KKeyServer.html
index 8589eab..c002309 100644
--- a/doc/classref/tdecore/KKeyServer.html
+++ b/doc/classref/tdecore/KKeyServer.html
@@ -49,19 +49,19 @@
 <li><b>initializeMods</b> ()
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(bool)</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>keyTQtToKeyX</b> (keyCombTQt, pKeyCodeX)
+<li><b>keyQtToKeyX</b> (keyCombTQt, pKeyCodeX)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td><i>Not Implemented</i></td></tr></table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>keyTQtToMod</b> (keyTQt)
+<li><b>keyQtToMod</b> (keyTQt)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td><i>Not Implemented</i></td></tr></table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>keyTQtToSym</b> (keyTQt)
+<li><b>keyQtToSym</b> (keyTQt)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td><i>Not Implemented</i></td></tr></table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>keyboardHasWinKey</b> ()
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(bool)</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>modToModTQt</b> (mod)
+<li><b>modToModQt</b> (mod)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td><i>Not Implemented</i></td></tr></table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>modToModX</b> (mod)
@@ -104,7 +104,7 @@
 <li><b>modXToMod</b> (modX)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td><i>Not Implemented</i></td></tr></table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>modXToModTQt</b> (modX)
+<li><b>modXToModQt</b> (modX)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td><i>Not Implemented</i></td></tr></table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>modXWin</b> ()
@@ -123,7 +123,7 @@
 <tr><td>mod</td><td>TQString</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>symToKeyTQt</b> (sym)
+<li><b>symToKeyQt</b> (sym)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td><i>Not Implemented</i></td></tr></table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 </ul>
diff --git a/extra/kde300/kkeyserver_x11.h b/extra/kde300/kkeyserver_x11.h
index a6e82c3..f0b4dbe 100644
--- a/extra/kde300/kkeyserver_x11.h
+++ b/extra/kde300/kkeyserver_x11.h
@@ -20,7 +20,7 @@ namespace KKeyServer
 		Sym( const TQString& s )
 			{ init( s ); }
 
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 		bool init( const TQString& );
 
 		int qt() const;
@@ -56,7 +56,7 @@ namespace KKeyServer
 		uint sym() const { return m_sym; }
 		int keyCodeQt() const { return (int) m_sym; }
 
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		Key& operator =( const KKeyNative& key );
@@ -109,13 +109,13 @@ namespace KKeyServer
 	 */
 	uint accelModMaskX();
 
-	bool keyTQtToSym( int keyTQt, uint& sym );
-	bool keyTQtToMod( int keyTQt, uint& mod );
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool keyQtToSym( int keyTQt, uint& sym );
+	bool keyQtToMod( int keyTQt, uint& mod );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 	bool modToModX( uint mod, uint& modX );
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 	bool modXToMod( uint modX, uint& mod );
 
 	bool codeXToSym( uchar codeX, uint modX, uint& symX );
@@ -125,7 +125,7 @@ namespace KKeyServer
 
 	bool stringToSymMod( const TQString&, uint& sym, uint& mod );
 
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 };
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde301/kkeyserver_x11.h b/extra/kde301/kkeyserver_x11.h
index a6e82c3..f0b4dbe 100644
--- a/extra/kde301/kkeyserver_x11.h
+++ b/extra/kde301/kkeyserver_x11.h
@@ -20,7 +20,7 @@ namespace KKeyServer
 		Sym( const TQString& s )
 			{ init( s ); }
 
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 		bool init( const TQString& );
 
 		int qt() const;
@@ -56,7 +56,7 @@ namespace KKeyServer
 		uint sym() const { return m_sym; }
 		int keyCodeQt() const { return (int) m_sym; }
 
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		Key& operator =( const KKeyNative& key );
@@ -109,13 +109,13 @@ namespace KKeyServer
 	 */
 	uint accelModMaskX();
 
-	bool keyTQtToSym( int keyTQt, uint& sym );
-	bool keyTQtToMod( int keyTQt, uint& mod );
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool keyQtToSym( int keyTQt, uint& sym );
+	bool keyQtToMod( int keyTQt, uint& mod );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 	bool modToModX( uint mod, uint& modX );
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 	bool modXToMod( uint modX, uint& mod );
 
 	bool codeXToSym( uchar codeX, uint modX, uint& symX );
@@ -125,7 +125,7 @@ namespace KKeyServer
 
 	bool stringToSymMod( const TQString&, uint& sym, uint& mod );
 
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 };
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde303/kkeyserver_x11.h b/extra/kde303/kkeyserver_x11.h
index a6e82c3..f0b4dbe 100644
--- a/extra/kde303/kkeyserver_x11.h
+++ b/extra/kde303/kkeyserver_x11.h
@@ -20,7 +20,7 @@ namespace KKeyServer
 		Sym( const TQString& s )
 			{ init( s ); }
 
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 		bool init( const TQString& );
 
 		int qt() const;
@@ -56,7 +56,7 @@ namespace KKeyServer
 		uint sym() const { return m_sym; }
 		int keyCodeQt() const { return (int) m_sym; }
 
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		Key& operator =( const KKeyNative& key );
@@ -109,13 +109,13 @@ namespace KKeyServer
 	 */
 	uint accelModMaskX();
 
-	bool keyTQtToSym( int keyTQt, uint& sym );
-	bool keyTQtToMod( int keyTQt, uint& mod );
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool keyQtToSym( int keyTQt, uint& sym );
+	bool keyQtToMod( int keyTQt, uint& mod );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 	bool modToModX( uint mod, uint& modX );
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 	bool modXToMod( uint modX, uint& mod );
 
 	bool codeXToSym( uchar codeX, uint modX, uint& symX );
@@ -125,7 +125,7 @@ namespace KKeyServer
 
 	bool stringToSymMod( const TQString&, uint& sym, uint& mod );
 
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 };
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde310/kkeyserver_x11.h b/extra/kde310/kkeyserver_x11.h
index 6d5acbb..b006a7a 100644
--- a/extra/kde310/kkeyserver_x11.h
+++ b/extra/kde310/kkeyserver_x11.h
@@ -53,7 +53,7 @@ namespace KKeyServer
 	   * @return true if succesful, false otherwise
 	   * @see TQt::Key
 	   */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 	  
 	  /**
 	   * Initializes the key with the given string description.
@@ -175,7 +175,7 @@ namespace KKeyServer
 	   * Sets the qt key code.
 	   * @param keyTQt the qt key code
 	   */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 	  /**
@@ -326,7 +326,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool keyTQtToSym( int keyTQt, uint& sym );
+	bool keyQtToSym( int keyTQt, uint& sym );
 	
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -336,7 +336,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool keyTQtToMod( int keyTQt, uint& mod );
+	bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -346,7 +346,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed @ref KKey::ModFlag modifiers to 
@@ -358,7 +358,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed @ref KKey::ModFlag modifiers to 
@@ -380,7 +380,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to 
@@ -429,7 +429,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 };
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde311/kkeyserver_x11.h b/extra/kde311/kkeyserver_x11.h
index 6d5acbb..b006a7a 100644
--- a/extra/kde311/kkeyserver_x11.h
+++ b/extra/kde311/kkeyserver_x11.h
@@ -53,7 +53,7 @@ namespace KKeyServer
 	   * @return true if succesful, false otherwise
 	   * @see TQt::Key
 	   */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 	  
 	  /**
 	   * Initializes the key with the given string description.
@@ -175,7 +175,7 @@ namespace KKeyServer
 	   * Sets the qt key code.
 	   * @param keyTQt the qt key code
 	   */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 	  /**
@@ -326,7 +326,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool keyTQtToSym( int keyTQt, uint& sym );
+	bool keyQtToSym( int keyTQt, uint& sym );
 	
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -336,7 +336,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool keyTQtToMod( int keyTQt, uint& mod );
+	bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -346,7 +346,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed @ref KKey::ModFlag modifiers to 
@@ -358,7 +358,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed @ref KKey::ModFlag modifiers to 
@@ -380,7 +380,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to 
@@ -429,7 +429,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 };
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde312/kkeyserver_x11.h b/extra/kde312/kkeyserver_x11.h
index 6d5acbb..b006a7a 100644
--- a/extra/kde312/kkeyserver_x11.h
+++ b/extra/kde312/kkeyserver_x11.h
@@ -53,7 +53,7 @@ namespace KKeyServer
 	   * @return true if succesful, false otherwise
 	   * @see TQt::Key
 	   */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 	  
 	  /**
 	   * Initializes the key with the given string description.
@@ -175,7 +175,7 @@ namespace KKeyServer
 	   * Sets the qt key code.
 	   * @param keyTQt the qt key code
 	   */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 	  /**
@@ -326,7 +326,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool keyTQtToSym( int keyTQt, uint& sym );
+	bool keyQtToSym( int keyTQt, uint& sym );
 	
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -336,7 +336,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool keyTQtToMod( int keyTQt, uint& mod );
+	bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -346,7 +346,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed @ref KKey::ModFlag modifiers to 
@@ -358,7 +358,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed @ref KKey::ModFlag modifiers to 
@@ -380,7 +380,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to 
@@ -429,7 +429,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 };
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde313/kkeyserver_x11.h b/extra/kde313/kkeyserver_x11.h
index 6d5acbb..b006a7a 100644
--- a/extra/kde313/kkeyserver_x11.h
+++ b/extra/kde313/kkeyserver_x11.h
@@ -53,7 +53,7 @@ namespace KKeyServer
 	   * @return true if succesful, false otherwise
 	   * @see TQt::Key
 	   */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 	  
 	  /**
 	   * Initializes the key with the given string description.
@@ -175,7 +175,7 @@ namespace KKeyServer
 	   * Sets the qt key code.
 	   * @param keyTQt the qt key code
 	   */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 	  /**
@@ -326,7 +326,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool keyTQtToSym( int keyTQt, uint& sym );
+	bool keyQtToSym( int keyTQt, uint& sym );
 	
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -336,7 +336,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool keyTQtToMod( int keyTQt, uint& mod );
+	bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -346,7 +346,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed @ref KKey::ModFlag modifiers to 
@@ -358,7 +358,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed @ref KKey::ModFlag modifiers to 
@@ -380,7 +380,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to 
@@ -429,7 +429,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 };
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde314/kkeyserver_x11.h b/extra/kde314/kkeyserver_x11.h
index 5858081..9f37821 100644
--- a/extra/kde314/kkeyserver_x11.h
+++ b/extra/kde314/kkeyserver_x11.h
@@ -53,7 +53,7 @@ namespace KKeyServer
 	   * @return true if succesful, false otherwise
 	   * @see TQt::Key
 	   */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 	  
 	  /**
 	   * Initializes the key with the given string description.
@@ -175,7 +175,7 @@ namespace KKeyServer
 	   * Sets the qt key code.
 	   * @param keyTQt the qt key code
 	   */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 	  /**
@@ -326,7 +326,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool keyTQtToSym( int keyTQt, uint& sym );
+	bool keyQtToSym( int keyTQt, uint& sym );
 	
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -336,7 +336,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool keyTQtToMod( int keyTQt, uint& mod );
+	bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -346,7 +346,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed @ref KKey::ModFlag modifiers to 
@@ -358,7 +358,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed @ref KKey::ModFlag modifiers to 
@@ -380,7 +380,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to 
@@ -429,7 +429,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde315/kkeyserver_x11.h b/extra/kde315/kkeyserver_x11.h
index 5858081..9f37821 100644
--- a/extra/kde315/kkeyserver_x11.h
+++ b/extra/kde315/kkeyserver_x11.h
@@ -53,7 +53,7 @@ namespace KKeyServer
 	   * @return true if succesful, false otherwise
 	   * @see TQt::Key
 	   */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 	  
 	  /**
 	   * Initializes the key with the given string description.
@@ -175,7 +175,7 @@ namespace KKeyServer
 	   * Sets the qt key code.
 	   * @param keyTQt the qt key code
 	   */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 	  /**
@@ -326,7 +326,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool keyTQtToSym( int keyTQt, uint& sym );
+	bool keyQtToSym( int keyTQt, uint& sym );
 	
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -336,7 +336,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool keyTQtToMod( int keyTQt, uint& mod );
+	bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -346,7 +346,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed @ref KKey::ModFlag modifiers to 
@@ -358,7 +358,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed @ref KKey::ModFlag modifiers to 
@@ -380,7 +380,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to 
@@ -429,7 +429,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde320/kkeyserver_x11.h b/extra/kde320/kkeyserver_x11.h
index 3da52bf..dea4ff0 100644
--- a/extra/kde320/kkeyserver_x11.h
+++ b/extra/kde320/kkeyserver_x11.h
@@ -51,7 +51,7 @@ namespace KKeyServer
 		 * @return true if successful, false otherwise
 		 * @see TQt::Key
 		 */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 
 		/**
 		 * Initializes the key with the given string description.
@@ -173,7 +173,7 @@ namespace KKeyServer
 		 * Sets the qt key code.
 		 * @param keyTQt the qt key code
 		 */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		/**
@@ -324,7 +324,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool keyTQtToSym( int keyTQt, uint& sym );
+	bool keyQtToSym( int keyTQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -334,7 +334,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool keyTQtToMod( int keyTQt, uint& mod );
+	bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -344,7 +344,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -356,7 +356,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -378,7 +378,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to
@@ -427,7 +427,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde321/kkeyserver_x11.h b/extra/kde321/kkeyserver_x11.h
index 3da52bf..dea4ff0 100644
--- a/extra/kde321/kkeyserver_x11.h
+++ b/extra/kde321/kkeyserver_x11.h
@@ -51,7 +51,7 @@ namespace KKeyServer
 		 * @return true if successful, false otherwise
 		 * @see TQt::Key
 		 */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 
 		/**
 		 * Initializes the key with the given string description.
@@ -173,7 +173,7 @@ namespace KKeyServer
 		 * Sets the qt key code.
 		 * @param keyTQt the qt key code
 		 */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		/**
@@ -324,7 +324,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool keyTQtToSym( int keyTQt, uint& sym );
+	bool keyQtToSym( int keyTQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -334,7 +334,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool keyTQtToMod( int keyTQt, uint& mod );
+	bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -344,7 +344,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -356,7 +356,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -378,7 +378,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to
@@ -427,7 +427,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde322/kkeyserver_x11.h b/extra/kde322/kkeyserver_x11.h
index 3da52bf..dea4ff0 100644
--- a/extra/kde322/kkeyserver_x11.h
+++ b/extra/kde322/kkeyserver_x11.h
@@ -51,7 +51,7 @@ namespace KKeyServer
 		 * @return true if successful, false otherwise
 		 * @see TQt::Key
 		 */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 
 		/**
 		 * Initializes the key with the given string description.
@@ -173,7 +173,7 @@ namespace KKeyServer
 		 * Sets the qt key code.
 		 * @param keyTQt the qt key code
 		 */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		/**
@@ -324,7 +324,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool keyTQtToSym( int keyTQt, uint& sym );
+	bool keyQtToSym( int keyTQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -334,7 +334,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool keyTQtToMod( int keyTQt, uint& mod );
+	bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -344,7 +344,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -356,7 +356,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -378,7 +378,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to
@@ -427,7 +427,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde323/kkeyserver_x11.h b/extra/kde323/kkeyserver_x11.h
index 3da52bf..dea4ff0 100644
--- a/extra/kde323/kkeyserver_x11.h
+++ b/extra/kde323/kkeyserver_x11.h
@@ -51,7 +51,7 @@ namespace KKeyServer
 		 * @return true if successful, false otherwise
 		 * @see TQt::Key
 		 */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 
 		/**
 		 * Initializes the key with the given string description.
@@ -173,7 +173,7 @@ namespace KKeyServer
 		 * Sets the qt key code.
 		 * @param keyTQt the qt key code
 		 */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		/**
@@ -324,7 +324,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool keyTQtToSym( int keyTQt, uint& sym );
+	bool keyQtToSym( int keyTQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -334,7 +334,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool keyTQtToMod( int keyTQt, uint& mod );
+	bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -344,7 +344,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -356,7 +356,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -378,7 +378,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to
@@ -427,7 +427,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde330/kkeyserver_x11.h b/extra/kde330/kkeyserver_x11.h
index 3da52bf..dea4ff0 100644
--- a/extra/kde330/kkeyserver_x11.h
+++ b/extra/kde330/kkeyserver_x11.h
@@ -51,7 +51,7 @@ namespace KKeyServer
 		 * @return true if successful, false otherwise
 		 * @see TQt::Key
 		 */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 
 		/**
 		 * Initializes the key with the given string description.
@@ -173,7 +173,7 @@ namespace KKeyServer
 		 * Sets the qt key code.
 		 * @param keyTQt the qt key code
 		 */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		/**
@@ -324,7 +324,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool keyTQtToSym( int keyTQt, uint& sym );
+	bool keyQtToSym( int keyTQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -334,7 +334,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool keyTQtToMod( int keyTQt, uint& mod );
+	bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -344,7 +344,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -356,7 +356,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -378,7 +378,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to
@@ -427,7 +427,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde331/kkeyserver_x11.h b/extra/kde331/kkeyserver_x11.h
index 3da52bf..dea4ff0 100644
--- a/extra/kde331/kkeyserver_x11.h
+++ b/extra/kde331/kkeyserver_x11.h
@@ -51,7 +51,7 @@ namespace KKeyServer
 		 * @return true if successful, false otherwise
 		 * @see TQt::Key
 		 */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 
 		/**
 		 * Initializes the key with the given string description.
@@ -173,7 +173,7 @@ namespace KKeyServer
 		 * Sets the qt key code.
 		 * @param keyTQt the qt key code
 		 */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		/**
@@ -324,7 +324,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool keyTQtToSym( int keyTQt, uint& sym );
+	bool keyQtToSym( int keyTQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -334,7 +334,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool keyTQtToMod( int keyTQt, uint& mod );
+	bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -344,7 +344,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -356,7 +356,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -378,7 +378,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to
@@ -427,7 +427,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde332/kkeyserver_x11.h b/extra/kde332/kkeyserver_x11.h
index 3da52bf..dea4ff0 100644
--- a/extra/kde332/kkeyserver_x11.h
+++ b/extra/kde332/kkeyserver_x11.h
@@ -51,7 +51,7 @@ namespace KKeyServer
 		 * @return true if successful, false otherwise
 		 * @see TQt::Key
 		 */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 
 		/**
 		 * Initializes the key with the given string description.
@@ -173,7 +173,7 @@ namespace KKeyServer
 		 * Sets the qt key code.
 		 * @param keyTQt the qt key code
 		 */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		/**
@@ -324,7 +324,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool keyTQtToSym( int keyTQt, uint& sym );
+	bool keyQtToSym( int keyTQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -334,7 +334,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool keyTQtToMod( int keyTQt, uint& mod );
+	bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -344,7 +344,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	bool symToKeyTQt( uint sym, int& keyTQt );
+	bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -356,7 +356,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	bool modToModTQt( uint mod, int& modTQt );
+	bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -378,7 +378,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	bool modXToModTQt( uint modX, int& modTQt );
+	bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to
@@ -427,7 +427,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde340/kkeyserver_x11.h b/extra/kde340/kkeyserver_x11.h
index 180d821..e1810fb 100644
--- a/extra/kde340/kkeyserver_x11.h
+++ b/extra/kde340/kkeyserver_x11.h
@@ -73,7 +73,7 @@ namespace KKeyServer
 		 * @return true if successful, false otherwise
 		 * @see TQt::Key
 		 */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 
 		/**
 		 * Initializes the key with the given string description.
@@ -195,7 +195,7 @@ namespace KKeyServer
 		 * Sets the qt key code.
 		 * @param keyTQt the qt key code
 		 */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		/**
@@ -346,7 +346,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool keyTQtToSym( int keyTQt, uint& sym );
+	TDECORE_EXPORT bool keyQtToSym( int keyTQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -356,7 +356,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	TDECORE_EXPORT bool keyTQtToMod( int keyTQt, uint& mod );
+	TDECORE_EXPORT bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -366,7 +366,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool symToKeyTQt( uint sym, int& keyTQt );
+	TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -378,7 +378,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	TDECORE_EXPORT bool modToModTQt( uint mod, int& modTQt );
+	TDECORE_EXPORT bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -401,7 +401,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 */
 	//wrapped for win32
-	TDECORE_EXPORT bool modXToModTQt( uint modX, int& modTQt );
+	TDECORE_EXPORT bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the TQt-compatible button state to x11 modifier. 
@@ -455,7 +455,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	TDECORE_EXPORT void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	TDECORE_EXPORT void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde341/kkeyserver_x11.h b/extra/kde341/kkeyserver_x11.h
index 180d821..e1810fb 100644
--- a/extra/kde341/kkeyserver_x11.h
+++ b/extra/kde341/kkeyserver_x11.h
@@ -73,7 +73,7 @@ namespace KKeyServer
 		 * @return true if successful, false otherwise
 		 * @see TQt::Key
 		 */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 
 		/**
 		 * Initializes the key with the given string description.
@@ -195,7 +195,7 @@ namespace KKeyServer
 		 * Sets the qt key code.
 		 * @param keyTQt the qt key code
 		 */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		/**
@@ -346,7 +346,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool keyTQtToSym( int keyTQt, uint& sym );
+	TDECORE_EXPORT bool keyQtToSym( int keyTQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -356,7 +356,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	TDECORE_EXPORT bool keyTQtToMod( int keyTQt, uint& mod );
+	TDECORE_EXPORT bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -366,7 +366,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool symToKeyTQt( uint sym, int& keyTQt );
+	TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -378,7 +378,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	TDECORE_EXPORT bool modToModTQt( uint mod, int& modTQt );
+	TDECORE_EXPORT bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -401,7 +401,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 */
 	//wrapped for win32
-	TDECORE_EXPORT bool modXToModTQt( uint modX, int& modTQt );
+	TDECORE_EXPORT bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the TQt-compatible button state to x11 modifier. 
@@ -455,7 +455,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	TDECORE_EXPORT void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	TDECORE_EXPORT void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde342/kkeyserver_x11.h b/extra/kde342/kkeyserver_x11.h
index dcdc3fa..b5ebb1c 100644
--- a/extra/kde342/kkeyserver_x11.h
+++ b/extra/kde342/kkeyserver_x11.h
@@ -73,7 +73,7 @@ namespace KKeyServer
 		 * @return true if successful, false otherwise
 		 * @see TQt::Key
 		 */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 
 		/**
 		 * Initializes the key with the given string description.
@@ -195,7 +195,7 @@ namespace KKeyServer
 		 * Sets the qt key code.
 		 * @param keyTQt the qt key code
 		 */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		/**
@@ -354,7 +354,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool keyTQtToSym( int keyTQt, uint& sym );
+	TDECORE_EXPORT bool keyQtToSym( int keyTQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -364,7 +364,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	TDECORE_EXPORT bool keyTQtToMod( int keyTQt, uint& mod );
+	TDECORE_EXPORT bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -374,7 +374,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool symToKeyTQt( uint sym, int& keyTQt );
+	TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -386,7 +386,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	TDECORE_EXPORT bool modToModTQt( uint mod, int& modTQt );
+	TDECORE_EXPORT bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -409,7 +409,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 */
 	//wrapped for win32
-	TDECORE_EXPORT bool modXToModTQt( uint modX, int& modTQt );
+	TDECORE_EXPORT bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the TQt-compatible button state to x11 modifier. 
@@ -463,7 +463,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	TDECORE_EXPORT void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	TDECORE_EXPORT void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde343/kkeyserver_x11.h b/extra/kde343/kkeyserver_x11.h
index dcdc3fa..b5ebb1c 100644
--- a/extra/kde343/kkeyserver_x11.h
+++ b/extra/kde343/kkeyserver_x11.h
@@ -73,7 +73,7 @@ namespace KKeyServer
 		 * @return true if successful, false otherwise
 		 * @see TQt::Key
 		 */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 
 		/**
 		 * Initializes the key with the given string description.
@@ -195,7 +195,7 @@ namespace KKeyServer
 		 * Sets the qt key code.
 		 * @param keyTQt the qt key code
 		 */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		/**
@@ -354,7 +354,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool keyTQtToSym( int keyTQt, uint& sym );
+	TDECORE_EXPORT bool keyQtToSym( int keyTQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -364,7 +364,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	TDECORE_EXPORT bool keyTQtToMod( int keyTQt, uint& mod );
+	TDECORE_EXPORT bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -374,7 +374,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool symToKeyTQt( uint sym, int& keyTQt );
+	TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -386,7 +386,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	TDECORE_EXPORT bool modToModTQt( uint mod, int& modTQt );
+	TDECORE_EXPORT bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -409,7 +409,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 */
 	//wrapped for win32
-	TDECORE_EXPORT bool modXToModTQt( uint modX, int& modTQt );
+	TDECORE_EXPORT bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the TQt-compatible button state to x11 modifier. 
@@ -463,7 +463,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	TDECORE_EXPORT void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	TDECORE_EXPORT void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde350/kkeyserver_x11.h b/extra/kde350/kkeyserver_x11.h
index daecca4..3c00729 100644
--- a/extra/kde350/kkeyserver_x11.h
+++ b/extra/kde350/kkeyserver_x11.h
@@ -73,7 +73,7 @@ namespace KKeyServer
 		 * @return true if successful, false otherwise
 		 * @see TQt::Key
 		 */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 
 		/**
 		 * Initializes the key with the given string description.
@@ -195,7 +195,7 @@ namespace KKeyServer
 		 * Sets the qt key code.
 		 * @param keyTQt the qt key code
 		 */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		/**
@@ -354,7 +354,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool keyTQtToSym( int keyTQt, uint& sym );
+	TDECORE_EXPORT bool keyQtToSym( int keyTQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -364,7 +364,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	TDECORE_EXPORT bool keyTQtToMod( int keyTQt, uint& mod );
+	TDECORE_EXPORT bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -374,7 +374,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool symToKeyTQt( uint sym, int& keyTQt );
+	TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -386,7 +386,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	TDECORE_EXPORT bool modToModTQt( uint mod, int& modTQt );
+	TDECORE_EXPORT bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -409,7 +409,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 */
 	//wrapped for win32
-	TDECORE_EXPORT bool modXToModTQt( uint modX, int& modTQt );
+	TDECORE_EXPORT bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the TQt-compatible button state to x11 modifier. 
@@ -471,7 +471,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	TDECORE_EXPORT void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	TDECORE_EXPORT void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde351/kkeyserver_x11.h b/extra/kde351/kkeyserver_x11.h
index daecca4..3c00729 100644
--- a/extra/kde351/kkeyserver_x11.h
+++ b/extra/kde351/kkeyserver_x11.h
@@ -73,7 +73,7 @@ namespace KKeyServer
 		 * @return true if successful, false otherwise
 		 * @see TQt::Key
 		 */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 
 		/**
 		 * Initializes the key with the given string description.
@@ -195,7 +195,7 @@ namespace KKeyServer
 		 * Sets the qt key code.
 		 * @param keyTQt the qt key code
 		 */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		/**
@@ -354,7 +354,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool keyTQtToSym( int keyTQt, uint& sym );
+	TDECORE_EXPORT bool keyQtToSym( int keyTQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -364,7 +364,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	TDECORE_EXPORT bool keyTQtToMod( int keyTQt, uint& mod );
+	TDECORE_EXPORT bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -374,7 +374,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool symToKeyTQt( uint sym, int& keyTQt );
+	TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -386,7 +386,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	TDECORE_EXPORT bool modToModTQt( uint mod, int& modTQt );
+	TDECORE_EXPORT bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -409,7 +409,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 */
 	//wrapped for win32
-	TDECORE_EXPORT bool modXToModTQt( uint modX, int& modTQt );
+	TDECORE_EXPORT bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the TQt-compatible button state to x11 modifier. 
@@ -471,7 +471,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	TDECORE_EXPORT void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	TDECORE_EXPORT void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde352/kkeyserver_x11.h b/extra/kde352/kkeyserver_x11.h
index daecca4..3c00729 100644
--- a/extra/kde352/kkeyserver_x11.h
+++ b/extra/kde352/kkeyserver_x11.h
@@ -73,7 +73,7 @@ namespace KKeyServer
 		 * @return true if successful, false otherwise
 		 * @see TQt::Key
 		 */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyTQt );
 
 		/**
 		 * Initializes the key with the given string description.
@@ -195,7 +195,7 @@ namespace KKeyServer
 		 * Sets the qt key code.
 		 * @param keyTQt the qt key code
 		 */
-		void setKeycodeTQt( int keyTQt )
+		void setKeycodeQt( int keyTQt )
 			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
 
 		/**
@@ -354,7 +354,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool keyTQtToSym( int keyTQt, uint& sym );
+	TDECORE_EXPORT bool keyQtToSym( int keyTQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given TQt key and
@@ -364,7 +364,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see TQt::Key
 	 */
-	TDECORE_EXPORT bool keyTQtToMod( int keyTQt, uint& mod );
+	TDECORE_EXPORT bool keyQtToMod( int keyTQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a TQt key code.
@@ -374,7 +374,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool symToKeyTQt( uint sym, int& keyTQt );
+	TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -386,7 +386,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 * @see KKey
 	 */
-	TDECORE_EXPORT bool modToModTQt( uint mod, int& modTQt );
+	TDECORE_EXPORT bool modToModQt( uint mod, int& modTQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -409,7 +409,7 @@ namespace KKeyServer
 	 * @see TQt::Key
 	 */
 	//wrapped for win32
-	TDECORE_EXPORT bool modXToModTQt( uint modX, int& modTQt );
+	TDECORE_EXPORT bool modXToModQt( uint modX, int& modTQt );
 
 	/**
 	 * Converts the TQt-compatible button state to x11 modifier. 
@@ -471,7 +471,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	TDECORE_EXPORT void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	TDECORE_EXPORT void keyQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/extra/kde353/kkeyserver_x11.h b/extra/kde353/kkeyserver_x11.h
index daecca4..ce3fa2f 100644
--- a/extra/kde353/kkeyserver_x11.h
+++ b/extra/kde353/kkeyserver_x11.h
@@ -68,12 +68,12 @@ namespace KKeyServer
 			{ init( s ); }
 
 		/**
-		 * Initializes the symbol with the given TQt key code.
-		 * @param keyTQt the qt key code
+		 * Initializes the symbol with the given Qt key code.
+		 * @param keyQt the qt key code
 		 * @return true if successful, false otherwise
-		 * @see TQt::Key
+		 * @see Qt::Key
 		 */
-		bool initTQt( int keyTQt );
+		bool initQt( int keyQt );
 
 		/**
 		 * Initializes the key with the given string description.
@@ -101,10 +101,10 @@ namespace KKeyServer
 		TQString toString() const;
 
 		/**
-		 * Returns the mods that are retquired for this symbol as
-		 * ORed KKey::ModFlag's. For example, Break retquires a
+		 * Returns the mods that are required for this symbol as
+		 * ORed KKey::ModFlag's. For example, Break requires a
 		 * Ctrl to be valid.
-		 * @return the retquired KKey::ModFlag's
+		 * @return the required KKey::ModFlag's
 		 * @see KKey::ModFlag
 		 */
 		uint getModsRequired() const;
@@ -136,7 +136,7 @@ namespace KKeyServer
 	 */
 	struct TDECORE_EXPORT Key
 	{
-		/// Code for native Keys in TQt
+		/// Code for native Keys in Qt
 		enum { CODE_FOR_QT = 256 };
 
 		/// The code of the key
@@ -151,18 +151,18 @@ namespace KKeyServer
 		/**
 		 * Initializes the key with a KKey.
 		 * @param key the key to get the data from
-		 * @param bTQt true to take the TQt keycode, false
+		 * @param bQt true to take the Qt keycode, false
 		 *            for the native key code
-		 * @see TQt::Key
+		 * @see Qt::Key
 		 * @see KKeyNative
 		 */
-		bool init( const KKey& key, bool bTQt );
+		bool init( const KKey& key, bool bQt );
 
 		/**
 		 * Checks whether the key code is a native code.
 		 * @return true if native code of the window system,
-		 *         false if it is a TQt keycode
-		 * @see TQt::Key
+		 *         false if it is a Qt keycode
+		 * @see Qt::Key
 		 * @see KKeyNative
 		 */
 		bool isNative() const { return m_code != CODE_FOR_QT; }
@@ -193,10 +193,10 @@ namespace KKeyServer
 
 		/**
 		 * Sets the qt key code.
-		 * @param keyTQt the qt key code
+		 * @param keyQt the qt key code
 		 */
-		void setKeycodeTQt( int keyTQt )
-			{ m_code = CODE_FOR_QT; m_sym = keyTQt; }
+		void setKeycodeQt( int keyQt )
+			{ m_code = CODE_FOR_QT; m_sym = keyQt; }
 
 		/**
 		 * Initializes this key with a KKeyNative.
@@ -250,7 +250,7 @@ namespace KKeyServer
 
 		Variations() { m_nVariations = 0; }
 
-		void init( const KKey&, bool bTQt );
+		void init( const KKey&, bool bQt );
 
 		uint count() const { return m_nVariations; }
 		const Key& key( uint i ) const { return m_rgkey[i]; }
@@ -346,47 +346,47 @@ namespace KKeyServer
 	TDECORE_EXPORT uint accelModMaskX();
 
 	/**
-	 * Extracts the symbol from the given TQt key and
+	 * Extracts the symbol from the given Qt key and
 	 * converts it to a symbol.
-	 * @param keyTQt the qt key code
+	 * @param keyQt the qt key code
 	 * @param sym if successful, the symbol will be written here
 	 * @return true if successful, false otherwise
-	 * @see TQt::Key
+	 * @see Qt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool keyTQtToSym( int keyTQt, uint& sym );
+	TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym );
 
 	/**
-	 * Extracts the modifiers from the given TQt key and
+	 * Extracts the modifiers from the given Qt key and
 	 * converts them in a mask of ORed KKey::ModFlag modifiers.
-	 * @param keyTQt the qt key code
+	 * @param keyQt the qt key code
 	 * @param mod if successful, the modifiers will be written here
 	 * @return true if successful, false otherwise
-	 * @see TQt::Key
+	 * @see Qt::Key
 	 */
-	TDECORE_EXPORT bool keyTQtToMod( int keyTQt, uint& mod );
+	TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod );
 
 	/**
-	 * Converts the given symbol to a TQt key code.
+	 * Converts the given symbol to a Qt key code.
 	 * @param sym the symbol
-	 * @param keyTQt if successful, the qt key code will be written here
+	 * @param keyQt if successful, the qt key code will be written here
 	 * @return true if successful, false otherwise
-	 * @see TQt::Key
+	 * @see Qt::Key
 	 * @see Sym
 	 */
-	TDECORE_EXPORT bool symToKeyTQt( uint sym, int& keyTQt );
+	TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
-	 * a mask of ORed TQt key code modifiers.
+	 * a mask of ORed Qt key code modifiers.
 	 * @param mod the mask of KKey::ModFlag modifiers
-	 * @param modTQt the mask of TQt key code modifiers will be written here,
+	 * @param modQt the mask of Qt key code modifiers will be written here,
 	 *        if successful
 	 * @return true if successful, false otherwise
-	 * @see TQt::Key
+	 * @see Qt::Key
 	 * @see KKey
 	 */
-	TDECORE_EXPORT bool modToModTQt( uint mod, int& modTQt );
+	TDECORE_EXPORT bool modToModQt( uint mod, int& modQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -401,20 +401,20 @@ namespace KKeyServer
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to
-	 * a mask of ORed TQt key code modifiers.
+	 * a mask of ORed Qt key code modifiers.
 	 * @param modX the mask of X11 modifiers
-	 * @param modTQt the mask of TQt key code modifiers will be written here
+	 * @param modQt the mask of Qt key code modifiers will be written here
 	 *        if successful
 	 * @return true if successful, false otherwise
-	 * @see TQt::Key
+	 * @see Qt::Key
 	 */
 	//wrapped for win32
-	TDECORE_EXPORT bool modXToModTQt( uint modX, int& modTQt );
+	TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt );
 
 	/**
-	 * Converts the TQt-compatible button state to x11 modifier. 
+	 * Converts the Qt-compatible button state to x11 modifier. 
 	 */
-	TDECORE_EXPORT int qtButtonStateToMod( TQt::ButtonState s );
+	TDECORE_EXPORT int qtButtonStateToMod( TQ_ButtonState s );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to
@@ -435,7 +435,7 @@ namespace KKeyServer
 	 * @param modX the mask of ORed X11 modifiers
 	 * @param symX if successful, the X11 symbol will be written here
 	 * @return true if successful, false otherwise
-	 * @see TQt::Key
+	 * @see Qt::Key
 	 * @see Sym
 	 */
 	TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX );
@@ -471,7 +471,7 @@ namespace KKeyServer
 	 * @internal
 	 * Unimplemented?
 	 */
-	TDECORE_EXPORT void keyTQtToKeyX( uint keyCombTQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	TDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/sip/tdecore/kkeyserver_x11.sip b/sip/tdecore/kkeyserver_x11.sip
index b22bbec..aad7085 100644
--- a/sip/tdecore/kkeyserver_x11.sip
+++ b/sip/tdecore/kkeyserver_x11.sip
@@ -52,7 +52,7 @@ public:
                          Sym ();
                          Sym (uint);
                          Sym (const TQString&);
-    bool                 initTQt (int);
+    bool                 initQt (int);
     bool                 init (const TQString&);
     int                  qt () const;
     TQString              toStringInternal () const;
@@ -91,7 +91,7 @@ public:
     uint                 mod () const;
     uint                 sym () const;
     int                  keyCodeQt () const;
-    void                 setKeycodeTQt (int);
+    void                 setKeycodeQt (int);
     int                  compare (const KKeyServer::Key&) const;
 
 %If ( KDE_3_1_4 -  )
@@ -143,12 +143,12 @@ uint                 modXModeSwitch ();
 %End
 
 uint                 accelModMaskX ();
-//ig bool                 keyTQtToSym (int, uint&);
-//ig bool                 keyTQtToMod (int, uint&);
-//ig bool                 symToKeyTQt (uint, int&);
-//ig bool                 modToModTQt (uint, int&);
+//ig bool                 keyQtToSym (int, uint&);
+//ig bool                 keyQtToMod (int, uint&);
+//ig bool                 symToKeyQt (uint, int&);
+//ig bool                 modToModQt (uint, int&);
 //ig bool                 modToModX (uint, uint&);
-//ig bool                 modXToModTQt (uint, int&);
+//ig bool                 modXToModQt (uint, int&);
 
 %If ( KDE_3_4_2 -  )
 //ig int                  qtButtonStateToMod (TQt::ButtonState);
@@ -164,7 +164,7 @@ uint                 stringUserToMod (const TQString&);
 %End
 
 //ig bool                 stringToSymMod (const TQString&, uint&, uint&);
-//ig void                 keyTQtToKeyX (uint, uchar*, uint*, uint*);
+//ig void                 keyQtToKeyX (uint, uchar*, uint*, uint*);
 
 %If (  - KDE_3_2_0 )