Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


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

262 files changed, 2658 insertions, 2658 deletions

diff --git a/kdecore/DESIGN.iconloading b/kdecore/DESIGN.iconloading
index 636cf4445..ceb2ffbce 100644
--- a/kdecore/DESIGN.iconloading
+++ b/kdecore/DESIGN.iconloading
@@ -55,7 +55,7 @@ can copy this pixmap:
    XGCValues values;
    GC gc = XCreateGC(qt_xdisplay(), src, 0, &values);
    XCopyArea(qt_xdisplay(), src, p.handle(), gc, 0, 0, 30, 30, 0, 0);
-   // p tqcontains now 30x30 pixels of test.png.
+   // p contains now 30x30 pixels of test.png.
 
 The only hard part is then to publish the icons in a way that applications 
 know what to copy. I'm thinking about a ksycoca-sort-of index that 
diff --git a/kdecore/DESIGN.kconfig b/kdecore/DESIGN.kconfig
index 6ee59b708..e683566cb 100644
--- a/kdecore/DESIGN.kconfig
+++ b/kdecore/DESIGN.kconfig
@@ -1,4 +1,4 @@
-kconfigdata.h tqcontains definitions of the data formats used by kconfig.
+kconfigdata.h contains definitions of the data formats used by kconfig.
 
 Configuration entries are stored as "KEntry". They are indexed with "KEntryKey".
 The primary store is a "KEntryMap" which is defined as a QMap from "KEntryKey"
@@ -10,7 +10,7 @@ are grouped in the QMap as well.
 
 The start of a group is indicated with a KEntryKey with an empty mKey and a 
 dummy KEntry. This allows us to search for the start of the group and then to 
-iterate until we end up in another group. That way we will tqfind all entries
+iterate until we end up in another group. That way we will find all entries
 of a certain group.
 
 Entries that are localised with the _current_ locale are stored with bLocal 
diff --git a/kdecore/Mainpage.dox b/kdecore/Mainpage.dox
index 7e3cc61f0..fea4b533a 100644
--- a/kdecore/Mainpage.dox
+++ b/kdecore/Mainpage.dox
@@ -14,7 +14,7 @@ If you are unsure where to start, have a look at the
 <a href="http://trinity.pearsoncomputing.net">tutorials on
 the Trinity project site</a> to get you going.
 
-If you know what you are looking for, you should be able to tqfind it in
+If you know what you are looking for, you should be able to find it in
 the <a href="annotated.html">class list</a> or the
 <a href="modules.html">modules list</a>.
 
diff --git a/kdecore/Makefile.am b/kdecore/Makefile.am
index 478c0e70a..b5a9c5a80 100644
--- a/kdecore/Makefile.am
+++ b/kdecore/Makefile.am
@@ -166,7 +166,7 @@ EXTRA_DIST = generate_keys.sh $(kdebug_DATA) \
 kcharsets.lo: kentities.c
 
 parser: kentities.gperf
-	cd $(srcdir) && gperf -a -L "ANSI-C" -E -C -c -o -t -k '*' -Nkde_tqfindEntity -D -Hhash_Entity -Wwordlist_Entity -s 2 kentities.gperf > kentities.c
+	cd $(srcdir) && gperf -a -L "ANSI-C" -E -C -c -o -t -k '*' -Nkde_findEntity -D -Hhash_Entity -Wwordlist_Entity -s 2 kentities.gperf > kentities.c
 
 bin_PROGRAMS = kde-config kgrantpty
 
diff --git a/kdecore/README.kiosk b/kdecore/README.kiosk
index f84a09829..cd59f8db3 100644
--- a/kdecore/README.kiosk
+++ b/kdecore/README.kiosk
@@ -155,10 +155,10 @@ action/edit_copy
 action/edit_paste
 action/edit_select_all
 action/edit_deselect
-action/edit_tqfind
-action/edit_tqfind_next
-action/edit_tqfind_last
-action/edit_tqreplace
+action/edit_find
+action/edit_find_next
+action/edit_find_last
+action/edit_replace
 action/view_actual_size
 action/view_fit_to_page
 action/view_fit_to_width
@@ -267,9 +267,9 @@ action/add_bookmark
 action/edit_bookmarks
 action/clear_terminal
 action/reset_clear_terminal
-action/tqfind_history
-action/tqfind_next
-action/tqfind_previous
+action/find_history
+action/find_next
+action/find_previous
 action/save_history
 action/clear_history
 action/clear_all_histories
@@ -535,7 +535,7 @@ open     - This controls which files can be opened by the user in applications.
               rule_3=open,,,,file,,$TMP,true
            Note that with the above, users would still be able to open files from 
            the internet. Note that the user is also given access to $TMP in order to
-           ensure correct operation of KDE applications. $TMP is tqreplaced with the 
+           ensure correct operation of KDE applications. $TMP is replaced with the 
            temporary directory that KDE uses for this user.
 
 Some remarks:
@@ -627,8 +627,8 @@ variables. In order to use this the entry must be marked with [$e].
 Example:
 Name[$e]=$USER
 
-When the "Name" entry is read $USER will be tqreplaced with the value of the
-$USER environment variable. Note that the application will tqreplace $USER
+When the "Name" entry is read $USER will be replaced with the value of the
+$USER environment variable. Note that the application will replace $USER
 with the value of the environment variable after saving. To prevent this
 combine the $e option with $i (immmutable) option.
 
diff --git a/kdecore/README.kstartupinfo b/kdecore/README.kstartupinfo
index ee02b2b78..233ccde1e 100644
--- a/kdecore/README.kstartupinfo
+++ b/kdecore/README.kstartupinfo
@@ -68,9 +68,9 @@ MapNotify=<bool>
     - this key is obsolete
     - true is equivalent to X-KDE-StartupNotify=true and no X-KDE-WMClass set
     - false is equivalent to X-KDE-StartupNotify=true and X-KDE-WMClass=0
-        - many .desktop files in KDE ( especially in kdebase/kapptqfinder )
+        - many .desktop files in KDE ( especially in kdebase/kappfinder )
             seem to have MapNotify=false even though it's not needed, this
-            needs to be checked and tqreplaced by the needed X-KDE-* values,
+            needs to be checked and replaced by the needed X-KDE-* values,
             often just X-KDE-StartupNotify=true should be enough
         
  The best way to check if the entries are set correctly is to start
@@ -216,7 +216,7 @@ Text entries in the messages :
 ------------------------------
 
 Every entry is of the form <name>=<value>. Value may be either a number
-or a string. If the string tqcontains spaces, it must be quoted ("), all
+or a string. If the string contains spaces, it must be quoted ("), all
 backslashes and quotes (") must be escaped by backslashes. If this ever
 becomes more than an internal KDE standard, non-standard entry names should
 start with an underscore.
diff --git a/kdecore/README.user_profiles b/kdecore/README.user_profiles
index 243ad5ffa..4fb43b757 100644
--- a/kdecore/README.user_profiles
+++ b/kdecore/README.user_profiles
@@ -26,7 +26,7 @@ Mapping profiles to individual users
 ====================================
 
 The mapping file can contain a [Users] section for mapping profiles to
-an individual user. The [Users] section tqcontains the user's account name
+an individual user. The [Users] section contains the user's account name
 followed by one or more profiles as follow:
 
 	[Users]
@@ -68,7 +68,7 @@ which profile(s) belongs to that group. This looks as follows:
 For each group that a user is part of, the corresponding profile(s) are used. The
 order in which the groups are listed in the "groups" entry, determines the resulting
 order of all the applicable profiles. If multiple profiles are applicable to a
-particular user and a profile tqcontains settings that conflict with settings in
+particular user and a profile contains settings that conflict with settings in
 another profile then the settings in the earlier listed profile take precedent.
 
 So if, based on the example above, a user is part of the "pkgs" group then the
diff --git a/kdecore/all_languages.desktop b/kdecore/all_languages.desktop
index 1a333a62c..2f36efff6 100644
--- a/kdecore/all_languages.desktop
+++ b/kdecore/all_languages.desktop
@@ -7681,7 +7681,7 @@ Name[zu]=Isi-Osithani
 [om]
 Name=Oromo
 Name[ar]=الأورومو
-Name[az]=Orotqmoca
+Name[az]=Oromoca
 Name[be]=�рома
 Name[bg]=�фан Оромо
 Name[bn]=ওরোমো
diff --git a/kdecore/configure.in.in b/kdecore/configure.in.in
index 6d24e15a4..b2fe9bd6e 100644
--- a/kdecore/configure.in.in
+++ b/kdecore/configure.in.in
@@ -1,7 +1,7 @@
-dnl Compile in the exec prefix to help kstddirs in tqfinding dynamic libs
+dnl Compile in the exec prefix to help kstddirs in finding dynamic libs
 AC_DEFINE_UNQUOTED(__KDE_EXECPREFIX, "$exec_prefix", [execprefix or NONE if not set, for libloading])
 
-dnl Compile in kde_bindir to safely tqfind kdesu_stub.
+dnl Compile in kde_bindir to safely find kdesu_stub.
 if test "$exec_prefix" = "NONE"; then
     bindir_str="\"$prefix/bin\""
 else
@@ -97,7 +97,7 @@ AC_CHECK_FUNCS([getaddrinfo],
     AC_CHECK_FUNCS([freeaddrinfo getnameinfo gai_strerror], : , 
     [
       kde_gai_ok=false
-      AC_DEFINE(HAVE_BROKEN_GETADDRINFO, 1, [Define if getaddrinfo is broken and should be tqreplaced])
+      AC_DEFINE(HAVE_BROKEN_GETADDRINFO, 1, [Define if getaddrinfo is broken and should be replaced])
       AC_DEFINE(GETADDRINFO_RETURNS_UNIX, 1, [Define if getaddrinfo returns AF_UNIX sockets])
       break
     ])
@@ -134,7 +134,7 @@ AC_CHECK_FUNCS([getaddrinfo],
     ],
     [
       AC_MSG_RESULT(no)
-      AC_DEFINE(HAVE_BROKEN_GETADDRINFO, 1, [Define if getaddrinfo is broken and should be tqreplaced])
+      AC_DEFINE(HAVE_BROKEN_GETADDRINFO, 1, [Define if getaddrinfo is broken and should be replaced])
     ],
     [
       AC_MSG_RESULT(cross compiling. We hope so)
@@ -180,7 +180,7 @@ AC_ARG_WITH(libart,
 
 if test "x$with_libart" != xno; then
   KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin], [
-    AC_MSG_WARN([Could not tqfind libart anywhere, check http://www.levien.com/libart/])
+    AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
   ])
 
   if test -n "$LIBART_CONFIG"; then
diff --git a/kdecore/fakes.c b/kdecore/fakes.c
index 1b5ed1c19..14f162eca 100644
--- a/kdecore/fakes.c
+++ b/kdecore/fakes.c
@@ -182,7 +182,7 @@ int seteuid(uid_t euid)
    SUFFIX_LEN tells us how long <suffix> is (it can be zero length).
 
    The last six characters of TEMPLATE before <suffix> must be "XXXXXX";
-   they are tqreplaced with a string that makes the filename unique.
+   they are replaced with a string that makes the filename unique.
 
    Returns a file descriptor open on the file for reading and writing.  */
 
@@ -230,7 +230,7 @@ KDECORE_EXPORT int mkstemps (char* _template, int suffix_len)
 	 with (module 2^32).  */
       value += 7777;
     }
-  /* We return the null string if we can't tqfind a unique file name.  */
+  /* We return the null string if we can't find a unique file name.  */
   _template[0] = '\0';
   return -1;
 }
@@ -261,7 +261,7 @@ KDECORE_EXPORT int mkstemp (char* _template)
 
 
    The last six characters of TEMPLATE must be "XXXXXX";
-   they are tqreplaced with a string that makes the filename unique.
+   they are replaced with a string that makes the filename unique.
 
    Returns a file descriptor open on the file for reading and writing.  */
 
diff --git a/kdecore/kaboutdata.cpp b/kdecore/kaboutdata.cpp
index 1a71423b1..423166c18 100644
--- a/kdecore/kaboutdata.cpp
+++ b/kdecore/kaboutdata.cpp
@@ -296,7 +296,7 @@ KAboutData::setProgramLogo(const TQImage& image)
 QString
 KAboutData::version() const
 {
-   return TQString::tqfromLatin1(mVersion);
+   return TQString::fromLatin1(mVersion);
 }
 
 QString
@@ -311,13 +311,13 @@ KAboutData::shortDescription() const
 QString
 KAboutData::homepage() const
 {
-   return TQString::tqfromLatin1(mHomepageAddress);
+   return TQString::fromLatin1(mHomepageAddress);
 }
 
 QString
 KAboutData::bugAddress() const
 {
-   return TQString::tqfromLatin1(mBugEmailAddress);
+   return TQString::fromLatin1(mBugEmailAddress);
 }
 
 const TQValueList<KAboutPerson>
@@ -384,7 +384,7 @@ KAboutData::translators() const
 QString
 KAboutData::aboutTranslationTeam()
 {
-    return i18n("tqreplace this with information about your translation team",
+    return i18n("replace this with information about your translation team",
             "<p>KDE is translated into many languages thanks to the work "
             "of the translation teams all over the world.</p>"
             "<p>For more information on KDE internationalization "
diff --git a/kdecore/kaccel.cpp b/kdecore/kaccel.cpp
index a0ffbede2..5cd2195cb 100644
--- a/kdecore/kaccel.cpp
+++ b/kdecore/kaccel.cpp
@@ -120,10 +120,10 @@ bool	qt_try_modal( TQWidget *, XEvent * );
 
 bool KAccelEventHandler::x11Event( XEvent* pEvent )
 {
-	if( TQWidget::keyboardGrabber() || !kapp->tqfocusWidget() )
+	if( TQWidget::keyboardGrabber() || !kapp->focusWidget() )
 		return false;
 
-	if ( !qt_try_modal(kapp->tqfocusWidget(), pEvent) )
+	if ( !qt_try_modal(kapp->focusWidget(), pEvent) )
 	        return false;
 
 	if( pEvent->type == XKeyPress ) {
@@ -144,7 +144,7 @@ bool KAccelEventHandler::x11Event( XEvent* pEvent )
 		ke.ignore();
 
 		g_bAccelActivated = false;
-		kapp->sendEvent( kapp->tqfocusWidget(), &ke );
+		kapp->sendEvent( kapp->focusWidget(), &ke );
 
 		// If the Override event was accepted from a non-KAccel widget,
 		//  then kill the next AccelOverride in KApplication::notify.
@@ -206,7 +206,7 @@ bool KAccelPrivate::setEnabled( const TQString& sAction, bool bEnable )
 
 bool KAccelPrivate::removeAction( const TQString& sAction )
 {
-	// FIXME: getID() doesn't tqcontains any useful
+	// FIXME: getID() doesn't contains any useful
 	//  information!  Use mapIDToAction. --ellis, 2/May/2002
 	//  Or maybe KAccelBase::remove() takes care of TQAccel indirectly...
 	KAccelAction* pAction = actions().actionPtr( sAction );
@@ -278,7 +278,7 @@ bool KAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key&
 		}
 	}
 	//kdWarning(125) << kdBacktrace() << endl;
-	kdWarning(125) << "Didn't tqfind key in m_mapIDToKey." << endl;
+	kdWarning(125) << "Didn't find key in m_mapIDToKey." << endl;
 	return false;
 }
 
@@ -295,7 +295,7 @@ bool KAccelPrivate::disconnectKey( const KKeyServer::Key& key )
 		}
 	}
 	//kdWarning(125) << kdBacktrace() << endl;
-	kdWarning(125) << "Didn't tqfind key in m_mapIDTokey." << endl;
+	kdWarning(125) << "Didn't find key in m_mapIDTokey." << endl;
 	return false;
 }
 
@@ -303,7 +303,7 @@ void KAccelPrivate::slotKeyPressed( int id )
 {
 	kdDebug(125) << "KAccelPrivate::slotKeyPressed( " << id << " )" << endl;
 
-	if( m_mapIDToKey.tqcontains( id ) ) {
+	if( m_mapIDToKey.contains( id ) ) {
 		KKey key = m_mapIDToKey[id];
 		KKeySequence seq( key );
 		TQPopupMenu* pMenu = createPopupMenu( m_pWatch, seq );
@@ -357,7 +357,7 @@ bool KAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
 			if( (*it) == keyCodeQt ) {
 				int nID = it.key();
 				kdDebug(125) << "shortcut found!" << endl;
-				if( m_mapIDToAction.tqcontains( nID ) ) {
+				if( m_mapIDToAction.contains( nID ) ) {
 					// TODO: reduce duplication between here and slotMenuActivated
 					KAccelAction* pAction = m_mapIDToAction[nID];
 					if( !pAction->isEnabled() )
@@ -608,14 +608,14 @@ void KAccel::changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action
 	if( !pAction || s.isEmpty() )
 		return;
 
-	int i = s.tqfind( '\t' );
+	int i = s.find( '\t' );
 
 	TQString k = pAction->shortcut().seq(0).toString();
 	if( k.isEmpty() )
 		return;
 
 	if ( i >= 0 )
-		s.tqreplace( i+1, s.length()-i, k );
+		s.replace( i+1, s.length()-i, k );
 	else {
 		s += '\t';
 		s += k;
@@ -646,7 +646,7 @@ int KAccel::currentKey( const TQString& sAction ) const
 	return 0;
 }
 
-TQString KAccel::tqfindKey( int key ) const
+TQString KAccel::findKey( int key ) const
 {
 	KAccelAction* pAction = d->actionPtr( KKey(key) );
 	if( pAction )
diff --git a/kdecore/kaccel.h b/kdecore/kaccel.h
index 53073f29e..7bdf9e0e7 100644
--- a/kdecore/kaccel.h
+++ b/kdecore/kaccel.h
@@ -39,7 +39,7 @@ class KAccelPrivate;
  * through application configuration files or through the
  * KKeyChooser GUI.
  *
- * A KAccel tqcontains a list of accelerator actions.
+ * A KAccel contains a list of accelerator actions.
  *
  * For example, CTRL+Key_P could be a shortcut for printing a document. The key
  * codes are listed in tqnamespace.h. "Print" could be the action name for printing.
@@ -96,10 +96,10 @@ class KDECORE_EXPORT KAccel : public TQAccel
  public:
 	/**
 	 * Creates a new KAccel that watches @p pParent, which is also
-	 * the TQObject's parent.
+	 * the QObject's parent.
 	 *
 	 * @param pParent the parent and widget to watch for key strokes
-	 * @param psName the name of the TQObject
+	 * @param psName the name of the QObject
 	 */
 	KAccel( TQWidget* pParent, const char* psName = 0 );
 
@@ -107,8 +107,8 @@ class KDECORE_EXPORT KAccel : public TQAccel
 	 * Creates a new KAccel that watches @p watch.
 	 *
 	 * @param watch the widget to watch for key strokes
-	 * @param parent the parent of the TQObject
-	 * @param psName the name of the TQObject
+	 * @param parent the parent of the QObject
+	 * @param psName the name of the QObject
 	 */
 	KAccel( TQWidget* watch, TQObject* parent, const char* psName = 0 );
 	virtual ~KAccel();
@@ -376,7 +376,7 @@ class KDECORE_EXPORT KAccel : public TQAccel
 	 * Return the name of the accelerator item with the keycode @p key,
 	 * or TQString::null if the item cannot be found.
 	 */
-	TQString tqfindKey( int key ) const KDE_DEPRECATED;
+	TQString findKey( int key ) const KDE_DEPRECATED;
 #endif // !KDE_NO_COMPAT
 
  protected:
diff --git a/kdecore/kaccelaction.cpp b/kdecore/kaccelaction.cpp
index b7ea84ca5..856bbefdc 100644
--- a/kdecore/kaccelaction.cpp
+++ b/kdecore/kaccelaction.cpp
@@ -177,9 +177,9 @@ void KAccelAction::clearShortcut()
 	m_cut.clear();
 }
 
-bool KAccelAction::tqcontains( const KKeySequence& seq )
+bool KAccelAction::contains( const KKeySequence& seq )
 {
-	return m_cut.tqcontains( seq );
+	return m_cut.contains( seq );
 	for( uint i = 0; i < m_cut.count(); i++ ) {
 		if( m_cut.seq(i) == seq )
 			return true;
@@ -217,7 +217,7 @@ void KAccelAction::useFourModifierKeys( bool b )
 		// If we're 'turning off' the meta key or, if we're turning it on,
 		//  the keyboard must actually have a meta key.
 		if( b && !KKeyNative::keyboardHasWinKey() )
-			kdDebug(125) << "Tried to use four modifier keys on a keyboard tqlayout without a Meta key.\n";
+			kdDebug(125) << "Tried to use four modifier keys on a keyboard layout without a Meta key.\n";
 	}
 	KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
 	KGlobal::config()->writeEntry( "Use Four Modifier Keys", KAccelAction::g_bUseFourModifierKeys, true, true);
@@ -409,7 +409,7 @@ KAccelAction* KAccelActions::actionPtr( KKeySequence cut )
 	for( uint i = 0; i < m_nSize; i++ ) {
 		if( m_prgActions[i] == 0 )
 			kdWarning(125) << "KAccelActions::actionPtr( " << cut.toStringInternal() << " ): encountered null pointer at m_prgActions[" << i << "]" << endl;
-		else if( m_prgActions[i]->tqcontains( cut ) )
+		else if( m_prgActions[i]->contains( cut ) )
 			return m_prgActions[i];
 	}
 	return 0;
@@ -495,7 +495,7 @@ bool KAccelActions::readActions( const TQString& sConfigGroup, KConfigBase* pCon
 			1) KAccelSequence = "Meta+X"
 				1) KKeySequence = Meta+X
 			2) KAccelSequence = "Asterisk"
-				1) KKeySequence = Shift+8 (English tqlayout)
+				1) KKeySequence = Shift+8 (English layout)
 				2) KKeySequence = Keypad_Asterisk
 		2) KKeySequence = "Alt+F2"
 			1) KAccelSequence = "Alt+F2"
diff --git a/kdecore/kaccelaction.h b/kdecore/kaccelaction.h
index 934c694b4..d55e4517c 100644
--- a/kdecore/kaccelaction.h
+++ b/kdecore/kaccelaction.h
@@ -60,7 +60,7 @@ class KConfigBase;
  *				1) KKey = "Meta+X"
  *					1) Meta+X
  *				2) KKey = "Asterisk"
- *					1) Shift+8 (English tqlayout)
+ *					1) Shift+8 (English layout)
  *					2) Keypad_Asterisk
  * \endcode
  * @short An accelerator action
@@ -296,12 +296,12 @@ class KDECORE_EXPORT KAccelAction
 	void clearShortcut();
 	
 	/**
-	 * Checks whether the action's shortcut tqcontains the given key sequence.
+	 * Checks whether the action's shortcut contains the given key sequence.
 	 * @param keySeq the key sequence to check
-	 * @return true if the shortcut tqcontains the given sequence
-	 * @see KShortcut::tqcontains()
+	 * @return true if the shortcut contains the given sequence
+	 * @see KShortcut::contains()
 	 */
-	bool tqcontains( const KKeySequence &keySeq );
+	bool contains( const KKeySequence &keySeq );
 
 	/**
 	 * Returns the string representation of the action's shortcut.
@@ -333,8 +333,8 @@ class KDECORE_EXPORT KAccelAction
 	        m_sLabel /**< Label of accel. User-visible. */,
 	        m_sWhatsThis /**< WhatsThis help for accel. User-visible. */;
 	KShortcut m_cut /**< Shortcut actually assigned. */;
-	KShortcut m_cutDefault3 /**< Default shortcut in 3-modifier tqlayout */, 
-		  m_cutDefault4 /**< Default shortcur in 4-modifier tqlayout */;
+	KShortcut m_cutDefault3 /**< Default shortcut in 3-modifier layout */, 
+		  m_cutDefault4 /**< Default shortcur in 4-modifier layout */;
 	const TQObject* m_pObjSlot /**< Object we will send signals to. */;
 	const char* m_psMethodSlot /**< Slot we send signals to, in m_pObjSlot */;
 	bool m_bConfigurable /**< Can this accel be configured by the user? */,
@@ -405,7 +405,7 @@ class KDECORE_EXPORT KAccelActions
 	/**
 	 * Updates the shortcuts of all actions in this object
 	 * with the shortcuts from the given object.
-	 * @param shortcuts the collection that tqcontains the new
+	 * @param shortcuts the collection that contains the new
 	 *        shortcuts
 	 */
 	void updateShortcuts( KAccelActions &shortcuts );
diff --git a/kdecore/kaccelbase.cpp b/kdecore/kaccelbase.cpp
index 5f513c354..4ba4c9c3b 100644
--- a/kdecore/kaccelbase.cpp
+++ b/kdecore/kaccelbase.cpp
@@ -77,7 +77,7 @@ const KAccelAction* KAccelBase::actionPtr( const TQString& sAction ) const
 
 KAccelAction* KAccelBase::actionPtr( const KKeyServer::Key& key )
 {
-	if( !m_mapKeyToAction.tqcontains( key ) )
+	if( !m_mapKeyToAction.contains( key ) )
 		return 0;
 	// Note: If more than one action is connected to a single key, nil will be returned.
 	return m_mapKeyToAction[key].pAction;
@@ -206,8 +206,8 @@ KAccelBase
 
 read in a config entry
 	split by ';'
-	tqfind key sequences to disconnect
-	tqfind new key sequences to connect
+	find key sequences to disconnect
+	find new key sequences to connect
 check for conflicts with implicit keys
 	disconnect conflicting implicit keys
 connect new key sequences
@@ -355,7 +355,7 @@ bool KAccelBase::updateConnections()
 
 		if( bNonUnique ) {
 			// Remove connection to single action if there is one
-			if( m_mapKeyToAction.tqcontains( key ) ) {
+			if( m_mapKeyToAction.contains( key ) ) {
 				KAccelAction* pAction = m_mapKeyToAction[key].pAction;
 				if( pAction ) {
 					m_mapKeyToAction.remove( key );
@@ -378,7 +378,7 @@ bool KAccelBase::updateConnections()
 		const KKeyServer::Key& key = it.key();
 		KAccelAction* pAction = (*it).pAction;
 		// If this key is longer used or it points to a different action now,
-		if( !mapKeyToAction.tqcontains( key ) || mapKeyToAction[key].pAction != pAction ) {
+		if( !mapKeyToAction.contains( key ) || mapKeyToAction[key].pAction != pAction ) {
 			if( pAction ) {
 				disconnectKey( *pAction, key );
 				pAction->decConnections();
@@ -393,7 +393,7 @@ bool KAccelBase::updateConnections()
 	for( KKeyToActionMap::iterator it = mapKeyToAction.begin(); it != mapKeyToAction.end(); ++it ) {
 		const KKeyServer::Key& key = it.key();
 		KAccelAction* pAction = (*it).pAction;
-		if( !m_mapKeyToAction.tqcontains( key ) || m_mapKeyToAction[key].pAction != pAction ) {
+		if( !m_mapKeyToAction.contains( key ) || m_mapKeyToAction[key].pAction != pAction ) {
 			// TODO: Decide what to do if connect fails.
 			//  Probably should remove this item from map.
 			if( pAction ) {
@@ -470,7 +470,7 @@ bool KAccelBase::insertConnection( KAccelAction* pAction )
 
 			//if( !key.isNull() ) {
 			if( key.sym() ) {
-				if( !m_mapKeyToAction.tqcontains( key ) ) {
+				if( !m_mapKeyToAction.contains( key ) ) {
 					// If this is a single-key shortcut,
 					if( pAction->shortcut().seq(iSeq).count() == 1 ) {
 						m_mapKeyToAction[key] = ActionInfo( pAction, iSeq, iVari );
@@ -481,7 +481,7 @@ bool KAccelBase::insertConnection( KAccelAction* pAction )
 					else {
 						m_mapKeyToAction[key] = ActionInfo( 0, 0, 0 );
 						// Insert into non-unique list if it's not already there.
-						if( m_rgActionsNonUnique.tqfindIndex( pAction ) == -1 )
+						if( m_rgActionsNonUnique.findIndex( pAction ) == -1 )
 							m_rgActionsNonUnique.append( pAction );
 						if( connectKey( key ) )
 							pAction->incConnections();
@@ -523,7 +523,7 @@ bool KAccelBase::removeConnection( KAccelAction* pAction )
 	//for( KKeyToActionMap::iterator it = m_mapKeyToAction.begin(); it != m_mapKeyToAction.end(); ++it )
 	//	kdDebug(125) << "\tKey: " << it.key().toString() << " => '" << (*it)->m_sName << "'" << " " << *it << endl;
 
-	if( m_rgActionsNonUnique.tqfindIndex( pAction ) >= 0 ) {
+	if( m_rgActionsNonUnique.findIndex( pAction ) >= 0 ) {
 		mtemp_pActionRemoving = pAction;
 		bool b = updateConnections();
 		mtemp_pActionRemoving = 0;
@@ -591,7 +591,7 @@ TQPopupMenu* KAccelBase::createPopupMenu( TQWidget* pParent, const KKeySequence&
 		// If an action has already been inserted into the menu
 		//  and we have a label instead of an action here,
 		//  then indicate that we should insert a separator before the next menu entry.
-		if( bActionInserted && !pAction->isConfigurable() && pAction->name().tqcontains( ':' ) )
+		if( bActionInserted && !pAction->isConfigurable() && pAction->name().contains( ':' ) )
 			bInsertSeparator = true;
 
 		for( uint iSeq = 0; iSeq < pAction->shortcut().count(); iSeq++ ) {
diff --git a/kdecore/kaccelbase.h b/kdecore/kaccelbase.h
index d619e1bdc..07e3f4833 100644
--- a/kdecore/kaccelbase.h
+++ b/kdecore/kaccelbase.h
@@ -42,7 +42,7 @@ class TQWidget;
  * key bindings through application configuration files or through the
  * KKeyChooser GUI.
  *
- * A KAccel tqcontains a list of accelerator items. Each accelerator item
+ * A KAccel contains a list of accelerator items. Each accelerator item
  * consists of an action name and a keyboard code combined with modifiers
  * (Shift, Ctrl and Alt.)
  *
@@ -101,7 +101,7 @@ class TQWidget;
  *   id = popup->insertItem(i18n("Print &Document"),this, TQT_SLOT(printDoc()));
  * it might be a good idea to insert the standard action before as
  *          a->insertStdItem( KStdAccel::Print, i18n("Print Document") )
- * as well, so that the user can easily tqfind the corresponding function.
+ * as well, so that the user can easily find the corresponding function.
  *
  * This technique works for other actions as well.  Your "scroll up" function
  * in a menu could be done with
diff --git a/kdecore/kaccelmanager.cpp b/kdecore/kaccelmanager.cpp
index e65434c7f..1b5ea4d24 100644
--- a/kdecore/kaccelmanager.cpp
+++ b/kdecore/kaccelmanager.cpp
@@ -64,7 +64,7 @@
 
  class KAcceleratorManagerPrivate - internal helper class
 
- This class does all the work to tqfind accelerators for a hierarchy of
+ This class does all the work to find accelerators for a hierarchy of
  widgets.
 
  *********************************************************************/
@@ -144,7 +144,7 @@ bool KAcceleratorManagerPrivate::standardName(const TQString &str)
 {
     if (!kaccmp_sns)
         kaccmp_sns_d.setObject(kaccmp_sns, new TQStringList(KStdAction::internal_stdNames()));
-        return kaccmp_sns->tqcontains(str);
+        return kaccmp_sns->contains(str);
 }
 
 KAcceleratorManagerPrivate::Item::~Item()
@@ -201,8 +201,8 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use
         contents << it->m_content;
     }
 
-    // tqfind the right accelerators
-    KAccelManagerAlgorithm::tqfindAccelerators(contents, used);
+    // find the right accelerators
+    KAccelManagerAlgorithm::findAccelerators(contents, used);
 
     // write them back into the widgets
     int cnt = -1;
@@ -223,7 +223,7 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use
         {
             if (it->m_index >= 0)
             {
-                TQMenuItem *mitem = menuBar->tqfindItem(menuBar->idAt(it->m_index));
+                TQMenuItem *mitem = menuBar->findItem(menuBar->idAt(it->m_index));
                 if (mitem)
                 {
                     checkChange(contents[cnt]);
@@ -239,12 +239,12 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use
         if ( dynamic_cast<TQLabel*>( it->m_widget ) && it->m_widget->inherits("KURLLabel") )
              continue;
 
-        int tprop = it->m_widget->tqmetaObject()->tqfindProperty("text", true);
+        int tprop = it->m_widget->metaObject()->findProperty("text", true);
         if (tprop != -1)  {
             if (checkChange(contents[cnt]))
                 it->m_widget->setProperty("text", contents[cnt].accelerated());
         } else {
-            tprop = it->m_widget->tqmetaObject()->tqfindProperty("title", true);
+            tprop = it->m_widget->metaObject()->findProperty("title", true);
             if (tprop != -1 && checkChange(contents[cnt]))
                 it->m_widget->setProperty("title", contents[cnt].accelerated());
         }
@@ -265,12 +265,12 @@ void KAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item)
   TQObjectList *childList = widget->queryList("TQWidget", 0, false, false);
   for ( TQObject *it = childList->first(); it; it = childList->next() )
   {
-    TQWidget *w = static_cast<TQWidget*>(static_cast<QObject*>(it));
+    TQWidget *w = static_cast<TQWidget*>(it);
 
     if ( !w->isVisibleTo( widget ) || ( w->isTopLevel() && dynamic_cast<TQPopupMenu*>(w) == NULL ) )
         continue;
 
-    if ( KAcceleratorManagerPrivate::ignored_widgets.tqfind( w ) != KAcceleratorManagerPrivate::ignored_widgets.end() )
+    if ( KAcceleratorManagerPrivate::ignored_widgets.find( w ) != KAcceleratorManagerPrivate::ignored_widgets.end() )
         continue;
 
     manageWidget(w, item);
@@ -340,9 +340,9 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
   {
     TQString content;
     TQVariant variant;
-    int tprop = w->tqmetaObject()->tqfindProperty("text", true);
+    int tprop = w->metaObject()->findProperty("text", true);
     if (tprop != -1)  {
-        const TQMetaProperty* p = w->tqmetaObject()->property( tprop, true );
+        const TQMetaProperty* p = w->metaObject()->property( tprop, true );
         if ( p && p->isValid() )
             w->qt_property( tprop, 1, &variant );
         else
@@ -350,9 +350,9 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
     }
 
     if (tprop == -1)  {
-        tprop = w->tqmetaObject()->tqfindProperty("title", true);
+        tprop = w->metaObject()->findProperty("title", true);
         if (tprop != -1)  {
-            const TQMetaProperty* p = w->tqmetaObject()->property( tprop, true );
+            const TQMetaProperty* p = w->metaObject()->property( tprop, true );
             if ( p && p->isValid() )
                 w->qt_property( tprop, 1, &variant );
         }
@@ -409,7 +409,7 @@ void KAcceleratorManagerPrivate::manageMenuBar(TQMenuBar *mbar, Item *item)
 
     for (uint i=0; i<mbar->count(); ++i)
     {
-        mitem = mbar->tqfindItem(mbar->idAt(i));
+        mitem = mbar->findItem(mbar->idAt(i));
         if (!mitem)
             continue;
 
@@ -478,18 +478,18 @@ void KAcceleratorManager::last_manage(TQString &added,  TQString &changed, TQStr
 KAccelString::KAccelString(const TQString &input, int initialWeight)
   : m_pureText(input), m_weight()
 {
-    m_orig_accel = m_pureText.tqfind("(!)&");
+    m_orig_accel = m_pureText.find("(!)&");
     if (m_orig_accel != -1)
 	m_pureText.remove(m_orig_accel, 4);
 
-    m_orig_accel = m_pureText.tqfind("(&&)");
+    m_orig_accel = m_pureText.find("(&&)");
     if (m_orig_accel != -1)
-        m_pureText.tqreplace(m_orig_accel, 4, "&");
+        m_pureText.replace(m_orig_accel, 4, "&");
 
     m_origText = m_pureText;
 
-    if (m_pureText.tqcontains('\t'))
-        m_pureText = m_pureText.left(m_pureText.tqfind('\t'));
+    if (m_pureText.contains('\t'))
+        m_pureText = m_pureText.left(m_pureText.find('\t'));
 
     m_orig_accel = m_accel = stripAccelerator(m_pureText);
 
@@ -519,7 +519,7 @@ TQString KAccelString::accelerated() const
                   oa += 4;
       }
       if (m_orig_accel >= 0)
-	  result.tqreplace(oa, 1, "(&&)");
+	  result.replace(oa, 1, "(&&)");
     }
   } else {
       if (m_accel >= 0 && m_orig_accel != m_accel) {
@@ -598,7 +598,7 @@ int KAccelString::stripAccelerator(TQString &text)
 
   while (p >= 0)
   {
-    p = text.tqfind('&', p)+1;
+    p = text.find('&', p)+1;
 
     if (p <= 0 || p >= (int)text.length())
       return -1;
@@ -626,7 +626,7 @@ int KAccelString::maxWeight(int &index, const TQString &used)
   index = -1;
 
   for (uint pos=0; pos<m_pureText.length(); ++pos)
-    if (used.tqfind(m_pureText[pos], 0, FALSE) == -1 && m_pureText[pos].latin1() != 0)
+    if (used.find(m_pureText[pos], 0, FALSE) == -1 && m_pureText[pos].latin1() != 0)
       if (m_weight[pos] > max)
       {
         max = m_weight[pos];
@@ -648,7 +648,7 @@ void KAccelString::dump()
 
 /*********************************************************************
 
- tqfindAccelerators - the algorithm determining the new accelerators
+ findAccelerators - the algorithm determining the new accelerators
 
  The algorithm is very crude:
 
@@ -666,7 +666,7 @@ void KAccelString::dump()
 
  The disadvantages:
 
-   * it does not try to tqfind as many accelerators as possible
+   * it does not try to find as many accelerators as possible
 
  TODO:
 
@@ -679,9 +679,9 @@ void KAccelString::dump()
 
  *********************************************************************/
 
-void KAccelManagerAlgorithm::tqfindAccelerators(KAccelStringList &result, TQString &used)
+void KAccelManagerAlgorithm::findAccelerators(KAccelStringList &result, TQString &used)
 {
-    kdDebug(131) << "tqfindAccelerators\n";
+    kdDebug(131) << "findAccelerators\n";
   KAccelStringList accel_strings = result;
 
   // initally remove all accelerators
@@ -694,7 +694,7 @@ void KAccelManagerAlgorithm::tqfindAccelerators(KAccelStringList &result, TQStri
   {
     int max = 0, index = -1, accel = -1;
 
-    // tqfind maximum weight
+    // find maximum weight
     for (uint i=0; i<accel_strings.count(); ++i)
     {
       int a;
@@ -747,14 +747,14 @@ void KPopupAccelManager::aboutToShow()
 
   if (m_count != (int)m_popup->count())
   {
-    tqfindMenuEntries(m_entries);
+    findMenuEntries(m_entries);
     calculateAccelerators();
     m_count = m_popup->count();
   }
   else
   {
     KAccelStringList entries;
-    tqfindMenuEntries(entries);
+    findMenuEntries(entries);
     if (entries != m_entries)
     {
       m_entries = entries;
@@ -766,16 +766,16 @@ void KPopupAccelManager::aboutToShow()
 
 void KPopupAccelManager::calculateAccelerators()
 {
-  // tqfind the new accelerators
+  // find the new accelerators
   TQString used;
-  KAccelManagerAlgorithm::tqfindAccelerators(m_entries, used);
+  KAccelManagerAlgorithm::findAccelerators(m_entries, used);
 
   // change the menu entries
   setMenuEntries(m_entries);
 }
 
 
-void KPopupAccelManager::tqfindMenuEntries(KAccelStringList &list)
+void KPopupAccelManager::findMenuEntries(KAccelStringList &list)
 {
   TQMenuItem *mitem;
   TQString s;
@@ -785,7 +785,7 @@ void KPopupAccelManager::tqfindMenuEntries(KAccelStringList &list)
   // read out the menu entries
   for (uint i=0; i<m_popup->count(); i++)
   {
-    mitem = m_popup->tqfindItem(m_popup->idAt(i));
+    mitem = m_popup->findItem(m_popup->idAt(i));
     if (mitem->isSeparator())
       continue;
 
@@ -793,7 +793,7 @@ void KPopupAccelManager::tqfindMenuEntries(KAccelStringList &list)
 
     // in full menus, look at entries with global accelerators last
     int weight = 50;
-    if (s.tqcontains('\t'))
+    if (s.contains('\t'))
         weight = 0;
 
     list.append(KAccelString(s, weight));
@@ -812,7 +812,7 @@ void KPopupAccelManager::setMenuEntries(const KAccelStringList &list)
   uint cnt = 0;
   for (uint i=0; i<m_popup->count(); i++)
   {
-    mitem = m_popup->tqfindItem(m_popup->idAt(i));
+    mitem = m_popup->findItem(m_popup->idAt(i));
     if (mitem->isSeparator())
       continue;
 
@@ -845,8 +845,8 @@ QWidgetStackAccelManager::QWidgetStackAccelManager(TQWidgetStack *stack)
 
 bool QWidgetStackAccelManager::eventFilter ( TQObject * watched, TQEvent * e )
 {
-    if ( e->type() == TQEvent::Show && tqApp->activeWindow() ) {
-        KAcceleratorManager::manage( tqApp->activeWindow() );
+    if ( e->type() == TQEvent::Show && qApp->activeWindow() ) {
+        KAcceleratorManager::manage( qApp->activeWindow() );
         watched->removeEventFilter( this );
     }
     return false;
diff --git a/kdecore/kaccelmanager.h b/kdecore/kaccelmanager.h
index ed8fd0081..21655fd9c 100644
--- a/kdecore/kaccelmanager.h
+++ b/kdecore/kaccelmanager.h
@@ -30,7 +30,7 @@ class TQString;
 /**
  * KDE Accelerator manager.
  *
- * This class can be used to tqfind a valid and working set of
+ * This class can be used to find a valid and working set of
  * accelerators for any widget.
  *
  * @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
diff --git a/kdecore/kaccelmanager_private.h b/kdecore/kaccelmanager_private.h
index cd3f30a12..fbb5d1857 100644
--- a/kdecore/kaccelmanager_private.h
+++ b/kdecore/kaccelmanager_private.h
@@ -32,7 +32,7 @@ class TQWidgetStack;
 /**
  * A string class handling accelerators.
  *
- * This class tqcontains a string and knowledge about accelerators.
+ * This class contains a string and knowledge about accelerators.
  * It keeps a list weights, telling how valuable each character
  * would be as an accelerator.
  *
@@ -81,7 +81,7 @@ typedef TQValueList<KAccelString> KAccelStringList;
 
 
 /**
- * This class encapsulates the algorithm tqfinding the 'best'
+ * This class encapsulates the algorithm finding the 'best'
  * distribution of accelerators in a hierarchy of widgets.
  *
  * @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
@@ -113,8 +113,8 @@ public:
     STANDARD_ACCEL = 300
   };
 
-  /// Method to call to tqfind the best distribution of accelerators.
-  static void tqfindAccelerators(KAccelStringList &result, TQString &used);
+  /// Method to call to find the best distribution of accelerators.
+  static void findAccelerators(KAccelStringList &result, TQString &used);
 
 };
 
@@ -131,7 +131,7 @@ class TQPopupMenu;
  * @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
 */
 
-class KPopupAccelManager : public TQObject
+class KPopupAccelManager : public QObject
 {
   Q_OBJECT
 
@@ -154,7 +154,7 @@ private:
 
   void calculateAccelerators();
 
-  void tqfindMenuEntries(KAccelStringList &list);
+  void findMenuEntries(KAccelStringList &list);
   void setMenuEntries(const KAccelStringList &list);
 
   TQPopupMenu       *m_popup;
@@ -164,7 +164,7 @@ private:
 };
 
 
-class QWidgetStackAccelManager : public TQObject
+class QWidgetStackAccelManager : public QObject
 {
   Q_OBJECT
 
diff --git a/kdecore/kaccelprivate.h b/kdecore/kaccelprivate.h
index 7b616acbe..0a6cdc19b 100644
--- a/kdecore/kaccelprivate.h
+++ b/kdecore/kaccelprivate.h
@@ -47,7 +47,7 @@ class KDECORE_EXPORT KAccelPrivate : public TQObject, public KAccelBase
 	void slotShowMenu();
 	void slotMenuActivated( int iAction );
 	
-	bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from TQObject
+	bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from QObject
 };
 
 #endif // !__KACCELPRIVATE_H
diff --git a/kdecore/kallocator.cpp b/kdecore/kallocator.cpp
index 16c1b3625..c02bbf3ff 100644
--- a/kdecore/kallocator.cpp
+++ b/kdecore/kallocator.cpp
@@ -183,9 +183,9 @@ void KZoneAllocator::delBlock(MemBlock *b)
 void *
 KZoneAllocator::allocate(size_t _size)
 {
-   // Use the size of (void *) as tqalignment
-   const size_t tqalignment = sizeof(void *) - 1;
-   _size = (_size + tqalignment) & ~tqalignment;   
+   // Use the size of (void *) as alignment
+   const size_t alignment = sizeof(void *) - 1;
+   _size = (_size + alignment) & ~alignment;   
 
    if ((unsigned long) _size + blockOffset > blockSize)
    {
diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp
index 08e6c7652..3dc8ca77d 100644
--- a/kdecore/kapplication.cpp
+++ b/kdecore/kapplication.cpp
@@ -170,7 +170,7 @@ static Atom kde_xdnd_drop;
 #endif
 
 // duplicated from patched Qt, so that there won't be unresolved symbols if Qt gets
-// tqreplaced by unpatched one
+// replaced by unpatched one
 KDECORE_EXPORT bool qt_qclipboard_bailout_hack = false;
 
 template class TQPtrList<KSessionManaged>;
@@ -250,7 +250,7 @@ public:
   IceIOErrorHandler oldIceIOErrorHandler;
   KCheckAccelerators* checkAccelerators;
   TQString overrideStyle;
-  TQString tqgeometry_arg;
+  TQString geometry_arg;
   TQCString startup_id;
   TQTimer* app_started_timer;
   KAppDCOPInterface *m_KAppDCOPInterface;
@@ -466,7 +466,7 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event)
           // We have a keypress for a lineedit...
           TQKeyEvent *kevent = static_cast<TQKeyEvent *>(event);
           KKey key(kevent);
-          if (_selectAll.tqcontains(key))
+          if (_selectAll.contains(key))
           {
              if (t == TQEvent::KeyPress)
              {
@@ -503,7 +503,7 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event)
        {
           // We have a keypress for a multilineedit...
           TQKeyEvent *kevent = static_cast<TQKeyEvent *>(event);
-          if (_selectAll.tqcontains(KKey(kevent)))
+          if (_selectAll.contains(KKey(kevent)))
           {
              if (t == TQEvent::KeyPress)
              {
@@ -519,7 +519,7 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event)
     }
     if( t == TQEvent::Show && receiver->isWidgetType())
     {
-        TQWidget* w = static_cast< TQWidget* >( static_cast<QObject*>(receiver) );
+        TQWidget* w = static_cast< TQWidget* >( receiver );
 #if defined Q_WS_X11
         if( w->isTopLevel() && !startupId().isEmpty() && !static_cast<TQShowEvent*>(event)->spontaneous()) // TODO better done using window group leader?
             KStartupInfo::setWindowStartupId( w->winId(), startupId());
@@ -765,7 +765,7 @@ class KDETranslator : public TQTranslator
 {
 public:
   KDETranslator(TQObject *parent) : TQTranslator(parent, "kdetranslator") {}
-  virtual TQTranslatorMessage tqfindMessage(const char* context,
+  virtual TQTranslatorMessage findMessage(const char* context,
 					 const char *sourceText,
 					 const char* message) const
   {
@@ -832,7 +832,7 @@ void KApplication::init(bool GUIenabled)
 
   smw = 0;
 
-  // Initial KIPC event tqmask.
+  // Initial KIPC event mask.
 #if defined Q_WS_X11
   kipcEventMask = (1 << KIPC::StyleChanged) | (1 << KIPC::PaletteChanged) |
                   (1 << KIPC::FontChanged) | (1 << KIPC::BackgroundChanged) |
@@ -901,7 +901,7 @@ void KApplication::init(bool GUIenabled)
         TQMimeSourceFactory::addFactory( oldDefaultFactory );
     }
 
-    d->checkAccelerators = new KCheckAccelerators( TQT_TQOBJECT(this) );
+    d->checkAccelerators = new KCheckAccelerators( this );
   }
 
 #ifdef Q_WS_MACX
@@ -934,16 +934,16 @@ void KApplication::init(bool GUIenabled)
   // save and restore the RTL setting, as installTranslator calls qt_detectRTLLanguage,
   // which makes it impossible to use the -reverse cmdline switch with KDE apps
   bool rtl = reverseLayout();
-  installTranslator(new KDETranslator(TQT_TQOBJECT(this)));
+  installTranslator(new KDETranslator(this));
   setReverseLayout( rtl );
   if (i18n( "_: Dear Translator! Translate this string to the string 'LTR' in "
 	 "left-to-right languages (as english) or to 'RTL' in right-to-left "
-	 "languages (such as Hebrew and Arabic) to get proper widget tqlayout." ) == "RTL")
+	 "languages (such as Hebrew and Arabic) to get proper widget layout." ) == "RTL")
 	setReverseLayout( !rtl );
 
   // install appdata resource type
   KGlobal::dirs()->addResourceType("appdata", KStandardDirs::kde_default("data")
-                                   + TQString::tqfromLatin1(name()) + '/');
+                                   + TQString::fromLatin1(name()) + '/');
   pSessionConfig = 0L;
   bSessionManagement = true;
 
@@ -1179,9 +1179,9 @@ void KApplication::propagateSessionManager()
     TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver"));
     TQCString display = ::getenv(DISPLAY);
     // strip the screen number from the display
-    display.tqreplace(TQRegExp("\\.[0-9]+$"), "");
+    display.replace(TQRegExp("\\.[0-9]+$"), "");
     int i;
-    while( (i = display.tqfind(':')) >= 0)
+    while( (i = display.find(':')) >= 0)
        display[i] = '_';
 
     fName += "_"+display;
@@ -1222,7 +1222,7 @@ void KApplication::commitData( QSessionManager& sm )
 
     if ( sm.allowsInteraction() ) {
         TQWidgetList done;
-        TQWidgetList *list = TQApplication::tqtopLevelWidgets();
+        TQWidgetList *list = TQApplication::topLevelWidgets();
         bool canceled = false;
         TQWidget* w = list->first();
         while ( !canceled && w ) {
@@ -1233,12 +1233,12 @@ void KApplication::commitData( QSessionManager& sm )
                 if ( !canceled )
                     done.append( w );
                 delete list; // one never knows...
-                list = TQApplication::tqtopLevelWidgets();
+                list = TQApplication::topLevelWidgets();
                 w = list->first();
             } else {
                 w = list->next();
             }
-            while ( w && done.tqcontainsRef( w ) )
+            while ( w && done.containsRef( w ) )
                 w = list->next();
         }
         delete list;
@@ -1380,9 +1380,9 @@ void KApplication::startKdeinit()
          return; // whoever held the lock has already started dcopserver
   }
   // Try to launch kdeinit.
-  TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit"));
+  TQString srv = KStandardDirs::findExe(TQString::fromLatin1("kdeinit"));
   if (srv.isEmpty())
-     srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir());
+     srv = KStandardDirs::findExe(TQString::fromLatin1("kdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir());
   if (srv.isEmpty())
      return;
   if (kapp && (Tty != kapp->type()))
@@ -1467,7 +1467,7 @@ static const KCmdLineOptions qt_options[] =
 #ifdef Q_WS_QWS
    { "qws", I18N_NOOP("forces the application to run as QWS Server"), 0},
 #endif
-   { "reverse", I18N_NOOP("mirrors the whole tqlayout of widgets"), 0},
+   { "reverse", I18N_NOOP("mirrors the whole layout of widgets"), 0},
    KCmdLineLastOption
 };
 
@@ -1481,7 +1481,7 @@ static const KCmdLineOptions kde_options[] =
    { "nocrashhandler",          I18N_NOOP("Disable crash handler, to get core dumps"), 0},
    { "waitforwm",          I18N_NOOP("Waits for a WM_NET compatible windowmanager"), 0},
    { "style <style>", I18N_NOOP("sets the application GUI style"), 0},
-   { "tqgeometry <tqgeometry>", I18N_NOOP("sets the client tqgeometry of the main widget - see man X for the argument format"), 0},
+   { "geometry <geometry>", I18N_NOOP("sets the client geometry of the main widget - see man X for the argument format"), 0},
    { "smkey <sessionKey>", 0, 0}, // this option is obsolete and exists only to allow smooth upgrades from sessions
                                   // saved under Qt 3.0.x -- Qt 3.1.x includes the session key now automatically in
 				  // the session id (Simon)
@@ -1589,9 +1589,9 @@ void KApplication::parseCommandLine( )
     // FIXME(E): Implement for Qt Embedded
 #endif
 
-    if (args->isSet("tqgeometry"))
+    if (args->isSet("geometry"))
     {
-        d->tqgeometry_arg = args->getOption("tqgeometry");
+        d->geometry_arg = args->getOption("geometry");
     }
 
     if (args->isSet("smkey"))
@@ -1603,7 +1603,7 @@ void KApplication::parseCommandLine( )
 
 TQString KApplication::geometryArgument() const
 {
-    return d->tqgeometry_arg;
+    return d->geometry_arg;
 }
 
 TQPixmap KApplication::icon() const
@@ -1883,13 +1883,13 @@ void KApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned
 
 void KApplication::invokeEditSlot( const char *slot )
 {
-  TQObject *object = TQT_TQOBJECT(tqfocusWidget());
+  TQObject *object = focusWidget();
   if( !object )
     return;
 
-  TQMetaObject *meta = object->tqmetaObject();
+  TQMetaObject *meta = object->metaObject();
 
-  int idx = meta->tqfindSlot( slot + 1, true );
+  int idx = meta->findSlot( slot + 1, true );
   if( idx < 0 )
     return;
 
@@ -1900,7 +1900,7 @@ void KApplication::addKipcEventMask(int id)
 {
     if (id >= 32)
     {
-        kdDebug(101) << "Cannot use KIPC event tqmask for message IDs >= 32\n";
+        kdDebug(101) << "Cannot use KIPC event mask for message IDs >= 32\n";
         return;
     }
     kipcEventMask |= (1 << id);
@@ -1910,7 +1910,7 @@ void KApplication::removeKipcEventMask(int id)
 {
     if (id >= 32)
     {
-        kdDebug(101) << "Cannot use KIPC event tqmask for message IDs >= 32\n";
+        kdDebug(101) << "Cannot use KIPC event mask for message IDs >= 32\n";
         return;
     }
     kipcEventMask &= ~(1 << id);
@@ -2452,10 +2452,10 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const
    TQString command = config.readPathEntry("EmailClient");
 
    TQString to, cc, bcc;
-   if (command.isEmpty() || command == TQString::tqfromLatin1("kmail")
+   if (command.isEmpty() || command == TQString::fromLatin1("kmail")
        || command.endsWith("/kmail"))
    {
-     command = TQString::tqfromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t");
+     command = TQString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t");
      if ( !_to.isEmpty() )
      {
        // put the whole address lists into RFC2047 encoded blobs; technically
@@ -2473,7 +2473,7 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const
      to = _to;
      cc = _cc;
      bcc = _bcc;
-     if( !command.tqcontains( '%' ))
+     if( !command.contains( '%' ))
          command += " %u";
    }
 
@@ -2826,7 +2826,7 @@ TQString KApplication::tempSaveName( const TQString& pFilename ) const
         }
     }
 
-  aFilename.tqreplace( "/", "\\!" ).prepend( "#" ).append( "#" ).prepend( "/" ).prepend( aAutosaveDir.absPath() );
+  aFilename.replace( "/", "\\!" ).prepend( "#" ).append( "#" ).prepend( "/" ).prepend( aAutosaveDir.absPath() );
 
   return aFilename;
 }
@@ -2855,7 +2855,7 @@ TQString KApplication::checkRecoverFile( const TQString& pFilename,
         }
     }
 
-  aFilename.tqreplace( "/", "\\!" ).prepend( "#" ).append( "#" ).prepend( "/" ).prepend( aAutosaveDir.absPath() );
+  aFilename.replace( "/", "\\!" ).prepend( "#" ).append( "#" ).prepend( "/" ).prepend( aAutosaveDir.absPath() );
 
   if( TQFile( aFilename ).exists() )
     {
@@ -2888,7 +2888,7 @@ bool checkAccess(const TQString& pathname, int mode)
 
   //strip the filename (everything until '/' from the end
   TQString dirName(pathname);
-  int pos = dirName.tqfindRev('/');
+  int pos = dirName.findRev('/');
   if ( pos == -1 )
     return false;   // No path in argument. This is evil, we won't allow this
   else if ( pos == 0 ) // don't turn e.g. /root into an empty string
@@ -3103,18 +3103,18 @@ void KApplication::initUrlActionRestrictions()
     bool bEnabled = (strEnabled == "true");
 
     if (refPath.startsWith("$HOME"))
-       refPath.tqreplace(0, 5, TQDir::homeDirPath());
+       refPath.replace(0, 5, TQDir::homeDirPath());
     else if (refPath.startsWith("~"))
-       refPath.tqreplace(0, 1, TQDir::homeDirPath());
+       refPath.replace(0, 1, TQDir::homeDirPath());
     if (urlPath.startsWith("$HOME"))
-       urlPath.tqreplace(0, 5, TQDir::homeDirPath());
+       urlPath.replace(0, 5, TQDir::homeDirPath());
     else if (urlPath.startsWith("~"))
-       urlPath.tqreplace(0, 1, TQDir::homeDirPath());
+       urlPath.replace(0, 1, TQDir::homeDirPath());
 
     if (refPath.startsWith("$TMP"))
-       refPath.tqreplace(0, 4, KGlobal::dirs()->saveLocation("tmp"));
+       refPath.replace(0, 4, KGlobal::dirs()->saveLocation("tmp"));
     if (urlPath.startsWith("$TMP"))
-       urlPath.tqreplace(0, 4, KGlobal::dirs()->saveLocation("tmp"));
+       urlPath.replace(0, 4, KGlobal::dirs()->saveLocation("tmp"));
 
     d->urlActionRestrictions.append(new KApplicationPrivate::URLActionRule
     	( action, refProt, refHost, refPath, urlProt, urlHost, urlPath, bEnabled));
diff --git a/kdecore/kapplication.h b/kdecore/kapplication.h
index 20621bbfa..dd89de131 100644
--- a/kdecore/kapplication.h
+++ b/kdecore/kapplication.h
@@ -160,7 +160,7 @@ public:
    *
    * @param argv command line argument value(s)
    *
-   * @param rAppName application name. Will be used for tqfinding the
+   * @param rAppName application name. Will be used for finding the
    * associated message files and icon files, and as the default
    * registration name for DCOP. This is a mandatory parameter.
    *
@@ -186,7 +186,7 @@ public:
    *
    * @param argv command line argument value(s)
    *
-   * @param rAppName application name. Will be used for tqfinding the
+   * @param rAppName application name. Will be used for finding the
    * associated message files and icon files, and as the default
    * registration name for DCOP. This is a mandatory parameter.
    *
@@ -214,7 +214,7 @@ public:
   /**
    * Returns the current application object.
    *
-   * This is similar to the global TQApplication pointer tqApp. It
+   * This is similar to the global TQApplication pointer qApp. It
    * allows access to the single global KApplication object, since
    * more than one cannot be created in the same application. It
    * saves you the trouble of having to pass the pointer explicitly
@@ -237,7 +237,7 @@ public:
    *
    * @return If true, this application was restored by the session manager.
    *    Note that this may mean the config object returned by
-   * sessionConfig() tqcontains data saved by a session closedown.
+   * sessionConfig() contains data saved by a session closedown.
    * @see sessionConfig()
    */
   bool isRestored() const { return TQApplication::isSessionRestored(); }
@@ -625,10 +625,10 @@ public:
    *
    * @param _name the name of the service
    * @param URL if not empty this URL is passed to the service
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
-   * @param dcopService On success, @p dcopService tqcontains the DCOP name
+   * @param dcopService On success, @p dcopService contains the DCOP name
    *         under which this service is available. If empty, the service does
    *         not provide DCOP services. If the pointer is 0 the argument
    *         will be ignored
@@ -648,10 +648,10 @@ public:
    *
    * @param _name the name of the service
    * @param URLs if not empty these URLs will be passed to the service
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
-   * @param dcopService On success, @p dcopService tqcontains the DCOP name
+   * @param dcopService On success, @p dcopService contains the DCOP name
    *         under which this service is available. If empty, the service does
    *         not provide DCOP services. If the pointer is 0 the argument
    *         will be ignored
@@ -671,10 +671,10 @@ public:
    *
    * @param _name the path of the desktop file
    * @param URL if not empty this URL is passed to the service
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
-   * @param dcopService On success, @p dcopService tqcontains the DCOP name
+   * @param dcopService On success, @p dcopService contains the DCOP name
    *         under which this service is available. If empty, the service does
    *         not provide DCOP services. If the pointer is 0 the argument
    *         will be ignored
@@ -694,10 +694,10 @@ public:
    *
    * @param _name the path of the desktop file
    * @param URLs if not empty these URLs will be passed to the service
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
-   * @param dcopService On success, @p dcopService tqcontains the DCOP name
+   * @param dcopService On success, @p dcopService contains the DCOP name
    *         under which this service is available. If empty, the service does
    *         not provide DCOP services. If the pointer is 0 the argument
    *         will be ignored
@@ -717,10 +717,10 @@ public:
    *
    * @param _name the desktop name of the service
    * @param URL if not empty this URL is passed to the service
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
-   * @param dcopService On success, @p dcopService tqcontains the DCOP name
+   * @param dcopService On success, @p dcopService contains the DCOP name
    *         under which this service is available. If empty, the service does
    *         not provide DCOP services. If the pointer is 0 the argument
    *         will be ignored
@@ -740,10 +740,10 @@ public:
    *
    * @param _name the desktop name of the service
    * @param URLs if not empty these URLs will be passed to the service
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
-   * @param dcopService On success, @p dcopService tqcontains the DCOP name
+   * @param dcopService On success, @p dcopService contains the DCOP name
    *         under which this service is available. If empty, the service does
    *         not provide DCOP services. If the pointer is 0 the argument
    *         will be ignored
@@ -765,7 +765,7 @@ public:
    *
    * @param name Name of the program to start
    * @param args Arguments to pass to the program
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
    * @param pid On success, the process id of the new service will be written
@@ -788,7 +788,7 @@ public:
    *
    * @param name Name of the program to start
    * @param args Arguments to pass to the program
-   * @param error On failure, @p error tqcontains a description of the error
+   * @param error On failure, @p error contains a description of the error
    *         that occurred. If the pointer is 0, the argument will be
    *         ignored
    * @param pid On success, the process id of the new service will be written
@@ -819,8 +819,8 @@ public:
   KDE_DEPRECATED KStyle* kstyle() const { return 0; }
 
   /**
-   * Builds a caption that tqcontains the application name along with the
-   * userCaption using a standard tqlayout.
+   * Builds a caption that contains the application name along with the
+   * userCaption using a standard layout.
    *
    * To make a compliant caption
    * for your window, simply do: @p setCaption(kapp->makeStdCaption(yourCaption));
@@ -832,7 +832,7 @@ public:
    * compliant if you set this to @p false.
    * @param modified If true, a 'modified' sign will be included in the
    * returned string. This is useful when indicating that a file is
-   * modified, i.e., it tqcontains data that has not been saved.
+   * modified, i.e., it contains data that has not been saved.
    * @return the created caption
    */
   TQString makeStdCaption( const TQString &userCaption,
@@ -915,8 +915,8 @@ public:
   static TQString randomString(int length);
 
   /**
-   * Adds a message type to the KIPC event tqmask. You can only add "system
-   * messages" to the event tqmask. These are the messages with id < 32.
+   * Adds a message type to the KIPC event mask. You can only add "system
+   * messages" to the event mask. These are the messages with id < 32.
    * Messages with id >= 32 are user messages.
    * @param id The message id. See KIPC::Message.
    * @see KIPC
@@ -926,7 +926,7 @@ public:
   void addKipcEventMask(int id);
 
   /**
-   * Removes a message type from the KIPC event tqmask. This message will
+   * Removes a message type from the KIPC event mask. This message will
    * not be handled anymore.
    * @param id The message id.
    * @see KIPC
@@ -977,9 +977,9 @@ public:
   void updateRemoteUserTimestamp( const TQCString& dcopId, unsigned long time = 0 );
   
     /**
-    * Returns the argument to --tqgeometry if any, so the tqgeometry can be set
+    * Returns the argument to --geometry if any, so the geometry can be set
     * wherever necessary
-    * @return the tqgeometry argument, or TQString::null if there is none
+    * @return the geometry argument, or TQString::null if there is none
     */
   TQString geometryArgument() const;
 
diff --git a/kdecore/kapplication_win.cpp b/kdecore/kapplication_win.cpp
index 60eecefa9..abf0694b4 100644
--- a/kdecore/kapplication_win.cpp
+++ b/kdecore/kapplication_win.cpp
@@ -66,7 +66,7 @@ public:
   IceIOErrorHandler oldIceIOErrorHandler;
   KCheckAccelerators* checkAccelerators;
   TQString overrideStyle;
-  TQString tqgeometry_arg;
+  TQString geometry_arg;
   TQCString startup_id;
   TQTimer* app_started_timer;
   KAppDCOPInterface *m_KAppDCOPInterface;
diff --git a/kdecore/kbufferedio.h b/kdecore/kbufferedio.h
index 1445179c7..234034d87 100644
--- a/kdecore/kbufferedio.h
+++ b/kdecore/kbufferedio.h
@@ -30,7 +30,7 @@ class KBufferedIOPrivate;
  * This abstract class implements basic functionality for buffered
  * input/output.
  *
- * Through the available methods, you can tqfind out how many bytes are
+ * Through the available methods, you can find out how many bytes are
  * available for reading, how many are still unsent and you can peek at
  * the buffered data.
  *
@@ -201,7 +201,7 @@ signals:
   /**
    * This signal gets sent when the stream is closed. The @p state parameter
    * will give the current state, in OR-ed bits:
-   * @li availRead:	read buffer tqcontains data to be read
+   * @li availRead:	read buffer contains data to be read
    * @li dirtyWrite:	write buffer wasn't empty when the stream closed
    * @li involuntary:	the stream wasn't closed due to user request
    *			(i.e., call to close). Probably remote end closed it
diff --git a/kdecore/kcalendarsystemfactory.h b/kdecore/kcalendarsystemfactory.h
index 0ceae43b9..ec68124d7 100644
--- a/kdecore/kcalendarsystemfactory.h
+++ b/kdecore/kcalendarsystemfactory.h
@@ -49,7 +49,7 @@ public:
    * 0 is specified.
    * @return a KCalendarSystem object
    */
-  static KCalendarSystem *create (const TQString & calType = TQString::tqfromLatin1("gregorian"),
+  static KCalendarSystem *create (const TQString & calType = TQString::fromLatin1("gregorian"),
                                   const KLocale * locale = 0);
 
   /**
diff --git a/kdecore/kcalendarsystemgregorian.cpp b/kdecore/kcalendarsystemgregorian.cpp
index 1577683ee..26a366fd6 100644
--- a/kdecore/kcalendarsystemgregorian.cpp
+++ b/kdecore/kcalendarsystemgregorian.cpp
@@ -295,7 +295,7 @@ int KCalendarSystemGregorian::weekDayOfPray() const
 
 TQString KCalendarSystemGregorian::calendarName() const
 {
-  return TQString::tqfromLatin1("gregorian");
+  return TQString::fromLatin1("gregorian");
 }
 
 bool KCalendarSystemGregorian::isLunar() const
diff --git a/kdecore/kcalendarsystemhebrew.cpp b/kdecore/kcalendarsystemhebrew.cpp
index 871ca370b..ec39fc9ca 100644
--- a/kdecore/kcalendarsystemhebrew.cpp
+++ b/kdecore/kcalendarsystemhebrew.cpp
@@ -614,7 +614,7 @@ TQDate KCalendarSystemHebrew::addYears( const TQDate & date, int nyears ) const
 // Ok
 TQString KCalendarSystemHebrew::calendarName() const
 {
-  return TQString::tqfromLatin1("hebrew");
+  return TQString::fromLatin1("hebrew");
 }
 
 // Ok
@@ -640,7 +640,7 @@ TQString KCalendarSystemHebrew::dayString(const TQDate & pDate, bool bShort) con
   TQString sResult;
 
   // Only use hebrew numbers if the hebrew setting is selected
-  if (locale()->language() == TQString::tqfromLatin1("he"))
+  if (locale()->language() == TQString::fromLatin1("he"))
     sResult = num2heb(day(pDate), false);
   else
     sResult = KCalendarSystem::dayString(pDate, bShort);
@@ -653,7 +653,7 @@ TQString KCalendarSystemHebrew::yearString(const TQDate & pDate, bool bShort) co
   TQString sResult;
 
   // Only use hebrew numbers if the hebrew setting is selected
-  if (locale()->language() == TQString::tqfromLatin1("he"))
+  if (locale()->language() == TQString::fromLatin1("he"))
     sResult = num2heb(year(pDate), !bShort);
   else
     sResult = KCalendarSystem::yearString(pDate, bShort);
@@ -684,9 +684,9 @@ static int heb2num(const TQString& str, int & iLength) {
     {
       if (s.length() > pos && s[pos + 1] >= TQChar(0x05D0) &&
           s[pos + 1] <= TQChar(0x05EA))
-        result += (c.tqunicode() - 0x05D0 + 1) * 1000;
+        result += (c.unicode() - 0x05D0 + 1) * 1000;
       else
-        result += c.tqunicode() - 0x05D0 + 1;
+        result += c.unicode() - 0x05D0 + 1;
     }
     else if (c == TQChar(0x05D8))
     {
@@ -702,11 +702,11 @@ static int heb2num(const TQString& str, int & iLength) {
       if (s.length() > pos && s[pos + 1] >= TQChar(0x05D9))
         return -1;
       else
-        result += decadeValues[c.tqunicode() - 0x05D9];
+        result += decadeValues[c.unicode() - 0x05D9];
     }
     else if (c >= TQChar(0x05E7) && c <= TQChar(0x05EA))
     {
-      result += (c.tqunicode() - 0x05E7 + 1) * 100;
+      result += (c.unicode() - 0x05E7 + 1) * 100;
     }
     else
     {
diff --git a/kdecore/kcalendarsystemhijri.cpp b/kdecore/kcalendarsystemhijri.cpp
index 564a2eaa9..8eb403685 100644
--- a/kdecore/kcalendarsystemhijri.cpp
+++ b/kdecore/kcalendarsystemhijri.cpp
@@ -577,7 +577,7 @@ TQDate KCalendarSystemHijri::addYears( const TQDate & date, int nyears ) const
 
 TQString KCalendarSystemHijri::calendarName() const
 {
-  return TQString::tqfromLatin1("hijri");
+  return TQString::fromLatin1("hijri");
 }
 
 bool KCalendarSystemHijri::isLunar() const
diff --git a/kdecore/kcalendarsystemjalali.cpp b/kdecore/kcalendarsystemjalali.cpp
index 0e0ed7662..8915c585a 100644
--- a/kdecore/kcalendarsystemjalali.cpp
+++ b/kdecore/kcalendarsystemjalali.cpp
@@ -541,7 +541,7 @@ int KCalendarSystemJalali::weekDayOfPray() const
 }
 TQString KCalendarSystemJalali::calendarName() const
 {
-  return TQString::tqfromLatin1("jalali");
+  return TQString::fromLatin1("jalali");
 }
 
 bool KCalendarSystemJalali::isLunar() const
diff --git a/kdecore/kcatalogue.cpp b/kdecore/kcatalogue.cpp
index 38cfad22c..3669b40b4 100644
--- a/kdecore/kcatalogue.cpp
+++ b/kdecore/kcatalogue.cpp
@@ -26,7 +26,7 @@
 #include "kcatalogue.h"
 #include "kstandarddirs.h"
 
-char *k_nl_tqfind_msg(struct kde_loaded_l10nfile *domain_file,
+char *k_nl_find_msg(struct kde_loaded_l10nfile *domain_file,
 	       const char *msgid);
 void k_nl_unload_domain (struct loaded_domain *domain);
 
@@ -57,12 +57,12 @@ KCatalogue::KCatalogue(const TQString & name, const TQString & language )
 {
   d->name = name;
   d->language = language;
-  // at the moment we do not know more. To tqfind out the plural type we first have to look into
+  // at the moment we do not know more. To find out the plural type we first have to look into
   // kdelibs.mo for the language. And for this we already need a catalog object. So this data
   // has to be set after we have the first catalog objects.
   d->pluralType = -1; 
 
-  TQString path = TQString::tqfromLatin1("%1/LC_MESSAGES/%2.mo")
+  TQString path = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo")
     .arg( d->language )
     .arg( d->name );
 
@@ -143,7 +143,7 @@ TQString KCatalogue::fileName() const
 
 const char * KCatalogue::translate(const char * msgid) const
 {
-  return ::k_nl_tqfind_msg( &d->domain, msgid );
+  return ::k_nl_find_msg( &d->domain, msgid );
 }
 
 void KCatalogue::doUnload()
diff --git a/kdecore/kcharsets.cpp b/kdecore/kcharsets.cpp
index d55060d49..52cf87849 100644
--- a/kdecore/kcharsets.cpp
+++ b/kdecore/kcharsets.cpp
@@ -202,7 +202,7 @@ static struct Builtin
     { "ascii", "iso 8859-1" },
     { "x-utf-8", "utf-8" },
     { "x-utf-7", "utf-7" }, // ### FIXME: UTF-7 is not in Qt 
-    { "tqunicode-1-1-utf-7", "utf-7" }, // ### FIXME: UTF-7 is not in Qt
+    { "unicode-1-1-utf-7", "utf-7" }, // ### FIXME: UTF-7 is not in Qt
     { "utf-16", "iso-10646-ucs-2" },
     { "utf16", "iso-10646-ucs-2" },
     { "ucs2", "iso-10646-ucs-2" },
@@ -323,7 +323,7 @@ static struct ConversionHints
     { 0, 0 }};
 
 
-// search an array of items index/data, index is const char*, data is T, tqfind first matching index
+// search an array of items index/data, index is const char*, data is T, find first matching index
 // and return data, or return 0
 template< typename T, typename Data >
 static Data kcharsets_array_search( const T* start, const char* entry )
@@ -381,17 +381,17 @@ TQChar KCharsets::fromEntity(const TQString &str)
         if (str[pos] == (QChar)'x' || str[pos] == (QChar)'X') {
             pos++;
             // '&#x0000', hexadeciaml character reference
-            TQString tmp(str.tqunicode()+pos, str.length()-pos);
+            TQString tmp(str.unicode()+pos, str.length()-pos);
             res = tmp.toInt(&ok, 16);
         } else {
             //  '&#0000', decimal character reference
-            TQString tmp(str.tqunicode()+pos, str.length()-pos);
+            TQString tmp(str.unicode()+pos, str.length()-pos);
             res = tmp.toInt(&ok, 10);
         }
         return res;
     }
 
-    const entity *e = kde_tqfindEntity(str.ascii(), str.length());
+    const entity *e = kde_findEntity(str.ascii(), str.length());
 
     if(!e)
     {
@@ -422,14 +422,14 @@ TQChar KCharsets::fromEntity(const TQString &str, int &len)
 TQString KCharsets::toEntity(const TQChar &ch)
 {
     TQString ent;
-    ent.sprintf("&#0x%x;", ch.tqunicode());
+    ent.sprintf("&#0x%x;", ch.unicode());
     return ent;
 }
 
 TQString KCharsets::resolveEntities( const TQString &input )
 {
     TQString text = input;
-    const TQChar *p = text.tqunicode();
+    const TQChar *p = text.unicode();
     const TQChar *end = p + text.length();
     const TQChar *ampersand = 0;
     bool scanForSemicolon = false;
@@ -460,12 +460,12 @@ TQString KCharsets::resolveEntities( const TQString &input )
         if ( entityValue.isNull() )
             continue;
 
-        const uint ampersandPos = ampersand - text.tqunicode();
+        const uint ampersandPos = ampersand - text.unicode();
 
         text[ (int)ampersandPos ] = entityValue;
         text.remove( ampersandPos + 1, entityLength + 1 );
-        p = text.tqunicode() + ampersandPos;
-        end = text.tqunicode() + text.length();
+        p = text.unicode() + ampersandPos;
+        end = text.unicode() + text.length();
         ampersand = 0;
     }
 
@@ -477,7 +477,7 @@ TQStringList KCharsets::availableEncodingNames()
     TQStringList available;
     for ( const char* const* pos = charsets_for_encoding; *pos; ++pos ) {
         //kdDebug(0) << *charsets << " available" << endl;
-        available.append( TQString::tqfromLatin1( *pos ));
+        available.append( TQString::fromLatin1( *pos ));
     }
     return available;
 }
@@ -491,14 +491,14 @@ TQString KCharsets::languageForEncoding( const TQString &encoding )
 
 TQString KCharsets::encodingForName( const TQString &descriptiveName )
 {
-    const int left = descriptiveName.tqfindRev( '(' );
+    const int left = descriptiveName.findRev( '(' );
     
     if (left<0) // No parenthesis, so assume it is a normal encoding name
 	return descriptiveName.stripWhiteSpace();
     
     TQString name(descriptiveName.mid(left+1));
     
-    const int right = name.tqfindRev( ')' );
+    const int right = name.findRev( ')' );
     
     if (right<0) 
         return name;
@@ -511,7 +511,7 @@ TQStringList KCharsets::descriptiveEncodingNames()
     // As we are sorting, we can directly read the array language_for_encoding
     TQStringList encodings;
     for ( const LanguageForEncoding* pos = language_for_encoding; pos->index; ++pos ) {
-        const TQString name = TQString::tqfromLatin1( pos->index );
+        const TQString name = TQString::fromLatin1( pos->index );
         const TQString description = i18n( language_names[ pos->data ] );
         encodings.append( i18n("Descriptive Encoding Name", "%1 ( %2 )"). arg ( description ). arg( name ) );
     }
@@ -536,7 +536,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
 
     if (n.isEmpty()) {
         codec = KGlobal::locale()->codecForEncoding();
-        d->codecForNameDict.tqreplace("->locale<-", codec);
+        d->codecForNameDict.replace("->locale<-", codec);
         return codec;
     }
 
@@ -553,7 +553,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
     codec = TQTextCodec::codecForName(name);
 
     if(codec) {
-        d->codecForNameDict.tqreplace(key, codec);
+        d->codecForNameDict.replace(key, codec);
         return codec;
     }
 
@@ -566,14 +566,14 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
 
     if(codec)
     {
-        d->codecForNameDict.tqreplace(key, codec);
+        d->codecForNameDict.replace(key, codec);
         return codec;
     }
 
     TQString dir;
     {
     KConfigGroupSaver cfgsav( KGlobal::config(), "i18n" );
-    dir = KGlobal::config()->readPathEntry("i18ndir", TQString::tqfromLatin1("/usr/share/i18n/charmaps"));
+    dir = KGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/usr/share/i18n/charmaps"));
     }
 
     // these are codecs not included in Qt. They can be build up if the corresponding charmap
@@ -584,8 +584,8 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
         cname = name;
     cname = cname.upper();
 
-    const TQString basicName = TQString::tqfromLatin1(cname);
-    kdDebug() << k_funcinfo << endl << " Trying to tqfind " << cname << " in " << dir << endl;
+    const TQString basicName = TQString::fromLatin1(cname);
+    kdDebug() << k_funcinfo << endl << " Trying to find " << cname << " in " << dir << endl;
     
     TQString charMapFileName;
     bool gzipped = false; 
@@ -603,7 +603,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
     else {
         // Check if we are asking a code page
         // If yes, then check "CP99999" and "IBM99999"
-        // First we need to tqfind the number of the codepage
+        // First we need to find the number of the codepage
         TQRegExp regexp("^(X-)?(CP|IBM)(-| )?(0-9)+");
         if ( regexp.search(basicName) != -1) {
             const TQString num = regexp.cap(4);
@@ -642,7 +642,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
     }
 
     if(codec) {
-        d->codecForNameDict.tqreplace(key, codec);
+        d->codecForNameDict.replace(key, codec);
         return codec;
     }
 
@@ -654,7 +654,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
         codec = TQTextCodec::codecForName(cname);
 
     if(codec) {
-        d->codecForNameDict.tqreplace(key, codec);
+        d->codecForNameDict.replace(key, codec);
         return codec;
     }
 
diff --git a/kdecore/kcharsets.h b/kdecore/kcharsets.h
index c8b82eea0..32c91148a 100644
--- a/kdecore/kcharsets.h
+++ b/kdecore/kcharsets.h
@@ -66,7 +66,7 @@ public:
     TQTextCodec *codecForName(const TQString &name) const;
 
     /**
-     * Tries to tqfind a TQTextCodec to convert the given encoding from and to
+     * Tries to find a TQTextCodec to convert the given encoding from and to
      * Unicode. If no codec could be found the latin1 codec will be returned an
      * @p ok will be set to false.
      * @return the TQTextCodec. If the desired codec could not be found,
@@ -82,7 +82,7 @@ public:
      */
     static TQChar fromEntity(const TQString &str);
     /**
-     * Overloaded member function. Tries to tqfind an entity in the
+     * Overloaded member function. Tries to find an entity in the
      * TQString str.
      * @param str the string containing entified
      * @param len is a return value, that gives the length of the decoded
diff --git a/kdecore/kcheckaccelerators.cpp b/kdecore/kcheckaccelerators.cpp
index 771e0e619..7b1d3621b 100644
--- a/kdecore/kcheckaccelerators.cpp
+++ b/kdecore/kcheckaccelerators.cpp
@@ -66,7 +66,7 @@
  even if the GUI changed (in the latter case, use manual check ). Automatic
  checks can be anytime disabled by the checkbox in the dialog presenting
  the results of the check. If you set 'AlwaysShowCheckAccelerators' to true,
- the dialog will be shown even if the automatic check didn't tqfind any conflicts,
+ the dialog will be shown even if the automatic check didn't find any conflicts,
  and all submenus will be shown, even those without conflicts.
 
  The dialog first lists the name of the window, then all results for all menus
@@ -147,8 +147,8 @@ void KCheckAccelerators::createDialog(TQWidget *actWin, bool automatic)
     drklash = new TQDialog( actWin, "kapp_accel_check_dlg", false, Qt::WDestructiveClose);
     drklash->setCaption( i18n( "Dr. Klash' Accelerator Diagnosis" ));
     drklash->resize( 500, 460 );
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( drklash, 11, 6 );
-    tqlayout->setAutoAdd( true );
+    TQVBoxLayout* layout = new TQVBoxLayout( drklash, 11, 6 );
+    layout->setAutoAdd( true );
     drklash_view = new TQTextView( drklash );
     TQCheckBox* disableAutoCheck = NULL;
     if( automatic )  {
@@ -173,7 +173,7 @@ void KCheckAccelerators::slotDisableCheck(bool on)
 
 void KCheckAccelerators::checkAccelerators( bool automatic )
 {
-    TQWidget* actWin = tqApp->activeWindow();
+    TQWidget* actWin = qApp->activeWindow();
     if ( !actWin )
         return;
 
diff --git a/kdecore/kcheckaccelerators.h b/kdecore/kcheckaccelerators.h
index ce10b31bb..f6a5b7223 100644
--- a/kdecore/kcheckaccelerators.h
+++ b/kdecore/kcheckaccelerators.h
@@ -54,7 +54,7 @@ class TQTextView;
  even if the GUI changed (in the latter case, use manual check ). Automatic
  checks can be anytime disabled by the checkbox in the dialog presenting
  the results of the check. If you set 'AlwaysShowCheckAccelerators' to true,
- the dialog will be shown even if the automatic check didn't tqfind any conflicts,
+ the dialog will be shown even if the automatic check didn't find any conflicts,
  and all submenus will be shown, even those without conflicts.
 
  The dialog first lists the name of the window, then all results for all menus
@@ -63,7 +63,7 @@ class TQTextView;
  there are shown all conflicts grouped by accelerator, and a list of all used
  accelerators.
 */
-class KDECORE_EXPORT KCheckAccelerators : public TQObject
+class KDECORE_EXPORT KCheckAccelerators : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kdecore/kclipboard.cpp b/kdecore/kclipboard.cpp
index 0e17aec0c..50073cc6a 100644
--- a/kdecore/kclipboard.cpp
+++ b/kdecore/kclipboard.cpp
@@ -56,7 +56,7 @@ public:
             while ( (format = src->format( i++ )) )
             {
                 byteArray = new TQByteArray();
-                *byteArray = src->tqencodedData( format ).copy();
+                *byteArray = src->encodedData( format ).copy();
                 m_data.append( byteArray );
                 m_formats.append( format );
             }
@@ -72,11 +72,11 @@ public:
             return 0L;
     }
     virtual bool provides( const char *mimeType ) const {
-        return ( m_formats.tqfind( mimeType ) > -1 );
+        return ( m_formats.find( mimeType ) > -1 );
     }
-    virtual TQByteArray tqencodedData( const char *format ) const
+    virtual TQByteArray encodedData( const char *format ) const
     {
-        int index = m_formats.tqfind( format );
+        int index = m_formats.find( format );
         if ( index > -1 )
             return *(m_data.at( index ));
 
@@ -97,7 +97,7 @@ bool KClipboardSynchronizer::s_blocked = false;
 KClipboardSynchronizer * KClipboardSynchronizer::self()
 {
     if ( !s_self )
-        s_self = new KClipboardSynchronizer( TQT_TQOBJECT(kapp), "KDE Clipboard" );
+        s_self = new KClipboardSynchronizer( kapp, "KDE Clipboard" );
 
     return s_self;
 }
diff --git a/kdecore/kclipboard.h b/kdecore/kclipboard.h
index aecfccf52..593164f54 100644
--- a/kdecore/kclipboard.h
+++ b/kdecore/kclipboard.h
@@ -33,7 +33,7 @@
  * @since 3.1
  * @internal
  */
-class KDECORE_EXPORT KClipboardSynchronizer : public TQObject
+class KDECORE_EXPORT KClipboardSynchronizer : public QObject
 {
     Q_OBJECT
 
diff --git a/kdecore/kcmdlineargs.cpp b/kdecore/kcmdlineargs.cpp
index 1664c15dd..9600da39c 100644
--- a/kdecore/kcmdlineargs.cpp
+++ b/kdecore/kcmdlineargs.cpp
@@ -63,7 +63,7 @@ public:
      : TQAsciiDict<TQCString>( 7 ) { }
 
    // WABA: Huh?
-   // The compiler doesn't tqfind KCmdLineParsedOptions::write(s) by itself ???
+   // The compiler doesn't find KCmdLineParsedOptions::write(s) by itself ???
    // WABA: No, because there is another write function that hides the
    // write function in the base class even though this function has a
    // different signature. (obscure C++ feature)
@@ -352,7 +352,7 @@ void KCmdLineArgs::removeArgs(const char *id)
  *  +4 - no more options follow         // !fork
  */
 static int
-tqfindOption(const KCmdLineOptions *options, TQCString &opt,
+findOption(const KCmdLineOptions *options, TQCString &opt,
            const char *&opt_name, const char *&def, bool &enabled)
 {
    int result;
@@ -393,7 +393,7 @@ tqfindOption(const KCmdLineOptions *options, TQCString &opt,
                if (!options->name)
                   return result+0;
                TQCString nextOption = options->name;
-               int p = nextOption.tqfind(' ');
+               int p = nextOption.find(' ');
                if (p > 0)
                   nextOption = nextOption.left(p);
                if (nextOption[0] == '!')
@@ -403,7 +403,7 @@ tqfindOption(const KCmdLineOptions *options, TQCString &opt,
                   nextOption = nextOption.mid(2);
                   enabled = !enabled;
                }
-               result = tqfindOption(options, nextOption, opt_name, def, enabled);
+               result = findOption(options, nextOption, opt_name, def, enabled);
                assert(result);
                opt = nextOption;
                return result;
@@ -426,13 +426,13 @@ tqfindOption(const KCmdLineOptions *options, TQCString &opt,
 
 
 void
-KCmdLineArgs::tqfindOption(const char *_opt, TQCString opt, int &i, bool _enabled, bool &moreOptions)
+KCmdLineArgs::findOption(const char *_opt, TQCString opt, int &i, bool _enabled, bool &moreOptions)
 {
    KCmdLineArgs *args = argsList->first();
    const char *opt_name;
    const char *def;
    TQCString argument;
-   int j = opt.tqfind('=');
+   int j = opt.find('=');
    if (j != -1)
    {
       argument = opt.mid(j+1);
@@ -444,7 +444,7 @@ KCmdLineArgs::tqfindOption(const char *_opt, TQCString opt, int &i, bool _enable
    while (args)
    {
       enabled = _enabled;
-      result = ::tqfindOption(args->options, opt, opt_name, def, enabled);
+      result = ::findOption(args->options, opt, opt_name, def, enabled);
       if (result) break;
       args = argsList->next();
    }
@@ -461,7 +461,7 @@ KCmdLineArgs::tqfindOption(const char *_opt, TQCString opt, int &i, bool _enable
          while (args)
          {
             enabled = _enabled;
-            result = ::tqfindOption(args->options, singleCharOption, opt_name, def, enabled);
+            result = ::findOption(args->options, singleCharOption, opt_name, def, enabled);
             if (result) break;
             args = argsList->next();
          }
@@ -646,7 +646,7 @@ KCmdLineArgs::parseAllArgs()
               option += 2;
               enabled = false;
            }
-           tqfindOption(orig, option, i, enabled, inOptions);
+           findOption(orig, option, i, enabled, inOptions);
          }
       }
       else
@@ -858,7 +858,7 @@ KCmdLineArgs::usage(const char *id)
      bool hasOptions = false;
      TQString optionsHeader;
      if (args->name)
-        optionsHeader = optionHeaderString.arg(i18n("%1 options").arg(TQString::tqfromLatin1(args->name)));
+        optionsHeader = optionHeaderString.arg(i18n("%1 options").arg(TQString::fromLatin1(args->name)));
      else
         optionsHeader = i18n("\nOptions:\n");
 
@@ -1081,9 +1081,9 @@ KCmdLineArgs::setOption(const TQCString &opt, bool enabled)
    }
 
    if (enabled)
-      parsedOptionList->tqreplace( opt, new TQCString("t") );
+      parsedOptionList->replace( opt, new TQCString("t") );
    else
-      parsedOptionList->tqreplace( opt, new TQCString("f") );
+      parsedOptionList->replace( opt, new TQCString("f") );
 }
 
 void
@@ -1119,7 +1119,7 @@ KCmdLineArgs::getOption(const char *_opt) const
    TQCString *value = 0;
    if (parsedOptionList)
    {
-      value = parsedOptionList->tqfind(_opt);
+      value = parsedOptionList->find(_opt);
    }
 
    if (value)
@@ -1130,7 +1130,7 @@ KCmdLineArgs::getOption(const char *_opt) const
    const char *def;
    bool dummy = true;
    TQCString opt = _opt;
-   int result = ::tqfindOption( options, opt, opt_name, def, dummy) & ~4;
+   int result = ::findOption( options, opt, opt_name, def, dummy) & ~4;
 
    if (result != 3)
    {
@@ -1183,7 +1183,7 @@ KCmdLineArgs::isSet(const char *_opt) const
    const char *def;
    bool dummy = true;
    TQCString opt = _opt;
-   int result = ::tqfindOption( options, opt, opt_name, def, dummy) & ~4;
+   int result = ::findOption( options, opt, opt_name, def, dummy) & ~4;
 
    if (result == 0)
    {
@@ -1199,7 +1199,7 @@ KCmdLineArgs::isSet(const char *_opt) const
    TQCString *value = 0;
    if (parsedOptionList)
    {
-      value = parsedOptionList->tqfind(opt);
+      value = parsedOptionList->find(opt);
    }
 
    if (value)
diff --git a/kdecore/kcmdlineargs.h b/kdecore/kcmdlineargs.h
index aeb28528e..b4386c629 100644
--- a/kdecore/kcmdlineargs.h
+++ b/kdecore/kcmdlineargs.h
@@ -263,7 +263,7 @@ public:
    * Initialize class.
    *
    * This function should be called as the very first thing in
-   *  your application. It uses KAboutData to tqreplace some of the
+   *  your application. It uses KAboutData to replace some of the
    *  arguments that would otherwise be required.
    *
    * @param _argc As passed to @p main(...).
@@ -571,7 +571,7 @@ private:
    *
    * Checks what to do with a single option
    */
-  static void tqfindOption(const char *_opt, TQCString opt, int &i, bool enabled, bool &moreOptions);
+  static void findOption(const char *_opt, TQCString opt, int &i, bool enabled, bool &moreOptions);
 
   /**
    * @internal
diff --git a/kdecore/kcompletion.cpp b/kdecore/kcompletion.cpp
index c5db551ab..84a4cfca2 100644
--- a/kdecore/kcompletion.cpp
+++ b/kdecore/kcompletion.cpp
@@ -149,8 +149,8 @@ void KCompletion::addWeightedItem( const TQString& item )
     uint len = item.length();
     uint weight = 0;
 
-    // tqfind out the weighting of this item (appended to the string as ":num")
-    int index = item.tqfindRev(':');
+    // find out the weighting of this item (appended to the string as ":num")
+    int index = item.findRev(':');
     if ( index > 0 ) {
         bool ok;
         weight = item.mid( index + 1 ).toUInt( &ok );
@@ -206,7 +206,7 @@ TQString KCompletion::makeCompletion( const TQString& string )
         // on d->matches here would interfere with call to
         // postProcessMatch() during rotation
     
-        tqfindAllCompletions( string, &d->matches, myHasMultipleMatches );
+        findAllCompletions( string, &d->matches, myHasMultipleMatches );
         TQStringList l = d->matches.list();
         postProcessMatches( &l );
         emit matches( l );
@@ -221,12 +221,12 @@ TQString KCompletion::makeCompletion( const TQString& string )
     // in case-insensitive popup mode, we search all completions at once
     if ( myCompletionMode == KGlobalSettings::CompletionPopup ||
          myCompletionMode == KGlobalSettings::CompletionPopupAuto ) {
-        tqfindAllCompletions( string, &d->matches, myHasMultipleMatches );
+        findAllCompletions( string, &d->matches, myHasMultipleMatches );
         if ( !d->matches.isEmpty() )
             completion = d->matches.first();
     }
     else
-        completion = tqfindCompletion( string );
+        completion = findCompletion( string );
 
     if ( myHasMultipleMatches )
         emit multipleMatches();
@@ -274,7 +274,7 @@ TQStringList KCompletion::substringCompletion( const TQString& string ) const
 
     for( ; it != list.end(); ++it ) {
         TQString item = *it;
-        if ( item.tqfind( string, 0, false ) != -1 ) { // always case insensitive
+        if ( item.find( string, 0, false ) != -1 ) { // always case insensitive
             matches.append( item );
         }
     }
@@ -300,7 +300,7 @@ TQStringList KCompletion::allMatches()
     // postProcessMatch() during rotation
     KCompletionMatchesWrapper matches( myOrder == Weighted );
     bool dummy;
-    tqfindAllCompletions( myLastString, &matches, dummy );
+    findAllCompletions( myLastString, &matches, dummy );
     TQStringList l = matches.list();
     postProcessMatches( &l );
     return l;
@@ -313,7 +313,7 @@ KCompletionMatches KCompletion::allWeightedMatches()
     // postProcessMatch() during rotation
     KCompletionMatchesWrapper matches( myOrder == Weighted );
     bool dummy;
-    tqfindAllCompletions( myLastString, &matches, dummy );
+    findAllCompletions( myLastString, &matches, dummy );
     KCompletionMatches ret( matches );
     postProcessMatches( &ret );
     return ret;
@@ -323,7 +323,7 @@ TQStringList KCompletion::allMatches( const TQString &string )
 {
     KCompletionMatchesWrapper matches( myOrder == Weighted );
     bool dummy;
-    tqfindAllCompletions( string, &matches, dummy );
+    findAllCompletions( string, &matches, dummy );
     TQStringList l = matches.list();
     postProcessMatches( &l );
     return l;
@@ -333,7 +333,7 @@ KCompletionMatches KCompletion::allWeightedMatches( const TQString &string )
 {
     KCompletionMatchesWrapper matches( myOrder == Weighted );
     bool dummy;
-    tqfindAllCompletions( string, &matches, dummy );
+    findAllCompletions( string, &matches, dummy );
     KCompletionMatches ret( matches );
     postProcessMatches( &ret );
     return ret;
@@ -349,7 +349,7 @@ TQString KCompletion::nextMatch()
     myLastMatch = myCurrentMatch;
 
     if ( d->matches.isEmpty() ) {
-        tqfindAllCompletions( myLastString, &d->matches, myHasMultipleMatches );
+        findAllCompletions( myLastString, &d->matches, myHasMultipleMatches );
         completion = d->matches.first();
         myCurrentMatch = completion;
         myRotationIndex = 0;
@@ -382,7 +382,7 @@ TQString KCompletion::previousMatch()
     myLastMatch = myCurrentMatch;
 
     if ( d->matches.isEmpty() ) {
-        tqfindAllCompletions( myLastString, &d->matches, myHasMultipleMatches );
+        findAllCompletions( myLastString, &d->matches, myHasMultipleMatches );
         completion = d->matches.last();
         myCurrentMatch = completion;
         myRotationIndex = 0;
@@ -411,16 +411,16 @@ TQString KCompletion::previousMatch()
 
 
 // tries to complete "string" from the tree-root
-TQString KCompletion::tqfindCompletion( const TQString& string )
+TQString KCompletion::findCompletion( const TQString& string )
 {
     TQChar ch;
     TQString completion;
     const KCompTreeNode *node = myTreeRoot;
 
-    // start at the tree-root and try to tqfind the search-string
+    // start at the tree-root and try to find the search-string
     for( uint i = 0; i < string.length(); i++ ) {
         ch = string.at( i );
-        node = node->tqfind( ch );
+        node = node->find( ch );
 
         if ( node )
             completion += ch;
@@ -438,7 +438,7 @@ TQString KCompletion::tqfindCompletion( const TQString& string )
             completion += *node;
     }
     // if multiple matches and auto-completion mode
-    // -> tqfind the first complete match
+    // -> find the first complete match
     if ( node && node->childrenCount() > 1 ) {
         myHasMultipleMatches = true;
     
@@ -453,7 +453,7 @@ TQString KCompletion::tqfindCompletion( const TQString& string )
                 }
             }
             else {
-                // don't just tqfind the "first" match, but the one with the
+                // don't just find the "first" match, but the one with the
                 // highest priority
         
                 const KCompTreeNode* temp_node = 0L;
@@ -463,7 +463,7 @@ TQString KCompletion::tqfindCompletion( const TQString& string )
                     uint weight = temp_node->weight();
                     const KCompTreeNode* hit = temp_node;
                     for( int i = 1; i < count; i++ ) {
-                        temp_node = node->tqchildAt(i);
+                        temp_node = node->childAt(i);
                         if( temp_node->weight() > weight ) {
                             hit = temp_node;
                             weight = hit->weight();
@@ -487,11 +487,11 @@ TQString KCompletion::tqfindCompletion( const TQString& string )
 }
 
 
-void KCompletion::tqfindAllCompletions(const TQString& string,
+void KCompletion::findAllCompletions(const TQString& string,
                                      KCompletionMatchesWrapper *matches,
                                      bool& hasMultipleMatches) const
 {
-    //kdDebug(0) << "*** tqfinding all completions for " << string << endl;
+    //kdDebug(0) << "*** finding all completions for " << string << endl;
 
     if ( string.isEmpty() )
         return;
@@ -506,10 +506,10 @@ void KCompletion::tqfindAllCompletions(const TQString& string,
     TQString completion;
     const KCompTreeNode *node = myTreeRoot;
 
-    // start at the tree-root and try to tqfind the search-string
+    // start at the tree-root and try to find the search-string
     for( uint i = 0; i < string.length(); i++ ) {
         ch = string.at( i );
-        node = node->tqfind( ch );
+        node = node->find( ch );
 
         if ( node )
             completion += ch;
@@ -535,7 +535,7 @@ void KCompletion::tqfindAllCompletions(const TQString& string,
 
     else {
         // node has more than one child
-        // -> recursively tqfind all remaining completions
+        // -> recursively find all remaining completions
         hasMultipleMatches = true;
         extractStringsFromNode( node, completion, matches );
     }
@@ -579,7 +579,7 @@ void KCompletion::extractStringsFromNode( const KCompTreeNode *node,
             matches->append( node->weight(), string );
         }
 
-        // recursively tqfind all other strings.
+        // recursively find all other strings.
         if ( node && node->childrenCount() > 1 )
             extractStringsFromNode( node, string, matches, addWeight );
     }
@@ -599,19 +599,19 @@ void KCompletion::extractStringsFromNodeCI( const KCompTreeNode *node,
     TQString newRest = restString.mid(1);
     KCompTreeNode *child1, *child2;
 
-    child1 = node->tqfind( ch1 ); // the correct match
+    child1 = node->find( ch1 ); // the correct match
     if ( child1 )
         extractStringsFromNodeCI( child1, beginning + *child1, newRest,
                                   matches );
 
     // append the case insensitive matches, if available
     if ( ch1.isLetter() ) {
-        // tqfind out if we have to lower or upper it. Is there a better way?
+        // find out if we have to lower or upper it. Is there a better way?
         TQChar ch2 = ch1.lower();
         if ( ch1 == ch2 )
             ch2 = ch1.upper();
         if ( ch1 != ch2 ) {
-            child2 = node->tqfind( ch2 );
+            child2 = node->find( ch2 );
             if ( child2 )
                 extractStringsFromNodeCI( child2, beginning + *child2, newRest,
                                           matches );
@@ -628,19 +628,19 @@ void KCompletion::doBeep( BeepMode mode ) const
 
     switch ( mode ) {
         case Rotation:
-            event = TQString::tqfromLatin1("Textcompletion: rotation");
+            event = TQString::fromLatin1("Textcompletion: rotation");
             text = i18n("You reached the end of the list\nof matching items.\n");
             break;
         case PartialMatch:
             if ( myCompletionMode == KGlobalSettings::CompletionShell ||
                  myCompletionMode == KGlobalSettings::CompletionMan ) {
-                event = TQString::tqfromLatin1("Textcompletion: partial match");
+                event = TQString::fromLatin1("Textcompletion: partial match");
                 text = i18n("The completion is ambiguous, more than one\nmatch is available.\n");
             }
             break;
         case NoMatch:
             if ( myCompletionMode == KGlobalSettings::CompletionShell ) {
-                event = TQString::tqfromLatin1("Textcompletion: no match");
+                event = TQString::fromLatin1("Textcompletion: no match");
                 text = i18n("There is no matching item available.\n");
             }
             break;
@@ -676,7 +676,7 @@ KCompTreeNode::~KCompTreeNode()
 // it will not be created. Returns the new/existing node.
 KCompTreeNode * KCompTreeNode::insert( const TQChar& ch, bool sorted )
 {
-    KCompTreeNode *child = tqfind( ch );
+    KCompTreeNode *child = find( ch );
     if ( !child ) {
         child = new KCompTreeNode( ch );
 
@@ -725,7 +725,7 @@ void KCompTreeNode::remove( const TQString& str )
     uint i = 0;
     for ( ; i < string.length(); i++ )
     {
-        child = parent->tqfind( string.at( i ) );
+        child = parent->find( string.at( i ) );
         if ( child )
             deletables.insert( i + 1, child );
         else
diff --git a/kdecore/kcompletion.h b/kdecore/kcompletion.h
index 15c6ca288..95198cdb0 100644
--- a/kdecore/kcompletion.h
+++ b/kdecore/kcompletion.h
@@ -119,7 +119,7 @@ class TQPopupMenu;
  * tell the user) where a completion comes from.
  *
  * Note: KCompletion does not work with strings that contain 0x0 characters
- *       (tqunicode nul), as this is used internally as a delimiter.
+ *       (unicode nul), as this is used internally as a delimiter.
  *
  * You may inherit from KCompletion and override makeCompletion() in
  * special cases (like reading directories/urls and then supplying the
@@ -129,7 +129,7 @@ class TQPopupMenu;
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KDECORE_EXPORT KCompletion : public TQObject
+class KDECORE_EXPORT KCompletion : public QObject
 {
     Q_ENUMS( CompOrder )
     Q_PROPERTY( CompOrder order READ order WRITE setOrder )
@@ -160,7 +160,7 @@ public:
     virtual ~KCompletion();
 
     /**
-     * Attempts to tqfind an item in the list of available completions,
+     * Attempts to find an item in the list of available completions,
      * that begins with @p string. Will either return the first matching item
      * (if there is more than one match) or TQString::null, if no match was
      * found.
@@ -244,7 +244,7 @@ public:
     TQStringList items() const;
     
     /**
-     * Returns true when the completion object tqcontains no entries.
+     * Returns true when the completion object contains no entries.
      */
     bool isEmpty() const;
 
@@ -354,7 +354,7 @@ public:
 
     /**
      * Enables/disables playing a sound when
-     * @li makeCompletion() can't tqfind a match
+     * @li makeCompletion() can't find a match
      * @li there is a partial completion (= multiple matches in
      *     Shell-completion mode)
      * @li nextMatch() or previousMatch() hit the last possible
@@ -553,8 +553,8 @@ protected:
 
 private:
     void            addWeightedItem( const TQString& );
-    TQString         tqfindCompletion( const TQString& string );
-    void            tqfindAllCompletions( const TQString&,
+    TQString         findCompletion( const TQString& string );
+    void            findAllCompletions( const TQString&,
                                         KCompletionMatchesWrapper *matches,
                                         bool& hasMultipleMatches ) const;
 
@@ -829,7 +829,7 @@ public:
      *
      * @param mode Completion type:
      *   @li CompletionNone:  Disables completion feature.
-     *   @li CompletionAuto:  Attempts to tqfind a match &
+     *   @li CompletionAuto:  Attempts to find a match &
      *                        fills-in the remaining text.
      *   @li CompletionMan:   Acts the same as the above
      *                        except the action has to be
@@ -892,7 +892,7 @@ public:
      *
      * This methods returns the key-binding used to activate
      * the feature feature given by @p item.  If the binding
-     * tqcontains modifier key(s), the SUM of the modifier key
+     * contains modifier key(s), the SUM of the modifier key
      * and the actual key code are returned.
      *
      * @param item the item to check
diff --git a/kdecore/kcompletion_private.h b/kdecore/kcompletion_private.h
index 6b7151341..35c846593 100644
--- a/kdecore/kcompletion_private.h
+++ b/kdecore/kcompletion_private.h
@@ -99,7 +99,7 @@ public:
 
     // Returns a child of this node matching ch, if available.
     // Otherwise, returns 0L
-    inline KCompTreeNode * tqfind( const TQChar& ch ) const {
+    inline KCompTreeNode * find( const TQChar& ch ) const {
       KCompTreeNode * cur = myChildren.begin();
       while (cur && (*cur != ch)) cur = cur->next;
       return cur;
@@ -118,7 +118,7 @@ public:
     inline const KCompTreeChildren * children() const {
 	return &myChildren;
     }
-    inline const KCompTreeNode * tqchildAt(int index) const {
+    inline const KCompTreeNode * childAt(int index) const {
 	return myChildren.at(index);
     }
     inline const KCompTreeNode * firstChild() const {
diff --git a/kdecore/kcompletionbase.cpp b/kdecore/kcompletionbase.cpp
index 019f4ec6b..9e7f6d746 100644
--- a/kdecore/kcompletionbase.cpp
+++ b/kdecore/kcompletionbase.cpp
@@ -123,7 +123,7 @@ bool KCompletionBase::setKeyBinding( KeyBindingType item, const KShortcut& cut )
         for( KeyBindingMap::Iterator it = m_keyMap.begin(); it != m_keyMap.end(); ++it )
             if( it.data() == cut )  return false;
     }
-    m_keyMap.tqreplace( item, cut );
+    m_keyMap.replace( item, cut );
     return true;
 }
 
diff --git a/kdecore/kconfig.cpp b/kdecore/kconfig.cpp
index 3dfb018b9..2531034ee 100644
--- a/kdecore/kconfig.cpp
+++ b/kdecore/kconfig.cpp
@@ -144,7 +144,7 @@ TQMap<TQString, TQString> KConfig::entryMap(const TQString &pGroup) const
   KEntryKey groupKey( pGroup_utf, 0 );
   TQMap<TQString, TQString> tmpMap;
 
-  KEntryMapConstIterator aIt = aEntryMap.tqfind(groupKey);
+  KEntryMapConstIterator aIt = aEntryMap.find(groupKey);
   if (aIt == aEntryMap.end())
      return tmpMap;
   ++aIt; // advance past special group entry marker
@@ -183,7 +183,7 @@ KEntryMap KConfig::internalEntryMap(const TQString &pGroup) const
   KEntryKey aKey(pGroup_utf, 0);
   KEntryMap tmpEntryMap;
 
-  aIt = aEntryMap.tqfind(aKey);
+  aIt = aEntryMap.find(aKey);
   if (aIt == aEntryMap.end()) {
     // the special group key is not in the map,
     // so it must be an invalid group.  Return
@@ -215,7 +215,7 @@ void KConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGro
   if (bGroupImmutable && !_key.bDefault)
     return;
 
-  // now either add or tqreplace the data
+  // now either add or replace the data
   KEntry &entry = aEntryMap[_key];
   bool immutable = entry.bImmutable;
   if (immutable && !_key.bDefault)
@@ -237,7 +237,7 @@ void KConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGro
 
 KEntry KConfig::lookupData(const KEntryKey &_key) const
 {
-  KEntryMapConstIterator aIt = aEntryMap.tqfind(_key);
+  KEntryMapConstIterator aIt = aEntryMap.find(_key);
   if (aIt != aEntryMap.end())
   {
     const KEntry &entry = *aIt;
@@ -255,7 +255,7 @@ bool KConfig::internalHasGroup(const TQCString &group) const
 {
   KEntryKey groupKey( group, 0);
 
-  KEntryMapConstIterator aIt = aEntryMap.tqfind(groupKey);
+  KEntryMapConstIterator aIt = aEntryMap.find(groupKey);
   KEntryMapConstIterator aEnd = aEntryMap.end();
 
   if (aIt == aEnd)
@@ -290,7 +290,7 @@ void KConfig::checkUpdate(const TQString &id, const TQString &updateFile)
   setGroup("$Version");
   TQString cfg_id = updateFile+":"+id;
   TQStringList ids = readListEntry("update_info");
-  if (!ids.tqcontains(cfg_id))
+  if (!ids.contains(cfg_id))
   {
      TQStringList args;
      args << "--check" << updateFile;
diff --git a/kdecore/kconfig.h b/kdecore/kconfig.h
index 9ace7ebb9..19ff09314 100644
--- a/kdecore/kconfig.h
+++ b/kdecore/kconfig.h
@@ -136,7 +136,7 @@ public:
   bool forceGlobal() const { return bForceGlobal; }
 
   /**
-   * Checks whether the config file tqcontains the update @p id
+   * Checks whether the config file contains the update @p id
    * as contained in @p updateFile. If not, it runs kconf_update
    * to update the config file.
    *
@@ -215,9 +215,9 @@ protected:
    * Inserts a (key, value) pair into the internal storage mechanism of
    * the configuration object.
    *
-   * @param _key The key to insert.  It tqcontains information both on
+   * @param _key The key to insert.  It contains information both on
    *        the group of the key and the key itself. If the key already
-   *        exists, the old value will be tqreplaced.
+   *        exists, the old value will be replaced.
    * @param _data the KEntry that is to be stored.
    * @param _checkGroup When false, assume that the group already exists.
    */
@@ -226,7 +226,7 @@ protected:
   /**
    * Looks up an entry in the config object's internal structure.
    *
-   * @param _key The key to look up  It tqcontains information both on
+   * @param _key The key to look up  It contains information both on
    *        the group of the key and the entry's key itself.
    * @return the KEntry value (data) found for the key.  KEntry.aValue
    * will be the null string if nothing was located.
diff --git a/kdecore/kconfig_compiler/README.dox b/kdecore/kconfig_compiler/README.dox
index e6eea660d..36d9f988b 100644
--- a/kdecore/kconfig_compiler/README.dox
+++ b/kdecore/kconfig_compiler/README.dox
@@ -11,7 +11,7 @@ configuration data.
 
 The structure of the .kcfg file is described by its DTD kcfg.dtd.
 
-The \<kcfgfile\> tag tqcontains the name of the configuration file described.
+The \<kcfgfile\> tag contains the name of the configuration file described.
 Omitting the name will make the generated class use the default configuration
 file ("<appname>rc").
 
@@ -181,9 +181,9 @@ is always 0.
 A parameterized entry is expanded to a number of entries, one for each
 value in the parameter range. The name and key should contain a reference
 to the parameter in the form of $(parameter-name). When expanding the entries
-the $(parameter-name) part is tqreplaced with the value of the parameter.
-In the case of an Enum parameter it is tqreplaced with the name of the
-enumuration value. In the case of an int parameter it is tqreplaced with
+the $(parameter-name) part is replaced with the value of the parameter.
+In the case of an Enum parameter it is replaced with the name of the
+enumuration value. In the case of an int parameter it is replaced with
 the numeric value of the parameter.
 
 Parameterized entries all share the same default value unless different
diff --git a/kdecore/kconfig_compiler/example/example.kcfg b/kdecore/kconfig_compiler/example/example.kcfg
index c6716ea06..076bfb644 100644
--- a/kdecore/kconfig_compiler/example/example.kcfg
+++ b/kdecore/kconfig_compiler/example/example.kcfg
@@ -35,7 +35,7 @@
     </entry>
     <entry name="MyPath" type="Path">
       <label>This is a path</label>
-      <default code="true">QDir::homeDirPath()+QString::tqfromLatin1(".hidden_file")</default>
+      <default code="true">QDir::homeDirPath()+QString::fromLatin1(".hidden_file")</default>
     </entry>
     <entry name="MyPaths" type="PathList">
       <label>This is a list of paths</label>
diff --git a/kdecore/kconfig_compiler/example/general_base.ui b/kdecore/kconfig_compiler/example/general_base.ui
index 624d50331..9b41370c7 100644
--- a/kdecore/kconfig_compiler/example/general_base.ui
+++ b/kdecore/kconfig_compiler/example/general_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>GeneralBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -42,5 +42,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdecore/kconfig_compiler/example/myoptions_base.ui b/kdecore/kconfig_compiler/example/myoptions_base.ui
index ff6a80866..3c0c2e6cb 100644
--- a/kdecore/kconfig_compiler/example/myoptions_base.ui
+++ b/kdecore/kconfig_compiler/example/myoptions_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>MyOptionsBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -31,5 +31,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdecore/kconfig_compiler/kconfig_compiler.cpp b/kdecore/kconfig_compiler/kconfig_compiler.cpp
index d82810e48..f11394495 100644
--- a/kdecore/kconfig_compiler/kconfig_compiler.cpp
+++ b/kdecore/kconfig_compiler/kconfig_compiler.cpp
@@ -251,10 +251,10 @@ static void addQuotes( TQString &s )
 static TQString quoteString( const TQString &s )
 {
   TQString r = s;
-  r.tqreplace( "\\", "\\\\" );
-  r.tqreplace( "\"", "\\\"" );
-  r.tqreplace( "\r", "" );
-  r.tqreplace( "\n", "\\n\"\n\"" );
+  r.replace( "\\", "\\\\" );
+  r.replace( "\"", "\\\"" );
+  r.replace( "\r", "" );
+  r.replace( "\n", "\\n\"\n\"" );
   return "\"" + r + "\"";
 }
 
@@ -262,10 +262,10 @@ static TQString literalString( const TQString &s )
 {
   bool isAscii = true;
   for(int i = s.length(); i--;)
-     if (s[i].tqunicode() > 127) isAscii = false;
+     if (s[i].unicode() > 127) isAscii = false;
 
   if (isAscii)
-     return "TQString::tqfromLatin1( " + quoteString(s) + " )";
+     return "TQString::fromLatin1( " + quoteString(s) + " )";
   else
      return "TQString::fromUtf8( " + quoteString(s) + " )";
 }
@@ -284,7 +284,7 @@ static TQString dumpNode(const TQDomNode &node)
 
 static TQString filenameOnly(TQString path)
 {
-   int i = path.tqfindRev('/');
+   int i = path.findRev('/');
    if (i >= 0)
       return path.mid(i+1);
    return path;
@@ -480,13 +480,13 @@ CfgEntry *parseEntry( const TQString &group, const TQDomElement &element )
 
   if ( nameIsEmpty ) {
     name = key;
-    name.tqreplace( " ", TQString::null );
-  } else if ( name.tqcontains( ' ' ) ) {
-    kdWarning()<<"Entry '"<<name<<"' tqcontains spaces! <name> elements can't contain speces!"<<endl;
+    name.replace( " ", TQString::null );
+  } else if ( name.contains( ' ' ) ) {
+    kdWarning()<<"Entry '"<<name<<"' contains spaces! <name> elements can't contain speces!"<<endl;
     name.remove( ' ' );
   }
 
-  if (name.tqcontains("$("))
+  if (name.contains("$("))
   {
     if (param.isEmpty())
     {
@@ -513,7 +513,7 @@ CfgEntry *parseEntry( const TQString &group, const TQDomElement &element )
   {
     // Adjust name
     paramName = name;
-    name.tqreplace("$("+param+")", TQString::null);
+    name.replace("$("+param+")", TQString::null);
     // Lookup defaults for indexed entries
     for(int i = 0; i <= paramMax; i++)
     {
@@ -534,7 +534,7 @@ CfgEntry *parseEntry( const TQString &group, const TQDomElement &element )
         int i = index.toInt(&ok);
         if (!ok)
         {
-          i = paramValues.tqfindIndex(index);
+          i = paramValues.findIndex(index);
           if (i == -1)
           {
             kdError() << "Index '" << index << "' for default value is unknown." << endl;
@@ -568,7 +568,7 @@ CfgEntry *parseEntry( const TQString &group, const TQDomElement &element )
     return 0;
   }
 
-  if (allNames.tqcontains(name))
+  if (allNames.contains(name))
   {
     if (nameIsEmpty)
       kdError() << "The key '" << key << "' can not be used as name for the entry because "
@@ -619,8 +619,8 @@ TQString param( const TQString &type )
     else if ( type == "Bool" )        return "bool";
     else if ( type == "Double" )      return "double";
     else if ( type == "DateTime" )    return "const TQDateTime &";
-    else if ( type == "Int64" )       return "TQ_INT64";
-    else if ( type == "UInt64" )      return "TQ_UINT64";
+    else if ( type == "Int64" )       return "Q_INT64";
+    else if ( type == "UInt64" )      return "Q_UINT64";
     else if ( type == "IntList" )     return "const TQValueList<int> &";
     else if ( type == "Enum" )        return "int";
     else if ( type == "Path" )        return "const TQString &";
@@ -649,8 +649,8 @@ TQString cppType( const TQString &type )
     else if ( type == "Bool" )        return "bool";
     else if ( type == "Double" )      return "double";
     else if ( type == "DateTime" )    return "TQDateTime";
-    else if ( type == "Int64" )       return "TQ_INT64";
-    else if ( type == "UInt64" )      return "TQ_UINT64";
+    else if ( type == "Int64" )       return "Q_INT64";
+    else if ( type == "UInt64" )      return "Q_UINT64";
     else if ( type == "IntList" )     return "TQValueList<int>";
     else if ( type == "Enum" )        return "int";
     else if ( type == "Path" )        return "TQString";
@@ -694,7 +694,7 @@ TQString itemType( const TQString &type )
   TQString t;
 
   t = type;
-  t.tqreplace( 0, 1, t.left( 1 ).upper() );
+  t.replace( 0, 1, t.left( 1 ).upper() );
 
   return t;
 }
@@ -771,7 +771,7 @@ TQString paramString(const TQString &s, const CfgEntry *e, int i)
 {
   TQString result = s;
   TQString needle = "$("+e->param()+")";
-  if (result.tqcontains(needle))
+  if (result.contains(needle))
   {
     TQString tmp;
     if (e->paramType() == "Enum")
@@ -783,7 +783,7 @@ TQString paramString(const TQString &s, const CfgEntry *e, int i)
       tmp = TQString::number(i);
     }
 
-    result.tqreplace(needle, tmp);
+    result.replace(needle, tmp);
   }
   return result;
 }
@@ -796,18 +796,18 @@ TQString paramString(const TQString &group, const TQValueList<Param> &parameters
   for (TQValueList<Param>::ConstIterator it = parameters.begin();
        it != parameters.end(); ++it)
   {
-     if (paramString.tqcontains("$("+(*it).name+")"))
+     if (paramString.contains("$("+(*it).name+")"))
      {
        TQString tmp;
        tmp.sprintf("%%%d", i++);
-       paramString.tqreplace("$("+(*it).name+")", tmp);
+       paramString.replace("$("+(*it).name+")", tmp);
        arguments += ".arg( mParam"+(*it).name+" )";
      }
   }
   if (arguments.isEmpty())
-    return "TQString::tqfromLatin1( \""+group+"\" )";
+    return "TQString::fromLatin1( \""+group+"\" )";
 
-  return "TQString::tqfromLatin1( \""+paramString+"\" )"+arguments;
+  return "TQString::fromLatin1( \""+paramString+"\" )"+arguments;
 }
 
 /* int i is the value of the parameter */
@@ -818,7 +818,7 @@ TQString userTextsFunctions( CfgEntry *e, TQString itemVarStr=TQString::null, TQ
   if ( !e->label().isEmpty() ) {
     txt += "  " + itemVarStr + "->setLabel( i18n(";
     if ( !e->param().isEmpty() )
-      txt += quoteString(e->label().tqreplace("$("+e->param()+")", i));
+      txt += quoteString(e->label().replace("$("+e->param()+")", i));
     else
       txt+= quoteString(e->label());
     txt+= ") );\n";
@@ -826,7 +826,7 @@ TQString userTextsFunctions( CfgEntry *e, TQString itemVarStr=TQString::null, TQ
   if ( !e->whatsThis().isEmpty() ) {
     txt += "  " + itemVarStr + "->setWhatsThis( i18n(";
     if ( !e->param().isEmpty() )
-      txt += quoteString(e->whatsThis().tqreplace("$("+e->param()+")", i));
+      txt += quoteString(e->whatsThis().replace("$("+e->param()+")", i));
     else
       txt+= quoteString(e->whatsThis());
     txt+=") );\n";
@@ -883,12 +883,12 @@ TQString memberMutatorBody( CfgEntry *e )
     out << "}" << endl << endl;
   }
 
-  out << "if (!" << This << "isImmutable( TQString::tqfromLatin1( \"";
+  out << "if (!" << This << "isImmutable( TQString::fromLatin1( \"";
   if (!e->param().isEmpty())
   {
-    out << e->paramName().tqreplace("$("+e->param()+")", "%1") << "\" ).arg( ";
+    out << e->paramName().replace("$("+e->param()+")", "%1") << "\" ).arg( ";
     if ( e->paramType() == "Enum" ) {
-      out << "TQString::tqfromLatin1( ";
+      out << "TQString::fromLatin1( ";
 
       if (globalEnums)
         out << enumName(e->param()) << "ToString[i]";
@@ -1249,7 +1249,7 @@ int main( int argc, char **argv )
     TQString t = e->type();
 
     // Manipulator
-    if (allMutators || mutators.tqcontains(n))
+    if (allMutators || mutators.contains(n))
     {
       h << "    /**" << endl;
       h << "      Set " << e->label() << endl;
@@ -1518,7 +1518,7 @@ int main( int argc, char **argv )
   cpp << " )" << endl;
 
   cpp << "  : " << inherits << "(";
-  if ( !cfgFileName.isEmpty() ) cpp << " TQString::tqfromLatin1( \"" << cfgFileName << "\" ";
+  if ( !cfgFileName.isEmpty() ) cpp << " TQString::fromLatin1( \"" << cfgFileName << "\" ";
   if ( cfgFileNameArg ) cpp << " config ";
   if ( !cfgFileName.isEmpty() ) cpp << ") ";
   cpp << ")" << endl;
@@ -1560,7 +1560,7 @@ int main( int argc, char **argv )
       for( it = choices.begin(); it != choices.end(); ++it ) {
         cpp << "  {" << endl;
         cpp << "    KConfigSkeleton::ItemEnum::Choice choice;" << endl;
-        cpp << "    choice.name = TQString::tqfromLatin1( \"" << (*it).name << "\" );" << endl;
+        cpp << "    choice.name = TQString::fromLatin1( \"" << (*it).name << "\" );" << endl;
         if ( setUserTexts ) {
           if ( !(*it).label.isEmpty() )
             cpp << "    choice.label = i18n(" << quoteString((*it).label) << ");" << endl;
@@ -1592,7 +1592,7 @@ int main( int argc, char **argv )
       cpp << "  addItem( " << itemPath(e);
       TQString quotedName = e->name();
       addQuotes( quotedName );
-      if ( quotedName != key ) cpp << ", TQString::tqfromLatin1( \"" << e->name() << "\" )";
+      if ( quotedName != key ) cpp << ", TQString::fromLatin1( \"" << e->name() << "\" )";
       cpp << " );" << endl;
     }
     else
@@ -1617,15 +1617,15 @@ int main( int argc, char **argv )
         if ( setUserTexts )
           cpp << userTextsFunctions( e, itemVarStr, e->paramName() );
 
-        // Make mutators for enum parameters work by adding them with $(..) tqreplaced by the
+        // Make mutators for enum parameters work by adding them with $(..) replaced by the
         // param name. The check for isImmutable in the set* functions doesn't have the param
         // name available, just the corresponding enum value (int), so we need to store the
         // param names in a separate static list!.
-        cpp << "  addItem( " << itemVarStr << ", TQString::tqfromLatin1( \"";
+        cpp << "  addItem( " << itemVarStr << ", TQString::fromLatin1( \"";
         if ( e->paramType()=="Enum" )
-          cpp << e->paramName().tqreplace( "$("+e->param()+")", "%1").arg(e->paramValues()[i] );
+          cpp << e->paramName().replace( "$("+e->param()+")", "%1").arg(e->paramValues()[i] );
         else
-          cpp << e->paramName().tqreplace( "$("+e->param()+")", "%1").arg(i);
+          cpp << e->paramName().replace( "$("+e->param()+")", "%1").arg(i);
         cpp << "\" ) );" << endl;
       }
     }
@@ -1642,7 +1642,7 @@ int main( int argc, char **argv )
       TQString t = e->type();
   
       // Manipulator
-      if (allMutators || mutators.tqcontains(n))
+      if (allMutators || mutators.contains(n))
       {
         cpp << "void " << setFunction(n, className) << "( ";
         if (!e->param().isEmpty())
diff --git a/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp b/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
index 3dd197b34..2f8e7eee3 100644
--- a/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
+++ b/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
@@ -61,7 +61,7 @@ void KConfigCompiler_Test::testExpectedOutput()
 	// Known to pass test cases
 	while (testCases[ i ])
 	{
-		performCompare(TQString::tqfromLatin1(testCases[ i ]));
+		performCompare(TQString::fromLatin1(testCases[ i ]));
 		++i;
 	}
 
@@ -69,7 +69,7 @@ void KConfigCompiler_Test::testExpectedOutput()
 	i= 0;
 	while (willFailCases[ i ])
 	{
-		performCompare(TQString::tqfromLatin1(willFailCases[ i ]), true);
+		performCompare(TQString::fromLatin1(willFailCases[ i ]), true);
 		++i;
 	}
 }
@@ -77,7 +77,7 @@ void KConfigCompiler_Test::testExpectedOutput()
 void KConfigCompiler_Test::performCompare(const TQString &fileName, bool fail)
 {
 	TQFile file(fileName);
-	TQFile fileRef(TQString::tqfromLatin1(SRCDIR) + TQString::tqfromLatin1("/") + fileName + TQString::tqfromLatin1(".ref"));
+	TQFile fileRef(TQString::fromLatin1(SRCDIR) + TQString::fromLatin1("/") + fileName + TQString::fromLatin1(".ref"));
 	
 	if ( file.open(IO_ReadOnly) && fileRef.open(IO_ReadOnly) )
 	{
diff --git a/kdecore/kconfig_compiler/tests/test1.cpp.ref b/kdecore/kconfig_compiler/tests/test1.cpp.ref
index f8c4c1189..b3050921e 100644
--- a/kdecore/kconfig_compiler/tests/test1.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test1.cpp.ref
@@ -4,66 +4,66 @@
 #include "test1.h"
 
 Test1::Test1(  const TQString & transport, const TQString & folder )
-  : KConfigSkeleton( TQString::tqfromLatin1( "examplerc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
   , mParamtransport(transport)
   , mParamfolder(folder)
 {
-  setCurrentGroup( TQString::tqfromLatin1( "General-%1" ).arg( mParamfolder ) );
+  setCurrentGroup( TQString::fromLatin1( "General-%1" ).arg( mParamfolder ) );
 
   KConfigSkeleton::ItemBool  *itemOneOption;
-  itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "OneOption" ), mOneOption, true );
-  addItem( itemOneOption, TQString::tqfromLatin1( "OneOption" ) );
+  itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneOption" ), mOneOption, true );
+  addItem( itemOneOption, TQString::fromLatin1( "OneOption" ) );
   KConfigSkeleton::ItemInt  *itemAnotherOption;
-  itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Another Option" ), mAnotherOption, 5 );
-  addItem( itemAnotherOption, TQString::tqfromLatin1( "AnotherOption" ) );
+  itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption, 5 );
+  addItem( itemAnotherOption, TQString::fromLatin1( "AnotherOption" ) );
   TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesListOption;
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "One" );
+    choice.name = TQString::fromLatin1( "One" );
     valuesListOption.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "Two" );
+    choice.name = TQString::fromLatin1( "Two" );
     valuesListOption.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "Three" );
+    choice.name = TQString::fromLatin1( "Three" );
     valuesListOption.append( choice );
   }
   KConfigSkeleton::ItemEnum  *itemListOption;
-  itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One );
-  addItem( itemListOption, TQString::tqfromLatin1( "ListOption" ) );
+  itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One );
+  addItem( itemListOption, TQString::fromLatin1( "ListOption" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "MyOptions" ) );
+  setCurrentGroup( TQString::fromLatin1( "MyOptions" ) );
 
   KConfigSkeleton::ItemString  *itemMyString;
-  itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "MyString" ), mMyString, TQString::tqfromLatin1( "Default String" ) );
-  addItem( itemMyString, TQString::tqfromLatin1( "MyString" ) );
+  itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MyString" ), mMyString, TQString::fromLatin1( "Default String" ) );
+  addItem( itemMyString, TQString::fromLatin1( "MyString" ) );
   KConfigSkeleton::ItemPath  *itemMyPath;
-  itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::tqfromLatin1(".hidden_file") );
-  addItem( itemMyPath, TQString::tqfromLatin1( "MyPath" ) );
+  itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::fromLatin1(".hidden_file") );
+  addItem( itemMyPath, TQString::fromLatin1( "MyPath" ) );
   KConfigSkeleton::ItemInt  *itemAnotherOption2;
-  itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Another Option" ), mAnotherOption2, 10 );
-  addItem( itemAnotherOption2, TQString::tqfromLatin1( "AnotherOption2" ) );
+  itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption2, 10 );
+  addItem( itemAnotherOption2, TQString::fromLatin1( "AnotherOption2" ) );
   TQStringList defaultMyStringList;
   defaultMyStringList.append( TQString::fromUtf8( "up" ) );
   defaultMyStringList.append( TQString::fromUtf8( "down" ) );
 
   KConfigSkeleton::ItemStringList  *itemMyStringList;
-  itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
-  addItem( itemMyStringList, TQString::tqfromLatin1( "MyStringList" ) );
+  itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
+  addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) );
   TQStringList defaultMyStringListHidden;
   defaultMyStringListHidden.append( TQString::fromUtf8( "up" ) );
   defaultMyStringListHidden.append( TQString::fromUtf8( "down" ) );
 
   KConfigSkeleton::ItemStringList  *itemMyStringListHidden;
-  itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden );
-  addItem( itemMyStringListHidden, TQString::tqfromLatin1( "MyStringListHidden" ) );
+  itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden );
+  addItem( itemMyStringListHidden, TQString::fromLatin1( "MyStringListHidden" ) );
   KConfigSkeleton::ItemInt  *itemMyNumber;
-  itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 );
-  addItem( itemMyNumber, TQString::tqfromLatin1( "MyNumber" ) );
+  itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 );
+  addItem( itemMyNumber, TQString::fromLatin1( "MyNumber" ) );
 }
 
 Test1::~Test1()
diff --git a/kdecore/kconfig_compiler/tests/test1.h.ref b/kdecore/kconfig_compiler/tests/test1.h.ref
index b5a66b5cd..cc2d99c69 100644
--- a/kdecore/kconfig_compiler/tests/test1.h.ref
+++ b/kdecore/kconfig_compiler/tests/test1.h.ref
@@ -24,7 +24,7 @@ class Test1 : public KConfigSkeleton
     */
     void setOneOption( bool v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "OneOption" ) ))
+      if (!isImmutable( TQString::fromLatin1( "OneOption" ) ))
         mOneOption = v;
     }
 
@@ -41,7 +41,7 @@ class Test1 : public KConfigSkeleton
     */
     void setAnotherOption( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "AnotherOption" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AnotherOption" ) ))
         mAnotherOption = v;
     }
 
@@ -58,7 +58,7 @@ class Test1 : public KConfigSkeleton
     */
     void setListOption( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "ListOption" ) ))
+      if (!isImmutable( TQString::fromLatin1( "ListOption" ) ))
         mListOption = v;
     }
 
@@ -75,7 +75,7 @@ class Test1 : public KConfigSkeleton
     */
     void setMyString( const TQString & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyString" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyString" ) ))
         mMyString = v;
     }
 
@@ -92,7 +92,7 @@ class Test1 : public KConfigSkeleton
     */
     void setMyPath( const TQString & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyPath" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyPath" ) ))
         mMyPath = v;
     }
 
@@ -109,7 +109,7 @@ class Test1 : public KConfigSkeleton
     */
     void setAnotherOption2( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "AnotherOption2" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AnotherOption2" ) ))
         mAnotherOption2 = v;
     }
 
@@ -126,7 +126,7 @@ class Test1 : public KConfigSkeleton
     */
     void setMyStringList( const TQStringList & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyStringList" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyStringList" ) ))
         mMyStringList = v;
     }
 
@@ -143,7 +143,7 @@ class Test1 : public KConfigSkeleton
     */
     void setMyStringListHidden( const TQStringList & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyStringListHidden" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyStringListHidden" ) ))
         mMyStringListHidden = v;
     }
 
@@ -160,7 +160,7 @@ class Test1 : public KConfigSkeleton
     */
     void setMyNumber( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyNumber" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyNumber" ) ))
         mMyNumber = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test1.kcfg b/kdecore/kconfig_compiler/tests/test1.kcfg
index 14c395a54..ce42aebfb 100644
--- a/kdecore/kconfig_compiler/tests/test1.kcfg
+++ b/kdecore/kconfig_compiler/tests/test1.kcfg
@@ -35,7 +35,7 @@
     </entry>
     <entry name="MyPath" type="Path">
       <label>This is a path</label>
-      <default code="true">QDir::homeDirPath()+QString::tqfromLatin1(".hidden_file")</default>
+      <default code="true">QDir::homeDirPath()+QString::fromLatin1(".hidden_file")</default>
     </entry>
     <entry name="AnotherOption2" type="Int" key="Another Option">
       <label>Another option</label>
diff --git a/kdecore/kconfig_compiler/tests/test2.cpp.ref b/kdecore/kconfig_compiler/tests/test2.cpp.ref
index af8db588d..2d56f7545 100644
--- a/kdecore/kconfig_compiler/tests/test2.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test2.cpp.ref
@@ -6,90 +6,90 @@
 #include <klocale.h>
 
 Test2::Test2(  )
-  : MyPrefs( TQString::tqfromLatin1( "korganizerrc" ) )
+  : MyPrefs( TQString::fromLatin1( "korganizerrc" ) )
 {
-  setCurrentGroup( TQString::tqfromLatin1( "General" ) );
+  setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), mAutoSave, false );
+  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
   mAutoSaveItem->setLabel( i18n("Enable automatic saving of calendar") );
   mAutoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") );
-  addItem( mAutoSaveItem, TQString::tqfromLatin1( "AutoSave" ) );
-  mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 );
+  addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) );
+  mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 );
   mAutoSaveIntervalItem->setLabel( i18n("Auto Save Interval") );
-  addItem( mAutoSaveIntervalItem, TQString::tqfromLatin1( "AutoSaveInterval" ) );
-  mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Confirm Deletes" ), mConfirm, true );
+  addItem( mAutoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) );
+  mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), mConfirm, true );
   mConfirmItem->setLabel( i18n("Confirm deletes") );
-  addItem( mConfirmItem, TQString::tqfromLatin1( "Confirm" ) );
-  mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "Archive File" ), mArchiveFile );
+  addItem( mConfirmItem, TQString::fromLatin1( "Confirm" ) );
+  mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), mArchiveFile );
   mArchiveFileItem->setLabel( i18n("Archive File") );
-  addItem( mArchiveFileItem, TQString::tqfromLatin1( "ArchiveFile" ) );
+  addItem( mArchiveFileItem, TQString::fromLatin1( "ArchiveFile" ) );
   TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "standardDestination" );
+    choice.name = TQString::fromLatin1( "standardDestination" );
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "askDestination" );
+    choice.name = TQString::fromLatin1( "askDestination" );
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "argl1" );
+    choice.name = TQString::fromLatin1( "argl1" );
     choice.label = i18n("Argl1 Label");
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "argl2" );
+    choice.name = TQString::fromLatin1( "argl2" );
     choice.whatsThis = i18n("Argl2 Whatsthis");
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "argl3" );
+    choice.name = TQString::fromLatin1( "argl3" );
     choice.label = i18n("Argl3 Label");
     choice.whatsThis = i18n("Argl3 Whatsthis");
     valuesDestination.append( choice );
   }
-  mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination );
+  mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination );
   mDestinationItem->setLabel( i18n("New Events/Todos Should") );
-  addItem( mDestinationItem, TQString::tqfromLatin1( "Destination" ) );
+  addItem( mDestinationItem, TQString::fromLatin1( "Destination" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Views" ) );
+  setCurrentGroup( TQString::fromLatin1( "Views" ) );
 
-  mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Hour Size" ), mHourSize, 10 );
+  mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), mHourSize, 10 );
   mHourSizeItem->setLabel( i18n("Hour Size") );
-  addItem( mHourSizeItem, TQString::tqfromLatin1( "HourSize" ) );
-  mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false );
+  addItem( mHourSizeItem, TQString::fromLatin1( "HourSize" ) );
+  mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false );
   mSelectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") );
-  addItem( mSelectionStartsEditorItem, TQString::tqfromLatin1( "SelectionStartsEditor" ) );
+  addItem( mSelectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "KOrganizer Plugins" ) );
+  setCurrentGroup( TQString::fromLatin1( "KOrganizer Plugins" ) );
 
   TQStringList defaultSelectedPlugins;
   defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) );
   defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) );
 
-  mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins );
+  mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins );
   mSelectedPluginsItem->setLabel( i18n("SelectedPlugins") );
-  addItem( mSelectedPluginsItem, TQString::tqfromLatin1( "SelectedPlugins" ) );
+  addItem( mSelectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Colors" ) );
+  setCurrentGroup( TQString::fromLatin1( "Colors" ) );
 
-  mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) );
+  mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) );
   mHighlightColorItem->setLabel( i18n("Highlight color") );
-  addItem( mHighlightColorItem, TQString::tqfromLatin1( "HighlightColor" ) );
-  mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) );
+  addItem( mHighlightColorItem, TQString::fromLatin1( "HighlightColor" ) );
+  mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) );
   mAgendaBgColorItem->setLabel( i18n("Agenda view background color") );
-  addItem( mAgendaBgColorItem, TQString::tqfromLatin1( "AgendaBgColor" ) );
+  addItem( mAgendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Fonts" ) );
+  setCurrentGroup( TQString::fromLatin1( "Fonts" ) );
 
-  mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TimeBar Font" ), mTimeBarFont );
+  mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), mTimeBarFont );
   mTimeBarFontItem->setLabel( i18n("Time bar") );
-  addItem( mTimeBarFontItem, TQString::tqfromLatin1( "TimeBarFont" ) );
+  addItem( mTimeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) );
 }
 
 Test2::~Test2()
diff --git a/kdecore/kconfig_compiler/tests/test2.h.ref b/kdecore/kconfig_compiler/tests/test2.h.ref
index 075f48bde..6c0a74d66 100644
--- a/kdecore/kconfig_compiler/tests/test2.h.ref
+++ b/kdecore/kconfig_compiler/tests/test2.h.ref
@@ -21,7 +21,7 @@ class Test2 : public MyPrefs
     */
     void setAutoSave( bool v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "AutoSave" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AutoSave" ) ))
         mAutoSave = v;
     }
 
@@ -46,7 +46,7 @@ class Test2 : public MyPrefs
     */
     void setAutoSaveInterval( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "AutoSaveInterval" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AutoSaveInterval" ) ))
         mAutoSaveInterval = v;
     }
 
@@ -71,7 +71,7 @@ class Test2 : public MyPrefs
     */
     void setConfirm( bool v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "Confirm" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Confirm" ) ))
         mConfirm = v;
     }
 
@@ -96,7 +96,7 @@ class Test2 : public MyPrefs
     */
     void setArchiveFile( const TQString & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "ArchiveFile" ) ))
+      if (!isImmutable( TQString::fromLatin1( "ArchiveFile" ) ))
         mArchiveFile = v;
     }
 
@@ -121,7 +121,7 @@ class Test2 : public MyPrefs
     */
     void setDestination( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "Destination" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Destination" ) ))
         mDestination = v;
     }
 
@@ -146,7 +146,7 @@ class Test2 : public MyPrefs
     */
     void setHourSize( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "HourSize" ) ))
+      if (!isImmutable( TQString::fromLatin1( "HourSize" ) ))
         mHourSize = v;
     }
 
@@ -171,7 +171,7 @@ class Test2 : public MyPrefs
     */
     void setSelectionStartsEditor( bool v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "SelectionStartsEditor" ) ))
+      if (!isImmutable( TQString::fromLatin1( "SelectionStartsEditor" ) ))
         mSelectionStartsEditor = v;
     }
 
@@ -196,7 +196,7 @@ class Test2 : public MyPrefs
     */
     void setSelectedPlugins( const TQStringList & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "SelectedPlugins" ) ))
+      if (!isImmutable( TQString::fromLatin1( "SelectedPlugins" ) ))
         mSelectedPlugins = v;
     }
 
@@ -221,7 +221,7 @@ class Test2 : public MyPrefs
     */
     void setHighlightColor( const TQColor & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "HighlightColor" ) ))
+      if (!isImmutable( TQString::fromLatin1( "HighlightColor" ) ))
         mHighlightColor = v;
     }
 
@@ -246,7 +246,7 @@ class Test2 : public MyPrefs
     */
     void setAgendaBgColor( const TQColor & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "AgendaBgColor" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AgendaBgColor" ) ))
         mAgendaBgColor = v;
     }
 
@@ -271,7 +271,7 @@ class Test2 : public MyPrefs
     */
     void setTimeBarFont( const TQFont & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "TimeBarFont" ) ))
+      if (!isImmutable( TQString::fromLatin1( "TimeBarFont" ) ))
         mTimeBarFont = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test3.cpp.ref b/kdecore/kconfig_compiler/tests/test3.cpp.ref
index a47fd5213..11fe6b38f 100644
--- a/kdecore/kconfig_compiler/tests/test3.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test3.cpp.ref
@@ -6,21 +6,21 @@
 using namespace TestNameSpace;
 
 Test3::Test3(  )
-  : KConfigSkeleton( TQString::tqfromLatin1( "test3rc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "test3rc" ) )
 {
-  setCurrentGroup( TQString::tqfromLatin1( "General" ) );
+  setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), mAutoSave, false );
-  addItem( mAutoSaveItem, TQString::tqfromLatin1( "AutoSave" ) );
+  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
+  addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Blah" ) );
+  setCurrentGroup( TQString::fromLatin1( "Blah" ) );
 
-  mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Blubb" ), mBlubb, 10 );
-  addItem( mBlubbItem, TQString::tqfromLatin1( "Blubb" ) );
-  mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "BlahBlah" ), mBlahBlah, TQString::tqfromLatin1( "a string" ) );
-  addItem( mBlahBlahItem, TQString::tqfromLatin1( "BlahBlah" ) );
-  mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), TQString::tqfromLatin1( "MyPassword" ), mMyPassword );
-  addItem( mMyPasswordItem, TQString::tqfromLatin1( "MyPassword" ) );
+  mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Blubb" ), mBlubb, 10 );
+  addItem( mBlubbItem, TQString::fromLatin1( "Blubb" ) );
+  mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BlahBlah" ), mBlahBlah, TQString::fromLatin1( "a string" ) );
+  addItem( mBlahBlahItem, TQString::fromLatin1( "BlahBlah" ) );
+  mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), TQString::fromLatin1( "MyPassword" ), mMyPassword );
+  addItem( mMyPasswordItem, TQString::fromLatin1( "MyPassword" ) );
 }
 
 Test3::~Test3()
diff --git a/kdecore/kconfig_compiler/tests/test3.h.ref b/kdecore/kconfig_compiler/tests/test3.h.ref
index 8e86d36b0..75b1b0929 100644
--- a/kdecore/kconfig_compiler/tests/test3.h.ref
+++ b/kdecore/kconfig_compiler/tests/test3.h.ref
@@ -20,7 +20,7 @@ class Test3 : public KConfigSkeleton
     */
     void setAutoSave( bool v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "AutoSave" ) ))
+      if (!isImmutable( TQString::fromLatin1( "AutoSave" ) ))
         mAutoSave = v;
     }
 
@@ -45,7 +45,7 @@ class Test3 : public KConfigSkeleton
     */
     void setBlubb( int v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "Blubb" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Blubb" ) ))
         mBlubb = v;
     }
 
@@ -70,7 +70,7 @@ class Test3 : public KConfigSkeleton
     */
     void setBlahBlah( const TQString & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "BlahBlah" ) ))
+      if (!isImmutable( TQString::fromLatin1( "BlahBlah" ) ))
         mBlahBlah = v;
     }
 
@@ -95,7 +95,7 @@ class Test3 : public KConfigSkeleton
     */
     void setMyPassword( const TQString & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyPassword" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyPassword" ) ))
         mMyPassword = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test4.cpp.ref b/kdecore/kconfig_compiler/tests/test4.cpp.ref
index 0eee21488..6918a8c8a 100644
--- a/kdecore/kconfig_compiler/tests/test4.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test4.cpp.ref
@@ -21,57 +21,57 @@ Test4 *Test4::self()
 const char* const Test4::EnumButton::enumToString[] = { "right", "mid", "left" };
 
 Test4::Test4(  )
-  : KConfigSkeleton( TQString::tqfromLatin1( "test4rc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
 {
   mSelf = this;
-  setCurrentGroup( TQString::tqfromLatin1( "Foo" ) );
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
 TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
   KConfigSkeleton::ItemColor  *itemColor[4];
-  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #0" ), mColor[0], defaultColor[0] );
-  addItem( itemColor[0], TQString::tqfromLatin1( "Color0" ) );
-  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #1" ), mColor[1], defaultColor[1] );
-  addItem( itemColor[1], TQString::tqfromLatin1( "Color1" ) );
-  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #2" ), mColor[2], defaultColor[2] );
-  addItem( itemColor[2], TQString::tqfromLatin1( "Color2" ) );
-  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #3" ), mColor[3], defaultColor[3] );
-  addItem( itemColor[3], TQString::tqfromLatin1( "Color3" ) );
+  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
+  addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
+  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
+  addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
+  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
+  addItem( itemColor[2], TQString::fromLatin1( "Color2" ) );
+  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
+  addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
   TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "Encrypt" );
+    choice.name = TQString::fromLatin1( "Encrypt" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "Decrypt" );
+    choice.name = TQString::fromLatin1( "Decrypt" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "CrashNBurn" );
+    choice.name = TQString::fromLatin1( "CrashNBurn" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "PumpNDump" );
+    choice.name = TQString::fromLatin1( "PumpNDump" );
     valuesMouseAction.append( choice );
   }
   KConfigSkeleton::ItemEnum  *itemMouseAction[3];
-  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt );
-  addItem( itemMouseAction[0], TQString::tqfromLatin1( "MouseActionright" ) );
-  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt );
-  addItem( itemMouseAction[1], TQString::tqfromLatin1( "MouseActionmid" ) );
-  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump );
-  addItem( itemMouseAction[2], TQString::tqfromLatin1( "MouseActionleft" ) );
+  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt );
+  addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) );
+  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt );
+  addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
+  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump );
+  addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) );
   KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) );
+  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
   KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 );
+  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
-  addItem( itemAge, TQString::tqfromLatin1( "Age" ) );
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
 }
 
 Test4::~Test4()
diff --git a/kdecore/kconfig_compiler/tests/test4.h.ref b/kdecore/kconfig_compiler/tests/test4.h.ref
index dc8691b1f..d11dd3aee 100644
--- a/kdecore/kconfig_compiler/tests/test4.h.ref
+++ b/kdecore/kconfig_compiler/tests/test4.h.ref
@@ -30,7 +30,7 @@ class Test4 : public KConfigSkeleton
     static
     void setColor( int i, const TQColor & v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Color%1" ).arg( i ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Color%1" ).arg( i ) ))
         self()->mColor[i] = v;
     }
 
@@ -49,7 +49,7 @@ class Test4 : public KConfigSkeleton
     static
     void setMouseAction( int i, int v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "MouseAction%1" ).arg( TQString::tqfromLatin1( EnumButton::enumToString[i] ) ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "MouseAction%1" ).arg( TQString::fromLatin1( EnumButton::enumToString[i] ) ) ))
         self()->mMouseAction[i] = v;
     }
 
@@ -68,7 +68,7 @@ class Test4 : public KConfigSkeleton
     static
     void setFooBar( const TQString & v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "FooBar" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "FooBar" ) ))
         self()->mFooBar = v;
     }
 
@@ -99,7 +99,7 @@ class Test4 : public KConfigSkeleton
         v = 88;
       }
 
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Age" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Age" ) ))
         self()->mAge = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test5.cpp.ref b/kdecore/kconfig_compiler/tests/test5.cpp.ref
index 0fc90b387..8373eb3f6 100644
--- a/kdecore/kconfig_compiler/tests/test5.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test5.cpp.ref
@@ -21,57 +21,57 @@ Test5 *Test5::self()
 const char* const Test5::EnumButtonToString[] = { "right", "mid", "left" };
 
 Test5::Test5(  )
-  : KConfigSkeleton( TQString::tqfromLatin1( "test4rc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
 {
   mSelf = this;
-  setCurrentGroup( TQString::tqfromLatin1( "Foo" ) );
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
 TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
   KConfigSkeleton::ItemColor  *itemColor[4];
-  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #0" ), mColor[0], defaultColor[0] );
-  addItem( itemColor[0], TQString::tqfromLatin1( "Color0" ) );
-  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #1" ), mColor[1], defaultColor[1] );
-  addItem( itemColor[1], TQString::tqfromLatin1( "Color1" ) );
-  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #2" ), mColor[2], defaultColor[2] );
-  addItem( itemColor[2], TQString::tqfromLatin1( "Color2" ) );
-  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #3" ), mColor[3], defaultColor[3] );
-  addItem( itemColor[3], TQString::tqfromLatin1( "Color3" ) );
+  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
+  addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
+  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
+  addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
+  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
+  addItem( itemColor[2], TQString::fromLatin1( "Color2" ) );
+  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
+  addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
   TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "Encrypt" );
+    choice.name = TQString::fromLatin1( "Encrypt" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "Decrypt" );
+    choice.name = TQString::fromLatin1( "Decrypt" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "CrashNBurn" );
+    choice.name = TQString::fromLatin1( "CrashNBurn" );
     valuesMouseAction.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "PumpNDump" );
+    choice.name = TQString::fromLatin1( "PumpNDump" );
     valuesMouseAction.append( choice );
   }
   KConfigSkeleton::ItemEnum  *itemMouseAction[3];
-  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt );
-  addItem( itemMouseAction[0], TQString::tqfromLatin1( "MouseActionright" ) );
-  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt );
-  addItem( itemMouseAction[1], TQString::tqfromLatin1( "MouseActionmid" ) );
-  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump );
-  addItem( itemMouseAction[2], TQString::tqfromLatin1( "MouseActionleft" ) );
+  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt );
+  addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) );
+  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt );
+  addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
+  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump );
+  addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) );
   KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) );
+  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
   KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 );
+  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
-  addItem( itemAge, TQString::tqfromLatin1( "Age" ) );
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
 }
 
 Test5::~Test5()
diff --git a/kdecore/kconfig_compiler/tests/test5.h.ref b/kdecore/kconfig_compiler/tests/test5.h.ref
index 9fadbd0ec..efb9b448a 100644
--- a/kdecore/kconfig_compiler/tests/test5.h.ref
+++ b/kdecore/kconfig_compiler/tests/test5.h.ref
@@ -22,7 +22,7 @@ class Test5 : public KConfigSkeleton
     static
     void setColor( int i, const TQColor & v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Color%1" ).arg( i ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Color%1" ).arg( i ) ))
         self()->mColor[i] = v;
     }
 
@@ -41,7 +41,7 @@ class Test5 : public KConfigSkeleton
     static
     void setMouseAction( int i, int v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "MouseAction%1" ).arg( TQString::tqfromLatin1( EnumButtonToString[i] ) ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "MouseAction%1" ).arg( TQString::fromLatin1( EnumButtonToString[i] ) ) ))
         self()->mMouseAction[i] = v;
     }
 
@@ -60,7 +60,7 @@ class Test5 : public KConfigSkeleton
     static
     void setFooBar( const TQString & v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "FooBar" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "FooBar" ) ))
         self()->mFooBar = v;
     }
 
@@ -91,7 +91,7 @@ class Test5 : public KConfigSkeleton
         v = 88;
       }
 
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Age" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Age" ) ))
         self()->mAge = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test6.cpp.ref b/kdecore/kconfig_compiler/tests/test6.cpp.ref
index 2b8a71d50..51b96d4c4 100644
--- a/kdecore/kconfig_compiler/tests/test6.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test6.cpp.ref
@@ -4,25 +4,25 @@
 #include "test6.h"
 
 Test6::Test6(  const TQString & Number )
-  : KConfigSkeleton( TQString::tqfromLatin1( "test4rc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
   , mParamNumber(Number)
 {
-  setCurrentGroup( TQString::tqfromLatin1( "Foo" ) );
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
   KConfigSkeleton::ItemColor  *itemColor;
-  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
-  addItem( itemColor, TQString::tqfromLatin1( "Color" ) );
+  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
+  addItem( itemColor, TQString::fromLatin1( "Color" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Bar%1" ).arg( mParamNumber ) );
+  setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
 
   KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) );
+  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
   KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 );
+  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
-  addItem( itemAge, TQString::tqfromLatin1( "Age" ) );
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
 }
 
 Test6::~Test6()
diff --git a/kdecore/kconfig_compiler/tests/test6.h.ref b/kdecore/kconfig_compiler/tests/test6.h.ref
index 18615da38..6743d6064 100644
--- a/kdecore/kconfig_compiler/tests/test6.h.ref
+++ b/kdecore/kconfig_compiler/tests/test6.h.ref
@@ -18,7 +18,7 @@ class Test6 : public KConfigSkeleton
     */
     void setColor( const TQColor & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "Color" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Color" ) ))
         mColor = v;
     }
 
@@ -35,7 +35,7 @@ class Test6 : public KConfigSkeleton
     */
     void setFooBar( const TQString & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "FooBar" ) ))
+      if (!isImmutable( TQString::fromLatin1( "FooBar" ) ))
         mFooBar = v;
     }
 
@@ -64,7 +64,7 @@ class Test6 : public KConfigSkeleton
         v = 88;
       }
 
-      if (!isImmutable( TQString::tqfromLatin1( "Age" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Age" ) ))
         mAge = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test7.cpp.ref b/kdecore/kconfig_compiler/tests/test7.cpp.ref
index dab0ae27d..91a22e036 100644
--- a/kdecore/kconfig_compiler/tests/test7.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test7.cpp.ref
@@ -4,25 +4,25 @@
 #include "test7.h"
 
 Test7::Test7(  int Number )
-  : KConfigSkeleton( TQString::tqfromLatin1( "test7rc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "test7rc" ) )
   , mParamNumber(Number)
 {
-  setCurrentGroup( TQString::tqfromLatin1( "Foo" ) );
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
   KConfigSkeleton::ItemColor  *itemColor;
-  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
-  addItem( itemColor, TQString::tqfromLatin1( "Color" ) );
+  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
+  addItem( itemColor, TQString::fromLatin1( "Color" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Bar%1" ).arg( mParamNumber ) );
+  setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
 
   KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) );
+  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
   KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 );
+  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
-  addItem( itemAge, TQString::tqfromLatin1( "Age" ) );
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
 }
 
 Test7::~Test7()
diff --git a/kdecore/kconfig_compiler/tests/test7.h.ref b/kdecore/kconfig_compiler/tests/test7.h.ref
index f67bc30cb..8f8808da1 100644
--- a/kdecore/kconfig_compiler/tests/test7.h.ref
+++ b/kdecore/kconfig_compiler/tests/test7.h.ref
@@ -18,7 +18,7 @@ class Test7 : public KConfigSkeleton
     */
     void setColor( const TQColor & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "Color" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Color" ) ))
         mColor = v;
     }
 
@@ -35,7 +35,7 @@ class Test7 : public KConfigSkeleton
     */
     void setFooBar( const TQString & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "FooBar" ) ))
+      if (!isImmutable( TQString::fromLatin1( "FooBar" ) ))
         mFooBar = v;
     }
 
@@ -64,7 +64,7 @@ class Test7 : public KConfigSkeleton
         v = 88;
       }
 
-      if (!isImmutable( TQString::tqfromLatin1( "Age" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Age" ) ))
         mAge = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test8a.cpp.ref b/kdecore/kconfig_compiler/tests/test8a.cpp.ref
index 8d8925c57..f89b7c133 100644
--- a/kdecore/kconfig_compiler/tests/test8a.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test8a.cpp.ref
@@ -6,14 +6,14 @@
 Test8a::Test8a(  KSharedConfig::Ptr config  )
   : KConfigSkeleton( config )
 {
-  setCurrentGroup( TQString::tqfromLatin1( "Group" ) );
+  setCurrentGroup( TQString::fromLatin1( "Group" ) );
 
   KConfigSkeleton::ItemFont  *itemFont;
-  itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() );
-  addItem( itemFont, TQString::tqfromLatin1( "Font" ) );
+  itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() );
+  addItem( itemFont, TQString::fromLatin1( "Font" ) );
   KConfigSkeleton::ItemFont  *itemTitleFont;
-  itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() );
-  addItem( itemTitleFont, TQString::tqfromLatin1( "TitleFont" ) );
+  itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() );
+  addItem( itemTitleFont, TQString::fromLatin1( "TitleFont" ) );
 }
 
 Test8a::~Test8a()
diff --git a/kdecore/kconfig_compiler/tests/test8a.h.ref b/kdecore/kconfig_compiler/tests/test8a.h.ref
index a1ac4de64..2e947c437 100644
--- a/kdecore/kconfig_compiler/tests/test8a.h.ref
+++ b/kdecore/kconfig_compiler/tests/test8a.h.ref
@@ -19,7 +19,7 @@ class Test8a : public KConfigSkeleton
     */
     void setFont( const TQFont & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "Font" ) ))
+      if (!isImmutable( TQString::fromLatin1( "Font" ) ))
         mFont = v;
     }
 
@@ -36,7 +36,7 @@ class Test8a : public KConfigSkeleton
     */
     void setTitleFont( const TQFont & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "TitleFont" ) ))
+      if (!isImmutable( TQString::fromLatin1( "TitleFont" ) ))
         mTitleFont = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test8b.cpp.ref b/kdecore/kconfig_compiler/tests/test8b.cpp.ref
index 566902399..e29e3c4e7 100644
--- a/kdecore/kconfig_compiler/tests/test8b.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test8b.cpp.ref
@@ -22,20 +22,20 @@ Test8b::Test8b(  )
   : Test8a()
 {
   mSelf = this;
-  setCurrentGroup( TQString::tqfromLatin1( "Group8b1" ) );
+  setCurrentGroup( TQString::fromLatin1( "Group8b1" ) );
 
   KConfigSkeleton::ItemUInt  *itemSomething;
-  itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::tqfromLatin1( "Something" ), mSomething, 60 );
-  addItem( itemSomething, TQString::tqfromLatin1( "Something" ) );
+  itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Something" ), mSomething, 60 );
+  addItem( itemSomething, TQString::fromLatin1( "Something" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Group8b2" ) );
+  setCurrentGroup( TQString::fromLatin1( "Group8b2" ) );
 
   KConfigSkeleton::ItemBool  *itemFooBoo;
-  itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "FooBoo" ), mFooBoo, false );
-  addItem( itemFooBoo, TQString::tqfromLatin1( "FooBoo" ) );
+  itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "FooBoo" ), mFooBoo, false );
+  addItem( itemFooBoo, TQString::fromLatin1( "FooBoo" ) );
   KConfigSkeleton::ItemUInt  *itemPort;
-  itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::tqfromLatin1( "Port" ), mPort, 1000 );
-  addItem( itemPort, TQString::tqfromLatin1( "Port" ) );
+  itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Port" ), mPort, 1000 );
+  addItem( itemPort, TQString::fromLatin1( "Port" ) );
 }
 
 Test8b::~Test8b()
diff --git a/kdecore/kconfig_compiler/tests/test8b.h.ref b/kdecore/kconfig_compiler/tests/test8b.h.ref
index dfc9089e3..4ca0d5c7f 100644
--- a/kdecore/kconfig_compiler/tests/test8b.h.ref
+++ b/kdecore/kconfig_compiler/tests/test8b.h.ref
@@ -21,7 +21,7 @@ class Test8b : public Test8a
     static
     void setSomething( uint v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Something" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Something" ) ))
         self()->mSomething = v;
     }
 
@@ -40,7 +40,7 @@ class Test8b : public Test8a
     static
     void setFooBoo( bool v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "FooBoo" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "FooBoo" ) ))
         self()->mFooBoo = v;
     }
 
@@ -59,7 +59,7 @@ class Test8b : public Test8a
     static
     void setPort( uint v )
     {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Port" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Port" ) ))
         self()->mPort = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test9.cpp.ref b/kdecore/kconfig_compiler/tests/test9.cpp.ref
index 606f21ed1..c5d57e4d1 100644
--- a/kdecore/kconfig_compiler/tests/test9.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test9.cpp.ref
@@ -4,29 +4,29 @@
 #include "test9.h"
 
 Test9::Test9(  const TQString & transport, const TQString & folder )
-  : KConfigSkeleton( TQString::tqfromLatin1( "examplerc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
   , mParamtransport(transport)
   , mParamfolder(folder)
 {
-  setCurrentGroup( TQString::tqfromLatin1( "MyOptionsXX" ) );
+  setCurrentGroup( TQString::fromLatin1( "MyOptionsXX" ) );
 
   TQStringList defaultMyStringList;
   defaultMyStringList.append( TQString::fromUtf8( "up" ) );
   defaultMyStringList.append( TQString::fromUtf8( "down" ) );
 
   KConfigSkeleton::ItemStringList  *itemMyStringList;
-  itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
-  addItem( itemMyStringList, TQString::tqfromLatin1( "MyStringList" ) );
+  itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
+  addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) );
   TQStringList defaultMyPathList;
   defaultMyPathList.append( TQString::fromUtf8( "/home" ) );
   defaultMyPathList.append( TQString::fromUtf8( "~" ) );
 
   KConfigSkeleton::ItemPathList  *itemMyPathList;
-  itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::tqfromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList );
-  addItem( itemMyPathList, TQString::tqfromLatin1( "MyPathList" ) );
+  itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList );
+  addItem( itemMyPathList, TQString::fromLatin1( "MyPathList" ) );
   KConfigSkeleton::ItemPathList  *itemMyPathsList2;
-  itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::tqfromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::tqfromLatin1("/usr/bin")) += TQDir::homeDirPath() );
-  addItem( itemMyPathsList2, TQString::tqfromLatin1( "MyPathsList2" ) );
+  itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath() );
+  addItem( itemMyPathsList2, TQString::fromLatin1( "MyPathsList2" ) );
 }
 
 Test9::~Test9()
diff --git a/kdecore/kconfig_compiler/tests/test9.h.ref b/kdecore/kconfig_compiler/tests/test9.h.ref
index 0476c8a19..66a629b48 100644
--- a/kdecore/kconfig_compiler/tests/test9.h.ref
+++ b/kdecore/kconfig_compiler/tests/test9.h.ref
@@ -19,7 +19,7 @@ class Test9 : public KConfigSkeleton
     */
     void setMyStringList( const TQStringList & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyStringList" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyStringList" ) ))
         mMyStringList = v;
     }
 
@@ -36,7 +36,7 @@ class Test9 : public KConfigSkeleton
     */
     void setMyPathList( const TQStringList & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyPathList" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyPathList" ) ))
         mMyPathList = v;
     }
 
@@ -53,7 +53,7 @@ class Test9 : public KConfigSkeleton
     */
     void setMyPathsList2( const TQStringList & v )
     {
-      if (!isImmutable( TQString::tqfromLatin1( "MyPathsList2" ) ))
+      if (!isImmutable( TQString::fromLatin1( "MyPathsList2" ) ))
         mMyPathsList2 = v;
     }
 
diff --git a/kdecore/kconfig_compiler/tests/test9.kcfg b/kdecore/kconfig_compiler/tests/test9.kcfg
index 149a4d79f..b7495e2b6 100644
--- a/kdecore/kconfig_compiler/tests/test9.kcfg
+++ b/kdecore/kconfig_compiler/tests/test9.kcfg
@@ -18,7 +18,7 @@
     </entry>
     <entry name="MyPathsList2" type="PathList">
       <label>This is an additional test for PathList</label>
-      <default code="true">QStringList(QString::tqfromLatin1("/usr/bin")) += QDir::homeDirPath()</default>
+      <default code="true">QStringList(QString::fromLatin1("/usr/bin")) += QDir::homeDirPath()</default>
     </entry>
   </group>
 </kcfg>
diff --git a/kdecore/kconfig_compiler/tests/test9main.cpp b/kdecore/kconfig_compiler/tests/test9main.cpp
index 796ec0001..12e16e0d4 100644
--- a/kdecore/kconfig_compiler/tests/test9main.cpp
+++ b/kdecore/kconfig_compiler/tests/test9main.cpp
@@ -32,7 +32,7 @@ int main( int, char*[] )
   kdWarning() << myPathsList2 << endl;
 
   // add another path
-  TQStringList newlist = TQDir::homeDirPath() + TQString::tqfromLatin1("/.kde");
+  TQStringList newlist = TQDir::homeDirPath() + TQString::fromLatin1("/.kde");
   myPathsList2 = myPathsList2 + newlist;
   kdWarning() << myPathsList2 << endl;
 
diff --git a/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref b/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
index 00e933564..7b5f55f03 100644
--- a/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
+++ b/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
@@ -60,97 +60,97 @@ TestDPointer *TestDPointer::self()
 }
 
 TestDPointer::TestDPointer(  )
-  : KConfigSkeleton( TQString::tqfromLatin1( "korganizerrc" ) )
+  : KConfigSkeleton( TQString::fromLatin1( "korganizerrc" ) )
 {
   d = new TestDPointerPrivate;
   mSelf = this;
-  setCurrentGroup( TQString::tqfromLatin1( "General" ) );
+  setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), d->autoSave, false );
+  d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), d->autoSave, false );
   d->autoSaveItem->setLabel( i18n("Enable automatic saving of calendar") );
   d->autoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") );
-  addItem( d->autoSaveItem, TQString::tqfromLatin1( "AutoSave" ) );
-  d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 );
+  addItem( d->autoSaveItem, TQString::fromLatin1( "AutoSave" ) );
+  d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 );
   d->autoSaveIntervalItem->setLabel( i18n("Auto Save Interval") );
-  addItem( d->autoSaveIntervalItem, TQString::tqfromLatin1( "AutoSaveInterval" ) );
-  d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Confirm Deletes" ), d->confirm, true );
+  addItem( d->autoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) );
+  d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), d->confirm, true );
   d->confirmItem->setLabel( i18n("Confirm deletes") );
-  addItem( d->confirmItem, TQString::tqfromLatin1( "Confirm" ) );
-  d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "Archive File" ), d->archiveFile );
+  addItem( d->confirmItem, TQString::fromLatin1( "Confirm" ) );
+  d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), d->archiveFile );
   d->archiveFileItem->setLabel( i18n("Archive File") );
-  addItem( d->archiveFileItem, TQString::tqfromLatin1( "ArchiveFile" ) );
+  addItem( d->archiveFileItem, TQString::fromLatin1( "ArchiveFile" ) );
   TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "standardDestination" );
+    choice.name = TQString::fromLatin1( "standardDestination" );
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "askDestination" );
+    choice.name = TQString::fromLatin1( "askDestination" );
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "argl1" );
+    choice.name = TQString::fromLatin1( "argl1" );
     choice.label = i18n("Argl1 Label");
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "argl2" );
+    choice.name = TQString::fromLatin1( "argl2" );
     choice.whatsThis = i18n("Argl2 Whatsthis");
     valuesDestination.append( choice );
   }
   {
     KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::tqfromLatin1( "argl3" );
+    choice.name = TQString::fromLatin1( "argl3" );
     choice.label = i18n("Argl3 Label");
     choice.whatsThis = i18n("Argl3 Whatsthis");
     valuesDestination.append( choice );
   }
-  d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination );
+  d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination );
   d->destinationItem->setLabel( i18n("New Events/Todos Should") );
-  addItem( d->destinationItem, TQString::tqfromLatin1( "Destination" ) );
+  addItem( d->destinationItem, TQString::fromLatin1( "Destination" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Views" ) );
+  setCurrentGroup( TQString::fromLatin1( "Views" ) );
 
-  d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Hour Size" ), d->hourSize, 10 );
+  d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), d->hourSize, 10 );
   d->hourSizeItem->setLabel( i18n("Hour Size") );
-  addItem( d->hourSizeItem, TQString::tqfromLatin1( "HourSize" ) );
-  d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false );
+  addItem( d->hourSizeItem, TQString::fromLatin1( "HourSize" ) );
+  d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false );
   d->selectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") );
-  addItem( d->selectionStartsEditorItem, TQString::tqfromLatin1( "SelectionStartsEditor" ) );
+  addItem( d->selectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "KOrganizer Plugins" ) );
+  setCurrentGroup( TQString::fromLatin1( "KOrganizer Plugins" ) );
 
   TQStringList defaultSelectedPlugins;
   defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) );
   defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) );
 
-  d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins );
+  d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins );
   d->selectedPluginsItem->setLabel( i18n("SelectedPlugins") );
-  addItem( d->selectedPluginsItem, TQString::tqfromLatin1( "SelectedPlugins" ) );
+  addItem( d->selectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Colors" ) );
+  setCurrentGroup( TQString::fromLatin1( "Colors" ) );
 
-  d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) );
+  d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) );
   d->highlightColorItem->setLabel( i18n("Highlight color") );
-  addItem( d->highlightColorItem, TQString::tqfromLatin1( "HighlightColor" ) );
-  d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) );
+  addItem( d->highlightColorItem, TQString::fromLatin1( "HighlightColor" ) );
+  d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) );
   d->agendaBgColorItem->setLabel( i18n("Agenda view background color") );
-  addItem( d->agendaBgColorItem, TQString::tqfromLatin1( "AgendaBgColor" ) );
+  addItem( d->agendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) );
 
-  setCurrentGroup( TQString::tqfromLatin1( "Fonts" ) );
+  setCurrentGroup( TQString::fromLatin1( "Fonts" ) );
 
-  d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TimeBar Font" ), d->timeBarFont );
+  d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), d->timeBarFont );
   d->timeBarFontItem->setLabel( i18n("Time bar") );
-  addItem( d->timeBarFontItem, TQString::tqfromLatin1( "TimeBarFont" ) );
+  addItem( d->timeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) );
 }
 
 void TestDPointer::setAutoSave( bool v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "AutoSave" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "AutoSave" ) ))
         self()->d->autoSave = v;
 }
 
@@ -167,7 +167,7 @@ KConfigSkeleton::ItemBool *TestDPointer::autoSaveItem()
 
 void TestDPointer::setAutoSaveInterval( int v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "AutoSaveInterval" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "AutoSaveInterval" ) ))
         self()->d->autoSaveInterval = v;
 }
 
@@ -184,7 +184,7 @@ KConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem()
 
 void TestDPointer::setConfirm( bool v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Confirm" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Confirm" ) ))
         self()->d->confirm = v;
 }
 
@@ -201,7 +201,7 @@ KConfigSkeleton::ItemBool *TestDPointer::confirmItem()
 
 void TestDPointer::setArchiveFile( const TQString & v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "ArchiveFile" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "ArchiveFile" ) ))
         self()->d->archiveFile = v;
 }
 
@@ -218,7 +218,7 @@ KConfigSkeleton::ItemString *TestDPointer::archiveFileItem()
 
 void TestDPointer::setDestination( int v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "Destination" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "Destination" ) ))
         self()->d->destination = v;
 }
 
@@ -235,7 +235,7 @@ KConfigSkeleton::ItemEnum *TestDPointer::destinationItem()
 
 void TestDPointer::setHourSize( int v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "HourSize" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "HourSize" ) ))
         self()->d->hourSize = v;
 }
 
@@ -252,7 +252,7 @@ KConfigSkeleton::ItemInt *TestDPointer::hourSizeItem()
 
 void TestDPointer::setSelectionStartsEditor( bool v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "SelectionStartsEditor" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "SelectionStartsEditor" ) ))
         self()->d->selectionStartsEditor = v;
 }
 
@@ -269,7 +269,7 @@ KConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem()
 
 void TestDPointer::setSelectedPlugins( const TQStringList & v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "SelectedPlugins" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "SelectedPlugins" ) ))
         self()->d->selectedPlugins = v;
 }
 
@@ -286,7 +286,7 @@ KConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem()
 
 void TestDPointer::setHighlightColor( const TQColor & v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "HighlightColor" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "HighlightColor" ) ))
         self()->d->highlightColor = v;
 }
 
@@ -303,7 +303,7 @@ KConfigSkeleton::ItemColor *TestDPointer::highlightColorItem()
 
 void TestDPointer::setAgendaBgColor( const TQColor & v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "AgendaBgColor" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "AgendaBgColor" ) ))
         self()->d->agendaBgColor = v;
 }
 
@@ -320,7 +320,7 @@ KConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem()
 
 void TestDPointer::setTimeBarFont( const TQFont & v )
 {
-      if (!self()->isImmutable( TQString::tqfromLatin1( "TimeBarFont" ) ))
+      if (!self()->isImmutable( TQString::fromLatin1( "TimeBarFont" ) ))
         self()->d->timeBarFont = v;
 }
 
diff --git a/kdecore/kconfigbackend.cpp b/kdecore/kconfigbackend.cpp
index 072eb97b5..234124820 100644
--- a/kdecore/kconfigbackend.cpp
+++ b/kdecore/kconfigbackend.cpp
@@ -215,8 +215,8 @@ static TQCString encodeKey(const char* key)
 {
     TQCString newKey(key);
 
-    newKey.tqreplace('[', "%5b");
-    newKey.tqreplace(']', "%5d");
+    newKey.replace('[', "%5b");
+    newKey.replace(']', "%5d");
 
     return newKey;
 }
@@ -225,8 +225,8 @@ static TQCString decodeKey(const char* key)
 {
     TQCString newKey(key);
 
-    newKey.tqreplace("%5b", "[");
-    newKey.tqreplace("%5d", "]");
+    newKey.replace("%5b", "[");
+    newKey.replace("%5d", "]");
 
     return newKey;
 }
@@ -256,7 +256,7 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName,
 
    if (useKDEGlobals)
       mGlobalFileName = KGlobal::dirs()->saveLocation("config") +
-	      TQString::tqfromLatin1("kdeglobals");
+	      TQString::fromLatin1("kdeglobals");
    else
       mGlobalFileName = TQString::null;
 
@@ -347,19 +347,19 @@ bool KConfigINIBackEnd::parseConfigFiles()
   // Parse the general config files
   if (useKDEGlobals) {
     TQStringList kdercs = KGlobal::dirs()->
-      findAllResources("config", TQString::tqfromLatin1("kdeglobals"));
+      findAllResources("config", TQString::fromLatin1("kdeglobals"));
 
 #ifdef Q_WS_WIN
     TQString etc_kderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\kderc" );
 #else
-    TQString etc_kderc = TQString::tqfromLatin1("/etc/kderc");
+    TQString etc_kderc = TQString::fromLatin1("/etc/kderc");
 #endif
 
     if (checkAccess(etc_kderc, R_OK))
       kdercs += etc_kderc;
 
     kdercs += KGlobal::dirs()->
-      findAllResources("config", TQString::tqfromLatin1("system.kdeglobals"));
+      findAllResources("config", TQString::fromLatin1("system.kdeglobals"));
 
     TQStringList::ConstIterator it;
 
@@ -605,13 +605,13 @@ qWarning("SIGBUS while reading %s", rFile.name().latin1());
       const char *endOfKey = 0, *locale = 0, *elocale = 0;
       for (; (s < eof) && (*s != '\n'); s++)
       {
-         if (*s == '=') //tqfind the equal sign
+         if (*s == '=') //find the equal sign
          {
 	    if (!endOfKey)
         	endOfKey = s;
             goto haveeq;
 	 }
-	 if (*s == '[') //tqfind the locale or options.
+	 if (*s == '[') //find the locale or options.
 	 {
             const char *option;
             const char *eoption;
@@ -792,7 +792,7 @@ void KConfigINIBackEnd::sync(bool bMerge)
 
   bool bEntriesLeft = true;
 
-  // tqfind out the file to write to (most specific writable file)
+  // find out the file to write to (most specific writable file)
   // try local app-specific file first
 
   if (!mfileName.isEmpty()) {
@@ -999,7 +999,7 @@ bool KConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal,
     const KEntry &currentEntry = *aIt;
     if(aIt.key().bDefault)
     {
-       aTempMap.tqreplace(aIt.key(), currentEntry);
+       aTempMap.replace(aIt.key(), currentEntry);
        continue;
     }
 
@@ -1017,7 +1017,7 @@ bool KConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal,
 
     // put this entry from the config object into the
     // temporary map, possibly replacing an existing entry
-    KEntryMapIterator aIt2 = aTempMap.tqfind(aIt.key());
+    KEntryMapIterator aIt2 = aTempMap.find(aIt.key());
     if (aIt2 != aTempMap.end() && (*aIt2).bImmutable)
        continue; // Bail out if the on-disk entry is immutable
 
diff --git a/kdecore/kconfigbase.cpp b/kdecore/kconfigbase.cpp
index 0acd20041..1cbe1f3ab 100644
--- a/kdecore/kconfigbase.cpp
+++ b/kdecore/kconfigbase.cpp
@@ -272,7 +272,7 @@ TQString KConfigBase::readEntry( const char *pKey,
   if( expand || bExpand )
     {
       // check for environment variables and make necessary translations
-      int nDollarPos = aValue.tqfind( '$' );
+      int nDollarPos = aValue.find( '$' );
 
       while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(aValue.length())) {
         // there is at least one $
@@ -294,7 +294,7 @@ TQString KConfigBase::readEntry( const char *pKey,
              }
              pclose(fs);
           }
-          aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, result );
+          aValue.replace( nDollarPos, nEndPos-nDollarPos, result );
         } else if( (aValue)[nDollarPos+1] != '$' ) {
           uint nEndPos = nDollarPos+1;
           // the next character is no $
@@ -320,7 +320,7 @@ TQString KConfigBase::readEntry( const char *pKey,
 	    // !!! Sergey A. Sukiyazov <corwin@micom.don.ru> !!!
 	    // A environment variables may contain values in 8bit
 	    // locale cpecified encoding or in UTF8 encoding.
-	    aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) );
+	    aValue.replace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) );
           } else
             aValue.remove( nDollarPos, nEndPos-nDollarPos );
         } else {
@@ -328,7 +328,7 @@ TQString KConfigBase::readEntry( const char *pKey,
           aValue.remove( nDollarPos, 1 );
           nDollarPos++;
         }
-        nDollarPos = aValue.tqfind( '$', nDollarPos );
+        nDollarPos = aValue.find( '$', nDollarPos );
       }
     }
 
@@ -697,12 +697,12 @@ unsigned long KConfigBase::readUnsignedLongNumEntry( const char *pKey, unsigned
     }
 }
 
-TQ_INT64 KConfigBase::readNum64Entry( const TQString& pKey, TQ_INT64 nDefault) const
+Q_INT64 KConfigBase::readNum64Entry( const TQString& pKey, Q_INT64 nDefault) const
 {
   return readNum64Entry(pKey.utf8().data(), nDefault);
 }
 
-TQ_INT64 KConfigBase::readNum64Entry( const char *pKey, TQ_INT64 nDefault) const
+Q_INT64 KConfigBase::readNum64Entry( const char *pKey, Q_INT64 nDefault) const
 {
   // Note that TQCString::toLongLong() is missing, we muse use a TQString instead.
   TQString aValue = readEntry( pKey );
@@ -711,18 +711,18 @@ TQ_INT64 KConfigBase::readNum64Entry( const char *pKey, TQ_INT64 nDefault) const
   else
     {
       bool ok;
-      TQ_INT64 rc = aValue.toLongLong( &ok );
+      Q_INT64 rc = aValue.toLongLong( &ok );
       return( ok ? rc : nDefault );
     }
 }
 
 
-TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const TQString& pKey, TQ_UINT64 nDefault) const
+Q_UINT64 KConfigBase::readUnsignedNum64Entry( const TQString& pKey, Q_UINT64 nDefault) const
 {
   return readUnsignedNum64Entry(pKey.utf8().data(), nDefault);
 }
 
-TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefault) const
+Q_UINT64 KConfigBase::readUnsignedNum64Entry( const char *pKey, Q_UINT64 nDefault) const
 {
   // Note that TQCString::toULongLong() is missing, we muse use a TQString instead.
   TQString aValue = readEntry( pKey );
@@ -731,7 +731,7 @@ TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefa
   else
     {
       bool ok;
-      TQ_UINT64 rc = aValue.toULongLong( &ok );
+      Q_UINT64 rc = aValue.toULongLong( &ok );
       return( ok ? rc : nDefault );
     }
 }
@@ -793,7 +793,7 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
 
   TQString aValue = readEntry( pKey );
   if( !aValue.isNull() ) {
-    if ( aValue.tqcontains( ',' ) > 5 ) {
+    if ( aValue.contains( ',' ) > 5 ) {
       // KDE3 and upwards entry
       if ( !aRetFont.fromString( aValue ) && pDefault )
         aRetFont = *pDefault;
@@ -801,8 +801,8 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
     else {
       // backward compatibility with older font formats
       // ### remove KDE 3.1 ?
-      // tqfind first part (font family)
-      int nIndex = aValue.tqfind( ',' );
+      // find first part (font family)
+      int nIndex = aValue.find( ',' );
       if( nIndex == -1 ){
         if( pDefault )
           aRetFont = *pDefault;
@@ -810,9 +810,9 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
       }
       aRetFont.setFamily( aValue.left( nIndex ) );
 
-      // tqfind second part (point size)
+      // find second part (point size)
       int nOldIndex = nIndex;
-      nIndex = aValue.tqfind( ',', nOldIndex+1 );
+      nIndex = aValue.find( ',', nOldIndex+1 );
       if( nIndex == -1 ){
         if( pDefault )
           aRetFont = *pDefault;
@@ -822,9 +822,9 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
       aRetFont.setPointSize( aValue.mid( nOldIndex+1,
                                          nIndex-nOldIndex-1 ).toInt() );
 
-      // tqfind third part (style hint)
+      // find third part (style hint)
       nOldIndex = nIndex;
-      nIndex = aValue.tqfind( ',', nOldIndex+1 );
+      nIndex = aValue.find( ',', nOldIndex+1 );
 
       if( nIndex == -1 ){
         if( pDefault )
@@ -834,9 +834,9 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
 
       aRetFont.setStyleHint( (TQFont::StyleHint)aValue.mid( nOldIndex+1, nIndex-nOldIndex-1 ).toUInt() );
 
-      // tqfind fourth part (char set)
+      // find fourth part (char set)
       nOldIndex = nIndex;
-      nIndex = aValue.tqfind( ',', nOldIndex+1 );
+      nIndex = aValue.find( ',', nOldIndex+1 );
 
       if( nIndex == -1 ){
         if( pDefault )
@@ -846,9 +846,9 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
 
       TQString chStr=aValue.mid( nOldIndex+1,
                                 nIndex-nOldIndex-1 );
-      // tqfind fifth part (weight)
+      // find fifth part (weight)
       nOldIndex = nIndex;
-      nIndex = aValue.tqfind( ',', nOldIndex+1 );
+      nIndex = aValue.find( ',', nOldIndex+1 );
 
       if( nIndex == -1 ){
         if( pDefault )
@@ -859,7 +859,7 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
       aRetFont.setWeight( aValue.mid( nOldIndex+1,
                                       nIndex-nOldIndex-1 ).toUInt() );
 
-      // tqfind sixth part (font bits)
+      // find sixth part (font bits)
       uint nFontBits = aValue.right( aValue.length()-nIndex-1 ).toUInt();
 
       aRetFont.setItalic( nFontBits & 0x01 );
@@ -978,8 +978,8 @@ TQColor KConfigBase::readColorEntry( const char *pKey,
 
           bool bOK;
 
-          // tqfind first part (red)
-          int nIndex = aValue.tqfind( ',' );
+          // find first part (red)
+          int nIndex = aValue.find( ',' );
 
           if( nIndex == -1 ){
             // return a sensible default -- Bernd
@@ -990,9 +990,9 @@ TQColor KConfigBase::readColorEntry( const char *pKey,
 
           nRed = aValue.left( nIndex ).toInt( &bOK );
 
-          // tqfind second part (green)
+          // find second part (green)
           int nOldIndex = nIndex;
-          nIndex = aValue.tqfind( ',', nOldIndex+1 );
+          nIndex = aValue.find( ',', nOldIndex+1 );
 
           if( nIndex == -1 ){
             // return a sensible default -- Bernd
@@ -1003,7 +1003,7 @@ TQColor KConfigBase::readColorEntry( const char *pKey,
           nGreen = aValue.mid( nOldIndex+1,
                                nIndex-nOldIndex-1 ).toInt( &bOK );
 
-          // tqfind third part (blue)
+          // find third part (blue)
           nBlue = aValue.right( aValue.length()-nIndex-1 ).toInt( &bOK );
 
           aRetColor.setRgb( nRed, nGreen, nBlue );
@@ -1025,7 +1025,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const TQString& pKey,
   return readDateTimeEntry(pKey.utf8().data(), pDefault);
 }
 
-// ### tqcurrentDateTime() as fallback ? (Harri)
+// ### currentDateTime() as fallback ? (Harri)
 TQDateTime KConfigBase::readDateTimeEntry( const char *pKey,
                                           const TQDateTime* pDefault ) const
 {
@@ -1034,7 +1034,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey,
       if( pDefault )
         return *pDefault;
       else
-        return TQDateTime::tqcurrentDateTime();
+        return TQDateTime::currentDateTime();
     }
 
   TQStrList list;
@@ -1048,7 +1048,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey,
     return TQDateTime( date, time );
   }
 
-  return TQDateTime::tqcurrentDateTime();
+  return TQDateTime::currentDateTime();
 }
 
 void KConfigBase::writeEntry( const TQString& pKey, const TQString& value,
@@ -1119,9 +1119,9 @@ static bool cleanHomeDirPath( TQString &path, const TQString &homeDir )
 #endif
 
    unsigned int len = homeDir.length();
-   // tqreplace by "$HOME" if possible
+   // replace by "$HOME" if possible
    if (len && (path.length() == len || path[len] == '/')) {
-        path.tqreplace(0, len, TQString::tqfromLatin1("$HOME"));
+        path.replace(0, len, TQString::fromLatin1("$HOME"));
         return true;
    } else
         return false;
@@ -1133,7 +1133,7 @@ static TQString translatePath( TQString path )
        return path;
 
    // only "our" $HOME should be interpreted
-   path.tqreplace('$', "$$");
+   path.replace('$', "$$");
 
    bool startsWithFile = path.startsWith("file:", false);
 
@@ -1160,7 +1160,7 @@ static TQString translatePath( TQString path )
    if (cleanHomeDirPath(path, homeDir0) ||
        cleanHomeDirPath(path, homeDir1) ||
        cleanHomeDirPath(path, homeDir2) ) {
-     // kdDebug() << "Path was tqreplaced\n";
+     // kdDebug() << "Path was replaced\n";
    }
 
    if (startsWithFile)
@@ -1189,7 +1189,7 @@ void KConfigBase::writePathEntry ( const char *pKey, const TQStringList &list,
 {
   if( list.isEmpty() )
     {
-      writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent );
+      writeEntry( pKey, TQString::fromLatin1(""), bPersistent );
       return;
     }
   TQStringList new_list;
@@ -1402,7 +1402,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list,
 {
   if( list.isEmpty() )
     {
-      writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent );
+      writeEntry( pKey, TQString::fromLatin1(""), bPersistent );
       return;
     }
   TQString str_list;
@@ -1449,7 +1449,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
 {
   if( list.isEmpty() )
     {
-      writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent );
+      writeEntry( pKey, TQString::fromLatin1(""), bPersistent );
       return;
     }
   TQString str_list;
@@ -1548,14 +1548,14 @@ void KConfigBase::writeEntry( const char *pKey, unsigned long nValue,
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const TQString& pKey, TQ_INT64 nValue,
+void KConfigBase::writeEntry( const TQString& pKey, Q_INT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, TQ_INT64 nValue,
+void KConfigBase::writeEntry( const char *pKey, Q_INT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
@@ -1563,14 +1563,14 @@ void KConfigBase::writeEntry( const char *pKey, TQ_INT64 nValue,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, TQ_UINT64 nValue,
+void KConfigBase::writeEntry( const TQString& pKey, Q_UINT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, TQ_UINT64 nValue,
+void KConfigBase::writeEntry( const char *pKey, Q_UINT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
diff --git a/kdecore/kconfigbase.h b/kdecore/kconfigbase.h
index e557aed3d..cc7ad8ffe 100644
--- a/kdecore/kconfigbase.h
+++ b/kdecore/kconfigbase.h
@@ -67,7 +67,7 @@ class KConfigGroup;
  * @see KSimpleConfig
  * @see KSharedConfig
  */
-class KDECORE_EXPORT KConfigBase : public TQObject
+class KDECORE_EXPORT KConfigBase : public QObject
 {
   Q_OBJECT
 
@@ -461,7 +461,7 @@ public:
    * the read value cannot be interpreted.
    * @return The value for this key.
    */
-  TQ_INT64 readNum64Entry( const TQString& pKey, TQ_INT64 nDefault = 0 ) const;
+  Q_INT64 readNum64Entry( const TQString& pKey, Q_INT64 nDefault = 0 ) const;
 
   /**
    * Reads a 64-bit numerical value.
@@ -474,7 +474,7 @@ public:
    * the read value cannot be interpreted.
    * @return The value for this key.
    */
-  TQ_INT64 readNum64Entry( const char *pKey, TQ_INT64 nDefault = 0 ) const;
+  Q_INT64 readNum64Entry( const char *pKey, Q_INT64 nDefault = 0 ) const;
 
   /**
    * Read an 64-bit unsigned numerical value.
@@ -487,7 +487,7 @@ public:
    * the read value cannot be interpreted.
    * @return The value for this key.
    */
-  TQ_UINT64 readUnsignedNum64Entry( const TQString& pKey, TQ_UINT64 nDefault = 0 ) const;
+  Q_UINT64 readUnsignedNum64Entry( const TQString& pKey, Q_UINT64 nDefault = 0 ) const;
 
   /**
    * Read an 64-bit unsigned numerical value.
@@ -500,7 +500,7 @@ public:
    * the read value cannot be interpreted.
    * @return The value for this key.
    */
-  TQ_UINT64 readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefault = 0 ) const;
+  Q_UINT64 readUnsignedNum64Entry( const char *pKey, Q_UINT64 nDefault = 0 ) const;
 
   /**
    * Reads a floating point value.
@@ -692,7 +692,7 @@ public:
    * and interpret it as a date and time.
    *
    * @param pKey The key to search for.
-   * @param pDefault A default value ( tqcurrentDateTime() by default)
+   * @param pDefault A default value ( currentDateTime() by default)
    * returned if the key was not found or if the read value cannot be
    * interpreted.
    * @return The value for this key.
@@ -706,7 +706,7 @@ public:
    * and interpret it as a date and time.
    *
    * @param pKey The key to search for.
-   * @param pDefault A default value ( tqcurrentDateTime() by default)
+   * @param pDefault A default value ( currentDateTime() by default)
    * returned if the key was not found or if the read value cannot be
    * interpreted.
    * @return The value for this key.
@@ -978,7 +978,7 @@ public:
   void writeEntry( const TQString& pKey, const char *pValue,
                       bool bPersistent = true, bool bGlobal = false,
                       bool bNLS = false )
-    { writeEntry(pKey, TQString::tqfromLatin1(pValue), bPersistent, bGlobal, bNLS); }
+    { writeEntry(pKey, TQString::fromLatin1(pValue), bPersistent, bGlobal, bNLS); }
   /**
    * Write a (key/value) pair.
    *
@@ -999,7 +999,7 @@ public:
   void writeEntry( const char *pKey, const char *pValue,
                       bool bPersistent = true, bool bGlobal = false,
                       bool bNLS = false )
-    { writeEntry(pKey, TQString::tqfromLatin1(pValue), bPersistent, bGlobal, bNLS); }
+    { writeEntry(pKey, TQString::fromLatin1(pValue), bPersistent, bGlobal, bNLS); }
 
   /**
    * Write a (key/value) pair.
@@ -1159,7 +1159,7 @@ public:
    * @param bNLS        If @p bNLS is true, the locale tag is added to the key
    *  when writing it back.
    */
-  void writeEntry( const TQString& pKey, TQ_INT64 nValue,
+  void writeEntry( const TQString& pKey, Q_INT64 nValue,
                       bool bPersistent = true, bool bGlobal = false,
                       bool bNLS = false );
   /**
@@ -1176,7 +1176,7 @@ public:
    * @param bNLS        If @p bNLS is true, the locale tag is added to the key
    *  when writing it back.
    */
-  void writeEntry( const char *pKey, TQ_INT64 nValue,
+  void writeEntry( const char *pKey, Q_INT64 nValue,
                       bool bPersistent = true, bool bGlobal = false,
                       bool bNLS = false );
 
@@ -1194,7 +1194,7 @@ public:
    * @param bNLS        If @p bNLS is true, the locale tag is added to the key
    *  when writing it back.
    */
-  void writeEntry( const TQString& pKey, TQ_UINT64 nValue,
+  void writeEntry( const TQString& pKey, Q_UINT64 nValue,
                       bool bPersistent = true, bool bGlobal = false,
                       bool bNLS = false );
   /**
@@ -1211,7 +1211,7 @@ public:
    * @param bNLS        If @p bNLS is true, the locale tag is added to the key
    *  when writing it back.
    */
-  void writeEntry( const char *pKey, TQ_UINT64 nValue,
+  void writeEntry( const char *pKey, Q_UINT64 nValue,
                       bool bPersistent = true, bool bGlobal = false,
                       bool bNLS = false );
 
@@ -1538,7 +1538,7 @@ public:
    * Writes a file path.
    *
    * It is checked whether the path is located under $HOME. If so the
-   * path is written out with the user's home-directory tqreplaced with
+   * path is written out with the user's home-directory replaced with
    * $HOME. The path should be read back with readPathEntry()
    *
    * @param pKey The key to write.
@@ -1558,7 +1558,7 @@ public:
    * Writes a file path.
    *
    * It is checked whether the path is located under $HOME. If so the
-   * path is written out with the user's home-directory tqreplaced with
+   * path is written out with the user's home-directory replaced with
    * $HOME. The path should be read back with readPathEntry()
    *
    * @param pKey The key to write.
@@ -1579,7 +1579,7 @@ public:
    * writePathEntry() overridden to accept a list of paths (strings).
    *
    * It is checked whether the paths are located under $HOME. If so each of
-   * the paths are written out with the user's home-directory tqreplaced with
+   * the paths are written out with the user's home-directory replaced with
    * $HOME. The paths should be read back with readPathListEntry()
    *
    * @param pKey The key to write
@@ -1604,7 +1604,7 @@ public:
    * writePathEntry() overridden to accept a list of paths (strings).
    *
    * It is checked whether the paths are located under $HOME. If so each of
-   * the paths are written out with the user's home-directory tqreplaced with
+   * the paths are written out with the user's home-directory replaced with
    * $HOME. The paths should be read back with readPathListEntry()
    *
    * @param pKey The key to write
@@ -1942,9 +1942,9 @@ protected:
    * Do not use this function, the implementation / return type are
    * subject to change.
    *
-   * @param _key The key to insert.  It tqcontains information both on
+   * @param _key The key to insert.  It contains information both on
    *        the group of the key and the key itself. If the key already
-   *        exists, the old value will be tqreplaced.
+   *        exists, the old value will be replaced.
    * @param _data the KEntry that is to be stored.
    * @param _checkGroup When false, assume that the group already exists.
    * @internal
@@ -1959,7 +1959,7 @@ protected:
    * Do not use this function, the implementation and return type are
    * subject to change.
    *
-   * @param _key The key to look up  It tqcontains information both on
+   * @param _key The key to look up  It contains information both on
    *        the group of the key and the entry's key itself.
    * @return The KEntry value (data) found for the key.  @p KEntry.aValue
    * will be the null string if nothing was located.
diff --git a/kdecore/kconfigdialogmanager.cpp b/kdecore/kconfigdialogmanager.cpp
index c23750300..1d89bf49b 100644
--- a/kdecore/kconfigdialogmanager.cpp
+++ b/kdecore/kconfigdialogmanager.cpp
@@ -117,7 +117,7 @@ void KConfigDialogManager::init(bool trackChanges)
     changedMap.insert( "KDoubleNumInput", TQT_SIGNAL(valueChanged (double)));
   }
 
-  // Go through all of the children of the widgets and tqfind all known widgets
+  // Go through all of the children of the widgets and find all known widgets
   (void) parseChildren(m_dialog, trackChanges);
 }
 
@@ -131,13 +131,13 @@ void KConfigDialogManager::setupWidget(TQWidget *widget, KConfigSkeletonItem *it
   TQVariant minValue = item->minValue();
   if (minValue.isValid())
   {
-    if (widget->tqmetaObject()->tqfindProperty("minValue", true) != -1)
+    if (widget->metaObject()->findProperty("minValue", true) != -1)
        widget->setProperty("minValue", minValue);
   }
   TQVariant maxValue = item->maxValue();
   if (maxValue.isValid())
   {
-    if (widget->tqmetaObject()->tqfindProperty("maxValue", true) != -1)
+    if (widget->metaObject()->findProperty("maxValue", true) != -1)
        widget->setProperty("maxValue", maxValue);
   }
   if (TQWhatsThis::textFor( widget ).isEmpty())
@@ -153,12 +153,12 @@ void KConfigDialogManager::setupWidget(TQWidget *widget, KConfigSkeletonItem *it
 bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChanges)
 {
   bool valueChanged = false;
-  const TQObjectList listOfChildren = widget->tqchildren();
-  if(listOfChildren.isEmpty())
+  const TQObjectList *listOfChildren = widget->children();
+  if(!listOfChildren)
     return valueChanged;
 
   TQObject *object;
-  for( TQObjectListIterator it( listOfChildren );
+  for( TQObjectListIterator it( *listOfChildren );
        (object = it.current()); ++it )
   {
     if(!object->isWidgetType())
@@ -174,14 +174,14 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang
     {
       // This is one of our widgets!
       TQString configId = widgetName+5;
-      KConfigSkeletonItem *item = m_conf->tqfindItem(configId);
+      KConfigSkeletonItem *item = m_conf->findItem(configId);
       if (item)
       {
         d->knownWidget.insert(configId, childWidget);
 
         setupWidget(childWidget, item);
 
-        TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.tqfind(childWidget->className());
+        TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.find(childWidget->className());
 
         if (changedIt == changedMap.end())
         {
@@ -189,7 +189,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang
 		   // it again using the super class name. This fixes a problem with using QtRuby/Korundum 
 		   // widgets with KConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even 
 		   // though it was a 'QWidget'.
-          changedIt = changedMap.tqfind(childWidget->tqmetaObject()->superClassName());
+          changedIt = changedMap.find(childWidget->metaObject()->superClassName());
         }
 
         if (changedIt == changedMap.end())
@@ -236,7 +236,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang
 #ifndef NDEBUG
     else if (widgetName)
     {
-      TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.tqfind(childWidget->className());
+      TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.find(childWidget->className());
       if (changedIt != changedMap.end())
       {
         if ((!d->insideGroupBox || !childWidget->inherits("QRadioButton")) && 
@@ -267,7 +267,7 @@ void KConfigDialogManager::updateWidgets()
   for( TQDictIterator<TQWidget> it( d->knownWidget );
        (widget = it.current()); ++it )
   {
-     KConfigSkeletonItem *item = m_conf->tqfindItem(it.currentKey());
+     KConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
      if (!item)
      {
         kdWarning(178) << "The setting '" << it.currentKey() << "' has disappeared!" << endl;
@@ -284,7 +284,7 @@ void KConfigDialogManager::updateWidgets()
      if (item->isImmutable())
      {
         widget->setEnabled(false);
-        TQWidget *buddy = d->buddyWidget.tqfind(it.currentKey());
+        TQWidget *buddy = d->buddyWidget.find(it.currentKey());
         if (buddy)
            buddy->setEnabled(false);
      }
@@ -310,7 +310,7 @@ void KConfigDialogManager::updateSettings()
   for( TQDictIterator<TQWidget> it( d->knownWidget );
        (widget = it.current()); ++it )
   {
-     KConfigSkeletonItem *item = m_conf->tqfindItem(it.currentKey());
+     KConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
      if (!item)
      {
         kdWarning(178) << "The setting '" << it.currentKey() << "' has disappeared!" << endl;
@@ -370,7 +370,7 @@ bool KConfigDialogManager::hasChanged()
   for( TQDictIterator<TQWidget> it( d->knownWidget );
        (widget = it.current()); ++it )
   {
-     KConfigSkeletonItem *item = m_conf->tqfindItem(it.currentKey());
+     KConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
      if (!item)
      {
         kdWarning(178) << "The setting '" << it.currentKey() << "' has disappeared!" << endl;
diff --git a/kdecore/kconfigdialogmanager.h b/kdecore/kconfigdialogmanager.h
index 309f025bc..d0b385b60 100644
--- a/kdecore/kconfigdialogmanager.h
+++ b/kdecore/kconfigdialogmanager.h
@@ -91,7 +91,7 @@ signals:
    * TODO: Verify
    * One or more of the settings have been changed.
    * @param widget - The widget group (pass in via addWidget()) that
-   * tqcontains the one or more modified setting.
+   * contains the one or more modified setting.
    * @see settingsChanged()
    */
   void settingsChanged( TQWidget *widget );
@@ -111,7 +111,7 @@ public:
   /**
    * Constructor.
    * @param parent  Dialog widget to manage
-   * @param conf Object that tqcontains settings
+   * @param conf Object that contains settings
    * @param name - Object name.
    */
    KConfigDialogManager(TQWidget *parent, KConfigSkeleton *conf, const char *name=0);
@@ -176,7 +176,7 @@ protected:
   void init(bool trackChanges);
 
   /**
-   * Recursive function that tqfinds all known children.
+   * Recursive function that finds all known children.
    * Goes through the children of widget and if any are known and not being
    * ignored, stores them in currentGroup.  Also checks if the widget
    * should be disabled because it is set immutable.
diff --git a/kdecore/kconfigskeleton.cpp b/kdecore/kconfigskeleton.cpp
index 3e0f220b6..9e6070d6a 100644
--- a/kdecore/kconfigskeleton.cpp
+++ b/kdecore/kconfigskeleton.cpp
@@ -223,8 +223,8 @@ void KConfigSkeleton::ItemInt::setMaxValue(int v)
 
 
 KConfigSkeleton::ItemInt64::ItemInt64( const TQString &group, const TQString &key,
-                              TQ_INT64 &reference, TQ_INT64 defaultValue )
-  : KConfigSkeletonGenericItem<TQ_INT64>( group, key, reference, defaultValue )
+                              Q_INT64 &reference, Q_INT64 defaultValue )
+  : KConfigSkeletonGenericItem<Q_INT64>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
@@ -266,13 +266,13 @@ TQVariant KConfigSkeleton::ItemInt64::maxValue() const
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemInt64::setMinValue(TQ_INT64 v)
+void KConfigSkeleton::ItemInt64::setMinValue(Q_INT64 v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemInt64::setMaxValue(TQ_INT64 v)
+void KConfigSkeleton::ItemInt64::setMaxValue(Q_INT64 v)
 {
   mHasMax = true;
   mMax = v;
@@ -394,8 +394,8 @@ void KConfigSkeleton::ItemUInt::setMaxValue(unsigned int v)
 
 
 KConfigSkeleton::ItemUInt64::ItemUInt64( const TQString &group, const TQString &key,
-                              TQ_UINT64 &reference, TQ_UINT64 defaultValue )
-  : KConfigSkeletonGenericItem<TQ_UINT64>( group, key, reference, defaultValue )
+                              Q_UINT64 &reference, Q_UINT64 defaultValue )
+  : KConfigSkeletonGenericItem<Q_UINT64>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
@@ -437,13 +437,13 @@ TQVariant KConfigSkeleton::ItemUInt64::maxValue() const
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemUInt64::setMinValue(TQ_UINT64 v)
+void KConfigSkeleton::ItemUInt64::setMinValue(Q_UINT64 v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemUInt64::setMaxValue(TQ_UINT64 v)
+void KConfigSkeleton::ItemUInt64::setMaxValue(Q_UINT64 v)
 {
   mHasMax = true;
   mMax = v;
@@ -1065,8 +1065,8 @@ KConfigSkeleton::ItemUInt *KConfigSkeleton::addItemUInt( const TQString &name, u
   return item;
 }
 
-KConfigSkeleton::ItemInt64 *KConfigSkeleton::addItemInt64( const TQString &name, TQ_INT64 &reference,
-                                    TQ_INT64 defaultValue, const TQString &key )
+KConfigSkeleton::ItemInt64 *KConfigSkeleton::addItemInt64( const TQString &name, Q_INT64 &reference,
+                                    Q_INT64 defaultValue, const TQString &key )
 {
   KConfigSkeleton::ItemInt64 *item;
   item = new KConfigSkeleton::ItemInt64( mCurrentGroup, key.isNull() ? name : key,
@@ -1075,8 +1075,8 @@ KConfigSkeleton::ItemInt64 *KConfigSkeleton::addItemInt64( const TQString &name,
   return item;
 }
 
-KConfigSkeleton::ItemUInt64 *KConfigSkeleton::addItemUInt64( const TQString &name, TQ_UINT64 &reference,
-                                     TQ_UINT64 defaultValue, const TQString &key )
+KConfigSkeleton::ItemUInt64 *KConfigSkeleton::addItemUInt64( const TQString &name, Q_UINT64 &reference,
+                                     Q_UINT64 defaultValue, const TQString &key )
 {
   KConfigSkeleton::ItemUInt64 *item;
   item = new KConfigSkeleton::ItemUInt64( mCurrentGroup, key.isNull() ? name : key,
@@ -1197,11 +1197,11 @@ KConfigSkeleton::ItemIntList *KConfigSkeleton::addItemIntList( const TQString &n
 
 bool KConfigSkeleton::isImmutable(const TQString &name)
 {
-  KConfigSkeletonItem *item = tqfindItem(name);
+  KConfigSkeletonItem *item = findItem(name);
   return !item || item->isImmutable();
 }
 
-KConfigSkeletonItem *KConfigSkeleton::tqfindItem(const TQString &name)
+KConfigSkeletonItem *KConfigSkeleton::findItem(const TQString &name)
 {
-  return mItemDict.tqfind(name);
+  return mItemDict.find(name);
 }
diff --git a/kdecore/kconfigskeleton.h b/kdecore/kconfigskeleton.h
index e6c3b8d20..82185c090 100644
--- a/kdecore/kconfigskeleton.h
+++ b/kdecore/kconfigskeleton.h
@@ -376,7 +376,7 @@ public:
 
     ItemString(const TQString & group, const TQString & key,
                TQString & reference,
-               const TQString & defaultValue = TQString::tqfromLatin1(""), // NOT TQString::null !!
+               const TQString & defaultValue = TQString::fromLatin1(""), // NOT TQString::null !!
                Type type = Normal);
 
     void writeConfig(KConfig * config);
@@ -396,7 +396,7 @@ public:
   public:
     ItemPassword(const TQString & group, const TQString & key,
                TQString & reference,
-               const TQString & defaultValue = TQString::tqfromLatin1("")); // NOT TQString::null !!
+               const TQString & defaultValue = TQString::fromLatin1("")); // NOT TQString::null !!
   };
 
   /**
@@ -469,11 +469,11 @@ public:
   /**
    * Class for handling an 64-bit integer preferences item.
    */
-  class KDECORE_EXPORT ItemInt64:public KConfigSkeletonGenericItem < TQ_INT64 >
+  class KDECORE_EXPORT ItemInt64:public KConfigSkeletonGenericItem < Q_INT64 >
   {
   public:
-    ItemInt64(const TQString & group, const TQString & key, TQ_INT64 &reference,
-            TQ_INT64 defaultValue = 0);
+    ItemInt64(const TQString & group, const TQString & key, Q_INT64 &reference,
+            Q_INT64 defaultValue = 0);
 
     void readConfig(KConfig * config);
     void setProperty(const TQVariant & p);
@@ -482,14 +482,14 @@ public:
     TQVariant minValue() const;
     TQVariant maxValue() const;
 
-    void setMinValue(TQ_INT64);
-    void setMaxValue(TQ_INT64);
+    void setMinValue(Q_INT64);
+    void setMaxValue(Q_INT64);
     
   private:  
     bool mHasMin : 1;
     bool mHasMax : 1;
-    TQ_INT64 mMin;
-    TQ_INT64 mMax;
+    Q_INT64 mMin;
+    Q_INT64 mMax;
   };
 
   /**
@@ -598,11 +598,11 @@ public:
   /**
    * Class for handling unsigned 64-bit integer preferences item.
    */
-  class KDECORE_EXPORT ItemUInt64:public KConfigSkeletonGenericItem < TQ_UINT64 >
+  class KDECORE_EXPORT ItemUInt64:public KConfigSkeletonGenericItem < Q_UINT64 >
   {
   public:
-    ItemUInt64(const TQString & group, const TQString & key, TQ_UINT64 &reference,
-            TQ_UINT64 defaultValue = 0);
+    ItemUInt64(const TQString & group, const TQString & key, Q_UINT64 &reference,
+            Q_UINT64 defaultValue = 0);
 
     void readConfig(KConfig * config);
     void setProperty(const TQVariant & p);
@@ -611,14 +611,14 @@ public:
     TQVariant minValue() const;
     TQVariant maxValue() const;
 
-    void setMinValue(TQ_UINT64);
-    void setMaxValue(TQ_UINT64);
+    void setMinValue(Q_UINT64);
+    void setMaxValue(Q_UINT64);
     
   private:  
     bool mHasMin : 1;
     bool mHasMax : 1;
-    TQ_UINT64 mMin;
-    TQ_UINT64 mMax;
+    Q_UINT64 mMin;
+    Q_UINT64 mMax;
   };
 
   /**
@@ -859,7 +859,7 @@ public:
    * @return The created item
    */
   ItemString *addItemString(const TQString & name, TQString & reference,
-                            const TQString & defaultValue = TQString::tqfromLatin1(""), // NOT TQString::null !!
+                            const TQString & defaultValue = TQString::fromLatin1(""), // NOT TQString::null !!
                             const TQString & key = TQString::null);
 
   /**
@@ -876,7 +876,7 @@ public:
    * @return The created item
    */
   ItemPassword *addItemPassword(const TQString & name, TQString & reference,
-                              const TQString & defaultValue = TQString::tqfromLatin1(""),
+                              const TQString & defaultValue = TQString::fromLatin1(""),
                               const TQString & key = TQString::null);
 
   /**
@@ -893,7 +893,7 @@ public:
    * @return The created item
    */
   ItemPath *addItemPath(const TQString & name, TQString & reference,
-                          const TQString & defaultValue = TQString::tqfromLatin1(""),
+                          const TQString & defaultValue = TQString::fromLatin1(""),
                           const TQString & key = TQString::null);
 
   /**
@@ -987,7 +987,7 @@ public:
                           const TQString & key = TQString::null);
 
   /**
-   * Register an item of type TQ_INT64.
+   * Register an item of type Q_INT64.
    * 
    * @param name Name used to indentify this setting. Names must be unique.
    * @param reference Pointer to the variable, which is set by readConfig()
@@ -997,12 +997,12 @@ public:
    * @param key Key used in config file. If key is null, name is used as key.
    * @return The created item
    */
-  ItemInt64 *addItemInt64(const TQString & name, TQ_INT64 &reference,
-                          TQ_INT64 defaultValue = 0,
+  ItemInt64 *addItemInt64(const TQString & name, Q_INT64 &reference,
+                          Q_INT64 defaultValue = 0,
                           const TQString & key = TQString::null);
 
   /**
-   * Register an item of type TQ_UINT64
+   * Register an item of type Q_UINT64
    * 
    * @param name Name used to indentify this setting. Names must be unique.
    * @param reference Pointer to the variable, which is set by readConfig()
@@ -1012,8 +1012,8 @@ public:
    * @param key Key used in config file. If key is null, name is used as key.
    * @return The created item
    */
-  ItemUInt64 *addItemUInt64(const TQString & name, TQ_UINT64 &reference,
-                            TQ_UINT64 defaultValue = 0,
+  ItemUInt64 *addItemUInt64(const TQString & name, Q_UINT64 &reference,
+                            Q_UINT64 defaultValue = 0,
                             const TQString & key = TQString::null);
 
   /**
@@ -1174,7 +1174,7 @@ public:
   /**
    * Lookup item by name
    */
-  KConfigSkeletonItem * tqfindItem(const TQString & name);
+  KConfigSkeletonItem * findItem(const TQString & name);
 
   /**
    * Indicate whether this object should reflect the actual
@@ -1187,7 +1187,7 @@ public:
 protected:
   /**
    * Implemented by subclasses that use special defaults.
-   * It should tqreplace the default values with the actual
+   * It should replace the default values with the actual
    * values and vice versa.
    */
   virtual void usrUseDefaults(bool)
diff --git a/kdecore/kcrash.cpp b/kdecore/kcrash.cpp
index 63e7351c4..5642500f8 100644
--- a/kdecore/kcrash.cpp
+++ b/kdecore/kcrash.cpp
@@ -89,27 +89,27 @@ KCrash::setCrashHandler (HandlerType handler)
   if (!handler)
     handler = SIG_DFL;
 
-  sigset_t tqmask;
-  sigemptyset(&tqmask);
+  sigset_t mask;
+  sigemptyset(&mask);
 
 #ifdef SIGSEGV
   signal (SIGSEGV, handler);
-  sigaddset(&tqmask, SIGSEGV);
+  sigaddset(&mask, SIGSEGV);
 #endif
 #ifdef SIGFPE
   signal (SIGFPE, handler);
-  sigaddset(&tqmask, SIGFPE);
+  sigaddset(&mask, SIGFPE);
 #endif
 #ifdef SIGILL
   signal (SIGILL, handler);
-  sigaddset(&tqmask, SIGILL);
+  sigaddset(&mask, SIGILL);
 #endif
 #ifdef SIGABRT
   signal (SIGABRT, handler);
-  sigaddset(&tqmask, SIGABRT);
+  sigaddset(&mask, SIGABRT);
 #endif
 
-  sigprocmask(SIG_UNBLOCK, &tqmask, 0);
+  sigprocmask(SIG_UNBLOCK, &mask, 0);
 #endif //Q_OS_UNIX
 
   _crashHandler = handler;
diff --git a/kdecore/kdcoppropertyproxy.cpp b/kdecore/kdcoppropertyproxy.cpp
index 22390a4c4..bc720736f 100644
--- a/kdecore/kdcoppropertyproxy.cpp
+++ b/kdecore/kdcoppropertyproxy.cpp
@@ -94,12 +94,12 @@ TQValueList<TQCString> KDCOPPropertyProxy::functions( TQObject *object )
   res << "bool setProperty(TQCString name,TQVariant property)";
   res << "TQValueList<TQCString> propertyNames(bool super)";
 
-  TQMetaObject *metaObj = object->tqmetaObject();
+  TQMetaObject *metaObj = object->metaObject();
   TQStrList properties = metaObj->propertyNames( true );
   TQStrListIterator it( properties );
   for (; it.current(); ++it )
   {
-    const TQMetaProperty *metaProp = metaObj->property( metaObj->tqfindProperty( it.current(), true ), true );
+    const TQMetaProperty *metaProp = metaObj->property( metaObj->findProperty( it.current(), true ), true );
 
     assert( metaProp );
 
@@ -146,18 +146,18 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB
 
     replyType = "bool";
     TQDataStream reply( replyData, IO_WriteOnly );
-    reply << (TQ_INT8)object->setProperty( propName, propValue );
+    reply << (Q_INT8)object->setProperty( propName, propValue );
     return true;
   }
 
   if ( fun == "propertyNames(bool)" )
   {
-    TQ_INT8 b;
+    Q_INT8 b;
     TQDataStream stream( data, IO_ReadOnly );
     stream >> b;
 
     TQValueList<TQCString> res;
-    TQStrList props = object->tqmetaObject()->propertyNames( static_cast<bool>( b ) );
+    TQStrList props = object->metaObject()->propertyNames( static_cast<bool>( b ) );
     TQStrListIterator it( props );
     for (; it.current(); ++it )
       res.append( it.current() );
@@ -228,7 +228,7 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB
       DEMARSHAL( UInt, uint )
       case TQVariant::Bool:
       {
-        TQ_INT8 v;
+        Q_INT8 v;
         stream >> v;
         prop = TQVariant( static_cast<bool>( v ), 1 );
       }
@@ -283,7 +283,7 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB
       MARSHAL( Int )
       MARSHAL( UInt )
       case TQVariant::Bool:
-        reply << (TQ_INT8)prop.toBool();
+        reply << (Q_INT8)prop.toBool();
         break;
       MARSHAL( Double )
       default:
@@ -314,7 +314,7 @@ bool KDCOPPropertyProxy::decodePropertyRequestInternal( const TQCString &fun, TQ
     propName.detach();
     set = true;
     propName = propName.mid( 3 );
-    int p1 = propName.tqfind( '(' );
+    int p1 = propName.find( '(' );
 
     uint len = propName.length();
 
@@ -328,7 +328,7 @@ bool KDCOPPropertyProxy::decodePropertyRequestInternal( const TQCString &fun, TQ
   else
     propName.truncate( propName.length() - 2 );
 
-  if ( !object->tqmetaObject()->propertyNames( true ).tqcontains( propName ) )
+  if ( !object->metaObject()->propertyNames( true ).contains( propName ) )
     return false;
 
   return true;
diff --git a/kdecore/kde-config.cpp.cmake b/kdecore/kde-config.cpp.cmake
index 291329398..f7be1e2be 100644
--- a/kdecore/kde-config.cpp.cmake
+++ b/kdecore/kde-config.cpp.cmake
@@ -32,69 +32,69 @@ bool _expandvars = false;
 
 TQString expandvars(const char *_input)
 {
-    TQString result = TQString::tqfromLatin1(_input);
+    TQString result = TQString::fromLatin1(_input);
     if (!_expandvars)
         return result;
 
     bool changed = false;
-    int index = result.tqfind("${prefix}");
+    int index = result.find("${prefix}");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@CMAKE_INSTALL_PREFIX@");
+        result = result.replace(index, 9, "@CMAKE_INSTALL_PREFIX@");
         changed = true;
     }
-    index = result.tqfind("$(prefix)");
+    index = result.find("$(prefix)");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@CMAKE_INSTALL_PREFIX@");
+        result = result.replace(index, 9, "@CMAKE_INSTALL_PREFIX@");
         changed = true;
     }
-    index = result.tqfind("${datadir}");
+    index = result.find("${datadir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 10, "@SHARE_INSTALL_PREFIX@");
+        result = result.replace(index, 10, "@SHARE_INSTALL_PREFIX@");
         changed = true;
     }
-    index = result.tqfind("$(datadir)");
+    index = result.find("$(datadir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 10, "@SHARE_INSTALL_PREFIX@");
+        result = result.replace(index, 10, "@SHARE_INSTALL_PREFIX@");
         changed = true;
     }
-    index = result.tqfind("${exec_prefix}");
+    index = result.find("${exec_prefix}");
     if (index >= 0) {
-        result = result.tqreplace(index, 14, "@EXEC_INSTALL_PREFIX@");
+        result = result.replace(index, 14, "@EXEC_INSTALL_PREFIX@");
         changed = true;
     }
-    index = result.tqfind("$(exec_prefix)");
+    index = result.find("$(exec_prefix)");
     if (index >= 0) {
-        result = result.tqreplace(index, 14, "@EXEC_INSTALL_PREFIX@");
+        result = result.replace(index, 14, "@EXEC_INSTALL_PREFIX@");
         changed = true;
     }
-    index = result.tqfind("${libdir}");
+    index = result.find("${libdir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@LIB_INSTALL_DIR@");
+        result = result.replace(index, 9, "@LIB_INSTALL_DIR@");
         changed = true;
     }
-    index = result.tqfind("$(libdir)");
+    index = result.find("$(libdir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@LIB_INSTALL_DIR@");
+        result = result.replace(index, 9, "@LIB_INSTALL_DIR@");
         changed = true;
     }
-    index = result.tqfind("${includedir}");
+    index = result.find("${includedir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 20, "@INCLUDE_INSTALL_DIR@");
+        result = result.replace(index, 20, "@INCLUDE_INSTALL_DIR@");
         changed = true;
     }
-    index = result.tqfind("$(includedir)");
+    index = result.find("$(includedir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 20, "@INCLUDE_INSTALL_DIR@");
+        result = result.replace(index, 20, "@INCLUDE_INSTALL_DIR@");
         changed = true;
     }
-    index = result.tqfind("${sysconfdir}");
+    index = result.find("${sysconfdir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 13, "@SYSCONF_INSTALL_DIR@");
+        result = result.replace(index, 13, "@SYSCONF_INSTALL_DIR@");
         changed = true;
     }
-    index = result.tqfind("$(sysconfdir)");
+    index = result.find("$(sysconfdir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 13, "@SYSCONF_INSTALL_DIR@");
+        result = result.replace(index, 13, "@SYSCONF_INSTALL_DIR@");
         changed = true;
     }
     if (changed)
@@ -186,7 +186,7 @@ int main(int argc, char **argv)
             "wallpaper", I18N_NOOP("Wallpapers"),
             "xdgdata-apps", I18N_NOOP("XDG Application menu (.desktop files)"),
             "xdgdata-dirs", I18N_NOOP("XDG Menu descriptions (.directory files)"),
-            "xdgconf-menu", I18N_NOOP("XDG Menu tqlayout (.menu files)"),
+            "xdgconf-menu", I18N_NOOP("XDG Menu layout (.menu files)"),
             "cmake", I18N_NOOP("CMake import modules (.cmake files)"),
             "tmp", I18N_NOOP("Temporary files (specific for both current host and current user)"),
             "socket", I18N_NOOP("UNIX Sockets (specific for both current host and current user)"),
diff --git a/kdecore/kde-config.cpp.in b/kdecore/kde-config.cpp.in
index 738686f11..da9d41782 100644
--- a/kdecore/kde-config.cpp.in
+++ b/kdecore/kde-config.cpp.in
@@ -32,69 +32,69 @@ bool _expandvars = false;
 
 TQString expandvars(const char *_input)
 {
-    TQString result = TQString::tqfromLatin1(_input);
+    TQString result = TQString::fromLatin1(_input);
     if (!_expandvars)
         return result;
 
     bool changed = false;
-    int index = result.tqfind("${prefix}");
+    int index = result.find("${prefix}");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@prefix@");
+        result = result.replace(index, 9, "@prefix@");
         changed = true;
     }
-    index = result.tqfind("$(prefix)");
+    index = result.find("$(prefix)");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@prefix@");
+        result = result.replace(index, 9, "@prefix@");
         changed = true;
     }
-    index = result.tqfind("${datadir}");
+    index = result.find("${datadir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 10, "@datadir@");
+        result = result.replace(index, 10, "@datadir@");
         changed = true;
     }
-    index = result.tqfind("$(datadir)");
+    index = result.find("$(datadir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 10, "@datadir@");
+        result = result.replace(index, 10, "@datadir@");
         changed = true;
     }
-    index = result.tqfind("${exec_prefix}");
+    index = result.find("${exec_prefix}");
     if (index >= 0) {
-        result = result.tqreplace(index, 14, "@exec_prefix@");
+        result = result.replace(index, 14, "@exec_prefix@");
         changed = true;
     }
-    index = result.tqfind("$(exec_prefix)");
+    index = result.find("$(exec_prefix)");
     if (index >= 0) {
-        result = result.tqreplace(index, 14, "@exec_prefix@");
+        result = result.replace(index, 14, "@exec_prefix@");
         changed = true;
     }
-    index = result.tqfind("${libdir}");
+    index = result.find("${libdir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@libdir@");
+        result = result.replace(index, 9, "@libdir@");
         changed = true;
     }
-    index = result.tqfind("$(libdir)");
+    index = result.find("$(libdir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 9, "@libdir@");
+        result = result.replace(index, 9, "@libdir@");
         changed = true;
     }
-    index = result.tqfind("${includedir}");
+    index = result.find("${includedir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 20, "@includedir@");
+        result = result.replace(index, 20, "@includedir@");
         changed = true;
     }
-    index = result.tqfind("$(includedir)");
+    index = result.find("$(includedir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 20, "@includedir@");
+        result = result.replace(index, 20, "@includedir@");
         changed = true;
     }
-    index = result.tqfind("${sysconfdir}");
+    index = result.find("${sysconfdir}");
     if (index >= 0) {
-        result = result.tqreplace(index, 13, "@sysconfdir@");
+        result = result.replace(index, 13, "@sysconfdir@");
         changed = true;
     }
-    index = result.tqfind("$(sysconfdir)");
+    index = result.find("$(sysconfdir)");
     if (index >= 0) {
-        result = result.tqreplace(index, 13, "@sysconfdir@");
+        result = result.replace(index, 13, "@sysconfdir@");
         changed = true;
     }
     if (changed)
@@ -186,7 +186,7 @@ int main(int argc, char **argv)
             "wallpaper", I18N_NOOP("Wallpapers"),
             "xdgdata-apps", I18N_NOOP("XDG Application menu (.desktop files)"),
             "xdgdata-dirs", I18N_NOOP("XDG Menu descriptions (.directory files)"),
-            "xdgconf-menu", I18N_NOOP("XDG Menu tqlayout (.menu files)"),
+            "xdgconf-menu", I18N_NOOP("XDG Menu layout (.menu files)"),
             "tmp", I18N_NOOP("Temporary files (specific for both current host and current user)"),
             "socket", I18N_NOOP("UNIX Sockets (specific for both current host and current user)"),
             0, 0
diff --git a/kdecore/kdebug.areas b/kdecore/kdebug.areas
index d98e54df6..d1dc1ffa1 100644
--- a/kdecore/kdebug.areas
+++ b/kdecore/kdebug.areas
@@ -81,7 +81,7 @@
 1210        kicker
 1211        konsole
 1212        kwin
-1213        kapptqfinder
+1213        kappfinder
 1214        kdesktop (icons)
 1215        ksysguard
 1216        kwin (client errors)
@@ -107,10 +107,10 @@
 1511        kdessh (kdeutils)
 1512        kdepasswd (kdeutils)
 1601        ark (kdeutils)
-1901        ktqfind
-1902        ktqfind (KtqfindWindow::updateResults)
-1903        ktqfind (KtqfindTabDialog::createQuery)
-2000        ktqfind
+1901        kfind
+1902        kfind (KfindWindow::updateResults)
+1903        kfind (KfindTabDialog::createQuery)
+2000        kfind
 2001        kregexpeditor
 2002        kfloppy
 2003        ksim
@@ -427,11 +427,11 @@
 20011        KDB (Connection)
 20012        KDB (plugin)
 
-#kfiletqreplace
-23000 	     KFileReplace (kfiletqreplacepart)
+#kfilereplace
+23000 	     KFileReplace (kfilereplacepart)
 
 #klinkstatus
-23100        KLinktqStatus
+23100        KLinkStatus
 
 # Quanta
 24000        Quanta
diff --git a/kdecore/kdebug.cpp b/kdecore/kdebug.cpp
index 60e765f29..b581b5fdd 100644
--- a/kdecore/kdebug.cpp
+++ b/kdecore/kdebug.cpp
@@ -86,7 +86,7 @@ static TQCString getDescrFromNum(unsigned int _num)
     KDebugCache->setAutoDelete(true);
   }
 
-  KDebugEntry *ent = KDebugCache->tqfind( _num );
+  KDebugEntry *ent = KDebugCache->find( _num );
   if ( ent )
     return ent->descr;
 
@@ -130,7 +130,7 @@ static TQCString getDescrFromNum(unsigned int _num)
           ch=line[++i];
       } while ( ch >= '0' && ch <= '9');
 
-      const TQ_ULONG number =line.mid(numStart,i).toULong();
+      const Q_ULONG number =line.mid(numStart,i).toULong();
 
       while (line[i] && line[i] <= ' ')
         i++;
@@ -139,7 +139,7 @@ static TQCString getDescrFromNum(unsigned int _num)
   }
   file.close();
 
-  ent = KDebugCache->tqfind( _num );
+  ent = KDebugCache->find( _num );
   if ( ent )
       return ent->descr;
 
@@ -373,7 +373,7 @@ kdbgstream& kdbgstream::operator << (TQChar ch)
 {
   if (!print) return *this;
   if (!ch.isPrint())
-    output += "\\x" + TQString::number( ch.tqunicode(), 16 ).rightJustify(2, '0');
+    output += "\\x" + TQString::number( ch.unicode(), 16 ).rightJustify(2, '0');
   else {
     output += ch;
     if (ch == (QChar)'\n') flush();
@@ -403,7 +403,7 @@ kdbgstream& kdbgstream::operator << (const TQWidget* widget)
 	} else {
 	  string += (TQString)" to widget " + widget->name() + ", ";
 	}
-      string += "tqgeometry="
+      string += "geometry="
 	+ TQString().setNum(widget->width())
 	+ "x"+TQString().setNum(widget->height())
 	+ "+"+TQString().setNum(widget->x())
@@ -567,8 +567,8 @@ TQString kdBacktrace(int levels)
 
     for (int i = 0; i < n; ++i)
         s += TQString::number(i) +
-             TQString::tqfromLatin1(": ") +
-             TQString::tqfromLatin1(strings[i]) + TQString::tqfromLatin1("\n");
+             TQString::fromLatin1(": ") +
+             TQString::fromLatin1(strings[i]) + TQString::fromLatin1("\n");
     s += "]\n";
     if (strings)
         free (strings);
diff --git a/kdecore/kdebug.h b/kdecore/kdebug.h
index cd472174c..7d9dd5957 100644
--- a/kdecore/kdebug.h
+++ b/kdecore/kdebug.h
@@ -85,7 +85,7 @@ class KDECORE_EXPORT kdbgstream {
     kdbgstream(unsigned int _area, unsigned int _level, bool _print = true) :
       area(_area), level(_level),  print(_print) { }
     kdbgstream(const char * initialString, unsigned int _area, unsigned int _level, bool _print = true) :
-      output(TQString::tqfromLatin1(initialString)), area(_area), level(_level),  print(_print) { }
+      output(TQString::fromLatin1(initialString)), area(_area), level(_level),  print(_print) { }
     /// Copy constructor
     kdbgstream(kdbgstream &str);
     kdbgstream(const kdbgstream &str) :
@@ -98,7 +98,7 @@ class KDECORE_EXPORT kdbgstream {
      */
     kdbgstream &operator<<(bool i)  {
 	if (!print) return *this;
-	output += TQString::tqfromLatin1(i ? "true" : "false");
+	output += TQString::fromLatin1(i ? "true" : "false");
 	return *this;
     }
     /**
@@ -281,7 +281,7 @@ class KDECORE_EXPORT kdbgstream {
      ;
 
     /** Operator to print out basic information about a TQWidget.
-     *  Output of class names only works if the class is tqmoc'ified.
+     *  Output of class names only works if the class is moc'ified.
      * @param widget the widget to print
      * @return this stream
      */
diff --git a/kdecore/kdelibs_export.h b/kdecore/kdelibs_export.h
index 5624fcddb..e7faabdcf 100644
--- a/kdecore/kdelibs_export.h
+++ b/kdecore/kdelibs_export.h
@@ -67,7 +67,7 @@
 
 #endif /*_KDELIBS_EXPORT_H*/
 
-/* workaround for kdecore: stupid tqmoc's grammar doesn't accept two macros
+/* workaround for kdecore: stupid moc's grammar doesn't accept two macros
    between 'class' keyword and <classname>: */
 #ifdef KDE_DEPRECATED
 # ifndef KDECORE_EXPORT_DEPRECATED
diff --git a/kdecore/kdemacros.h.cmake b/kdecore/kdemacros.h.cmake
index 9cb59ccd1..d0d8126d0 100644
--- a/kdecore/kdemacros.h.cmake
+++ b/kdecore/kdemacros.h.cmake
@@ -105,11 +105,11 @@
  * this is because usually get called by the class which they belong to,
  * and one'd assume that a class author doesn't use deprecated methods of his
  * own class. The only exception to this are signals which are connected to
- * other signals; they get invoked from tqmoc-generated code. In any case, 
+ * other signals; they get invoked from moc-generated code. In any case, 
  * printing a warning message in either case is not useful.
  * For slots, it can make sense (since slots can be invoked directly) but be
  * aware that if the slots get triggered by a signal, the will get called from
- * tqmoc code as well and thus the warnings are useless.
+ * moc code as well and thus the warnings are useless.
  *
  * \par
  * Also note that it is not possible to use KDE_DEPRECATED for classes which
@@ -148,7 +148,7 @@
  * The KDE_ISUNLIKELY macro tags an expression as unlikely evaluating to 'true'. 
  *
  * \note
- * Do NOT use ( !KDE_ISLIKELY(foo) ) as an tqreplacement for KDE_ISUNLIKELY !
+ * Do NOT use ( !KDE_ISLIKELY(foo) ) as an replacement for KDE_ISUNLIKELY !
  *
  * \code
  * if ( KDE_ISUNLIKELY( testsomething() ) )
@@ -172,7 +172,7 @@
  *
  * \note The added functions must be added to the header at the same location
  * as the macro; changing the order of virtual functions in a header is also
- * binary incompatible as it breaks the tqlayout of the vtable.
+ * binary incompatible as it breaks the layout of the vtable.
  */
 
 #define RESERVE_VIRTUAL_1 \
diff --git a/kdecore/kdemacros.h.in b/kdecore/kdemacros.h.in
index 62d905e32..00f49bbd7 100644
--- a/kdecore/kdemacros.h.in
+++ b/kdecore/kdemacros.h.in
@@ -105,11 +105,11 @@
  * this is because usually get called by the class which they belong to,
  * and one'd assume that a class author doesn't use deprecated methods of his
  * own class. The only exception to this are signals which are connected to
- * other signals; they get invoked from tqmoc-generated code. In any case, 
+ * other signals; they get invoked from moc-generated code. In any case, 
  * printing a warning message in either case is not useful.
  * For slots, it can make sense (since slots can be invoked directly) but be
  * aware that if the slots get triggered by a signal, the will get called from
- * tqmoc code as well and thus the warnings are useless.
+ * moc code as well and thus the warnings are useless.
  *
  * \par
  * Also note that it is not possible to use KDE_DEPRECATED for classes which
@@ -148,7 +148,7 @@
  * The KDE_ISUNLIKELY macro tags an expression as unlikely evaluating to 'true'. 
  *
  * \note
- * Do NOT use ( !KDE_ISLIKELY(foo) ) as an tqreplacement for KDE_ISUNLIKELY !
+ * Do NOT use ( !KDE_ISLIKELY(foo) ) as an replacement for KDE_ISUNLIKELY !
  *
  * \code
  * if ( KDE_ISUNLIKELY( testsomething() ) )
@@ -172,7 +172,7 @@
  *
  * \note The added functions must be added to the header at the same location
  * as the macro; changing the order of virtual functions in a header is also
- * binary incompatible as it breaks the tqlayout of the vtable.
+ * binary incompatible as it breaks the layout of the vtable.
  */
 
 #define RESERVE_VIRTUAL_1 \
diff --git a/kdecore/kdesktopfile.cpp b/kdecore/kdesktopfile.cpp
index c29f5b3cb..09a3f1e9b 100644
--- a/kdecore/kdesktopfile.cpp
+++ b/kdecore/kdesktopfile.cpp
@@ -42,7 +42,7 @@
 
 KDesktopFile::KDesktopFile(const TQString &fileName, bool bReadOnly,
 			   const char * resType)
-  : KConfig(TQString::tqfromLatin1(""), bReadOnly, false)
+  : KConfig(TQString::fromLatin1(""), bReadOnly, false)
 {
   // KConfigBackEnd will try to locate the filename that is provided
   // based on the resource type specified, _only_ if the filename
@@ -83,7 +83,7 @@ TQString KDesktopFile::locateLocal(const TQString &path)
       {
         // Hm, that didn't work...
         // What now? Use filename only and hope for the best.
-        local = path.mid(path.tqfindRev('/')+1);
+        local = path.mid(path.findRev('/')+1);
       }
       local = ::locateLocal("xdgdata-dirs", local);
     }
@@ -102,7 +102,7 @@ TQString KDesktopFile::locateLocal(const TQString &path)
       if (!TQDir::isRelativePath(local))
       {
         // What now? Use filename only and hope for the best.
-        local = path.mid(path.tqfindRev('/')+1);
+        local = path.mid(path.findRev('/')+1);
       }
       local = ::locateLocal("xdgdata-apps", local);
     }
@@ -114,9 +114,9 @@ bool KDesktopFile::isDesktopFile(const TQString& path)
 {
   int len = path.length();
 
-  if(len > 8 && path.right(8) == TQString::tqfromLatin1(".desktop"))
+  if(len > 8 && path.right(8) == TQString::fromLatin1(".desktop"))
     return true;
-  else if(len > 7 && path.right(7) == TQString::tqfromLatin1(".kdelnk"))
+  else if(len > 7 && path.right(7) == TQString::fromLatin1(".kdelnk"))
     return true;
   else
     return false;
@@ -155,8 +155,8 @@ TQString KDesktopFile::translatedEntry(const char* key) const
   if (hasKey(key)) {
     TQString value = readEntryUntranslated(key);
     TQString fName = fileName();
-    fName = fName.mid(fName.tqfindRev('/')+1);
-    TQString po_lookup_key = TQString::tqfromLatin1(key) + "(" + fName + "): " + value;
+    fName = fName.mid(fName.findRev('/')+1);
+    TQString po_lookup_key = TQString::fromLatin1(key) + "(" + fName + "): " + value;
     TQString po_value = KGlobal::locale()->translate(po_lookup_key.utf8().data());
 
     if (po_value == po_lookup_key)
@@ -241,33 +241,33 @@ TQStringList KDesktopFile::readActions() const
 
 void KDesktopFile::setActionGroup(const TQString &group)
 {
-    setGroup(TQString::tqfromLatin1("Desktop Action ") + group);
+    setGroup(TQString::fromLatin1("Desktop Action ") + group);
 }
 
 bool KDesktopFile::hasActionGroup(const TQString &group) const
 {
-  return hasGroup(TQString::tqfromLatin1("Desktop Action ") + group);
+  return hasGroup(TQString::fromLatin1("Desktop Action ") + group);
 }
 
 bool KDesktopFile::hasLinkType() const
 {
-  return readEntry("Type") == TQString::tqfromLatin1("Link");
+  return readEntry("Type") == TQString::fromLatin1("Link");
 }
 
 bool KDesktopFile::hasApplicationType() const
 {
-  return readEntry("Type") == TQString::tqfromLatin1("Application");
+  return readEntry("Type") == TQString::fromLatin1("Application");
 }
 
 bool KDesktopFile::hasMimeTypeType() const
 {
-  return readEntry("Type") == TQString::tqfromLatin1("MimeType");
+  return readEntry("Type") == TQString::fromLatin1("MimeType");
 }
 
 bool KDesktopFile::hasDeviceType() const
 {
-  return readEntry("Type") == TQString::tqfromLatin1("FSDev") ||
-         readEntry("Type") == TQString::tqfromLatin1("FSDevice");
+  return readEntry("Type") == TQString::fromLatin1("FSDev") ||
+         readEntry("Type") == TQString::fromLatin1("FSDevice");
 }
 
 bool KDesktopFile::tryExec() const
diff --git a/kdecore/kdesktopfile.h b/kdecore/kdesktopfile.h
index b5b4b97d1..bb705b696 100644
--- a/kdecore/kdesktopfile.h
+++ b/kdecore/kdesktopfile.h
@@ -181,9 +181,9 @@ public:
   bool hasDeviceType() const;
 
   /**
-   * Checks whether the TryExec field tqcontains a binary
+   * Checks whether the TryExec field contains a binary
    * which is found on the local system.
-   * @return true if TryExec tqcontains an existing binary
+   * @return true if TryExec contains an existing binary
    */
   bool tryExec() const;
 
diff --git a/kdecore/kentities.c b/kdecore/kentities.c
index b4cc4aeba..8181e5a6c 100644
--- a/kdecore/kentities.c
+++ b/kdecore/kentities.c
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.1 */
-/* Command-line: gperf -a -L ANSI-C -E -C -c -o -t -k '*' -Nkde_tqfindEntity -D -Hhash_Entity -Wwordlist_Entity -s 2 kentities.gperf  */
+/* Command-line: gperf -a -L ANSI-C -E -C -c -o -t -k '*' -Nkde_findEntity -D -Hhash_Entity -Wwordlist_Entity -s 2 kentities.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -53,7 +53,7 @@
   
     kentities.gperf: input file to generate a hash table for entities
     kentities.c: DO NOT EDIT! generated by the command
-    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_tqfindEntity -D -s 2 khtmlentities.gperf > entities.c"
+    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 khtmlentities.gperf > entities.c"
     from kentities.gperf
 
     $Id$     
@@ -140,7 +140,7 @@ hash_Entity (register const char *str, register unsigned int len)
 __inline
 #endif
 const struct entity *
-kde_tqfindEntity (register const char *str, register unsigned int len)
+kde_findEntity (register const char *str, register unsigned int len)
 {
   enum
     {
diff --git a/kdecore/kentities.gperf b/kdecore/kentities.gperf
index aaaccba80..08f712707 100644
--- a/kdecore/kentities.gperf
+++ b/kdecore/kentities.gperf
@@ -22,7 +22,7 @@
   
     kentities.gperf: input file to generate a hash table for entities
     kentities.c: DO NOT EDIT! generated by the command
-    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_tqfindEntity -D -s 2 khtmlentities.gperf > entities.c"
+    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 khtmlentities.gperf > entities.c"
     from kentities.gperf
 
     $Id$     
diff --git a/kdecore/kextsock.cpp b/kdecore/kextsock.cpp
index d0472177e..6371bb7eb 100644
--- a/kdecore/kextsock.cpp
+++ b/kdecore/kextsock.cpp
@@ -236,12 +236,12 @@ bool KExtendedSocket::reset()
   d->syserror = 0;
 }
 
-int KExtendedSocket::sockettqStatus() const
+int KExtendedSocket::socketStatus() const
 {
   return d->status;
 }
 
-void KExtendedSocket::setSockettqStatus(int newstatus)
+void KExtendedSocket::setSocketStatus(int newstatus)
 {
   d->status = newstatus;
 }
@@ -716,7 +716,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize)
 /*
  * Finds the local address for this socket
  * if we have done this already, we return it. Otherwise, we'll have
- * to tqfind the socket name
+ * to find the socket name
  */
 const ::KSocketAddress *KExtendedSocket::localAddress()
 {
@@ -1436,7 +1436,7 @@ void KExtendedSocket::flush()
 }
 
 
-TQ_LONG KExtendedSocket::readBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KExtendedSocket::readBlock(char *data, Q_ULONG maxlen)
 {
   cleanError();
   if (d->status < connected || d->flags & passiveSocket)
@@ -1481,7 +1481,7 @@ TQ_LONG KExtendedSocket::readBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KExtendedSocket::writeBlock(const char *data, TQ_ULONG len)
+Q_LONG KExtendedSocket::writeBlock(const char *data, Q_ULONG len)
 {
   cleanError();
   if (d->status < connected || d->status >= closing || d->flags & passiveSocket)
@@ -1808,7 +1808,7 @@ void KExtendedSocket::connectionEvent()
   if (sockfd != -1)
     {
       // our socket has activity
-      // tqfind out what it was
+      // find out what it was
       int retval;
       socklen_t len = sizeof(errcode);
       retval = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (char*)&errcode, &len);
@@ -2075,7 +2075,7 @@ TQPtrList<KAddressInfo> KExtendedSocket::lookup(const TQString& host, const TQSt
   struct sockaddr static_sa, *sa = &static_sa;
   ksocklen_t len = sizeof(static_sa);
 
-  /* tqfind out the socket length, in advance
+  /* find out the socket length, in advance
    * we use a sockaddr allocated on the heap just not to pass down
    * a NULL pointer to the first call. Some systems are reported to
    * set len to 0 if we pass NULL as the sockaddr */
@@ -2123,7 +2123,7 @@ TQPtrList<KAddressInfo> KExtendedSocket::lookup(const TQString& host, const TQSt
   struct sockaddr static_sa, *sa = &static_sa;
   ksocklen_t len = sizeof(static_sa);
 
-  /* tqfind out the socket length, in advance
+  /* find out the socket length, in advance
    * we use a sockaddr allocated on the heap just not to pass down
    * a NULL pointer to the first call. Some systems are reported to
    * set len to 0 if we pass NULL as the sockaddr */
diff --git a/kdecore/kextsock.h b/kdecore/kextsock.h
index c72c49cab..2bfb22bfe 100644
--- a/kdecore/kextsock.h
+++ b/kdecore/kextsock.h
@@ -82,7 +82,7 @@ class KExtendedSocketPrivate;
  *
  * @deprecated
  *	This class is now deprecated. Please use the classes in KNetwork for
- *	new programs. In particular, this class is tqreplaced by KNetwork::KStreamSocket
+ *	new programs. In particular, this class is replaced by KNetwork::KStreamSocket
  *	and @ref KNetwork::KServerSocket.
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
@@ -128,7 +128,7 @@ public:
    * The status are sequential. If a change to one status is requested,
    * all the prior status will be passed and their actions, performed
    */
-  enum SocktqStatus
+  enum SockStatus
   {
     // the numbers are scattered so that we leave room for future expansion
     error = -1,			// invalid status!
@@ -220,9 +220,9 @@ public:
   /**
    * Returns the class status.
    * @return the class status
-   * @see ::SocktqStatus
+   * @see ::SockStatus
    */
-  int sockettqStatus() const;
+  int socketStatus() const;
 
   /**
    * Returns the related system error code
@@ -285,7 +285,7 @@ public:
   bool setPort(const TQString& port);
 
   /**
-   * Returns the port/service. If it is a port, the string tqcontains a number.
+   * Returns the port/service. If it is a port, the string contains a number.
    * @return the port or TQString::null if it has not been set.
    */
   TQString port() const;
@@ -450,7 +450,7 @@ public:
    * @param enable	if true, no IPv4 translation will be performed;
    *			this socket will be restricted to IPv6 communication
    * @returns true on success, false on failure.
-   * @see localAddress to tqfind out if this is an IPv6 socket
+   * @see localAddress to find out if this is an IPv6 socket
    */
   bool setIPv6Only(bool enable);
 
@@ -681,7 +681,7 @@ public:
    * @return the length of this socket, or 0 if unsupported
    */
 #ifdef USE_QT3
-  virtual inline TQ_ULONG size() const
+  virtual inline Q_ULONG size() const
 #endif // USE_QT3
 #ifdef USE_QT4
   virtual inline qint64 size() const
@@ -692,7 +692,7 @@ public:
    * Returns relative position from start. This call is not supported on sockets.
    * @return the relative position from the start, or 0 if unsupported
    */
-  virtual inline TQ_ULONG at() const
+  virtual inline Q_ULONG at() const
   { return 0; }
 
   /**
@@ -740,7 +740,7 @@ public:
    * This function returns 0, if the function detected end-of-file condition
    * (socket was closed)
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen);
 
   /**
    * Writes a block of data to the socket.
@@ -765,7 +765,7 @@ public:
    * The return value might be less than @p len if the output buffers cannot
    * accommodate that many bytes and -1 in the case of an errro.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len);
 
   /**
    * Peeks at a block of data from the socket.
@@ -929,7 +929,7 @@ protected:
   /**
    * Sets the socket status. For derived classes only.
    */
-  void setSockettqStatus(int status);
+  void setSocketStatus(int status);
 
 public:
   /**
diff --git a/kdecore/kgenericfactory.h b/kdecore/kgenericfactory.h
index 4d2c03615..0bdeaa846 100644
--- a/kdecore/kgenericfactory.h
+++ b/kdecore/kgenericfactory.h
@@ -133,7 +133,7 @@ KInstance *KGenericFactoryBase<T>::instance()
  *                         const TQStringList &args);</code>
  *     <li>If the class is derived from KParts::Part then it needs to have
  *         a constructor like:
- *         <code>MyPart( TQWidget *tqparentWidget, const char *widgetName,
+ *         <code>MyPart( TQWidget *parentWidget, const char *widgetName,
  *                       TQObject *parent, const char *name,
  *                       const TQStringList &args );</code>
  * </ul>
@@ -190,8 +190,8 @@ protected:
                                   const char *className, const TQStringList &args )
     {
         KGenericFactoryBase<Product>::initializeMessageCatalogue();
-        return TQT_TQOBJECT( (KDEPrivate::ConcreteFactory<Product, ParentType>
-            ::create( 0, 0, parent, name, className, args )) );
+        return KDEPrivate::ConcreteFactory<Product, ParentType>
+            ::create( 0, 0, parent, name, className, args );
     }
 };
 
@@ -216,7 +216,7 @@ protected:
  *                         const TQStringList &args);</code>
  *     <li>If the class is derived from KParts::Part then it needs to have
  *         a constructor like:
- *         <code>MyPart( TQWidget *tqparentWidget, const char *widgetName,
+ *         <code>MyPart( TQWidget *parentWidget, const char *widgetName,
  *                       TQObject *parent, const char *name,
  *                       const TQStringList &args );</code>
  * </ul>
@@ -253,7 +253,7 @@ protected:
  *     {
  *         Q_ OBJECT
  *     public:
- *         MyDialogComponent( TQWidget *tqparentWidget, const char *name,
+ *         MyDialogComponent( TQWidget *parentWidget, const char *name,
  *                            const TQStringList &args );
  *         ...
  *     };
@@ -311,7 +311,7 @@ protected:
  *                         const TQStringList &args);</code>
  *     <li>If the class is derived from KParts::Part then it needs to have
  *         a constructor like:
- *         <code>MyPart( TQWidget *tqparentWidget, const char *widgetName,
+ *         <code>MyPart( TQWidget *parentWidget, const char *widgetName,
  *                       TQObject *parent, const char *name,
  *                       const TQStringList &args );</code>
  * </ul>
@@ -348,7 +348,7 @@ protected:
  *     {
  *         Q_ OBJECT
  *     public:
- *         MyDialogComponent( TQWidget *tqparentWidget, const char *name,
+ *         MyDialogComponent( TQWidget *parentWidget, const char *name,
  *                            const TQStringList &args );
  *         ...
  *     };
diff --git a/kdecore/kgenericfactory.tcc b/kdecore/kgenericfactory.tcc
index cee230b53..41cd77824 100644
--- a/kdecore/kgenericfactory.tcc
+++ b/kdecore/kgenericfactory.tcc
@@ -112,26 +112,26 @@ namespace KDEPrivate
     // but not least the standard default constructor of parent/name .
     // the choice of the right constructor is done using an ordered inheritance
     // test.
-    template <class Product, class ParentType = TQObject>
+    template <class Product, class ParentType = QObject>
     class ConcreteFactory
     {
     public:
         typedef typename If< PartInheritanceTest< Product >::Result,
                              KParts::Part,
                              typename If< QWidgetInheritanceTest< Product >::Result,
-                                          QWidget, TQObject >::Result >::Result BaseType;
+                                          QWidget, QObject >::Result >::Result BaseType;
  
-        static inline Product *create( QWidget *tqparentWidget, const char *widgetName,
-                                       TQObject *parent, const char *name, 
+        static inline Product *create( QWidget *parentWidget, const char *widgetName,
+                                       QObject *parent, const char *name, 
                                        const char *className, const QStringList &args )
         {
-            QMetaObject *tqmetaObject = Product::staticMetaObject();
-            while ( tqmetaObject )
+            QMetaObject *metaObject = Product::staticMetaObject();
+            while ( metaObject )
             {
-                if ( !qstrcmp( className, tqmetaObject->className() ) )
-                    return create( tqparentWidget, widgetName,
+                if ( !qstrcmp( className, metaObject->className() ) )
+                    return create( parentWidget, widgetName,
                                    parent, name, args, Type2Type<BaseType>() );
-                tqmetaObject = tqmetaObject->superClass();
+                metaObject = metaObject->superClass();
             }
             return 0;
         }
@@ -139,15 +139,15 @@ namespace KDEPrivate
         typedef typename If< QWidgetInheritanceTest<ParentType>::Result,
                              ParentType, QWidget >::Result WidgetParentType;
 
-        static inline Product *create( QWidget *tqparentWidget, const char *widgetName,
-                                       TQObject *parent, const char *name,
+        static inline Product *create( QWidget *parentWidget, const char *widgetName,
+                                       QObject *parent, const char *name,
                                        const QStringList &args, Type2Type<KParts::Part> )
         { 
-            return new Product( tqparentWidget, widgetName, parent, name, args ); 
+            return new Product( parentWidget, widgetName, parent, name, args ); 
         }
 
-        static inline Product *create( QWidget* /*tqparentWidget*/, const char* /*widgetName*/,
-                                       TQObject *parent, const char *name,
+        static inline Product *create( QWidget* /*parentWidget*/, const char* /*widgetName*/,
+                                       QObject *parent, const char *name,
                                        const QStringList &args, Type2Type<QWidget> )
         {
 
@@ -157,9 +157,9 @@ namespace KDEPrivate
             return new Product( p, name, args );
         }
 
-        static inline Product *create( QWidget* /*tqparentWidget*/, const char* /*widgetName*/,
-                                       TQObject *parent, const char *name,
-                                       const QStringList &args, Type2Type<TQObject> )
+        static inline Product *create( QWidget* /*parentWidget*/, const char* /*widgetName*/,
+                                       QObject *parent, const char *name,
+                                       const QStringList &args, Type2Type<QObject> )
         { 
             ParentType *p = dynamic_cast<ParentType *>( parent );
             if ( parent && !p )
@@ -171,16 +171,16 @@ namespace KDEPrivate
     // this template is used to iterate through the typelist and call the
     // concrete factory for each type. the specializations of this template
     // are the ones actually being responsible for iterating, in fact.
-    template <class Product, class ParentType = TQObject>
+    template <class Product, class ParentType = QObject>
     class MultiFactory
     {
     public:
-        inline static TQObject *create( QWidget *tqparentWidget, const char *widgetName,
-                                       TQObject *parent, const char *name,
+        inline static QObject *create( QWidget *parentWidget, const char *widgetName,
+                                       QObject *parent, const char *name,
                                        const char *className, 
                                        const QStringList &args )
         {
-            return ConcreteFactory<Product, ParentType>::create( tqparentWidget, widgetName,
+            return ConcreteFactory<Product, ParentType>::create( parentWidget, widgetName,
                                                                  parent, name, className, 
                                                                  args );
         }
@@ -193,7 +193,7 @@ namespace KDEPrivate
     class MultiFactory<KDE::NullType>
     {
     public:
-        inline static TQObject *create( QWidget *, const char *, TQObject *, 
+        inline static QObject *create( QWidget *, const char *, QObject *, 
                                        const char *, const char *, 
                                        const QStringList & )
         { return 0; }
@@ -205,29 +205,29 @@ namespace KDEPrivate
     class MultiFactory<KDE::NullType, KDE::NullType>
     {
     public:
-        inline static TQObject *create( QWidget *, const char *, TQObject *, 
+        inline static QObject *create( QWidget *, const char *, QObject *, 
                                        const char *, const char *, 
                                        const QStringList & )
         { return 0; }
     };
  
     template <class Product, class ProductListTail>
-    class MultiFactory< KTypeList<Product, ProductListTail>, TQObject >
+    class MultiFactory< KTypeList<Product, ProductListTail>, QObject >
     {
     public:
-        inline static TQObject *create( QWidget *tqparentWidget, const char *widgetName,
-                                       TQObject *parent, const char *name,
+        inline static QObject *create( QWidget *parentWidget, const char *widgetName,
+                                       QObject *parent, const char *name,
                                        const char *className, 
                                        const QStringList &args )
         {
             // try with the head of the typelist first. the head is always
             // a concrete type.
-            TQObject *object = MultiFactory<Product>::create( tqparentWidget, widgetName,
+            QObject *object = MultiFactory<Product>::create( parentWidget, widgetName,
                                                              parent, name, className, 
                                                              args );
 
             if ( !object )
-                object = MultiFactory<ProductListTail>::create( tqparentWidget, widgetName,
+                object = MultiFactory<ProductListTail>::create( parentWidget, widgetName,
                                                                 parent, name, className, 
                                                                 args );
 
@@ -241,15 +241,15 @@ namespace KDEPrivate
                         KTypeList<ParentType, ParentTypeListTail> >
     {
     public:
-        inline static TQObject *create( QWidget *tqparentWidget, const char *widgetName,
-                                       TQObject *parent, const char *name,
+        inline static QObject *create( QWidget *parentWidget, const char *widgetName,
+                                       QObject *parent, const char *name,
                                        const char *className, 
                                        const QStringList &args )
         {
             // try with the head of the typelist first. the head is always
             // a concrete type.
-            TQObject *object = MultiFactory<Product, ParentType>
-                                  ::create( tqparentWidget, widgetName,
+            QObject *object = MultiFactory<Product, ParentType>
+                                  ::create( parentWidget, widgetName,
                                             parent, name, className, args );
 
             // if that failed continue by advancing the typelist, calling this
@@ -257,7 +257,7 @@ namespace KDEPrivate
             // at the end we reach the nulltype specialization.
             if ( !object )
                 object = MultiFactory<ProductListTail, ParentTypeListTail>
-                             ::create( tqparentWidget, widgetName,
+                             ::create( parentWidget, widgetName,
                                        parent, name, className, args );
 
             return object;
diff --git a/kdecore/kglobal.cpp b/kdecore/kglobal.cpp
index 347e8d31c..b886d8d7f 100644
--- a/kdecore/kglobal.cpp
+++ b/kdecore/kglobal.cpp
@@ -127,7 +127,7 @@ void KGlobal::setActiveInstance(KInstance *i)
 const TQString &
 KGlobal::staticQString(const char *str)
 {
-   return staticQString(TQString::tqfromLatin1(str));
+   return staticQString(TQString::fromLatin1(str));
 }
 
 class KStringDict : public TQDict<TQString>
@@ -150,7 +150,7 @@ KGlobal::staticQString(const TQString &str)
       _stringDict->setAutoDelete( true );
       kglobal_init();
     }
-   TQString *result = _stringDict->tqfind(str);
+   TQString *result = _stringDict->find(str);
    if (!result)
    {
       result = new TQString(str);
@@ -170,7 +170,7 @@ KGlobal::registerStaticDeleter(KStaticDeleterBase *obj)
 {
    if (!_staticDeleters)
       kglobal_init();
-   if (_staticDeleters->tqfind(obj) == -1)
+   if (_staticDeleters->find(obj) == -1)
       _staticDeleters->append(obj);
 }
 
diff --git a/kdecore/kglobal.h b/kdecore/kglobal.h
index 93304a281..c00279e1b 100644
--- a/kdecore/kglobal.h
+++ b/kdecore/kglobal.h
@@ -172,12 +172,12 @@ public:
 
 /**
  * \relates KGlobal
- * A typesafe function to tqfind the minimum of the two arguments.
+ * A typesafe function to find the minimum of the two arguments.
  */
 #define KMIN(a,b)	kMin(a,b)
 /**
  * \relates KGlobal
- * A typesafe function to tqfind the maximum of the two arguments.
+ * A typesafe function to find the maximum of the two arguments.
  */
 #define KMAX(a,b)	kMax(a,b)
 /**
diff --git a/kdecore/kglobalaccel.h b/kdecore/kglobalaccel.h
index 5e1ddd456..33dd5e37b 100644
--- a/kdecore/kglobalaccel.h
+++ b/kdecore/kglobalaccel.h
@@ -42,15 +42,15 @@ class KGlobalAccelPrivate;
 * @see KKeyDialog
 * @short Configurable global shortcut support
 */
-class KDECORE_EXPORT KGlobalAccel : public TQObject
+class KDECORE_EXPORT KGlobalAccel : public QObject
 {
 	Q_OBJECT
  public:
 	/**
 	 * Creates a new KGlobalAccel object with the given pParent and
 	 * psName.
-	 * @param pParent the parent of the TQObject
-	 * @param psName the name of the TQObject
+	 * @param pParent the parent of the QObject
+	 * @param psName the name of the QObject
 	 */
 	KGlobalAccel( TQObject* pParent, const char* psName = 0 );
 	virtual ~KGlobalAccel();
diff --git a/kdecore/kglobalaccel_win.cpp b/kdecore/kglobalaccel_win.cpp
index a1b6debbd..8b0c81f1a 100644
--- a/kdecore/kglobalaccel_win.cpp
+++ b/kdecore/kglobalaccel_win.cpp
@@ -116,7 +116,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce
 		return false;
 	}
 
-	// Make sure that grab tqmasks have been initialized.
+	// Make sure that grab masks have been initialized.
 	if( g_keyModMaskXOnOrOff == 0 )
 		calculateGrabMasks();
 
@@ -136,7 +136,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce
 
 	// We'll have to grab 8 key modifier combinations in order to cover all
 	//  combinations of CapsLock, NumLock, ScrollLock.
-	// Does anyone with more X-savvy know how to set a tqmask on qt_xrootwin so that
+	// Does anyone with more X-savvy know how to set a mask on qt_xrootwin so that
 	//  the irrelevant bits are always ignored and we can just make one XGrabKey
 	//  call per accelerator? -- ellis
 #ifndef NDEBUG
@@ -265,7 +265,7 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
 			.arg( codemod.code, 0, 16 ).arg( pEvent->xkey.state, 0, 16 ).arg( codemod.mod, 0, 16 ) << endl;
 
 	// Search for which accelerator activated this event:
-	if( !m_rgCodeModToAction.tqcontains( codemod ) ) {
+	if( !m_rgCodeModToAction.contains( codemod ) ) {
 #ifndef NDEBUG
 		for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) {
 			KAccelAction* pAction = *it;
@@ -311,14 +311,14 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
 	if( rexPassIndex.search( pAction->methodSlotPtr() ) >= 0 && rexIndex.search( pAction->name() ) >= 0 ) {
 		int n = rexIndex.cap(1).toInt();
 		kdDebug(125) << "Calling " << pAction->methodSlotPtr() << " int = " << n << endl;
-                int slot_id = pAction->objSlotPtr()->tqmetaObject()->tqfindSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+                int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
                 if( slot_id >= 0 ) {
                     QUObject o[2];
                     static_QUType_int.set(o+1,n);
                     const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o );
                 }
 	} else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) {
-                int slot_id = pAction->objSlotPtr()->tqmetaObject()->tqfindSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+                int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
                 if( slot_id >= 0 ) {
                     QUObject o[4];
                     static_QUType_QString.set(o+1,pAction->name());
@@ -327,7 +327,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
                     const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o );
                 }
 	} else {
-                int slot_id = pAction->objSlotPtr()->tqmetaObject()->tqfindSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+                int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
                 if( slot_id >= 0 )
                     const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 );
 	}
diff --git a/kdecore/kglobalaccel_x11.cpp b/kdecore/kglobalaccel_x11.cpp
index 70872c715..e9d86e576 100644
--- a/kdecore/kglobalaccel_x11.cpp
+++ b/kdecore/kglobalaccel_x11.cpp
@@ -54,10 +54,10 @@ extern "C" {
 }
 
 // g_keyModMaskXAccel
-//	tqmask of modifiers which can be used in shortcuts
+//	mask of modifiers which can be used in shortcuts
 //	(meta, alt, ctrl, shift)
 // g_keyModMaskXOnOrOff
-//	tqmask of modifiers where we don't care whether they are on or off
+//	mask of modifiers where we don't care whether they are on or off
 //	(caps lock, num lock, scroll lock)
 static uint g_keyModMaskXAccel = 0;
 static uint g_keyModMaskXOnOrOff = 0;
@@ -163,7 +163,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce
 		return false;
 	}
 
-	// Make sure that grab tqmasks have been initialized.
+	// Make sure that grab masks have been initialized.
 	if( g_keyModMaskXOnOrOff == 0 )
 		calculateGrabMasks();
 
@@ -191,7 +191,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce
 #endif
 	// We'll have to grab 8 key modifier combinations in order to cover all
 	//  combinations of CapsLock, NumLock, ScrollLock.
-	// Does anyone with more X-savvy know how to set a tqmask on qt_xrootwin so that
+	// Does anyone with more X-savvy know how to set a mask on qt_xrootwin so that
 	//  the irrelevant bits are always ignored and we can just make one XGrabKey
 	//  call per accelerator? -- ellis
 #ifndef NDEBUG
@@ -282,7 +282,7 @@ void KGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) {
 			.arg( codemod.code, 0, 16 ).arg( keyCode, 0, 16 ).arg( codemod.mod, 0, 16 ) << endl;
 
 	// Search for which accelerator activated this event:
-	if( !m_rgCodeModToAction.tqcontains( codemod ) ) {
+	if( !m_rgCodeModToAction.contains( codemod ) ) {
 #ifndef NDEBUG
 		for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) {
 			KAccelAction* pAction = *it;
@@ -360,7 +360,7 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
 			.arg( codemod.code, 0, 16 ).arg( pEvent->xkey.state, 0, 16 ).arg( codemod.mod, 0, 16 ) << endl;
 
 	// Search for which accelerator activated this event:
-	if( !m_rgCodeModToAction.tqcontains( codemod ) ) {
+	if( !m_rgCodeModToAction.contains( codemod ) ) {
 #ifndef NDEBUG
 		for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) {
 			KAccelAction* pAction = *it;
@@ -407,14 +407,14 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
 	if( rexPassIndex.search( pAction->methodSlotPtr() ) >= 0 && rexIndex.search( pAction->name() ) >= 0 ) {
 		int n = rexIndex.cap(1).toInt();
 		kdDebug(125) << "Calling " << pAction->methodSlotPtr() << " int = " << n << endl;
-                int slot_id = pAction->objSlotPtr()->tqmetaObject()->tqfindSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+                int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
                 if( slot_id >= 0 ) {
                     QUObject o[2];
                     static_QUType_int.set(o+1,n);
                     const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o );
                 }
 	} else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) {
-                int slot_id = pAction->objSlotPtr()->tqmetaObject()->tqfindSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+                int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
                 if( slot_id >= 0 ) {
                     QUObject o[4];
                     static_QUType_QString.set(o+1,pAction->name());
@@ -423,7 +423,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
                     const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o );
                 }
 	} else {
-                int slot_id = pAction->objSlotPtr()->tqmetaObject()->tqfindSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+                int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
                 if( slot_id >= 0 )
                     const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 );
 	}
diff --git a/kdecore/kglobalsettings.cpp b/kdecore/kglobalsettings.cpp
index 734861663..6dfd92c9b 100644
--- a/kdecore/kglobalsettings.cpp
+++ b/kdecore/kglobalsettings.cpp
@@ -35,7 +35,7 @@
 #include <win32_utils.h>
 static QRgb qt_colorref2qrgb(COLORREF col)
 {
-    return tqRgb(GetRValue(col),GetGValue(col),GetBValue(col));
+    return qRgb(GetRValue(col),GetGValue(col),GetBValue(col));
 }
 #endif
 
@@ -98,9 +98,9 @@ void readXdgUserDirs(TQString *desktop, TQString *documents)
 	while (!line.isNull())
 	{
 		if (line.startsWith("XDG_DESKTOP_DIR="))
-			*desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath());
+			*desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
 		else if (line.startsWith("XDG_DOCUMENTS_DIR="))
-			*documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath());
+			*documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
 
 		line = s.readLine();
 	}
@@ -694,10 +694,10 @@ TQRect KGlobalSettings::splashScreenDesktopGeometry()
                 scr = dw->screenNumber(TQCursor::pos());
             return dw->screenGeometry(scr);
         } else {
-            return dw->tqgeometry();
+            return dw->geometry();
         }
     } else {
-        return dw->tqgeometry();
+        return dw->geometry();
     }
 }
 
@@ -711,10 +711,10 @@ TQRect KGlobalSettings::desktopGeometry(const TQPoint& point)
             group.readBoolEntry("XineramaPlacementEnabled", true)) {
             return dw->screenGeometry(dw->screenNumber(point));
         } else {
-            return dw->tqgeometry();
+            return dw->geometry();
         }
     } else {
-        return dw->tqgeometry();
+        return dw->geometry();
     }
 }
 
@@ -730,10 +730,10 @@ TQRect KGlobalSettings::desktopGeometry(TQWidget* w)
                 return dw->screenGeometry(dw->screenNumber(w));
             else return dw->screenGeometry(-1);
         } else {
-            return dw->tqgeometry();
+            return dw->geometry();
         }
     } else {
-        return dw->tqgeometry();
+        return dw->geometry();
     }
 }
 
diff --git a/kdecore/kglobalsettings.h b/kdecore/kglobalsettings.h
index 957190705..4925fd098 100644
--- a/kdecore/kglobalsettings.h
+++ b/kdecore/kglobalsettings.h
@@ -440,20 +440,20 @@ class KDECORE_EXPORT KGlobalSettings
     static bool wheelMouseZooms();
 
     /**
-     * This function returns the desktop tqgeometry for an application's splash
+     * This function returns the desktop geometry for an application's splash
      * screen.  It takes into account the user's display settings (number of
      * screens, Xinerama, etc), and the user's preferences (if KDE should be
      * Xinerama aware).
      *
-     * @return the tqgeometry to use for the desktop.  Note that it might not
+     * @return the geometry to use for the desktop.  Note that it might not
      *         start at (0,0).
      * @since 3.2
      */
     static TQRect splashScreenDesktopGeometry();
 
     /**
-     * This function returns the desktop tqgeometry for an application that needs
-     * to set the tqgeometry of a widget on the screen manually.  It takes into
+     * This function returns the desktop geometry for an application that needs
+     * to set the geometry of a widget on the screen manually.  It takes into
      * account the user's display settings (number of screens, Xinerama, etc),
      * and the user's preferences (if KDE should be Xinerama aware).
      *
@@ -463,22 +463,22 @@ class KDECORE_EXPORT KGlobalSettings
      * @param point a reference point for the widget, for instance one that the
      *              widget should be adjacent or on top of.
      *
-     * @return the tqgeometry to use for the desktop.  Note that it might not
+     * @return the geometry to use for the desktop.  Note that it might not
      *         start at (0,0).
      * @since 3.2
      */
     static TQRect desktopGeometry(const TQPoint& point);
 
     /**
-     * This function returns the desktop tqgeometry for an application that needs
-     * to set the tqgeometry of a widget on the screen manually.  It takes into
+     * This function returns the desktop geometry for an application that needs
+     * to set the geometry of a widget on the screen manually.  It takes into
      * account the user's display settings (number of screens, Xinerama, etc),
      * and the user's preferences (if KDE should be Xinerama aware).
      *
      * @param w the widget in question.  This is used to determine which screen
      *          to use in Xinerama or multi-head mode.
      *
-     * @return the tqgeometry to use for the desktop.  Note that it might not
+     * @return the geometry to use for the desktop.  Note that it might not
      *         start at (0,0).
      * @since 3.2
      */
@@ -525,7 +525,7 @@ class KDECORE_EXPORT KGlobalSettings
     static bool opaqueResize();
 
     /**
-     * The tqlayout scheme to use for dialog buttons
+     * The layout scheme to use for dialog buttons
      * 
      * @return Returns the number of the scheme to use.
      * @see KDialogBase::setButtonStyle()
diff --git a/kdecore/kiconeffect.cpp b/kdecore/kiconeffect.cpp
index 6cd1e81ca..8315eab6b 100644
--- a/kdecore/kiconeffect.cpp
+++ b/kdecore/kiconeffect.cpp
@@ -153,8 +153,8 @@ TQString KIconEffect::fingerprint(int group, int state) const
         cached += ':';
         cached += tmp.setNum(mValue[group][state]);
         cached += ':';
-        cached += mTrans[group][state] ? TQString::tqfromLatin1("trans")
-            : TQString::tqfromLatin1("notrans");
+        cached += mTrans[group][state] ? TQString::fromLatin1("trans")
+            : TQString::fromLatin1("notrans");
         if (mEffect[group][state] == Colorize || mEffect[group][state] == ToMonochrome)
         {
             cached += ':';
@@ -291,16 +291,16 @@ void KIconEffect::toGray(TQImage &img, float value)
     int rval, gval, bval, val, alpha, i;
     for (i=0; i<pixels; i++)
     {
-	val = tqGray(data[i]);
-	alpha = tqAlpha(data[i]);
+	val = qGray(data[i]);
+	alpha = qAlpha(data[i]);
 	if (value < 1.0)
 	{
-	    rval = static_cast<int>(value*val+(1.0-value)*tqRed(data[i]));
-	    gval = static_cast<int>(value*val+(1.0-value)*tqGreen(data[i]));
-	    bval = static_cast<int>(value*val+(1.0-value)*tqBlue(data[i]));
-	    data[i] = tqRgba(rval, gval, bval, alpha);
+	    rval = static_cast<int>(value*val+(1.0-value)*qRed(data[i]));
+	    gval = static_cast<int>(value*val+(1.0-value)*qGreen(data[i]));
+	    bval = static_cast<int>(value*val+(1.0-value)*qBlue(data[i]));
+	    data[i] = qRgba(rval, gval, bval, alpha);
 	} else
-	    data[i] = tqRgba(val, val, val, alpha);
+	    data[i] = qRgba(val, val, val, alpha);
     }
 }
 
@@ -314,7 +314,7 @@ void KIconEffect::colorize(TQImage &img, const TQColor &col, float value)
     float rcol = col.red(), gcol = col.green(), bcol = col.blue();
     for (i=0; i<pixels; i++)
     {
-        val = tqGray(data[i]);
+        val = qGray(data[i]);
         if (val < 128)
         {
              rval = static_cast<int>(rcol/128*val);
@@ -335,13 +335,13 @@ void KIconEffect::colorize(TQImage &img, const TQColor &col, float value)
 	}
 	if (value < 1.0)
 	{
-	    rval = static_cast<int>(value*rval+(1.0 - value)*tqRed(data[i]));
-	    gval = static_cast<int>(value*gval+(1.0 - value)*tqGreen(data[i]));
-	    bval = static_cast<int>(value*bval+(1.0 - value)*tqBlue(data[i]));
+	    rval = static_cast<int>(value*rval+(1.0 - value)*qRed(data[i]));
+	    gval = static_cast<int>(value*gval+(1.0 - value)*qGreen(data[i]));
+	    bval = static_cast<int>(value*bval+(1.0 - value)*qBlue(data[i]));
 	}
 
-	alpha = tqAlpha(data[i]);
-	data[i] = tqRgba(rval, gval, bval, alpha);
+	alpha = qAlpha(data[i]);
+	data[i] = qRgba(rval, gval, bval, alpha);
     }
 }
 
@@ -357,9 +357,9 @@ void KIconEffect::toMonochrome(TQImage &img, const TQColor &black, const TQColor
    bool grayscale = true;
    // Step 1: determine the average brightness
    for (i=0; i<pixels; i++) {
-       sum += tqGray(data[i])*tqAlpha(data[i]) + 255*(255-tqAlpha(data[i]));
+       sum += qGray(data[i])*qAlpha(data[i]) + 255*(255-qAlpha(data[i]));
        values += 255;
-       if ((tqRed(data[i]) != tqGreen(data[i]) ) || (tqGreen(data[i]) != tqBlue(data[i]) ))
+       if ((qRed(data[i]) != qGreen(data[i]) ) || (qGreen(data[i]) != qBlue(data[i]) ))
            grayscale = false;
    }
    double medium = sum/values;
@@ -367,30 +367,30 @@ void KIconEffect::toMonochrome(TQImage &img, const TQColor &black, const TQColor
    // Step 2: Modify the image
    if (grayscale) {
        for (i=0; i<pixels; i++) {
-           int v = tqRed(data[i]);
-           rval = static_cast<int>( ((255-v)*rb + v*rw)*value/255 + (1.0-value)*tqRed(data[i]));
-           gval = static_cast<int>( ((255-v)*gb + v*gw)*value/255 + (1.0-value)*tqGreen(data[i]));
-           bval = static_cast<int>( ((255-v)*bb + v*bw)*value/255 + (1.0-value)*tqBlue(data[i]));
+           int v = qRed(data[i]);
+           rval = static_cast<int>( ((255-v)*rb + v*rw)*value/255 + (1.0-value)*qRed(data[i]));
+           gval = static_cast<int>( ((255-v)*gb + v*gw)*value/255 + (1.0-value)*qGreen(data[i]));
+           bval = static_cast<int>( ((255-v)*bb + v*bw)*value/255 + (1.0-value)*qBlue(data[i]));
 
-           alpha = tqAlpha(data[i]);
-           data[i] = tqRgba(rval, gval, bval, alpha);
+           alpha = qAlpha(data[i]);
+           data[i] = qRgba(rval, gval, bval, alpha);
        }
    }
    else {
       for (i=0; i<pixels; i++) {
-         if (tqGray(data[i]) <= medium) {
-            rval = static_cast<int>(value*rb+(1.0-value)*tqRed(data[i]));
-            gval = static_cast<int>(value*gb+(1.0-value)*tqGreen(data[i]));
-            bval = static_cast<int>(value*bb+(1.0-value)*tqBlue(data[i]));
+         if (qGray(data[i]) <= medium) {
+            rval = static_cast<int>(value*rb+(1.0-value)*qRed(data[i]));
+            gval = static_cast<int>(value*gb+(1.0-value)*qGreen(data[i]));
+            bval = static_cast<int>(value*bb+(1.0-value)*qBlue(data[i]));
          }
          else {
-            rval = static_cast<int>(value*rw+(1.0-value)*tqRed(data[i]));
-            gval = static_cast<int>(value*gw+(1.0-value)*tqGreen(data[i]));
-            bval = static_cast<int>(value*bw+(1.0-value)*tqBlue(data[i]));
+            rval = static_cast<int>(value*rw+(1.0-value)*qRed(data[i]));
+            gval = static_cast<int>(value*gw+(1.0-value)*qGreen(data[i]));
+            bval = static_cast<int>(value*bw+(1.0-value)*qBlue(data[i]));
          }
 
-         alpha = tqAlpha(data[i]);
-         data[i] = tqRgba(rval, gval, bval, alpha);
+         alpha = qAlpha(data[i]);
+         data[i] = qRgba(rval, gval, bval, alpha);
       }
    }
 }
@@ -408,8 +408,8 @@ void KIconEffect::deSaturate(TQImage &img, float value)
         color.setRgb(data[i]);
         color.hsv(&h, &s, &v);
         color.setHsv(h, (int) (s * (1.0 - value) + 0.5), v);
-	data[i] = tqRgba(color.red(), color.green(), color.blue(),
-		tqAlpha(data[i]));
+	data[i] = qRgba(color.red(), color.green(), color.blue(),
+		qAlpha(data[i]));
     }
 }
 
@@ -431,7 +431,7 @@ void KIconEffect::toGamma(TQImage &img, float value)
         rval = static_cast<int>(pow(static_cast<float>(rval)/255 , gamma)*255);
         gval = static_cast<int>(pow(static_cast<float>(gval)/255 , gamma)*255);
         bval = static_cast<int>(pow(static_cast<float>(bval)/255 , gamma)*255);
-	data[i] = tqRgba(rval, gval, bval, tqAlpha(data[i]));
+	data[i] = qRgba(rval, gval, bval, qAlpha(data[i]));
     }
 }
 
@@ -475,8 +475,8 @@ void KIconEffect::semiTransparent(TQImage &img)
         // search for a color that is already transparent
         for (x=0; x<img.numColors(); x++)
         {
-            // try to tqfind already transparent pixel
-            if (tqAlpha(img.color(x)) < 127)
+            // try to find already transparent pixel
+            if (qAlpha(img.color(x)) < 127)
             {
                 transColor = x;
                 break;
@@ -535,9 +535,9 @@ void KIconEffect::semiTransparent(TQPixmap &pix)
 	for (int x=0; x<(img.width()+31)/32; x++)
 	    line[x] &= pattern;
     }
-    TQBitmap tqmask;
-    tqmask.convertFromImage(img);
-    pix.setMask(tqmask);
+    TQBitmap mask;
+    mask.convertFromImage(img);
+    pix.setMask(mask);
 }
 
 TQImage KIconEffect::doublePixels(TQImage src) const
@@ -631,7 +631,7 @@ void KIconEffect::overlay(TQImage &src, TQImage &overlay)
 	int trans;
 	for (trans=0; trans<overlay.numColors(); trans++)
 	{
-	    if (tqAlpha(overlay.color(trans)) == 0)
+	    if (qAlpha(overlay.color(trans)) == 0)
 	    {
 		kdDebug(265) << "transparent pixel found at " << trans << "\n";
 		break;
@@ -680,22 +680,22 @@ void KIconEffect::overlay(TQImage &src, TQImage &overlay)
 
 	    for (j=0; j<src.width(); j++)
 	    {
-		r1 = tqRed(oline[j]);
-		g1 = tqGreen(oline[j]);
-		b1 = tqBlue(oline[j]);
-		a1 = tqAlpha(oline[j]);
+		r1 = qRed(oline[j]);
+		g1 = qGreen(oline[j]);
+		b1 = qBlue(oline[j]);
+		a1 = qAlpha(oline[j]);
 
-		r2 = tqRed(sline[j]);
-		g2 = tqGreen(sline[j]);
-		b2 = tqBlue(sline[j]);
-		a2 = tqAlpha(sline[j]);
+		r2 = qRed(sline[j]);
+		g2 = qGreen(sline[j]);
+		b2 = qBlue(sline[j]);
+		a2 = qAlpha(sline[j]);
 
 		r2 = (a1 * r1 + (0xff - a1) * r2) >> 8;
 		g2 = (a1 * g1 + (0xff - a1) * g2) >> 8;
 		b2 = (a1 * b1 + (0xff - a1) * b2) >> 8;
 		a2 = QMAX(a1, a2);
 
-		sline[j] = tqRgba(r2, g2, b2, a2);
+		sline[j] = qRgba(r2, g2, b2, a2);
 	    }
 	}
     }
@@ -742,7 +742,7 @@ KIconEffect::visualActivate(TQWidget * widget, TQRect rect)
 
     TQPainter p(widget);
 
-    // Use NotROP to avoid having to tqrepaint the pixmap each time.
+    // Use NotROP to avoid having to repaint the pixmap each time.
     p.setPen(TQPen(Qt::black, 2, Qt::DotLine));
     p.setRasterOp(Qt::NotROP);
 
diff --git a/kdecore/kiconloader.cpp b/kdecore/kiconloader.cpp
index 0fff345e7..ff9243ebe 100644
--- a/kdecore/kiconloader.cpp
+++ b/kdecore/kiconloader.cpp
@@ -88,7 +88,7 @@ void KIconThemeNode::queryIconsByContext(TQStringList *result,
     *result += theme->queryIconsByContext(size, context);
 }
 
-KIcon KIconThemeNode::tqfindIcon(const TQString& name, int size,
+KIcon KIconThemeNode::findIcon(const TQString& name, int size,
 			       KIcon::MatchType match) const
 {
     return theme->iconPath(name, size, match);
@@ -194,7 +194,7 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs )
     {
         delete def;
         // warn, as this is actually a small penalty hit
-        kdDebug(264) << "Couldn't tqfind current icon theme, falling back to default." << endl;
+        kdDebug(264) << "Couldn't find current icon theme, falling back to default." << endl;
 	def = new KIconTheme(KIconTheme::defaultThemeName(), appname);
         if (!def->isValid())
         {
@@ -221,7 +221,7 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs )
     {
 	if (groups[i] == 0L)
 	    break;
-	config->setGroup(TQString::tqfromLatin1(groups[i]) + "Icons");
+	config->setGroup(TQString::fromLatin1(groups[i]) + "Icons");
 	d->mpGroups[i].size = config->readNumEntry("Size", 0);
 	d->mpGroups[i].dblPixels = config->readBoolEntry("DoublePixels", false);
 	if (TQPixmap::defaultDepth()>8)
@@ -328,7 +328,7 @@ void KIconLoader::addBaseThemes(KIconThemeNode *node, const TQString &appname)
 
     for (it=lst.begin(); it!=lst.end(); ++it)
     {
-	if( d->mThemesInTree.tqcontains(*it) && (*it) != "hicolor")
+	if( d->mThemesInTree.contains(*it) && (*it) != "hicolor")
 	    continue;
 	KIconTheme *theme = new KIconTheme(*it,appname);
 	if (!theme->isValid()) {
@@ -370,7 +370,7 @@ void KIconLoader::addExtraDesktopThemes()
 	      TQDir dir2( buf );
 	      TQString themeName=dir2.dirName();
 
-	      if (!list.tqcontains(themeName))
+	      if (!list.contains(themeName))
 		list.append(themeName);
 	    }
 	}
@@ -378,7 +378,7 @@ void KIconLoader::addExtraDesktopThemes()
 
     for (it=list.begin(); it!=list.end(); ++it)
     {
-	if ( d->mThemesInTree.tqcontains(*it) )
+	if ( d->mThemesInTree.contains(*it) )
 		continue;
 	if ( *it == TQString("default.kde") ) continue;
 
@@ -443,7 +443,7 @@ TQString KIconLoader::removeIconExtensionInternal(const TQString &name) const
     return name_noext;
 }
 
-KIcon KIconLoader::tqfindMatchingIcon(const TQString& name, int size) const
+KIcon KIconLoader::findMatchingIcon(const TQString& name, int size) const
 {
     KIcon icon;
 
@@ -495,10 +495,10 @@ inline TQString KIconLoader::unknownIconPath( int size ) const
 {
     static const TQString &str_unknown = KGlobal::staticQString("unknown");
 
-    KIcon icon = tqfindMatchingIcon(str_unknown, size);
+    KIcon icon = findMatchingIcon(str_unknown, size);
     if (!icon.isValid())
     {
-        kdDebug(264) << "Warning: could not tqfind \"Unknown\" icon for size = "
+        kdDebug(264) << "Warning: could not find \"Unknown\" icon for size = "
                      << size << endl;
         return TQString::null;
     }
@@ -557,7 +557,7 @@ TQString KIconLoader::iconPath(const TQString& _name, int group_or_size,
             return unknownIconPath(size);
     }
 
-    KIcon icon = tqfindMatchingIcon(name, size);
+    KIcon icon = findMatchingIcon(name, size);
 
     if (!icon.isValid())
     {
@@ -601,7 +601,7 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
 	key = "$kicou_";
         key += TQString::number(size); key += '_';
 	key += name;
-	bool inCache = TQPixmapCache::tqfind(key, pix);
+	bool inCache = TQPixmapCache::find(key, pix);
 	if (inCache && (path_store == 0L))
 	    return pix;
 
@@ -615,7 +615,7 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
 	    path = iconPath(str_unknown, KIcon::Small, true);
 	    if (path.isEmpty())
 	    {
-		kdDebug(264) << "Warning: Cannot tqfind \"unknown\" icon." << endl;
+		kdDebug(264) << "Warning: Cannot find \"unknown\" icon." << endl;
 		return pix;
 	    }
 	}
@@ -684,14 +684,14 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
     {
 	key += d->mpEffect.fingerprint(group, state);
 	if (d->mpGroups[group].dblPixels)
-	    key += TQString::tqfromLatin1(":dblsize");
+	    key += TQString::fromLatin1(":dblsize");
     } else
-	key += TQString::tqfromLatin1("noeffect");
+	key += TQString::fromLatin1("noeffect");
     key += '_';
     key += overlayStr;
 
     // Is the icon in the cache?
-    bool inCache = TQPixmapCache::tqfind(key, pix);
+    bool inCache = TQPixmapCache::find(key, pix);
     if (inCache && (path_store == 0L))
 	return pix;
 
@@ -713,7 +713,7 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
         else
         {
             if (!name.isEmpty())
-                icon = tqfindMatchingIcon(favIconOverlay ? TQString("www") : name, size);
+                icon = findMatchingIcon(favIconOverlay ? TQString("www") : name, size);
 
             if (!icon.isValid())
             {
@@ -725,11 +725,11 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
                     return pix;
                 }
 
-                icon = tqfindMatchingIcon(str_unknown, size);
+                icon = findMatchingIcon(str_unknown, size);
                 if (!icon.isValid())
                 {
                     kdDebug(264)
-                        << "Warning: could not tqfind \"Unknown\" icon for size = "
+                        << "Warning: could not find \"Unknown\" icon for size = "
                         << size << endl;
                     return pix;
                 }
@@ -806,7 +806,7 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
             {
 		QRgb *line = reinterpret_cast<QRgb *>(img->scanLine(y));
                 for (int x = 0; x < img->width();  x++)
-                    line[x] = (line[x] & 0x00ffffff) | (QMIN(0x80, tqAlpha(line[x])) << 24);
+                    line[x] = (line[x] & 0x00ffffff) | (QMIN(0x80, qAlpha(line[x])) << 24);
 	    }
 	}
     }
@@ -848,10 +848,10 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
             for( int i = 0;
                  i < favIcon.width();
                  ++i, ++fpos, ++ipos )
-                *ipos = tqRgba( ( tqRed( *ipos ) * ( 255 - tqAlpha( *fpos )) + tqRed( *fpos ) * tqAlpha( *fpos )) / 255,
-                               ( tqGreen( *ipos ) * ( 255 - tqAlpha( *fpos )) + tqGreen( *fpos ) * tqAlpha( *fpos )) / 255,
-                               ( tqBlue( *ipos ) * ( 255 - tqAlpha( *fpos )) + tqBlue( *fpos ) * tqAlpha( *fpos )) / 255,
-                               ( tqAlpha( *ipos ) * ( 255 - tqAlpha( *fpos )) + tqAlpha( *fpos ) * tqAlpha( *fpos )) / 255 );
+                *ipos = qRgba( ( qRed( *ipos ) * ( 255 - qAlpha( *fpos )) + qRed( *fpos ) * qAlpha( *fpos )) / 255,
+                               ( qGreen( *ipos ) * ( 255 - qAlpha( *fpos )) + qGreen( *fpos ) * qAlpha( *fpos )) / 255,
+                               ( qBlue( *ipos ) * ( 255 - qAlpha( *fpos )) + qBlue( *fpos ) * qAlpha( *fpos )) / 255,
+                               ( qAlpha( *ipos ) * ( 255 - qAlpha( *fpos )) + qAlpha( *fpos ) * qAlpha( *fpos )) / 255 );
         }
     }
 
@@ -866,18 +866,18 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
 TQImage *KIconLoader::loadOverlay(const TQString &name, int size) const
 {
     TQString key = name + '_' + TQString::number(size);
-    TQImage *image = d->imgDict.tqfind(key);
+    TQImage *image = d->imgDict.find(key);
     if (image != 0L)
 	return image;
 
-    KIcon icon = tqfindMatchingIcon(name, size);
+    KIcon icon = findMatchingIcon(name, size);
     if (!icon.isValid())
     {
 	kdDebug(264) << "Overlay " << name << "not found." << endl;
 	return 0L;
     }
     image = new TQImage(icon.path);
-    // In some cases (since size in tqfindMatchingIcon() is more a hint than a
+    // In some cases (since size in findMatchingIcon() is more a hint than a
     // constraint) image->size can be != size. If so perform rescaling.
     if ( size != image->width() )
         *image = image->smoothScale( size, size );
@@ -892,7 +892,7 @@ TQMovie KIconLoader::loadMovie(const TQString& name, KIcon::Group group, int siz
     TQString file = moviePath( name, group, size );
     if (file.isEmpty())
 	return TQMovie();
-    int dirLen = file.tqfindRev('/');
+    int dirLen = file.findRev('/');
     TQString icon = iconPath(name, size ? -size : group, true);
     if (!icon.isEmpty() && file.left(dirLen) != icon.left(dirLen))
 	return TQMovie();
@@ -968,7 +968,7 @@ TQStringList KIconLoader::loadAnimated(const TQString& name, KIcon::Group group,
     {
 	if (size == 0)
 	    size = d->mpGroups[group].size;
-	KIcon icon = tqfindMatchingIcon(file, size);
+	KIcon icon = findMatchingIcon(file, size);
 	file = icon.isValid() ? icon.path : TQString::null;
 
     }
@@ -1048,13 +1048,13 @@ TQStringList KIconLoader::queryIconsByContext(int group_or_size,
     TQStringList::ConstIterator it;
     for (it=result.begin(); it!=result.end(); ++it)
     {
-	int n = (*it).tqfindRev('/');
+	int n = (*it).findRev('/');
 	if (n == -1)
 	    name = *it;
 	else
 	    name = (*it).mid(n+1);
 	name = removeIconExtension(name);
-	if (!entries.tqcontains(name))
+	if (!entries.contains(name))
 	{
 	    entries += name;
 	    res2 += *it;
@@ -1088,13 +1088,13 @@ TQStringList KIconLoader::queryIcons(int group_or_size, KIcon::Context context)
     TQStringList::ConstIterator it;
     for (it=result.begin(); it!=result.end(); ++it)
     {
-	int n = (*it).tqfindRev('/');
+	int n = (*it).findRev('/');
 	if (n == -1)
 	    name = *it;
 	else
 	    name = (*it).mid(n+1);
 	name = removeIconExtension(name);
-	if (!entries.tqcontains(name))
+	if (!entries.contains(name))
 	{
 	    entries += name;
 	    res2 += *it;
@@ -1103,7 +1103,7 @@ TQStringList KIconLoader::queryIcons(int group_or_size, KIcon::Context context)
     return res2;
 }
 
-// used by KIconDialog to tqfind out which contexts to offer in a combobox
+// used by KIconDialog to find out which contexts to offer in a combobox
 bool KIconLoader::hasContext(KIcon::Context context) const
 {
     for ( KIconThemeNode *themeNode = d->links.first() ; themeNode ;
@@ -1173,7 +1173,7 @@ TQIconSet KIconLoader::loadIconSet( const TQString& name, KIcon::Group g, int s,
     }
 
     if(canReturnNull && immediateExistenceCheck)
-    { // we need to tqfind out if the icon actually exists
+    { // we need to find out if the icon actually exists
         TQPixmap pm = loadIcon( name, g, s, KIcon::DefaultState, NULL, true );
         if( pm.isNull())
             return TQIconSet();
@@ -1383,13 +1383,13 @@ int IconSize(KIcon::Group group, KInstance *instance)
 TQPixmap KIconLoader::unknown()
 {
     TQPixmap pix;
-    if ( TQPixmapCache::tqfind("unknown", pix) )
+    if ( TQPixmapCache::find("unknown", pix) )
             return pix;
 
     TQString path = KGlobal::iconLoader()->iconPath("unknown", KIcon::Small, true);
     if (path.isEmpty())
     {
-	kdDebug(264) << "Warning: Cannot tqfind \"unknown\" icon." << endl;
+	kdDebug(264) << "Warning: Cannot find \"unknown\" icon." << endl;
 	pix.resize(32,32);
     } else
     {
diff --git a/kdecore/kiconloader.h b/kdecore/kiconloader.h
index b9d6c7714..f8ac3fbc7 100644
--- a/kdecore/kiconloader.h
+++ b/kdecore/kiconloader.h
@@ -106,7 +106,7 @@ public:
     void addAppDir(const TQString& appname);
 
     /**
-     * Loads an icon. It will try very hard to tqfind an icon which is
+     * Loads an icon. It will try very hard to find an icon which is
      * suitable. If no exact match is found, a close match is searched.
      * If neither an exact nor a close match is found, a null pixmap or
      * the "unknown" pixmap is returned, depending on the value of the
@@ -372,10 +372,10 @@ public:
 
     /**
      * @internal
-     * tries to tqfind an icon with the name. It tries some extension and
+     * tries to find an icon with the name. It tries some extension and
      * match strategies
      */
-    KIcon tqfindMatchingIcon(const TQString& name, int size) const;
+    KIcon findMatchingIcon(const TQString& name, int size) const;
 
     /**
      * @internal
@@ -424,7 +424,7 @@ public:
      * Same as removeIconExtension except it prints a debug message
      * if an extension is removed to help catch programming errors.
      *
-     * @see tqfindMatchingIcon()
+     * @see findMatchingIcon()
      * @see iconPath()
      *
      * TODO: KDE 4 make static
diff --git a/kdecore/kiconloader_p.h b/kdecore/kiconloader_p.h
index cc7e7beb3..41083b38c 100644
--- a/kdecore/kiconloader_p.h
+++ b/kdecore/kiconloader_p.h
@@ -27,13 +27,13 @@ public:
 
     void queryIcons(TQStringList *lst, int size, KIcon::Context context) const;
     void queryIconsByContext(TQStringList *lst, int size, KIcon::Context context) const;
-    KIcon tqfindIcon(const TQString& name, int size, KIcon::MatchType match) const;
+    KIcon findIcon(const TQString& name, int size, KIcon::MatchType match) const;
     void printTree(TQString& dbgString) const;
 
     KIconTheme *theme;
 };
 
-class KIconLoaderPrivate : public TQObject
+class KIconLoaderPrivate : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kdecore/kicontheme.cpp b/kdecore/kicontheme.cpp
index 5ee706422..6bbeba512 100644
--- a/kdecore/kicontheme.cpp
+++ b/kdecore/kicontheme.cpp
@@ -185,7 +185,7 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
     TQMap<int,TQValueList<int> > scIcons;
     for (KIconThemeDir *dir=mDirs.first(); dir!=0L; dir=mDirs.next())
     {
-        if ((dir->type() == KIcon::Scalable) && !scIcons.tqcontains(dir->size()))
+        if ((dir->type() == KIcon::Scalable) && !scIcons.contains(dir->size()))
         {
             TQValueList<int> lst;
             for (i=dir->minSize(); i<=dir->maxSize(); i++)
@@ -209,7 +209,7 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
         TQValueList<int>::ConstIterator it2;
         for (it2=lst.begin(); it2!=lst.end(); ++it2)
         {
-            if (scIcons.tqcontains(*it2))
+            if (scIcons.contains(*it2))
                 exp += scIcons[*it2];
             else
                 exp += *it2;
@@ -269,7 +269,7 @@ TQStringList KIconTheme::queryIcons(int size, KIcon::Context context) const
     TQPtrListIterator<KIconThemeDir> dirs(mDirs);
     KIconThemeDir *dir;
 
-    // Try to tqfind exact match
+    // Try to find exact match
     TQStringList result;
     for ( ; dirs.current(); ++dirs)
     {
@@ -422,13 +422,13 @@ KIcon KIconTheme::iconPath(const TQString& name, int size, KIcon::MatchType matc
 	icon.threshold = dir->threshold();
         icon.context = dir->context();
 
-        // if we got in MatchExact that far, we tqfind no better
+        // if we got in MatchExact that far, we find no better
         if (match == KIcon::MatchExact)
             return icon;
 	else
         {
 	    delta = dw;
-	    if (delta==0) return icon; // We won't tqfind a better match anyway
+	    if (delta==0) return icon; // We won't find a better match anyway
         }
     }
     return icon;
@@ -451,13 +451,13 @@ TQString KIconTheme::current()
     KConfig *config = KGlobal::config();
     KConfigGroupSaver saver(config, "Icons");
     *_theme = config->readEntry("Theme",defaultThemeName());
-    if ( *_theme == TQString::tqfromLatin1("hicolor") ) *_theme = defaultThemeName();
+    if ( *_theme == TQString::fromLatin1("hicolor") ) *_theme = defaultThemeName();
 /*    if (_theme->isEmpty())
     {
         if (TQPixmap::defaultDepth() > 8)
             *_theme = defaultThemeName();
         else
-            *_theme = TQString::tqfromLatin1("locolor");
+            *_theme = TQString::fromLatin1("locolor");
     }*/
     return *_theme;
 }
@@ -492,7 +492,7 @@ TQStringList KIconTheme::list()
 		KIconTheme oink(*it2);
 	    if (!oink.isValid()) continue;
 
-	    if (!_theme_list->tqcontains(*it2))
+	    if (!_theme_list->contains(*it2))
                 _theme_list->append(*it2);
         }
     }
@@ -511,7 +511,7 @@ void KIconTheme::reconfigure()
 // static
 TQString KIconTheme::defaultThemeName()
 {
-    return TQString::tqfromLatin1("crystalsvg");
+    return TQString::fromLatin1("crystalsvg");
 }
 
 /*** KIconThemeDir ***/
@@ -551,8 +551,8 @@ KIconThemeDir::KIconThemeDir(const TQString& dir, const KConfigBase *config)
         mContext = KIcon::International;
     else if (tmp == "Places")
         mContext = KIcon::Place;
-    else if (tmp == "tqStatus")
-        mContext = KIcon::tqStatusIcon;
+    else if (tmp == "Status")
+        mContext = KIcon::StatusIcon;
     else {
         kdDebug(264) << "Invalid Context= line for icon theme: " << mDir << "\n";
         return;
diff --git a/kdecore/kicontheme.h b/kdecore/kicontheme.h
index 643c655df..3a1f14fa4 100644
--- a/kdecore/kicontheme.h
+++ b/kdecore/kicontheme.h
@@ -59,7 +59,7 @@ public:
       Emote, ///< An icon that expresses an emotion.
       International, ///< An icon that represents a country's flag.
       Place, ///< An icon that represents a location (e.g. 'home', 'trash').
-      tqStatusIcon ///< An icon that represents an event.
+      StatusIcon ///< An icon that represents an event.
     };
 
     /**
@@ -75,7 +75,7 @@ public:
      * The type of a match.
      */
     enum MatchType {
-      MatchExact, ///< Only try to tqfind an exact match.
+      MatchExact, ///< Only try to find an exact match.
       MatchBest   ///< Take the best match if there is no exact match.
 
     };
diff --git a/kdecore/kidna.cpp b/kdecore/kidna.cpp
index 1ce2c1348..ca41fecdf 100644
--- a/kdecore/kidna.cpp
+++ b/kdecore/kidna.cpp
@@ -43,12 +43,12 @@ TQString KIDNA::toAscii(const TQString &idna)
 {
   if (idna.length() && (idna[0] == (QChar)'.'))
   {
-     TQString host = TQString::tqfromLatin1(toAsciiCString(idna.mid(1)));
+     TQString host = TQString::fromLatin1(toAsciiCString(idna.mid(1)));
      if (host.isEmpty())
         return TQString::null; // Error
      return idna[0] + host;
   }
-  return TQString::tqfromLatin1(toAsciiCString(idna));
+  return TQString::fromLatin1(toAsciiCString(idna));
 }
 
 TQString KIDNA::toUnicode(const TQString &idna)
diff --git a/kdecore/kinstance.cpp b/kdecore/kinstance.cpp
index a03d6e891..2a579de0a 100644
--- a/kdecore/kinstance.cpp
+++ b/kdecore/kinstance.cpp
@@ -40,7 +40,7 @@
   static TQPtrDict<TQCString> *allOldInstances = 0;
   #define DEBUG_ADD do { if (!allInstances) { allInstances = new TQPtrList<KInstance>(); allOldInstances = new TQPtrDict<TQCString>(); } allInstances->append(this); allOldInstances->insert( this, new TQCString( _name)); } while (false);
   #define DEBUG_REMOVE do { allInstances->removeRef(this); } while (false);
-  #define DEBUG_CHECK_ALIVE do { if (!allInstances->tqcontains((KInstance*)this)) { TQCString *old = allOldInstances->tqfind((KInstance*)this); qWarning("ACCESSING DELETED KINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false);
+  #define DEBUG_CHECK_ALIVE do { if (!allInstances->contains((KInstance*)this)) { TQCString *old = allOldInstances->find((KInstance*)this); qWarning("ACCESSING DELETED KINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false);
 #else
   #define DEBUG_ADD
   #define DEBUG_REMOVE
diff --git a/kdecore/kkeynative.h b/kdecore/kkeynative.h
index e77adfcb0..47b4ad677 100644
--- a/kdecore/kkeynative.h
+++ b/kdecore/kkeynative.h
@@ -48,14 +48,14 @@ class KDECORE_EXPORT KKeyNative
 #ifdef Q_WS_X11
 	/**
 	 * Extracts a new native key from the given xevent.
-	 * @param xevent the XEvent that tqcontains the key
+	 * @param xevent the XEvent that contains the key
 	 */
 	KKeyNative( const XEvent* xevent );
 #endif
 
 	/**
 	 * Creates a new native key for the given KKey code.
-	 * @param key the KKey that tqcontains the generic key
+	 * @param key the KKey that contains the generic key
 	 */
 	KKeyNative( const KKey& key );
 
@@ -80,7 +80,7 @@ class KDECORE_EXPORT KKeyNative
 	/**
 	 * Initializes the native key by extracting the information
 	 * from the given xevent.
-	 * @param xevent the XEvent that tqcontains the key
+	 * @param xevent the XEvent that contains the key
 	 * @return true if successful, false otherwise
 	 */
 	bool init( const XEvent* xevent );
@@ -88,7 +88,7 @@ class KDECORE_EXPORT KKeyNative
 
 	/**
 	 * Creates a new native key for the given KKey code.
-	 * @param key the KKey that tqcontains the generic key
+	 * @param key the KKey that contains the generic key
 	 * @return true if successful, false otherwise
 	 */
 	bool init( const KKey& key );
@@ -207,43 +207,43 @@ class KDECORE_EXPORT KKeyNative
 
 #ifdef Q_WS_X11
 	/**
-	 * Returns the equivalent X modifier tqmask of the given modifier flag.
+	 * Returns the equivalent X modifier mask of the given modifier flag.
 	 * @param modFlag the mod flags to test
 	 * @return the equivalent native flags of the window system
 	 */
 	static uint modX( KKey::ModFlag modFlag );
 
 	/**
-	 * Returns bitwise OR'ed tqmask containing Shift, Ctrl, Alt, and
+	 * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and
 	 * Win (if available).
-	 * @return the tqmask of Shift, Ctrl, Alt and Win.
+	 * @return the mask of Shift, Ctrl, Alt and Win.
 	 */
 	static uint accelModMaskX();
 
 	/**
-	 * Returns the X11 NumLock modifier tqmask/flag.
-	 * @return the X11 NumLock modifier tqmask/flag.
+	 * Returns the X11 NumLock modifier mask/flag.
+	 * @return the X11 NumLock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	static uint modXNumLock();
 
 	/**
-	 * Returns the X11 Lock modifier tqmask/flag.
-	 * @return the X11 Lock modifier tqmask/flag.
+	 * Returns the X11 Lock modifier mask/flag.
+	 * @return the X11 Lock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	static uint modXLock();
 
 	/**
-	 * Returns the X11 ScrollLock modifier tqmask/flag.
-	 * @return the X11 ScrollLock modifier tqmask/flag.
+	 * Returns the X11 ScrollLock modifier mask/flag.
+	 * @return the X11 ScrollLock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	static uint modXScrollLock();
 
 	/** 
-	 * Returns the X11 Mode_switch modifier tqmask/flag. 
-	 * @return the X11 Mode_switch modifier tqmask/flag. 
+	 * Returns the X11 Mode_switch modifier mask/flag. 
+	 * @return the X11 Mode_switch modifier mask/flag. 
 	 * @see accelModMaskX() 
 	 * @since 3.5
 	 */ 
diff --git a/kdecore/kkeynative_x11.cpp b/kdecore/kkeynative_x11.cpp
index cef68022e..7733d3de7 100644
--- a/kdecore/kkeynative_x11.cpp
+++ b/kdecore/kkeynative_x11.cpp
@@ -96,7 +96,7 @@ bool KKeyNative::init( const KKey& key )
 	m_mod = key.m_mod;
 #elif !defined(Q_WS_WIN) && !defined(Q_WS_MACX)
 	// Get any extra mods required by the sym.
-	//  E.g., XK_Plus requires SHIFT on the en tqlayout.
+	//  E.g., XK_Plus requires SHIFT on the en layout.
 	m_sym = key.sym();
 	uint modExtra = KKeyServer::Sym(m_sym).getModsRequired();
 	// Get the X modifier equivalent.
@@ -108,7 +108,7 @@ bool KKeyNative::init( const KKey& key )
 
 	// XKeysymToKeycode returns the wrong keycode for XK_Print and XK_Break.
 	// Specifically, it returns the code for SysReq instead of Print
-	// Only do this for the default Xorg tqlayout, other keycode mappings
+	// Only do this for the default Xorg layout, other keycode mappings
 	// (e.g. evdev) don't need or want it.
 	if( m_sym == XK_Print && !(m_mod & Mod1Mask) &&
                 XKeycodeToKeysym( qt_xdisplay(), 111, 0 ) == XK_Print )
@@ -122,7 +122,7 @@ bool KKeyNative::init( const KKey& key )
 	if( !m_code && m_sym )
 		kdDebug(125) << "Couldn't get code for sym" << endl;
 	// Now get the true sym formed by the modifiers
-	//  E.g., Shift+Equal => Plus on the en tqlayout.
+	//  E.g., Shift+Equal => Plus on the en layout.
 	if( key.modFlags() && ( ( m_sym < XK_Home || m_sym > XK_Begin ) && 
 				  m_sym != XK_Insert && m_sym != XK_Delete ))
 		KKeyServer::codeXToSym( m_code, m_mod, m_sym );
diff --git a/kdecore/kkeyserver_x11.cpp b/kdecore/kkeyserver_x11.cpp
index 4882d5429..96411bca5 100644
--- a/kdecore/kkeyserver_x11.cpp
+++ b/kdecore/kkeyserver_x11.cpp
@@ -338,7 +338,7 @@ bool initializeMods()
         XFree( XGetKeyboardMapping( qt_xdisplay(), min_keycode, 1, &keysyms_per_keycode ));
 	// Qt assumes that Alt is always Mod1Mask, so start at Mod2Mask.
 	for( int i = Mod2MapIndex; i < 8; i++ ) {
-		uint tqmask = (1 << i);
+		uint mask = (1 << i);
 		uint keySymX = NoSymbol;
                 // This used to be only XKeycodeToKeysym( ... , 0 ), but that fails with XFree4.3.99
                 // and X.org R6.7 , where for some reason only ( ... , 1 ) works. I have absolutely no
@@ -348,13 +348,13 @@ bool initializeMods()
                     for( int k = 0; k < keysyms_per_keycode && keySymX == NoSymbol; ++k )
                         keySymX = XKeycodeToKeysym( qt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * i + j], k );
 		switch( keySymX ) {
-			case XK_Num_Lock:    g_modXNumLock = tqmask; break;     // Normally Mod2Mask
+			case XK_Num_Lock:    g_modXNumLock = mask; break;     // Normally Mod2Mask
 			case XK_Super_L:
-			case XK_Super_R:     g_rgModInfo[3].modX = tqmask; break; // Win key, Normally Mod4Mask
+			case XK_Super_R:     g_rgModInfo[3].modX = mask; break; // Win key, Normally Mod4Mask
 			case XK_Meta_L:
-			case XK_Meta_R:      if( !g_rgModInfo[3].modX ) g_rgModInfo[3].modX = tqmask; break; // Win alternate
-			case XK_Scroll_Lock: g_modXScrollLock = tqmask; break;  // Normally Mod5Mask
-			case XK_Mode_switch: g_modXModeSwitch = tqmask; break; 
+			case XK_Meta_R:      if( !g_rgModInfo[3].modX ) g_rgModInfo[3].modX = mask; break; // Win alternate
+			case XK_Scroll_Lock: g_modXScrollLock = mask; break;  // Normally Mod5Mask
+			case XK_Mode_switch: g_modXModeSwitch = mask; break; 
 		}
 	}
 
@@ -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().tqunicode();
+		m_sym = TQChar(symQt).lower().unicode();
 		return true;
 	}
 
@@ -434,9 +434,9 @@ bool Sym::initQt( int keyQt )
 
 bool Sym::init( const TQString& s )
 {
-	// If it's a single character, get tqunicode value.
+	// If it's a single character, get unicode value.
 	if( s.length() == 1 ) {
-		m_sym = s[0].lower().tqunicode();
+		m_sym = s[0].lower().unicode();
 		return true;
 	}
 
@@ -498,7 +498,7 @@ TQString Sym::toString( bool bUserSpace ) const
 	if( m_sym == 0 )
 		return TQString::null;
 
-	// If it's a tqunicode character,
+	// If it's a unicode character,
 #ifdef Q_WS_WIN
 	else if( m_sym < 0x1000 ) {
 #else
@@ -536,13 +536,13 @@ uint Sym::getModsRequired() const
 {
 	uint mod = 0;
 #ifdef Q_WS_X11
-	// FIXME: This might not be true on all keyboard tqlayouts!
+	// FIXME: This might not be true on all keyboard layouts!
 	if( m_sym == XK_Sys_Req ) return KKey::ALT;
 	if( m_sym == XK_Break ) return KKey::CTRL;
 
 	if( m_sym < 0x3000 ) {
 		TQChar c(m_sym);
-		if( c.isLetter() && c.lower() != c.upper() && m_sym == c.upper().tqunicode() )
+		if( c.isLetter() && c.lower() != c.upper() && m_sym == c.upper().unicode() )
 			return KKey::SHIFT;
 	}
 
@@ -823,7 +823,7 @@ uint stringUserToMod( const TQString& mod )
 	// Get code of just the primary key
 	keySymQt = keyCombQt & 0xffff;
 
-	// If tqunicode value beneath 0x1000 (special Qt codes begin thereafter),
+	// If unicode 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().tqunicode();
+		m_sym = TQChar(m_sym).lower().unicode();
 
 	// Remove modifers from modifier list which are implicit in the symbol.
 	// Ex. Shift+Plus => Plus (en)
diff --git a/kdecore/kkeyserver_x11.h b/kdecore/kkeyserver_x11.h
index b9a5ed811..7935c0ce4 100644
--- a/kdecore/kkeyserver_x11.h
+++ b/kdecore/kkeyserver_x11.h
@@ -110,7 +110,7 @@ namespace KKeyServer
 		uint getModsRequired() const;
 
 		/**
-		 * TODO: please tqfind out what this method does and document it
+		 * TODO: please find out what this method does and document it
 		 */
 		uint getSymVariation() const;
 
@@ -260,14 +260,14 @@ namespace KKeyServer
 	KDECORE_EXPORT bool initializeMods();
 
 	/**
-	 * Returns the equivalent X modifier tqmask of the given modifier flag.
+	 * Returns the equivalent X modifier mask of the given modifier flag.
 	 * @param modFlag the generic flags to check
 	 * @return the window system specific flags
 	 */
 	KDECORE_EXPORT uint modX( KKey::ModFlag modFlag );
 
 	/**
-	 * Returns true if the current keyboard tqlayout supports the Win key.
+	 * Returns true if the current keyboard layout supports the Win key.
 	 * Specifically, whether the Super or Meta keys are assigned to an X modifier.
 	 * @return true if the keyboard has a Win key
 	 * @see modXWin()
@@ -275,65 +275,65 @@ namespace KKeyServer
 	KDECORE_EXPORT bool keyboardHasWinKey();
 
 	/**
-	 * Returns the X11 Shift modifier tqmask/flag.
-	 * @return the X11 Shift modifier tqmask/flag.
+	 * Returns the X11 Shift modifier mask/flag.
+	 * @return the X11 Shift modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	KDECORE_EXPORT uint modXShift();
 
 	/**
-	 * Returns the X11 Lock modifier tqmask/flag.
-	 * @return the X11 Lock modifier tqmask/flag.
+	 * Returns the X11 Lock modifier mask/flag.
+	 * @return the X11 Lock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	KDECORE_EXPORT uint modXLock();
 
 	/**
-	 * Returns the X11 Ctrl modifier tqmask/flag.
-	 * @return the X11 Ctrl modifier tqmask/flag.
+	 * Returns the X11 Ctrl modifier mask/flag.
+	 * @return the X11 Ctrl modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	KDECORE_EXPORT uint modXCtrl();
 
 	/**
-	 * Returns the X11 Alt (Mod1) modifier tqmask/flag.
-	 * @return the X11 Alt (Mod1) modifier tqmask/flag.
+	 * Returns the X11 Alt (Mod1) modifier mask/flag.
+	 * @return the X11 Alt (Mod1) modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	KDECORE_EXPORT uint modXAlt();
 
 	/**
-	 * Returns the X11 NumLock modifier tqmask/flag.
-	 * @return the X11 NumLock modifier tqmask/flag.
+	 * Returns the X11 NumLock modifier mask/flag.
+	 * @return the X11 NumLock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	KDECORE_EXPORT uint modXNumLock();
 
 	/**
-	 * Returns the X11 Win (Mod3) modifier tqmask/flag.
-	 * @return the X11 Win (Mod3) modifier tqmask/flag.
+	 * Returns the X11 Win (Mod3) modifier mask/flag.
+	 * @return the X11 Win (Mod3) modifier mask/flag.
 	 * @see keyboardHasWinKey()
 	 * @see accelModMaskX()
 	 */
 	KDECORE_EXPORT uint modXWin();
 
 	/**
-	 * Returns the X11 ScrollLock modifier tqmask/flag.
-	 * @return the X11 ScrollLock modifier tqmask/flag.
+	 * Returns the X11 ScrollLock modifier mask/flag.
+	 * @return the X11 ScrollLock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
 	KDECORE_EXPORT uint modXScrollLock();
 
 	/**
-	 * Returns the X11 Mode_switch modifier tqmask/flag. 
-	 * @return the X11 Mode_switch modifier tqmask/flag. 
+	 * Returns the X11 Mode_switch modifier mask/flag. 
+	 * @return the X11 Mode_switch modifier mask/flag. 
 	 * @see accelModMaskX()
 	 * @since 3.5
 	 */
 	KDECORE_EXPORT uint modXModeSwitch();
 
 	/**
-	 * Returns bitwise OR'ed tqmask containing Shift, Ctrl, Alt, and
+	 * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and
 	 * Win (if available).
 	 * @see modXShift()
 	 * @see modXLock()
@@ -358,7 +358,7 @@ namespace KKeyServer
 
 	/**
 	 * Extracts the modifiers from the given Qt key and
-	 * converts them in a tqmask of ORed KKey::ModFlag modifiers.
+	 * converts them in a mask of ORed KKey::ModFlag modifiers.
 	 * @param keyQt the qt key code
 	 * @param mod if successful, the modifiers will be written here
 	 * @return true if successful, false otherwise
@@ -377,10 +377,10 @@ namespace KKeyServer
 	KDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt );
 
 	/**
-	 * Converts the tqmask of ORed KKey::ModFlag modifiers to
-	 * a tqmask of ORed Qt key code modifiers.
-	 * @param mod the tqmask of KKey::ModFlag modifiers
-	 * @param modQt the tqmask of Qt key code modifiers will be written here,
+	 * Converts the mask of ORed KKey::ModFlag modifiers to
+	 * a mask of ORed Qt key code modifiers.
+	 * @param mod the mask of KKey::ModFlag modifiers
+	 * @param modQt the mask of Qt key code modifiers will be written here,
 	 *        if successful
 	 * @return true if successful, false otherwise
 	 * @see Qt::Key
@@ -389,10 +389,10 @@ namespace KKeyServer
 	KDECORE_EXPORT bool modToModQt( uint mod, int& modQt );
 
 	/**
-	 * Converts the tqmask of ORed KKey::ModFlag modifiers to
-	 * a tqmask of ORed X11 modifiers.
-	 * @param mod the tqmask of KKey::ModFlag modifiers
-	 * @param modX the tqmask of X11 modifiers will be written here,
+	 * Converts the mask of ORed KKey::ModFlag modifiers to
+	 * a mask of ORed X11 modifiers.
+	 * @param mod the mask of KKey::ModFlag modifiers
+	 * @param modX the mask of X11 modifiers will be written here,
 	 *        if successful
 	 * @return true if successful, false otherwise
 	 * @see KKey
@@ -400,10 +400,10 @@ namespace KKeyServer
 	KDECORE_EXPORT bool modToModX( uint mod, uint& modX );
 
 	/**
-	 * Converts the tqmask of ORed X11 modifiers to
-	 * a tqmask of ORed Qt key code modifiers.
-	 * @param modX the tqmask of X11 modifiers
-	 * @param modQt the tqmask of Qt key code modifiers will be written here
+	 * Converts the mask of ORed X11 modifiers to
+	 * a mask of ORed Qt key code modifiers.
+	 * @param modX the mask of X11 modifiers
+	 * @param modQt the mask of Qt key code modifiers will be written here
 	 *        if successful
 	 * @return true if successful, false otherwise
 	 * @see Qt::Key
@@ -417,10 +417,10 @@ namespace KKeyServer
 	KDECORE_EXPORT int qtButtonStateToMod( TQ_ButtonState s );
 
 	/**
-	 * Converts the tqmask of ORed X11 modifiers to
-	 * a tqmask of ORed KKey::ModFlag modifiers.
-	 * @param modX the tqmask of X11 modifiers
-	 * @param mod the tqmask of KKey::ModFlag modifiers will be written here,
+	 * Converts the mask of ORed X11 modifiers to
+	 * a mask of ORed KKey::ModFlag modifiers.
+	 * @param modX the mask of X11 modifiers
+	 * @param mod the mask of KKey::ModFlag modifiers will be written here,
 	 *        if successful
 	 * @return true if successful, false otherwise
 	 * @see KKey
@@ -428,11 +428,11 @@ namespace KKeyServer
 	KDECORE_EXPORT bool modXToMod( uint modX, uint& mod );
 
 	/**
-	 * Converts a X11 key code and a tqmask of ORed X11 modifiers
+	 * Converts a X11 key code and a mask of ORed X11 modifiers
 	 * into a X11 symbol.
 	 * converts it to a symbol.
 	 * @param codeX the X11 key code
-	 * @param modX the tqmask of ORed X11 modifiers
+	 * @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 Qt::Key
@@ -446,9 +446,9 @@ namespace KKeyServer
 	KDECORE_EXPORT TQString modToStringInternal( uint mod );
 
 	/**
-	 * Converts the tqmask of ORed KKey::ModFlag modifiers to a
+	 * Converts the mask of ORed KKey::ModFlag modifiers to a
 	 * user-readable string.
-	 * @param mod the tqmask of ORed KKey::ModFlag modifiers
+	 * @param mod the mask of ORed KKey::ModFlag modifiers
 	 * @return the user-readable string
 	 */
 	KDECORE_EXPORT TQString modToStringUser( uint mod );
diff --git a/kdecore/klibloader.cpp b/kdecore/klibloader.cpp
index 84482ba79..e2f55fe67 100644
--- a/kdecore/klibloader.cpp
+++ b/kdecore/klibloader.cpp
@@ -209,7 +209,7 @@ void KLibrary::slotObjectCreated( TQObject *obj )
   if ( m_timer && m_timer->isActive() )
     m_timer->stop();
 
-  if ( m_objs.tqcontainsRef( obj ) )
+  if ( m_objs.containsRef( obj ) )
       return; // we know this object already
 
   connect( obj, TQT_SIGNAL( destroyed() ),
@@ -320,7 +320,7 @@ KLibLoader::~KLibLoader()
     TQAsciiDictIterator<KLibWrapPrivate> it( m_libs );
     for (; it.current(); ++it )
     {
-      kdDebug(150) << "The KLibLoader tqcontains the library " << it.current()->name
+      kdDebug(150) << "The KLibLoader contains the library " << it.current()->name
         << " (" << it.current()->lib << ")" << endl;
       d->pending_close.append(it.current());
     }
@@ -337,10 +337,10 @@ static inline TQCString makeLibName( const char* name )
     // only append ".la" if there is no extension
     // this allows to load non-libtool libraries as well
     // (mhk, 20000228)
-    int pos = libname.tqfindRev('/');
+    int pos = libname.findRev('/');
     if (pos < 0)
       pos = 0;
-    if (libname.tqfind('.', pos) < 0)
+    if (libname.find('.', pos) < 0)
       libname += ".la";
     return libname;
 }
@@ -500,7 +500,7 @@ void KLibLoader::slotLibraryDestroyed()
 
 void KLibLoader::close_pending(KLibWrapPrivate *wrap)
 {
-  if (wrap && !d->pending_close.tqcontainsRef( wrap ))
+  if (wrap && !d->pending_close.containsRef( wrap ))
     d->pending_close.append( wrap );
 
   /* First delete all KLibrary objects in pending_close, but _don't_ unload
@@ -534,7 +534,7 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
 
     /* Now ensure, that the libs are only unloaded in the reverse direction
        they were loaded.  */
-    if (!d->pending_close.tqcontainsRef( wrap )) {
+    if (!d->pending_close.containsRef( wrap )) {
       if (!deleted_one)
         /* Only diagnose, if we really haven't deleted anything. */
 //        kdDebug(150) << "try to dlclose " << wrap->name << ": not yet" << endl;
diff --git a/kdecore/klibloader.h b/kdecore/klibloader.h
index d5f811faf..b1a1bc330 100644
--- a/kdecore/klibloader.h
+++ b/kdecore/klibloader.h
@@ -47,7 +47,7 @@ class KLibraryPrivate;
  * @see KLibLoader
  * @author Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KLibrary : public TQObject
+class KDECORE_EXPORT KLibrary : public QObject
 {
     friend class KLibLoader;
     friend class TQAsciiDict<KLibrary>;
@@ -139,7 +139,7 @@ class KLibWrapPrivate;
  * @see KLibrary
  * @author Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KLibLoader : public TQObject
+class KDECORE_EXPORT KLibLoader : public QObject
 {
     friend class KLibrary;
 
@@ -312,7 +312,7 @@ private:
  *     s_global = new KInstance( "kspread" );
  * \endcode
  * This KInstance is comparable to KGlobal used by normal applications.
- * It allows you to tqfind resource files (images, XML, sound etc.) belonging
+ * It allows you to find resource files (images, XML, sound etc.) belonging
  * to the library.
  *
  * If you want to load a library, use KLibLoader. You can query KLibLoader
@@ -322,7 +322,7 @@ private:
  * The KLibFactory is used to create the components, the library has to offer.
  * The factory of KSpread for example will create instances of KSpreadDoc,
  * while the Konqueror factory will create KonqView widgets.
- * All objects created by the factory must be derived from TQObject, since TQObject
+ * All objects created by the factory must be derived from TQObject, since QObject
  * offers type safe casting.
  *
  * KLibFactory is an abstract class. Reimplement the
@@ -330,7 +330,7 @@ private:
  *
  * @author Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KLibFactory : public TQObject
+class KDECORE_EXPORT KLibFactory : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kdecore/klocale.cpp b/kdecore/klocale.cpp
index e94c631cd..91fe1c2a1 100644
--- a/kdecore/klocale.cpp
+++ b/kdecore/klocale.cpp
@@ -59,7 +59,7 @@ public:
   bool dateMonthNamePossessive;
   TQStringList languageList;
   TQStringList catalogNames; // list of all catalogs (regardless of language)
-  TQValueList<KCatalogue> catalogues; // list of all loaded catalogs, tqcontains one instance per catalog name and language
+  TQValueList<KCatalogue> catalogues; // list of all loaded catalogs, contains one instance per catalog name and language
   TQString encoding;
   TQTextCodec * codecForEncoding;
   KConfig * config;
@@ -121,9 +121,9 @@ void KLocale::initMainCatalogues(const TQString & catalog)
   TQString mainCatalogue = catalog;
 
   // don't use main catalogue if we're looking up .desktop translations
-  if (mainCatalogue.tqcontains("desktop") == 0 || mainCatalogue.tqcontains("kdesktop") == 1) {
+  if (mainCatalogue.contains("desktop") == 0 || mainCatalogue.contains("kdesktop") == 1) {
     if (maincatalogue) {
-      mainCatalogue = TQString::tqfromLatin1(maincatalogue);
+      mainCatalogue = TQString::fromLatin1(maincatalogue);
     }
   }
 
@@ -135,7 +135,7 @@ void KLocale::initMainCatalogues(const TQString & catalog)
   else {
     // do not use insertCatalogue here, that would already trigger updateCatalogs
     d->catalogNames.append( mainCatalogue );   // application catalog
-    if (mainCatalogue.tqcontains("desktop") == 0 || mainCatalogue.tqcontains("kdesktop") == 1) { //don't bother if we're looking up desktop translations
+    if (mainCatalogue.contains("desktop") == 0 || mainCatalogue.contains("kdesktop") == 1) { //don't bother if we're looking up desktop translations
       d->catalogNames.append( SYSTEM_MESSAGES ); // always include kdelibs.mo
       d->catalogNames.append( "kio" );            // always include kio.mo
       d->catalogNames.append( "xdg-user-dirs" );
@@ -312,13 +312,13 @@ void KLocale::initFormat()
   KConfigGroupSaver saver(config, "Locale");
 
   KSimpleConfig entry(locate("locale",
-                             TQString::tqfromLatin1("l10n/%1/entry.desktop")
+                             TQString::fromLatin1("l10n/%1/entry.desktop")
                              .arg(m_country)), true);
   entry.setGroup("KCM Locale");
 
   // Numeric
 #define readConfigEntry(key, default, save) \
-  save = entry.readEntry(key, TQString::tqfromLatin1(default)); \
+  save = entry.readEntry(key, TQString::fromLatin1(default)); \
   save = config->readEntry(key, save);
 
 #define readConfigNumEntry(key, default, save, type) \
@@ -331,7 +331,7 @@ void KLocale::initFormat()
 
   readConfigEntry("DecimalSymbol", ".", m_decimalSymbol);
   readConfigEntry("ThousandsSeparator", ",", m_thousandsSeparator);
-  m_thousandsSeparator.tqreplace( TQString::tqfromLatin1("$0"), TQString::null );
+  m_thousandsSeparator.replace( TQString::fromLatin1("$0"), TQString::null );
   //kdDebug(173) << "m_thousandsSeparator=" << m_thousandsSeparator << endl;
 
   readConfigEntry("PositiveSign", "", m_positiveSign);
@@ -342,7 +342,7 @@ void KLocale::initFormat()
   readConfigEntry("MonetaryDecimalSymbol", ".", m_monetaryDecimalSymbol);
   readConfigEntry("MonetaryThousandsSeparator", ",",
 		  m_monetaryThousandsSeparator);
-  m_monetaryThousandsSeparator.tqreplace(TQString::tqfromLatin1("$0"), TQString::null);
+  m_monetaryThousandsSeparator.replace(TQString::fromLatin1("$0"), TQString::null);
 
   readConfigNumEntry("FracDigits", 2, m_fracDigits, int);
   readConfigBoolEntry("PositivePrefixCurrencySymbol", true,
@@ -372,7 +372,7 @@ void KLocale::initFormat()
   //Grammatical
   //Precedence here is l10n / i18n / config file
   KSimpleConfig language(locate("locale",
-			        TQString::tqfromLatin1("%1/entry.desktop")
+			        TQString::fromLatin1("%1/entry.desktop")
                                 .arg(m_language)), true);
   language.setGroup("KCM Locale");
 #define read3ConfigBoolEntry(key, default, save) \
@@ -404,7 +404,7 @@ bool KLocale::setCountry(const TQString & country)
 TQString KLocale::catalogueFileName(const TQString & language,
 				   const KCatalogue & catalog)
 {
-  TQString path = TQString::tqfromLatin1("%1/LC_MESSAGES/%2.mo")
+  TQString path = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo")
     .arg( language )
     .arg( catalog.name() );
 
@@ -417,7 +417,7 @@ TQString KLocale::catalogueFileName(const TQString & language,
 
 bool KLocale::setLanguage(const TQString & language)
 {
-  if ( d->languageList.tqcontains( language ) ) {
+  if ( d->languageList.contains( language ) ) {
  	 d->languageList.remove( language );
   }
   d->languageList.prepend( language ); // let us consider this language to be the most important one
@@ -444,14 +444,14 @@ bool KLocale::setLanguage(const TQStringList & languages)
   //    these langugage have to be dropped. Otherwise we get strange side effects, e.g. with Hebrew:
   //    the right/left switch for languages that write from
   //    right to left (like Hebrew or Arabic) is set in kdelibs.mo. If you only have kdelibs.mo
-  //    but nothing from appname.mo, you get a mostly English app with tqlayout from right to left.
+  //    but nothing from appname.mo, you get a mostly English app with layout from right to left.
   //    That was considered to be a bug by the Hebrew translators.
   for( TQStringList::Iterator it = languageList.fromLast();
     it != languageList.begin(); --it )
   {
     // kdDebug() << "checking " << (*it) << endl;
     bool bIsTranslated = isApplicationTranslatedInto( *it );
-    if ( languageList.tqcontains(*it) > 1 || (*it).isEmpty() || (!bIsTranslated) ) {
+    if ( languageList.contains(*it) > 1 || (*it).isEmpty() || (!bIsTranslated) ) {
       // kdDebug() << "removing " << (*it) << endl;
       it = languageList.remove( it );
     }
@@ -497,15 +497,15 @@ bool KLocale::isApplicationTranslatedInto( const TQString & language)
 
   TQString appName = d->appName;
   if (maincatalogue) {
-    appName = TQString::tqfromLatin1(maincatalogue);
+    appName = TQString::fromLatin1(maincatalogue);
   }
   // sorry, catalogueFileName requires catalog object,k which we do not have here
-  // path tqfinding was supposed to be moved completely to KCatalogue. The interface cannot
+  // path finding was supposed to be moved completely to KCatalogue. The interface cannot
   // be changed that far during deep freeze. So in order to fix the bug now, we have
   // duplicated code for file path evaluation. Cleanup will follow later. We could have e.g.
   // a static method in KCataloge that can translate between these file names.
   // a stat
-  TQString sFileName = TQString::tqfromLatin1("%1/LC_MESSAGES/%2.mo")
+  TQString sFileName = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo")
     .arg( language )
     .arg( appName );
   // kdDebug() << "isApplicationTranslatedInto: filename " << sFileName << endl;
@@ -526,7 +526,7 @@ void KLocale::splitLocale(const TQString & aStr,
   TQString str = aStr;
 
   // just in case, there is another language appended
-  int f = str.tqfind(':');
+  int f = str.find(':');
   if (f >= 0)
     str.truncate(f);
 
@@ -534,14 +534,14 @@ void KLocale::splitLocale(const TQString & aStr,
   chrset = TQString::null;
   language = TQString::null;
 
-  f = str.tqfind('.');
+  f = str.find('.');
   if (f >= 0)
     {
       chrset = str.mid(f + 1);
       str.truncate(f);
     }
 
-  f = str.tqfind('_');
+  f = str.find('_');
   if (f >= 0)
     {
       country = str.mid(f + 1);
@@ -644,7 +644,7 @@ TQString KLocale::weekDayName (int i, bool shortName) const
 
 void KLocale::insertCatalogue( const TQString & catalog )
 {
-  if ( !d->catalogNames.tqcontains( catalog) ) {
+  if ( !d->catalogNames.contains( catalog) ) {
     d->catalogNames.append( catalog );
   }
   updateCatalogues( ); // evaluate the changed list and generate the neccessary KCatalog objects
@@ -693,7 +693,7 @@ void KLocale::updateCatalogues( )
 
 void KLocale::removeCatalogue(const TQString &catalog)
 {
-  if ( d->catalogNames.tqcontains( catalog )) {
+  if ( d->catalogNames.contains( catalog )) {
     d->catalogNames.remove( catalog );
     if (KGlobal::_instance)
       updateCatalogues();  // walk through the KCatalogue instances and weed out everything we no longer need
@@ -702,7 +702,7 @@ void KLocale::removeCatalogue(const TQString &catalog)
 
 void KLocale::setActiveCatalogue(const TQString &catalog)
 {
-  if ( d->catalogNames.tqcontains( catalog ) ) {
+  if ( d->catalogNames.contains( catalog ) ) {
     d->catalogNames.remove( catalog );
 	d->catalogNames.prepend( catalog );
 	updateCatalogues();  // walk through the KCatalogue instances and adapt to the new order
@@ -723,7 +723,7 @@ TQString KLocale::translate_priv(const char *msgid,
 				int* pluralType ) const
 {
   if ( pluralType) {
-  	*pluralType = -1; // unless we tqfind something more precise
+  	*pluralType = -1; // unless we find something more precise
   }
   if (!msgid || !msgid[0])
     {
@@ -795,10 +795,10 @@ TQString KLocale::translate( const char *index, const char *fallback) const
 static TQString put_n_in(const TQString &orig, unsigned long n)
 {
   TQString ret = orig;
-  int index = ret.tqfind("%n");
+  int index = ret.find("%n");
   if (index == -1)
     return ret;
-  ret.tqreplace(index, 2, TQString::number(n));
+  ret.replace(index, 2, TQString::number(n));
   return ret;
 }
 
@@ -830,7 +830,7 @@ TQString KLocale::translate( const char *singular, const char *plural,
 	} else {
 	  TQString tmp = TQString::fromUtf8( plural );
 #ifndef NDEBUG
-	  if (tmp.tqfind("%n") == -1) {
+	  if (tmp.find("%n") == -1) {
 			  kdDebug() << "the message for i18n should contain a '%n'! " << plural << endl;
 	  }
 #endif
@@ -1142,7 +1142,7 @@ TQString KLocale::formatMoney(double num,
   TQString res = TQString::number(neg?-num:num, 'f', precision);
 
   // Replace dot with locale decimal separator
-  res.tqreplace(TQChar('.'), monetaryDecimalSymbol());
+  res.replace(TQChar('.'), monetaryDecimalSymbol());
 
   // Insert the thousand separators
   _insertSeparator(res, monetaryThousandsSeparator(), monetaryDecimalSymbol());
@@ -1259,7 +1259,7 @@ static void _inc_by_one(TQString &str, int position)
 // Cut off if more digits in fractional part than 'precision'
 static void _round(TQString &str, int precision)
 {
-  int decimalSymbolPos = str.tqfind('.');
+  int decimalSymbolPos = str.find('.');
 
   if (decimalSymbolPos == -1)
     if (precision == 0)  return;
@@ -1294,7 +1294,7 @@ static void _round(TQString &str, int precision)
       break;
     }
 
-  decimalSymbolPos = str.tqfind('.');
+  decimalSymbolPos = str.find('.');
   str.truncate(decimalSymbolPos + precision + 1);
   
   // if precision == 0 delete also '.'
@@ -1324,7 +1324,7 @@ TQString KLocale::formatNumber(const TQString &numStr, bool round,
   if (round) _round(mantString, precision);
  
   // Replace dot with locale decimal separator
-  mantString.tqreplace(TQChar('.'), decimalSymbol());
+  mantString.replace(TQChar('.'), decimalSymbol());
   
   // Insert the thousand separators
   _insertSeparator(mantString, thousandsSeparator(), decimalSymbol());
@@ -1352,14 +1352,14 @@ TQString KLocale::formatDate(const TQDate &pDate, bool shortFormat) const
     {
       if ( !escape )
 	{
-	  if ( (QChar)(rst.at( format_index ).tqunicode()) == (QChar)'%' )
+	  if ( (QChar)(rst.at( format_index ).unicode()) == (QChar)'%' )
 	    escape = true;
 	  else
 	    buffer.append(rst.at(format_index));
 	}
       else
 	{
-	  switch ( rst.at( format_index ).tqunicode() )
+	  switch ( rst.at( format_index ).unicode() )
 	    {
 	    case '%':
 	      buffer.append('%');
@@ -1418,7 +1418,7 @@ void KLocale::setMainCatalogue(const char *catalog)
 double KLocale::readNumber(const TQString &_str, bool * ok) const
 {
   TQString str = _str.stripWhiteSpace();
-  bool neg = str.tqfind(negativeSign()) == 0;
+  bool neg = str.find(negativeSign()) == 0;
   if (neg)
     str.remove( 0, negativeSign().length() );
 
@@ -1428,7 +1428,7 @@ double KLocale::readNumber(const TQString &_str, bool * ok) const
   TQString exponentialPart;
   int EPos;
 
-  EPos = str.tqfind('E', 0, false);
+  EPos = str.find('E', 0, false);
 
   if (EPos != -1)
   {
@@ -1436,7 +1436,7 @@ double KLocale::readNumber(const TQString &_str, bool * ok) const
     str = str.left(EPos);
   }
 
-  int pos = str.tqfind(decimalSymbol());
+  int pos = str.find(decimalSymbol());
   TQString major;
   TQString minor;
   if ( pos == -1 )
@@ -1450,7 +1450,7 @@ double KLocale::readNumber(const TQString &_str, bool * ok) const
   // Remove thousand separators
   int thlen = thousandsSeparator().length();
   int lastpos = 0;
-  while ( ( pos = major.tqfind( thousandsSeparator() ) ) > 0 )
+  while ( ( pos = major.find( thousandsSeparator() ) ) > 0 )
   {
     // e.g. 12,,345,,678,,922 Acceptable positions (from the end) are 5, 10, 15... i.e. (3+thlen)*N
     int fromEnd = major.length() - pos;
@@ -1487,7 +1487,7 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const
   bool currencyFound = false;
   TQString symbol = currencySymbol();
   // First try removing currency symbol from either end
-  int pos = str.tqfind(symbol);
+  int pos = str.find(symbol);
   if ( pos == 0 || pos == (int) str.length()-symbol.length() )
     {
       str.remove(pos,symbol.length());
@@ -1512,7 +1512,7 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const
     }
   else
     {
-      int i1 = str.tqfind(negativeSign());
+      int i1 = str.find(negativeSign());
       if ( i1 == 0 || i1 == (int) str.length()-1 )
         {
 	  neg = true;
@@ -1521,11 +1521,11 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const
     }
   if (neg) str = str.stripWhiteSpace();
 
-  // Finally try again for the currency symbol, if we didn't tqfind
+  // Finally try again for the currency symbol, if we didn't find
   // it already (because of the negative sign being in the way).
   if ( !currencyFound )
     {
-      pos = str.tqfind(symbol);
+      pos = str.find(symbol);
       if ( pos == 0 || pos == (int) str.length()-symbol.length() )
         {
 	  str.remove(pos,symbol.length());
@@ -1534,7 +1534,7 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const
     }
 
   // And parse the rest as a number
-  pos = str.tqfind(monetaryDecimalSymbol());
+  pos = str.find(monetaryDecimalSymbol());
   TQString major;
   TQString minior;
   if (pos == -1)
@@ -1548,7 +1548,7 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const
   // Remove thousand separators
   int thlen = monetaryThousandsSeparator().length();
   int lastpos = 0;
-  while ( ( pos = major.tqfind( monetaryThousandsSeparator() ) ) > 0 )
+  while ( ( pos = major.find( monetaryThousandsSeparator() ) ) > 0 )
   {
     // e.g. 12,,345,,678,,922 Acceptable positions (from the end) are 5, 10, 15... i.e. (3+thlen)*N
     int fromEnd = major.length() - pos;
@@ -1614,7 +1614,7 @@ TQDate KLocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok)
   TQString str = intstr.simplifyWhiteSpace().lower();
   int day = -1, month = -1;
   // allow the year to be omitted if not in the format
-  int year = calendar()->year(TQDate::tqcurrentDate());
+  int year = calendar()->year(TQDate::currentDate());
   uint strpos = 0;
   uint fmtpos = 0;
 
@@ -1876,14 +1876,14 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat
     {
       if ( !escape )
 	{
-	  if ( (QChar)(rst.at( format_index ).tqunicode()) == (QChar)'%' )
+	  if ( (QChar)(rst.at( format_index ).unicode()) == (QChar)'%' )
 	    escape = true;
 	  else
 	    buffer[index++] = rst.at( format_index );
 	}
       else
 	{
-	  switch ( rst.at( format_index ).tqunicode() )
+	  switch ( rst.at( format_index ).unicode() )
 	    {
 	    case '%':
 	      buffer[index++] = (QChar)'%';
@@ -1915,7 +1915,7 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat
 	      number = pTime.hour();
 	    case 'l':
 	      // to share the code
-	      if ( (QChar)(rst.at( format_index ).tqunicode()) == (QChar)'l' )
+	      if ( (QChar)(rst.at( format_index ).unicode()) == (QChar)'l' )
 		number = isDuration ? pTime.hour() : (pTime.hour() + 11) % 12 + 1;
 	      if ( number / 10 )
 		buffer[index++] = number / 10 + '0';
@@ -1948,8 +1948,8 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat
 
 bool KLocale::use12Clock() const
 {
-  if ((timeFormat().tqcontains(TQString::tqfromLatin1("%I")) > 0) ||
-      (timeFormat().tqcontains(TQString::tqfromLatin1("%l")) > 0))
+  if ((timeFormat().contains(TQString::fromLatin1("%I")) > 0) ||
+      (timeFormat().contains(TQString::fromLatin1("%l")) > 0))
     return true;
   else
     return false;
@@ -1957,7 +1957,7 @@ bool KLocale::use12Clock() const
 
 TQString KLocale::languages() const
 {
-  return d->languageList.join( TQString::tqfromLatin1(":") );
+  return d->languageList.join( TQString::fromLatin1(":") );
 }
 
 TQStringList KLocale::languageList() const
@@ -2008,7 +2008,7 @@ void KLocale::initInstance()
 
   KInstance *app = KGlobal::instance();
   if (app) {
-    KGlobal::_locale = new KLocale(TQString::tqfromLatin1(app->instanceName()));
+    KGlobal::_locale = new KLocale(TQString::fromLatin1(app->instanceName()));
 
     // only do this for the global instance
     TQTextCodec::setCodecForLocale(KGlobal::_locale->codecForEncoding());
@@ -2265,12 +2265,12 @@ void KLocale::setMeasureSystem(MeasureSystem value)
 
 TQString KLocale::defaultLanguage()
 {
-  return TQString::tqfromLatin1("en_US");
+  return TQString::fromLatin1("en_US");
 }
 
 TQString KLocale::defaultCountry()
 {
-  return TQString::tqfromLatin1("C");
+  return TQString::fromLatin1("C");
 }
 
 const char * KLocale::encoding() const
@@ -2325,7 +2325,7 @@ TQStringList KLocale::languagesTwoAlpha() const
 
   TQStringList result;
 
-  KConfig config(TQString::tqfromLatin1("language.codes"), true, false);
+  KConfig config(TQString::fromLatin1("language.codes"), true, false);
   config.setGroup("TwoLetterCodes");
 
   for ( TQStringList::ConstIterator it = origList.begin();
@@ -2338,7 +2338,7 @@ TQStringList KLocale::languagesTwoAlpha() const
          langLst = config.readListEntry( lang );
       else
       {
-         int i = lang.tqfind('_');
+         int i = lang.find('_');
          if (i >= 0)
             lang.truncate(i);
          langLst << lang;
@@ -2348,7 +2348,7 @@ TQStringList KLocale::languagesTwoAlpha() const
 	    langIt != langLst.end();
 	    ++langIt )
 	{
-	  if ( !(*langIt).isEmpty() && !result.tqcontains( *langIt ) )
+	  if ( !(*langIt).isEmpty() && !result.contains( *langIt ) )
 	    result += *langIt;
 	}
     }
@@ -2370,8 +2370,8 @@ TQString KLocale::twoAlphaToLanguageName(const TQString &code) const
     d->languages = new KConfig("all_languages", true, false, "locale");
 
   TQString groupName = code;
-  const int i = groupName.tqfind('_');
-  groupName.tqreplace(0, i, groupName.left(i).lower());
+  const int i = groupName.find('_');
+  groupName.replace(0, i, groupName.left(i).lower());
 
   d->languages->setGroup(groupName);
   return d->languages->readEntry("Name");
@@ -2466,7 +2466,7 @@ KLocale & KLocale::operator=(const KLocale & rhs)
 }
 
 bool KLocale::setCharset(const TQString & ) { return true; }
-TQString KLocale::charset() const { return TQString::tqfromLatin1("UTF-8"); }
+TQString KLocale::charset() const { return TQString::fromLatin1("UTF-8"); }
 
 // KDE4: remove
 #if 0
diff --git a/kdecore/klocale.h b/kdecore/klocale.h
index a7e049595..5f8be8f7c 100644
--- a/kdecore/klocale.h
+++ b/kdecore/klocale.h
@@ -91,7 +91,7 @@ KDECORE_EXPORT TQString i18n(const char *comment, const char *text);
  *  If you want to handle plural forms, use this form of i18n.
  *  @param singular the singular form of the word, for example "file".
   * @param plural the plural form of the word. Must contain a "%n" that will
- *                be tqreplaced by the number @p n, for example "%n files"
+ *                be replaced by the number @p n, for example "%n files"
  *  @param n the number
  *  @return the correct singular or plural for the selected language,
  *          depending on n
@@ -162,7 +162,7 @@ public:
    * Translates the string into the corresponding string in
    * the national language, if available. If not, returns
    * the string itself.
-   * There is a KDE wide message file that tqcontains the most
+   * There is a KDE wide message file that contains the most
    * often used phrases, so we can avoid duplicating the
    * translation of these phrases. If a phrase is not found
    * in the catalog given to the constructor, it will search
@@ -210,7 +210,7 @@ public:
    * word.
    * @param singular the singular form of the word, for example "file".
    * @param plural the plural form of the word. Must contain a "%n" that will
-   *               be tqreplaced by the number @p n, for example "%n files"
+   *               be replaced by the number @p n, for example "%n files"
    * @param n the number
    * @return the correct singular or plural for the selected language,
    *         depending on n
@@ -533,7 +533,7 @@ public:
    *
    * @return The name of the month
    * 
-   * Typically the correct tqreplacement for this deprecated class is
+   * Typically the correct replacement for this deprecated class is
    * calendar()->monthString(), which requires a TQDate (rather than an
    * integer month) or both a month and a year.
    * This will work across different calendars.
@@ -558,7 +558,7 @@ public:
    * @return The possessive form of the name of the month
    * @since 3.1
    *
-   * Typically the correct tqreplacement for this deprecated class is
+   * Typically the correct replacement for this deprecated class is
    * calendar()->monthNamePossessive(), which requires a TQDate (rather than
    * an integer month) or both a month and a year.
    * This will work across different calendars.
@@ -801,8 +801,8 @@ public:
   /**
    * Changes the current date format.
    *
-   * The format of the date is a string which tqcontains variables that will
-   * be tqreplaced:
+   * The format of the date is a string which contains variables that will
+   * be replaced:
    * @li %Y with the century (e.g. "19" for "1984")
    * @li %y with the lower 2 digits of the year (e.g. "84" for "1984")
    * @li %n with the month (January="1", December="12")
@@ -824,8 +824,8 @@ public:
   /**
    * Changes the current short date format.
    *
-   * The format of the date is a string which tqcontains variables that will
-   * be tqreplaced:
+   * The format of the date is a string which contains variables that will
+   * be replaced:
    * @li %Y with the century (e.g. "19" for "1984")
    * @li %y with the lower 2 digits of the year (e.g. "84" for "1984")
    * @li %n with the month (January="1", December="12")
@@ -854,8 +854,8 @@ public:
   /**
    * Changes the current time format.
    *
-   * The format of the time is string a which tqcontains variables that will
-   * be tqreplaced:
+   * The format of the time is string a which contains variables that will
+   * be replaced:
    * @li %H with the hour in 24h format and 2 digits (e.g. 5pm is "17", 5am is "05")
    * @li %k with the hour in 24h format and one digits (e.g. 5pm is "17", 5am is "5")
    * @li %I with the hour in 12h format and 2 digits (e.g. 5pm is "05", 5am is "05")
@@ -1117,7 +1117,7 @@ public:
   /**
    * Finds localized resource in resourceDir( rtype ) + \<lang> + fname.
    *
-   * @param fname relative path to tqfind
+   * @param fname relative path to find
    * @param rtype resource type to use
    */
   static TQString langLookup(const TQString &fname, const char *rtype = "html");
diff --git a/kdecore/kmacroexpander.cpp b/kdecore/kmacroexpander.cpp
index 9c7e5da24..5516c1b61 100644
--- a/kdecore/kmacroexpander.cpp
+++ b/kdecore/kmacroexpander.cpp
@@ -56,7 +56,7 @@ void KMacroExpanderBase::expandMacros( TQString &str )
 
     for (pos = 0; pos < str.length(); ) {
         if (ec != (QChar)0) {
-            if (str.tqunicode()[pos] != ec)
+            if (str.unicode()[pos] != ec)
                 goto nohit;
             if (!(len = expandEscapedMacro( str, pos, rst )))
                 goto nohit;
@@ -70,7 +70,7 @@ void KMacroExpanderBase::expandMacros( TQString &str )
             }
             rsts = rst.join( " " );
             rst.clear();
-            str.tqreplace( pos, len, rsts );
+            str.replace( pos, len, rsts );
             pos += rsts.length();
             continue;
       nohit:
@@ -109,7 +109,7 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
     TQString rsts;
 
     while (pos < str.length()) {
-        TQChar cc( str.tqunicode()[pos] );
+        TQChar cc( str.unicode()[pos] );
         if (ec != (QChar)0) {
             if (cc != ec)
                 goto nohit;
@@ -125,13 +125,13 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
             }
             if (state.dquote) {
                 rsts = rst.join( " " );
-                rsts.tqreplace( TQRegExp("([$`\"\\\\])"), "\\\\1" );
+                rsts.replace( TQRegExp("([$`\"\\\\])"), "\\\\1" );
             } else if (state.current == dollarquote) {
                 rsts = rst.join( " " );
-                rsts.tqreplace( TQRegExp("(['\\\\])"), "\\\\1" );
+                rsts.replace( TQRegExp("(['\\\\])"), "\\\\1" );
             } else if (state.current == singlequote) {
                 rsts = rst.join( " " );
-                rsts.tqreplace( '\'', "'\\''");
+                rsts.replace( '\'', "'\\''");
             } else {
                 if (rst.isEmpty()) {
                     str.remove( pos, len );
@@ -140,14 +140,14 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
                     rsts = "'";
 #if 0 // this could pay off if join() would be cleverer and the strings were long
                     for (TQStringList::Iterator it = rst.begin(); it != rst.end(); ++it)
-                        (*it).tqreplace( '\'', "'\\''" );
+                        (*it).replace( '\'', "'\\''" );
                     rsts += rst.join( "' '" );
 #else
                     for (TQStringList::ConstIterator it = rst.begin(); it != rst.end(); ++it) {
                         if (it != rst.begin())
                             rsts += "' '";
                         TQString trsts( *it );
-                        trsts.tqreplace( '\'', "'\\''" );
+                        trsts.replace( '\'', "'\\''" );
                         rsts += trsts;
                     }
 #endif
@@ -155,7 +155,7 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
                 }
             }
             rst.clear();
-            str.tqreplace( pos, len, rsts );
+            str.replace( pos, len, rsts );
             pos += rsts.length();
             continue;
       nohit:
@@ -198,14 +198,14 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
             }
             // always swallow the char -> prevent anomalies due to expansion
         } else if (cc == (QChar)'`') {
-            str.tqreplace( pos, 1, "$( " ); // add space -> avoid creating $((
+            str.replace( pos, 1, "$( " ); // add space -> avoid creating $((
             pos2 = pos += 3;
             for (;;) {
                 if (pos2 >= str.length()) {
                     pos = pos2;
                     return false;
                 }
-                cc = str.tqunicode()[pos2];
+                cc = str.unicode()[pos2];
                 if (cc == (QChar)'`')
                     break;
                 if (cc == (QChar)'\\') {
@@ -339,7 +339,7 @@ template<class VT>
 int
 KMacroMapExpander<TQChar,VT>::expandPlainMacro( const TQString &str, uint pos, TQStringList &ret )
 {
-    TQMapConstIterator<TQChar,VT> it = macromap.tqfind(str[pos]);
+    TQMapConstIterator<TQChar,VT> it = macromap.find(str[pos]);
     if (it != macromap.end()) {
        ret += it.data();
        return 1;
@@ -355,7 +355,7 @@ KMacroMapExpander<TQChar,VT>::expandEscapedMacro( const TQString &str, uint pos,
         ret += TQString( escapeChar() );
         return 2;
     }
-    TQMapConstIterator<TQChar,VT> it = macromap.tqfind(str[pos+1]);
+    TQMapConstIterator<TQChar,VT> it = macromap.find(str[pos+1]);
     if (it != macromap.end()) {
        ret += it.data();
        return 2;
@@ -383,14 +383,14 @@ template<class VT>
 int
 KMacroMapExpander<TQString,VT>::expandPlainMacro( const TQString &str, uint pos, TQStringList &ret )
 {
-    if (isIdentifier( str[pos - 1].tqunicode() ))
+    if (isIdentifier( str[pos - 1].unicode() ))
         return 0;
     uint sl;
-    for (sl = 0; isIdentifier( str[pos + sl].tqunicode() ); sl++);
+    for (sl = 0; isIdentifier( str[pos + sl].unicode() ); sl++);
     if (!sl)
         return 0;
     TQMapConstIterator<TQString,VT> it =
-        macromap.tqfind( TQConstString( str.tqunicode() + pos, sl ).string() );
+        macromap.find( TQConstString( str.unicode() + pos, sl ).string() );
     if (it != macromap.end()) {
         ret += it.data();
         return sl;
@@ -415,13 +415,13 @@ KMacroMapExpander<TQString,VT>::expandEscapedMacro( const TQString &str, uint po
         rsl = sl + 3;
     } else {
         rpos = pos + 1;
-        for (sl = 0; isIdentifier( str[rpos + sl].tqunicode() ); sl++);
+        for (sl = 0; isIdentifier( str[rpos + sl].unicode() ); sl++);
         rsl = sl + 1;
     }
     if (!sl)
         return 0;
     TQMapConstIterator<TQString,VT> it =
-        macromap.tqfind( TQConstString( str.tqunicode() + rpos, sl ).string() );
+        macromap.find( TQConstString( str.unicode() + rpos, sl ).string() );
     if (it != macromap.end()) {
         ret += it.data();
         return rsl;
@@ -454,13 +454,13 @@ KCharMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL
 int
 KWordMacroExpander::expandPlainMacro( const TQString &str, uint pos, TQStringList &ret )
 {
-    if (isIdentifier( str[pos - 1].tqunicode() ))
+    if (isIdentifier( str[pos - 1].unicode() ))
         return 0;
     uint sl;
-    for (sl = 0; isIdentifier( str[pos + sl].tqunicode() ); sl++);
+    for (sl = 0; isIdentifier( str[pos + sl].unicode() ); sl++);
     if (!sl)
         return 0;
-    if (expandMacro( TQConstString( str.tqunicode() + pos, sl ).string(), ret ))
+    if (expandMacro( TQConstString( str.unicode() + pos, sl ).string(), ret ))
         return sl;
     return 0;
 }
@@ -481,12 +481,12 @@ KWordMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL
         rsl = sl + 3;
     } else {
         rpos = pos + 1;
-        for (sl = 0; isIdentifier( str[rpos + sl].tqunicode() ); sl++);
+        for (sl = 0; isIdentifier( str[rpos + sl].unicode() ); sl++);
         rsl = sl + 1;
     }
     if (!sl)
         return 0;
-    if (expandMacro( TQConstString( str.tqunicode() + rpos, sl ).string(), ret ))
+    if (expandMacro( TQConstString( str.unicode() + rpos, sl ).string(), ret ))
         return rsl;
     return 0;
 }
diff --git a/kdecore/kmacroexpander.h b/kdecore/kmacroexpander.h
index 2e86145e5..226264990 100644
--- a/kdecore/kmacroexpander.h
+++ b/kdecore/kmacroexpander.h
@@ -71,7 +71,7 @@ public:
      * The rest of the shell (incl. bash) syntax is simply ignored,
      * as it is not expected to cause problems.
      *
-     * Note that bash tqcontains a bug which makes macro expansion within 
+     * Note that bash contains a bug which makes macro expansion within 
      * double quoted substitutions ("${VAR:-%macro}") inherently insecure.
      *
      * @param str the string in which macros are expanded in-place
diff --git a/kdecore/kmanagerselection.cpp b/kdecore/kmanagerselection.cpp
index ef7110dc2..b88990dbf 100644
--- a/kdecore/kmanagerselection.cpp
+++ b/kdecore/kmanagerselection.cpp
@@ -423,9 +423,9 @@ void KSelectionWatcher::init()
         manager_atom = XInternAtom( dpy, "MANAGER", False );
         XWindowAttributes attrs;
         XGetWindowAttributes( dpy, RootWindow( dpy, screen ), &attrs );
-        long event_tqmask = attrs.your_event_mask;
+        long event_mask = attrs.your_event_mask;
         // StructureNotifyMask on the root window is needed
-        XSelectInput( dpy, RootWindow( dpy, screen ), event_tqmask | StructureNotifyMask );
+        XSelectInput( dpy, RootWindow( dpy, screen ), event_mask | StructureNotifyMask );
         }
     }    
 
diff --git a/kdecore/kmanagerselection.h b/kdecore/kmanagerselection.h
index 2560a3724..b6aefd9db 100644
--- a/kdecore/kmanagerselection.h
+++ b/kdecore/kmanagerselection.h
@@ -44,7 +44,7 @@ class KSelectionOwnerPrivate;
  @short ICCCM manager selection owner
 */
 class KDECORE_EXPORT KSelectionOwner
-    : public TQObject
+    : public QObject
     {
     Q_OBJECT
     public:
@@ -161,13 +161,13 @@ class KSelectionWatcherPrivate;
 /**
  This class implements watching manager selections, as described in the ICCCM
  section 2.8. It emits signal newOwner() when a new owner claim the selection,
- and emits lostOwner() when the selection ownership is given up. To tqfind
+ and emits lostOwner() when the selection ownership is given up. To find
  out current owner of the selection, owner() can be used.
  @since 3.2
  @short ICCCM manager selection watching
 */
 class KDECORE_EXPORT KSelectionWatcher
-    : public TQObject
+    : public QObject
     {
     Q_OBJECT
     public:
diff --git a/kdecore/kmdcodec.cpp b/kdecore/kmdcodec.cpp
index 73b868417..76c80d329 100644
--- a/kdecore/kmdcodec.cpp
+++ b/kdecore/kmdcodec.cpp
@@ -238,7 +238,7 @@ void KCodecs::quotedPrintableEncode(const TQByteArray& in, TQByteArray& out, boo
         ++lineLength;
       }
     }
-    // If we tqfind a line break, just let it through.
+    // If we find a line break, just let it through.
     else if ((useCRLF && ('\r' == c) && (i < end) && ('\n' == data[i + 1])) ||
              (!useCRLF && ('\n' == c)))
     {
@@ -787,7 +787,7 @@ void KMD5::update(const TQCString& in)
 void KMD5::update(const unsigned char* in, int len)
 {
     if (len < 0)
-        len = tqstrlen(reinterpret_cast<const char*>(in));
+        len = qstrlen(reinterpret_cast<const char*>(in));
 
     if (!len)
         return;
@@ -797,12 +797,12 @@ void KMD5::update(const unsigned char* in, int len)
         return;
     }
 
-    TQ_UINT32 in_index;
-    TQ_UINT32 buffer_index;
-    TQ_UINT32 buffer_space;
-    TQ_UINT32 in_length = static_cast<TQ_UINT32>( len );
+    Q_UINT32 in_index;
+    Q_UINT32 buffer_index;
+    Q_UINT32 buffer_space;
+    Q_UINT32 in_length = static_cast<Q_UINT32>( len );
 
-    buffer_index = static_cast<TQ_UINT32>((m_count[0] >> 3) & 0x3F);
+    buffer_index = static_cast<Q_UINT32>((m_count[0] >> 3) & 0x3F);
 
     if (  (m_count[0] += (in_length << 3))<(in_length << 3) )
         m_count[1]++;
@@ -842,8 +842,8 @@ void KMD5::finalize ()
 {
     if (m_finalized) return;
 
-    TQ_UINT8 bits[8];
-    TQ_UINT32 index, padLen;
+    Q_UINT8 bits[8];
+    Q_UINT32 index, padLen;
     static const unsigned char PADDING[64]=
     {
         0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -856,7 +856,7 @@ void KMD5::finalize ()
     //memcpy( bits, m_count, 8 );
 
     // Pad out to 56 mod 64.
-    index = static_cast<TQ_UINT32>((m_count[0] >> 3) & 0x3f);
+    index = static_cast<Q_UINT32>((m_count[0] >> 3) & 0x3f);
     padLen = (index < 56) ? (56 - index) : (120 - index);
     update (reinterpret_cast<const char*>(PADDING), padLen);
 
@@ -957,7 +957,7 @@ void KMD5::reset()
 void KMD5::transform( const unsigned char block[64] )
 {
 
-    TQ_UINT32 a = m_state[0], b = m_state[1], c = m_state[2], d = m_state[3], x[16];
+    Q_UINT32 a = m_state[0], b = m_state[1], c = m_state[2], d = m_state[3], x[16];
 
     decode (x, block, 64);
     //memcpy( x, block, 64 );
@@ -1044,91 +1044,91 @@ void KMD5::transform( const unsigned char block[64] )
     memset ( static_cast<void *>(x), 0, sizeof(x) );
 }
 
-inline TQ_UINT32 KMD5::rotate_left (TQ_UINT32 x, TQ_UINT32 n)
+inline Q_UINT32 KMD5::rotate_left (Q_UINT32 x, Q_UINT32 n)
 {
     return (x << n) | (x >> (32-n))  ;
 }
 
-inline TQ_UINT32 KMD5::F (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z)
+inline Q_UINT32 KMD5::F (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z)
 {
     return (x & y) | (~x & z);
 }
 
-inline TQ_UINT32 KMD5::G (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z)
+inline Q_UINT32 KMD5::G (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z)
 {
     return (x & z) | (y & ~z);
 }
 
-inline TQ_UINT32 KMD5::H (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z)
+inline Q_UINT32 KMD5::H (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z)
 {
     return x ^ y ^ z;
 }
 
-inline TQ_UINT32 KMD5::I (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z)
+inline Q_UINT32 KMD5::I (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z)
 {
     return y ^ (x | ~z);
 }
 
-void KMD5::FF ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d,
-                       TQ_UINT32 x, TQ_UINT32  s, TQ_UINT32 ac )
+void KMD5::FF ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d,
+                       Q_UINT32 x, Q_UINT32  s, Q_UINT32 ac )
 {
     a += F(b, c, d) + x + ac;
     a = rotate_left (a, s) +b;
 }
 
-void KMD5::GG ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d,
-                 TQ_UINT32 x, TQ_UINT32 s, TQ_UINT32 ac)
+void KMD5::GG ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d,
+                 Q_UINT32 x, Q_UINT32 s, Q_UINT32 ac)
 {
     a += G(b, c, d) + x + ac;
     a = rotate_left (a, s) +b;
 }
 
-void KMD5::HH ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d,
-                 TQ_UINT32 x, TQ_UINT32 s, TQ_UINT32 ac )
+void KMD5::HH ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d,
+                 Q_UINT32 x, Q_UINT32 s, Q_UINT32 ac )
 {
     a += H(b, c, d) + x + ac;
     a = rotate_left (a, s) +b;
 }
 
-void KMD5::II ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d,
-                 TQ_UINT32 x, TQ_UINT32 s, TQ_UINT32 ac )
+void KMD5::II ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d,
+                 Q_UINT32 x, Q_UINT32 s, Q_UINT32 ac )
 {
     a += I(b, c, d) + x + ac;
     a = rotate_left (a, s) +b;
 }
 
 
-void KMD5::encode ( unsigned char* output, TQ_UINT32 *in, TQ_UINT32 len )
+void KMD5::encode ( unsigned char* output, Q_UINT32 *in, Q_UINT32 len )
 {
 #if !defined(WORDS_BIGENDIAN)
     memcpy(output, in, len);
 
 #else
-    TQ_UINT32 i, j;
+    Q_UINT32 i, j;
     for (i = 0, j = 0; j < len; i++, j += 4)
     {
-        output[j]   = static_cast<TQ_UINT8>((in[i] & 0xff));
-        output[j+1] = static_cast<TQ_UINT8>(((in[i] >> 8) & 0xff));
-        output[j+2] = static_cast<TQ_UINT8>(((in[i] >> 16) & 0xff));
-        output[j+3] = static_cast<TQ_UINT8>(((in[i] >> 24) & 0xff));
+        output[j]   = static_cast<Q_UINT8>((in[i] & 0xff));
+        output[j+1] = static_cast<Q_UINT8>(((in[i] >> 8) & 0xff));
+        output[j+2] = static_cast<Q_UINT8>(((in[i] >> 16) & 0xff));
+        output[j+3] = static_cast<Q_UINT8>(((in[i] >> 24) & 0xff));
     }
 #endif
 }
 
-// Decodes in (TQ_UINT8) into output (TQ_UINT32). Assumes len is a
+// Decodes in (Q_UINT8) into output (Q_UINT32). Assumes len is a
 // multiple of 4.
-void KMD5::decode (TQ_UINT32 *output, const unsigned char* in, TQ_UINT32 len)
+void KMD5::decode (Q_UINT32 *output, const unsigned char* in, Q_UINT32 len)
 {
 #if !defined(WORDS_BIGENDIAN)
     memcpy(output, in, len);
 
 #else
-    TQ_UINT32 i, j;
+    Q_UINT32 i, j;
     for (i = 0, j = 0; j < len; i++, j += 4)
-        output[i] = static_cast<TQ_UINT32>(in[j]) |
-                    (static_cast<TQ_UINT32>(in[j+1]) << 8)  |
-                    (static_cast<TQ_UINT32>(in[j+2]) << 16) |
-                    (static_cast<TQ_UINT32>(in[j+3]) << 24);
+        output[i] = static_cast<Q_UINT32>(in[j]) |
+                    (static_cast<Q_UINT32>(in[j+1]) << 8)  |
+                    (static_cast<Q_UINT32>(in[j+2]) << 16) |
+                    (static_cast<Q_UINT32>(in[j+3]) << 24);
 #endif
 }
 
@@ -1180,7 +1180,7 @@ void KMD4::update(const TQCString& in)
 void KMD4::update(const unsigned char *in, int len)
 {
   if (len < 0)
-      len = tqstrlen(reinterpret_cast<const char*>(in));
+      len = qstrlen(reinterpret_cast<const char*>(in));
 
   if (!len)
       return;
@@ -1190,12 +1190,12 @@ void KMD4::update(const unsigned char *in, int len)
       return;
   }
 
-  TQ_UINT32 t;
+  Q_UINT32 t;
 
   /* Update bitcount */
 
   t = m_count[0];
-  if ((m_count[0] = t + ((TQ_UINT32) len << 3)) < t)
+  if ((m_count[0] = t + ((Q_UINT32) len << 3)) < t)
     m_count[1]++;		/* Carry from low to high */
   m_count[1] += len >> 29;
 
@@ -1205,17 +1205,17 @@ void KMD4::update(const unsigned char *in, int len)
 
   if (t)
     {
-      TQ_UINT8 *p = &m_buffer[ t ];
+      Q_UINT8 *p = &m_buffer[ t ];
 
       t = 64 - t;
-      if ((TQ_UINT32)len < t)
+      if ((Q_UINT32)len < t)
 	{
 	  memcpy (p, in, len);
 	  return;
 	}
       memcpy (p, in, t);
       byteReverse (m_buffer, 16);
-      transform (m_state, (TQ_UINT32*) m_buffer);
+      transform (m_state, (Q_UINT32*) m_buffer);
       in += t;
       len -= t;
     }
@@ -1225,7 +1225,7 @@ void KMD4::update(const unsigned char *in, int len)
     {
       memcpy (m_buffer, in, 64);
       byteReverse (m_buffer, 16);
-      transform (m_state, (TQ_UINT32 *) m_buffer);
+      transform (m_state, (Q_UINT32 *) m_buffer);
       in += 64;
       len -= 64;
     }
@@ -1272,7 +1272,7 @@ void KMD4::finalize()
       /* Two lots of padding:  Pad the first block to 64 bytes */
       memset (p, 0, count);
       byteReverse (m_buffer, 16);
-      transform (m_state, (TQ_UINT32*) m_buffer);
+      transform (m_state, (Q_UINT32*) m_buffer);
 
       /* Now fill the next block with 56 bytes */
       memset (m_buffer, 0, 56);
@@ -1285,10 +1285,10 @@ void KMD4::finalize()
   byteReverse (m_buffer, 14);
 
   /* Append length in bits and transform */
-  ((TQ_UINT32 *) m_buffer)[14] = m_count[0];
-  ((TQ_UINT32 *) m_buffer)[15] = m_count[1];
+  ((Q_UINT32 *) m_buffer)[14] = m_count[0];
+  ((Q_UINT32 *) m_buffer)[15] = m_count[1];
 
-  transform (m_state, (TQ_UINT32 *) m_buffer);
+  transform (m_state, (Q_UINT32 *) m_buffer);
   byteReverse ((unsigned char *) m_state, 4);
 
   memcpy (m_digest, m_state, 16);
@@ -1380,53 +1380,53 @@ void KMD4::reset()
   memset ( m_digest, 0, sizeof(*m_digest));
 }
 
-//#define rotl32(x,n)   (((x) << ((TQ_UINT32)(n))) | ((x) >> (32 - (TQ_UINT32)(n))))
+//#define rotl32(x,n)   (((x) << ((Q_UINT32)(n))) | ((x) >> (32 - (Q_UINT32)(n))))
 
-inline TQ_UINT32 KMD4::rotate_left (TQ_UINT32 x, TQ_UINT32 n)
+inline Q_UINT32 KMD4::rotate_left (Q_UINT32 x, Q_UINT32 n)
 {
     return (x << n) | (x >> (32-n))  ;
 }
 
-inline TQ_UINT32 KMD4::F (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z)
+inline Q_UINT32 KMD4::F (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z)
 {
     return (x & y) | (~x & z);
 }
 
-inline TQ_UINT32 KMD4::G (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z)
+inline Q_UINT32 KMD4::G (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z)
 {
     return ((x) & (y)) | ((x) & (z)) | ((y) & (z));
 }
 
-inline TQ_UINT32 KMD4::H (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z)
+inline Q_UINT32 KMD4::H (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z)
 {
     return x ^ y ^ z;
 }
 
-inline void KMD4::FF ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d,
-                       TQ_UINT32 x, TQ_UINT32  s )
+inline void KMD4::FF ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d,
+                       Q_UINT32 x, Q_UINT32  s )
 {
     a += F(b, c, d) + x;
     a = rotate_left (a, s);
 }
 
-inline void KMD4::GG ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d,
-                 TQ_UINT32 x, TQ_UINT32 s)
+inline void KMD4::GG ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d,
+                 Q_UINT32 x, Q_UINT32 s)
 {
-    a += G(b, c, d) + x + (TQ_UINT32)0x5a827999;
+    a += G(b, c, d) + x + (Q_UINT32)0x5a827999;
     a = rotate_left (a, s);
 }
 
-inline void KMD4::HH ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d,
-                 TQ_UINT32 x, TQ_UINT32 s )
+inline void KMD4::HH ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d,
+                 Q_UINT32 x, Q_UINT32 s )
 {
-    a += H(b, c, d) + x + (TQ_UINT32)0x6ed9eba1;
+    a += H(b, c, d) + x + (Q_UINT32)0x6ed9eba1;
     a = rotate_left (a, s);
 }
 
-void KMD4::byteReverse( unsigned char *buf, TQ_UINT32 len )
+void KMD4::byteReverse( unsigned char *buf, Q_UINT32 len )
 {
 #ifdef WORDS_BIGENDIAN
-  TQ_UINT32 *b = (TQ_UINT32*) buf;
+  Q_UINT32 *b = (Q_UINT32*) buf;
   while ( len > 0 ) {
     *b = ((((*b) & 0xff000000) >> 24) | (((*b) & 0x00ff0000) >>  8) |
          (((*b) & 0x0000ff00) <<  8) | (((*b) & 0x000000ff) << 24));
@@ -1442,9 +1442,9 @@ void KMD4::byteReverse( unsigned char *buf, TQ_UINT32 len )
 /*
  * The core of the MD4 algorithm
  */
-void KMD4::transform( TQ_UINT32 buf[4], TQ_UINT32 const in[16] )
+void KMD4::transform( Q_UINT32 buf[4], Q_UINT32 const in[16] )
 {
-  TQ_UINT32 a, b, c, d;
+  Q_UINT32 a, b, c, d;
 
   a = buf[0];
   b = buf[1];
diff --git a/kdecore/kmdcodec.h b/kdecore/kmdcodec.h
index d4bd8dfb0..ef1d49d1e 100644
--- a/kdecore/kmdcodec.h
+++ b/kdecore/kmdcodec.h
@@ -541,27 +541,27 @@ private:
   KMD5& operator=(const KMD5& md);
 
   void init();
-  void encode( unsigned char* output, TQ_UINT32 *in, TQ_UINT32 len );
-  void decode( TQ_UINT32 *output, const unsigned char* in, TQ_UINT32 len );
-
-  TQ_UINT32 rotate_left( TQ_UINT32 x, TQ_UINT32 n );
-  TQ_UINT32 F( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z );
-  TQ_UINT32 G( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z );
-  TQ_UINT32 H( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z );
-  TQ_UINT32 I( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z );
-  void FF( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x,
-               TQ_UINT32  s, TQ_UINT32 ac );
-  void GG( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x,
-                TQ_UINT32 s, TQ_UINT32 ac );
-  void HH( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x,
-                TQ_UINT32 s, TQ_UINT32 ac );
-  void II( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x,
-             TQ_UINT32 s, TQ_UINT32 ac );
+  void encode( unsigned char* output, Q_UINT32 *in, Q_UINT32 len );
+  void decode( Q_UINT32 *output, const unsigned char* in, Q_UINT32 len );
+
+  Q_UINT32 rotate_left( Q_UINT32 x, Q_UINT32 n );
+  Q_UINT32 F( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z );
+  Q_UINT32 G( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z );
+  Q_UINT32 H( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z );
+  Q_UINT32 I( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z );
+  void FF( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x,
+               Q_UINT32  s, Q_UINT32 ac );
+  void GG( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x,
+                Q_UINT32 s, Q_UINT32 ac );
+  void HH( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x,
+                Q_UINT32 s, Q_UINT32 ac );
+  void II( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x,
+             Q_UINT32 s, Q_UINT32 ac );
 
 private:
-  TQ_UINT32 m_state[4];
-  TQ_UINT32 m_count[2];
-  TQ_UINT8 m_buffer[64];
+  Q_UINT32 m_state[4];
+  Q_UINT32 m_count[2];
+  Q_UINT8 m_buffer[64];
   Digest m_digest;
   bool m_finalized;
 
@@ -704,7 +704,7 @@ protected:
    *  Performs the real update work.  Note
    *  that length is implied to be 64.
    */
-  void transform( TQ_UINT32 buf[4], TQ_UINT32 const in[16] );
+  void transform( Q_UINT32 buf[4], Q_UINT32 const in[16] );
 
   /**
    * finalizes the digest
@@ -717,23 +717,23 @@ private:
 
   void init();
 
-  void byteReverse( unsigned char *buf, TQ_UINT32 len );
+  void byteReverse( unsigned char *buf, Q_UINT32 len );
 
-  TQ_UINT32 rotate_left( TQ_UINT32 x, TQ_UINT32 n );
-  TQ_UINT32 F( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z );
-  TQ_UINT32 G( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z );
-  TQ_UINT32 H( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z );
-  void FF( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x,
-               TQ_UINT32  s );
-  void GG( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x,
-                TQ_UINT32 s );
-  void HH( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x,
-                TQ_UINT32 s );
+  Q_UINT32 rotate_left( Q_UINT32 x, Q_UINT32 n );
+  Q_UINT32 F( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z );
+  Q_UINT32 G( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z );
+  Q_UINT32 H( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z );
+  void FF( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x,
+               Q_UINT32  s );
+  void GG( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x,
+                Q_UINT32 s );
+  void HH( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x,
+                Q_UINT32 s );
 
 private:
-  TQ_UINT32 m_state[4];
-  TQ_UINT32 m_count[2];
-  TQ_UINT8 m_buffer[64];
+  Q_UINT32 m_state[4];
+  Q_UINT32 m_count[2];
+  Q_UINT8 m_buffer[64];
   Digest m_digest;
   bool m_finalized;
 
diff --git a/kdecore/kmimesourcefactory.cpp b/kdecore/kmimesourcefactory.cpp
index 0123f3465..37745d398 100644
--- a/kdecore/kmimesourcefactory.cpp
+++ b/kdecore/kmimesourcefactory.cpp
@@ -60,7 +60,7 @@ TQString KMimeSourceFactory::makeAbsolute (const TQString& absOrRelName, const T
   TQString myName;
   TQString myContext;
 
-  const int pos = absOrRelName.tqfind ('|');
+  const int pos = absOrRelName.find ('|');
   if (pos > -1)
 	{
 	  myContext = absOrRelName.left (pos);
diff --git a/kdecore/kmimesourcefactory.h b/kdecore/kmimesourcefactory.h
index e35c13f19..536ead0b8 100644
--- a/kdecore/kmimesourcefactory.h
+++ b/kdecore/kmimesourcefactory.h
@@ -30,7 +30,7 @@ class KInstance;
 
 /**
  * An extension to TQMimeSourceFactory that uses KIconLoader to
- * tqfind images.
+ * find images.
  *
  * Normally you don't have to instantiate this class at all, KApplication does that for
  * you automagically and sets TQMimeSourceFactory::setDefaultFactory().
@@ -44,7 +44,7 @@ public:
   /**
    * Constructor.
    *
-   * @param loader is the iconloader used to tqfind images.
+   * @param loader is the iconloader used to find images.
    */
   KMimeSourceFactory (KIconLoader* loader = KGlobal::iconLoader());
 
diff --git a/kdecore/kmountpoint.cpp b/kdecore/kmountpoint.cpp
index adf353f1f..764f085a0 100644
--- a/kdecore/kmountpoint.cpp
+++ b/kdecore/kmountpoint.cpp
@@ -59,7 +59,7 @@
 #include <sys/mntctl.h>
 #include <sys/vmount.h>
 #include <sys/vfs.h>
-/* AIX does not prototype mntctl anywhere that I can tqfind */
+/* AIX does not prototype mntctl anywhere that I can find */
 #ifndef mntctl
 extern "C" {
 int mntctl(int command, int size, void* buffer);
@@ -375,7 +375,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded)
 
 TQString KMountPoint::devNameFromOptions(const TQStringList &options)
 {
-   // Search options to tqfind the device name
+   // Search options to find the device name
    for ( TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
    {
       if( (*it).startsWith("dev="))
diff --git a/kdecore/kmultipledrag.cpp b/kdecore/kmultipledrag.cpp
index f81b9b154..29d56bd85 100644
--- a/kdecore/kmultipledrag.cpp
+++ b/kdecore/kmultipledrag.cpp
@@ -32,24 +32,24 @@ void KMultipleDrag::addDragObject( TQDragObject *dragObject )
 {
     //kdDebug() << "KMultipleDrag::addDragObject" << endl;
     m_dragObjects.append( dragObject );
-    // We need to tqfind out how many formats this dragObject supports
+    // We need to find out how many formats this dragObject supports
     int i = 0;
     while ( dragObject->format( i ) )
         ++i;
     m_numberFormats.append( i ); // e.g. if it supports two formats, 0 and 1, store 2.
 }
 
-TQByteArray KMultipleDrag::tqencodedData( const char *mime ) const
+TQByteArray KMultipleDrag::encodedData( const char *mime ) const
 {
-    //kdDebug() << "KMultipleDrag::tqencodedData " << mime << endl;
-    // Iterate over the drag objects, and tqfind the format in the right one
+    //kdDebug() << "KMultipleDrag::encodedData " << mime << endl;
+    // Iterate over the drag objects, and find the format in the right one
     TQPtrListIterator<TQDragObject> it( m_dragObjects );
     for ( ; it.current(); ++it )
     {
         for ( int i = 0; it.current()->format( i ); ++i )
         {
             if ( ::qstrcmp( it.current()->format( i ), mime ) == 0 )
-                return it.current()->tqencodedData( mime );
+                return it.current()->encodedData( mime );
         }
     }
     return TQByteArray();
diff --git a/kdecore/kmultipledrag.h b/kdecore/kmultipledrag.h
index 5dc6e2972..47bfbd378 100644
--- a/kdecore/kmultipledrag.h
+++ b/kdecore/kmultipledrag.h
@@ -40,7 +40,7 @@ class KMultipleDragPrivate;
  * Sample code for this:
  *
  * \code
- * KMultipleDrag *drag = new KMultipleDrag( tqparentWidget );
+ * KMultipleDrag *drag = new KMultipleDrag( parentWidget );
  * drag->addDragObject( new TQImageDrag( someQImage, 0 ) );
  * drag->addDragObject( new KURLDrag( someKURL, 0 ) );
  * drag->drag();
@@ -80,7 +80,7 @@ public:
      * @return the data, or a null byte array if not found
      * @reimp
      */
-    virtual TQByteArray tqencodedData( const char *mime ) const;
+    virtual TQByteArray encodedData( const char *mime ) const;
 
     /**
      * Returns the @p i'th supported format, or 0.
diff --git a/kdecore/knotifyclient.cpp b/kdecore/knotifyclient.cpp
index 851023170..bce90d86a 100644
--- a/kdecore/knotifyclient.cpp
+++ b/kdecore/knotifyclient.cpp
@@ -84,9 +84,9 @@ static int sendNotifyEvent(const TQString &message, const TQString &text,
   int uniqueId = kMax( 1, kapp->random() ); // must not be 0 -- means failure!
 
   // knotify daemon needs toplevel window
-  TQWidget* widget = TQWidget::tqfind( (WId)winId );
+  TQWidget* widget = TQWidget::find( (WId)winId );
   if( widget )
-    winId = (int)widget->tqtopLevelWidget()->winId();
+    winId = (int)widget->topLevelWidget()->winId();
 
   TQByteArray data;
   TQDataStream ds(data, IO_WriteOnly);
@@ -126,20 +126,20 @@ int KNotifyClient::event( int winId, StandardEvent type, const TQString& text )
     TQString message;
     switch ( type ) {
     case cannotOpenFile:
-	message = TQString::tqfromLatin1("cannotopenfile");
+	message = TQString::fromLatin1("cannotopenfile");
 	break;
     case warning:
-	message = TQString::tqfromLatin1("warning");
+	message = TQString::fromLatin1("warning");
 	break;
     case fatalError:
-	message = TQString::tqfromLatin1("fatalerror");
+	message = TQString::fromLatin1("fatalerror");
 	break;
     case catastrophe:
-	message = TQString::tqfromLatin1("catastrophe");
+	message = TQString::fromLatin1("catastrophe");
 	break;
     case notification: // fall through
     default:
-	message = TQString::tqfromLatin1("notification");
+	message = TQString::fromLatin1("notification");
 	break;
     }
 
diff --git a/kdecore/knotifyclient.h b/kdecore/knotifyclient.h
index d661f5b59..2de3e297d 100644
--- a/kdecore/knotifyclient.h
+++ b/kdecore/knotifyclient.h
@@ -27,7 +27,7 @@ class KInstance;
  * This namespace provides a method for issuing events to a KNotifyServer
  * call KNotifyClient::event("eventname"); to issue it.
  * On installation, there should be a file called
- * $KDEDIR/share/apps/appname/eventsrc which tqcontains the events.
+ * $KDEDIR/share/apps/appname/eventsrc which contains the events.
  *
  * The file looks like this:
  * \code
@@ -44,7 +44,7 @@ class KInstance;
  * default_presentation=1
  *  ...
  * \endcode
- * default_presentation tqcontains these ORed events:
+ * default_presentation contains these ORed events:
  *	None=0, Sound=1, Messagebox=2, Logfile=4, Stderr=8, PassivePopup=16,
  *      Execute=32, Taskbar=64
  *
diff --git a/kdecore/kpalette.cpp b/kdecore/kpalette.cpp
index 7cb14cec0..777340ea6 100644
--- a/kdecore/kpalette.cpp
+++ b/kdecore/kpalette.cpp
@@ -66,7 +66,7 @@ KPalette::KPalette(const TQString &name)
   // Read first line
   // Expected "GIMP Palette"
   if (paletteFile.readLine(line, maxLength) == -1) return;
-  if (line.tqfind(" Palette") == -1) return;
+  if (line.find(" Palette") == -1) return;
 
   while( paletteFile.readLine(line, maxLength) != -1)
   {
diff --git a/kdecore/kpalette.h b/kdecore/kpalette.h
index a7dd5e946..4f9c74029 100644
--- a/kdecore/kpalette.h
+++ b/kdecore/kpalette.h
@@ -150,7 +150,7 @@ public:
    
    /**
     * Find index by @p color.
-    * @param color the color to tqfind
+    * @param color the color to find
     * @return The index of the color in the palette or -1 if the
     * color is not found.
     **/
diff --git a/kdecore/kprocctrl.cpp b/kdecore/kprocctrl.cpp
index 6774eee5f..d8170c0a8 100644
--- a/kdecore/kprocctrl.cpp
+++ b/kdecore/kprocctrl.cpp
@@ -214,7 +214,7 @@ void KProcessController::slotDoHousekeeping()
     if( waitpid( *uit, 0, WNOHANG ) > 0 )
     {
       uit = unixProcessList.remove( uit );
-      deref(); // counterpart to addProcess, can tqinvalidate 'this'
+      deref(); // counterpart to addProcess, can invalidate 'this'
     } else
       ++uit;
   }
diff --git a/kdecore/kprocctrl.h b/kdecore/kprocctrl.h
index 0e534f4ad..69182a344 100644
--- a/kdecore/kprocctrl.h
+++ b/kdecore/kprocctrl.h
@@ -36,7 +36,7 @@ class TQSocketNotifier;
  *
  * This class takes care of the actual (UN*X) signal handling.
  */
-class KDECORE_EXPORT KProcessController : public TQObject
+class KDECORE_EXPORT KProcessController : public QObject
 {
   Q_OBJECT
 
diff --git a/kdecore/kprocess.cpp b/kdecore/kprocess.cpp
index 9930235ab..f13813d15 100644
--- a/kdecore/kprocess.cpp
+++ b/kdecore/kprocess.cpp
@@ -809,7 +809,7 @@ KPty *KProcess::pty() const
 TQString KProcess::quote(const TQString &arg)
 {
     TQChar q('\'');
-    return TQString(arg).tqreplace(q, "'\\''").prepend(q).append(q);
+    return TQString(arg).replace(q, "'\\''").prepend(q).append(q);
 }
 
 
diff --git a/kdecore/kprocess.h b/kdecore/kprocess.h
index a07df060e..51366e3e4 100644
--- a/kdecore/kprocess.h
+++ b/kdecore/kprocess.h
@@ -127,7 +127,7 @@ class KPty;
  * @author Christian Czezatke e9025461@student.tuwien.ac.at
  *
  **/
-class KDECORE_EXPORT KProcess : public TQObject
+class KDECORE_EXPORT KProcess : public QObject
 {
   Q_OBJECT
 
@@ -606,7 +606,7 @@ signals:
    * data structures before returning from the slot.
    * Example:
    * \code
-   *     TQString myBuf = TQString::tqfromLatin1(buffer, buflen);
+   *     TQString myBuf = TQString::fromLatin1(buffer, buflen);
    * \endcode
    **/
   void receivedStdout(KProcess *proc, char *buffer, int buflen);
@@ -752,7 +752,7 @@ protected:
    * will usually do some communications cleanup, like closing in[0],
    * out[1] and out[1].
    *
-   * Furthermore, it must also create the TQSocketNotifiers innot,
+   * Furthermore, it must also create the QSocketNotifiers innot,
    * outnot and errnot and connect their Qt signals to the respective
    * KProcess slots.
    *
diff --git a/kdecore/kprocio.cpp b/kdecore/kprocio.cpp
index 91c28024f..9159edab5 100644
--- a/kdecore/kprocio.cpp
+++ b/kdecore/kprocio.cpp
@@ -231,7 +231,7 @@ int KProcIO::readln (TQString &line, bool autoAck, bool *partial)
 
   //need to reduce the size of recvbuffer at some point...
 
-  len=recvbuffer.tqfind ('\n',rbi)-rbi;
+  len=recvbuffer.find ('\n',rbi)-rbi;
 
   //kdDebug(174) << "KPIO::readln" << endl;
 
diff --git a/kdecore/kprocio.h b/kdecore/kprocio.h
index cd5bb5b92..8661699a7 100644
--- a/kdecore/kprocio.h
+++ b/kdecore/kprocio.h
@@ -35,7 +35,7 @@ class TQTextCodec;
  *        buffer and maintained/freed appropriately.  There is no need
  *        to be concerned with wroteStdin() signals _at_all_.
  *    @li readln() reads a line of data and buffers any leftovers.
- *    @li Conversion from/to tqunicode.
+ *    @li Conversion from/to unicode.
  *
  * Basically, KProcIO gives you buffered I/O similar to fgets()/fputs().
  *
@@ -146,7 +146,7 @@ public:
    * @param autoAck when true, ackRead() is called for you.
    * @param partial when provided the line is returned
    * even if it does not contain a '\\n'. *partial will be set to
-   * false if the line tqcontains a '\\n' and false otherwise.
+   * false if the line contains a '\\n' and false otherwise.
    * @return the number of characters read, or -1 if no data is available.
    **/
   int readln (TQString &line, bool autoAck=true, bool *partial=0);
diff --git a/kdecore/kprotocolinfo_kdecore.cpp b/kdecore/kprotocolinfo_kdecore.cpp
index 66ce97760..203f455a1 100644
--- a/kdecore/kprotocolinfo_kdecore.cpp
+++ b/kdecore/kprotocolinfo_kdecore.cpp
@@ -151,8 +151,8 @@ KProtocolInfo::load( TQDataStream& _str)
 {
    // You may add new fields at the end. Make sure to update the version
    // number in ksycoca.h
-   TQ_INT32 i_inputType, i_outputType;
-   TQ_INT8 i_isSourceProtocol, i_isHelperProtocol,
+   Q_INT32 i_inputType, i_outputType;
+   Q_INT8 i_isSourceProtocol, i_isHelperProtocol,
           i_supportsListing, i_supportsReading,
           i_supportsWriting, i_supportsMakeDir,
           i_supportsDeleting, i_supportsLinking,
@@ -206,8 +206,8 @@ KProtocolInfo::save( TQDataStream& _str)
 
    // You may add new fields at the end. Make sure to update the version
    // number in ksycoca.h
-   TQ_INT32 i_inputType, i_outputType;
-   TQ_INT8 i_isSourceProtocol, i_isHelperProtocol,
+   Q_INT32 i_inputType, i_outputType;
+   Q_INT8 i_isSourceProtocol, i_isHelperProtocol,
           i_supportsListing, i_supportsReading,
           i_supportsWriting, i_supportsMakeDir,
           i_supportsDeleting, i_supportsLinking,
@@ -216,8 +216,8 @@ KProtocolInfo::save( TQDataStream& _str)
           i_uriMode, i_canRenameFromFile, i_canRenameToFile,
           i_canDeleteRecursive, i_fileNameUsedForCopying;
 
-   i_inputType = (TQ_INT32) m_inputType;
-   i_outputType = (TQ_INT32) m_outputType;
+   i_inputType = (Q_INT32) m_inputType;
+   i_outputType = (Q_INT32) m_outputType;
    i_isSourceProtocol = m_isSourceProtocol ? 1 : 0;
    i_isHelperProtocol = m_isHelperProtocol ? 1 : 0;
    i_supportsListing = m_supportsListing ? 1 : 0;
@@ -392,7 +392,7 @@ TQString KProtocolInfo::icon( const TQString& _protocol )
 {
   KProtocolInfo::Ptr prot = KProtocolInfoFactory::self()->findProtocol(_protocol);
   if ( !prot )
-    return TQString::tqfromLatin1("unknown");
+    return TQString::fromLatin1("unknown");
 
   return prot->m_icon;
 }
diff --git a/kdecore/kprotocolinfofactory.cpp b/kdecore/kprotocolinfofactory.cpp
index 6d61c2d8c..e47cbb881 100644
--- a/kdecore/kprotocolinfofactory.cpp
+++ b/kdecore/kprotocolinfofactory.cpp
@@ -86,7 +86,7 @@ KProtocolInfoFactory::findProtocol(const TQString &protocol)
 {
   if (!m_sycocaDict) return 0; // Error!
 
-  TQMap<TQString,KProtocolInfo::Ptr>::iterator it = m_cache.tqfind(protocol);
+  TQMap<TQString,KProtocolInfo::Ptr>::iterator it = m_cache.find(protocol);
   if (it != m_cache.end())
      return (*it);
 
diff --git a/kdecore/kpty.cpp b/kdecore/kpty.cpp
index 22235038f..f6fc9d5cd 100644
--- a/kdecore/kpty.cpp
+++ b/kdecore/kpty.cpp
@@ -271,7 +271,7 @@ bool KPty::_attachPty(int pty_master)
 
     // set xon/xoff & control keystrokes
   // without the '::' some version of HP-UX thinks, this declares
-  // the struct in this class, in this method, and fails to tqfind
+  // the struct in this class, in this method, and fails to find
   // the correct tc[gs]etattr
   struct ::termios ttmode;
 
@@ -517,7 +517,7 @@ void KPty::setXonXoff(bool useXonXoff)
   d->xonXoff = useXonXoff;
   if (d->masterFd >= 0) {
     // without the '::' some version of HP-UX thinks, this declares
-    // the struct in this class, in this method, and fails to tqfind
+    // the struct in this class, in this method, and fails to find
     // the correct tc[gs]etattr
     struct ::termios ttmode;
 
@@ -538,7 +538,7 @@ void KPty::setUtf8Mode(bool useUtf8)
 #ifdef IUTF8
   if (d->masterFd >= 0) {
     // without the '::' some version of HP-UX thinks, this declares
-    // the struct in this class, in this method, and fails to tqfind
+    // the struct in this class, in this method, and fails to find
     // the correct tc[gs]etattr
     struct ::termios ttmode;
 
diff --git a/kdecore/kqiodevicegzip_p.cpp b/kdecore/kqiodevicegzip_p.cpp
index 9ad82a653..2f949b9ee 100644
--- a/kdecore/kqiodevicegzip_p.cpp
+++ b/kdecore/kqiodevicegzip_p.cpp
@@ -111,9 +111,9 @@ bool KQIODeviceGZip::reset(void)
     return (gzrewind(m_gzfile)>=0);
 }
 
-TQ_LONG KQIODeviceGZip::readBlock( char *data, TQ_ULONG maxlen )
+Q_LONG KQIODeviceGZip::readBlock( char *data, Q_ULONG maxlen )
 {
-    TQ_LONG result=0;
+    Q_LONG result=0;
     if (m_gzfile)
     {
         result=gzread(m_gzfile,data,maxlen);
@@ -122,9 +122,9 @@ TQ_LONG KQIODeviceGZip::readBlock( char *data, TQ_ULONG maxlen )
     return result;
 }
 
-TQ_LONG KQIODeviceGZip::writeBlock( const char *data, TQ_ULONG len )
+Q_LONG KQIODeviceGZip::writeBlock( const char *data, Q_ULONG len )
 {
-    TQ_ULONG result=0;
+    Q_ULONG result=0;
     if (m_gzfile)
     {
         result=gzwrite(m_gzfile,(char*)data,len);
diff --git a/kdecore/kqiodevicegzip_p.h b/kdecore/kqiodevicegzip_p.h
index c8a504c65..02c3fe039 100644
--- a/kdecore/kqiodevicegzip_p.h
+++ b/kdecore/kqiodevicegzip_p.h
@@ -48,8 +48,8 @@ public:
     bool atEnd(void) const;
     bool reset (void);
 
-    TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
-    TQ_LONG writeBlock( const char *data, TQ_ULONG len );
+    Q_LONG readBlock( char *data, Q_ULONG maxlen );
+    Q_LONG writeBlock( const char *data, Q_ULONG len );
 
     int getch(void);
     int putch(int ch);
diff --git a/kdecore/kregexp.h b/kdecore/kregexp.h
index 88d16a3c7..c3ed8ff3d 100644
--- a/kdecore/kregexp.h
+++ b/kdecore/kregexp.h
@@ -30,7 +30,7 @@ class KRegExpPrivate;
  *
  * This was implemented
  * because TQRegExp did not support back-references. It now does and
- * is recommended over KRegExp because of the tqunicode support and the
+ * is recommended over KRegExp because of the unicode support and the
  * more powerful API.
  *
  * Back-references are parts of a regexp grouped with parentheses. If a
@@ -53,7 +53,7 @@ class KRegExpPrivate;
  *  Weis
  * \endcode
  *
- * Please notice that KRegExp does @em not support tqunicode.
+ * Please notice that KRegExp does @em not support unicode.
  *
  * @author Torben Weis <weis@kde.org>
  */
diff --git a/kdecore/krfcdate.cpp b/kdecore/krfcdate.cpp
index 809a056f2..d9a374d0c 100644
--- a/kdecore/krfcdate.cpp
+++ b/kdecore/krfcdate.cpp
@@ -362,13 +362,13 @@ KRFCDate::parseDateISO8601( const TQString& input_ )
 
   TQString input = input_;
 
-  // First tqfind the 'T' separator, if any.
-  int tPos = input.tqfind('T');
+  // First find the 'T' separator, if any.
+  int tPos = input.find('T');
 
   // If there is no time, no month or no day specified, fill those missing
   // fields so that 'input' matches YYYY-MM-DDTHH:MM:SS
   if (-1 == tPos) {
-    const int dashes = input.tqcontains('-');
+    const int dashes = input.contains('-');
     if (0 == dashes) {
       input += "-01-01";
     } else if (1 == dashes) {
@@ -400,7 +400,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ )
 
   // +zone or -zone suffix (offset from UTC).
 
-  int plusPos = timeString.tqfindRev('+');
+  int plusPos = timeString.findRev('+');
 
   if (-1 != plusPos) {
     TQString offsetString = timeString.mid(plusPos + 1);
@@ -409,7 +409,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ )
 
     timeString = timeString.left(plusPos);
   } else {
-    int minusPos = timeString.tqfindRev('-');
+    int minusPos = timeString.findRev('-');
 
     if (-1 != minusPos) {
       TQString offsetString = timeString.mid(minusPos + 1);
@@ -421,7 +421,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ )
   }
 
   // secfrac suffix.
-  int dotPos = timeString.tqfindRev('.');
+  int dotPos = timeString.findRev('.');
 
   if (-1 != dotPos) {
     timeString = timeString.left(dotPos);
diff --git a/kdecore/krfcdate.h b/kdecore/krfcdate.h
index e0232995e..ade819622 100644
--- a/kdecore/krfcdate.h
+++ b/kdecore/krfcdate.h
@@ -25,7 +25,7 @@
 #include "kdelibs_export.h"
 
 /**
- * The KRFCDate class tqcontains functions related to the parsing of dates.
+ * The KRFCDate class contains functions related to the parsing of dates.
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
diff --git a/kdecore/krootprop.cpp b/kdecore/krootprop.cpp
index 4e62b77d7..2d545f30b 100644
--- a/kdecore/krootprop.cpp
+++ b/kdecore/krootprop.cpp
@@ -118,7 +118,7 @@ void KRootProp::setProp( const TQString& rProp )
   {
     // parse the string for first key-value pair separator '\n'
 
-    i = s.tqfind("\n");
+    i = s.find("\n");
     if(i == -1)
       i = s.length();
 
@@ -131,7 +131,7 @@ void KRootProp::setProp( const TQString& rProp )
 
     keypair.simplifyWhiteSpace();
 
-    i = keypair.tqfind( "=" );
+    i = keypair.find( "=" );
     if( i != -1 )
     {
       key = keypair.left( i );
@@ -160,7 +160,7 @@ void KRootProp::destroy()
 TQString KRootProp::readEntry( const TQString& rKey,
 			    const TQString& pDefault ) const
 {
-  if( propDict.tqcontains( rKey ) )
+  if( propDict.contains( rKey ) )
       return propDict[ rKey ];
   else
       return pDefault;
@@ -217,18 +217,18 @@ TQColor KRootProp::readColorEntry( const TQString& rKey,
 
   // Support #ffffff style color naming.
   // Help ease transistion from legacy KDE setups
-  if( aValue.tqfind("#") == 0 ) {
+  if( aValue.find("#") == 0 ) {
     aRetColor.setNamedColor( aValue );
     return aRetColor;
   }
 
   // Parse "red,green,blue"
-  // tqfind first comma
-  int nIndex1 = aValue.tqfind( ',' );
+  // find first comma
+  int nIndex1 = aValue.find( ',' );
   if( nIndex1 == -1 )
     return aRetColor;
-  // tqfind second comma
-  int nIndex2 = aValue.tqfind( ',', nIndex1+1 );
+  // find second comma
+  int nIndex2 = aValue.find( ',', nIndex1+1 );
   if( nIndex2 == -1 )
     return aRetColor;
 
@@ -246,9 +246,9 @@ TQColor KRootProp::readColorEntry( const TQString& rKey,
 TQString KRootProp::writeEntry( const TQString& rKey, const TQString& rValue )
 {
     dirty = true;
-    if ( propDict.tqcontains( rKey ) ) {
+    if ( propDict.contains( rKey ) ) {
 	TQString aValue = propDict[ rKey ];
-	propDict.tqreplace( rKey, rValue );
+	propDict.replace( rKey, rValue );
 	return aValue;
     }
     else {
@@ -280,7 +280,7 @@ TQString KRootProp::writeEntry( const TQString& rKey, const TQColor& rColor )
 
 TQString KRootProp::removeEntry(const TQString& rKey)
 {
-    if (propDict.tqcontains(rKey)) {
+    if (propDict.contains(rKey)) {
 	dirty = true;
 	TQString aValue = propDict[rKey];
 	propDict.remove(rKey);
diff --git a/kdecore/ksavefile.cpp b/kdecore/ksavefile.cpp
index d5feec68f..16887a677 100644
--- a/kdecore/ksavefile.cpp
+++ b/kdecore/ksavefile.cpp
@@ -47,7 +47,7 @@ KSaveFile::KSaveFile(const TQString &filename, int mode)
    TQString real_filename = KStandardDirs::realFilePath(filename);
 
    // we only check here if the directory can be written to
-   // the actual filename isn't written to, but tqreplaced later
+   // the actual filename isn't written to, but replaced later
    // with the contents of our tempfile
    if (!checkAccess(real_filename, W_OK))
    {
@@ -55,7 +55,7 @@ KSaveFile::KSaveFile(const TQString &filename, int mode)
       return;
    }
 
-   if (mTempFile.create(real_filename, TQString::tqfromLatin1(".new"), mode))
+   if (mTempFile.create(real_filename, TQString::fromLatin1(".new"), mode))
    {
       mFileName = real_filename; // Set filename upon success
 
@@ -165,7 +165,7 @@ bool KSaveFile::backupFile( const TQString& qFilename, const TQString& backupDir
    else
    {
        TQCString nameOnly;
-       int slash = cFilename.tqfindRev('/');
+       int slash = cFilename.findRev('/');
        if (slash < 0)
 	   nameOnly = cFilename;
        else
diff --git a/kdecore/ksavefile.h b/kdecore/ksavefile.h
index 448c9ca1a..ae68b2d1f 100644
--- a/kdecore/ksavefile.h
+++ b/kdecore/ksavefile.h
@@ -140,7 +140,7 @@ public:
      */
    static bool backupFile( const TQString& filename,
                            const TQString& backupDir = TQString::null,
-                           const TQString& backupExtension = TQString::tqfromLatin1( "~" ) );
+                           const TQString& backupExtension = TQString::fromLatin1( "~" ) );
 
 private:
    TQString mFileName;
diff --git a/kdecore/kshell.cpp b/kdecore/kshell.cpp
index f7ab97683..5b92b1d5e 100644
--- a/kdecore/kshell.cpp
+++ b/kdecore/kshell.cpp
@@ -72,7 +72,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
         do {
             if (pos >= args.length())
                 goto okret;
-            c = args.tqunicode()[pos++];
+            c = args.unicode()[pos++];
         } while (c.isSpace());
         TQString cret;
         if ((flags & TildeExpand) && c == (QChar)'~') {
@@ -80,7 +80,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
             for (; ; pos++) {
                 if (pos >= args.length())
                     break;
-                c = args.tqunicode()[pos];
+                c = args.unicode()[pos];
                 if (c == (QChar)'/' || c.isSpace())
                     break;
                 if (isQuoteMeta( c )) {
@@ -91,7 +91,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
                 if ((flags & AbortOnMeta) && isMeta( c ))
                     goto metaerr;
             }
-            TQString ccret = homeDir( TQConstString( args.tqunicode() + opos, pos - opos ).string() );
+            TQString ccret = homeDir( TQConstString( args.unicode() + opos, pos - opos ).string() );
             if (ccret.isEmpty()) {
                 pos = opos;
                 c = (QChar)'~';
@@ -129,20 +129,20 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
                 do {
                     if (pos >= args.length())
                         goto quoteerr;
-                    c = args.tqunicode()[pos++];
+                    c = args.unicode()[pos++];
                 } while (c != (QChar)'\'');
-                cret += TQConstString( args.tqunicode() + spos, pos - spos - 1 ).string();
+                cret += TQConstString( args.unicode() + spos, pos - spos - 1 ).string();
             } else if (c == (QChar)'"') {
                 for (;;) {
                     if (pos >= args.length())
                         goto quoteerr;
-                    c = args.tqunicode()[pos++];
+                    c = args.unicode()[pos++];
                     if (c == (QChar)'"')
                         break;
                     if (c == (QChar)'\\') {
                         if (pos >= args.length())
                             goto quoteerr;
-                        c = args.tqunicode()[pos++];
+                        c = args.unicode()[pos++];
                         if (c != (QChar)'"' && c != (QChar)'\\' &&
                             !((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`')))
                             cret += (QChar)'\\';
@@ -155,13 +155,13 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
                 for (;;) {
                     if (pos >= args.length())
                         goto quoteerr;
-                    c = args.tqunicode()[pos++];
+                    c = args.unicode()[pos++];
                     if (c == (QChar)'\'')
                         break;
                     if (c == (QChar)'\\') {
                         if (pos >= args.length())
                             goto quoteerr;
-                        c = args.tqunicode()[pos++];
+                        c = args.unicode()[pos++];
                         switch (c) {
                         case 'a': cret += (QChar)'\a'; break;
                         case 'b': cret += (QChar)'\b'; break;
@@ -212,7 +212,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
                 if (c == (QChar)'\\') {
                     if (pos >= args.length())
                         goto quoteerr;
-                    c = args.tqunicode()[pos++];
+                    c = args.unicode()[pos++];
                     if (!c.isSpace() &&
                         !((flags & AbortOnMeta) ? isMeta( c ) : isQuoteMeta( c )))
                         cret += '\\';
@@ -222,7 +222,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
             }
             if (pos >= args.length())
                 break;
-            c = args.tqunicode()[pos++];
+            c = args.unicode()[pos++];
         } while (!c.isSpace());
         ret += cret;
         firstword = false;
@@ -265,9 +265,9 @@ TQString KShell::joinArgs( const TQStringList &args )
             ret.append( q ).append( q );
         else {
             for (uint i = 0; i < (*it).length(); i++)
-                if (isSpecial((*it).tqunicode()[i])) {
+                if (isSpecial((*it).unicode()[i])) {
                     TQString tmp(*it);
-                    tmp.tqreplace( q, "'\\''" );
+                    tmp.replace( q, "'\\''" );
                     ret += q;
                     tmp += q;
                     ret += tmp;
@@ -294,8 +294,8 @@ TQString KShell::joinArgs( const char * const *args, int nargs )
         else {
             TQString tmp( TQFile::decodeName( *argp ) );
             for (uint i = 0; i < tmp.length(); i++)
-                if (isSpecial(tmp.tqunicode()[i])) {
-                    tmp.tqreplace( q, "'\\''" );
+                if (isSpecial(tmp.unicode()[i])) {
+                    tmp.replace( q, "'\\''" );
                     ret += q;
                     tmp += q;
                     ret += tmp;
@@ -319,10 +319,10 @@ TQString KShell::joinArgsDQ( const TQStringList &args )
             ret.append( q ).append( q );
         else {
             for (uint i = 0; i < (*it).length(); i++)
-                if (isSpecial((*it).tqunicode()[i])) {
+                if (isSpecial((*it).unicode()[i])) {
                     ret.append( '$' ).append( q );
                     for (uint pos = 0; pos < (*it).length(); pos++) {
-                        int c = (*it).tqunicode()[pos];
+                        int c = (*it).unicode()[pos];
                         if (c < 32) {
                             ret += bs;
                             switch (c) {
@@ -355,12 +355,12 @@ TQString KShell::joinArgsDQ( const TQStringList &args )
 TQString KShell::tildeExpand( const TQString &fname )
 {
     if (fname[0] == (QChar)'~') {
-        int pos = fname.tqfind( '/' );
+        int pos = fname.find( '/' );
         if (pos < 0)
-            return homeDir( TQConstString( fname.tqunicode() + 1, fname.length() - 1 ).string() );
-        TQString ret = homeDir( TQConstString( fname.tqunicode() + 1, pos - 1 ).string() );
+            return homeDir( TQConstString( fname.unicode() + 1, fname.length() - 1 ).string() );
+        TQString ret = homeDir( TQConstString( fname.unicode() + 1, pos - 1 ).string() );
         if (!ret.isNull())
-            ret += TQConstString( fname.tqunicode() + pos, fname.length() - pos ).string();
+            ret += TQConstString( fname.unicode() + pos, fname.length() - pos ).string();
         return ret;
     }
     return fname;
diff --git a/kdecore/kshell.h b/kdecore/kshell.h
index 96ba4978a..2e9f3ad98 100644
--- a/kdecore/kshell.h
+++ b/kdecore/kshell.h
@@ -59,7 +59,7 @@ namespace KShell {
     };
 
     /**
-     * tqStatus codes from splitArgs()
+     * Status codes from splitArgs()
      */
     enum Errors {
         /**
@@ -81,7 +81,7 @@ namespace KShell {
 
     /**
      * Splits @p cmd according to POSIX shell word splitting and quoting rules.
-     * Can optionally perform tilde expansion and/or abort if it tqfinds shell
+     * Can optionally perform tilde expansion and/or abort if it finds shell
      * meta characters it cannot process.
      *
      * @param cmd the command to split
diff --git a/kdecore/kshortcut.cpp b/kdecore/kshortcut.cpp
index 611f7924c..4847b8742 100644
--- a/kdecore/kshortcut.cpp
+++ b/kdecore/kshortcut.cpp
@@ -526,12 +526,12 @@ int KShortcut::compare( const KShortcut& cut ) const
 	return m_nSeqs - cut.m_nSeqs;
 }
 
-bool KShortcut::tqcontains( const KKey& key ) const
+bool KShortcut::contains( const KKey& key ) const
 {
-	return tqcontains( KKeySequence(key) );
+	return contains( KKeySequence(key) );
 }
 
-bool KShortcut::tqcontains( const KKeyNative& keyNative ) const
+bool KShortcut::contains( const KKeyNative& keyNative ) const
 {
 	KKey key = keyNative.key();
 	key.simplify();
@@ -545,7 +545,7 @@ bool KShortcut::tqcontains( const KKeyNative& keyNative ) const
 	return false;
 }
 
-bool KShortcut::tqcontains( const KKeySequence& seq ) const
+bool KShortcut::contains( const KKeySequence& seq ) const
 {
 	for( uint i = 0; i < count(); i++ ) {
 		if( !m_rgseq[i].isNull() && m_rgseq[i] == seq )
@@ -607,13 +607,13 @@ bool KShortcut::append( const KShortcut& cut )
 {
 	uint seqs = m_nSeqs, co = cut.count();
 	for( uint i=0; i<co; i++ ) {
-	    if (!tqcontains(cut.seq(i))) seqs++;
+	    if (!contains(cut.seq(i))) seqs++;
 	}
 	if( seqs > MAX_SEQUENCES ) return false;
 
 	for( uint i=0; i<co; i++ ) {
 		const KKeySequence& seq = cut.seq(i);
-		if(!tqcontains(seq)) {
+		if(!contains(seq)) {
 			m_rgseq[m_nSeqs] = seq;
 			m_nSeqs++;
 		}
diff --git a/kdecore/kshortcut.h b/kdecore/kshortcut.h
index 281dcaa96..7d62a0041 100644
--- a/kdecore/kshortcut.h
+++ b/kdecore/kshortcut.h
@@ -74,7 +74,7 @@ class KDECORE_EXPORT KKey
 
 	/**
 	 * Creates a new key from the first key code of the given key sequence.
-	 * @param keySeq the key sequence that tqcontains the key
+	 * @param keySeq the key sequence that contains the key
 	 */
 	KKey( const TQKeySequence& keySeq );
 
@@ -121,7 +121,7 @@ class KDECORE_EXPORT KKey
 
 	/**
 	 * Initializes the key with the first key code of the given key sequence.
-	 * @param keySeq the key sequence that tqcontains the key
+	 * @param keySeq the key sequence that contains the key
 	 * @return true if successful, false otherwise
 	 */
 	bool init( const TQKeySequence& keySeq );
@@ -306,13 +306,13 @@ class KDECORE_EXPORT KKeySequence
 	KKeySequence( const TQKeySequence& keySeq );
 
 	/**
-	 * Create a new key sequence that only tqcontains the given key.
+	 * Create a new key sequence that only contains the given key.
 	 * @param key the key to add
 	 */
 	KKeySequence( const KKey& key );
 
 	/**
-	 * Create a new key sequence that only tqcontains the given key.
+	 * Create a new key sequence that only contains the given key.
 	 * @param key the key to add
 	 */
 	KKeySequence( const KKeyNative& key );
@@ -324,7 +324,7 @@ class KDECORE_EXPORT KKeySequence
 	KKeySequence( const KKeySequence& keySeq );
 
 	/**
-	 * Creates a new key sequence that tqcontains the given key sequence.
+	 * Creates a new key sequence that contains the given key sequence.
 	 * The description consists of comma-separated keys as
 	 * required by KKey::KKey(const TQString&).
 	 * @param keySeq the description of the key
@@ -440,7 +440,7 @@ class KDECORE_EXPORT KKeySequence
 	 * number if the given KKeySequence is larger, 0 if they are equal and
 	 * a positive number this KKeySequence is larger. Key sequences are
 	 * compared by comparing the individual keys, starting from the beginning
-	 * until an unequal key has been found. If a sequence tqcontains more
+	 * until an unequal key has been found. If a sequence contains more
 	 * keys, it is considered larger.
 	 * @param keySeq the key sequence to compare to
 	 * @return a negative number if the given KKeySequence is larger, 0 if
@@ -566,21 +566,21 @@ class KDECORE_EXPORT KShortcut
 	KShortcut( int keyQt );
 
 	/**
-	 * Creates a new shortcut that tqcontains only the given qt key
+	 * Creates a new shortcut that contains only the given qt key
 	 * sequence.
 	 * @param keySeq the qt key sequence to add
 	 */
 	KShortcut( const TQKeySequence& keySeq );
 
 	/**
-	 * Creates a new shortcut that tqcontains only the given key
+	 * Creates a new shortcut that contains only the given key
 	 * in its only sequence.
 	 * @param key the key to add
 	 */
 	KShortcut( const KKey& key );
 
 	/**
-	 * Creates a new shortcut that tqcontains only the given key
+	 * Creates a new shortcut that contains only the given key
 	 * sequence.
 	 * @param keySeq the key sequence to add
 	 */
@@ -593,7 +593,7 @@ class KDECORE_EXPORT KShortcut
 	KShortcut( const KShortcut& shortcut );
 
 	/**
-	 * Creates a new key sequence that tqcontains the given key sequence.
+	 * Creates a new key sequence that contains the given key sequence.
 	 * The description consists of semicolon-separated keys as
 	 * used in KKeySequence::KKeySequence(const TQString&).
 	 * @param shortcut the description of the key
@@ -602,7 +602,7 @@ class KDECORE_EXPORT KShortcut
 	KShortcut( const char* shortcut );
 
 	/**
-	 * Creates a new key sequence that tqcontains the given key sequence.
+	 * Creates a new key sequence that contains the given key sequence.
 	 * The description consists of semicolon-separated keys as
 	 * used in KKeySequence::KKeySequence(const TQString&).
 	 * @param shortcut the description of the key
@@ -706,7 +706,7 @@ class KDECORE_EXPORT KShortcut
 	 * a positive number this shortcut is larger. Shortcuts are
 	 * compared by comparing the individual key sequences, starting from the
 	 * beginning until an unequal key sequences has been found. If a shortcut
-	 * tqcontains more key sequences, it is considered larger.
+	 * contains more key sequences, it is considered larger.
 	 * @param shortcut the shortcut to compare to
 	 * @return a negative number if the given KShortcut is larger, 0 if
 	 * they are equal and a positive number this KShortcut is larger
@@ -737,27 +737,27 @@ class KDECORE_EXPORT KShortcut
 		{ return compare( cut ) < 0; }
 
 	/**
-	 * Checks whether this shortcut tqcontains a sequence that starts
+	 * Checks whether this shortcut contains a sequence that starts
 	 * with the given key.
 	 * @param key the key to check
 	 * @return true if a key sequence starts with the key
 	 */
-	bool tqcontains( const KKey& key ) const;
+	bool contains( const KKey& key ) const;
 
 	/**
-	 * Checks whether this shortcut tqcontains a sequence that starts
+	 * Checks whether this shortcut contains a sequence that starts
 	 * with the given key.
 	 * @param key the key to check
 	 * @return true if a key sequence starts with the key
 	 */
-	bool tqcontains( const KKeyNative& key ) const;
+	bool contains( const KKeyNative& key ) const;
 
 	/**
-	 * Checks whether this shortcut tqcontains the given sequence.
+	 * Checks whether this shortcut contains the given sequence.
 	 * @param keySeq the key sequence to check
 	 * @return true if the shortcut has the given key sequence
 	 */
-	bool tqcontains( const KKeySequence& keySeq ) const;
+	bool contains( const KKeySequence& keySeq ) const;
 
 	/**
 	 * Sets the @p i 'th key sequence of the shortcut. You can not introduce
diff --git a/kdecore/kshortcutlist.cpp b/kdecore/kshortcutlist.cpp
index b8796d350..865bdc257 100644
--- a/kdecore/kshortcutlist.cpp
+++ b/kdecore/kshortcutlist.cpp
@@ -46,7 +46,7 @@ int KShortcutList::index( const KKeySequence& seq ) const
 
 	uint nSize = count();
 	for( uint i = 0; i < nSize; i++ ) {
-		if( shortcut(i).tqcontains( seq ) )
+		if( shortcut(i).contains( seq ) )
 			return i;
 	}
 
diff --git a/kdecore/kshortcutmenu.cpp b/kdecore/kshortcutmenu.cpp
index 930095c84..3df389f07 100644
--- a/kdecore/kshortcutmenu.cpp
+++ b/kdecore/kshortcutmenu.cpp
@@ -123,7 +123,7 @@ int KShortcutMenu::searchForKey( KKey key )
 	uint iKey = m_seq.count();
 	
 	for( uint iItem = 1; iItem < count(); iItem++ ) {
-		if( m_seqs.tqcontains( iItem ) ) {
+		if( m_seqs.contains( iItem ) ) {
 			KKey keyItem = m_seqs[iItem].key( iKey );
 			//kdDebug(125) << "iItem = " << iItem << " key = " << key.toStringInternal() << " keyItem = " << keyItem.toStringInternal() << endl;
 			if( key == keyItem ) {
@@ -146,7 +146,7 @@ void KShortcutMenu::keepItemsMatching( KKey key )
 	m_seq.setKey( iKey, key );
 	
 	for( uint iItem = 1; iItem < count(); iItem++ ) {
-		if( m_seqs.tqcontains( iItem ) ) {
+		if( m_seqs.contains( iItem ) ) {
 			KKey keyItem = m_seqs[iItem].key( iKey );
 			if( key != keyItem ) {
 				m_seqs.remove( iItem );
diff --git a/kdecore/ksimpleconfig.cpp b/kdecore/ksimpleconfig.cpp
index 15597826d..6b4e13a14 100644
--- a/kdecore/ksimpleconfig.cpp
+++ b/kdecore/ksimpleconfig.cpp
@@ -38,7 +38,7 @@
 #include "ksimpleconfig.h"
 
 KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly)
-  : KConfig(TQString::tqfromLatin1(""), bReadOnly, false)
+  : KConfig(TQString::fromLatin1(""), bReadOnly, false)
 {
   // the difference between KConfig and KSimpleConfig is just that
   // for KSimpleConfig an absolute filename is guaranteed
diff --git a/kdecore/ksimpleconfig.h b/kdecore/ksimpleconfig.h
index 1a18a09a3..89d380512 100644
--- a/kdecore/ksimpleconfig.h
+++ b/kdecore/ksimpleconfig.h
@@ -32,7 +32,7 @@ class KSimpleConfigPrivate;
  * only one configuration file and no default system.
  * A difference with KConfig is that when the data in memory is written back
  * it is not merged with what is on disk.
- * Whatever is in memory simply tqreplaces what is on disk entirely.
+ * Whatever is in memory simply replaces what is on disk entirely.
  *
  * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org>
  * @see KConfigBase KConfig
diff --git a/kdecore/ksock.h b/kdecore/ksock.h
index 7981bd233..8f2c9280c 100644
--- a/kdecore/ksock.h
+++ b/kdecore/ksock.h
@@ -84,7 +84,7 @@ class KServerSocketPrivate;
  * @author Torben Weis <weis@uni-frankfurt.de>
  * @short A TCP/IP client socket.
  */
-class KDECORE_EXPORT KSocket : public TQObject
+class KDECORE_EXPORT KSocket : public QObject
 {
     Q_OBJECT
 public:
@@ -234,7 +234,7 @@ private:
  * @deprecated
  * This class is deprecated and will be removed in the future.
  * Please use the classes in KNetwork for new programs. 
- * In special, this class is tqreplaced by KNetwork::KStreamSocket
+ * In special, this class is replaced by KNetwork::KStreamSocket
  * and KNetwork::KServerSocket. 
  *
  * You can use a KServerSocket to listen on a port for incoming
@@ -247,7 +247,7 @@ private:
  *
  * @author Torben Weis <weis@stud.uni-frankfurt.de>
 */
-class KDECORE_EXPORT KServerSocket : public TQObject
+class KDECORE_EXPORT KServerSocket : public QObject
 {
     Q_OBJECT
 public:
diff --git a/kdecore/ksockaddr.cpp b/kdecore/ksockaddr.cpp
index bc9c03059..82bed0d5c 100644
--- a/kdecore/ksockaddr.cpp
+++ b/kdecore/ksockaddr.cpp
@@ -421,7 +421,7 @@ bool KInetSocketAddress::setHost(const TQString& addr, int family)
 
 #ifdef AF_INET6
       // IPv6 addresses MUST contain colons (:) and IPv4 addresses must not
-      if (addr.tqfind(':') != -1)
+      if (addr.find(':') != -1)
 	family = AF_INET6;
       else
 	family = AF_INET;
@@ -485,7 +485,7 @@ bool KInetSocketAddress::setFamily(int _family)
   return true;
 }
 
-bool KInetSocketAddress::setFlowinfo(TQ_UINT32 flowinfo)
+bool KInetSocketAddress::setFlowinfo(Q_UINT32 flowinfo)
 {
 #ifdef AF_INET6
   if (d->sockfamily == AF_INET6)
@@ -587,7 +587,7 @@ TQString KInetSocketAddress::nodeName() const
       return i18n("<empty>");
     }
 
-  return TQString::tqfromLatin1(buf); // FIXME! What's the encoding?
+  return TQString::fromLatin1(buf); // FIXME! What's the encoding?
 }
 
 TQString KInetSocketAddress::serviceName() const
@@ -605,11 +605,11 @@ unsigned short KInetSocketAddress::port() const
 #endif
 }
 
-TQ_UINT32 KInetSocketAddress::flowinfo() const
+Q_UINT32 KInetSocketAddress::flowinfo() const
 {
 #ifdef AF_INET6
   if (d->sockfamily == AF_INET6)
-    return (TQ_UINT32)d->sin6.sin6_flowinfo;
+    return (Q_UINT32)d->sin6.sin6_flowinfo;
 #endif
   return 0;
 }
@@ -677,9 +677,9 @@ void KInetSocketAddress::fromV4()
   d->sin6.sin6_port = d->sin.sin_port;
 
   // Make this a v4-mapped address
-  ((TQ_UINT32*)&d->sin6.sin6_addr)[0] = ((TQ_UINT32*)&d->sin6.sin6_addr)[1] = 0;
-  ((TQ_UINT32*)&d->sin6.sin6_addr)[2] = htonl(0xffff);
-  ((TQ_UINT32*)&d->sin6.sin6_addr)[3] = *(TQ_UINT32*)&d->sin.sin_addr;
+  ((Q_UINT32*)&d->sin6.sin6_addr)[0] = ((Q_UINT32*)&d->sin6.sin6_addr)[1] = 0;
+  ((Q_UINT32*)&d->sin6.sin6_addr)[2] = htonl(0xffff);
+  ((Q_UINT32*)&d->sin6.sin6_addr)[3] = *(Q_UINT32*)&d->sin.sin_addr;
 
   // Clear flowinfo and scopeid
   d->sin6.sin6_flowinfo = 0;
@@ -700,7 +700,7 @@ void KInetSocketAddress::fromV6()
   if (V6_CAN_CONVERT_TO_V4(&d->sin6.sin6_addr))
     {
       d->sin.sin_port = d->sin6.sin6_port;
-      *(TQ_UINT32*)&d->sin.sin_addr = ((TQ_UINT32*)&d->sin6.sin6_addr)[3];
+      *(Q_UINT32*)&d->sin.sin_addr = ((Q_UINT32*)&d->sin6.sin6_addr)[3];
     }
   else
     {
@@ -717,7 +717,7 @@ TQString KInetSocketAddress::addrToString(int family, const void* addr)
 {
   char buf[INET6_ADDRSTRLEN+1];
 
-  return TQString::tqfromLatin1(inet_ntop(family, addr, buf, INET6_ADDRSTRLEN));
+  return TQString::fromLatin1(inet_ntop(family, addr, buf, INET6_ADDRSTRLEN));
 }
 
 bool KInetSocketAddress::stringToAddr(int family, const char *text, void *dest)
diff --git a/kdecore/ksockaddr.h b/kdecore/ksockaddr.h
index 04ae350aa..8b62f7da9 100644
--- a/kdecore/ksockaddr.h
+++ b/kdecore/ksockaddr.h
@@ -43,7 +43,7 @@ class KSocketAddressPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short a socket address.
  */
-class KDECORE_EXPORT KSocketAddress: public TQObject
+class KDECORE_EXPORT KSocketAddress: public QObject
 {
   Q_OBJECT
 protected:
@@ -391,7 +391,7 @@ public:
    * @param flowinfo	flowinfo
    * @return true if successful, false otherwise
    */
-  bool setFlowinfo(TQ_UINT32 flowinfo);
+  bool setFlowinfo(Q_UINT32 flowinfo);
 
   /**
    * Sets the scope id for this socket if this is IPv6.
@@ -461,7 +461,7 @@ public:
    * Returns flowinfo for IPv6 socket.
    * @return the flowinfo, 0 if unsupported
    */
-  TQ_UINT32 flowinfo() const;
+  Q_UINT32 flowinfo() const;
 
   /**
    * Returns the scope id for this IPv6 socket.
diff --git a/kdecore/ksocks.cpp b/kdecore/ksocks.cpp
index 2af496f7a..e596c50d9 100644
--- a/kdecore/ksocks.cpp
+++ b/kdecore/ksocks.cpp
@@ -85,7 +85,7 @@ class KSocksTable {
    KSocksTable();
   virtual ~KSocksTable();
 
-   // The name of each symbol and it's SOCKS tqreplacement
+   // The name of each symbol and it's SOCKS replacement
    TQMap<SymbolKeys,TQString>  symbols;
    // The name of this library
    TQString                   myname;
diff --git a/kdecore/kstandarddirs.cpp b/kdecore/kstandarddirs.cpp
index 54dab242a..f8b7bd307 100644
--- a/kdecore/kstandarddirs.cpp
+++ b/kdecore/kstandarddirs.cpp
@@ -144,7 +144,7 @@ bool KStandardDirs::isRestrictedResource(const char *type, const TQString& relPa
 void KStandardDirs::applyDataRestrictions(const TQString &relPath) const
 {
    TQString key;
-   int i = relPath.tqfind(QChar('/'));
+   int i = relPath.find(QChar('/'));
    if (i != -1)
       key = "data_"+relPath.left(i);
    else
@@ -159,7 +159,7 @@ TQStringList KStandardDirs::allTypes() const
 {
     TQStringList list;
     for (int i = 0; types[i] != 0; ++i)
-        list.append(TQString::tqfromLatin1(types[i]));
+        list.append(TQString::fromLatin1(types[i]));
     return list;
 }
 
@@ -192,7 +192,7 @@ void KStandardDirs::addPrefix( const TQString& _dir, bool priority )
     if (dir.at(dir.length() - 1) != QChar('/'))
 	dir += QChar('/');
 
-    if (!prefixes.tqcontains(dir)) {
+    if (!prefixes.contains(dir)) {
         priorityAdd(prefixes, dir, priority);
 	dircache.clear();
     }
@@ -212,7 +212,7 @@ void KStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority )
     if (dir.at(dir.length() - 1) != QChar('/'))
 	dir += QChar('/');
 
-    if (!d->xdgconf_prefixes.tqcontains(dir)) {
+    if (!d->xdgconf_prefixes.contains(dir)) {
         priorityAdd(d->xdgconf_prefixes, dir, priority);
 	dircache.clear();
     }
@@ -232,7 +232,7 @@ void KStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority )
     if (dir.at(dir.length() - 1) != QChar('/'))
 	dir += QChar('/');
 
-    if (!d->xdgdata_prefixes.tqcontains(dir)) {
+    if (!d->xdgdata_prefixes.contains(dir)) {
 	priorityAdd(d->xdgdata_prefixes, dir, priority);
 	dircache.clear();
     }
@@ -265,7 +265,7 @@ bool KStandardDirs::addResourceType( const char *type,
     if (relativename.isEmpty())
        return false;
 
-    TQStringList *rels = relatives.tqfind(type);
+    TQStringList *rels = relatives.find(type);
     if (!rels) {
 	rels = new TQStringList();
 	relatives.insert(type, rels);
@@ -273,7 +273,7 @@ bool KStandardDirs::addResourceType( const char *type,
     TQString copy = relativename;
     if (copy.at(copy.length() - 1) != QChar('/'))
 	copy += QChar('/');
-    if (!rels->tqcontains(copy)) {
+    if (!rels->contains(copy)) {
         if (priority)
 	    rels->prepend(copy);
 	else
@@ -295,7 +295,7 @@ bool KStandardDirs::addResourceDir( const char *type,
 				    const TQString& absdir,
 				    bool priority)
 {
-    TQStringList *paths = absolutes.tqfind(type);
+    TQStringList *paths = absolutes.find(type);
     if (!paths) {
 	paths = new TQStringList();
 	absolutes.insert(type, paths);
@@ -304,7 +304,7 @@ bool KStandardDirs::addResourceDir( const char *type,
     if (copy.at(copy.length() - 1) != QChar('/'))
       copy += QChar('/');
 
-    if (!paths->tqcontains(copy)) {
+    if (!paths->contains(copy)) {
         if (priority)
             paths->prepend(copy);
         else
@@ -337,7 +337,7 @@ for (TQStringList::ConstIterator pit = prefixes.begin();
     else return dir + filename;
 }
 
-static TQ_UINT32 updateHash(const TQString &file, TQ_UINT32 hash)
+static Q_UINT32 updateHash(const TQString &file, Q_UINT32 hash)
 {
     TQCString cFile = TQFile::encodeName(file);
     KDE_struct_stat buff;
@@ -345,15 +345,15 @@ static TQ_UINT32 updateHash(const TQString &file, TQ_UINT32 hash)
         (KDE_stat( cFile, &buff ) == 0) &&
         (S_ISREG( buff.st_mode )))
     {
-       hash = hash + (TQ_UINT32) buff.st_ctime;
+       hash = hash + (Q_UINT32) buff.st_ctime;
     }
     return hash;
 }
 
-TQ_UINT32 KStandardDirs::calcResourceHash( const char *type,
+Q_UINT32 KStandardDirs::calcResourceHash( const char *type,
 			      const TQString& filename, bool deep) const
 {
-    TQ_UINT32 hash = 0;
+    Q_UINT32 hash = 0;
 
     if (!TQDir::isRelativePath(filename))
     {
@@ -442,7 +442,7 @@ TQString KStandardDirs::findResourceDir( const char *type,
 
 #ifndef NDEBUG
     if(false && strcmp(type, "locale"))
-      kdDebug() << "KStdDirs::tqfindResDir(): can't tqfind \"" << filename << "\" in type \"" << type << "\"." << endl;
+      kdDebug() << "KStdDirs::findResDir(): can't find \"" << filename << "\" in type \"" << type << "\"." << endl;
 #endif
 
     return TQString::null;
@@ -468,7 +468,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart,
 			    bool recursive, bool unique)
 {
   TQString pattern = regexp.pattern();
-  if (recursive || pattern.tqcontains('?') || pattern.tqcontains('*'))
+  if (recursive || pattern.contains('?') || pattern.contains('*'))
   {
     if (path.isEmpty()) //for sanity
       return;
@@ -512,7 +512,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart,
       }
       if ( S_ISREG( buff.st_mode))
       {
-        if (!unique || !relList.tqcontains(relPart + fn))
+        if (!unique || !relList.contains(relPart + fn))
         {
 	    list.append( pathfn );
 	    relList.append( relPart + fn );
@@ -531,7 +531,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart,
         return; // File not found
      if ( S_ISREG( buff.st_mode))
      {
-       if (!unique || !relList.tqcontains(relPart + fn))
+       if (!unique || !relList.contains(relPart + fn))
        {
          list.append( pathfn );
          relList.append( relPart + fn );
@@ -557,7 +557,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
 
     if (relpath.length())
     {
-       int slash = relpath.tqfind(QChar('/'));
+       int slash = relpath.find(QChar('/'));
        if (slash < 0)
 	   rest = relpath.left(relpath.length() - 1);
        else {
@@ -575,7 +575,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
 #endif
     KDE_struct_stat buff;
 
-    if (path.tqcontains('*') || path.tqcontains('?')) {
+    if (path.contains('*') || path.contains('?')) {
 
 	TQRegExp pathExp(path, true, true);
 	DIR *dp = opendir( TQFile::encodeName(prefix) );
@@ -608,7 +608,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
 
 	closedir( dp );
     } else {
-        // Don't stat, if the dir doesn't exist we will tqfind out
+        // Don't stat, if the dir doesn't exist we will find out
         // when we try to open it.
         lookupPrefix(prefix + path + QChar('/'), rest,
                      relPart + path + QChar('/'), regexp, list,
@@ -629,7 +629,7 @@ KStandardDirs::findAllResources( const char *type,
 
     if (filter.length())
     {
-       int slash = filter.tqfindRev('/');
+       int slash = filter.findRev('/');
        if (slash < 0)
 	   filterFile = filter;
        else {
@@ -688,7 +688,7 @@ KStandardDirs::realPath(const TQString &dirname)
     char realpath_buffer[MAXPATHLEN + 1];
     memset(realpath_buffer, 0, MAXPATHLEN + 1);
 
-    /* If the path tqcontains symlinks, get the real name */
+    /* If the path contains symlinks, get the real name */
     if (realpath( TQFile::encodeName(dirname).data(), realpath_buffer) != 0) {
         // success, use result from realpath
         int len = strlen(realpath_buffer);
@@ -706,7 +706,7 @@ KStandardDirs::realFilePath(const TQString &filename)
     char realpath_buffer[MAXPATHLEN + 1];
     memset(realpath_buffer, 0, MAXPATHLEN + 1);
 
-    /* If the path tqcontains symlinks, get the real name */
+    /* If the path contains symlinks, get the real name */
     if (realpath( TQFile::encodeName(filename).data(), realpath_buffer) != 0) {
         // success, use result from realpath
         return TQFile::decodeName(realpath_buffer);
@@ -762,9 +762,9 @@ void KStandardDirs::createSpecialResource(const char *type)
 #else //UNIX
    if (relink)
    {
-      TQString srv = findExe(TQString::tqfromLatin1("lnusertemp"), kfsstnd_defaultbindir());
+      TQString srv = findExe(TQString::fromLatin1("lnusertemp"), kfsstnd_defaultbindir());
       if (srv.isEmpty())
-         srv = findExe(TQString::tqfromLatin1("lnusertemp"));
+         srv = findExe(TQString::fromLatin1("lnusertemp"));
       if (!srv.isEmpty())
       {
          system(TQFile::encodeName(srv)+" "+type);
@@ -785,7 +785,7 @@ void KStandardDirs::createSpecialResource(const char *type)
 
 TQStringList KStandardDirs::resourceDirs(const char *type) const
 {
-    TQStringList *candidates = dircache.tqfind(type);
+    TQStringList *candidates = dircache.find(type);
 
     if (!candidates) { // filling cache
         if (strcmp(type, "socket") == 0)
@@ -812,7 +812,7 @@ TQStringList KStandardDirs::resourceDirs(const char *type) const
            d->dataRestrictionActive = false; // Reset
         }
 
-        dirs = relatives.tqfind(type);
+        dirs = relatives.find(type);
         if (dirs)
         {
             bool local = true;
@@ -834,7 +834,7 @@ TQStringList KStandardDirs::resourceDirs(const char *type) const
                     testdir.setPath(path);
                     if (local && restrictionActive)
                        continue;
-                    if ((local || testdir.exists()) && !candidates->tqcontains(path))
+                    if ((local || testdir.exists()) && !candidates->contains(path))
                         candidates->append(path);
                 }
 		// UGLY HACK - Chris CHeney
@@ -844,7 +844,7 @@ TQStringList KStandardDirs::resourceDirs(const char *type) const
                 local = false;
             }
         }
-        dirs = absolutes.tqfind(type);
+        dirs = absolutes.find(type);
         if (dirs)
             for (TQStringList::ConstIterator it = dirs->begin();
                  it != dirs->end(); ++it)
@@ -853,7 +853,7 @@ TQStringList KStandardDirs::resourceDirs(const char *type) const
                 if (testdir.exists())
                 {
                     TQString filename = realPath(*it);
-                    if (!candidates->tqcontains(filename))
+                    if (!candidates->contains(filename))
                         candidates->append(filename);
                 }
             }
@@ -897,19 +897,19 @@ TQStringList KStandardDirs::systemPaths( const TQString& pstr )
 
         if ( p[ 0 ] == QChar('~') )
         {
-            int len = p.tqfind( QChar('/') );
+            int len = p.find( QChar('/') );
             if ( len == -1 )
                 len = p.length();
             if ( len == 1 )
             {
-                p.tqreplace( 0, 1, TQDir::homeDirPath() );
+                p.replace( 0, 1, TQDir::homeDirPath() );
             }
             else
             {
                 TQString user = p.mid( 1, len - 1 );
                 struct passwd *dir = getpwnam( user.local8Bit().data() );
                 if ( dir && strlen( dir->pw_dir ) )
-                    p.tqreplace( 0, len, TQString::fromLocal8Bit( dir->pw_dir ) );
+                    p.replace( 0, len, TQString::fromLocal8Bit( dir->pw_dir ) );
             }
         }
 
@@ -931,7 +931,7 @@ TQString KStandardDirs::findExe( const TQString& appname,
     TQFileInfo info;
 
     // absolute or relative path given
-    if (real_appname.tqfind(TQDir::separator()) >= 0)
+    if (real_appname.find(TQDir::separator()) >= 0)
     {
         info.setFile( real_appname );
         if( info.exists() && ( ignore || info.isExecutable() )
@@ -969,7 +969,7 @@ TQString KStandardDirs::findExe( const TQString& appname,
     return TQString::null;
 }
 
-int KStandardDirs::tqfindAllExe( TQStringList& list, const TQString& appname,
+int KStandardDirs::findAllExe( TQStringList& list, const TQString& appname,
 			const TQString& pstr, bool ignore )
 {
 #ifdef Q_WS_WIN
@@ -1006,7 +1006,7 @@ static int tokenize( TQStringList& tokens, const TQString& str,
 
     for( int index = 0; index < len; index++)
     {
-	if ( delim.tqfind( str[ index ] ) >= 0 )
+	if ( delim.find( str[ index ] ) >= 0 )
 	{
 	    tokens.append( token );
 	    token = "";
@@ -1093,17 +1093,17 @@ TQString KStandardDirs::saveLocation(const char *type,
 {
     checkConfig();
 
-    TQString *pPath = savelocations.tqfind(type);
+    TQString *pPath = savelocations.find(type);
     if (!pPath)
     {
-       TQStringList *dirs = relatives.tqfind(type);
+       TQStringList *dirs = relatives.find(type);
        if (!dirs && (
                      (strcmp(type, "socket") == 0) ||
                      (strcmp(type, "tmp") == 0) ||
                      (strcmp(type, "cache") == 0) ))
        {
           (void) resourceDirs(type); // Generate socket|tmp|cache resource.
-          dirs = relatives.tqfind(type); // Search again.
+          dirs = relatives.find(type); // Search again.
        }
        if (dirs)
        {
@@ -1116,7 +1116,7 @@ TQString KStandardDirs::saveLocation(const char *type,
              pPath = new TQString(realPath(localkdedir() + dirs->last()));
        }
        else {
-          dirs = absolutes.tqfind(type);
+          dirs = absolutes.find(type);
           if (!dirs)
              qFatal("KStandardDirs: The resource type %s is not registered", type);
           pPath = new TQString(realPath(dirs->last()));
@@ -1147,7 +1147,7 @@ TQString KStandardDirs::saveLocation(const char *type,
 TQString KStandardDirs::relativeLocation(const char *type, const TQString &absPath)
 {
     TQString fullPath = absPath;
-    int i = absPath.tqfindRev('/');
+    int i = absPath.findRev('/');
     if (i != -1)
     {
        fullPath = realPath(absPath.left(i+1))+absPath.mid(i+1); // Normalize
@@ -1185,7 +1185,7 @@ bool KStandardDirs::makeDir(const TQString& dir, int mode)
     while( i < len )
     {
         KDE_struct_stat st;
-        int pos = target.tqfind(QChar('/'), i);
+        int pos = target.find(QChar('/'), i);
         base += target.mid(i - 1, pos - i + 1);
         TQCString baseEncoded = TQFile::encodeName(base);
         // bail out if we encountered a problem
@@ -1236,10 +1236,10 @@ static TQString executablePrefix()
    if(path.isEmpty())
       return TQString::null;
 
-   int pos = path.tqfindRev('/'); // Skip filename
+   int pos = path.findRev('/'); // Skip filename
    if(pos <= 0)
       return TQString::null;
-   pos = path.tqfindRev(QChar('/'), pos - 1); // Skip last directory
+   pos = path.findRev(QChar('/'), pos - 1); // Skip last directory
    if(pos <= 0)
       return TQString::null;
 
@@ -1256,7 +1256,7 @@ TQString KStandardDirs::kfsstnd_defaultprefix()
    s->defaultprefix = readEnvPath("KDEDIR");
    if (s->defaultprefix.isEmpty()) {
       s->defaultprefix = TQFile::decodeName("c:\\kde");
-      //TODO: tqfind other location (the Registry?)
+      //TODO: find other location (the Registry?)
    }
 #else //UNIX
    s->defaultprefix = KDEDIR;
@@ -1272,11 +1272,11 @@ TQString KStandardDirs::kfsstnd_defaultbindir()
    if (!s->defaultbindir.isEmpty())
       return s->defaultbindir;
 #ifdef Q_WS_WIN
-   s->defaultbindir = kfsstnd_defaultprefix() + TQString::tqfromLatin1("/bin");
+   s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin");
 #else //UNIX
    s->defaultbindir = __KDE_BINDIR;
    if (s->defaultbindir.isEmpty())
-      s->defaultbindir = kfsstnd_defaultprefix() + TQString::tqfromLatin1("/bin");
+      s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin");
 #endif
    if (s->defaultbindir.isEmpty())
       kdWarning() << "KStandardDirs::kfsstnd_defaultbindir(): default binary KDE dir not found!" << endl;
@@ -1543,13 +1543,13 @@ bool KStandardDirs::addCustomized(KConfig *config)
         addedCustoms = true;
 
         // reading the prefixes in
-        TQString group = TQString::tqfromLatin1("Directories");
+        TQString group = TQString::fromLatin1("Directories");
         config->setGroup(group);
 
         TQString kioskAdmin = config->readEntry("kioskAdmin");
         if (!kioskAdmin.isEmpty() && !kde_kiosk_admin)
         {
-            int i = kioskAdmin.tqfind(':');
+            int i = kioskAdmin.find(':');
             TQString user = kioskAdmin.left(i);
             TQString host = kioskAdmin.mid(i+1);
 
@@ -1603,7 +1603,7 @@ bool KStandardDirs::addCustomized(KConfig *config)
             }
 
             // iterating over all entries in the group Directories
-            // to tqfind entries that start with dir_$type
+            // to find entries that start with dir_$type
             TQMap<TQString, TQString> entries = config->entryMap(group);
             for (TQMap<TQString, TQString>::ConstIterator it2 = entries.begin();
                  it2 != entries.end(); it2++)
@@ -1623,7 +1623,7 @@ bool KStandardDirs::addCustomized(KConfig *config)
             if (profiles.isEmpty())
                 break;
             profile = profiles.back();
-            group = TQString::tqfromLatin1("Directories-%1").arg(profile);
+            group = TQString::fromLatin1("Directories-%1").arg(profile);
             profiles.pop_back();
             priority = true;
         }
@@ -1692,9 +1692,9 @@ TQString locateLocal( const char *type,
 TQString locateLocal( const char *type,
 	             const TQString& filename, bool createDir, const KInstance* inst )
 {
-    // try to tqfind slashes. If there are some, we have to
+    // try to find slashes. If there are some, we have to
     // create the subdir first
-    int slash = filename.tqfindRev('/')+1;
+    int slash = filename.findRev('/')+1;
     if (!slash) // only one filename
 	return inst->dirs()->saveLocation(type, TQString::null, createDir) + filename;
 
diff --git a/kdecore/kstandarddirs.h b/kdecore/kstandarddirs.h
index 25a6cf231..ded472d1d 100644
--- a/kdecore/kstandarddirs.h
+++ b/kdecore/kstandarddirs.h
@@ -61,7 +61,7 @@ class KStandardDirsPrivate;
  * So the search algorithm basically appends to each prefix each registered
  * suffix and tries to locate the file there.
  * To make the thing even more complex, it's also possible to register
- * absolute paths that KStandardDirs looks up after not tqfinding anything
+ * absolute paths that KStandardDirs looks up after not finding anything
  * in the former steps. They can be useful if the user wants to provide
  * specific directories that aren't in his $HOME/.kde directory for,
  * for example, icons.
@@ -205,7 +205,7 @@ public:
 			     const TQString& absdir);
 
 	/**
-	 * Tries to tqfind a resource in the following order:
+	 * Tries to find a resource in the following order:
 	 * @li All PREFIX/\<relativename> paths (most recent first).
 	 * @li All absolute paths (most recent first).
 	 *
@@ -214,7 +214,7 @@ public:
 	 * to findResource("lib", "libkdecore.la"). KStandardDirs will
 	 * then look into the subdir lib of all elements of all prefixes
 	 * ($KDEDIRS) for a file libkdecore.la and return the path to
-	 * the first one it tqfinds (e.g. /opt/kde/lib/libkdecore.la)
+	 * the first one it finds (e.g. /opt/kde/lib/libkdecore.la)
 	 *
 	 * @param type The type of the wanted resource
 	 * @param filename A relative filename of the resource.
@@ -255,11 +255,11 @@ public:
 	 * @return A number identifying the current version of the
 	 *          resource.
 	 */
-	TQ_UINT32 calcResourceHash( const char *type,
+	Q_UINT32 calcResourceHash( const char *type,
 			      const TQString& filename, bool deep) const;
 
 	/**
-	 * Tries to tqfind all directories whose names consist of the
+	 * Tries to find all directories whose names consist of the
 	 * specified type and a relative path. So would
 	 * findDirs("apps", "Settings") return
 	 * @li /opt/kde/share/applnk/Settings/
@@ -278,7 +278,7 @@ public:
                               const TQString& reldir ) const;
 
 	/**
-	 * Tries to tqfind the directory the file is in.
+	 * Tries to find the directory the file is in.
 	 * It works the same as findResource(), but it doesn't
 	 * return the filename but the name of the directory.
 	 *
@@ -302,7 +302,7 @@ public:
 
 
 	/**
-	 * Tries to tqfind all resources with the specified type.
+	 * Tries to find all resources with the specified type.
 	 *
 	 * The function will look into all specified directories
 	 * and return all filenames in these directories.
@@ -326,7 +326,7 @@ public:
 				       bool unique = false) const;
 
 	/**
-	 * Tries to tqfind all resources with the specified type.
+	 * Tries to find all resources with the specified type.
 	 *
 	 * The function will look into all specified directories
 	 * and return all filenames (full and relative paths) in
@@ -379,7 +379,7 @@ public:
 	 *
 	 * @return The path of the executable. If it was not found,
 	 *         it will return TQString::null.
-	 * @see tqfindAllExe()
+	 * @see findAllExe()
 	 */
 	static TQString findExe( const TQString& appname,
 				const TQString& pathstr=TQString::null,
@@ -403,7 +403,7 @@ public:
 	 *
 	 * @see	findExe()
 	 */
-	static int tqfindAllExe( TQStringList& list, const TQString& appname,
+	static int findAllExe( TQStringList& list, const TQString& appname,
 			       const TQString& pathstr=TQString::null,
 			       bool ignoreExecBit=false );
 
@@ -483,7 +483,7 @@ public:
          * @param absPath An absolute path to make relative.
          *
          * @return A relative path relative to resource @p type that
-         * will tqfind @p absPath. If no such relative path exists, absPath
+         * will find @p absPath. If no such relative path exists, absPath
          * will be returned unchanged.
          */
          TQString relativeLocation(const char *type, const TQString &absPath);
diff --git a/kdecore/kstartupinfo.cpp b/kdecore/kstartupinfo.cpp
index c8e47db65..673e5e6ab 100644
--- a/kdecore/kstartupinfo.cpp
+++ b/kdecore/kstartupinfo.cpp
@@ -94,9 +94,9 @@ struct KStartupInfoPrivate
     {
     public:
         TQMap< KStartupInfoId, KStartupInfo::Data > startups;
-	// tqcontains silenced ASN's only if !AnnounceSilencedChanges
+	// contains silenced ASN's only if !AnnounceSilencedChanges
         TQMap< KStartupInfoId, KStartupInfo::Data > silent_startups;
-        // tqcontains ASN's that had change: but no new: yet
+        // contains ASN's that had change: but no new: yet
         TQMap< KStartupInfoId, KStartupInfo::Data > uninited_startups;
 #ifdef Q_WS_X11
         KWinModule* wm_module;
@@ -234,7 +234,7 @@ void KStartupInfo::new_startup_info_internal( const KStartupInfoId& id_P,
         return;
     if( id_P.none())
         return;
-    if( d->startups.tqcontains( id_P ))
+    if( d->startups.contains( id_P ))
         { // already reported, update
         d->startups[ id_P ].update( data_P );
         d->startups[ id_P ].age = 0; // CHECKME
@@ -250,7 +250,7 @@ void KStartupInfo::new_startup_info_internal( const KStartupInfoId& id_P,
         emit gotStartupChange( id_P, d->startups[ id_P ] );
         return;
         }
-    if( d->silent_startups.tqcontains( id_P ))
+    if( d->silent_startups.contains( id_P ))
         { // already reported, update
         d->silent_startups[ id_P ].update( data_P );
         d->silent_startups[ id_P ].age = 0; // CHECKME
@@ -265,7 +265,7 @@ void KStartupInfo::new_startup_info_internal( const KStartupInfoId& id_P,
         emit gotStartupChange( id_P, d->silent_startups[ id_P ] );
         return;
         }
-    if( d->uninited_startups.tqcontains( id_P ))
+    if( d->uninited_startups.contains( id_P ))
         {
         d->uninited_startups[ id_P ].update( data_P );
         kdDebug( 172 ) << "updating uninited" << endl;
@@ -317,18 +317,18 @@ void KStartupInfo::remove_startup_info_internal( const KStartupInfoId& id_P )
     {
     if( d == NULL )
         return;
-    if( d->startups.tqcontains( id_P ))
+    if( d->startups.contains( id_P ))
         {
 	kdDebug( 172 ) << "removing" << endl;
 	emit gotRemoveStartup( id_P, d->startups[ id_P ]);
 	d->startups.remove( id_P );
 	}
-    else if( d->silent_startups.tqcontains( id_P ))
+    else if( d->silent_startups.contains( id_P ))
 	{
 	kdDebug( 172 ) << "removing silent" << endl;
 	d->silent_startups.remove( id_P );
 	}
-    else if( d->uninited_startups.tqcontains( id_P ))
+    else if( d->uninited_startups.contains( id_P ))
 	{
 	kdDebug( 172 ) << "removing uninited" << endl;
 	d->uninited_startups.remove( id_P );
@@ -337,7 +337,7 @@ void KStartupInfo::remove_startup_info_internal( const KStartupInfoId& id_P )
     }
 
 void KStartupInfo::remove_startup_pids( const KStartupInfoData& data_P )
-    { // first tqfind the matching info
+    { // first find the matching info
     if( d == NULL )
         return;
     for( TQMap< KStartupInfoId, Data >::Iterator it = d->startups.begin();
@@ -360,11 +360,11 @@ void KStartupInfo::remove_startup_pids( const KStartupInfoId& id_P,
         return;
     kdFatal( data_P.pids().count() == 0, 172 );
     Data* data = NULL;
-    if( d->startups.tqcontains( id_P ))
+    if( d->startups.contains( id_P ))
 	data = &d->startups[ id_P ];
-    else if( d->silent_startups.tqcontains( id_P ))
+    else if( d->silent_startups.contains( id_P ))
 	data = &d->silent_startups[ id_P ];
-    else if( d->uninited_startups.tqcontains( id_P ))
+    else if( d->uninited_startups.contains( id_P ))
         data = &d->uninited_startups[ id_P ];
     else
 	return;
@@ -381,7 +381,7 @@ bool KStartupInfo::sendStartup( const KStartupInfoId& id_P, const KStartupInfoDa
     if( id_P.none())
         return false;
     KXMessages msgs;
-    TQString msg = TQString::tqfromLatin1( "new: %1 %2" )
+    TQString msg = TQString::fromLatin1( "new: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
     msg = check_required_startup_fields( msg, data_P, qt_xscreen());
     kdDebug( 172 ) << "sending " << msg << endl;
@@ -394,7 +394,7 @@ bool KStartupInfo::sendStartupX( Display* disp_P, const KStartupInfoId& id_P,
     {
     if( id_P.none())
         return false;
-    TQString msg = TQString::tqfromLatin1( "new: %1 %2" )
+    TQString msg = TQString::fromLatin1( "new: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
     msg = check_required_startup_fields( msg, data_P, DefaultScreen( disp_P ));
 #ifdef KSTARTUPINFO_ALL_DEBUG
@@ -425,7 +425,7 @@ bool KStartupInfo::sendChange( const KStartupInfoId& id_P, const KStartupInfoDat
     if( id_P.none())
         return false;
     KXMessages msgs;
-    TQString msg = TQString::tqfromLatin1( "change: %1 %2" )
+    TQString msg = TQString::fromLatin1( "change: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
     kdDebug( 172 ) << "sending " << msg << endl;
     msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false );
@@ -437,7 +437,7 @@ bool KStartupInfo::sendChangeX( Display* disp_P, const KStartupInfoId& id_P,
     {
     if( id_P.none())
         return false;
-    TQString msg = TQString::tqfromLatin1( "change: %1 %2" )
+    TQString msg = TQString::fromLatin1( "change: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
 #ifdef KSTARTUPINFO_ALL_DEBUG
     kdDebug( 172 ) << "sending " << msg << endl;
@@ -450,7 +450,7 @@ bool KStartupInfo::sendFinish( const KStartupInfoId& id_P )
     if( id_P.none())
         return false;
     KXMessages msgs;
-    TQString msg = TQString::tqfromLatin1( "remove: %1" ).arg( id_P.to_text());
+    TQString msg = TQString::fromLatin1( "remove: %1" ).arg( id_P.to_text());
     kdDebug( 172 ) << "sending " << msg << endl;
     msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false );
     return true;
@@ -460,7 +460,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P )
     {
     if( id_P.none())
         return false;
-    TQString msg = TQString::tqfromLatin1( "remove: %1" ).arg( id_P.to_text());
+    TQString msg = TQString::fromLatin1( "remove: %1" ).arg( id_P.to_text());
 #ifdef KSTARTUPINFO_ALL_DEBUG
     kdDebug( 172 ) << "sending " << msg << endl;
 #endif
@@ -472,7 +472,7 @@ bool KStartupInfo::sendFinish( const KStartupInfoId& id_P, const KStartupInfoDat
 //    if( id_P.none()) // id may be none, the pids and hostname matter then
 //        return false;
     KXMessages msgs;
-    TQString msg = TQString::tqfromLatin1( "remove: %1 %2" )
+    TQString msg = TQString::fromLatin1( "remove: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
     kdDebug( 172 ) << "sending " << msg << endl;
     msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false );
@@ -484,7 +484,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P,
     {
 //    if( id_P.none()) // id may be none, the pids and hostname matter then
 //        return false;
-    TQString msg = TQString::tqfromLatin1( "remove: %1 %2" )
+    TQString msg = TQString::fromLatin1( "remove: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
 #ifdef KSTARTUPINFO_ALL_DEBUG
     kdDebug( 172 ) << "sending " << msg << endl;
@@ -615,7 +615,7 @@ KStartupInfo::startup_t KStartupInfo::check_startup_internal( WId w_P, KStartupI
             kdDebug( 172 ) << "ignore" << endl;
             return NoMatch;
             }
-        return tqfind_id( id, id_O, data_O ) ? Match : NoMatch;
+        return find_id( id, id_O, data_O ) ? Match : NoMatch;
         }
 #ifdef Q_WS_X11
     NETWinInfo info( qt_xdisplay(),  w_P, qt_xrootwin(),
@@ -625,7 +625,7 @@ KStartupInfo::startup_t KStartupInfo::check_startup_internal( WId w_P, KStartupI
         {
         TQCString hostname = get_window_hostname( w_P );
         if( !hostname.isEmpty()
-            && tqfind_pid( pid, hostname, id_O, data_O ))
+            && find_pid( pid, hostname, id_O, data_O ))
             return Match;
         // try XClass matching , this PID stuff sucks :(
         }
@@ -636,7 +636,7 @@ KStartupInfo::startup_t KStartupInfo::check_startup_internal( WId w_P, KStartupI
         TQCString res_class = hint.res_class;
         XFree( hint.res_name );
         XFree( hint.res_class );
-        if( tqfind_wclass( res_name, res_class, id_O, data_O ))
+        if( find_wclass( res_name, res_class, id_O, data_O ))
             return Match;
         }
     // ignore NET::Tool and other special window types, if they can't be matched
@@ -661,15 +661,15 @@ KStartupInfo::startup_t KStartupInfo::check_startup_internal( WId w_P, KStartupI
     return CantDetect;
     }
 
-bool KStartupInfo::tqfind_id( const TQCString& id_P, KStartupInfoId* id_O,
+bool KStartupInfo::find_id( const TQCString& id_P, KStartupInfoId* id_O,
     KStartupInfoData* data_O )
     {
     if( d == NULL )
         return false;
-    kdDebug( 172 ) << "tqfind_id:" << id_P << endl;
+    kdDebug( 172 ) << "find_id:" << id_P << endl;
     KStartupInfoId id;
     id.initId( id_P );
-    if( d->startups.tqcontains( id ))
+    if( d->startups.contains( id ))
         {
         if( id_O != NULL )
             *id_O = id;
@@ -681,12 +681,12 @@ bool KStartupInfo::tqfind_id( const TQCString& id_P, KStartupInfoId* id_O,
     return false;
     }
 
-bool KStartupInfo::tqfind_pid( pid_t pid_P, const TQCString& hostname_P,
+bool KStartupInfo::find_pid( pid_t pid_P, const TQCString& hostname_P,
     KStartupInfoId* id_O, KStartupInfoData* data_O )
     {
     if( d == NULL )
         return false;
-    kdDebug( 172 ) << "tqfind_pid:" << pid_P << endl;
+    kdDebug( 172 ) << "find_pid:" << pid_P << endl;
     for( TQMap< KStartupInfoId, Data >::Iterator it = d->startups.begin();
          it != d->startups.end();
          ++it )
@@ -706,19 +706,19 @@ bool KStartupInfo::tqfind_pid( pid_t pid_P, const TQCString& hostname_P,
     return false;
     }
 
-bool KStartupInfo::tqfind_wclass( TQCString res_name, TQCString res_class,
+bool KStartupInfo::find_wclass( TQCString res_name, TQCString res_class,
     KStartupInfoId* id_O, KStartupInfoData* data_O )
     {
     if( d == NULL )
         return false;
     res_name = res_name.lower();
     res_class = res_class.lower();
-    kdDebug( 172 ) << "tqfind_wclass:" << res_name << ":" << res_class << endl;
+    kdDebug( 172 ) << "find_wclass:" << res_name << ":" << res_class << endl;
     for( TQMap< KStartupInfoId, Data >::Iterator it = d->startups.begin();
          it != d->startups.end();
          ++it )
         {
-        const TQCString wmclass = ( *it ).tqfindWMClass();
+        const TQCString wmclass = ( *it ).findWMClass();
         if( wmclass.lower() == res_name || wmclass.lower() == res_class )
             { // Found it !
             if( id_O != NULL )
@@ -941,7 +941,7 @@ TQCString KStartupInfo::createNewStartupId()
 #endif
     TQCString id = TQString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec )
         .arg( tm.tv_usec ).arg( getpid()).arg( qt_x_user_time ).utf8();
-    kdDebug( 172 ) << "creating: " << id << ":" << tqAppName() << endl;
+    kdDebug( 172 ) << "creating: " << id << ":" << qAppName() << endl;
     return id;
     }
 
@@ -960,14 +960,14 @@ const TQCString& KStartupInfoId::id() const
 
 TQString KStartupInfoId::to_text() const
     {
-    return TQString::tqfromLatin1( " ID=\"%1\" " ).arg( escape_str( id()));
+    return TQString::fromLatin1( " ID=\"%1\" " ).arg( escape_str( id()));
     }
 
 KStartupInfoId::KStartupInfoId( const TQString& txt_P )
     {
     d = new KStartupInfoIdPrivate;
     TQStringList items = get_fields( txt_P );
-    const TQString id_str = TQString::tqfromLatin1( "ID=" );
+    const TQString id_str = TQString::fromLatin1( "ID=" );
     for( TQStringList::Iterator it = items.begin();
          it != items.end();
          ++it )
@@ -1074,7 +1074,7 @@ unsigned long KStartupInfoId::timestamp() const
     {
     if( none())
         return 0;
-    int pos = d->id.tqfindRev( "_TIME" );
+    int pos = d->id.findRev( "_TIME" );
     if( pos >= 0 )
         {
         bool ok;
@@ -1088,10 +1088,10 @@ unsigned long KStartupInfoId::timestamp() const
     // snprintf (s, len, "%s/%s/%lu/%d-%d-%s",
     //   canonicalized_launcher, canonicalized_launchee, (unsigned long) timestamp,
     //  (int) getpid (), (int) sequence_number, hostbuf);
-    int pos1 = d->id.tqfindRev( '/' );
+    int pos1 = d->id.findRev( '/' );
     if( pos1 > 0 )
         {
-        int pos2 = d->id.tqfindRev( '/', pos1 - 1 );
+        int pos2 = d->id.findRev( '/', pos1 - 1 );
         if( pos2 >= 0 )
             {
             bool ok;
@@ -1129,34 +1129,34 @@ TQString KStartupInfoData::to_text() const
     {
     TQString ret = "";
     if( !d->bin.isEmpty())
-        ret += TQString::tqfromLatin1( " BIN=\"%1\"" ).arg( escape_str( d->bin ));
+        ret += TQString::fromLatin1( " BIN=\"%1\"" ).arg( escape_str( d->bin ));
     if( !d->name.isEmpty())
-        ret += TQString::tqfromLatin1( " NAME=\"%1\"" ).arg( escape_str( d->name ));
+        ret += TQString::fromLatin1( " NAME=\"%1\"" ).arg( escape_str( d->name ));
     if( !d->description.isEmpty())
-        ret += TQString::tqfromLatin1( " DESCRIPTION=\"%1\"" ).arg( escape_str( d->description ));
+        ret += TQString::fromLatin1( " DESCRIPTION=\"%1\"" ).arg( escape_str( d->description ));
     if( !d->icon.isEmpty())
-        ret += TQString::tqfromLatin1( " ICON=%1" ).arg( d->icon );
+        ret += TQString::fromLatin1( " ICON=%1" ).arg( d->icon );
     if( d->desktop != 0 )
-        ret += TQString::tqfromLatin1( " DESKTOP=%1" )
+        ret += TQString::fromLatin1( " DESKTOP=%1" )
             .arg( d->desktop == NET::OnAllDesktops ? NET::OnAllDesktops : d->desktop - 1 ); // spec counts from 0
     if( !d->wmclass.isEmpty())
-        ret += TQString::tqfromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) );
+        ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) );
     if( !d->hostname.isEmpty())
-        ret += TQString::tqfromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) );
+        ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) );
     for( TQValueList< pid_t >::ConstIterator it = d->pids.begin();
          it != d->pids.end();
          ++it )
-        ret += TQString::tqfromLatin1( " PID=%1" ).arg( *it );
+        ret += TQString::fromLatin1( " PID=%1" ).arg( *it );
     if( d->silent != Unknown )
-	ret += TQString::tqfromLatin1( " SILENT=%1" ).arg( d->silent == Yes ? 1 : 0 );
+	ret += TQString::fromLatin1( " SILENT=%1" ).arg( d->silent == Yes ? 1 : 0 );
     if( d->timestamp != -1U )
-        ret += TQString::tqfromLatin1( " TIMESTAMP=%1" ).arg( d->timestamp );
+        ret += TQString::fromLatin1( " TIMESTAMP=%1" ).arg( d->timestamp );
     if( d->screen != -1 )
-        ret += TQString::tqfromLatin1( " SCREEN=%1" ).arg( d->screen );
+        ret += TQString::fromLatin1( " SCREEN=%1" ).arg( d->screen );
     if( d->xinerama != -1 )
-        ret += TQString::tqfromLatin1( " XINERAMA=%1" ).arg( d->xinerama );
+        ret += TQString::fromLatin1( " XINERAMA=%1" ).arg( d->xinerama );
     if( d->launched_by != 0 )
-        ret += TQString::tqfromLatin1( " LAUNCHED_BY=%1" ).arg( d->launched_by );
+        ret += TQString::fromLatin1( " LAUNCHED_BY=%1" ).arg( d->launched_by );
     return ret;
     }
 
@@ -1164,19 +1164,19 @@ KStartupInfoData::KStartupInfoData( const TQString& txt_P )
     {
     d = new KStartupInfoDataPrivate;
     TQStringList items = get_fields( txt_P );
-    const TQString bin_str = TQString::tqfromLatin1( "BIN=" );
-    const TQString name_str = TQString::tqfromLatin1( "NAME=" );
-    const TQString description_str = TQString::tqfromLatin1( "DESCRIPTION=" );
-    const TQString icon_str = TQString::tqfromLatin1( "ICON=" );
-    const TQString desktop_str = TQString::tqfromLatin1( "DESKTOP=" );
-    const TQString wmclass_str = TQString::tqfromLatin1( "WMCLASS=" );
-    const TQString hostname_str = TQString::tqfromLatin1( "HOSTNAME=" ); // SELI nonstd
-    const TQString pid_str = TQString::tqfromLatin1( "PID=" );  // SELI nonstd
-    const TQString silent_str = TQString::tqfromLatin1( "SILENT=" );
-    const TQString timestamp_str = TQString::tqfromLatin1( "TIMESTAMP=" );
-    const TQString screen_str = TQString::tqfromLatin1( "SCREEN=" );
-    const TQString xinerama_str = TQString::tqfromLatin1( "XINERAMA=" );
-    const TQString launched_by_str = TQString::tqfromLatin1( "LAUNCHED_BY=" );
+    const TQString bin_str = TQString::fromLatin1( "BIN=" );
+    const TQString name_str = TQString::fromLatin1( "NAME=" );
+    const TQString description_str = TQString::fromLatin1( "DESCRIPTION=" );
+    const TQString icon_str = TQString::fromLatin1( "ICON=" );
+    const TQString desktop_str = TQString::fromLatin1( "DESKTOP=" );
+    const TQString wmclass_str = TQString::fromLatin1( "WMCLASS=" );
+    const TQString hostname_str = TQString::fromLatin1( "HOSTNAME=" ); // SELI nonstd
+    const TQString pid_str = TQString::fromLatin1( "PID=" );  // SELI nonstd
+    const TQString silent_str = TQString::fromLatin1( "SILENT=" );
+    const TQString timestamp_str = TQString::fromLatin1( "TIMESTAMP=" );
+    const TQString screen_str = TQString::fromLatin1( "SCREEN=" );
+    const TQString xinerama_str = TQString::fromLatin1( "XINERAMA=" );
+    const TQString launched_by_str = TQString::fromLatin1( "LAUNCHED_BY=" );
     for( TQStringList::Iterator it = items.begin();
          it != items.end();
          ++it )
@@ -1290,7 +1290,7 @@ const TQString& KStartupInfoData::name() const
     return d->name;
     }
 
-const TQString& KStartupInfoData::tqfindName() const
+const TQString& KStartupInfoData::findName() const
     {
     if( !name().isEmpty())
         return name();
@@ -1307,7 +1307,7 @@ const TQString& KStartupInfoData::description() const
     return d->description;
     }
 
-const TQString& KStartupInfoData::tqfindDescription() const
+const TQString& KStartupInfoData::findDescription() const
     {
     if( !description().isEmpty())
         return description();
@@ -1319,7 +1319,7 @@ void KStartupInfoData::setIcon( const TQString& icon_P )
     d->icon = icon_P;
     }
 
-const TQString& KStartupInfoData::tqfindIcon() const
+const TQString& KStartupInfoData::findIcon() const
     {
     if( !icon().isEmpty())
         return icon();
@@ -1346,7 +1346,7 @@ void KStartupInfoData::setWMClass( const TQCString& wmclass_P )
     d->wmclass = wmclass_P;
     }
 
-const TQCString KStartupInfoData::tqfindWMClass() const
+const TQCString KStartupInfoData::findWMClass() const
     {
     if( !WMClass().isEmpty() && WMClass() != "0" )
         return WMClass();
@@ -1379,7 +1379,7 @@ const TQCString& KStartupInfoData::hostname() const
 
 void KStartupInfoData::addPid( pid_t pid_P )
     {
-    if( !d->pids.tqcontains( pid_P ))
+    if( !d->pids.contains( pid_P ))
         d->pids.append( pid_P );
     }
 
@@ -1395,7 +1395,7 @@ const TQValueList< pid_t >& KStartupInfoData::pids() const
 
 bool KStartupInfoData::is_pid( pid_t pid_P ) const
     {
-    return d->pids.tqcontains( pid_P );
+    return d->pids.contains( pid_P );
     }
 
 void KStartupInfoData::setSilent( TriState state_P )
@@ -1451,24 +1451,24 @@ WId KStartupInfoData::launchedBy() const
 static
 long get_num( const TQString& item_P )
     {
-    unsigned int pos = item_P.tqfind( '=' );
+    unsigned int pos = item_P.find( '=' );
     return item_P.mid( pos + 1 ).toLong();
     }
 
 static
 unsigned long get_unum( const TQString& item_P )
     {
-    unsigned int pos = item_P.tqfind( '=' );
+    unsigned int pos = item_P.find( '=' );
     return item_P.mid( pos + 1 ).toULong();
     }
 
 static
 TQString get_str( const TQString& item_P )
     {
-    unsigned int pos = item_P.tqfind( '=' );
+    unsigned int pos = item_P.find( '=' );
     if( item_P.length() > pos + 2 && item_P[ pos + 1 ] == (QChar)'\"' )
         {
-        int pos2 = item_P.left( pos + 2 ).tqfind( '\"' );
+        int pos2 = item_P.left( pos + 2 ).find( '\"' );
         if( pos2 < 0 )
             return TQString::null;                      // 01234
         return item_P.mid( pos + 2, pos2 - 2 - pos );  // A="C"
diff --git a/kdecore/kstartupinfo.h b/kdecore/kstartupinfo.h
index 147d31893..e35bdba56 100644
--- a/kdecore/kstartupinfo.h
+++ b/kdecore/kstartupinfo.h
@@ -61,7 +61,7 @@ class KStartupInfoPrivate;
  * @author Lubos Lunak <l.lunak@kde.org>
  */
 class KDECORE_EXPORT KStartupInfo
-    : public TQObject
+    : public QObject
     {
     Q_OBJECT
     public:
@@ -358,11 +358,11 @@ class KDECORE_EXPORT KStartupInfo
         void remove_startup_pids( const KStartupInfoId& id, const KStartupInfoData& data );
         void remove_startup_pids( const KStartupInfoData& data );
         startup_t check_startup_internal( WId w, KStartupInfoId* id, KStartupInfoData* data );
-        bool tqfind_id( const TQCString& id_P, KStartupInfoId* id_O,
+        bool find_id( const TQCString& id_P, KStartupInfoId* id_O,
             KStartupInfoData* data_O );
-        bool tqfind_pid( pid_t pid_P, const TQCString& hostname, KStartupInfoId* id_O,
+        bool find_pid( pid_t pid_P, const TQCString& hostname, KStartupInfoId* id_O,
             KStartupInfoData* data_O );
-        bool tqfind_wclass( TQCString res_name_P, TQCString res_class_P,
+        bool find_wclass( TQCString res_name_P, TQCString res_class_P,
             KStartupInfoId* id_O, KStartupInfoData* data_O );
         static TQCString get_window_hostname( WId w_P );
         void startups_cleanup_internal( bool age_P );
@@ -482,7 +482,7 @@ class KDECORE_EXPORT KStartupInfoData
          * it tries to use other information (binary name).
 	 * @return the name of the startup notification
 	 */
-        const TQString& tqfindName() const;
+        const TQString& findName() const;
 	/**
 	 * Returns the name of the startup notification, or empty if not available.
 	 * @return the name of the startup notification, or an empty string
@@ -502,7 +502,7 @@ class KDECORE_EXPORT KStartupInfoData
 	 * @return the description of the startup notification
          * @since 3.2
 	 */
-        const TQString& tqfindDescription() const;
+        const TQString& findDescription() const;
 	/**
 	 * Returns the name of the startup notification, or empty if not available.
 	 * @return the name of the startup notificaiton, or an empty string
@@ -521,7 +521,7 @@ class KDECORE_EXPORT KStartupInfoData
 	 * @return the name of the startup notification's icon, or the name of
 	 *         the binary if not set
 	 */
-        const TQString& tqfindIcon() const;
+        const TQString& findIcon() const;
 	/**
 	 * Returns the icon of the startup notification, or empty if not available.
 	 * @return the name of the icon, or an empty string if not set.
@@ -551,7 +551,7 @@ class KDECORE_EXPORT KStartupInfoData
 	 * @return the WM_CLASS value for the startup notification, or the binary name
 	 *         if not set
 	 */
-        const TQCString tqfindWMClass() const;
+        const TQCString findWMClass() const;
 	/**
 	 * Returns the WM_CLASS value for the startup notification, or empty if not available.
 	 * @return the WM_CLASS value for the startup notification, or empty
diff --git a/kdecore/kstdaccel.cpp b/kdecore/kstdaccel.cpp
index aa139bf99..8e1819735 100644
--- a/kdecore/kstdaccel.cpp
+++ b/kdecore/kstdaccel.cpp
@@ -191,7 +191,7 @@ StdAccel findStdAccel( const KKeySequence& seq )
 			if( id != AccelNone ) {
 				if( !g_infoStdAccel[i].bInitialized )
 					initialize( id );
-				if( g_infoStdAccel[i].cut.tqcontains( seq ) )
+				if( g_infoStdAccel[i].cut.contains( seq ) )
 					return id;
 			}
 		}
@@ -281,10 +281,10 @@ const KShortcut& deleteWordBack()        { return shortcut( DeleteWordBack ); }
 const KShortcut& deleteWordForward()     { return shortcut( DeleteWordForward ); }
 const KShortcut& undo()                  { return shortcut( Undo ); }
 const KShortcut& redo()                  { return shortcut( Redo ); }
-const KShortcut& tqfind()                  { return shortcut( Find ); }
-const KShortcut& tqfindNext()              { return shortcut( FindNext ); }
-const KShortcut& tqfindPrev()              { return shortcut( FindPrev ); }
-const KShortcut& tqreplace()               { return shortcut( Replace ); }
+const KShortcut& find()                  { return shortcut( Find ); }
+const KShortcut& findNext()              { return shortcut( FindNext ); }
+const KShortcut& findPrev()              { return shortcut( FindPrev ); }
+const KShortcut& replace()               { return shortcut( Replace ); }
 const KShortcut& home()                  { return shortcut( Home ); }
 const KShortcut& end()                   { return shortcut( End ); }
 const KShortcut& beginningOfLine()       { return shortcut( BeginningOfLine ); }
diff --git a/kdecore/kstdaccel.h b/kdecore/kstdaccel.h
index 008f71227..9f379b210 100644
--- a/kdecore/kstdaccel.h
+++ b/kdecore/kstdaccel.h
@@ -237,25 +237,25 @@ namespace KStdAccel
    * Find, search. Default: Ctrl-f
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& tqfind();
+  KDECORE_EXPORT const KShortcut& find();
 
   /**
    * Find/search next. Default: F3
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& tqfindNext();
+  KDECORE_EXPORT const KShortcut& findNext();
 
   /**
    * Find/search previous. Default: Shift-F3
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& tqfindPrev();
+  KDECORE_EXPORT const KShortcut& findPrev();
 
   /**
-   * Find and tqreplace matches. Default: Ctrl-r
+   * Find and replace matches. Default: Ctrl-r
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& tqreplace();
+  KDECORE_EXPORT const KShortcut& replace();
 
   /**
    * Zoom in. Default: Ctrl-Plus
diff --git a/kdecore/kstringhandler.cpp b/kdecore/kstringhandler.cpp
index 9b668f4ba..8b5ca1a7d 100644
--- a/kdecore/kstringhandler.cpp
+++ b/kdecore/kstringhandler.cpp
@@ -22,7 +22,7 @@
 
 static void parsePythonRange( const TQCString &range, uint &start, uint &end )
 {
-    const int colon = range.tqfind( ':' );
+    const int colon = range.find( ':' );
     if ( colon == -1 ) {
         start = range.toUInt();
         end = start;
@@ -178,7 +178,7 @@ TQString KStringHandler::remword( const TQString &text , const TQString &word )
     // Split words and add into list
     TQStringList list = TQStringList::split( " ", text, true );
 
-    TQStringList::Iterator it = list.tqfind(word);
+    TQStringList::Iterator it = list.find(word);
 
     if (it != list.end())
        list.remove( it );
@@ -200,7 +200,7 @@ TQString KStringHandler::capwords( const TQString &text )
     const TQStringList words = capwords( TQStringList::split( ' ', strippedText ) );
 
     TQString result = text;
-    result.tqreplace( strippedText, words.join( " " ) );
+    result.replace( strippedText, words.join( " " ) );
     return result;
 }
 
@@ -422,11 +422,11 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa
    if ( pattern[ pattern_len - 1 ] == (QChar)'*' && len + 1 >= pattern_len ) {
       if ( pattern[ 0 ] == (QChar)'*' )
       {
-         return filename.tqfind(pattern.mid(1, pattern_len - 2)) != -1;
+         return filename.find(pattern.mid(1, pattern_len - 2)) != -1;
       }
 
-      const TQChar *c1 = pattern.tqunicode();
-      const TQChar *c2 = filename.tqunicode();
+      const TQChar *c1 = pattern.unicode();
+      const TQChar *c2 = filename.unicode();
       int cnt = 1;
       while ( cnt < pattern_len && *c1++ == *c2++ )
          ++cnt;
@@ -436,8 +436,8 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa
    // Patterns like "*~", "*.extension"
    if ( pattern[ 0 ] == (QChar)'*' && len + 1 >= pattern_len )
    {
-     const TQChar *c1 = pattern.tqunicode() + pattern_len - 1;
-     const TQChar *c2 = filename.tqunicode() + len - 1;
+     const TQChar *c1 = pattern.unicode() + pattern_len - 1;
+     const TQChar *c2 = filename.unicode() + len - 1;
      int cnt = 1;
      while ( cnt < pattern_len && *c1-- == *c2-- )
         ++cnt;
@@ -457,7 +457,7 @@ KStringHandler::perlSplit(const TQString & sep, const TQString & s, uint max)
 
   int searchStart = 0;
 
-  int tokenStart = s.tqfind(sep, searchStart);
+  int tokenStart = s.find(sep, searchStart);
 
   while (-1 != tokenStart && (ignoreMax || l.count() < max - 1))
   {
@@ -465,7 +465,7 @@ KStringHandler::perlSplit(const TQString & sep, const TQString & s, uint max)
       l << s.mid(searchStart, tokenStart - searchStart);
 
     searchStart = tokenStart + sep.length();
-    tokenStart = s.tqfind(sep, searchStart);
+    tokenStart = s.find(sep, searchStart);
   }
 
   if (!s.mid(searchStart, s.length() - searchStart).isEmpty())
@@ -483,7 +483,7 @@ KStringHandler::perlSplit(const TQChar & sep, const TQString & s, uint max)
 
   int searchStart = 0;
 
-  int tokenStart = s.tqfind(sep, searchStart);
+  int tokenStart = s.find(sep, searchStart);
 
   while (-1 != tokenStart && (ignoreMax || l.count() < max - 1))
   {
@@ -491,7 +491,7 @@ KStringHandler::perlSplit(const TQChar & sep, const TQString & s, uint max)
       l << s.mid(searchStart, tokenStart - searchStart);
 
     searchStart = tokenStart + 1;
-    tokenStart = s.tqfind(sep, searchStart);
+    tokenStart = s.find(sep, searchStart);
   }
 
   if (!s.mid(searchStart, s.length() - searchStart).isEmpty())
@@ -545,7 +545,7 @@ KStringHandler::tagURLs( const TQString& text )
         }
         // Don't use TQString::arg since %01, %20, etc could be in the string
         TQString anchor = "<a href=\"" + href + "\">" + href + "</a>";
-        richText.tqreplace( urlPos, urlLen, anchor );
+        richText.replace( urlPos, urlLen, anchor );
 
 
         urlPos += anchor.length();
@@ -556,10 +556,10 @@ KStringHandler::tagURLs( const TQString& text )
 TQString KStringHandler::obscure( const TQString &str )
 {
   TQString result;
-  const TQChar *tqunicode = str.tqunicode();
+  const TQChar *unicode = str.unicode();
   for ( uint i = 0; i < str.length(); ++i )
-    result += ( tqunicode[ i ].tqunicode() < 0x21 ) ? tqunicode[ i ] :
-        TQChar( 0x1001F - tqunicode[ i ].tqunicode() );
+    result += ( unicode[ i ].unicode() < 0x21 ) ? unicode[ i ] :
+        TQChar( 0x1001F - unicode[ i ].unicode() );
 
   return result;
 }
diff --git a/kdecore/kstringhandler.h b/kdecore/kstringhandler.h
index 2986e8799..47075a066 100644
--- a/kdecore/kstringhandler.h
+++ b/kdecore/kstringhandler.h
@@ -26,7 +26,7 @@
 #include "kdelibs_export.h"
 
 /**
- * This class tqcontains utility functions for handling strings.
+ * This class contains utility functions for handling strings.
  *
  * This class is @em not a substitute for the TQString class. What
  * I tried to do with this class is provide an easy way to
@@ -45,7 +45,7 @@
  * a string. These ranges function, for the large part, as they would in
  * python. See the word(const TQString&, const char *) and remword(const TQString&, uint) functions for more detail.
  *
- * This class tqcontains no data members of its own. All strings are cut
+ * This class contains no data members of its own. All strings are cut
  * on the fly and returned as new qstrings/qstringlists.
  *
  * Quick example on how to use:
@@ -331,7 +331,7 @@ public:
      * Example:
      * \code
      * perlSplit("__", "some__string__for__you__here", 4)
-     * TQStringList tqcontains: "some", "string", "for", "you__here"
+     * TQStringList contains: "some", "string", "for", "you__here"
      * \endcode
      *
      * @param sep is the string to use to delimit s.
@@ -351,7 +351,7 @@ public:
      * Example:
      * \code
      * perlSplit(' ', "kparts reaches the parts other parts can't", 3)
-     * TQStringList tqcontains: "kparts", "reaches", "the parts other parts can't"
+     * TQStringList contains: "kparts", "reaches", "the parts other parts can't"
      * \endcode
      *
      * @param sep is the character to use to delimit s.
@@ -371,7 +371,7 @@ public:
      * Example:
      * \code
      * perlSplit(TQRegExp("[! ]", "Split me up ! I'm bored ! OK ?", 3)
-     * TQStringList tqcontains: "Split", "me", "up ! I'm bored, OK ?"
+     * TQStringList contains: "Split", "me", "up ! I'm bored, OK ?"
      * \endcode
      *
      * @param sep is the regular expression to use to delimit s.
diff --git a/kdecore/ksycoca.cpp b/kdecore/ksycoca.cpp
index 2977d609d..fd4d9aa95 100644
--- a/kdecore/ksycoca.cpp
+++ b/kdecore/ksycoca.cpp
@@ -76,7 +76,7 @@ public:
     TQString language;
     bool readError;
     bool autoRebuild;
-    TQ_UINT32 updateSig;
+    Q_UINT32 updateSig;
     TQStringList allResourceDirs;
 };
 
@@ -179,8 +179,8 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound )
         TQBuffer *buffer = new TQBuffer( TQByteArray() );
         buffer->open(IO_ReadWrite);
         m_str = new TQDataStream( buffer);
-        (*m_str) << (TQ_INT32) KSYCOCA_VERSION;
-        (*m_str) << (TQ_INT32) 0;
+        (*m_str) << (Q_INT32) KSYCOCA_VERSION;
+        (*m_str) << (Q_INT32) 0;
      }
      else
      {
@@ -262,7 +262,7 @@ void KSycoca::addFactory( KSycocaFactory *factory )
 
 bool KSycoca::isChanged(const char *type)
 {
-    return self()->d->changeList.tqcontains(type);
+    return self()->d->changeList.contains(type);
 }
 
 void KSycoca::notifyDatabaseChanged(const TQStringList &changeList)
@@ -285,7 +285,7 @@ TQDataStream * KSycoca::findEntry(int offset, KSycocaType &type)
       openDatabase();
    //kdDebug(7011) << TQString("KSycoca::_findEntry(offset=%1)").arg(offset,8,16) << endl;
    m_str->device()->at(offset);
-   TQ_INT32 aType;
+   Q_INT32 aType;
    (*m_str) >> aType;
    type = (KSycocaType) aType;
    //kdDebug(7011) << TQString("KSycoca::found type %1").arg(aType) << endl;
@@ -303,7 +303,7 @@ bool KSycoca::checkVersion(bool abortOnError)
       assert(m_str);
    }
    m_str->device()->at(0);
-   TQ_INT32 aVersion;
+   Q_INT32 aVersion;
    (*m_str) >> aVersion;
    if ( aVersion < KSYCOCA_VERSION )
    {
@@ -342,8 +342,8 @@ TQDataStream * KSycoca::findFactory(KSycocaFactoryId id)
      kdWarning(7011) << "Outdated database found" << endl;
      return 0L;
    }
-   TQ_INT32 aId;
-   TQ_INT32 aOffset;
+   Q_INT32 aId;
+   Q_INT32 aOffset;
    while(true)
    {
       (*m_str) >> aId;
@@ -368,8 +368,8 @@ TQString KSycoca::kfsstnd_prefixes()
 {
    if (bNoDatabase) return "";
    if (!checkVersion(false)) return "";
-   TQ_INT32 aId;
-   TQ_INT32 aOffset;
+   Q_INT32 aId;
+   Q_INT32 aOffset;
    // skip factories offsets
    while(true)
    {
@@ -389,14 +389,14 @@ TQString KSycoca::kfsstnd_prefixes()
    return prefixes;
 }
 
-TQ_UINT32 KSycoca::timeStamp()
+Q_UINT32 KSycoca::timeStamp()
 {
    if (!m_timeStamp)
       (void) kfsstnd_prefixes();
    return m_timeStamp;
 }
 
-TQ_UINT32 KSycoca::updateSignature()
+Q_UINT32 KSycoca::updateSignature()
 {
    if (!m_timeStamp)
       (void) kfsstnd_prefixes();
@@ -424,11 +424,11 @@ TQString KSycoca::determineRelativePath( const TQString & _fullpath, const char
   TQStringList::ConstIterator dirsit = dirs.begin();
   for ( ; dirsit != dirs.end() && sRelativeFilePath.isEmpty(); ++dirsit ) {
     // might need canonicalPath() ...
-    if ( _fullpath.tqfind( *dirsit ) == 0 ) // path is dirs + relativePath
+    if ( _fullpath.find( *dirsit ) == 0 ) // path is dirs + relativePath
       sRelativeFilePath = _fullpath.mid( (*dirsit).length() ); // skip appsdirs
   }
   if ( sRelativeFilePath.isEmpty() )
-    kdFatal(7011) << TQString("Couldn't tqfind %1 in any %2 dir !!!").arg( _fullpath ).arg( _resource) << endl;
+    kdFatal(7011) << TQString("Couldn't find %1 in any %2 dir !!!").arg( _fullpath ).arg( _resource) << endl;
   //else
     // debug code
     //kdDebug(7011) << sRelativeFilePath << endl;
@@ -469,7 +469,7 @@ bool KSycoca::readError()
 
 void KSycocaEntry::read( TQDataStream &s, TQString &str )
 {
-  TQ_UINT32 bytes;
+  Q_UINT32 bytes;
   s >> bytes;                          // read size of string
   if ( bytes > 8192 ) {                // null string or too big
       if (bytes != 0xffffffff)
@@ -479,7 +479,7 @@ void KSycocaEntry::read( TQDataStream &s, TQString &str )
   else if ( bytes > 0 ) {              // not empty
       int bt = bytes/2;
       str.setLength( bt );
-      TQChar* ch = (TQChar *) str.tqunicode();
+      TQChar* ch = (TQChar *) str.unicode();
       char t[8192];
       char *b = t;
       s.readRawBytes( b, bytes );
@@ -495,14 +495,14 @@ void KSycocaEntry::read( TQDataStream &s, TQString &str )
 void KSycocaEntry::read( TQDataStream &s, TQStringList &list )
 {
   list.clear();
-  TQ_UINT32 count;
+  Q_UINT32 count;
   s >> count;                          // read size of list
   if (count >= 1024)
   {
      KSycoca::flagError();
      return;
   }
-  for(TQ_UINT32 i = 0; i < count; i++)
+  for(Q_UINT32 i = 0; i < count; i++)
   {
      TQString str;
      read(s, str);
diff --git a/kdecore/ksycoca.h b/kdecore/ksycoca.h
index aebaef41d..8cbe6eb67 100644
--- a/kdecore/ksycoca.h
+++ b/kdecore/ksycoca.h
@@ -90,10 +90,10 @@ public:
    /**
     * @internal - returns timestamp of database
     *
-    * The database tqcontains all changes made _before_ this time and
+    * The database contains all changes made _before_ this time and
     * _might_ contain changes made after that.
     */
-   TQ_UINT32 timeStamp();
+   Q_UINT32 timeStamp();
 
    /**
     * @internal - returns update signature of database
@@ -104,7 +104,7 @@ public:
     * Touching this file causes the database to be recreated
     * from scratch.
     */
-   TQ_UINT32 updateSignature();
+   Q_UINT32 updateSignature();
 
    /**
     * @internal - returns all directories with information
@@ -172,7 +172,7 @@ protected:
    bool bNoDatabase;
    size_t m_sycoca_size;
    const char *m_sycoca_mmap;
-   TQ_UINT32 m_timeStamp;
+   Q_UINT32 m_timeStamp;
 
 public:
    static KSycoca *_self; // Internal use only.
diff --git a/kdecore/ksycocadict.cpp b/kdecore/ksycocadict.cpp
index f35eadd22..ce7529682 100644
--- a/kdecore/ksycocadict.cpp
+++ b/kdecore/ksycocadict.cpp
@@ -29,7 +29,7 @@ namespace
 {
 struct string_entry {
   string_entry(TQString _key, KSycocaEntry *_payload) 
-  { keyStr = _key; key = keyStr.tqunicode(); length = keyStr.length(); payload = _payload; hash = 0; }
+  { keyStr = _key; key = keyStr.unicode(); length = keyStr.length(); payload = _payload; hash = 0; }
   uint hash;
   int length;
   const TQChar *key;
@@ -59,7 +59,7 @@ KSycocaDict::KSycocaDict()
 KSycocaDict::KSycocaDict(TQDataStream *str, int offset)
   : d(0), mStr(str), mOffset(offset)
 {
-   TQ_UINT32 test1, test2;
+   Q_UINT32 test1, test2;
    str->device()->at(offset);
    (*str) >> test1 >> test2;
    if ((test1 > 0x000fffff) || (test2 > 1024))
@@ -123,17 +123,17 @@ KSycocaDict::find_string(const TQString &key )
    }
 
    if (mHashTableSize == 0)
-      return 0; // Unlikely to tqfind anything :-]
+      return 0; // Unlikely to find anything :-]
 
    // Read hash-table data 
    uint hash = hashKey(key) % mHashTableSize;
    //kdDebug(7011) << TQString("hash is %1").arg(hash) << endl;
 
-   uint off = mOffset+sizeof(TQ_INT32)*hash;
+   uint off = mOffset+sizeof(Q_INT32)*hash;
    //kdDebug(7011) << TQString("off is %1").arg(off,8,16) << endl;
    mStr->device()->at( off );
 
-   TQ_INT32 offset;
+   Q_INT32 offset;
    (*mStr) >> offset;
 
    //kdDebug(7011) << TQString("offset is %1").arg(offset,8,16) << endl;
@@ -411,13 +411,13 @@ KSycocaDict::save(TQDataStream &str)
       //kdDebug(7011) << TQString("Writing hash table (pass #%1)").arg(pass) << endl;
       for(uint i=0; i < mHashTableSize; i++)
       {
-         TQ_INT32 tmpid;
+         Q_INT32 tmpid;
          if (!hashTable[i].entry)
-            tmpid = (TQ_INT32) 0;
+            tmpid = (Q_INT32) 0;
          else if (!hashTable[i].duplicates)
-            tmpid = (TQ_INT32) hashTable[i].entry->payload->offset(); // Positive ID
+            tmpid = (Q_INT32) hashTable[i].entry->payload->offset(); // Positive ID
          else
-            tmpid = (TQ_INT32) -hashTable[i].duplicate_offset; // Negative ID
+            tmpid = (Q_INT32) -hashTable[i].duplicate_offset; // Negative ID
          str << tmpid;
          //kdDebug(7011) << TQString("Hash table : %1").arg(tmpid,8,16) << endl;
       }
@@ -435,10 +435,10 @@ KSycocaDict::save(TQDataStream &str)
 */
             for(string_entry *dup = dups->first(); dup; dup=dups->next())
             {
-               str << (TQ_INT32) dup->payload->offset(); // Positive ID
+               str << (Q_INT32) dup->payload->offset(); // Positive ID
                str << dup->keyStr;                      // Key (TQString)
             }
-            str << (TQ_INT32) 0;               // End of list marker (0)
+            str << (Q_INT32) 0;               // End of list marker (0)
          }
       }
       //kdDebug(7011) << TQString("End of Dict, offset = %1").arg(str.device()->at(),8,16) << endl;
diff --git a/kdecore/ksycocadict.h b/kdecore/ksycocadict.h
index b83ed42db..94a2bc646 100644
--- a/kdecore/ksycocadict.h
+++ b/kdecore/ksycocadict.h
@@ -92,7 +92,7 @@ public:
     * Save the dictionary to the stream
     * A reasonable fast hash algorithm will be created.
     *
-    * Typically this will tqfind 90% of the entries directly.
+    * Typically this will find 90% of the entries directly.
     * Average hash table size: nrOfItems * 20 bytes.
     * Average duplicate list size: nrOfItms * avgKeyLength / 5.
     *
@@ -111,13 +111,13 @@ public:
    void save(TQDataStream &str);
 
 protected:
-   TQ_UINT32 hashKey( const TQString &);
+   Q_UINT32 hashKey( const TQString &);
 private:
    KSycocaDictStringList *d;
    TQDataStream *mStr;
-   TQ_INT32 mOffset;
-   TQ_UINT32 mHashTableSize;
-   TQValueList<TQ_INT32> mHashList;
+   Q_INT32 mOffset;
+   Q_UINT32 mHashTableSize;
+   TQValueList<Q_INT32> mHashList;
 };
 
 #endif
diff --git a/kdecore/ksycocaentry.h b/kdecore/ksycocaentry.h
index eca4a9bea..5f6f11bbd 100644
--- a/kdecore/ksycocaentry.h
+++ b/kdecore/ksycocaentry.h
@@ -102,7 +102,7 @@ public: // KDoc seems to barf on those typedefs and generates no docs after them
    virtual void save(TQDataStream &s)
      {
        mOffset = s.device()->at(); // store position in member variable
-       s << (TQ_INT32) sycocaType() << mPath;
+       s << (Q_INT32) sycocaType() << mPath;
      }
 
    /**
diff --git a/kdecore/ksycocafactory.cpp b/kdecore/ksycocafactory.cpp
index c224ebe79..e5816dc23 100644
--- a/kdecore/ksycocafactory.cpp
+++ b/kdecore/ksycocafactory.cpp
@@ -38,7 +38,7 @@ KSycocaFactory::KSycocaFactory(KSycocaFactoryId factory_id)
       if (m_str) // Can be 0 in case of errors
       {
           // Read position of index tables....
-          TQ_INT32 i;
+          Q_INT32 i;
           (*m_str) >> i;
           m_sycocaDictOffset = i;
           (*m_str) >> i;
@@ -79,9 +79,9 @@ KSycocaFactory::saveHeader(TQDataStream &str)
 {
    // Write header 
    str.device()->at(mOffset);
-   str << (TQ_INT32) m_sycocaDictOffset;
-   str << (TQ_INT32) m_beginEntryOffset;
-   str << (TQ_INT32) m_endEntryOffset;
+   str << (Q_INT32) m_sycocaDictOffset;
+   str << (Q_INT32) m_beginEntryOffset;
+   str << (Q_INT32) m_endEntryOffset;
 }
 
 void
@@ -114,13 +114,13 @@ KSycocaFactory::save(TQDataStream &str)
 
    // Write indices...
    // Linear index
-   str << (TQ_INT32) entryCount;
+   str << (Q_INT32) entryCount;
    for(TQDictIterator<KSycocaEntry::Ptr> it ( *m_entryDict ); 
        it.current(); 
        ++it)
    {
       KSycocaEntry *entry = (*it.current());
-      str << (TQ_INT32) entry->offset(); 
+      str << (Q_INT32) entry->offset(); 
    }
 
    // Dictionary index
@@ -170,7 +170,7 @@ KSycocaEntry::List KSycocaFactory::allEntries()
    // Assume we're NOT building a database
 
    m_str->device()->at(m_endEntryOffset);
-   TQ_INT32 entryCount;
+   Q_INT32 entryCount;
    (*m_str) >> entryCount;
    
    if (entryCount > 8192)
@@ -179,7 +179,7 @@ KSycocaEntry::List KSycocaFactory::allEntries()
       return list;
    }
 
-   TQ_INT32 *offsetList = new TQ_INT32[entryCount];
+   Q_INT32 *offsetList = new Q_INT32[entryCount];
    for(int i = 0; i < entryCount; i++)
    {
       (*m_str) >> offsetList[i];
diff --git a/kdecore/ktempdir.cpp b/kdecore/ktempdir.cpp
index 9428266c9..70a442730 100644
--- a/kdecore/ktempdir.cpp
+++ b/kdecore/ktempdir.cpp
@@ -177,7 +177,7 @@ rmtree(const TQCString& name)
              *
              * Potential problems:
              * - opendir/readdir/closedir is not re-entrant
-             * - unlink and rmdir tqinvalidates a opendir/readdir/closedir
+             * - unlink and rmdir invalidates a opendir/readdir/closedir
              * - limited number of file descriptors for opendir/readdir/closedir
              */
             if ( ::closedir( dp ) )
diff --git a/kdecore/ktempdir.h b/kdecore/ktempdir.h
index b2f3e3431..491a14c4c 100644
--- a/kdecore/ktempdir.h
+++ b/kdecore/ktempdir.h
@@ -124,7 +124,7 @@ public:
     * @brief Remove a directory and all its contents
     *
     * Remove recursively a directory, even if it is not empty
-    * or tqcontains other directories.
+    * or contains other directories.
     *
     * However the function works too when the @p path given
     * is a non-directory file. In that case it simply remove that file.
diff --git a/kdecore/ktempfile.cpp b/kdecore/ktempfile.cpp
index b2e3346b0..c04f725fe 100644
--- a/kdecore/ktempfile.cpp
+++ b/kdecore/ktempfile.cpp
@@ -107,7 +107,7 @@ KTempFile::create(const TQString &filePrefix, const TQString &fileExtension,
        return false;
    }
 
-   // got a file descriptor. nme tqcontains the name
+   // got a file descriptor. nme contains the name
    mTmpName = TQFile::decodeName(nme);
    mode_t tmp = 0;
    mode_t umsk = umask(tmp);
diff --git a/kdecore/ktimezones.cpp b/kdecore/ktimezones.cpp
index 2ec4c7e64..5ebf9bd4a 100644
--- a/kdecore/ktimezones.cpp
+++ b/kdecore/ktimezones.cpp
@@ -285,12 +285,12 @@ int KTimezone::offset(Qt::TimeSpec basisSpec) const
     char *originalZone = ::getenv("TZ");
 
     // Get the time in the current timezone.
-    TQDateTime basisTime = TQDateTime::tqcurrentDateTime(basisSpec);
+    TQDateTime basisTime = TQDateTime::currentDateTime(basisSpec);
 
-    // Set the timezone and tqfind out what time it is there compared to the basis.
+    // Set the timezone and find out what time it is there compared to the basis.
     ::setenv("TZ", m_name.utf8(), 1);
     tzset();
-    TQDateTime remoteTime = TQDateTime::tqcurrentDateTime(Qt::LocalTime);
+    TQDateTime remoteTime = TQDateTime::currentDateTime(Qt::LocalTime);
     int offset = remoteTime.secsTo(basisTime);
 
     // Now restore things
@@ -308,11 +308,11 @@ int KTimezone::offset(Qt::TimeSpec basisSpec) const
 
 int KTimezone::offset(const TQDateTime &dateTime) const
 {
-    OffsetFind tqfinder(dateTime.toTime_t());
+    OffsetFind finder(dateTime.toTime_t());
     int result = 0;
-    if (parse(tqfinder))
+    if (parse(finder))
     {
-        result = tqfinder.offset();
+        result = finder.offset();
     }
     return result;
 }
@@ -595,7 +595,7 @@ const KTimezone *KTimezones::local()
         return local;
 
     // None of the deterministic stuff above has worked: try a heuristic. We
-    // try to tqfind a pair of matching timezone abbreviations...that way, we'll
+    // try to find a pair of matching timezone abbreviations...that way, we'll
     // likely return a value in the user's own country.
     if (!m_zoneinfoDir.isEmpty())
     {
@@ -623,7 +623,7 @@ const KTimezone *KTimezones::zone(const TQString &name)
 {
     if (name.isEmpty())
         return m_UTC;
-    ZoneMap::ConstIterator it = m_zones->tqfind(name);
+    ZoneMap::ConstIterator it = m_zones->find(name);
     if (it != m_zones->end())
         return it.data();
 
@@ -695,28 +695,28 @@ bool KTimezoneSource::parse(const TQString &zone, KTimezoneDetails &dataReceiver
     }
 
     // Structures that represent the zoneinfo file.
-    TQ_UINT8 T, z, i_, f_;
+    Q_UINT8 T, z, i_, f_;
     struct
     {
-        TQ_UINT32 ttisgmtcnt;
-        TQ_UINT32 ttisstdcnt;
-        TQ_UINT32 leapcnt;
-        TQ_UINT32 timecnt;
-        TQ_UINT32 typecnt;
-        TQ_UINT32 charcnt;
+        Q_UINT32 ttisgmtcnt;
+        Q_UINT32 ttisstdcnt;
+        Q_UINT32 leapcnt;
+        Q_UINT32 timecnt;
+        Q_UINT32 typecnt;
+        Q_UINT32 charcnt;
     } tzh;
-    TQ_UINT32 transitionTime;
-    TQ_UINT8 localTimeIndex;
+    Q_UINT32 transitionTime;
+    Q_UINT8 localTimeIndex;
     struct
     {
-        TQ_INT32 gmtoff;
-        TQ_INT8 isdst;
-        TQ_UINT8 abbrind;
+        Q_INT32 gmtoff;
+        Q_INT8 isdst;
+        Q_UINT8 abbrind;
     } tt;
-    TQ_UINT32 leapTime;
-    TQ_UINT32 leapSeconds;
-    TQ_UINT8 isStandard;
-    TQ_UINT8 isUTC;
+    Q_UINT32 leapTime;
+    Q_UINT32 leapSeconds;
+    Q_UINT8 isStandard;
+    Q_UINT8 isUTC;
 
     TQDataStream str(&f);
     str >> T >> z >> i_ >> f_;
diff --git a/kdecore/ktimezones.h b/kdecore/ktimezones.h
index d07be53bb..3055f202f 100644
--- a/kdecore/ktimezones.h
+++ b/kdecore/ktimezones.h
@@ -33,7 +33,7 @@ class KTimezonePrivate;
 class KTimezonesPrivate;
 
 /**
- * The KTimezoneSource class tqcontains information source-dependent functions
+ * The KTimezoneSource class contains information source-dependent functions
  * related to a timezone. Create subclasses to implement custom sources of
  * timezone information.
  *
@@ -73,7 +73,7 @@ private:
 };
 
 /**
- * The KTimezone class tqcontains core functions related to a timezone. Instances
+ * The KTimezone class contains core functions related to a timezone. Instances
  * are created in the context of a {@link KTimezoneSource } which provides
  * extended functionality via {@link KTimezoneDetails }.
  *
@@ -201,7 +201,7 @@ private:
 };
 
 /**
- * The KTimezoneDetails class tqcontains extended functions related to a
+ * The KTimezoneDetails class contains extended functions related to a
  * timezone.
  *
  * The parser must be customised by overriding the given virtual callbacks:
diff --git a/kdecore/kurl.cpp b/kdecore/kurl.cpp
index 00ae675ea..cb396c3a5 100644
--- a/kdecore/kurl.cpp
+++ b/kdecore/kurl.cpp
@@ -172,14 +172,14 @@ static TQString lazy_encode( const TQString& segment, bool encodeAt=true )
 
   for ( int i = 0; i < old_length; i++ )
   {
-    unsigned int character = segment[i].tqunicode(); // Don't use latin1()
+    unsigned int character = segment[i].unicode(); // Don't use latin1()
                                                    // It returns 0 for non-latin1 values
     // Small set of really ambiguous chars
     if ((character < 32) ||  // Low ASCII
         ((character == '%') && // The escape character itself
            (i+2 < old_length) && // But only if part of a valid escape sequence!
-          (hex2int(segment[i+1].tqunicode())!= -1) &&
-          (hex2int(segment[i+2].tqunicode())!= -1)) ||
+          (hex2int(segment[i+1].unicode())!= -1) &&
+          (hex2int(segment[i+2].unicode())!= -1)) ||
         (character == '?') || // Start of query delimiter
         ((character == '@') && encodeAt) || // Username delimiter
         (character == '#') || // Start of reference delimiter
@@ -250,7 +250,7 @@ static void decode( const TQString& segment, TQString &decoded, TQString &encode
     {
       int a = i+1 < old_length ? hex2int( csegment[i] ) : -1;
       int b = i+1 < old_length ? hex2int( csegment[i+1] ) : -1;
-      if ((a == -1) || (b == -1)) // Only tqreplace if sequence is valid
+      if ((a == -1) || (b == -1)) // Only replace if sequence is valid
       {
          // Contains stray %, make sure to re-encode!
          bReencode = true;
@@ -291,12 +291,12 @@ static void decode( const TQString& segment, TQString &decoded, TQString &encode
   {
      decoded = textCodec->toUnicode( new_segment );
      if ( isRawURI ) {
-        int length = tqstrlen( new_segment );
+        int length = qstrlen( new_segment );
         while ( length < new_length ) {
             decoded += TQChar::null;
             length += 1;
             decoded += textCodec->toUnicode( new_segment + length );
-            length += tqstrlen( new_segment + length );
+            length += qstrlen( new_segment + length );
         }
      }
 
@@ -338,15 +338,15 @@ static TQString cleanpath(const TQString &_path, bool cleanDirSeparator, bool de
 #else
      TQString encodedDot("%2e");
 #endif
-     if (path.tqfind(encodedDot, 0, false) != -1)
+     if (path.find(encodedDot, 0, false) != -1)
      {
 #ifndef KDE_QT_ONLY
         static const TQString &encodedDOT = KGlobal::staticQString("%2E"); // Uppercase!
 #else
         TQString encodedDOT("%2E");
 #endif
-        path.tqreplace(encodedDot, ".");
-        path.tqreplace(encodedDOT, ".");
+        path.replace(encodedDot, ".");
+        path.replace(encodedDOT, ".");
         len = path.length();
      }
   }
@@ -365,7 +365,7 @@ static TQString cleanpath(const TQString &_path, bool cleanDirSeparator, bool de
 
   cdUp = 0;
   pos = orig_pos = len;
-  while ( pos && (pos = path.tqfindRev('/',--pos)) != -1 )
+  while ( pos && (pos = path.findRev('/',--pos)) != -1 )
   {
     len = orig_pos - pos - 1;
     if ( len == 2 && path[pos+1] == '.' && path[pos+2] == '.' )
@@ -404,7 +404,7 @@ bool KURL::isRelativeURL(const TQString &_url)
 {
   int len = _url.length();
   if (!len) return true; // Very short relative URL.
-  const TQChar *str = _url.tqunicode();
+  const TQChar *str = _url.unicode();
 
   // Absolute URL must start with alpha-character
   if (!isalpha(str[0].latin1()))
@@ -471,13 +471,13 @@ KURL::KURL( const TQString &url, int encoding_hint )
 KURL::KURL( const char * url, int encoding_hint )
 {
   reset();
-  parse( TQString::tqfromLatin1(url), encoding_hint );
+  parse( TQString::fromLatin1(url), encoding_hint );
 }
 
 KURL::KURL( const TQCString& url, int encoding_hint )
 {
   reset();
-  parse( TQString::tqfromLatin1(url), encoding_hint );
+  parse( TQString::fromLatin1(url), encoding_hint );
 }
 
 KURL::KURL( const KURL& _u )
@@ -493,13 +493,13 @@ TQDataStream & operator<< (TQDataStream & s, const KURL & a)
 
     s << a.m_strProtocol << a.m_strUser << a.m_strPass << a.m_strHost
       << a.m_strPath << a.m_strPath_encoded << QueryForWire << a.m_strRef_encoded
-      << TQ_INT8(a.m_bIsMalformed ? 1 : 0) << a.m_iPort;
+      << Q_INT8(a.m_bIsMalformed ? 1 : 0) << a.m_iPort;
     return s;
 }
 
 TQDataStream & operator>> (TQDataStream & s, KURL & a)
 {
-    TQ_INT8 malf;
+    Q_INT8 malf;
     TQString QueryFromWire;
     s >> a.m_strProtocol >> a.m_strUser >> a.m_strPass >> a.m_strHost
       >> a.m_strPath >> a.m_strPath_encoded >> QueryFromWire >> a.m_strRef_encoded
@@ -542,11 +542,11 @@ KURL::KURL( const KURL& _u, const TQString& _rel_url, int encoding_hint )
   TQString rUrl = _rel_url;
   int len = _u.m_strProtocol.length();
   if ( !_u.m_strHost.isEmpty() && !rUrl.isEmpty() &&
-       rUrl.tqfind( _u.m_strProtocol, 0, false ) == 0 &&
+       rUrl.find( _u.m_strProtocol, 0, false ) == 0 &&
        rUrl[len] == ':' && (rUrl[len+1] != '/' ||
        (rUrl[len+1] == '/' && rUrl[len+2] != '/')) )
   {
-    rUrl.remove( 0, rUrl.tqfind( ':' ) + 1 );
+    rUrl.remove( 0, rUrl.find( ':' ) + 1 );
   }
 
   if ( rUrl.isEmpty() )
@@ -579,13 +579,13 @@ KURL::KURL( const KURL& _u, const TQString& _rel_url, int encoding_hint )
     }
     else if ( rUrl[0] != '?' )
     {
-       int pos = m_strPath.tqfindRev( '/' );
+       int pos = m_strPath.findRev( '/' );
        if (pos >= 0)
           m_strPath.truncate(pos);
        m_strPath += '/';
        if (!m_strPath_encoded.isEmpty())
        {
-          pos = m_strPath_encoded.tqfindRev( '/' );
+          pos = m_strPath_encoded.findRev( '/' );
           if (pos >= 0)
              m_strPath_encoded.truncate(pos);
           m_strPath_encoded += '/';
@@ -643,7 +643,7 @@ void KURL::parse( const TQString& _url, int encoding_hint )
 	return;
     }
 
-    const TQChar* buf = _url.tqunicode();
+    const TQChar* buf = _url.unicode();
     const TQChar* orig = buf;
     uint len = _url.length();
     uint pos = 0;
@@ -707,7 +707,7 @@ NodeErr:
 void KURL::parseRawURI( const TQString& _url, int encoding_hint )
 {
     uint len = _url.length();
-    const TQChar* buf = _url.tqunicode();
+    const TQChar* buf = _url.unicode();
 
     uint pos = 0;
 
@@ -762,7 +762,7 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
   bool badHostName = false;
   int start = 0;
   uint len = _url.length();
-  const TQChar* buf = _url.tqunicode();
+  const TQChar* buf = _url.unicode();
 
   TQChar delim;
   TQString tmp;
@@ -1040,7 +1040,7 @@ KURL& KURL::operator=( const TQString& _url )
 KURL& KURL::operator=( const char * _url )
 {
   reset();
-  parse( TQString::tqfromLatin1(_url) );
+  parse( TQString::fromLatin1(_url) );
 
   return *this;
 }
@@ -1231,7 +1231,7 @@ void KURL::setFileName( const TQString& _txt )
     path = "/";
   else
   {
-    int lastSlash = path.tqfindRev( '/' );
+    int lastSlash = path.findRev( '/' );
     if ( lastSlash == -1)
     {
       // The first character is not a '/' ???
@@ -1347,7 +1347,7 @@ void KURL::setEncodedPath( const TQString& _txt, int encoding_hint )
 
 void KURL::setEncodedPathAndQuery( const TQString& _txt, int encoding_hint )
 {
-  int pos = _txt.tqfind( '?' );
+  int pos = _txt.find( '?' );
   if ( pos == -1 )
   {
     setEncodedPath(_txt, encoding_hint);
@@ -1490,7 +1490,7 @@ TQString KURL::url( int _trailing, int encoding_hint ) const
     }
     if ( m_iUriMode == URL )
     {
-      bool IPv6 = (m_strHost.tqfind(':') != -1);
+      bool IPv6 = (m_strHost.find(':') != -1);
       if (IPv6)
         u += '[' + m_strHost + ']';
       else
@@ -1546,7 +1546,7 @@ TQString KURL::prettyURL( int _trailing ) const
     }
     if ( m_iUriMode == URL )
     {
-    bool IPv6 = (m_strHost.tqfind(':') != -1);
+    bool IPv6 = (m_strHost.find(':') != -1);
     if (IPv6)
     {
        u += '[' + m_strHost + ']';
@@ -1704,13 +1704,13 @@ TQString KURL::fileName( bool _strip_trailing_slash ) const
      // This is hairy, we need the last unencoded slash.
      // Count in the encoded string how many encoded slashes follow the last
      // unencoded one.
-     int i = m_strPath_encoded.tqfindRev( (QChar)'/', len - 1 );
+     int i = m_strPath_encoded.findRev( (QChar)'/', len - 1 );
      TQString fileName_encoded = m_strPath_encoded.mid(i+1);
-     n += fileName_encoded.tqcontains("%2f", false);
+     n += fileName_encoded.contains("%2f", false);
   }
   int i = len;
   do {
-    i = path.tqfindRev( (QChar)'/', i - 1 );
+    i = path.findRev( (QChar)'/', i - 1 );
   }
   while (--n && (i > 0));
 
@@ -1773,7 +1773,7 @@ TQString KURL::directory( bool _strip_trailing_slash_from_result,
   if ( result.isEmpty() || result == "/" )
     return result;
 
-  int i = result.tqfindRev( "/" );
+  int i = result.findRev( "/" );
   // If ( i == -1 ) => the first character is not a '/'
   // So it's some URL like file:blah.tgz, with no path
   if ( i == -1 )
@@ -2143,17 +2143,17 @@ TQMap< TQString, TQString > KURL::queryItems( int options, int encoding_hint ) c
   TQMap< TQString, TQString > result;
   TQStringList items = TQStringList::split( '&', m_strQuery_encoded );
   for ( TQStringList::const_iterator it = items.begin() ; it != items.end() ; ++it ) {
-    int equal_pos = (*it).tqfind( '=' );
+    int equal_pos = (*it).find( '=' );
     if ( equal_pos > 0 ) { // = is not the first char...
       TQString name = (*it).left( equal_pos );
       if ( options & CaseInsensitiveKeys )
 	name = name.lower();
       TQString value = (*it).mid( equal_pos + 1 );
       if ( value.isEmpty() )
-	result.insert( name, TQString::tqfromLatin1("") );
+	result.insert( name, TQString::fromLatin1("") );
       else {
 	// ### why is decoding name not necessary?
-	value.tqreplace( '+', ' ' ); // + in queries means space
+	value.replace( '+', ' ' ); // + in queries means space
 	result.insert( name, decode_string( value, encoding_hint ) );
       }
     } else if ( equal_pos < 0 ) { // no =
@@ -2187,11 +2187,11 @@ TQString KURL::queryItem( const TQString& _item, int encoding_hint ) const
       if ( (*it).length() > _len )
       {
         TQString str = (*it).mid( _len );
-        str.tqreplace( '+', ' ' ); // + in queries means space.
+        str.replace( '+', ' ' ); // + in queries means space.
         return decode_string( str, encoding_hint );
       }
       else // empty value
-        return TQString::tqfromLatin1("");
+        return TQString::fromLatin1("");
     }
   }
 
diff --git a/kdecore/kurl.h b/kdecore/kurl.h
index 8546d3394..86c7aa169 100644
--- a/kdecore/kurl.h
+++ b/kdecore/kurl.h
@@ -171,7 +171,7 @@ public:
      */
     URL,
     /**
-     * Mailto URI. path() tqcontains an email address which should have its
+     * Mailto URI. path() contains an email address which should have its
      * domain part processed as a DNS name. The email address is accessible
      * through the path() method.
      */
@@ -179,7 +179,7 @@ public:
   };
 
   /**
-   * KURL::List is a TQValueList that tqcontains KURLs with a few
+   * KURL::List is a TQValueList that contains KURLs with a few
    * convenience methods.
    * @see KURL
    * @see QValueList
@@ -192,13 +192,13 @@ public:
      */
       List() { }
       /**
-       * @brief Creates a list that tqcontains the given URL as only item
+       * @brief Creates a list that contains the given URL as only item
        *
        * @param url the URL to add
        */
       List(const KURL &url);
       /**
-       * @brief Creates a list that tqcontains the URLs from the given list
+       * @brief Creates a list that contains the URLs from the given list
        *
        * This equivalent to iterating over the input list and using each item
        * as the argument to KURL's constructor, i.e. the resulting list will
@@ -281,7 +281,7 @@ public:
    *        See TQTextCodec::mibEnum()
    *
    * @see fromPathOrURL()
-   * @see TQString::tqfromLatin1()
+   * @see TQString::fromLatin1()
    */
   KURL( const char * url, int encoding_hint = 0 );
   /**
@@ -307,7 +307,7 @@ public:
    *        See TQTextCodec::mibEnum()
    *
    * @see fromPathOrURL()
-   * @see TQString::tqfromLatin1()
+   * @see TQString::fromLatin1()
    */
   KURL( const TQCString& url, int encoding_hint = 0 );
 
@@ -838,7 +838,7 @@ public:
    * @brief Adds file encoding information
    *
    * Adds encoding information to the URL by adding a @c "charset" parameter.
-   * If there is already a charset parameter, it will be tqreplaced.
+   * If there is already a charset parameter, it will be replaced.
    *
    * @param encoding the encoding to add or @c TQString::null to remove the
    *                 encoding
@@ -957,7 +957,7 @@ public:
   /**
    * @brief Adds an additional query item
    *
-   * To tqreplace an existing query item, the item should first be
+   * To replace an existing query item, the item should first be
    * removed with removeQueryItem()
    *
    * @param _item name of item to add
@@ -1586,7 +1586,7 @@ public:
    *
    * Convenience function.
    *
-   * Convert tqunicoded string to local encoding and use %%-style
+   * Convert unicoded string to local encoding and use %%-style
    * encoding for all common delimiters / non-ascii characters.
    *
    * @param str the string to encode (can be @c TQString::null)
@@ -1605,7 +1605,7 @@ public:
    *
    * Convenience function.
    *
-   * Convert tqunicoded string to local encoding and use %%-style
+   * Convert unicoded string to local encoding and use %%-style
    * encoding for all common delimiters and non-ascii characters
    * as well as the slash @c '/'.
    *
@@ -1623,7 +1623,7 @@ public:
    *
    * Convenience function.
    *
-   * Decode %-style encoding and convert from local encoding to tqunicode.
+   * Decode %-style encoding and convert from local encoding to unicode.
    *
    * Reverse of encode_string()
    *
diff --git a/kdecore/kurldrag.cpp b/kdecore/kurldrag.cpp
index 089d2fadb..7147f7a74 100644
--- a/kdecore/kurldrag.cpp
+++ b/kdecore/kurldrag.cpp
@@ -87,7 +87,7 @@ KURLDrag * KURLDrag::newDrag( const KURL::List &urls, const TQMap<TQString, TQSt
 bool KURLDrag::decode( const TQMimeSource *e, KURL::List &uris )
 {
     if ( e->provides( "application/x-kde-urilist" ) ) {
-        TQByteArray payload = e->tqencodedData( "application/x-kde-urilist" );
+        TQByteArray payload = e->encodedData( "application/x-kde-urilist" );
         if ( payload.size() ) {
             uint c=0;
             const char* d = payload.data();
@@ -128,7 +128,7 @@ bool KURLDrag::decode( const TQMimeSource *e, KURL::List &uris, TQMap<TQString,T
 {
     if ( decode( e, uris ) ) // first decode the URLs (see above)
     {
-        TQByteArray ba = e->tqencodedData( "application/x-kio-metadata" );
+        TQByteArray ba = e->encodedData( "application/x-kio-metadata" );
         if ( ba.size() )
         {
             TQString s = ba.data();
@@ -140,7 +140,7 @@ bool KURLDrag::decode( const TQMimeSource *e, KURL::List &uris, TQMap<TQString,T
                 if ( readingKey )
                     key = *it;
                 else
-                    metaData.tqreplace( key, *it );
+                    metaData.replace( key, *it );
                 readingKey = !readingKey;
             }
             Q_ASSERT( readingKey ); // an odd number of items would be, well, odd ;-)
@@ -187,12 +187,12 @@ const char * KURLDrag::format( int i ) const
     else return 0;
 }
 
-TQByteArray KURLDrag::tqencodedData( const char* mime ) const
+TQByteArray KURLDrag::encodedData( const char* mime ) const
 {
     TQByteArray a;
     TQCString mimetype( mime );
     if ( mimetype == "text/uri-list" )
-        return TQUriDrag::tqencodedData( mime );
+        return TQUriDrag::encodedData( mime );
     else if ( mimetype == "text/plain" )
     {
 	TQStringList uris;
diff --git a/kdecore/kurldrag.h b/kdecore/kurldrag.h
index 4cf374314..eb1f9522a 100644
--- a/kdecore/kurldrag.h
+++ b/kdecore/kurldrag.h
@@ -30,7 +30,7 @@ class KURLDragPrivate;
 /**
  * This class is to be used instead of TQUriDrag when using KURL.
  * The reason is: TQUriDrag (and the XDND/W3C standards) expect URLs to
- * be encoded in UTF-8 (tqunicode), but KURL uses the current locale
+ * be encoded in UTF-8 (unicode), but KURL uses the current locale
  * by default.
  * The other reasons for using this class are:
  * @li it exports text/plain (for dropping/pasting into lineedits, mails etc.)
@@ -52,7 +52,7 @@ public:
    * @param urls the list of URLs
    * @param dragSource the parent of the TQObject. Should be set when doing drag-n-drop,
    * but should be 0 when copying to the clipboard
-   * @param name the name of the TQObject
+   * @param name the name of the QObject
    */
   KURLDrag( const KURL::List &urls, TQWidget* dragSource = 0, const char * name = 0 );
   /**
@@ -62,7 +62,7 @@ public:
    * @param metaData a map containing meta data
    * @param dragSource the parent of the TQObject. Should be set when doing drag-n-drop,
    * but should be 0 when copying to the clipboard
-   * @param name the name of the TQObject
+   * @param name the name of the QObject
    * @see metaData()
    */
   KURLDrag( const KURL::List &urls, const TQMap<TQString, TQString>& metaData,
@@ -145,7 +145,7 @@ public:
   /// @reimp
   virtual const char * format( int i ) const;
   /// @reimp
-  virtual TQByteArray tqencodedData( const char* mime ) const;
+  virtual TQByteArray encodedData( const char* mime ) const;
 
 protected:
   /**
diff --git a/kdecore/kuser.cpp b/kdecore/kuser.cpp
index ca74700fe..3fffddf4f 100644
--- a/kdecore/kuser.cpp
+++ b/kdecore/kuser.cpp
@@ -219,7 +219,7 @@ TQValueList<KUserGroup> KUser::groups() const {
   TQValueList<KUserGroup>::const_iterator it;
   for ( it = allGroups.begin(); it != allGroups.end(); ++it ) {
     TQValueList<KUser> users = (*it).users();
-    if ( users.tqfind( *this ) != users.end()) {
+    if ( users.find( *this ) != users.end()) {
        result.append(*it);
     }
   }
@@ -232,7 +232,7 @@ TQStringList KUser::groupNames() const {
   TQValueList<KUserGroup>::const_iterator it;
   for ( it = allGroups.begin(); it != allGroups.end(); ++it ) {
     TQValueList<KUser> users = (*it).users();
-    if ( users.tqfind( *this ) != users.end()) {
+    if ( users.find( *this ) != users.end()) {
        result.append((*it).name());
     }
   }
diff --git a/kdecore/kuser.h b/kdecore/kuser.h
index be5834f09..5c43b6b69 100644
--- a/kdecore/kuser.h
+++ b/kdecore/kuser.h
@@ -52,7 +52,7 @@ public:
   };
 
   /**
-   * Creates an object that tqcontains information about the current user.
+   * Creates an object that contains information about the current user.
    * (as returned by getuid(2) or geteuid(2), taking $LOGNAME/$USER into
    * account).
    * @param mode if #UseEffectiveUID is passed the effective
@@ -76,7 +76,7 @@ public:
   KUser(long uid);
 
   /**
-   * Creates an object that tqcontains information about the user with the given
+   * Creates an object that contains information about the user with the given
    * name. If the user does not exist isValid() will return false.
    *
    * @param name the name of the user
@@ -85,7 +85,7 @@ public:
   KUser(const TQString& name);
 
   /**
-   * Creates an object that tqcontains information about the user with the given
+   * Creates an object that contains information about the user with the given
    * name. If the user does not exist isValid() will return false.
    *
    * @param name the name of the user
diff --git a/kdecore/kvmallocator.cpp b/kdecore/kvmallocator.cpp
index 031dd4304..996d55791 100644
--- a/kdecore/kvmallocator.cpp
+++ b/kdecore/kvmallocator.cpp
@@ -106,7 +106,7 @@ KVMAllocator::allocate(size_t _size)
          free_block.start += block.size;
          if (!free_block.size)
             d->free_blocks.remove(it);
-         it = d->used_blocks.tqreplace(block.start, block);
+         it = d->used_blocks.replace(block.start, block);
          return &(it.data());
       }
       ++it;
@@ -120,7 +120,7 @@ KVMAllocator::allocate(size_t _size)
    block.size = (_size + KVM_ALIGN) & ~KVM_ALIGN;
    block.mmap = 0;
    kdDebug(180)<<"VM alloc: using new block "<<(long)block.start<<" size ="<<(long)block.size<<" request = "<<_size<< endl;
-   it = d->used_blocks.tqreplace(block.start, block);
+   it = d->used_blocks.replace(block.start, block);
    d->max_length += block.size;
    return &(it.data());
 }
@@ -138,14 +138,14 @@ KVMAllocator::free(Block *block_p)
       return;
    }
    TQMap<off_t,KVMAllocator::Block>::iterator it;
-   it = d->used_blocks.tqfind(block.start);
+   it = d->used_blocks.find(block.start);
    if (it == d->used_blocks.end())
    {
       kdDebug(180)<<"VM free: Block "<<(long)block.start<<" is not allocated."<<endl;
       return;
    }
    d->used_blocks.remove(it);
-   it = d->free_blocks.tqreplace(block.start, block);
+   it = d->free_blocks.replace(block.start, block);
    TQMap<off_t,KVMAllocator::Block>::iterator before = it;
    --before;
    if (before != d->free_blocks.end())
diff --git a/kdecore/kwin.cpp b/kdecore/kwin.cpp
index 99710e810..bc9a9761b 100644
--- a/kdecore/kwin.cpp
+++ b/kdecore/kwin.cpp
@@ -108,7 +108,7 @@ static void kwin_net_create_atoms() {
 #ifdef Q_WS_X11
 static void sendClientMessageToRoot(Window w, Atom a, long x, long y = 0, long z = 0 ){
   XEvent ev;
-  long tqmask;
+  long mask;
 
   memset(&ev, 0, sizeof(ev));
   ev.xclient.type = ClientMessage;
@@ -118,8 +118,8 @@ static void sendClientMessageToRoot(Window w, Atom a, long x, long y = 0, long z
   ev.xclient.data.l[0] = x;
   ev.xclient.data.l[1] = y;
   ev.xclient.data.l[2] = z;
-  tqmask = SubstructureRedirectMask;
-  XSendEvent(qt_xdisplay(), qt_xrootwin(), False, tqmask, &ev);
+  mask = SubstructureRedirectMask;
+  XSendEvent(qt_xdisplay(), qt_xrootwin(), False, mask, &ev);
 }
 #endif
 
@@ -129,7 +129,7 @@ static void sendClientMessageToRoot(Window w, Atom a, long x, long y = 0, long z
 #ifdef Q_WS_X11
 static void sendClientMessage(Window w, Atom a, long x){
   XEvent ev;
-  long tqmask;
+  long mask;
 
   memset(&ev, 0, sizeof(ev));
   ev.xclient.type = ClientMessage;
@@ -138,10 +138,10 @@ static void sendClientMessage(Window w, Atom a, long x){
   ev.xclient.format = 32;
   ev.xclient.data.l[0] = x;
   ev.xclient.data.l[1] = CurrentTime;
-  tqmask = 0L;
+  mask = 0L;
   if (w == qt_xrootwin())
-    tqmask = SubstructureRedirectMask;        /* magic! */
-  XSendEvent(qt_xdisplay(), w, False, tqmask, &ev);
+    mask = SubstructureRedirectMask;        /* magic! */
+  XSendEvent(qt_xdisplay(), w, False, mask, &ev);
 }
 #endif
 
@@ -179,7 +179,7 @@ ContextWidget::ContextWidget()
 			      LeaveWindowMask ),
 		      GrabModeAsync, GrabModeAsync,
 		      None, c.handle(), CurrentTime );
-	tqApp->enter_loop();
+	qApp->enter_loop();
     }
 
 
@@ -205,7 +205,7 @@ bool ContextWidget::x11Event( XEvent * ev)
 	    e.xbutton.x = lx;
 	    e.xbutton.y = ly;
 	    XSendEvent( qt_xdisplay(), w, true, ButtonPressMask, &e );
-	    tqApp->exit_loop();
+	    qApp->exit_loop();
 	    return true;
 	}
 	return false;
@@ -313,7 +313,7 @@ void KWin::setMainWindow( TQWidget* subwindow, WId mainwindow )
          Grmbl. See TQDialog::show(). That should get fixed in Qt somehow.
         */
         if( tqqt_cast< TQDialog* >( subwindow ) != NULL
-            && subwindow->tqparentWidget() == NULL
+            && subwindow->parentWidget() == NULL
             && kapp->mainWidget() != NULL )
         {
             kdWarning() << "KWin::setMainWindow(): There either mustn't be kapp->mainWidget(),"
@@ -386,7 +386,7 @@ KWin::Info KWin::info( WId win )
     w.pid = inf.pid();
     NETRect frame, geom;
     inf.kdeGeometry( frame, geom );
-    w.tqgeometry.setRect( geom.pos.x, geom.pos.y, geom.size.width, geom.size.height );
+    w.geometry.setRect( geom.pos.x, geom.pos.y, geom.size.width, geom.size.height );
     w.frameGeometry.setRect( frame.pos.x, frame.pos.y, frame.size.width, frame.size.height );
 #endif
     return w;
@@ -421,14 +421,14 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags )
 
     if( flags & WMHints ) {
         Pixmap p = None;
-        Pixmap p_tqmask = None;
+        Pixmap p_mask = None;
 
         XWMHints *hints = XGetWMHints(qt_xdisplay(), win );
         if (hints && (hints->flags & IconPixmapHint)){
     	    p = hints->icon_pixmap;
         }
         if (hints && (hints->flags & IconMaskHint)){
-	    p_tqmask = hints->icon_mask;
+	    p_mask = hints->icon_mask;
         }
         if (hints)
 	    XFree((char*)hints);
@@ -448,9 +448,9 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags )
 	        XCopyArea(qt_xdisplay(), p, pm.handle(),
 		          qt_xget_temp_gc(qt_xscreen(), depth==1),
 		          0, 0, w, h, 0, 0);
-	        if (p_tqmask != None){
+	        if (p_mask != None){
 	    	    TQBitmap bm(w, h);
-		    XCopyArea(qt_xdisplay(), p_tqmask, bm.handle(),
+		    XCopyArea(qt_xdisplay(), p_mask, bm.handle(),
 			      qt_xget_temp_gc(qt_xscreen(), true),
 			      0, 0, w, h, 0, 0);
 		    pm.setMask(bm);
@@ -752,8 +752,8 @@ class KWin::WindowInfoPrivate
 	WId win_;
 	TQString name_;
         TQString iconic_name_;
-	TQRect tqgeometry_;
-        TQRect frame_tqgeometry_;
+	TQRect geometry_;
+        TQRect frame_geometry_;
 	int ref;
         bool valid;
     private:
@@ -806,8 +806,8 @@ KWin::WindowInfo::WindowInfo( WId win, unsigned long properties, unsigned long p
     if( properties & ( NET::WMGeometry | NET::WMKDEFrameStrut )) {
         NETRect frame, geom;
         d->info->kdeGeometry( frame, geom );
-        d->tqgeometry_.setRect( geom.pos.x, geom.pos.y, geom.size.width, geom.size.height );
-        d->frame_tqgeometry_.setRect( frame.pos.x, frame.pos.y, frame.size.width, frame.size.height );
+        d->geometry_.setRect( geom.pos.x, geom.pos.y, geom.size.width, geom.size.height );
+        d->frame_geometry_.setRect( frame.pos.x, frame.pos.y, frame.size.width, frame.size.height );
     }
     d->valid = !handler.error( false ); // no sync - NETWinInfo did roundtrips
 #endif
@@ -1068,12 +1068,12 @@ int KWin::WindowInfo::desktop() const
 #endif
 }
 
-TQRect KWin::WindowInfo::tqgeometry() const
+TQRect KWin::WindowInfo::geometry() const
 {
 #ifdef Q_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMGeometry ) == 0, 176 )
         << "Pass NET::WMGeometry to KWin::windowInfo()" << endl;
-    return d->tqgeometry_;
+    return d->geometry_;
 #else
     return TQRect( 100, 100, 200, 200 );
 #endif
@@ -1084,7 +1084,7 @@ TQRect KWin::WindowInfo::frameGeometry() const
 #ifdef Q_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMKDEFrameStrut ) == 0, 176 )
         << "Pass NET::WMKDEFrameStrut to KWin::windowInfo()" << endl;
-    return d->frame_tqgeometry_;
+    return d->frame_geometry_;
 #else
     return TQRect();
 #endif
diff --git a/kdecore/kwin.h b/kdecore/kwin.h
index 4e7abaf10..36cccb125 100644
--- a/kdecore/kwin.h
+++ b/kdecore/kwin.h
@@ -161,7 +161,7 @@ public:
     /**
      * Makes @p trayWin a system tray window for @p forWin.
      *
-     * A system tray window serves as an icon tqreplacement. It's
+     * A system tray window serves as an icon replacement. It's
      * displayed inside the panel's system tray.
      * @param trayWin the id of the system tray window
      * @param forWin the id of the window represented by the system
@@ -491,7 +491,7 @@ public:
       /// The process id of the window's owner
 	pid_t pid;
       /// Position and size of the window contents.
-	TQRect tqgeometry;
+	TQRect geometry;
       /// Position and size of the window's frame.
 	TQRect frameGeometry;
 
@@ -655,9 +655,9 @@ public:
      * Returns the position and size of the window contents.
      * Requires NET::WMGeometry passed to KWin::windowInfo().
      */
-    TQRect tqgeometry() const;
+    TQRect geometry() const;
     /**
-     * Returns the frame tqgeometry of the window, i.e. including the window decoration.
+     * Returns the frame geometry of the window, i.e. including the window decoration.
      * Requires NET::WMKDEFrameStrut passed to KWin::windowInfo().
      */
     TQRect frameGeometry() const;
diff --git a/kdecore/kwinmodule.cpp b/kdecore/kwinmodule.cpp
index 383bb76d5..f113570db 100644
--- a/kdecore/kwinmodule.cpp
+++ b/kdecore/kwinmodule.cpp
@@ -172,7 +172,7 @@ const TQValueList<WId>& KWinModule::stackingOrder() const
 
 bool KWinModule::hasWId(WId w) const
 {
-    return d->windows.tqfindIndex( w ) != -1;
+    return d->windows.findIndex( w ) != -1;
 }
 
 const TQValueList<WId>& KWinModule::systemTrayWindows() const
@@ -243,7 +243,7 @@ bool KWinModulePrivate::x11Event( XEvent * ev )
 	    for ( TQPtrListIterator<KWinModule> mit( modules ); mit.current(); ++mit )
 		emit (*mit)->showingDesktopChanged( showingDesktop());
         }
-    } else  if ( windows.tqfindIndex( ev->xany.window ) != -1 ){
+    } else  if ( windows.findIndex( ev->xany.window ) != -1 ){
 	NETWinInfo ni( qt_xdisplay(), ev->xany.window, qt_xrootwin(), 0 );
         unsigned long dirty[ 2 ];
 	ni.event( ev, dirty, 2 );
@@ -257,7 +257,7 @@ bool KWinModulePrivate::x11Event( XEvent * ev )
         }
 	if ( (dirty[ NETWinInfo::PROTOCOLS ] & NET::WMStrut) != 0 ) {
             removeStrutWindow( ev->xany.window );
-            if ( possibleStrutWindows.tqfindIndex( ev->xany.window ) == -1 )
+            if ( possibleStrutWindows.findIndex( ev->xany.window ) == -1 )
         	possibleStrutWindows.append( ev->xany.window );
 	}
 	if ( dirty[ NETWinInfo::PROTOCOLS ] || dirty[ NETWinInfo::PROTOCOLS2 ] ) {
@@ -295,7 +295,7 @@ void KWinModulePrivate::updateStackingOrder()
 
 void KWinModulePrivate::addClient(Window w)
 {
-    if ( (what >= KWinModule::INFO_WINDOWS) && !TQWidget::tqfind( w ) )
+    if ( (what >= KWinModule::INFO_WINDOWS) && !TQWidget::find( w ) )
 	XSelectInput( qt_xdisplay(), w, PropertyChangeMask | StructureNotifyMask );
     bool emit_strutChanged = false;
     if( strutSignalConnected && modules.count() > 0 ) {
@@ -318,7 +318,7 @@ void KWinModulePrivate::addClient(Window w)
 void KWinModulePrivate::removeClient(Window w)
 {
     bool emit_strutChanged = removeStrutWindow( w );
-    if( strutSignalConnected && possibleStrutWindows.tqfindIndex( w ) != -1 && modules.count() > 0 ) {
+    if( strutSignalConnected && possibleStrutWindows.findIndex( w ) != -1 && modules.count() > 0 ) {
         NETWinInfo info( qt_xdisplay(), w, qt_xrootwin(), NET::WMStrut );
         NETStrut strut = info.strut();
         if ( strut.left || strut.top || strut.right || strut.bottom ) {
@@ -382,16 +382,16 @@ TQRect KWinModule::workArea( int desktop ) const
 {
     int desk  = (desktop > 0 && desktop <= (int) d->numberOfDesktops() ) ? desktop : currentDesktop();
     if ( desk <= 0 )
-	return TQApplication::desktop()->tqgeometry();
+	return TQApplication::desktop()->geometry();
     NETRect r = d->workArea( desk );
     if( r.size.width <= 0 || r.size.height <= 0 ) // not set
-	return TQApplication::desktop()->tqgeometry();
+	return TQApplication::desktop()->geometry();
     return TQRect( r.pos.x, r.pos.y, r.size.width, r.size.height );
 }
 
 TQRect KWinModule::workArea( const TQValueList<WId>& exclude, int desktop ) const
 {
-    TQRect all = TQApplication::desktop()->tqgeometry();
+    TQRect all = TQApplication::desktop()->geometry();
     TQRect a = all;
 
     if (desktop == -1)
@@ -400,10 +400,10 @@ TQRect KWinModule::workArea( const TQValueList<WId>& exclude, int desktop ) cons
     TQValueList<WId>::ConstIterator it1;
     for( it1 = d->windows.begin(); it1 != d->windows.end(); ++it1 ) {
 
-	if(exclude.tqfindIndex(*it1) != -1) continue;
+	if(exclude.findIndex(*it1) != -1) continue;
         
 // Kicker (very) extensively calls this function, causing hundreds of roundtrips just
-// to repeatedly tqfind out struts of all windows. Therefore strut values for strut
+// to repeatedly find out struts of all windows. Therefore strut values for strut
 // windows are cached here.
         NETStrut strut;
         TQValueList< KWinModulePrivate::StrutData >::Iterator it2 = d->strutWindows.begin();
@@ -416,7 +416,7 @@ TQRect KWinModule::workArea( const TQValueList<WId>& exclude, int desktop ) cons
             if(!((*it2).desktop == desktop || (*it2).desktop == NETWinInfo::OnAllDesktops ))
                 continue;
             strut = (*it2).strut;
-        } else if( d->possibleStrutWindows.tqfindIndex( *it1 ) != -1 ) {
+        } else if( d->possibleStrutWindows.findIndex( *it1 ) != -1 ) {
             NETWinInfo info( qt_xdisplay(), (*it1), qt_xrootwin(), NET::WMStrut | NET::WMDesktop);
 	    strut = info.strut();
             d->possibleStrutWindows.remove( *it1 );
diff --git a/kdecore/kwinmodule.h b/kdecore/kwinmodule.h
index a15fd53a1..f680d561d 100644
--- a/kdecore/kwinmodule.h
+++ b/kdecore/kwinmodule.h
@@ -49,7 +49,7 @@ class KWinModulePrivate;
  * @short Base class for KDE Window Manager modules.
  * @author Matthias Ettrich (ettrich@kde.org)
  */
-class KDECORE_EXPORT KWinModule : public TQObject
+class KDECORE_EXPORT KWinModule : public QObject
 {
     Q_OBJECT
 
@@ -61,7 +61,7 @@ public:
     /**
      * Creates a KWinModule object and connects to the window
      * manager.
-     * @param parent the parent for the TQObject
+     * @param parent the parent for the QObject
      * @param what The information you are interested in:
      *   INFO_DESKTOP:  currentDesktop, 
      *                  numberOfDesktops, 
@@ -89,7 +89,7 @@ public:
     /**
      * Creates a KWinModule object and connects to the window
      * manager.
-     * @param parent the parent for the TQObject
+     * @param parent the parent for the QObject
      **/
     KWinModule( TQObject* parent = 0 );
 
@@ -298,7 +298,7 @@ signals:
     /**
      * The window changed.
      *
-     * The properties parameter tqcontains the NET properties that
+     * The properties parameter contains the NET properties that
      * were modified (see netwm_def.h). First element are NET::Property
      * values, second element are NET::Property2 values (i.e. the format
      * is the same like for the NETWinInfo class constructor).
@@ -311,7 +311,7 @@ signals:
      * @deprecated
      * The window changed.
      *
-     * The unsigned int parameter tqcontains the NET properties that
+     * The unsigned int parameter contains the NET properties that
      * were modified (see netwm_def.h).
      * @param id the id of the window
      * @param properties the properties that were modified
diff --git a/kdecore/kxmessages.cpp b/kdecore/kxmessages.cpp
index 85b573e81..6b6f971a2 100644
--- a/kdecore/kxmessages.cpp
+++ b/kdecore/kxmessages.cpp
@@ -150,7 +150,7 @@ bool KXMessages::sendMessageX( Display* disp, WId w_P, const char* msg_type_P,
     return true;
     }
     
-void KXMessages::send_message_internal( WId w_P, const TQString& msg_P, long tqmask_P,
+void KXMessages::send_message_internal( WId w_P, const TQString& msg_P, long mask_P,
     Display* disp, Atom atom1_P, Atom atom2_P, Window handle_P )
     {
     unsigned int pos = 0;
@@ -169,7 +169,7 @@ void KXMessages::send_message_internal( WId w_P, const TQString& msg_P, long tqm
              i < 20 && i + pos <= len;
              ++i )
             e.xclient.data.b[ i ] = msg[ i + pos ];
-        XSendEvent( disp, w_P, false, tqmask_P, &e );
+        XSendEvent( disp, w_P, false, mask_P, &e );
         e.xclient.message_type = atom2_P; // following messages
         pos += i;
         } while( pos <= len );
@@ -189,7 +189,7 @@ bool KXMessages::x11Event( XEvent* ev_P )
          ++i )
         buf[ i ] = ev_P->xclient.data.b[ i ];
     buf[ i ] = '\0';
-    if( incoming_messages.tqcontains( ev_P->xclient.window ))
+    if( incoming_messages.contains( ev_P->xclient.window ))
         {
         if( ev_P->xclient.message_type == accept_atom1 && accept_atom1 != accept_atom2 )
             // two different messages on the same window at the same time shouldn't happen anyway
diff --git a/kdecore/kxmessages.h b/kdecore/kxmessages.h
index 8b4c12270..256b69f91 100644
--- a/kdecore/kxmessages.h
+++ b/kdecore/kxmessages.h
@@ -153,7 +153,7 @@ class KDECORE_EXPORT KXMessages
 	 */
         virtual bool x11Event( XEvent* ev );
     private:
-        static void send_message_internal( WId w_P, const TQString& msg_P, long tqmask_P,
+        static void send_message_internal( WId w_P, const TQString& msg_P, long mask_P,
             Display* disp, Atom atom1_P, Atom atom2_P, Window handle_P );
         TQWidget* handle;
         Atom accept_atom2;
diff --git a/kdecore/libintl.cpp b/kdecore/libintl.cpp
index 5677dde82..aadfcd821 100644
--- a/kdecore/libintl.cpp
+++ b/kdecore/libintl.cpp
@@ -8,7 +8,7 @@ of glibc. The master sources can be found in
       dcgettext.c
       dgettext.c
       explodename.c
-      tqfinddomain.c
+      finddomain.c
       gettext.c
       gettext.h
       gettextP.h
@@ -77,7 +77,7 @@ Boston, MA 02110-1301, USA.  */
 # define W(flag, data) ((flag) ? SWAP (data) : (data))
 #endif
 
-typedef TQ_UINT32 nls_uint32;
+typedef Q_UINT32 nls_uint32;
 
 struct loaded_domain
 {
@@ -157,11 +157,11 @@ struct string_desc
 };
 
 /* Prototypes for local functions.  */
-char *k_nl_tqfind_msg  (struct kde_loaded_l10nfile *domain_file,
+char *k_nl_find_msg  (struct kde_loaded_l10nfile *domain_file,
 			const char *msgid);
 
 char *
-k_nl_tqfind_msg (struct kde_loaded_l10nfile *domain_file, const char *msgid)
+k_nl_find_msg (struct kde_loaded_l10nfile *domain_file, const char *msgid)
 {
   size_t top, act, bottom;
   struct loaded_domain *domain;
diff --git a/kdecore/libqt-mt.nmcheck b/kdecore/libqt-mt.nmcheck
index 017dc25d5..77b200029 100644
--- a/kdecore/libqt-mt.nmcheck
+++ b/kdecore/libqt-mt.nmcheck
@@ -8,8 +8,8 @@ qt_*
 qDebug
 qFatal
 qWarning
-tqApp
-tqAppName
+qApp
+qAppName
 qVersion
 qSysInfo
 qObsolete
diff --git a/kdecore/libqt-mt_weak.nmcheck b/kdecore/libqt-mt_weak.nmcheck
index 3eaf41e2d..d0b00eee4 100644
--- a/kdecore/libqt-mt_weak.nmcheck
+++ b/kdecore/libqt-mt_weak.nmcheck
@@ -6,13 +6,13 @@ Q*::*
 qstrcmp
 qstrcpy
 qstrlen
-tqAlpha
-tqRed
-tqGreen
-tqBlue
-tqGray
-tqRgba
-tqRgb
+qAlpha
+qRed
+qGreen
+qBlue
+qGray
+qRgba
+qRgb
 qSwap
 qCopy
 qHeapSort
diff --git a/kdecore/malloc/README b/kdecore/malloc/README
index 52c089e89..181c29764 100644
--- a/kdecore/malloc/README
+++ b/kdecore/malloc/README
@@ -38,7 +38,7 @@ commented out #including malloc.h
 added #include <config.h> at the top and enclosed whole file in #ifdef KDE_MALLOC
 taken posix_memalign() from glibc
 removed public icalloc(),icomalloc(),mtrim(),musable()  (they don't exist everywhere anyway)
-enclosed the pthreads part by #if 0 and tqreplaced it with spinlock from glibc CVS (in x86.h)
+enclosed the pthreads part by #if 0 and replaced it with spinlock from glibc CVS (in x86.h)
     also added :
 ----------
 static mutex_t spinlock = MUTEX_INITIALIZER;
diff --git a/kdecore/malloc/malloc.c b/kdecore/malloc/malloc.c
index 39d950a7d..dba0fdef0 100644
--- a/kdecore/malloc/malloc.c
+++ b/kdecore/malloc/malloc.c
@@ -44,7 +44,7 @@ int kde_malloc_is_used = 0;
   For convenience, an include file for code using this malloc is at:
      ftp://gee.cs.oswego.edu/pub/misc/malloc-2.7.0.h
   You don't really need this .h file unless you call functions not
-  defined in your system include files.  The .h file tqcontains only the
+  defined in your system include files.  The .h file contains only the
   excerpts from this file needed for using this malloc on ANSI C/C++
   systems, so long as you haven't changed compile-time options about
   naming and tuning parameters.  If you do, then you can create your
@@ -85,7 +85,7 @@ int kde_malloc_is_used = 0;
     calloc(size_t n_elements, size_t element_size);
     free(Void_t* p);
     realloc(Void_t* p, size_t n);
-    memalign(size_t tqalignment, size_t n);
+    memalign(size_t alignment, size_t n);
     valloc(size_t n);
     mallinfo()
     mallopt(int parameter_number, int parameter_value)
@@ -107,7 +107,7 @@ int kde_malloc_is_used = 0;
        You can adjust this by defining INTERNAL_SIZE_T
 
   Alignment:                              2 * sizeof(size_t) (default)
-       (i.e., 8 byte tqalignment with 4byte size_t). This suffices for
+       (i.e., 8 byte alignment with 4byte size_t). This suffices for
        nearly all current machines and C compilers. However, you can
        define MALLOC_ALIGNMENT to be wider than this if necessary.
 
@@ -146,7 +146,7 @@ int kde_malloc_is_used = 0;
        default used to obtain memory from system) accepts signed
        arguments, and may not be able to handle size_t-wide arguments
        with negative sign bit.  Generally, values that would
-       appear as negative after accounting for overhead and tqalignment
+       appear as negative after accounting for overhead and alignment
        are supported only via mmap(), which does not have this
        limitation.
 
@@ -393,8 +393,8 @@ extern "C" {
   defining INTERNAL_SIZE_T to be a 32 bit `unsigned int' at the
   expense of not being able to handle more than 2^32 of malloced
   space. If this limitation is acceptable, you are encouraged to set
-  this unless you are on a platform requiring 16byte tqalignments. In
-  this case the tqalignment requirements turn out to negate any
+  this unless you are on a platform requiring 16byte alignments. In
+  this case the alignment requirements turn out to negate any
   potential advantages of decreasing size_t word size.
 
   Implementors: Beware of the possible combinations of:
@@ -419,11 +419,11 @@ extern "C" {
 
 
 /*
-  MALLOC_ALIGNMENT is the minimum tqalignment for malloc'ed chunks.
+  MALLOC_ALIGNMENT is the minimum alignment for malloc'ed chunks.
   It must be a power of two at least 2 * SIZE_SZ, even on machines
-  for which smaller tqalignments would suffice. It may be defined as
+  for which smaller alignments would suffice. It may be defined as
   larger than this though. Note however that code and data structures
-  are optimized for the case of 8-byte tqalignment.
+  are optimized for the case of 8-byte alignment.
 */
 
 
@@ -431,7 +431,7 @@ extern "C" {
 #define MALLOC_ALIGNMENT       (2 * SIZE_SZ)
 #endif
 
-/* The corresponding bit tqmask value */
+/* The corresponding bit mask value */
 #define MALLOC_ALIGN_MASK      (MALLOC_ALIGNMENT - 1)
 
 
@@ -824,7 +824,7 @@ extern Void_t*     sbrk();
   there's no compelling reason to bother to do this.)
 
   The main declaration needed is the mallinfo struct that is returned
-  (by-copy) by mallinfo().  The SVID/XPG malloinfo struct tqcontains a
+  (by-copy) by mallinfo().  The SVID/XPG malloinfo struct contains a
   bunch of field that are not even meaningful in this version of
   malloc.  These fields are are instead filled by mallinfo() with
   other numbers that might be of interest.
@@ -925,7 +925,7 @@ Void_t*  public_cALLOc();
 
 /*
   realloc(Void_t* p, size_t n)
-  Returns a pointer to a chunk of size n that tqcontains the same data
+  Returns a pointer to a chunk of size n that contains the same data
   as does chunk p up to the minimum of (n, p's size) bytes, or null
   if no space is available. 
 
@@ -957,13 +957,13 @@ Void_t*  public_rEALLOc();
 #endif
 
 /*
-  memalign(size_t tqalignment, size_t n);
+  memalign(size_t alignment, size_t n);
   Returns a pointer to a newly allocated chunk of n bytes, aligned
-  in accord with the tqalignment argument.
+  in accord with the alignment argument.
 
-  The tqalignment argument should be a power of two. If the argument is
+  The alignment argument should be a power of two. If the argument is
   not a power of two, the nearest greater power is used.
-  8-byte tqalignment is guaranteed by normal malloc calls, so don't
+  8-byte alignment is guaranteed by normal malloc calls, so don't
   bother calling memalign with an argument of 8 or less.
 
   Overreliance on memalign is a sure way to fragment space.
@@ -1228,7 +1228,7 @@ int      public_mTRIm();
 
   Returns the number of bytes you can actually use in
   an allocated chunk, which may be more than you requested (although
-  often not) due to tqalignment and minimum size constraints.
+  often not) due to alignment and minimum size constraints.
   You can use this many bytes without worrying about
   overwriting other allocated objects. This is not a particularly great
   programming practice. malloc_usable_size can be more useful in
@@ -1252,8 +1252,8 @@ size_t   public_mUSABLe();
   number of bytes allocated via malloc (or realloc, etc) but not yet
   freed. Note that this is the number of bytes allocated, not the
   number requested. It will be larger than the number requested
-  because of tqalignment and bookkeeping overhead. Because it includes
-  tqalignment wastage as being in use, this figure may be greater than
+  because of alignment and bookkeeping overhead. Because it includes
+  alignment wastage as being in use, this figure may be greater than
   zero even when no user-level chunks are allocated.
 
   The reported current and maximum system memory can be inaccurate if
@@ -1290,7 +1290,7 @@ void     public_mSTATs();
   fragmentation without improving speed.
 
   M_MXFAST is set in REQUEST size units. It is internally used in
-  chunksize units, which adds padding and tqalignment.  You can reduce
+  chunksize units, which adds padding and alignment.  You can reduce
   M_MXFAST to 0 to disable all use of fastbins.  This causes the malloc
   algorithm to be a closer approximation of fifo-best-fit in all cases,
   not just for larger requests, but will generally cause it to be
@@ -1434,7 +1434,7 @@ void     public_mSTATs();
 
    1. The space cannot be reclaimed, consolidated, and then
       used to service later requests, as happens with normal chunks.
-   2. It can lead to more wastage because of mmap page tqalignment
+   2. It can lead to more wastage because of mmap page alignment
       requirements
    3. It causes malloc performance to be more dependent on host
       system memory management support routines which may vary in
@@ -1614,12 +1614,12 @@ Void_t* public_rEALLOc(Void_t* m, size_t bytes) {
   return m;
 }
 
-Void_t* public_mEMALIGn(size_t tqalignment, size_t bytes) {
+Void_t* public_mEMALIGn(size_t alignment, size_t bytes) {
   Void_t* m;
   if (MALLOC_PREACTION != 0) {
     return 0;
   }
-  m = mEMALIGn(tqalignment, bytes);
+  m = mEMALIGn(alignment, bytes);
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
@@ -1928,8 +1928,8 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     The P (PREV_INUSE) bit, stored in the unused low-order bit of the
     chunk size (which is always a multiple of two words), is an in-use
     bit for the *previous* chunk.  If that bit is *clear*, then the
-    word before the current chunk size tqcontains the previous chunk
-    size, and can be used to tqfind the front of the previous chunk.
+    word before the current chunk size contains the previous chunk
+    size, and can be used to find the front of the previous chunk.
     The very first chunk allocated always has this bit set,
     preventing access to non-existent (or non-owned) memory. If
     prev_inuse is set for any given chunk, then you CANNOT determine
@@ -1938,7 +1938,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
     Note that the `foot' of the current chunk is actually represented
     as the prev_size of the NEXT chunk. This makes it easier to
-    deal with tqalignments etc but can be very confusing when trying
+    deal with alignments etc but can be very confusing when trying
     to extend or adapt this code.
 
     The two exceptions to all this are
@@ -1956,7 +1956,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 */
 
 /*
-  ---------- Size and tqalignment checks and conversions ----------
+  ---------- Size and alignment checks and conversions ----------
 */
 
 /* conversion from malloc headers to user pointers, and back */
@@ -1972,7 +1972,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 #define MINSIZE  \
   (unsigned long)(((MIN_CHUNK_SIZE+MALLOC_ALIGN_MASK) & ~MALLOC_ALIGN_MASK))
 
-/* Check if m has acceptable tqalignment */
+/* Check if m has acceptable alignment */
 
 #define aligned_OK(m)  (((unsigned long)((m)) & (MALLOC_ALIGN_MASK)) == 0)
 
@@ -2022,9 +2022,9 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 #define chunk_is_mmapped(p) ((p)->size & IS_MMAPPED)
 
 /* 
-  Bits to tqmask off when extracting size 
+  Bits to mask off when extracting size 
 
-  Note: IS_MMAPPED is intentionally not tqmasked off from size field in
+  Note: IS_MMAPPED is intentionally not masked off from size field in
   macros for which mmapped chunks should never be seen. This should
   cause helpful core dumps to occur if it is tried by accident by
   people extending or adapting this malloc.
@@ -2641,7 +2641,7 @@ static void do_check_remalloced_chunk(p, s) mchunkptr p; INTERNAL_SIZE_T s;
   /* Legal size ... */
   assert((sz & MALLOC_ALIGN_MASK) == 0);
   assert((unsigned long)(sz) >= MINSIZE);
-  /* ... and tqalignment */
+  /* ... and alignment */
   assert(aligned_OK(chunk2mem(p)));
   /* chunk is less than MINSIZE more than request */
   assert((long)(sz) - (long)(s) >= 0);
@@ -2704,7 +2704,7 @@ static void do_check_malloc_state()
   /* internal size_t must be no wider than pointer type */
   assert(sizeof(INTERNAL_SIZE_T) <= sizeof(char*));
 
-  /* tqalignment is a power of 2 */
+  /* alignment is a power of 2 */
   assert((MALLOC_ALIGNMENT & (MALLOC_ALIGNMENT-1)) == 0);
 
   /* cannot run remaining checks until fully initialized */
@@ -2843,7 +2843,7 @@ static int sYSTRIm(pad, av) size_t pad; mstate av;
       
       /*
         Attempt to release memory. We ignore MORECORE return value,
-        and instead call again to tqfind out where new end of memory is.
+        and instead call again to find out where new end of memory is.
         This avoids problems if first call releases less than we asked,
         of if failure somehow altered brk value. (We could still
         encounter problems if it altered brk in some very bad way,
@@ -3145,7 +3145,7 @@ void fREe(mem) Void_t* mem;
   sysmalloc handles malloc cases requiring more memory from the system.
   On entry, it is assumed that av->top does not have enough
   space to service request for nb bytes, thus requiring that av->top
-  be extended or tqreplaced.
+  be extended or replaced.
 */
 
 INLINE
@@ -3175,7 +3175,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
 
   unsigned long   sum;            /* for updating stats */
 
-  size_t          pagetqmask  = av->pagesize - 1;
+  size_t          pagemask  = av->pagesize - 1;
 
 
 #if HAVE_MMAP
@@ -3197,7 +3197,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
       is one SIZE_SZ unit larger than for normal chunks, because there
       is no following chunk whose prev_size field could be used.
     */
-    size = (nb + SIZE_SZ + MALLOC_ALIGN_MASK + pagetqmask) & ~pagetqmask;
+    size = (nb + SIZE_SZ + MALLOC_ALIGN_MASK + pagemask) & ~pagemask;
 
     /* Don't try if size wraps around 0 */
     if ((unsigned long)(size) > (unsigned long)(nb)) {
@@ -3209,7 +3209,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
         /*
           The offset to the start of the mmapped region is stored
           in the prev_size field of the chunk. This allows us to adjust
-          returned start address to meet tqalignment requirements here 
+          returned start address to meet alignment requirements here 
           and in memalign(), and still be able to compute proper
           address argument for later munmap in free() and realloc().
         */
@@ -3288,11 +3288,11 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
     Round to a multiple of page size.
     If MORECORE is not contiguous, this ensures that we only call it
     with whole-page arguments.  And if MORECORE is contiguous and
-    this is not first time through, this preserves page-tqalignment of
+    this is not first time through, this preserves page-alignment of
     previous calls. Otherwise, we correct to page-align below.
   */
 
-  size = (size + pagetqmask) & ~pagetqmask;
+  size = (size + pagemask) & ~pagemask;
 
   /*
     Don't try to call MORECORE if argument is so big as to appear
@@ -3317,7 +3317,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
 
     /* Cannot merge with old top, so add its size back in */
     if (contiguous(av))
-      size = (size + old_size + pagetqmask) & ~pagetqmask;
+      size = (size + old_size + pagemask) & ~pagemask;
 
     /* If we are relying on mmap as backup, then use larger units */
     if ((unsigned long)(size) < (unsigned long)(MMAP_AS_MORECORE_SIZE))
@@ -3330,7 +3330,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
       
       if (brk != (char*)(MORECORE_FAILURE)) {
         
-        /* We do not need, and cannot use, another sbrk call to tqfind end */
+        /* We do not need, and cannot use, another sbrk call to find end */
         snd_brk = brk + size;
         
         /* 
@@ -3360,7 +3360,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
       Otherwise, make adjustments:
       
       * If the first time through or noncontiguous, we need to call sbrk
-        just to tqfind out where the end of memory lies.
+        just to find out where the end of memory lies.
 
       * We need to ensure that all returned chunks from malloc will meet
         MALLOC_ALIGNMENT
@@ -3384,7 +3384,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
       /* handle contiguous cases */
       if (contiguous(av)) { 
         
-        /* Guarantee tqalignment of first new chunk made from this space */
+        /* Guarantee alignment of first new chunk made from this space */
 
         front_misalign = (INTERNAL_SIZE_T)chunk2mem(brk) & MALLOC_ALIGN_MASK;
         if (front_misalign > 0) {
@@ -3410,13 +3410,13 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
         
         /* Extend the end address to hit a page boundary */
         end_misalign = (INTERNAL_SIZE_T)(brk + size + correction);
-        correction += ((end_misalign + pagetqmask) & ~pagetqmask) - end_misalign;
+        correction += ((end_misalign + pagemask) & ~pagemask) - end_misalign;
         
         assert(correction >= 0);
         snd_brk = (char*)(MORECORE(correction));
         
         /*
-          If can't allocate correction, try to at least tqfind out current
+          If can't allocate correction, try to at least find out current
           brk.  It might be enough to proceed without failing.
           
           Note that if second sbrk did NOT fail, we assume that space
@@ -3454,7 +3454,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
           double fencepost at old_top to prevent consolidation with space
           we don't own. These fenceposts are artificial chunks that are
           marked as inuse and are in any case too small to use.  We need
-          two to make sizes and tqalignments work out.
+          two to make sizes and alignments work out.
         */
    
         if (old_size != 0) {
@@ -3554,7 +3554,7 @@ Void_t* mALLOc(size_t bytes)
 
   /*
     Convert request size to internal form by adding SIZE_SZ bytes
-    overhead plus possibly more to obtain necessary tqalignment and/or
+    overhead plus possibly more to obtain necessary alignment and/or
     to obtain a size of at least MINSIZE, the smallest allocatable
     size. Also, checked_request2size traps (returning 0) request sizes
     that are so large that they wrap around zero when padded and
@@ -3582,7 +3582,7 @@ Void_t* mALLOc(size_t bytes)
     If a small request, check regular bin.  Since these "smallbins"
     hold one size each, no searching within bins is necessary.
     (For a large request, we need to wait until unsorted chunks are
-    processed to tqfind best fit. But for small ones, fits are exact
+    processed to find best fit. But for small ones, fits are exact
     anyway, so we can check now, which is faster.)
   */
 
@@ -3718,7 +3718,7 @@ Void_t* mALLOc(size_t bytes)
    
     /*
       If a large request, scan through the chunks of current bin in
-      sorted order to tqfind smallest that fits.  This is the only step
+      sorted order to find smallest that fits.  This is the only step
       where an unbounded number of chunks might be scanned without doing
       anything useful with them. However the lists tend to be short.
     */
@@ -4066,12 +4066,12 @@ Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes;
 
 #if HAVE_MREMAP
     INTERNAL_SIZE_T offset = oldp->prev_size;
-    size_t pagetqmask = av->pagesize - 1;
+    size_t pagemask = av->pagesize - 1;
     char *cp;
     unsigned long sum;
     
     /* Note the extra SIZE_SZ overhead */
-    newsize = (nb + offset + SIZE_SZ + pagetqmask) & ~pagetqmask;
+    newsize = (nb + offset + SIZE_SZ + pagemask) & ~pagemask;
 
     /* don't need to remap if still within same page */
     if (oldsize == newsize - offset) 
@@ -4127,54 +4127,54 @@ Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes;
 
 INLINE
 #if __STD_C
-Void_t* mEMALIGn(size_t tqalignment, size_t bytes)
+Void_t* mEMALIGn(size_t alignment, size_t bytes)
 #else
-Void_t* mEMALIGn(tqalignment, bytes) size_t tqalignment; size_t bytes;
+Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes;
 #endif
 {
   INTERNAL_SIZE_T nb;             /* padded  request size */
   char*           m;              /* memory returned by malloc call */
   mchunkptr       p;              /* corresponding chunk */
-  char*           brk;            /* tqalignment point within p */
+  char*           brk;            /* alignment point within p */
   mchunkptr       newp;           /* chunk to return */
   INTERNAL_SIZE_T newsize;        /* its size */
-  INTERNAL_SIZE_T leadsize;       /* leading space before tqalignment point */
+  INTERNAL_SIZE_T leadsize;       /* leading space before alignment point */
   mchunkptr       remainder;      /* spare room at end to split off */
   unsigned long   remainder_size; /* its size */
   INTERNAL_SIZE_T size;
 
-  /* If need less tqalignment than we give anyway, just relay to malloc */
+  /* If need less alignment than we give anyway, just relay to malloc */
 
-  if (tqalignment <= MALLOC_ALIGNMENT) return mALLOc(bytes);
+  if (alignment <= MALLOC_ALIGNMENT) return mALLOc(bytes);
 
   /* Otherwise, ensure that it is at least a minimum chunk size */
 
-  if (tqalignment <  MINSIZE) tqalignment = MINSIZE;
+  if (alignment <  MINSIZE) alignment = MINSIZE;
 
-  /* Make sure tqalignment is power of 2 (in case MINSIZE is not).  */
-  if ((tqalignment & (tqalignment - 1)) != 0) {
+  /* Make sure alignment is power of 2 (in case MINSIZE is not).  */
+  if ((alignment & (alignment - 1)) != 0) {
     size_t a = MALLOC_ALIGNMENT * 2;
-    while ((unsigned long)a < (unsigned long)tqalignment) a <<= 1;
-    tqalignment = a;
+    while ((unsigned long)a < (unsigned long)alignment) a <<= 1;
+    alignment = a;
   }
 
   checked_request2size(bytes, nb);
 
   /*
-    Strategy: tqfind a spot within that chunk that meets the tqalignment
+    Strategy: find a spot within that chunk that meets the alignment
     request, and then possibly free the leading and trailing space.
   */
 
 
-  /* Call malloc with worst case padding to hit tqalignment. */
+  /* Call malloc with worst case padding to hit alignment. */
 
-  m  = (char*)(mALLOc(nb + tqalignment + MINSIZE));
+  m  = (char*)(mALLOc(nb + alignment + MINSIZE));
 
   if (m == 0) return 0; /* propagate failure */
 
   p = mem2chunk(m);
 
-  if ((((unsigned long)(m)) % tqalignment) != 0) { /* misaligned */
+  if ((((unsigned long)(m)) % alignment) != 0) { /* misaligned */
 
     /*
       Find an aligned spot inside chunk.  Since we need to give back
@@ -4184,10 +4184,10 @@ Void_t* mEMALIGn(tqalignment, bytes) size_t tqalignment; size_t bytes;
       total room so that this is always possible.
     */
 
-    brk = (char*)mem2chunk(((unsigned long)(m + tqalignment - 1)) &
-                           -((signed long) tqalignment));
+    brk = (char*)mem2chunk(((unsigned long)(m + alignment - 1)) &
+                           -((signed long) alignment));
     if ((unsigned long)(brk - (char*)(p)) < MINSIZE)
-      brk += tqalignment;
+      brk += alignment;
 
     newp = (mchunkptr)brk;
     leadsize = brk - (char*)(p);
@@ -4208,7 +4208,7 @@ Void_t* mEMALIGn(tqalignment, bytes) size_t tqalignment; size_t bytes;
     p = newp;
 
     assert (newsize >= nb &&
-            (((unsigned long)(chunk2mem(p))) % tqalignment) == 0);
+            (((unsigned long)(chunk2mem(p))) % alignment) == 0);
   }
 
   /* Also give back spare room at the end */
@@ -4375,7 +4375,7 @@ static Void_t** iALLOc(n_elements, sizes, opts, chunks) size_t n_elements; size_
       contents_size += request2size(sizes[i]);     
   }
 
-  /* subtract out tqalignment bytes from total to minimize overallocation */
+  /* subtract out alignment bytes from total to minimize overallocation */
   size = contents_size + array_size - MALLOC_ALIGN_MASK;
   
   /* 
@@ -5356,7 +5356,7 @@ History:
         and Anonymous.
       * Allow override of MALLOC_ALIGNMENT (Thanks to Ruud Waij for 
         helping test this.)
-      * memalign: check tqalignment arg
+      * memalign: check alignment arg
       * realloc: don't try to shift chunks backwards, since this
         leads to  more fragmentation in some programs and doesn't
         seem to help in any others.
@@ -5382,7 +5382,7 @@ History:
          * Set 'malloc_getpagesize' for WIN32 platforms (needs more work)
          * Use 'assert' rather than 'ASSERT' in WIN32 code to conform to
            usage of 'assert' in non-WIN32 code
-         * Improve WIN32 'sbrk()' emulation's 'tqfindRegion()' routine to
+         * Improve WIN32 'sbrk()' emulation's 'findRegion()' routine to
            avoid infinite loop
       * Always call 'fREe()' rather than 'free()'
 
@@ -5394,7 +5394,7 @@ History:
       * Added 64bit pointer support mainly from Wolfram Gloger
       * Added anonymously donated WIN32 sbrk emulation
       * Malloc, calloc, getpagesize: add optimizations from Raymond Nijssen
-      * malloc_extend_top: fix tqmask error that caused wastage after
+      * malloc_extend_top: fix mask error that caused wastage after
         foreign sbrks
       * Add linux mremap support code from HJ Liu
 
@@ -5409,7 +5409,7 @@ History:
       * Support another case of realloc via move into top
       * Fix error occurring when initial sbrk_base not word-aligned.
       * Rely on page size for units instead of SBRK_UNIT to
-        avoid surprises about sbrk tqalignment conventions.
+        avoid surprises about sbrk alignment conventions.
       * Add mallinfo, mallopt. Thanks to Raymond Nijssen
         (raymond@es.ele.tue.nl) for the suggestion.
       * Add `pad' argument to malloc_trim and top_pad mallopt parameter.
@@ -5452,7 +5452,7 @@ History:
     V2.5.1 Sat Aug 14 15:40:43 1993  Doug Lea  (dl at g)
       * faster bin computation & slightly different binning
       * merged all consolidations to one part of malloc proper
-         (eliminating old malloc_tqfind_space & malloc_clean_bin)
+         (eliminating old malloc_find_space & malloc_clean_bin)
       * Scan 2 returns chunks (not just 1)
       * Propagate failure in realloc if malloc returns 0
       * Add stuff to allow compilation on non-ANSI compilers
@@ -5569,7 +5569,7 @@ Void_t* public_rEALLOc(Void_t* m, size_t bytes) {
 #endif
 }
 
-Void_t* public_mEMALIGn(size_t tqalignment, size_t bytes) {
+Void_t* public_mEMALIGn(size_t alignment, size_t bytes) {
 #ifndef KDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
@@ -5578,16 +5578,16 @@ Void_t* public_mEMALIGn(size_t tqalignment, size_t bytes) {
   if (MALLOC_PREACTION != 0) {
     return 0;
   }
-  m = mEMALIGn(tqalignment, bytes);
+  m = mEMALIGn(alignment, bytes);
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
 #ifndef KDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
-      return libc_memalign( tqalignment, bytes );
+      return libc_memalign( alignment, bytes );
   init_malloc_type();
-  return public_mEMALIGn( tqalignment, bytes );
+  return public_mEMALIGn( alignment, bytes );
 #endif
 }
 
@@ -5728,7 +5728,7 @@ int public_mALLOPt(int p, int v) {
 #endif
 
 int
-posix_memalign (void **memptr, size_t tqalignment, size_t size)
+posix_memalign (void **memptr, size_t alignment, size_t size)
 {
   void *mem;
 
@@ -5737,7 +5737,7 @@ posix_memalign (void **memptr, size_t tqalignment, size_t size)
   if (size % sizeof (void *) != 0 || (size & (size - 1)) != 0)
     return EINVAL;
 
-  mem = memalign (tqalignment, size);
+  mem = memalign (alignment, size);
 
   if (mem != NULL) {
     *memptr = mem;
diff --git a/kdecore/netsupp.cpp b/kdecore/netsupp.cpp
index 87368c121..6d56e147d 100644
--- a/kdecore/netsupp.cpp
+++ b/kdecore/netsupp.cpp
@@ -104,7 +104,7 @@ void kde_freeaddrinfo(struct kde_addrinfo *ai)
     {
       struct addrinfo *p, *last = NULL;
       /* We've added one AF_UNIX socket in here, to the
-       * tail of the linked list. We have to tqfind it */
+       * tail of the linked list. We have to find it */
       for (p = ai->data; p; p = p->ai_next)
 	{
 	  if (p->ai_family == AF_UNIX)
@@ -324,7 +324,7 @@ int kde_getaddrinfo(const char *name, const char *service,
   if (err == 0)
     for (p = res->data; p; p = p->ai_next)
       {
-	last = p;			// we have to tqfind out which one is last anyways
+	last = p;			// we have to find out which one is last anyways
 	if (p->ai_family == AF_UNIX)
 	  // there is an Unix node
 	  goto out;
@@ -715,9 +715,9 @@ static int make_inet(const char *name, int portnum, int protonum, struct addrinf
 # endif
 	  sin->sin_port = portnum;
 	  if (hint->ai_flags & AI_PASSIVE)
-	    *(TQ_UINT32*)&sin->sin_addr = INADDR_ANY;
+	    *(Q_UINT32*)&sin->sin_addr = INADDR_ANY;
 	  else
-	    *(TQ_UINT32*)&sin->sin_addr = htonl(INADDR_LOOPBACK);
+	    *(Q_UINT32*)&sin->sin_addr = htonl(INADDR_LOOPBACK);
 	  q->ai_flags = 0;
 	  q->ai_family = AF_INET;
 	  q->ai_socktype = hint->ai_socktype;
@@ -909,7 +909,7 @@ char *gai_strerror(int errorcode)
   return buffer;
 }
 
-static void tqfindport(unsigned short port, char *serv, size_t servlen, int flags)
+static void findport(unsigned short port, char *serv, size_t servlen, int flags)
 {
   if (serv == NULL)
     return;
@@ -978,7 +978,7 @@ int getnameinfo(const struct sockaddr *sa, ksocklen_t salen,
 	    return 1;		// error
 	}
 
-      tqfindport(s.sin->sin_port, serv, servlen, flags);
+      findport(s.sin->sin_port, serv, servlen, flags);
     }
 # ifdef AF_INET6
   else if (s.sa->sa_family == AF_INET6)
@@ -1003,7 +1003,7 @@ int getnameinfo(const struct sockaddr *sa, ksocklen_t salen,
 	    return 1;		// error
 	}
 
-      tqfindport(s.sin6->sin6_port, serv, servlen, flags);
+      findport(s.sin6->sin6_port, serv, servlen, flags);
     }
 # endif // AF_INET6
 
@@ -1016,7 +1016,7 @@ int getnameinfo(const struct sockaddr *sa, ksocklen_t salen,
 
 #define KRF_inet_ntop	KRF_USING_OWN_INET_NTOP
 
-static void add_dwords(char *buf, TQ_UINT16 *dw, int count)
+static void add_dwords(char *buf, Q_UINT16 *dw, int count)
 {
   int i = 1;
   sprintf(buf + strlen(buf), "%x", ntohs(dw[0]));
@@ -1027,7 +1027,7 @@ static void add_dwords(char *buf, TQ_UINT16 *dw, int count)
 const char* inet_ntop(int af, const void *cp, char *buf, size_t len)
 {
   char buf2[sizeof "1234:5678:9abc:def0:1234:5678:255.255.255.255" + 1];
-  TQ_UINT8 *data = (TQ_UINT8*)cp;
+  Q_UINT8 *data = (Q_UINT8*)cp;
 
   if (af == AF_INET)
     {
@@ -1046,8 +1046,8 @@ const char* inet_ntop(int af, const void *cp, char *buf, size_t len)
 # ifdef AF_INET6
   if (af == AF_INET6)
     {
-      TQ_UINT16 *p = (TQ_UINT16*)data;
-      TQ_UINT16 *longest = NULL, *cur = NULL;
+      Q_UINT16 *p = (Q_UINT16*)data;
+      Q_UINT16 *longest = NULL, *cur = NULL;
       int longest_length = 0, cur_length;
       int i;
 
@@ -1057,7 +1057,7 @@ const char* inet_ntop(int af, const void *cp, char *buf, size_t len)
 		buf[12], buf[13], buf[14], buf[15]);
       else
 	{
-	  // tqfind the longest sequence of zeroes
+	  // find the longest sequence of zeroes
 	  for (i = 0; i < 8; i++)
 	    if (cur == NULL && p[i] == 0)
 	      {
@@ -1150,7 +1150,7 @@ int inet_pton(int af, const char *cp, void *buf)
 # ifdef AF_INET6
   else if (af == AF_INET6)
     {
-      TQ_UINT16 addr[8];
+      Q_UINT16 addr[8];
       const char *p = cp;
       int n = 0, start = 8;
       bool has_v4 = strchr(p, '.') != NULL;
@@ -1200,8 +1200,8 @@ int inet_pton(int af, const char *cp, void *buf)
       // n < 8 means that we have to move n - start words 8 - n words to the right
       if (start == 8 && n != 8)
 	return 0;		// bad conversion
-      memmove(addr + start + (8 - n), addr + start, (n - start) * sizeof(TQ_UINT16));
-      memset(addr + start, 0, (8 - n) * sizeof(TQ_UINT16));
+      memmove(addr + start + (8 - n), addr + start, (n - start) * sizeof(Q_UINT16));
+      memset(addr + start, 0, (8 - n) * sizeof(Q_UINT16));
 
       // check the byte order
       // The compiler should optimise this out in big endian machines
diff --git a/kdecore/netsupp.h b/kdecore/netsupp.h
index a6d2015ea..4dba3f6cc 100644
--- a/kdecore/netsupp.h
+++ b/kdecore/netsupp.h
@@ -66,63 +66,63 @@ struct kde_in6_addr
 struct kde_sockaddr_in6
 {
 #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
-  TQ_UINT8		sin6_len;
-  TQ_UINT8		sin6_family;
+  Q_UINT8		sin6_len;
+  Q_UINT8		sin6_family;
 #else  //HAVE_STRUCT_SOCKADDR_SA_LEN
-  TQ_UINT16		sin6_family;
+  Q_UINT16		sin6_family;
 #endif
   unsigned short       	sin6_port;	/* RFC says in_port_t */
-  TQ_UINT32		sin6_flowinfo;
+  Q_UINT32		sin6_flowinfo;
   struct kde_in6_addr	sin6_addr;
-  TQ_UINT32		sin6_scope_id;
+  Q_UINT32		sin6_scope_id;
 };
 
 /* IPv6 test macros that could be missing from some implementations */
 
 #define KDE_IN6_IS_ADDR_UNSPECIFIED(a) \
-	(((TQ_UINT32 *) (a))[0] == 0 && ((TQ_UINT32 *) (a))[1] == 0 && \
-	 ((TQ_UINT32 *) (a))[2] == 0 && ((TQ_UINT32 *) (a))[3] == 0)
+	(((Q_UINT32 *) (a))[0] == 0 && ((Q_UINT32 *) (a))[1] == 0 && \
+	 ((Q_UINT32 *) (a))[2] == 0 && ((Q_UINT32 *) (a))[3] == 0)
 
 #define KDE_IN6_IS_ADDR_LOOPBACK(a) \
-	(((TQ_UINT32 *) (a))[0] == 0 && ((TQ_UINT32 *) (a))[1] == 0 && \
-	 ((TQ_UINT32 *) (a))[2] == 0 && ((TQ_UINT32 *) (a))[3] == htonl (1))
+	(((Q_UINT32 *) (a))[0] == 0 && ((Q_UINT32 *) (a))[1] == 0 && \
+	 ((Q_UINT32 *) (a))[2] == 0 && ((Q_UINT32 *) (a))[3] == htonl (1))
 
 #define KDE_IN6_IS_ADDR_MULTICAST(a) (((u_int8_t *) (a))[0] == 0xff)
 
 #define KDE_IN6_IS_ADDR_LINKLOCAL(a) \
-	((((TQ_UINT32 *) (a))[0] & htonl (0xffc00000)) == htonl (0xfe800000))
+	((((Q_UINT32 *) (a))[0] & htonl (0xffc00000)) == htonl (0xfe800000))
 
 #define KDE_IN6_IS_ADDR_SITELOCAL(a) \
-	((((TQ_UINT32 *) (a))[0] & htonl (0xffc00000)) == htonl (0xfec00000))
+	((((Q_UINT32 *) (a))[0] & htonl (0xffc00000)) == htonl (0xfec00000))
 
 #define KDE_IN6_IS_ADDR_V4MAPPED(a) \
-	((((TQ_UINT32 *) (a))[0] == 0) && (((TQ_UINT32 *) (a))[1] == 0) && \
-	 (((TQ_UINT32 *) (a))[2] == htonl (0xffff)))
+	((((Q_UINT32 *) (a))[0] == 0) && (((Q_UINT32 *) (a))[1] == 0) && \
+	 (((Q_UINT32 *) (a))[2] == htonl (0xffff)))
 
 #define KDE_IN6_IS_ADDR_V4COMPAT(a) \
-	((((TQ_UINT32 *) (a))[0] == 0) && (((TQ_UINT32 *) (a))[1] == 0) && \
-	 (((TQ_UINT32 *) (a))[2] == 0) && (ntohl (((TQ_UINT32 *) (a))[3]) > 1))
+	((((Q_UINT32 *) (a))[0] == 0) && (((Q_UINT32 *) (a))[1] == 0) && \
+	 (((Q_UINT32 *) (a))[2] == 0) && (ntohl (((Q_UINT32 *) (a))[3]) > 1))
 
 #define KDE_IN6_ARE_ADDR_EQUAL(a,b) \
-	((((TQ_UINT32 *) (a))[0] == ((TQ_UINT32 *) (b))[0]) && \
-	 (((TQ_UINT32 *) (a))[1] == ((TQ_UINT32 *) (b))[1]) && \
-	 (((TQ_UINT32 *) (a))[2] == ((TQ_UINT32 *) (b))[2]) && \
-	 (((TQ_UINT32 *) (a))[3] == ((TQ_UINT32 *) (b))[3]))
+	((((Q_UINT32 *) (a))[0] == ((Q_UINT32 *) (b))[0]) && \
+	 (((Q_UINT32 *) (a))[1] == ((Q_UINT32 *) (b))[1]) && \
+	 (((Q_UINT32 *) (a))[2] == ((Q_UINT32 *) (b))[2]) && \
+	 (((Q_UINT32 *) (a))[3] == ((Q_UINT32 *) (b))[3]))
 
 #define KDE_IN6_IS_ADDR_MC_NODELOCAL(a) \
-	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((TQ_UINT8 *) (a))[1] & 0xf) == 0x1))
+	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((Q_UINT8 *) (a))[1] & 0xf) == 0x1))
 
 #define KDE_IN6_IS_ADDR_MC_LINKLOCAL(a) \
-	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((TQ_UINT8 *) (a))[1] & 0xf) == 0x2))
+	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((Q_UINT8 *) (a))[1] & 0xf) == 0x2))
 
 #define KDE_IN6_IS_ADDR_MC_SITELOCAL(a) \
-	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((TQ_UINT8 *) (a))[1] & 0xf) == 0x5))
+	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((Q_UINT8 *) (a))[1] & 0xf) == 0x5))
 
 #define KDE_IN6_IS_ADDR_MC_ORGLOCAL(a) \
-	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((TQ_UINT8 *) (a))[1] & 0xf) == 0x8))
+	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((Q_UINT8 *) (a))[1] & 0xf) == 0x8))
 
 #define KDE_IN6_IS_ADDR_MC_GLOBAL(a) \
-	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((TQ_UINT8 *) (a))[1] & 0xf) == 0xe))
+	(KDE_IN6_IS_ADDR_MULTICAST(a) && ((((Q_UINT8 *) (a))[1] & 0xf) == 0xe))
 
 #ifdef NEED_IN6_TESTS
 # define IN6_IS_ADDR_UNSPECIFIED	KDE_IN6_IS_ADDR_UNSPECIFIED
@@ -143,8 +143,8 @@ struct kde_sockaddr_in6
 /* Special internal structure */
 
 #define KAI_SYSTEM		0	/* data is all-system */
-#define KAI_LOCALUNIX		1	/* data tqcontains a Unix addrinfo allocated by us */
-#define KAI_QDNS		2	/* data tqcontains data derived from TQDns */
+#define KAI_LOCALUNIX		1	/* data contains a Unix addrinfo allocated by us */
+#define KAI_QDNS		2	/* data contains data derived from TQDns */
 
 struct addrinfo;		/* forward declaration; this could be needed */
 
diff --git a/kdecore/netwm.cpp b/kdecore/netwm.cpp
index 404ba9aab..9c8bd1283 100644
--- a/kdecore/netwm.cpp
+++ b/kdecore/netwm.cpp
@@ -46,7 +46,7 @@ static Atom UTF8_STRING = 0;
 static Atom net_supported            = 0;
 static Atom net_client_list          = 0;
 static Atom net_client_list_stacking = 0;
-static Atom net_desktop_tqgeometry     = 0;
+static Atom net_desktop_geometry     = 0;
 static Atom net_desktop_viewport     = 0;
 static Atom net_current_desktop      = 0;
 static Atom net_desktop_names        = 0;
@@ -56,7 +56,7 @@ static Atom net_workarea             = 0;
 static Atom net_supporting_wm_check  = 0;
 static Atom net_virtual_roots        = 0;
 static Atom net_showing_desktop      = 0;
-static Atom net_desktop_tqlayout       = 0;
+static Atom net_desktop_layout       = 0;
 
 // root window messages
 static Atom net_close_window         = 0;
@@ -74,7 +74,7 @@ static Atom net_wm_window_type       = 0;
 static Atom net_wm_state             = 0;
 static Atom net_wm_strut             = 0;
 static Atom net_wm_extended_strut    = 0; // the atom is called _NET_WM_STRUT_PARTIAL
-static Atom net_wm_icon_tqgeometry     = 0;
+static Atom net_wm_icon_geometry     = 0;
 static Atom net_wm_icon              = 0;
 static Atom net_wm_pid               = 0;
 static Atom net_wm_user_time         = 0;
@@ -149,7 +149,7 @@ static Atom xa_wm_state = 0;
 static Atom net_wm_full_placement = 0;
 
 static Bool netwm_atoms_created      = False;
-const unsigned long netwm_sendevent_tqmask = (SubstructureRedirectMask|
+const unsigned long netwm_sendevent_mask = (SubstructureRedirectMask|
 					     SubstructureNotifyMask);
 
 
@@ -346,14 +346,14 @@ static void create_atoms(Display *d) {
 	    &net_client_list,
 	    &net_client_list_stacking,
 	    &net_number_of_desktops,
-	    &net_desktop_tqgeometry,
+	    &net_desktop_geometry,
 	    &net_desktop_viewport,
 	    &net_current_desktop,
 	    &net_desktop_names,
 	    &net_active_window,
 	    &net_workarea,
 	    &net_virtual_roots,
-            &net_desktop_tqlayout,
+            &net_desktop_layout,
             &net_showing_desktop,
 	    &net_close_window,
             &net_restack_window,
@@ -369,7 +369,7 @@ static void create_atoms(Display *d) {
 	    &net_wm_state,
 	    &net_wm_strut,
             &net_wm_extended_strut,
-	    &net_wm_icon_tqgeometry,
+	    &net_wm_icon_geometry,
 	    &net_wm_icon,
 	    &net_wm_pid,
 	    &net_wm_user_time,
@@ -623,9 +623,9 @@ NETRootInfo::NETRootInfo(Display *display, Window supportWindow, const char *wmN
     p->kde_system_tray_windows = 0;
     p->kde_system_tray_windows_count = 0;
     p->showing_desktop = false;
-    p->desktop_tqlayout_orientation = OrientationHorizontal;
-    p->desktop_tqlayout_corner = DesktopLayoutCornerTopLeft;
-    p->desktop_tqlayout_columns = p->desktop_tqlayout_rows = 0;
+    p->desktop_layout_orientation = OrientationHorizontal;
+    p->desktop_layout_corner = DesktopLayoutCornerTopLeft;
+    p->desktop_layout_columns = p->desktop_layout_rows = 0;
     setDefaultProperties();
     if( properties_size > PROPERTIES_SIZE ) {
         fprintf( stderr, "NETRootInfo::NETRootInfo(): properties array too large\n");
@@ -724,9 +724,9 @@ NETRootInfo::NETRootInfo(Display *display, const unsigned long properties[], int
     p->kde_system_tray_windows = 0;
     p->kde_system_tray_windows_count = 0;
     p->showing_desktop = false;
-    p->desktop_tqlayout_orientation = OrientationHorizontal;
-    p->desktop_tqlayout_corner = DesktopLayoutCornerTopLeft;
-    p->desktop_tqlayout_columns = p->desktop_tqlayout_rows = 0;
+    p->desktop_layout_orientation = OrientationHorizontal;
+    p->desktop_layout_corner = DesktopLayoutCornerTopLeft;
+    p->desktop_layout_columns = p->desktop_layout_rows = 0;
     setDefaultProperties();
     if( properties_size > 2 ) {
         fprintf( stderr, "NETWinInfo::NETWinInfo(): properties array too large\n");
@@ -785,9 +785,9 @@ NETRootInfo::NETRootInfo(Display *display, unsigned long properties, int screen,
     p->kde_system_tray_windows = 0;
     p->kde_system_tray_windows_count = 0;
     p->showing_desktop = false;
-    p->desktop_tqlayout_orientation = OrientationHorizontal;
-    p->desktop_tqlayout_corner = DesktopLayoutCornerTopLeft;
-    p->desktop_tqlayout_columns = p->desktop_tqlayout_rows = 0;
+    p->desktop_layout_orientation = OrientationHorizontal;
+    p->desktop_layout_corner = DesktopLayoutCornerTopLeft;
+    p->desktop_layout_columns = p->desktop_layout_rows = 0;
     setDefaultProperties();
     p->client_properties[ PROTOCOLS ] = properties;
     for( int i = 0; i < PROPERTIES_SIZE; ++i )
@@ -989,7 +989,7 @@ void NETRootInfo::setNumberOfDesktops(int numberOfDesktops) {
 	e.xclient.data.l[3] = 0l;
 	e.xclient.data.l[4] = 0l;
 
-	XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
     }
 }
 
@@ -1021,7 +1021,7 @@ void NETRootInfo::setCurrentDesktop(int desktop) {
 	e.xclient.data.l[3] = 0l;
 	e.xclient.data.l[4] = 0l;
 
-	XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
     }
 }
 
@@ -1062,37 +1062,37 @@ void NETRootInfo::setDesktopName(int desktop, const char *desktopName) {
 }
 
 
-void NETRootInfo::setDesktopGeometry(int , const NETSize &tqgeometry) {
+void NETRootInfo::setDesktopGeometry(int , const NETSize &geometry) {
 
 #ifdef    NETWMDEBUG
     fprintf(stderr, "NETRootInfo::setDesktopGeometry( -- , { %d, %d }) (%s)\n",
-	    tqgeometry.width, tqgeometry.height, (role == WindowManager) ? "WM" : "Client");
+	    geometry.width, geometry.height, (role == WindowManager) ? "WM" : "Client");
 #endif
 
     if (role == WindowManager) {
-	p->tqgeometry = tqgeometry;
+	p->geometry = geometry;
 
 	long data[2];
-	data[0] = p->tqgeometry.width;
-	data[1] = p->tqgeometry.height;
+	data[0] = p->geometry.width;
+	data[1] = p->geometry.height;
 
-	XChangeProperty(p->display, p->root, net_desktop_tqgeometry, XA_CARDINAL, 32,
+	XChangeProperty(p->display, p->root, net_desktop_geometry, XA_CARDINAL, 32,
 			PropModeReplace, (unsigned char *) data, 2);
     } else {
 	XEvent e;
 
 	e.xclient.type = ClientMessage;
-	e.xclient.message_type = net_desktop_tqgeometry;
+	e.xclient.message_type = net_desktop_geometry;
 	e.xclient.display = p->display;
 	e.xclient.window = p->root;
 	e.xclient.format = 32;
-	e.xclient.data.l[0] = tqgeometry.width;
-	e.xclient.data.l[1] = tqgeometry.height;
+	e.xclient.data.l[0] = geometry.width;
+	e.xclient.data.l[1] = geometry.height;
 	e.xclient.data.l[2] = 0l;
 	e.xclient.data.l[3] = 0l;
 	e.xclient.data.l[4] = 0l;
 
-	XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
     }
 }
 
@@ -1135,7 +1135,7 @@ void NETRootInfo::setDesktopViewport(int desktop, const NETPoint &viewport) {
 	e.xclient.data.l[3] = 0l;
 	e.xclient.data.l[4] = 0l;
 
-	XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
     }
 }
 
@@ -1166,7 +1166,7 @@ void NETRootInfo::setSupported() {
 	atoms[pnum++] = net_number_of_desktops;
 
     if (p->properties[ PROTOCOLS ] & DesktopGeometry)
-	atoms[pnum++] = net_desktop_tqgeometry;
+	atoms[pnum++] = net_desktop_geometry;
 
     if (p->properties[ PROTOCOLS ] & DesktopViewport)
 	atoms[pnum++] = net_desktop_viewport;
@@ -1187,7 +1187,7 @@ void NETRootInfo::setSupported() {
 	atoms[pnum++] = net_virtual_roots;
 
     if (p->properties[ PROTOCOLS2 ] & WM2DesktopLayout)
-	atoms[pnum++] = net_desktop_tqlayout;
+	atoms[pnum++] = net_desktop_layout;
 
     if (p->properties[ PROTOCOLS ] & CloseWindow)
 	atoms[pnum++] = net_close_window;
@@ -1299,7 +1299,7 @@ void NETRootInfo::setSupported() {
 	atoms[pnum++] = net_wm_extended_strut;
 
     if (p->properties[ PROTOCOLS ] & WMIconGeometry)
-	atoms[pnum++] = net_wm_icon_tqgeometry;
+	atoms[pnum++] = net_wm_icon_geometry;
 
     if (p->properties[ PROTOCOLS ] & WMIcon)
 	atoms[pnum++] = net_wm_icon;
@@ -1402,7 +1402,7 @@ void NETRootInfo::updateSupportedProperties( Atom atom )
     else if( atom == net_number_of_desktops )
         p->properties[ PROTOCOLS ] |= NumberOfDesktops;
 
-    else if( atom == net_desktop_tqgeometry )
+    else if( atom == net_desktop_geometry )
         p->properties[ PROTOCOLS ] |= DesktopGeometry;
 
     else if( atom == net_desktop_viewport )
@@ -1423,7 +1423,7 @@ void NETRootInfo::updateSupportedProperties( Atom atom )
     else if( atom == net_virtual_roots )
         p->properties[ PROTOCOLS ] |= VirtualRoots;
 
-    else if( atom == net_desktop_tqlayout )
+    else if( atom == net_desktop_layout )
         p->properties[ PROTOCOLS2 ] |= WM2DesktopLayout;
 
     else if( atom == net_close_window )
@@ -1533,7 +1533,7 @@ void NETRootInfo::updateSupportedProperties( Atom atom )
     else if( atom == net_wm_extended_strut )
         p->properties[ PROTOCOLS2 ] |= WM2ExtendedStrut;
 
-    else if( atom == net_wm_icon_tqgeometry )
+    else if( atom == net_wm_icon_geometry )
         p->properties[ PROTOCOLS ] |= WMIconGeometry;
 
     else if( atom == net_wm_icon )
@@ -1631,7 +1631,7 @@ void NETRootInfo::setActiveWindow(Window window, NET::RequestSource src,
 	e.xclient.data.l[3] = 0l;
 	e.xclient.data.l[4] = 0l;
 
-	XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
     }
 }
 
@@ -1685,10 +1685,10 @@ void NETRootInfo::setVirtualRoots(Window *windows, unsigned int count) {
 void NETRootInfo::setDesktopLayout(NET::Orientation orientation, int columns, int rows,
     NET::DesktopLayoutCorner corner)
 {
-    p->desktop_tqlayout_orientation = orientation;
-    p->desktop_tqlayout_columns = columns;
-    p->desktop_tqlayout_rows = rows;
-    p->desktop_tqlayout_corner = corner;
+    p->desktop_layout_orientation = orientation;
+    p->desktop_layout_columns = columns;
+    p->desktop_layout_rows = rows;
+    p->desktop_layout_corner = corner;
 
 #ifdef   NETWMDEBUG
     fprintf(stderr, "NETRootInfo::setDesktopLayout: %d %d %d %d\n",
@@ -1700,7 +1700,7 @@ void NETRootInfo::setDesktopLayout(NET::Orientation orientation, int columns, in
     data[ 1 ] = columns;
     data[ 2 ] = rows;
     data[ 3 ] = corner;
-    XChangeProperty(p->display, p->root, net_desktop_tqlayout, XA_CARDINAL, 32,
+    XChangeProperty(p->display, p->root, net_desktop_layout, XA_CARDINAL, 32,
 		    PropModeReplace, (unsigned char *) &data, 4);
 }
 
@@ -1724,7 +1724,7 @@ void NETRootInfo::setShowingDesktop( bool showing ) {
 	e.xclient.data.l[3] = 0;
 	e.xclient.data.l[4] = 0;
 
-	XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
     }
 }
 
@@ -1754,7 +1754,7 @@ void NETRootInfo::closeWindowRequest(Window window) {
     e.xclient.data.l[3] = 0l;
     e.xclient.data.l[4] = 0l;
 
-    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 }
 
 
@@ -1781,7 +1781,7 @@ void NETRootInfo::moveResizeRequest(Window window, int x_root, int y_root,
     e.xclient.data.l[3] = 0l;
     e.xclient.data.l[4] = 0l;
 
-    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 }
 
 void NETRootInfo::moveResizeWindowRequest(Window window, int flags, int x, int y, int width, int height )
@@ -1806,7 +1806,7 @@ void NETRootInfo::moveResizeWindowRequest(Window window, int flags, int x, int y
     e.xclient.data.l[3] = width;
     e.xclient.data.l[4] = height;
 
-    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 }
 
 void NETRootInfo::restackRequest(Window window, Window above, int detail)
@@ -1835,7 +1835,7 @@ void NETRootInfo::restackRequest(Window window, RequestSource src, Window above,
     e.xclient.data.l[3] = timestamp;
     e.xclient.data.l[4] = 0l;
 
-    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 }
 
 void NETRootInfo2::sendPing( Window window, Time timestamp )
@@ -1937,7 +1937,7 @@ void NETRootInfo::event(XEvent *event, unsigned long* properties, int properties
 #endif
 
 	    changeNumberOfDesktops(event->xclient.data.l[0]);
-	} else if (event->xclient.message_type == net_desktop_tqgeometry) {
+	} else if (event->xclient.message_type == net_desktop_geometry) {
 	    dirty = DesktopGeometry;
 
 	    NETSize sz;
@@ -2125,7 +2125,7 @@ void NETRootInfo::event(XEvent *event, unsigned long* properties, int properties
 		dirty |= WorkArea;
 	    else if (pe.xproperty.atom == net_number_of_desktops)
 		dirty |= NumberOfDesktops;
-	    else if (pe.xproperty.atom == net_desktop_tqgeometry)
+	    else if (pe.xproperty.atom == net_desktop_geometry)
 		dirty |= DesktopGeometry;
 	    else if (pe.xproperty.atom == net_desktop_viewport)
 		dirty |= DesktopViewport;
@@ -2141,7 +2141,7 @@ void NETRootInfo::event(XEvent *event, unsigned long* properties, int properties
                 dirty |= SupportingWMCheck;
             else if (pe.xproperty.atom == net_virtual_roots )
                 dirty |= VirtualRoots;
-            else if (pe.xproperty.atom == net_desktop_tqlayout )
+            else if (pe.xproperty.atom == net_desktop_layout )
                 dirty2 |= WM2DesktopLayout;
 	    else {
 
@@ -2396,8 +2396,8 @@ void NETRootInfo::update( const unsigned long dirty_props[] )
     }
 
     if (dirty & DesktopGeometry) {
-        p->tqgeometry = p->rootSize;
-	if (XGetWindowProperty(p->display, p->root, net_desktop_tqgeometry,
+        p->geometry = p->rootSize;
+	if (XGetWindowProperty(p->display, p->root, net_desktop_geometry,
 			       0l, 2l, False, XA_CARDINAL, &type_ret, &format_ret,
 			       &nitems_ret, &unused, &data_ret)
 	    == Success) {
@@ -2405,11 +2405,11 @@ void NETRootInfo::update( const unsigned long dirty_props[] )
 		nitems_ret == 2) {
 		long *data = (long *) data_ret;
 
-		p->tqgeometry.width  = data[0];
-		p->tqgeometry.height = data[1];
+		p->geometry.width  = data[0];
+		p->geometry.height = data[1];
 
 #ifdef    NETWMDEBUG
-		fprintf(stderr, "NETRootInfo::update: desktop tqgeometry updated\n");
+		fprintf(stderr, "NETRootInfo::update: desktop geometry updated\n");
 #endif
 	    }
 	    if ( data_ret )
@@ -2609,29 +2609,29 @@ void NETRootInfo::update( const unsigned long dirty_props[] )
     }
 
     if (dirty2 & WM2DesktopLayout) {
-        p->desktop_tqlayout_orientation = OrientationHorizontal;
-        p->desktop_tqlayout_corner = DesktopLayoutCornerTopLeft;
-        p->desktop_tqlayout_columns = p->desktop_tqlayout_rows = 0;
-	if (XGetWindowProperty(p->display, p->root, net_desktop_tqlayout,
+        p->desktop_layout_orientation = OrientationHorizontal;
+        p->desktop_layout_corner = DesktopLayoutCornerTopLeft;
+        p->desktop_layout_columns = p->desktop_layout_rows = 0;
+	if (XGetWindowProperty(p->display, p->root, net_desktop_layout,
 			       0, MAX_PROP_SIZE, False, XA_CARDINAL, &type_ret,
 			       &format_ret, &nitems_ret, &unused, &data_ret)
 	    == Success) {
 	    if (type_ret == XA_CARDINAL && format_ret == 32) {
                 long* data = (long*) data_ret;
                 if( nitems_ret >= 4 && data[ 3 ] >= 0 && data[ 3 ] <= 3 )
-                    p->desktop_tqlayout_corner = (NET::DesktopLayoutCorner)data[ 3 ];
+                    p->desktop_layout_corner = (NET::DesktopLayoutCorner)data[ 3 ];
                 if( nitems_ret >= 3 ) {
                     if( data[ 0 ] >= 0 && data[ 0 ] <= 1 )
-                        p->desktop_tqlayout_orientation = (NET::Orientation)data[ 0 ];
-                    p->desktop_tqlayout_columns = data[ 1 ];
-                    p->desktop_tqlayout_rows = data[ 2 ];
+                        p->desktop_layout_orientation = (NET::Orientation)data[ 0 ];
+                    p->desktop_layout_columns = data[ 1 ];
+                    p->desktop_layout_rows = data[ 2 ];
                 }
 	    }
 
 #ifdef    NETWMDEBUG
-	    fprintf(stderr, "NETRootInfo::updated: desktop tqlayout updated (%d %d %d %d)\n",
-                p->desktop_tqlayout_orientation, p->desktop_tqlayout_columns,
-                p->desktop_tqlayout_rows, p->desktop_tqlayout_corner );
+	    fprintf(stderr, "NETRootInfo::updated: desktop layout updated (%d %d %d %d)\n",
+                p->desktop_layout_orientation, p->desktop_layout_columns,
+                p->desktop_layout_rows, p->desktop_layout_corner );
 #endif
 	    if ( data_ret )
 		XFree(data_ret);
@@ -2750,7 +2750,7 @@ int NETRootInfo::kdeSystemTrayWindowsCount() const {
 
 
 NETSize NETRootInfo::desktopGeometry(int) const {
-    return p->tqgeometry.width != 0 ? p->tqgeometry : p->rootSize;
+    return p->geometry.width != 0 ? p->geometry : p->rootSize;
 }
 
 
@@ -2794,17 +2794,17 @@ int NETRootInfo::virtualRootsCount() const {
 
 
 NET::Orientation NETRootInfo::desktopLayoutOrientation() const {
-    return p->desktop_tqlayout_orientation;
+    return p->desktop_layout_orientation;
 }
 
 
 TQSize NETRootInfo::desktopLayoutColumnsRows() const {
-    return TQSize( p->desktop_tqlayout_columns, p->desktop_tqlayout_rows );
+    return TQSize( p->desktop_layout_columns, p->desktop_layout_rows );
 }
 
 
 NET::DesktopLayoutCorner NETRootInfo::desktopLayoutCorner() const {
-    return p->desktop_tqlayout_corner;
+    return p->desktop_layout_corner;
 }
 
 
@@ -2982,16 +2982,16 @@ const NETWinInfo &NETWinInfo::operator=(const NETWinInfo &wininfo) {
 }
 
 
-void NETWinInfo::setIcon(NETIcon icon, Bool tqreplace) {
-    setIconInternal( p->icons, p->icon_count, net_wm_icon, icon, tqreplace );
+void NETWinInfo::setIcon(NETIcon icon, Bool replace) {
+    setIconInternal( p->icons, p->icon_count, net_wm_icon, icon, replace );
 }
 
-void NETWinInfo::setIconInternal(NETRArray<NETIcon>& icons, int& icon_count, Atom property, NETIcon icon, Bool tqreplace) {
+void NETWinInfo::setIconInternal(NETRArray<NETIcon>& icons, int& icon_count, Atom property, NETIcon icon, Bool replace) {
     if (role != Client) return;
 
     int proplen, i, sz, j;
 
-    if (tqreplace) {
+    if (replace) {
 
 	for (i = 0; i < icons.size(); i++) {
 	    delete [] icons[i].data;
@@ -3040,21 +3040,21 @@ void NETWinInfo::setIconInternal(NETRArray<NETIcon>& icons, int& icon_count, Ato
 }
 
 
-void NETWinInfo::setIconGeometry(NETRect tqgeometry) {
+void NETWinInfo::setIconGeometry(NETRect geometry) {
     if (role != Client) return;
 
-    p->icon_geom = tqgeometry;
+    p->icon_geom = geometry;
 
-    if( tqgeometry.size.width == 0 ) // empty
-        XDeleteProperty(p->display, p->window, net_wm_icon_tqgeometry);
+    if( geometry.size.width == 0 ) // empty
+        XDeleteProperty(p->display, p->window, net_wm_icon_geometry);
     else {
         long data[4];
-        data[0] = tqgeometry.pos.x;
-        data[1] = tqgeometry.pos.y;
-        data[2] = tqgeometry.size.width;
-        data[3] = tqgeometry.size.height;
+        data[0] = geometry.pos.x;
+        data[1] = geometry.pos.y;
+        data[2] = geometry.size.width;
+        data[3] = geometry.size.height;
 
-        XChangeProperty(p->display, p->window, net_wm_icon_tqgeometry, XA_CARDINAL,
+        XChangeProperty(p->display, p->window, net_wm_icon_geometry, XA_CARDINAL,
 		    32, PropModeReplace, (unsigned char *) data, 4);
     }
 }
@@ -3100,7 +3100,7 @@ void NETWinInfo::setStrut(NETStrut strut) {
 }
 
 
-void NETWinInfo::setState(unsigned long state, unsigned long tqmask) {
+void NETWinInfo::setState(unsigned long state, unsigned long mask) {
     if (p->mapping_state_dirty)
 	updateWMState();
 
@@ -3117,7 +3117,7 @@ void NETWinInfo::setState(unsigned long state, unsigned long tqmask) {
 
 #ifdef NETWMDEBUG
         fprintf(stderr, "NETWinInfo::setState (0x%lx, 0x%lx) (Client)\n",
-                state, tqmask);
+                state, mask);
 #endif // NETWMDEBUG
 
 	XEvent e;
@@ -3129,141 +3129,141 @@ void NETWinInfo::setState(unsigned long state, unsigned long tqmask) {
 	e.xclient.data.l[3] = 0l;
 	e.xclient.data.l[4] = 0l;
 
-	if ((tqmask & Modal) && ((p->state & Modal) != (state & Modal))) {
+	if ((mask & Modal) && ((p->state & Modal) != (state & Modal))) {
 	    e.xclient.data.l[0] = (state & Modal) ? 1 : 0;
 	    e.xclient.data.l[1] = net_wm_state_modal;
 	    e.xclient.data.l[2] = 0l;
 
-	    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 	}
 
-	if ((tqmask & Sticky) && ((p->state & Sticky) != (state & Sticky))) {
+	if ((mask & Sticky) && ((p->state & Sticky) != (state & Sticky))) {
 	    e.xclient.data.l[0] = (state & Sticky) ? 1 : 0;
 	    e.xclient.data.l[1] = net_wm_state_sticky;
 	    e.xclient.data.l[2] = 0l;
 
-	    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 	}
 
-	if ((tqmask & Max) && (( (p->state&tqmask) & Max) != (state & Max))) {
+	if ((mask & Max) && (( (p->state&mask) & Max) != (state & Max))) {
 
-	    unsigned long wishstate = (p->state & ~tqmask) | (state & tqmask);
+	    unsigned long wishstate = (p->state & ~mask) | (state & mask);
 	    if ( ( (wishstate & MaxHoriz) != (p->state & MaxHoriz) )
 		 && ( (wishstate & MaxVert) != (p->state & MaxVert) ) ) {
 		if ( (wishstate & Max) == Max ) {
 		    e.xclient.data.l[0] = 1;
 		    e.xclient.data.l[1] = net_wm_state_max_horiz;
 		    e.xclient.data.l[2] = net_wm_state_max_vert;
-		    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+		    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 		} else if ( (wishstate & Max) == 0 ) {
 		    e.xclient.data.l[0] = 0;
 		    e.xclient.data.l[1] = net_wm_state_max_horiz;
 		    e.xclient.data.l[2] = net_wm_state_max_vert;
-		    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+		    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 		} else {
 		    e.xclient.data.l[0] = ( wishstate & MaxHoriz ) ? 1 : 0;
 		    e.xclient.data.l[1] = net_wm_state_max_horiz;
 		    e.xclient.data.l[2] = 0;
-		    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+		    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 		    e.xclient.data.l[0] = ( wishstate & MaxVert ) ? 1 : 0;
 		    e.xclient.data.l[1] = net_wm_state_max_vert;
 		    e.xclient.data.l[2] = 0;
-		    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+		    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 		}
 	    } else	if ( (wishstate & MaxVert) != (p->state & MaxVert) ) {
 		e.xclient.data.l[0] = ( wishstate & MaxVert ) ? 1 : 0;
 		e.xclient.data.l[1] = net_wm_state_max_vert;
 		e.xclient.data.l[2] = 0;
-		XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+		XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 	    } else if ( (wishstate & MaxHoriz) != (p->state & MaxHoriz) ) {
 		e.xclient.data.l[0] = ( wishstate & MaxHoriz ) ? 1 : 0;
 		e.xclient.data.l[1] = net_wm_state_max_horiz;
 		e.xclient.data.l[2] = 0;
-		XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+		XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 	    }
 	}
 
-	if ((tqmask & Shaded) && ((p->state & Shaded) != (state & Shaded))) {
+	if ((mask & Shaded) && ((p->state & Shaded) != (state & Shaded))) {
 	    e.xclient.data.l[0] = (state & Shaded) ? 1 : 0;
 	    e.xclient.data.l[1] = net_wm_state_shaded;
 	    e.xclient.data.l[2] = 0l;
 
-	    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 	}
 
-	if ((tqmask & SkipTaskbar) &&
+	if ((mask & SkipTaskbar) &&
 	    ((p->state & SkipTaskbar) != (state & SkipTaskbar))) {
 	    e.xclient.data.l[0] = (state & SkipTaskbar) ? 1 : 0;
 	    e.xclient.data.l[1] = net_wm_state_skip_taskbar;
 	    e.xclient.data.l[2] = 0l;
 
-	    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 	}
 
-        if ((tqmask & SkipPager) &&
+        if ((mask & SkipPager) &&
 	    ((p->state & SkipPager) != (state & SkipPager))) {
             e.xclient.data.l[0] = (state & SkipPager) ? 1 : 0;
             e.xclient.data.l[1] = net_wm_state_skip_pager;
             e.xclient.data.l[2] = 0l;
 
-            XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+            XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
         }
 
-        if ((tqmask & Hidden) &&
+        if ((mask & Hidden) &&
 	    ((p->state & Hidden) != (state & Hidden))) {
             e.xclient.data.l[0] = (state & Hidden) ? 1 : 0;
             e.xclient.data.l[1] = net_wm_state_hidden;
             e.xclient.data.l[2] = 0l;
 
-            XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+            XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
         }
 
-        if ((tqmask & FullScreen) &&
+        if ((mask & FullScreen) &&
 	    ((p->state & FullScreen) != (state & FullScreen))) {
             e.xclient.data.l[0] = (state & FullScreen) ? 1 : 0;
             e.xclient.data.l[1] = net_wm_state_fullscreen;
             e.xclient.data.l[2] = 0l;
 
-            XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+            XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
         }
 
-        if ((tqmask & KeepAbove) &&
+        if ((mask & KeepAbove) &&
 	    ((p->state & KeepAbove) != (state & KeepAbove))) {
             e.xclient.data.l[0] = (state & KeepAbove) ? 1 : 0;
             e.xclient.data.l[1] = net_wm_state_above;
             e.xclient.data.l[2] = 0l;
 
-            XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+            XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
         }
 
-        if ((tqmask & KeepBelow) &&
+        if ((mask & KeepBelow) &&
 	    ((p->state & KeepBelow) != (state & KeepBelow))) {
             e.xclient.data.l[0] = (state & KeepBelow) ? 1 : 0;
             e.xclient.data.l[1] = net_wm_state_below;
             e.xclient.data.l[2] = 0l;
 
-            XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+            XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
         }
 
-	if ((tqmask & StaysOnTop) && ((p->state & StaysOnTop) != (state & StaysOnTop))) {
+	if ((mask & StaysOnTop) && ((p->state & StaysOnTop) != (state & StaysOnTop))) {
 	    e.xclient.data.l[0] = (state & StaysOnTop) ? 1 : 0;
 	    e.xclient.data.l[1] = net_wm_state_stays_on_top;
 	    e.xclient.data.l[2] = 0l;
 
-	    XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	    XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
 	}
 
-        if ((tqmask & DemandsAttention) &&
+        if ((mask & DemandsAttention) &&
 	    ((p->state & DemandsAttention) != (state & DemandsAttention))) {
             e.xclient.data.l[0] = (state & DemandsAttention) ? 1 : 0;
             e.xclient.data.l[1] = net_wm_state_demands_attention;
             e.xclient.data.l[2] = 0l;
 
-            XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+            XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
         }
 
     } else {
-	p->state &= ~tqmask;
+	p->state &= ~mask;
 	p->state |= state;
 
 	long data[50];
@@ -3497,7 +3497,7 @@ void NETWinInfo::setDesktop(int desktop) {
 	e.xclient.data.l[3] = 0l;
 	e.xclient.data.l[4] = 0l;
 
-	XSendEvent(p->display, p->root, False, netwm_sendevent_tqmask, &e);
+	XSendEvent(p->display, p->root, False, netwm_sendevent_mask, &e);
     } else {
 	// otherwise we just set or remove the property directly
 	p->desktop = desktop;
@@ -3651,7 +3651,7 @@ NETIcon NETWinInfo::iconInternal(NETRArray<NETIcon>& icons, int icon_count, int
 	return result;
     }
 
-    // tqfind the largest icon
+    // find the largest icon
     result = icons[0];
     for (int i = 1; i < icons.size(); i++) {
 	if( icons[i].size.width >= result.size.width &&
@@ -3662,7 +3662,7 @@ NETIcon NETWinInfo::iconInternal(NETRArray<NETIcon>& icons, int icon_count, int
     // return the largest icon if w and h are -1
     if (width == -1 && height == -1) return result;
 
-    // tqfind the icon that's closest in size to w x h...
+    // find the icon that's closest in size to w x h...
     for (int i = 0; i < icons.size(); i++) {
 	if ((icons[i].size.width >= width &&
 	     icons[i].size.width < result.size.width) &&
@@ -3708,15 +3708,15 @@ void NETWinInfo::event(XEvent *event, unsigned long* properties, int properties_
 	if (event->xclient.message_type == net_wm_state) {
 	    dirty = WMState;
 
-	    // we need to generate a change tqmask
+	    // we need to generate a change mask
 
 #ifdef NETWMDEBUG
 	    fprintf(stderr,
-		    "NETWinInfo::event: state client message, getting new state/tqmask\n");
+		    "NETWinInfo::event: state client message, getting new state/mask\n");
 #endif
 
 	    int i;
-	    long state = 0, tqmask = 0;
+	    long state = 0, mask = 0;
 
 	    for (i = 1; i < 3; i++) {
 #ifdef NETWMDEBUG
@@ -3728,43 +3728,43 @@ void NETWinInfo::event(XEvent *event, unsigned long* properties, int properties_
 #endif
 
 		if ((Atom) event->xclient.data.l[i] == net_wm_state_modal)
-		    tqmask |= Modal;
+		    mask |= Modal;
 		else if ((Atom) event->xclient.data.l[i] == net_wm_state_sticky)
-		    tqmask |= Sticky;
+		    mask |= Sticky;
 		else if ((Atom) event->xclient.data.l[i] == net_wm_state_max_vert)
-		    tqmask |= MaxVert;
+		    mask |= MaxVert;
 		else if ((Atom) event->xclient.data.l[i] == net_wm_state_max_horiz)
-		    tqmask |= MaxHoriz;
+		    mask |= MaxHoriz;
 		else if ((Atom) event->xclient.data.l[i] == net_wm_state_shaded)
-		    tqmask |= Shaded;
+		    mask |= Shaded;
 		else if ((Atom) event->xclient.data.l[i] == net_wm_state_skip_taskbar)
-		    tqmask |= SkipTaskbar;
+		    mask |= SkipTaskbar;
                 else if ((Atom) event->xclient.data.l[i] == net_wm_state_skip_pager)
-		    tqmask |= SkipPager;
+		    mask |= SkipPager;
                 else if ((Atom) event->xclient.data.l[i] == net_wm_state_hidden)
-		    tqmask |= Hidden;
+		    mask |= Hidden;
                 else if ((Atom) event->xclient.data.l[i] == net_wm_state_fullscreen)
-		    tqmask |= FullScreen;
+		    mask |= FullScreen;
                 else if ((Atom) event->xclient.data.l[i] == net_wm_state_above)
-		    tqmask |= KeepAbove;
+		    mask |= KeepAbove;
                 else if ((Atom) event->xclient.data.l[i] == net_wm_state_below)
-		    tqmask |= KeepBelow;
+		    mask |= KeepBelow;
                 else if ((Atom) event->xclient.data.l[i] == net_wm_state_demands_attention)
-		    tqmask |= DemandsAttention;
+		    mask |= DemandsAttention;
 		else if ((Atom) event->xclient.data.l[i] == net_wm_state_stays_on_top)
-		    tqmask |= StaysOnTop;
+		    mask |= StaysOnTop;
 	    }
 
 	    // when removing, we just leave newstate == 0
 	    switch (event->xclient.data.l[0]) {
 	    case 1: // set
-		// to set... the change state should be the same as the tqmask
-		state = tqmask;
+		// to set... the change state should be the same as the mask
+		state = mask;
 		break;
 
 	    case 2: // toggle
 		// to toggle, we need to xor the current state with the new state
-		state = (p->state & tqmask) ^ tqmask;
+		state = (p->state & mask) ^ mask;
 		break;
 
 	    default:
@@ -3774,10 +3774,10 @@ void NETWinInfo::event(XEvent *event, unsigned long* properties, int properties_
 
 #ifdef NETWMDEBUG
 	    fprintf(stderr, "NETWinInfo::event: calling changeState(%lx, %lx)\n",
-		    state, tqmask);
+		    state, mask);
 #endif
 
-	    changeState(state, tqmask);
+	    changeState(state, mask);
 	} else if (event->xclient.message_type == net_wm_desktop) {
 	    dirty = WMDesktop;
 
@@ -3818,7 +3818,7 @@ void NETWinInfo::event(XEvent *event, unsigned long* properties, int properties_
 		dirty |= WMStrut;
 	    else if (pe.xproperty.atom == net_wm_extended_strut)
 		dirty2 |= WM2ExtendedStrut;
-	    else if (pe.xproperty.atom == net_wm_icon_tqgeometry)
+	    else if (pe.xproperty.atom == net_wm_icon_geometry)
 		dirty |= WMIconGeometry;
 	    else if (pe.xproperty.atom == net_wm_icon)
 		dirty |= WMIcon;
@@ -3880,7 +3880,7 @@ void NETWinInfo::event(XEvent *event, unsigned long* properties, int properties_
 
 	dirty |= WMGeometry;
 
-	// update window tqgeometry
+	// update window geometry
 	p->win_geom.pos.x = event->xconfigure.x;
 	p->win_geom.pos.y = event->xconfigure.y;
 	p->win_geom.size.width = event->xconfigure.width;
@@ -4218,7 +4218,7 @@ void NETWinInfo::update(const unsigned long dirty_props[]) {
 
     if (dirty & WMIconGeometry) {
         p->icon_geom = NETRect();
-	if (XGetWindowProperty(p->display, p->window, net_wm_icon_tqgeometry, 0l, 4l,
+	if (XGetWindowProperty(p->display, p->window, net_wm_icon_geometry, 0l, 4l,
 			       False, XA_CARDINAL, &type_ret, &format_ret,
 			       &nitems_ret, &unused, &data_ret)
 	    == Success) {
@@ -4466,11 +4466,11 @@ NETExtendedStrut NETWinInfo::extendedStrut() const {
     return p->extended_strut;
 }
 
-bool NET::typeMatchesMask( WindowType type, unsigned long tqmask ) {
+bool NET::typeMatchesMask( WindowType type, unsigned long mask ) {
     switch( type ) {
 #define CHECK_TYPE_MASK( type ) \
         case type: \
-    	    if( tqmask & type##Mask ) \
+    	    if( mask & type##Mask ) \
 	        return true; \
 	    break;
         CHECK_TYPE_MASK( Normal )
@@ -4626,18 +4626,18 @@ Time NET::timestampDiff( Time time1, Time time2 ) // returns time2 - time1
 #else
 int NET::timestampCompare( unsigned long time1_, unsigned long time2_ ) // like strcmp()
     {
-    TQ_UINT32 time1 = time1_;
-    TQ_UINT32 time2 = time2_;
+    Q_UINT32 time1 = time1_;
+    Q_UINT32 time2 = time2_;
     if( time1 == time2 )
         return 0;
-    return TQ_UINT32( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping
+    return Q_UINT32( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping
     }
 
 int NET::timestampDiff( unsigned long time1_, unsigned long time2_ ) // returns time2 - time1
     { // no need to handle wrapping?
-    TQ_UINT32 time1 = time1_;
-    TQ_UINT32 time2 = time2_;
-    return TQ_UINT32( time2 - time1 );
+    Q_UINT32 time1 = time1_;
+    Q_UINT32 time2 = time2_;
+    return Q_UINT32( time2 - time1 );
     }
 #endif
 
diff --git a/kdecore/netwm.h b/kdecore/netwm.h
index 3fc86e955..cc39ada1d 100644
--- a/kdecore/netwm.h
+++ b/kdecore/netwm.h
@@ -86,7 +86,7 @@ public:
        [1]= NET::WindowTypeMask (not NET::WindowType!), [2]= NET::State,
        [3]= NET::Property2, [4]= NET::Action.
        In future versions, the list may be extended. In case you pass less elements,
-       the missing ones will be tqreplaced with default values.
+       the missing ones will be replaced with default values.
        
        @param properties_size The number of elements in the properties array.
 
@@ -251,7 +251,7 @@ public:
        to the first element of the properties argument, for the constructor
        for Clients, it's the properties argument.
        
-       Clients willing to tqfind out all properties and protocols supported
+       Clients willing to find out all properties and protocols supported
        by the WindowManager should use supportedProperties().
        
        @return an OR'ed list of protocols
@@ -316,7 +316,7 @@ public:
     int kdeSystemTrayWindowsCount() const;
 
     /**
-       Returns the desktop tqgeometry size.
+       Returns the desktop geometry size.
 
        The desktop argument is ignored. Early drafts of the NET WM
        Specification were unclear about the semantics of this property.
@@ -373,18 +373,18 @@ public:
     int virtualRootsCount() const;
 
     /**
-       Returns the desktop tqlayout orientation.
+       Returns the desktop layout orientation.
     **/
     NET::Orientation desktopLayoutOrientation() const;
 
     /**
-       Returns the desktop tqlayout number of columns and rows. Note that
+       Returns the desktop layout number of columns and rows. Note that
        either may be 0 (see _NET_DESKTOP_LAYOUT).
     **/
     TQSize desktopLayoutColumnsRows() const;
 
     /**
-       Returns the desktop tqlayout starting corner.
+       Returns the desktop layout starting corner.
     **/
     NET::DesktopLayoutCorner desktopLayoutCorner() const;
 
@@ -456,16 +456,16 @@ public:
     void setCurrentDesktop(int desktop);
 
     /**
-       Sets the desktop tqgeometry to the specified tqgeometry.
+       Sets the desktop geometry to the specified geometry.
 
        The desktop argument is ignored. Early drafts of the NET WM
        Specification were unclear about the semantics of this property.
 
        @param desktop the number of the desktop
 
-       @param tqgeometry the new size of the desktop
+       @param geometry the new size of the desktop
     **/
-    void setDesktopGeometry(int desktop, const NETSize &tqgeometry);
+    void setDesktopGeometry(int desktop, const NETSize &geometry);
 
     /**
        Sets the viewport for the current desktop to the specified point.
@@ -534,7 +534,7 @@ public:
     void setVirtualRoots(Window *windows, unsigned int count);
     
     /**
-       Sets the desktop tqlayout. This is set by the pager. When setting, the pager must
+       Sets the desktop layout. This is set by the pager. When setting, the pager must
        own the _NET_DESKTOP_LAYOUT_Sn manager selection. See _NET_DESKTOP_LAYOUT for details.
     **/
     void setDesktopLayout(NET::Orientation orientation, int columns, int rows,
@@ -633,7 +633,7 @@ public:
        This function takes the passed XEvent and returns an OR'ed list of
        NETRootInfo properties that have changed.  The new information will be
        read immediately by the class. This overloaded version returns
-       only a single tqmask, and therefore cannot check state of all properties
+       only a single mask, and therefore cannot check state of all properties
        like the other variant.
 
        @param event the event
@@ -690,7 +690,7 @@ protected:
     /**
        A Window Manager should subclass NETRootInfo and reimplement this function
        when it wants to know when a Client made a request to change the specified
-       desktop tqgeometry.
+       desktop geometry.
 
        @param desktop the number of the desktop
 
@@ -960,7 +960,7 @@ public:
        from the NET base class, in the following order: [0]= NET::Property,
        [1]= NET::Property2.
        In future versions, the list may be extended. In case you pass less elements,
-       the missing ones will be tqreplaced with default values.
+       the missing ones will be replaced with default values.
        
        @param properties_size The number of elements in the properties array.
 
@@ -1032,9 +1032,9 @@ public:
     unsigned long properties() const KDE_DEPRECATED;
 
     /**
-       Returns the icon tqgeometry.
+       Returns the icon geometry.
 
-       @return the tqgeometry of the icon
+       @return the geometry of the icon
     **/
     NETRect iconGeometry() const;
 
@@ -1067,7 +1067,7 @@ public:
        in order to support backwards compatibility and extensions
        not available in the NETWM spec, you should specify all
        window types you application supports (see the NET::WindowTypeMask
-       tqmask values for various window types). This method will
+       mask values for various window types). This method will
        return the first window type that is listed in the supported types,
        or NET::Unknown if none of the window types is supported.
 
@@ -1161,22 +1161,22 @@ public:
     MappingState mappingState() const;
 
     /**
-       Set icons for the application window.  If tqreplace is True, then
-       the specified icon is defined to be the only icon.  If tqreplace is False,
+       Set icons for the application window.  If replace is True, then
+       the specified icon is defined to be the only icon.  If replace is False,
        then the specified icon is added to a list of icons.
 
        @param icon the new icon
        
-       @param tqreplace true to tqreplace, false to append to the list of icons
+       @param replace true to replace, false to append to the list of icons
     **/
-    void setIcon(NETIcon icon, Bool tqreplace = True);
+    void setIcon(NETIcon icon, Bool replace = True);
 
     /**
-       Set the icon tqgeometry for the application window.
+       Set the icon geometry for the application window.
 
-       @param tqgeometry the new icon tqgeometry
+       @param geometry the new icon geometry
     **/
-    void setIconGeometry(NETRect tqgeometry);
+    void setIconGeometry(NETRect geometry);
 
     /**
        Set the extended (partial) strut for the application window.
@@ -1201,9 +1201,9 @@ public:
 
        @param state the name state
 
-       @param tqmask the tqmask for the state
+       @param mask the mask for the state
     **/
-    void setState(unsigned long state, unsigned long tqmask);
+    void setState(unsigned long state, unsigned long mask);
 
     /**
        Sets the window type for this client (see the NET base class
@@ -1291,7 +1291,7 @@ public:
 
     /**
        Returns an icon.  If width and height are passed, the icon returned will be
-       the closest it can tqfind (the next biggest).  If width and height are omitted,
+       the closest it can find (the next biggest).  If width and height are omitted,
        then the largest icon in the list is returned.
 
        @param width the preferred width for the icon, -1 to ignore
@@ -1382,12 +1382,12 @@ public:
     const char* clientMachine() const;
 
     /**
-       Places the window frame tqgeometry in frame, and the application window
-       tqgeometry in window.  Both geometries are relative to the root window.
+       Places the window frame geometry in frame, and the application window
+       geometry in window.  Both geometries are relative to the root window.
 
-       @param frame the tqgeometry for the frame
+       @param frame the geometry for the frame
 
-       @param window the tqgeometry for the window
+       @param window the geometry for the window
     **/
     void kdeGeometry(NETRect &frame, NETRect &window);
 
@@ -1412,7 +1412,7 @@ public:
        This function takes the pass XEvent and returns an OR'ed list of NETWinInfo
        properties that have changed.  The new information will be read
        immediately by the class. This overloaded version returns
-       only a single tqmask, and therefore cannot check state of all properties
+       only a single mask, and therefore cannot check state of all properties
        like the other variant.
 
        @param event the event
@@ -1447,14 +1447,14 @@ protected:
 
        @param state the new state
 
-       @param tqmask the tqmask for the state
+       @param mask the mask for the state
     **/
-    virtual void changeState(unsigned long state, unsigned long tqmask) { Q_UNUSED(state); Q_UNUSED(tqmask); }
+    virtual void changeState(unsigned long state, unsigned long mask) { Q_UNUSED(state); Q_UNUSED(mask); }
 
 private:
     void update( const unsigned long[] );
     void updateWMState();
-    void setIconInternal(NETRArray<NETIcon>& icons, int& icon_count, Atom property, NETIcon icon, Bool tqreplace);
+    void setIconInternal(NETRArray<NETIcon>& icons, int& icon_count, Atom property, NETIcon icon, Bool replace);
     NETIcon iconInternal(NETRArray<NETIcon>& icons, int icon_count, int width, int height) const;
     Role role;
 
diff --git a/kdecore/netwm_def.h b/kdecore/netwm_def.h
index fce97c445..1f6860243 100644
--- a/kdecore/netwm_def.h
+++ b/kdecore/netwm_def.h
@@ -340,10 +340,10 @@ public:
     enum { AllTypesMask = 0LU-1 };
 
     /**
-     * Returns true if the given window type matches the tqmask given
+     * Returns true if the given window type matches the mask given
      * using WindowTypeMask flags.
      */    
-    static bool typeMatchesMask( WindowType type, unsigned long tqmask );
+    static bool typeMatchesMask( WindowType type, unsigned long mask );
 
     /**
        Window state.
@@ -643,7 +643,7 @@ public:
     };
     
     /**
-     Starting corner for desktop tqlayout.
+     Starting corner for desktop layout.
     **/
     enum DesktopLayoutCorner {
         DesktopLayoutCornerTopLeft = 0,
diff --git a/kdecore/netwm_p.h b/kdecore/netwm_p.h
index 17afca698..a2395c4ac 100644
--- a/kdecore/netwm_p.h
+++ b/kdecore/netwm_p.h
@@ -93,7 +93,7 @@ struct NETRootInfoPrivate {
     // and requires updates
     NETRArray<NETPoint> viewport;
     NETRArray<NETRect> workarea;
-    NETSize tqgeometry;
+    NETSize geometry;
     Window active;
     Window *clients, *stacking, *virtual_roots, *kde_system_tray_windows;
     NETRArray<const char *> desktop_names;
@@ -103,9 +103,9 @@ struct NETRootInfoPrivate {
     unsigned long clients_count, stacking_count, virtual_roots_count,
 	kde_system_tray_windows_count;
     bool showing_desktop;
-    NET::Orientation desktop_tqlayout_orientation;
-    NET::DesktopLayoutCorner desktop_tqlayout_corner;
-    int desktop_tqlayout_columns, desktop_tqlayout_rows;
+    NET::Orientation desktop_layout_orientation;
+    NET::DesktopLayoutCorner desktop_layout_corner;
+    int desktop_layout_columns, desktop_layout_rows;
 
     unsigned long properties[ 5 ];
     unsigned long client_properties[ 5 ]; // properties the client is interested in
diff --git a/kdecore/network/Makefile.am b/kdecore/network/Makefile.am
index b82eaa715..71ed013d9 100644
--- a/kdecore/network/Makefile.am
+++ b/kdecore/network/Makefile.am
@@ -55,5 +55,5 @@ noinst_HEADERS = kresolver_p.h \
 configdir = $(kde_confdir)
 config_DATA = ipv6blacklist
 
-# let autotqmoc handle all of the meta source files (tqmoc)
+# let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/kdecore/network/kbufferedsocket.cpp b/kdecore/network/kbufferedsocket.cpp
index 85b433193..04115c051 100644
--- a/kdecore/network/kbufferedsocket.cpp
+++ b/kdecore/network/kbufferedsocket.cpp
@@ -94,7 +94,7 @@ void KBufferedSocket::close()
 }
 
 #ifdef USE_QT3
-TQ_LONG KBufferedSocket::bytesAvailable() const
+Q_LONG KBufferedSocket::bytesAvailable() const
 #endif
 #ifdef USE_QT4
 qint64 KBufferedSocket::bytesAvailable() const
@@ -106,9 +106,9 @@ qint64 KBufferedSocket::bytesAvailable() const
   return d->input->length();
 }
 
-TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout)
+Q_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout)
 {
-  TQ_LONG retval = KStreamSocket::waitForMore(msecs, timeout);
+  Q_LONG retval = KStreamSocket::waitForMore(msecs, timeout);
   if (d->input)
     {
       resetError();
@@ -118,7 +118,7 @@ TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout)
   return retval;
 }
 
-TQ_LONG KBufferedSocket::readBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KBufferedSocket::readBlock(char *data, Q_ULONG maxlen)
 {
   if (d->input)
     {
@@ -134,13 +134,13 @@ TQ_LONG KBufferedSocket::readBlock(char *data, TQ_ULONG maxlen)
   return KStreamSocket::readBlock(data, maxlen);
 }
 
-TQ_LONG KBufferedSocket::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+Q_LONG KBufferedSocket::readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from)
 {
   from = peerAddress();
   return readBlock(data, maxlen);
 }
 
-TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KBufferedSocket::peekBlock(char *data, Q_ULONG maxlen)
 {
   if (d->input)
     {
@@ -156,13 +156,13 @@ TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
   return KStreamSocket::peekBlock(data, maxlen);
 }
 
-TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+Q_LONG KBufferedSocket::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from)
 {
   from = peerAddress();
   return peekBlock(data, maxlen);
 }
 
-TQ_LONG KBufferedSocket::writeBlock(const char *data, TQ_ULONG len)
+Q_LONG KBufferedSocket::writeBlock(const char *data, Q_ULONG len)
 {
   if (state() != Connected)
     {
@@ -192,7 +192,7 @@ TQ_LONG KBufferedSocket::writeBlock(const char *data, TQ_ULONG len)
   return KStreamSocket::writeBlock(data, len);
 }
 
-TQ_LONG KBufferedSocket::writeBlock(const char *data, TQ_ULONG maxlen,
+Q_LONG KBufferedSocket::writeBlock(const char *data, Q_ULONG maxlen,
 				   const KSocketAddress&)
 {
   // ignore the third parameter
@@ -285,7 +285,7 @@ KIOBufferBase* KBufferedSocket::outputBuffer()
 }
 
 #ifdef USE_QT3
-TQ_ULONG KBufferedSocket::bytesToWrite() const
+Q_ULONG KBufferedSocket::bytesToWrite() const
 #endif
 #ifdef USE_QT4
 qint64 KBufferedSocket::bytesToWrite() const
@@ -332,7 +332,7 @@ void KBufferedSocket::slotReadActivity()
   if (d->input && state() == Connected)
     {
       mutex()->lock();
-      TQ_LONG len = d->input->receiveFrom(socketDevice());
+      Q_LONG len = d->input->receiveFrom(socketDevice());
 
       if (len == -1)
 	{
@@ -380,7 +380,7 @@ void KBufferedSocket::slotWriteActivity()
       (state() == Connected || state() == Closing))
     {
       mutex()->lock();
-      TQ_LONG len = d->output->sendTo(socketDevice());
+      Q_LONG len = d->output->sendTo(socketDevice());
 
       if (len == -1)
 	{
diff --git a/kdecore/network/kbufferedsocket.h b/kdecore/network/kbufferedsocket.h
index 3dd09af43..bca034002 100644
--- a/kdecore/network/kbufferedsocket.h
+++ b/kdecore/network/kbufferedsocket.h
@@ -99,7 +99,7 @@ public:
    * Make use of the buffers.
    */
 #ifdef USE_QT3
-  virtual TQ_LONG bytesAvailable() const;
+  virtual Q_LONG bytesAvailable() const;
 #endif
 #ifdef USE_QT4
   virtual qint64 bytesAvailable() const;
@@ -108,12 +108,12 @@ public:
   /**
    * Make use of buffers.
    */
-  virtual TQ_LONG waitForMore(int msecs, bool *timeout = 0L);
+  virtual Q_LONG waitForMore(int msecs, bool *timeout = 0L);
 
   /**
    * Reads data from the socket. Make use of buffers.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen);
 
   /**
    * @overload
@@ -121,12 +121,12 @@ public:
    *
    * The @p from parameter is always set to @ref peerAddress()
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Peeks data from the socket.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen);
 
   /**
    * @overload
@@ -134,12 +134,12 @@ public:
    *
    * The @p from parameter is always set to @ref peerAddress()
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen, KSocketAddress &from);
 
   /**
    * Writes data to the socket.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len);
 
   /**
    * @overload
@@ -147,7 +147,7 @@ public:
    *
    * The @p to parameter is discarded.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to);
 
   /**
    * Catch changes.
@@ -183,7 +183,7 @@ public:
    * Returns the length of the output buffer.
    */
 #ifdef USE_QT3
-  virtual TQ_ULONG bytesToWrite() const;
+  virtual Q_ULONG bytesToWrite() const;
 #endif
 #ifdef USE_QT4
   virtual qint64 bytesToWrite() const;
diff --git a/kdecore/network/kclientsocketbase.cpp b/kdecore/network/kclientsocketbase.cpp
index 5cb87d391..7ac3ca3b1 100644
--- a/kdecore/network/kclientsocketbase.cpp
+++ b/kdecore/network/kclientsocketbase.cpp
@@ -140,7 +140,7 @@ bool KClientSocketBase::lookup()
     {
       if (d->localResolver.serviceName().isNull() &&
 	  !d->localResolver.nodeName().isNull())
-	d->localResolver.setServiceName(TQString::tqfromLatin1(""));
+	d->localResolver.setServiceName(TQString::fromLatin1(""));
 
       // don't restart the lookups if they had succeeded and
       // the input values weren't changed
@@ -279,7 +279,7 @@ void KClientSocketBase::close()
 
 // This function is unlike all the others because it is const
 #ifdef USE_QT3
-TQ_LONG KClientSocketBase::bytesAvailable() const
+Q_LONG KClientSocketBase::bytesAvailable() const
 #endif
 #ifdef USE_QT4
 qint64 KClientSocketBase::bytesAvailable() const
@@ -291,10 +291,10 @@ qint64 KClientSocketBase::bytesAvailable() const
 // All the functions below look really alike
 // Should I use a macro to define them?
 
-TQ_LONG KClientSocketBase::waitForMore(int msecs, bool *timeout)
+Q_LONG KClientSocketBase::waitForMore(int msecs, bool *timeout)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->waitForMore(msecs, timeout);
+  Q_LONG retval = socketDevice()->waitForMore(msecs, timeout);
   if (retval == -1)
     {
       copyError();
@@ -303,10 +303,10 @@ TQ_LONG KClientSocketBase::waitForMore(int msecs, bool *timeout)
   return retval;
 }
 
-TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KClientSocketBase::readBlock(char *data, Q_ULONG maxlen)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->readBlock(data, maxlen);
+  Q_LONG retval = socketDevice()->readBlock(data, maxlen);
   if (retval == -1)
     {
       copyError();
@@ -315,10 +315,10 @@ TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+Q_LONG KClientSocketBase::readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->readBlock(data, maxlen, from);
+  Q_LONG retval = socketDevice()->readBlock(data, maxlen, from);
   if (retval == -1)
     {
       copyError();
@@ -327,10 +327,10 @@ TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress
   return retval;
 }
 
-TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KClientSocketBase::peekBlock(char *data, Q_ULONG maxlen)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->peekBlock(data, maxlen);
+  Q_LONG retval = socketDevice()->peekBlock(data, maxlen);
   if (retval == -1)
     {
       copyError();
@@ -339,10 +339,10 @@ TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+Q_LONG KClientSocketBase::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->peekBlock(data, maxlen, from);
+  Q_LONG retval = socketDevice()->peekBlock(data, maxlen, from);
   if (retval == -1)
     {
       copyError();
@@ -351,10 +351,10 @@ TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress
   return retval;
 }
 
-TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len)
+Q_LONG KClientSocketBase::writeBlock(const char *data, Q_ULONG len)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->writeBlock(data, len);
+  Q_LONG retval = socketDevice()->writeBlock(data, len);
   if (retval == -1)
     {
       copyError();
@@ -363,10 +363,10 @@ TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len)
   return retval;
 }
 
-TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+Q_LONG KClientSocketBase::writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->writeBlock(data, len, to);
+  Q_LONG retval = socketDevice()->writeBlock(data, len, to);
   if (retval == -1)
     {
       copyError();
diff --git a/kdecore/network/kclientsocketbase.h b/kdecore/network/kclientsocketbase.h
index 4883e6a5b..d4e31b6b3 100644
--- a/kdecore/network/kclientsocketbase.h
+++ b/kdecore/network/kclientsocketbase.h
@@ -257,7 +257,7 @@ public:
    * This is a convenience function provided to ease migrating from
    * Qt 3.x's TQSocket class.
    */
-  inline void connectToHost(const TQString& host, TQ_UINT16 port)
+  inline void connectToHost(const TQString& host, Q_UINT16 port)
   { connect(host, TQString::number(port)); }
 
   /**
@@ -293,7 +293,7 @@ public:
    * Reimplemented from KSocketBase.
    */
 #ifdef USE_QT3
-  virtual TQ_LONG bytesAvailable() const;
+  virtual Q_LONG bytesAvailable() const;
 #endif
 #ifdef USE_QT4
   virtual qint64 bytesAvailable() const;
@@ -302,40 +302,40 @@ public:
   /**
    * Waits for more data. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG waitForMore(int msecs, bool *timeout = 0L);
+  virtual Q_LONG waitForMore(int msecs, bool *timeout = 0L);
 
   /**
    * Reads data from a socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen);
 
   /**
    * @overload
    * Reads data from a socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Peeks data from the socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen);
 
   /**
    * @overload
    * Peeks data from the socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen, KSocketAddress &from);
 
   /**
    * Writes data to the socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len);
 
   /**
    * @overload
    * Writes data to the socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to);
 
   /**
    * Returns the local socket address. Reimplemented from KSocketBase.
@@ -413,8 +413,8 @@ signals:
   void stateChanged(int newstate);
 
   /**
-   * This signal is emitted when this object tqfinds an error.
-   * The @p code parameter tqcontains the error code that can
+   * This signal is emitted when this object finds an error.
+   * The @p code parameter contains the error code that can
    * also be found by calling @ref error.
    */
   void gotError(int code);
diff --git a/kdecore/network/kdatagramsocket.cpp b/kdecore/network/kdatagramsocket.cpp
index ff6ea04b3..d598d2d14 100644
--- a/kdecore/network/kdatagramsocket.cpp
+++ b/kdecore/network/kdatagramsocket.cpp
@@ -133,7 +133,7 @@ bool KDatagramSocket::connect(const TQString& node, const TQString& service)
 
 KDatagramPacket KDatagramSocket::receive()
 {
-  TQ_LONG size = bytesAvailable();
+  Q_LONG size = bytesAvailable();
   if (size == 0)
     {
       // nothing available yet to read
@@ -165,12 +165,12 @@ KDatagramPacket KDatagramSocket::receive()
   return KDatagramPacket(data, address);
 }
 
-TQ_LONG KDatagramSocket::send(const KDatagramPacket& packet)
+Q_LONG KDatagramSocket::send(const KDatagramPacket& packet)
 {
   return writeBlock(packet.data(), packet.size(), packet.address());
 }
 
-TQ_LONG KDatagramSocket::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+Q_LONG KDatagramSocket::writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to)
 {
   if (to.family() != AF_UNSPEC)
     {
diff --git a/kdecore/network/kdatagramsocket.h b/kdecore/network/kdatagramsocket.h
index a58b7c4fd..6b94c1d42 100644
--- a/kdecore/network/kdatagramsocket.h
+++ b/kdecore/network/kdatagramsocket.h
@@ -222,7 +222,7 @@ public:
    *
    * Connecting means only to designate the given address as the default
    * destination address for datagrams sent without destination addresses
-   * ( writeBlock(const char *, TQ_ULONG) ).
+   * ( writeBlock(const char *, Q_ULONG) ).
    *
    * @note Calling connect will not cause the socket to be bound. You have
    *       to call @ref bind explicitly.
@@ -240,7 +240,7 @@ public:
   /**
    * Writes data to the socket. Reimplemented from KClientSocketBase.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to);
 
   /**
    * Receives one datagram from the stream. The reading process is guaranteed
@@ -260,7 +260,7 @@ public:
    *
    * @returns the number of bytes written or -1 in case of error.
    */
-  virtual TQ_LONG send(const KDatagramPacket& packet);
+  virtual Q_LONG send(const KDatagramPacket& packet);
 
 private slots:
   void lookupFinishedLocal();
diff --git a/kdecore/network/khttpproxysocketdevice.cpp b/kdecore/network/khttpproxysocketdevice.cpp
index 55b69a2b3..09d8dd7a5 100644
--- a/kdecore/network/khttpproxysocketdevice.cpp
+++ b/kdecore/network/khttpproxysocketdevice.cpp
@@ -153,12 +153,12 @@ bool KHttpProxySocketDevice::connect(const TQString& node, const TQString& servi
       setState(0);		// unset open flag
 
       // prepare the request
-      TQString request = TQString::tqfromLatin1("CONNECT %1:%2 HTTP/1.1\r\n"
+      TQString request = TQString::fromLatin1("CONNECT %1:%2 HTTP/1.1\r\n"
 					    "Cache-Control: no-cache\r\n"
 					    "Host: \r\n"
 					    "\r\n");
       TQString node2 = node;
-      if (node.tqcontains(':'))
+      if (node.contains(':'))
 	node2 = '[' + node + ']';
 
       d->request = request.arg(node2).arg(service).latin1();
@@ -179,7 +179,7 @@ bool KHttpProxySocketDevice::parseServerReply()
   if (!d->request.isEmpty())
     {
       // send request
-      TQ_LONG written = writeBlock(d->request, d->request.length());
+      Q_LONG written = writeBlock(d->request, d->request.length());
       if (written < 0)
 	{
 	  qDebug("KHttpProxySocketDevice: would block writing request!");
@@ -205,7 +205,7 @@ bool KHttpProxySocketDevice::parseServerReply()
   int index;
   if (!blocking())
     {
-      TQ_LONG avail = bytesAvailable();
+      Q_LONG avail = bytesAvailable();
       qDebug("KHttpProxySocketDevice: %ld bytes available", avail);
       setState(0);
       if (avail == 0)
@@ -222,7 +222,7 @@ bool KHttpProxySocketDevice::parseServerReply()
 
       TQCString fullHeaders = d->reply + buf.data();
       // search for the end of the headers
-      index = fullHeaders.tqfind("\r\n\r\n");
+      index = fullHeaders.find("\r\n\r\n");
       if (index == -1)
 	{
 	  // no, headers not yet finished...
@@ -265,9 +265,9 @@ bool KHttpProxySocketDevice::parseServerReply()
 
   // now really parse the reply
   qDebug("KHttpProxySocketDevice: get reply: %s\n",
-	 d->reply.left(d->reply.tqfind('\r')).data());
+	 d->reply.left(d->reply.find('\r')).data());
   if (d->reply.left(7) != "HTTP/1." ||
-      (index = d->reply.tqfind(' ')) == -1 ||
+      (index = d->reply.find(' ')) == -1 ||
       d->reply[index + 1] != '2')
     {
       setError(IO_ConnectError, NetFailure);
diff --git a/kdecore/network/kiobuffer.h b/kdecore/network/kiobuffer.h
index 02f75a420..839899b18 100644
--- a/kdecore/network/kiobuffer.h
+++ b/kdecore/network/kiobuffer.h
@@ -85,7 +85,7 @@ public:
    *
    * @sa size
    */
-  virtual TQ_LONG length() const = 0;
+  virtual Q_LONG length() const = 0;
 
   /**
    * Returns true if the buffer is empty of data.
@@ -99,7 +99,7 @@ public:
    *
    * @sa length for the length of the data stored
    */
-  virtual TQ_LONG size() const = 0;
+  virtual Q_LONG size() const = 0;
 
   /**
    * Returns true if the buffer is full (i.e., cannot receive more data)
@@ -114,7 +114,7 @@ public:
    * @returns true on success, false if an error occurred.
    * @note if the new size is less than length(), the buffer will be truncated
    */
-  virtual bool setSize(TQ_LONG size) = 0;
+  virtual bool setSize(Q_LONG size) = 0;
 
   /**
    * Adds data to the end of the buffer.
@@ -123,7 +123,7 @@ public:
    * @param len		the data length, in bytes
    * @returns the number of bytes added to the end of the buffer.
    */
-  virtual TQ_LONG feedBuffer(const char *data, TQ_LONG len) = 0;
+  virtual Q_LONG feedBuffer(const char *data, Q_LONG len) = 0;
 
   /**
    * Consumes data from the beginning of the buffer.
@@ -133,7 +133,7 @@ public:
    * @param discard	if true, the bytes copied will be discarded
    * @returns the number of bytes copied from the buffer
    */
-  virtual TQ_LONG consumeBuffer(char *data, TQ_LONG maxlen, bool discard = true) = 0;
+  virtual Q_LONG consumeBuffer(char *data, Q_LONG maxlen, bool discard = true) = 0;
 
   /**
    * Clears the buffer.
diff --git a/kdecore/network/knetworkinterface.h b/kdecore/network/knetworkinterface.h
index c9dd1b145..74fd52d55 100644
--- a/kdecore/network/knetworkinterface.h
+++ b/kdecore/network/knetworkinterface.h
@@ -30,7 +30,7 @@ namespace KNetwork {
 
 /**
  * A place-holder class for a future network interface class.
- * This class is to be tqreplaced with a more powerful version, inspired
+ * This class is to be replaced with a more powerful version, inspired
  * by:
  *  - KInetInterface (kdenetwork/krfb/srvloc)
  *  - NWInterface (kdenonbeta/knot/lib)
diff --git a/kdecore/network/kresolver.cpp b/kdecore/network/kresolver.cpp
index 013d1e335..cfb87e3ef 100644
--- a/kdecore/network/kresolver.cpp
+++ b/kdecore/network/kresolver.cpp
@@ -105,7 +105,7 @@ KResolverEntry::KResolverEntry(const KSocketAddress& addr, int socktype, int pro
 }
 
 // constructor with even more stuff
-KResolverEntry::KResolverEntry(const struct sockaddr* sa, TQ_UINT16 salen, int socktype,
+KResolverEntry::KResolverEntry(const struct sockaddr* sa, Q_UINT16 salen, int socktype,
 			       int protocol, const TQString& canonName,
 			       const TQCString& encodedName) :
   d(new KResolverEntryPrivate)
@@ -141,7 +141,7 @@ KSocketAddress KResolverEntry::address() const
 }
 
 // returns the length
-TQ_UINT16 KResolverEntry::length() const
+Q_UINT16 KResolverEntry::length() const
 {
   return d ? d->addr.length() : 0;
 }
@@ -393,7 +393,7 @@ int KResolver::setFlags(int flags)
   return oldflags;
 }
 
-// sets the family tqmask
+// sets the family mask
 void KResolver::setFamily(int families)
 {
   if (!isRunning())
@@ -546,7 +546,7 @@ void KResolver::emitFinished()
   emit finished(d->results);
 
   if (p && d->deleteWhenDone)
-    deleteLater();		// in TQObject
+    deleteLater();		// in QObject
 }
 
 TQString KResolver::errorString(int errorcode, int syserror)
@@ -587,7 +587,7 @@ KResolverResults
 KResolver::resolve(const TQString& host, const TQString& service, int flags,
 		  int families)
 {
-  KResolver qres(host, service, TQT_TQOBJECT(tqApp), "synchronous KResolver");
+  KResolver qres(host, service, qApp, "synchronous KResolver");
   qres.setFlags(flags);
   qres.setFamily(families);
   qres.start();
@@ -599,7 +599,7 @@ bool KResolver::resolveAsync(TQObject* userObj, const char *userSlot,
 			     const TQString& host, const TQString& service,
 			     int flags, int families)
 {
-  KResolver* qres = new KResolver(host, service, TQT_TQOBJECT(tqApp), "asynchronous KResolver");
+  KResolver* qres = new KResolver(host, service, qApp, "asynchronous KResolver");
   TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)), userObj, userSlot);
   qres->setFlags(flags);
   qres->setFamily(families);
@@ -915,16 +915,16 @@ TQString KResolver::localHostName()
     }
 
   if (name.isEmpty())
-    return TQString::tqfromLatin1("localhost");
+    return TQString::fromLatin1("localhost");
 
-  if (name.tqfind('.') == -1)
+  if (name.find('.') == -1)
     {
       // not fully qualified
       // must resolve
       KResolverResults results = resolve(name, "0", CanonName);
       if (results.isEmpty())
-	// cannot tqfind a valid hostname!
-	return TQString::tqfromLatin1("localhost");
+	// cannot find a valid hostname!
+	return TQString::fromLatin1("localhost");
       else
 	return results.first().canonicalName();
     }
@@ -934,7 +934,7 @@ TQString KResolver::localHostName()
 
 
 // forward declaration
-static TQStringList splitLabels(const TQString& tqunicodeDomain);
+static TQStringList splitLabels(const TQString& unicodeDomain);
 static TQCString ToASCII(const TQString& label);
 static TQString ToUnicode(const TQString& label);
 
@@ -943,11 +943,11 @@ static TQStringList *KResolver_initIdnDomains()
   const char *kde_use_idn = getenv("KDE_USE_IDN");
   if (!kde_use_idn)
      kde_use_idn = "ac:at:br:cat:ch:cl:cn:de:dk:fi:gr:hu:info:io:is:jp:kr:li:lt:museum:org:no:se:sh:th:tm:tw:vn";
-  return new TQStringList(TQStringList::split(':', TQString::tqfromLatin1(kde_use_idn).lower()));
+  return new TQStringList(TQStringList::split(':', TQString::fromLatin1(kde_use_idn).lower()));
 }
 
 // implement the ToAscii function, as described by IDN documents
-TQCString KResolver::domainToAscii(const TQString& tqunicodeDomain)
+TQCString KResolver::domainToAscii(const TQString& unicodeDomain)
 {
   if (!idnDomains)
     idnDomains = KResolver_initIdnDomains();
@@ -958,10 +958,10 @@ TQCString KResolver::domainToAscii(const TQString& tqunicodeDomain)
 
   // 2) split the domain into individual labels, without
   // separators.
-  TQStringList input = splitLabels(tqunicodeDomain);
+  TQStringList input = splitLabels(unicodeDomain);
 
   // Do we allow IDN names for this TLD?
-  if (input.count() && !idnDomains->tqcontains(input[input.count()-1].lower()))
+  if (input.count() && !idnDomains->contains(input[input.count()-1].lower()))
     return input.join(".").lower().latin1(); // No IDN allowed for this TLD
 
   // 3) decide whether to enforce the STD3 rules for chars < 0x7F
@@ -987,7 +987,7 @@ TQCString KResolver::domainToAscii(const TQString& tqunicodeDomain)
 
 TQString KResolver::domainToUnicode(const TQCString& asciiDomain)
 {
-  return domainToUnicode(TQString::tqfromLatin1(asciiDomain));
+  return domainToUnicode(TQString::fromLatin1(asciiDomain));
 }
 
 // implement the ToUnicode function, as described by IDN documents
@@ -1009,7 +1009,7 @@ TQString KResolver::domainToUnicode(const TQString& asciiDomain)
   TQStringList input = splitLabels(asciiDomain);
 
   // Do we allow IDN names for this TLD?
-  if (input.count() && !idnDomains->tqcontains(input[input.count()-1].lower()))
+  if (input.count() && !idnDomains->contains(input[input.count()-1].lower()))
     return asciiDomain.lower(); // No TLDs allowed
 
   // 3) decide whether to enforce the STD3 rules for chars < 0x7F
@@ -1048,7 +1048,7 @@ void KResolver::virtual_hook( int, void* )
 //  RFC 3492 - Punycode: A Bootstring encoding of Unicode
 //          for Internationalized Domain Names in Applications (IDNA)
 
-static TQStringList splitLabels(const TQString& tqunicodeDomain)
+static TQStringList splitLabels(const TQString& unicodeDomain)
 {
   // From RFC 3490 section 3.1:
   // "Whenever dots are used as label separators, the following characters
@@ -1060,9 +1060,9 @@ static TQStringList splitLabels(const TQString& tqunicodeDomain)
   TQStringList lst;
   int start = 0;
   uint i;
-  for (i = 0; i < tqunicodeDomain.length(); i++)
+  for (i = 0; i < unicodeDomain.length(); i++)
     {
-      unsigned int c = tqunicodeDomain[i].tqunicode();
+      unsigned int c = unicodeDomain[i].unicode();
 
       if (c == separators[0] ||
 	  c == separators[1] ||
@@ -1070,13 +1070,13 @@ static TQStringList splitLabels(const TQString& tqunicodeDomain)
 	  c == separators[3])
 	{
 	  // found a separator!
-	  lst << tqunicodeDomain.mid(start, i - start);
+	  lst << unicodeDomain.mid(start, i - start);
 	  start = i + 1;
 	}
     }
   if ((long)i >= start)
     // there is still one left
-    lst << tqunicodeDomain.mid(start, i - start);
+    lst << unicodeDomain.mid(start, i - start);
 
   return lst;
 }
@@ -1097,11 +1097,11 @@ static TQCString ToASCII(const TQString& label)
   TQCString retval;
   char buf[65];
 
-  TQ_UINT32* ucs4 = new TQ_UINT32[label.length() + 1];
+  Q_UINT32* ucs4 = new Q_UINT32[label.length() + 1];
 
   uint i;
   for (i = 0; i < label.length(); i++)
-    ucs4[i] = (unsigned long)label[i].tqunicode();
+    ucs4[i] = (unsigned long)label[i].unicode();
   ucs4[i] = 0;			// terminate with NUL, just to be on the safe side
 
   if (idna_to_ascii_4i(ucs4, label.length(), buf, 0) == IDNA_SUCCESS)
@@ -1118,18 +1118,18 @@ static TQCString ToASCII(const TQString& label)
 static TQString ToUnicode(const TQString& label)
 {
 #ifdef HAVE_IDNA_H
-  // We have idna.h, so we can use the idna_to_tqunicode
+  // We have idna.h, so we can use the idna_to_unicode
   // function :)
 
-  TQ_UINT32 *ucs4_input, *ucs4_output;
+  Q_UINT32 *ucs4_input, *ucs4_output;
   size_t outlen;
 
-  ucs4_input = new TQ_UINT32[label.length() + 1];
+  ucs4_input = new Q_UINT32[label.length() + 1];
   for (uint i = 0; i < label.length(); i++)
-    ucs4_input[i] = (unsigned long)label[i].tqunicode();
+    ucs4_input[i] = (unsigned long)label[i].unicode();
 
   // try the same length for output
-  ucs4_output = new TQ_UINT32[outlen = label.length()];
+  ucs4_output = new Q_UINT32[outlen = label.length()];
 
   idna_to_unicode_44i(ucs4_input, label.length(),
 		      ucs4_output, &outlen,
@@ -1139,7 +1139,7 @@ static TQString ToUnicode(const TQString& label)
     {
       // it must have failed
       delete [] ucs4_output;
-      ucs4_output = new TQ_UINT32[outlen];
+      ucs4_output = new Q_UINT32[outlen];
 
       idna_to_unicode_44i(ucs4_input, label.length(),
 			  ucs4_output, &outlen,
diff --git a/kdecore/network/kresolver.h b/kdecore/network/kresolver.h
index f17ac840f..5b66f362c 100644
--- a/kdecore/network/kresolver.h
+++ b/kdecore/network/kresolver.h
@@ -51,11 +51,11 @@ class KResolverEntryPrivate;
  *  @brief One resolution entry.
  *
  * This class is one element in the resolution results list.
- * It tqcontains the socket address for connecting, as well as
+ * It contains the socket address for connecting, as well as
  * a bit more of information: the socket type, address family
  * and protocol numbers.
  *
- * This class tqcontains all the information required for creating,
+ * This class contains all the information required for creating,
  * binding and connecting a socket.
  *
  * KResolverEntry objects implicitly share data, so copying them
@@ -101,7 +101,7 @@ public:
    * @param canonName	the canonical name of the resolved hostname
    * @param encodedName	the ASCII-compatible encoding of the hostname
    */
-  KResolverEntry(const struct sockaddr *sa, TQ_UINT16 salen, int socktype,
+  KResolverEntry(const struct sockaddr *sa, Q_UINT16 salen, int socktype,
 		int protocol, const TQString& canonName = TQString::null,
 		const TQCString& encodedName = TQCString());
 
@@ -128,7 +128,7 @@ public:
   /**
    * Retrieves the length of the socket address structure.
    */
-  TQ_UINT16 length() const;
+  Q_UINT16 length() const;
 
   /**
    * Retrieves the family associated with this socket address.
@@ -180,7 +180,7 @@ class KResolverResultsPrivate;
  * @class KResolverResults kresolver.h kresolver.h
  * @brief Name and service resolution results.
  *
- * This object tqcontains the results of a name and service resolution, as
+ * This object contains the results of a name and service resolution, as
  * those performed by @ref KResolver. It is also a descendant of TQValueList, so
  * you may use all its member functions here to access the elements.
  *
@@ -292,7 +292,7 @@ class KResolverPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KResolver: public TQObject
+class KDECORE_EXPORT KResolver: public QObject
 {
   Q_OBJECT
 
@@ -398,7 +398,7 @@ public:
     };
 
   /**
-   * tqStatus codes.
+   * Status codes.
    *
    * These are the possible status for a Resolver object. A value
    * greater than zero indicates normal behaviour, while negative
@@ -417,7 +417,7 @@ public:
    * Note 2: the status Queued and InProgress might not be distinguishable.
    * Some implementations might not differentiate one from the other.
    */
-  enum tqStatusCodes
+  enum StatusCodes
     {
       Idle = 0,
       Queued = 1,
@@ -462,7 +462,7 @@ public:
   /**
    * Retrieve the current status of this object.
    *
-   * @see tqStatusCodes for the possible status codes.
+   * @see StatusCodes for the possible status codes.
    */
   int status() const;
 
@@ -470,8 +470,8 @@ public:
    * Retrieve the error code in this object.
    *
    * This function will return NoError if we are not in
-   * an error condition. See @ref status and @ref tqStatusCodes to
-   * tqfind out what the current status is.
+   * an error condition. See @ref status and @ref StatusCodes to
+   * find out what the current status is.
    *
    * @see errorString for getting a textual representation of
    * this error
@@ -668,7 +668,7 @@ public:
    * an empty object.
    *
    * @return the resolved data
-   * @see status for information on tqfinding out if the resolution was successful
+   * @see status for information on finding out if the resolution was successful
    */
   KResolverResults results() const;
 
@@ -795,11 +795,11 @@ public:
    * Note that the encoding is illegible and, thus, should not be presented
    * to the user, except if requested.
    *
-   * @param tqunicodeDomain	the domain name to be encoded
+   * @param unicodeDomain	the domain name to be encoded
    * @return the ACE-encoded suitable for DNS queries if successful, a null
    *	     TQCString if failure.
    */
-  static TQCString domainToAscii(const TQString& tqunicodeDomain);
+  static TQCString domainToAscii(const TQString& unicodeDomain);
 
   /**
    * Does the inverse of @ref domainToAscii and return an Unicode domain
diff --git a/kdecore/network/kresolver_p.h b/kdecore/network/kresolver_p.h
index b4ab61108..e29304383 100644
--- a/kdecore/network/kresolver_p.h
+++ b/kdecore/network/kresolver_p.h
@@ -283,14 +283,14 @@ namespace KNetwork
 
     private:
       /*
-       * tqfinds a suitable worker for this request
+       * finds a suitable worker for this request
        */
-      KNetwork::KResolverWorkerBase *tqfindWorker(KNetwork::KResolverPrivate *p);
+      KNetwork::KResolverWorkerBase *findWorker(KNetwork::KResolverPrivate *p);
 
       /*
-       * tqfinds data for this request
+       * finds data for this request
        */
-      RequestData* tqfindData(KResolverThread*);
+      RequestData* findData(KResolverThread*);
 
       /*
        * Handle completed requests.
diff --git a/kdecore/network/kresolvermanager.cpp b/kdecore/network/kresolvermanager.cpp
index b97f58005..b3c7172ae 100644
--- a/kdecore/network/kresolvermanager.cpp
+++ b/kdecore/network/kresolvermanager.cpp
@@ -85,11 +85,11 @@ using namespace KNetwork::Internal;
    process, which means it will lock and unlock the manager mutex in
    the process.
 
-   If it tqfinds no new data, it'll wait on the feedWorkers condition
+   If it finds no new data, it'll wait on the feedWorkers condition
    for a certain maximum time. If that time expires and there's still
    no data, the thread will exit, in order to save system resources.
 
-   If it tqfinds data, however, it'll set up and call the worker class
+   If it finds data, however, it'll set up and call the worker class
    that has been selected by the manager. Once that worker is done,
    the thread releases the data through KResolverManager::releaseData.
 
@@ -99,7 +99,7 @@ using namespace KNetwork::Internal;
 
    When data is being requested, the KResolverManager::requestData
    function will look the currentRequests list and return the first
-   Queued request it tqfinds, while marking it to be InProgress.
+   Queued request it finds, while marking it to be InProgress.
 
    When the worker class has returned, the worker thread will release
    that data through the KResolverManager::releaseData function. If the
@@ -367,7 +367,7 @@ RequestData* KResolverManager::requestData(KResolverThread *th, int maxWaitTime)
   // lock the mutex, so that the manager thread or other threads won't
   // interfere.
   TQMutexLocker locker(&mutex);
-  RequestData *data = tqfindData(th);
+  RequestData *data = findData(th);
 
   if (data)
     // it found something, that's good
@@ -378,18 +378,18 @@ RequestData* KResolverManager::requestData(KResolverThread *th, int maxWaitTime)
   feedWorkers.wait(&mutex, maxWaitTime);
   availableThreads--;
 
-  data = tqfindData(th);
+  data = findData(th);
   return data;
 }
 
-RequestData* KResolverManager::tqfindData(KResolverThread* th)
+RequestData* KResolverManager::findData(KResolverThread* th)
 {
   /////
   // This function is called by @ref requestData above and must
   // always be called with a locked mutex
   /////
 
-  // now tqfind data to be processed
+  // now find data to be processed
   for (RequestData *curr = newRequests.first(); curr; curr = newRequests.next())
     if (!curr->worker->m_finished)
       {
@@ -504,7 +504,7 @@ void KResolverManager::registerNewWorker(KResolverWorkerFactoryBase *factory)
   workerFactories.append(factory);
 }
 
-KResolverWorkerBase* KResolverManager::tqfindWorker(KResolverPrivate* p)
+KResolverWorkerBase* KResolverManager::findWorker(KResolverPrivate* p)
 {
   /////
   // this function can be called on any user thread
@@ -514,7 +514,7 @@ KResolverWorkerBase* KResolverManager::tqfindWorker(KResolverPrivate* p)
   // thread-safe!
   // but the factory list is expected not to be changed asynchronously
 
-  // This function is responsible for tqfinding a suitable worker for the given
+  // This function is responsible for finding a suitable worker for the given
   // input. That means we have to do a costly operation to create each worker
   // class and call their preprocessing functions. The first one that
   // says they can process (i.e., preprocess() returns true) will get the job.
@@ -653,12 +653,12 @@ void KResolverManager::enqueue(KResolver *obj, RequestData *requestor)
   newrequest->input = &obj->d->input;
   newrequest->requestor = requestor;
 
-  // when processing a new request, tqfind the most
+  // when processing a new request, find the most
   // suitable worker
-  if ((newrequest->worker = tqfindWorker(obj->d)) == 0L)
+  if ((newrequest->worker = findWorker(obj->d)) == 0L)
     {
       // oops, problem
-      // cannot tqfind a worker class for this guy
+      // cannot find a worker class for this guy
       obj->d->status = KResolver::Failed;
       obj->d->errorcode = KResolver::UnsupportedFamily;
       obj->d->syserror = 0;
@@ -668,7 +668,7 @@ void KResolverManager::enqueue(KResolver *obj, RequestData *requestor)
     }
 
   // no, queue it
-  // p->status was set in tqfindWorker!
+  // p->status was set in findWorker!
   if (requestor)
     requestor->nRequests++;
 
@@ -728,7 +728,7 @@ void KResolverManager::dispatch(RequestData *data)
     {
       // yes, a new thread should be started
 
-      // tqfind if there's a finished one
+      // find if there's a finished one
       KResolverThread *th = workers.first();
       while (th && th->running())
 	th = workers.next();
diff --git a/kdecore/network/kresolverstandardworkers.cpp b/kdecore/network/kresolverstandardworkers.cpp
index 401158cab..f64803ced 100644
--- a/kdecore/network/kresolverstandardworkers.cpp
+++ b/kdecore/network/kresolverstandardworkers.cpp
@@ -140,11 +140,11 @@ bool KBlacklistWorker::isBlacklisted(const TQString& host)
     return false;
 
   // KDE4: QLatin1String
-  TQString ascii = TQString::tqfromLatin1(KResolver::domainToAscii(host));
+  TQString ascii = TQString::fromLatin1(KResolver::domainToAscii(host));
 
   TQMutexLocker locker(&blacklistMutex);
 
-  // now tqfind out if this hostname is present
+  // now find out if this hostname is present
   TQStringList::ConstIterator it = blacklist.constBegin(),
     end = blacklist.constEnd();
   for ( ; it != end; ++it)
@@ -208,12 +208,12 @@ namespace
   {
   public:
     TQCString m_hostname;	// might be different!
-    TQ_UINT16 m_port;
+    Q_UINT16 m_port;
     int m_scopeid;
     int m_af;
     KResolverResults& results;
 
-    GetHostByNameThread(const char * hostname, TQ_UINT16 port,
+    GetHostByNameThread(const char * hostname, Q_UINT16 port,
 			int scopeid, int af, KResolverResults* res) :
       m_hostname(hostname), m_port(port), m_scopeid(scopeid), m_af(af),
       results(*res)
@@ -251,7 +251,7 @@ namespace
 
 	// check blacklist
 	if (m_af != AF_INET && 
-	    KBlacklistWorker::isBlacklisted(TQString::tqfromLatin1(m_hostname)))
+	    KBlacklistWorker::isBlacklisted(TQString::fromLatin1(m_hostname)))
 	  break;
 
 # ifdef USE_GETHOSTBYNAME2_R
@@ -358,7 +358,7 @@ namespace
     if (socktype == 0)
       socktype = SOCK_STREAM;	// default
 
-    TQString canon = KResolver::domainToUnicode(TQString::tqfromLatin1(he->h_name));
+    TQString canon = KResolver::domainToUnicode(TQString::fromLatin1(he->h_name));
     KInetSocketAddress sa;
     sa.setPort(m_port);
     if (he->h_addrtype != AF_INET)
@@ -404,7 +404,7 @@ namespace
   {
     // check blacklist
     if ((m_af != AF_INET && m_af != AF_UNSPEC) && 
-	KBlacklistWorker::isBlacklisted(TQString::tqfromLatin1(m_node)))
+	KBlacklistWorker::isBlacklisted(TQString::fromLatin1(m_node)))
       {
 	results.setError(KResolver::NoName);
 	finished();
@@ -547,11 +547,11 @@ bool KStandardWorker::sanityCheck()
   if (!nodeName().isEmpty())
     {
       TQString node = nodeName();
-      if (node.tqfind('%') != -1)
-	node.truncate(node.tqfind('%'));
+      if (node.find('%') != -1)
+	node.truncate(node.find('%'));
 
-      if (node.isEmpty() || node == TQString::tqfromLatin1("*") ||
-	  node == TQString::tqfromLatin1("localhost"))
+      if (node.isEmpty() || node == TQString::fromLatin1("*") ||
+	  node == TQString::fromLatin1("localhost"))
 	m_encodedName.truncate(0);
       else
 	{
@@ -584,7 +584,7 @@ bool KStandardWorker::resolveScopeId()
 {
   // we must test the original name, not the encoded one
   scopeid = 0;
-  int pos = nodeName().tqfindRev('%');
+  int pos = nodeName().findRev('%');
   if (pos == -1)
     return true;
 
@@ -608,7 +608,7 @@ bool KStandardWorker::resolveScopeId()
 
 bool KStandardWorker::resolveService()
 {
-  // tqfind the service first
+  // find the service first
   bool ok;
   port = serviceName().toUInt(&ok);
   if (!ok)
@@ -616,7 +616,7 @@ bool KStandardWorker::resolveService()
       // service name does not contain a port number
       // must be a name
 
-      if (serviceName().isEmpty() || serviceName().compare(TQString::tqfromLatin1("*")) == 0)
+      if (serviceName().isEmpty() || serviceName().compare(TQString::fromLatin1("*")) == 0)
 	port = 0;
       else
 	{
@@ -648,7 +648,7 @@ bool KStandardWorker::resolveService()
 	    }
 
 	  // it worked, we have a port number
-	  port = (TQ_UINT16)result;
+	  port = (Q_UINT16)result;
 	}
     }
 
@@ -704,7 +704,7 @@ bool KStandardWorker::resolveNumerically()
     // no Internet address is wanted!
     return (flags() & KResolver::NoResolve);
 
-  // now try to tqfind results
+  // now try to find results
   if (!resolveScopeId() || !resolveService())
     return (flags() & KResolver::NoResolve);
 
@@ -712,7 +712,7 @@ bool KStandardWorker::resolveNumerically()
   // now try to resolve the hostname numerically
   KInetSocketAddress sa;
   setError(KResolver::NoError);
-  sa.setHost(KIpAddress(TQString::tqfromLatin1(m_encodedName)));
+  sa.setHost(KIpAddress(TQString::fromLatin1(m_encodedName)));
   
   // if it failed, the length was reset to 0
   bool ok = sa.length() != 0;
@@ -827,16 +827,16 @@ bool KStandardWorker::preprocess()
 
   // check if the user wants something we know about
 #ifdef AF_INET6
-# define tqmask	(KResolver::IPv6Family | KResolver::IPv4Family | KResolver::UnixFamily)
+# define mask	(KResolver::IPv6Family | KResolver::IPv4Family | KResolver::UnixFamily)
 #else
-# define tqmask	(KResolver::IPv4Family | KResolver::UnixFamily)
+# define mask	(KResolver::IPv4Family | KResolver::UnixFamily)
 #endif
 
-  if ((familyMask() & tqmask) == 0)
+  if ((familyMask() & mask) == 0)
     // errr... nothing we know about
     return false;
 
-#undef tqmask
+#undef mask
 
   return true;			// it's ok
 }
@@ -862,7 +862,7 @@ bool KStandardWorker::run()
   // these are the family types that we know of
   struct
   {
-    KResolver::SocketFamilies tqmask;
+    KResolver::SocketFamilies mask;
     int af;
   } families[] = { { KResolver::IPv4Family, AF_INET }
 #ifdef AF_INET6					  
@@ -874,7 +874,7 @@ bool KStandardWorker::run()
   resultList.setAutoDelete(true);
 
   for (int i = 0; i < familyCount; i++)
-    if (familyMask() & families[i].tqmask)
+    if (familyMask() & families[i].mask)
       {
 #ifdef AF_INET6
 	if (skipIPv6 && families[i].af == AF_INET6)
diff --git a/kdecore/network/kresolverstandardworkers_p.h b/kdecore/network/kresolverstandardworkers_p.h
index 2db460bef..310849bf3 100644
--- a/kdecore/network/kresolverstandardworkers_p.h
+++ b/kdecore/network/kresolverstandardworkers_p.h
@@ -66,7 +66,7 @@ namespace KNetwork { namespace Internal
   {
   protected:
     mutable TQCString m_encodedName;
-    TQ_UINT16 port;
+    Q_UINT16 port;
     int scopeid;
     TQPtrList<KNetwork::KResolverResults> resultList;
 
diff --git a/kdecore/network/kresolverworkerbase.h b/kdecore/network/kresolverworkerbase.h
index a4f352da6..4dee33239 100644
--- a/kdecore/network/kresolverworkerbase.h
+++ b/kdecore/network/kresolverworkerbase.h
@@ -119,7 +119,7 @@ public:
    * Derived classes will put their resolved data in this list, or will
    * leave it empty in case of error.
    *
-   * tqStatus and error codes should also be stored in this object (the
+   * Status and error codes should also be stored in this object (the
    * @ref setError function does that).
    */
   KResolverResults results;
@@ -147,7 +147,7 @@ public:
   int flags() const;
 
   /**
-   * gets the family tqmask
+   * gets the family mask
    */
   int familyMask() const;
 
diff --git a/kdecore/network/kreverseresolver.cpp b/kdecore/network/kreverseresolver.cpp
index d781e5f18..639f6dbe4 100644
--- a/kdecore/network/kreverseresolver.cpp
+++ b/kdecore/network/kreverseresolver.cpp
@@ -203,7 +203,7 @@ bool KReverseResolver::resolve(const KSocketAddress& addr, TQString& node,
   return false;
 }
 
-bool KReverseResolver::resolve(const struct sockaddr* sa, TQ_UINT16 salen,
+bool KReverseResolver::resolve(const struct sockaddr* sa, Q_UINT16 salen,
 			       TQString& node, TQString& serv, int flags)
 {
   return resolve(KSocketAddress(sa, salen), node, serv, flags);
@@ -238,8 +238,8 @@ bool ReverseThread::run()
 
   if (err == 0)
     {
-      node = KResolver::domainToUnicode(TQString::tqfromLatin1(h));
-      service = TQString::tqfromLatin1(s);
+      node = KResolver::domainToUnicode(TQString::fromLatin1(h));
+      service = TQString::fromLatin1(s);
       success = true;
     }
   else
diff --git a/kdecore/network/kreverseresolver.h b/kdecore/network/kreverseresolver.h
index bf338c075..26274e586 100644
--- a/kdecore/network/kreverseresolver.h
+++ b/kdecore/network/kreverseresolver.h
@@ -47,7 +47,7 @@ class KReverseResolverPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KReverseResolver: public TQObject
+class KDECORE_EXPORT KReverseResolver: public QObject
 {
   Q_OBJECT
 
@@ -144,7 +144,7 @@ signals:
   /**
    * This signal is emitted when the resolution has finished.
    *
-   * @param obj		this class, which tqcontains the results
+   * @param obj		this class, which contains the results
    */
   void finished(const KReverseResolver& obj);
 
@@ -183,7 +183,7 @@ public:
    * @return true if the resolution succeeded, false if not
    * @see ReverseFlags for the possible values for @p flags
    */
-  static bool resolve(const struct sockaddr* sa, TQ_UINT16 salen, 
+  static bool resolve(const struct sockaddr* sa, Q_UINT16 salen, 
 		      TQString& node, TQString& serv, int flags = 0);
 
 private:
diff --git a/kdecore/network/kserversocket.cpp b/kdecore/network/kserversocket.cpp
index 084418cf1..49facb12c 100644
--- a/kdecore/network/kserversocket.cpp
+++ b/kdecore/network/kserversocket.cpp
@@ -155,7 +155,7 @@ bool KServerSocket::lookup()
   // make sure we have at least one parameter for lookup
   if (d->resolver.serviceName().isNull() &&
       !d->resolver.nodeName().isNull())
-    d->resolver.setServiceName(TQString::tqfromLatin1(""));
+    d->resolver.setServiceName(TQString::fromLatin1(""));
 
   // don't restart the lookups if they had succeeded and
   // the input values weren't changed
@@ -326,7 +326,7 @@ KActiveSocketBase* KServerSocket::accept()
   streamsocket->setSocketDevice(accepted);
 
   // FIXME!
-  // when KStreamSocket can tqfind out the state of the socket passed through
+  // when KStreamSocket can find out the state of the socket passed through
   // setSocketDevice, this will probably be unnecessary:
   streamsocket->setState(KStreamSocket::Connected);
   streamsocket->setFlags(IO_Sequential | IO_Raw | IO_ReadWrite | IO_Open | IO_Async);
diff --git a/kdecore/network/kserversocket.h b/kdecore/network/kserversocket.h
index d4c7fea96..30d8b40b0 100644
--- a/kdecore/network/kserversocket.h
+++ b/kdecore/network/kserversocket.h
@@ -380,8 +380,8 @@ private slots:
 
 signals:
   /**
-   * This signal is emitted when this object tqfinds an error.
-   * The @p code parameter tqcontains the error code that can
+   * This signal is emitted when this object finds an error.
+   * The @p code parameter contains the error code that can
    * also be found by calling @ref error.
    */
   void gotError(int code);
diff --git a/kdecore/network/ksocketaddress.cpp b/kdecore/network/ksocketaddress.cpp
index a6fd14cf5..adfc76b06 100644
--- a/kdecore/network/ksocketaddress.cpp
+++ b/kdecore/network/ksocketaddress.cpp
@@ -74,7 +74,7 @@ const KIpAddress KIpAddress::anyhostV4(0L, 4);
 const KIpAddress KIpAddress::anyhostV6(0L, 6);
 
 // helper function to test if an IPv6 v4-mapped address is equal to its IPv4 counterpart
-static bool check_v4mapped(const TQ_UINT32* v6addr, TQ_UINT32 v4addr)
+static bool check_v4mapped(const Q_UINT32* v6addr, Q_UINT32 v4addr)
 {
   // check that the v6 is a v4-mapped address
   if (!(v6addr[0] == 0 && v6addr[1] == 0 && v6addr[2] == htonl(0x0000ffff)))
@@ -131,12 +131,12 @@ bool KIpAddress::setAddress(const TQString& address)
   m_version = 0;
 
   // try to guess the address version
-  if (address.tqfind(':') != -1)
+  if (address.find(':') != -1)
     {
 #ifdef AF_INET6
       // guessing IPv6
 
-      TQ_UINT32 buf[4];
+      Q_UINT32 buf[4];
       if (inet_pton(AF_INET6, address.latin1(), buf))
 	{
 	  memcpy(m_data, buf, sizeof(m_data));
@@ -149,7 +149,7 @@ bool KIpAddress::setAddress(const TQString& address)
     }
   else
     {
-      TQ_UINT32 buf;
+      Q_UINT32 buf;
       if (inet_pton(AF_INET, address.latin1(), &buf))
 	{
 	  *m_data = buf;
@@ -165,7 +165,7 @@ bool KIpAddress::setAddress(const TQString& address)
 
 bool KIpAddress::setAddress(const char* address)
 {
-  return setAddress(TQString::tqfromLatin1(address));
+  return setAddress(TQString::fromLatin1(address));
 }
 
 // set from binary data
@@ -194,21 +194,21 @@ TQString KIpAddress::toString() const
     {
     case 4:
       inet_ntop(AF_INET, m_data, buf, sizeof(buf) - 1);
-      return TQString::tqfromLatin1(buf);
+      return TQString::fromLatin1(buf);
 
     case 6:
 #ifdef AF_INET6
       inet_ntop(AF_INET6, m_data, buf, sizeof(buf) - 1);
 #endif
-      return TQString::tqfromLatin1(buf);
+      return TQString::fromLatin1(buf);
     }
 
   return TQString::null;
 }
 
-TQ_UINT32 KIpAddress::hostIPv4Addr(bool convertMapped) const
+Q_UINT32 KIpAddress::hostIPv4Addr(bool convertMapped) const
 {
-    TQ_UINT32 addr = IPv4Addr(convertMapped);
+    Q_UINT32 addr = IPv4Addr(convertMapped);
     return ntohl(addr);
 }
 
@@ -219,23 +219,23 @@ TQ_UINT32 KIpAddress::hostIPv4Addr(bool convertMapped) const
 struct our_sockaddr_in6
 {
 # ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
-  TQ_UINT8		sin6_len;
-  TQ_UINT8		sin6_family;
+  Q_UINT8		sin6_len;
+  Q_UINT8		sin6_family;
 # else  //!HAVE_STRUCT_SOCKADDR_SA_LEN
-  TQ_UINT16		sin6_family;
+  Q_UINT16		sin6_family;
 # endif
-  TQ_UINT16       	sin6_port;	/* RFC says in_port_t */
-  TQ_UINT32		sin6_flowinfo;
-  TQ_UINT8		sin6_addr[16]; // 24 bytes up to here
-  TQ_UINT32		sin6_scope_id; // 28 bytes total
+  Q_UINT16       	sin6_port;	/* RFC says in_port_t */
+  Q_UINT32		sin6_flowinfo;
+  Q_UINT8		sin6_addr[16]; // 24 bytes up to here
+  Q_UINT32		sin6_scope_id; // 28 bytes total
 };
 
 // useful definitions
-#define MIN_SOCKADDR_LEN	sizeof(TQ_UINT16)
+#define MIN_SOCKADDR_LEN	sizeof(Q_UINT16)
 #define SOCKADDR_IN_LEN		sizeof(sockaddr_in)
 #define MIN_SOCKADDR_IN6_LEN	((unsigned long) &(((our_sockaddr_in6*)0)->sin6_scope_id))
 #define SOCKADDR_IN6_LEN	sizeof(our_sockaddr_in6)
-#define MIN_SOCKADDR_UN_LEN	(sizeof(TQ_UINT16) + sizeof(char))
+#define MIN_SOCKADDR_UN_LEN	(sizeof(Q_UINT16) + sizeof(char))
 
 
 class KNetwork::KSocketAddressData
@@ -263,14 +263,14 @@ public:
     struct our_sockaddr_in6 *in6;
     struct sockaddr_un      *un;
   } addr;
-  TQ_UINT16 curlen, reallen;
+  Q_UINT16 curlen, reallen;
 
   KSocketAddressData()
     : ref(this)
   {
     addr.generic = 0L;
     curlen = 0;
-    tqinvalidate();
+    invalidate();
   }
 
   ~KSocketAddressData()
@@ -282,10 +282,10 @@ public:
   inline bool invalid() const
   { return reallen == 0; }
 
-  inline void tqinvalidate()
+  inline void invalidate()
   { reallen = 0; }
 
-  void dup(const sockaddr* sa, TQ_UINT16 len, bool clear = true);
+  void dup(const sockaddr* sa, Q_UINT16 len, bool clear = true);
 
   void makeipv4()
   {
@@ -343,12 +343,12 @@ public:
 };
 
 // create duplicates of
-void KSocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear)
+void KSocketAddressData::dup(const sockaddr* sa, Q_UINT16 len, bool clear)
 {
   if (len < MIN_SOCKADDR_LEN)
     {
       // certainly invalid
-      tqinvalidate();
+      invalidate();
       return;
     }
 
@@ -359,7 +359,7 @@ void KSocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear)
 	     (sa->sa_family == AF_UNIX && len < MIN_SOCKADDR_UN_LEN)))
     {
       // also invalid
-      tqinvalidate();
+      invalidate();
       return;
     }
 
@@ -411,7 +411,7 @@ KSocketAddress::KSocketAddress()
 }
 
 // constructor from binary data
-KSocketAddress::KSocketAddress(const sockaddr *sa, TQ_UINT16 len)
+KSocketAddress::KSocketAddress(const sockaddr *sa, Q_UINT16 len)
   : d(new KSocketAddressData)
 {
   setAddress(sa, len);
@@ -444,7 +444,7 @@ KSocketAddress& KSocketAddress::operator =(const KSocketAddress& other)
   if (other.d && !other.d->invalid())
     d->dup(other.d->addr.generic, other.d->reallen);
   else
-    d->tqinvalidate();
+    d->invalidate();
   return *this;
 }
 
@@ -462,24 +462,24 @@ sockaddr* KSocketAddress::address()
   return d->addr.generic;
 }
 
-KSocketAddress& KSocketAddress::setAddress(const sockaddr* sa, TQ_UINT16 len)
+KSocketAddress& KSocketAddress::setAddress(const sockaddr* sa, Q_UINT16 len)
 {
   if (sa != 0L && len >= MIN_SOCKADDR_LEN)
     d->dup(sa, len);
   else
-    d->tqinvalidate();
+    d->invalidate();
 
   return *this;
 }
 
-TQ_UINT16 KSocketAddress::length() const
+Q_UINT16 KSocketAddress::length() const
 {
   if (d->invalid())
     return 0;
   return d->reallen;
 }
 
-KSocketAddress& KSocketAddress::setLength(TQ_UINT16 len)
+KSocketAddress& KSocketAddress::setLength(Q_UINT16 len)
 {
   d->dup((sockaddr*)0L, len, false);
 
@@ -619,7 +619,7 @@ TQString KSocketAddress::toString() const
     fmt = "[%1]:%2";
 #endif
   else if (d->addr.generic->sa_family == AF_UNIX)
-    return TQString::tqfromLatin1("unix:%1").arg(serviceName());
+    return TQString::fromLatin1("unix:%1").arg(serviceName());
   else
     return i18n("1: the unknown socket address family number",
 		"Unknown family %1").arg(d->addr.generic->sa_family);
@@ -687,7 +687,7 @@ KInetSocketAddress::KInetSocketAddress()
 }
 
 // binary data constructor
-KInetSocketAddress::KInetSocketAddress(const sockaddr* sa, TQ_UINT16 len)
+KInetSocketAddress::KInetSocketAddress(const sockaddr* sa, Q_UINT16 len)
   : KSocketAddress(sa, len)
 {
   if (!d->invalid())
@@ -695,7 +695,7 @@ KInetSocketAddress::KInetSocketAddress(const sockaddr* sa, TQ_UINT16 len)
 }
 
 // create from IP and port
-KInetSocketAddress::KInetSocketAddress(const KIpAddress& host, TQ_UINT16 port)
+KInetSocketAddress::KInetSocketAddress(const KIpAddress& host, Q_UINT16 port)
 {
   setHost(host);
   setPort(port);
@@ -788,14 +788,14 @@ KInetSocketAddress& KInetSocketAddress::setHost(const KIpAddress& ip)
 
     default:
       // empty
-      d->tqinvalidate();
+      d->invalidate();
     }
 
   return *this;
 }
 
 // returns the port
-TQ_UINT16 KInetSocketAddress::port() const
+Q_UINT16 KInetSocketAddress::port() const
 {
   if (d->invalid())
     return 0;
@@ -814,7 +814,7 @@ TQ_UINT16 KInetSocketAddress::port() const
   return 0;
 }
 
-KInetSocketAddress& KInetSocketAddress::setPort(TQ_UINT16 port)
+KInetSocketAddress& KInetSocketAddress::setPort(Q_UINT16 port)
 {
   if (d->invalid())
     makeIPv4();
@@ -832,7 +832,7 @@ KInetSocketAddress& KInetSocketAddress::setPort(TQ_UINT16 port)
 #endif
       
     default:
-      d->tqinvalidate();		// setting the port on something else
+      d->invalidate();		// setting the port on something else
     }
 
   return *this;
@@ -850,7 +850,7 @@ KInetSocketAddress& KInetSocketAddress::makeIPv6()
   return *this;
 }
 
-TQ_UINT32 KInetSocketAddress::flowinfo() const
+Q_UINT32 KInetSocketAddress::flowinfo() const
 {
 #ifndef AF_INET6
   return 0;
@@ -862,7 +862,7 @@ TQ_UINT32 KInetSocketAddress::flowinfo() const
 #endif
 }
 
-KInetSocketAddress& KInetSocketAddress::setFlowinfo(TQ_UINT32 flowinfo)
+KInetSocketAddress& KInetSocketAddress::setFlowinfo(Q_UINT32 flowinfo)
 {
   makeIPv6();			// must set here
   d->addr.in6->sin6_flowinfo = flowinfo;
@@ -897,18 +897,18 @@ void KInetSocketAddress::update()
     return;
 #endif
   else
-    d->tqinvalidate();
+    d->invalidate();
 }
 
 KUnixSocketAddress::KUnixSocketAddress()
 {
 }
 
-KUnixSocketAddress::KUnixSocketAddress(const sockaddr* sa, TQ_UINT16 len)
+KUnixSocketAddress::KUnixSocketAddress(const sockaddr* sa, Q_UINT16 len)
   : KSocketAddress(sa, len)
 {
   if (!d->invalid() && d->addr.un->sun_family != AF_UNIX)
-    d->tqinvalidate();
+    d->invalidate();
 }
 
 KUnixSocketAddress::KUnixSocketAddress(const KUnixSocketAddress& other)
diff --git a/kdecore/network/ksocketaddress.h b/kdecore/network/ksocketaddress.h
index 2d44a0909..6889527e3 100644
--- a/kdecore/network/ksocketaddress.h
+++ b/kdecore/network/ksocketaddress.h
@@ -119,7 +119,7 @@ public:
    *
    * @param ip4addr		the IPv4 address
    */
-  inline KIpAddress(TQ_UINT32 ip4addr)
+  inline KIpAddress(Q_UINT32 ip4addr)
   { setAddress(&ip4addr, 4); }
 
   /**
@@ -232,7 +232,7 @@ public:
    * system's in_addr type.
    *
    */
-  inline TQ_UINT32 IPv4Addr(bool convertMapped = true) const
+  inline Q_UINT32 IPv4Addr(bool convertMapped = true) const
   {
     return (convertMapped && isV4Mapped()) ? m_data[3] : m_data[0];
   }
@@ -245,7 +245,7 @@ public:
    * valid. The address returned is in host byte order.
    *
    */
-  TQ_UINT32 hostIPv4Addr(bool convertMapped = true) const;
+  Q_UINT32 hostIPv4Addr(bool convertMapped = true) const;
 
 public:
   /*-- tests --*/
@@ -310,7 +310,7 @@ public:
   inline bool isMulticast() const
   {
     if (version() == 4) return isClassD();
-    if (version() == 6) return ((TQ_UINT8*)addr())[0] == 0xff;
+    if (version() == 6) return ((Q_UINT8*)addr())[0] == 0xff;
     return false;
   }
 
@@ -320,7 +320,7 @@ public:
   inline bool isLinkLocal() const
   { 
     if (version() != 6) return false;
-    TQ_UINT8* addr = (TQ_UINT8*)this->addr();
+    Q_UINT8* addr = (Q_UINT8*)this->addr();
     return (addr[0] & 0xff) == 0xfe &&
       (addr[1] & 0xc0) == 0x80;
   }
@@ -331,7 +331,7 @@ public:
   inline bool isSiteLocal() const
   {
     if (version() != 6) return false;
-    TQ_UINT8* addr = (TQ_UINT8*)this->addr();
+    Q_UINT8* addr = (Q_UINT8*)this->addr();
     return (addr[0] & 0xff) == 0xfe &&
       (addr[1] & 0xc0) == 0xc0;
   }
@@ -348,10 +348,10 @@ public:
   inline bool isV4Mapped() const
   {
     if (version() != 6) return false;
-    TQ_UINT32* addr = (TQ_UINT32*)this->addr();
+    Q_UINT32* addr = (Q_UINT32*)this->addr();
     return addr[0] == 0 && addr[1] == 0 &&
-      ((TQ_UINT16*)&addr[2])[0] == 0 &&
-      ((TQ_UINT16*)&addr[2])[1] == 0xffff;
+      ((Q_UINT16*)&addr[2])[0] == 0 &&
+      ((Q_UINT16*)&addr[2])[1] == 0xffff;
   }
 
   /**
@@ -360,7 +360,7 @@ public:
   inline bool isV4Compat() const
   {
     if (version() != 6 || isLocalhost()) return false;
-    TQ_UINT32* addr = (TQ_UINT32*)this->addr();
+    Q_UINT32* addr = (Q_UINT32*)this->addr();
     return addr[0] == 0 && addr[1] == 0 && addr[2] == 0 && addr[3] != 0;
   }
 
@@ -368,34 +368,34 @@ public:
    * Returns true if this is an IPv6 node-local multicast address.
    */
   inline bool isMulticastNodeLocal() const
-  { return version() == 6 && isMulticast() && (((TQ_UINT32*)addr())[0] & 0xf) == 0x1; }
+  { return version() == 6 && isMulticast() && (((Q_UINT32*)addr())[0] & 0xf) == 0x1; }
 
   /**
    * Returns true if this is an IPv6 link-local multicast address.
    */
   inline bool isMulticastLinkLocal() const
-  { return version() == 6 && isMulticast() && (((TQ_UINT32*)addr())[0] & 0xf) == 0x2; }
+  { return version() == 6 && isMulticast() && (((Q_UINT32*)addr())[0] & 0xf) == 0x2; }
       
   /**
    * Returns true if this is an IPv6 site-local multicast address.
    */
   inline bool isMulticastSiteLocal() const
-  { return version() == 6 && isMulticast() && (((TQ_UINT32*)addr())[0] & 0xf) == 0x5; }
+  { return version() == 6 && isMulticast() && (((Q_UINT32*)addr())[0] & 0xf) == 0x5; }
 
   /**
    * Returns true if this is an IPv6 organisational-local multicast address.
    */
   inline bool isMulticastOrgLocal() const
-  { return version() == 6 && isMulticast() && (((TQ_UINT32*)addr())[0] & 0xf) == 0x8; }
+  { return version() == 6 && isMulticast() && (((Q_UINT32*)addr())[0] & 0xf) == 0x8; }
 
   /**
    * Returns true if this is an IPv6 global multicast address.
    */
   inline bool isMulticastGlobal() const
-  { return version() == 6 && isMulticast() && (((TQ_UINT32*)addr())[0] & 0xf) == 0xe; }
+  { return version() == 6 && isMulticast() && (((Q_UINT32*)addr())[0] & 0xf) == 0xe; }
 
 protected:
-  TQ_UINT32 m_data[4];	       // 16 bytes, needed for an IPv6 address
+  Q_UINT32 m_data[4];	       // 16 bytes, needed for an IPv6 address
 
   char m_version;
 
@@ -437,7 +437,7 @@ public:
    * @param sa		the socket address structure
    * @param len		the socket address length
    */
-  KSocketAddress(const sockaddr* sa, TQ_UINT16 len);
+  KSocketAddress(const sockaddr* sa, Q_UINT16 len);
 
   /**
    * Copy constructor. This creates a copy of the other
@@ -490,7 +490,7 @@ public:
    * @param sa		the socket address structure
    * @param len		the socket address length
    */
-  KSocketAddress& setAddress(const sockaddr *sa, TQ_UINT16 len);
+  KSocketAddress& setAddress(const sockaddr *sa, Q_UINT16 len);
 
   /**
    * Returns the socket address structure, to be passed down to
@@ -502,7 +502,7 @@ public:
   /**
    * Returns the length of this socket address structure.
    */
-  TQ_UINT16 length() const;
+  Q_UINT16 length() const;
 
   /**
    * Sets the length of this socket structure.
@@ -511,7 +511,7 @@ public:
    * buffer to fit needs. This function should not be used except for handling
    * unknown socket address structures.
    *
-   * Also note that this function may tqinvalidate the socket if a known
+   * Also note that this function may invalidate the socket if a known
    * family is set (Internet or Unix socket) and the new length would be
    * too small to hold the system's sockaddr_* structure. If unsure, reset
    * the family:
@@ -524,7 +524,7 @@ public:
    *
    * @param len		the new length
    */
-  KSocketAddress& setLength(TQ_UINT16 len);
+  KSocketAddress& setLength(Q_UINT16 len);
 
   /**
    * Returns the family of this address.
@@ -535,7 +535,7 @@ public:
   /**
    * Sets the family of this object.
    *
-   * Note: setting the family will probably tqinvalidate any address data
+   * Note: setting the family will probably invalidate any address data
    * contained in this object. Use this function with care.
    *
    * @param family	the new family to set
@@ -666,7 +666,7 @@ public:
    * @param sa		the sockaddr structure
    * @param len		the structure's length
    */
-  KInetSocketAddress(const sockaddr* sa, TQ_UINT16 len);
+  KInetSocketAddress(const sockaddr* sa, Q_UINT16 len);
 
   /**
    * Creates an object from an IP address and port.
@@ -674,7 +674,7 @@ public:
    * @param host	the IP address
    * @param port	the port number
    */
-  KInetSocketAddress(const KIpAddress& host, TQ_UINT16 port);
+  KInetSocketAddress(const KIpAddress& host, Q_UINT16 port);
 
   /**
    * Copy constructor.
@@ -688,7 +688,7 @@ public:
   /**
    * Copy constructor.
    *
-   * If the other, generic socket address tqcontains an Internet address,
+   * If the other, generic socket address contains an Internet address,
    * it will be copied. Otherwise, this object will be empty.
    *
    * @param other	the other object
@@ -750,7 +750,7 @@ public:
    * @return a port number in the range 0 to 65535, inclusive. An empty or 
    * invalid object will have a port number of 0.
    */
-  TQ_UINT16 port() const;
+  Q_UINT16 port() const;
 
   /**
    * Sets the port number. If this object is empty, this function will default to
@@ -759,7 +759,7 @@ public:
    * @param port	the port number to set
    * @return a reference to itself
    */
-  KInetSocketAddress& setPort(TQ_UINT16 port);
+  KInetSocketAddress& setPort(Q_UINT16 port);
 
   /**
    * Converts this object to an IPv4 socket address. It has no effect if the object
@@ -787,7 +787,7 @@ public:
    *
    * @return the flowinfo information or 0 if this object is empty or IPv4
    */
-  TQ_UINT32 flowinfo() const;
+  Q_UINT32 flowinfo() const;
 
   /**
    * Sets the flowinfo information for an IPv6 socket address. If this is not
@@ -796,7 +796,7 @@ public:
    * @param flowinfo		the flowinfo to set
    * @return a reference to itself
    */
-  KInetSocketAddress& setFlowinfo(TQ_UINT32 flowinfo);
+  KInetSocketAddress& setFlowinfo(Q_UINT32 flowinfo);
 
   /**
    * Returns the scope id this IPv6 socket is bound to.
@@ -854,7 +854,7 @@ public:
    * @param sa		the socket address structure
    * @param len		the structure's length
    */
-  KUnixSocketAddress(const sockaddr* sa, TQ_UINT16 len);
+  KUnixSocketAddress(const sockaddr* sa, Q_UINT16 len);
 
   /**
    * Copy constructor. Creates a copy of the other object,
diff --git a/kdecore/network/ksocketbase.h b/kdecore/network/ksocketbase.h
index fe8812cde..133086114 100644
--- a/kdecore/network/ksocketbase.h
+++ b/kdecore/network/ksocketbase.h
@@ -128,7 +128,7 @@ public:
    * Possible socket error codes.
    *
    * This is a list of possible error conditions that socket classes may
-   * be expected to tqfind.
+   * be expected to find.
    *
    * - NoError: no error has been detected
    * - LookupFailure: if a name lookup has failed
@@ -191,11 +191,11 @@ protected:
   /**
    * Set the given socket options.
    *
-   * The default implementation does nothing but store the tqmask internally.
+   * The default implementation does nothing but store the mask internally.
    * Descended classes must override this function to achieve functionality and
    * must also call this implementation.
    *
-   * @param opts	a tqmask of @ref SocketOptions or-ed bits of options to set
+   * @param opts	a mask of @ref SocketOptions or-ed bits of options to set
    *			or unset
    * @returns true on success
    * @note this function sets the options corresponding to the bits enabled in @p opts
@@ -206,11 +206,11 @@ protected:
   /**
    * Retrieves the socket options that have been set.
    *
-   * The default implementation just retrieves the tqmask from an internal variable.
+   * The default implementation just retrieves the mask from an internal variable.
    * Descended classes may choose to override this function to read the values
    * from the operating system.
    *
-   * @returns the tqmask of the options set
+   * @returns the mask of the options set
    */
   virtual int socketOptions() const;
 
@@ -350,9 +350,9 @@ public:
    *       should test the object returned by @ref socketDevice (through
    *       @ref KSocketDevice::capabilities, for instance) the availability.
    *
-   * @param add		tqmask of @ref KSocketDevice::Capabilities to add
-   * @param remove	tqmask of bits to remove from the requirements
-   * @return the current tqmask of requested capabilities
+   * @param add		mask of @ref KSocketDevice::Capabilities to add
+   * @param remove	mask of bits to remove from the requirements
+   * @return the current mask of requested capabilities
    */
   int setRequestedCapabilities(int add, int remove = 0);
 
@@ -533,7 +533,7 @@ public:
    * blocking.
    */
 #ifdef USE_QT3
-  virtual TQ_LONG bytesAvailable() const = 0;
+  virtual Q_LONG bytesAvailable() const = 0;
 #endif
 #ifdef USE_QT4
   virtual qint64 bytesAvailable() const = 0;
@@ -550,7 +550,7 @@ public:
    *
    * @returns the number of bytes available
    */
-  virtual TQ_LONG waitForMore(int msecs, bool *timeout = 0L) = 0;
+  virtual Q_LONG waitForMore(int msecs, bool *timeout = 0L) = 0;
 
   /**
    * Reads data from the socket.
@@ -558,7 +558,7 @@ public:
    * Reimplemented from TQIODevice. See TQIODevice::readBlock for
    * more information.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG len) = 0;
+  virtual Q_LONG readBlock(char *data, Q_ULONG len) = 0;
 
   /** @overload
    * Receives data and the source address.
@@ -571,7 +571,7 @@ public:
    * @param from		the address of the sender will be stored here
    * @returns the actual number of bytes read
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) = 0;
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from) = 0;
 
   /**
    * Peeks the data in the socket.
@@ -584,7 +584,7 @@ public:
    * @param maxlen		the maximum number of bytes to peek
    * @returns the actual number of bytes copied into @p data
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen) = 0;
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen) = 0;
 
   /** @overload
    * Peeks the data in the socket and the source address.
@@ -598,7 +598,7 @@ public:
    * @param from		the address of the sender will be stored here
    * @returns the actual number of bytes copied into @p data
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) = 0;
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from) = 0;
 
   /**
    * Writes the given data to the socket.
@@ -606,7 +606,7 @@ public:
    * Reimplemented from TQIODevice. See TQIODevice::writeBlock for
    * more information.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len) = 0;
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len) = 0;
 
   /** @overload
    * Writes the given data to the destination address.
@@ -619,7 +619,7 @@ public:
    * @param to			the address to send to
    * @returns the number of bytes actually sent
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to) = 0;
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to) = 0;
 
   /**
    * Reads one character from the socket.
diff --git a/kdecore/network/ksocketbuffer.cpp b/kdecore/network/ksocketbuffer.cpp
index ca47bef9a..18c926c83 100644
--- a/kdecore/network/ksocketbuffer.cpp
+++ b/kdecore/network/ksocketbuffer.cpp
@@ -33,7 +33,7 @@
 using namespace KNetwork;
 using namespace KNetwork::Internal;
 
-KSocketBuffer::KSocketBuffer(TQ_LONG size)
+KSocketBuffer::KSocketBuffer(Q_LONG size)
   : m_mutex(true), m_offset(0), m_size(size), m_length(0)
 {
 }
@@ -75,9 +75,9 @@ bool KSocketBuffer::canReadLine() const
   // walk the buffer
   for ( ; it != end; ++it)
     {
-      if ((*it).tqfind('\n', offset) != -1)
+      if ((*it).find('\n', offset) != -1)
 	return true;
-      if ((*it).tqfind('\r', offset) != -1)
+      if ((*it).find('\r', offset) != -1)
 	return true;
       offset = 0;
     }
@@ -92,7 +92,7 @@ TQCString KSocketBuffer::readLine()
 
   TQMutexLocker locker(&m_mutex);
 
-  // tqfind the offset of the newline in the buffer
+  // find the offset of the newline in the buffer
   int newline = 0;
   TQValueListConstIterator<TQByteArray> it = m_list.constBegin(),
     end = m_list.constEnd();
@@ -101,7 +101,7 @@ TQCString KSocketBuffer::readLine()
   // walk the buffer
   for ( ; it != end; ++it)
     {
-      int posnl = (*it).tqfind('\n', offset);
+      int posnl = (*it).find('\n', offset);
       if (posnl == -1)
 	{
 	  // not found in this one
@@ -120,17 +120,17 @@ TQCString KSocketBuffer::readLine()
   return result;
 }
 
-TQ_LONG KSocketBuffer::length() const
+Q_LONG KSocketBuffer::length() const
 {
   return m_length;
 }
 
-TQ_LONG KSocketBuffer::size() const
+Q_LONG KSocketBuffer::size() const
 {
   return m_size;
 }
 
-bool KSocketBuffer::setSize(TQ_LONG size)
+bool KSocketBuffer::setSize(Q_LONG size)
 {
   m_size = size;
   if (size == -1 || m_length < m_size)
@@ -147,7 +147,7 @@ bool KSocketBuffer::setSize(TQ_LONG size)
   return (m_length - m_size) == consumeBuffer(0L, m_length - m_size, true);
 }
 
-TQ_LONG KSocketBuffer::feedBuffer(const char *data, TQ_LONG len)
+Q_LONG KSocketBuffer::feedBuffer(const char *data, Q_LONG len)
 {
   if (data == 0L || len == 0)
     return 0;			// nothing to write
@@ -168,7 +168,7 @@ TQ_LONG KSocketBuffer::feedBuffer(const char *data, TQ_LONG len)
   return len;
 }
 
-TQ_LONG KSocketBuffer::consumeBuffer(char *destbuffer, TQ_LONG maxlen, bool discard)
+Q_LONG KSocketBuffer::consumeBuffer(char *destbuffer, Q_LONG maxlen, bool discard)
 {
   if (maxlen == 0 || isEmpty())
     return 0;
@@ -176,7 +176,7 @@ TQ_LONG KSocketBuffer::consumeBuffer(char *destbuffer, TQ_LONG maxlen, bool disc
   TQValueListIterator<TQByteArray> it = m_list.begin(),
     end = m_list.end();
   TQIODevice::Offset offset = m_offset;
-  TQ_LONG copied = 0;
+  Q_LONG copied = 0;
 
   // walk the buffer
   while (it != end && maxlen)
@@ -228,7 +228,7 @@ void KSocketBuffer::clear()
   m_length = 0;
 }
 
-TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
+Q_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, Q_LONG len)
 {
   if (len == 0 || isEmpty())
     return 0;
@@ -238,7 +238,7 @@ TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
   TQValueListIterator<TQByteArray> it = m_list.begin(),
     end = m_list.end();
   TQIODevice::Offset offset = m_offset;
-  TQ_LONG written = 0;
+  Q_LONG written = 0;
   
   // walk the buffer
   while (it != end && (len || len == -1))
@@ -248,11 +248,11 @@ TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
       // better by concatenating a few of them into a big buffer
       // question is: how big should that buffer be? 2 kB should be enough
 
-      TQ_ULONG bufsize = 1460;
+      Q_ULONG bufsize = 1460;
       if (len != -1 && len < bufsize)
 	bufsize = len;
       TQByteArray buf(bufsize);
-      TQ_LONG count = 0;
+      Q_LONG count = 0;
 
       while (it != end && count + ((*it).size() - offset) <= bufsize)
 	{
@@ -273,7 +273,7 @@ TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
 	}
 
       // now try to write those bytes
-      TQ_LONG wrote = dev->writeBlock(buf, count);
+      Q_LONG wrote = dev->writeBlock(buf, count);
 
       if (wrote == -1)
 	// error?
@@ -293,7 +293,7 @@ TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
   return written;
 }
 
-TQ_LONG KSocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len)
+Q_LONG KSocketBuffer::receiveFrom(KActiveSocketBase* dev, Q_LONG len)
 {
   if (len == 0 || isFull())
     return 0;
@@ -310,7 +310,7 @@ TQ_LONG KSocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len)
   if (m_size != -1 && len > (m_size - m_length))
     len = m_size - m_length;
 
-  // here, len tqcontains just as many bytes as we're supposed to read
+  // here, len contains just as many bytes as we're supposed to read
 
   // now do the reading
   TQByteArray a(len);
diff --git a/kdecore/network/ksocketbuffer_p.h b/kdecore/network/ksocketbuffer_p.h
index 0b8e96205..a4a0d6a9e 100644
--- a/kdecore/network/ksocketbuffer_p.h
+++ b/kdecore/network/ksocketbuffer_p.h
@@ -53,7 +53,7 @@ public:
    *
    * @param size	the maximum size of the buffer
    */
-  KSocketBuffer(TQ_LONG size = -1);
+  KSocketBuffer(Q_LONG size = -1);
 
   /**
    * Copy constructor.
@@ -86,7 +86,7 @@ public:
    *
    * @sa size
    */
-  virtual TQ_LONG length() const;
+  virtual Q_LONG length() const;
 
   /**
    * Retrieves the buffer size. The value of -1 indicates that
@@ -94,7 +94,7 @@ public:
    *
    * @sa length for the length of the data stored
    */
-  virtual TQ_LONG size() const;
+  virtual Q_LONG size() const;
 
   /**
    * Sets the size of the buffer, if allowed.
@@ -103,7 +103,7 @@ public:
    * @returns true on success, false if an error occurred.
    * @note if the new size is less than length(), the buffer will be truncated
    */
-  virtual bool setSize(TQ_LONG size);
+  virtual bool setSize(Q_LONG size);
 
   /**
    * Adds data to the end of the buffer.
@@ -112,7 +112,7 @@ public:
    * @param len		the data length, in bytes
    * @returns the number of bytes added to the end of the buffer.
    */
-  virtual TQ_LONG feedBuffer(const char *data, TQ_LONG len);
+  virtual Q_LONG feedBuffer(const char *data, Q_LONG len);
 
   /**
    * Clears the buffer.
@@ -127,7 +127,7 @@ public:
    * @param discard	if true, the bytes copied will be discarded
    * @returns the number of bytes copied from the buffer
    */
-  virtual TQ_LONG consumeBuffer(char *data, TQ_LONG maxlen, bool discard = true);
+  virtual Q_LONG consumeBuffer(char *data, Q_LONG maxlen, bool discard = true);
 
   /**
    * Sends at most @p len bytes of data to the I/O Device.
@@ -137,7 +137,7 @@ public:
    * @returns the number of bytes sent and discarded from the buffer, -1
    *          indicates an error.
    */
-  virtual TQ_LONG sendTo(KActiveSocketBase* device, TQ_LONG len = -1);
+  virtual Q_LONG sendTo(KActiveSocketBase* device, Q_LONG len = -1);
 
   /**
    * Tries to receive @p len bytes of data from the I/O device.
@@ -148,15 +148,15 @@ public:
    * @returns the number of bytes received and copied into the buffer,
    *	      -1 indicates an error.
    */
-  virtual TQ_LONG receiveFrom(KActiveSocketBase* device, TQ_LONG len = -1);
+  virtual Q_LONG receiveFrom(KActiveSocketBase* device, Q_LONG len = -1);
 
 protected:
   mutable TQMutex m_mutex;
   TQValueList<TQByteArray> m_list;
   TQIODevice::Offset m_offset;	///< offset of the start of data in the first element
 
-  TQ_LONG m_size;		///< the maximum length of the buffer
-  mutable TQ_LONG m_length;
+  Q_LONG m_size;		///< the maximum length of the buffer
+  mutable Q_LONG m_length;
 };
 
 } }			// namespace KNetwork::Internal
diff --git a/kdecore/network/ksocketdevice.cpp b/kdecore/network/ksocketdevice.cpp
index 793642bf9..53a16ca0a 100644
--- a/kdecore/network/ksocketdevice.cpp
+++ b/kdecore/network/ksocketdevice.cpp
@@ -365,7 +365,7 @@ bool KSocketDevice::disconnect()
 }
 
 #ifdef USE_QT3
-TQ_LONG KSocketDevice::bytesAvailable() const
+Q_LONG KSocketDevice::bytesAvailable() const
 #endif
 #ifdef USE_QT4
 qint64 KSocketDevice::bytesAvailable() const
@@ -381,7 +381,7 @@ qint64 KSocketDevice::bytesAvailable() const
   return nchars;
 }
 
-TQ_LONG KSocketDevice::waitForMore(int msecs, bool *timeout)
+Q_LONG KSocketDevice::waitForMore(int msecs, bool *timeout)
 {
   if (m_sockfd == -1)
     return -1;			// there won't ever be anything to read...
@@ -393,7 +393,7 @@ TQ_LONG KSocketDevice::waitForMore(int msecs, bool *timeout)
   return bytesAvailable();
 }
 
-static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
+static int do_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
 {
   socklen_t len;
   if (from)
@@ -419,7 +419,7 @@ static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddres
   return 0;
 }
 
-TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KSocketDevice::readBlock(char *data, Q_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -440,7 +440,7 @@ TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from)
+Q_LONG KSocketDevice::readBlock(char *data, Q_ULONG maxlen, KSocketAddress &from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -461,7 +461,7 @@ TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress &fr
   return retval;
 }
 
-TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KSocketDevice::peekBlock(char *data, Q_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -482,7 +482,7 @@ TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+Q_LONG KSocketDevice::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -503,12 +503,12 @@ TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& fr
   return retval;
 }
 
-TQ_LONG KSocketDevice::writeBlock(const char *data, TQ_ULONG len)
+Q_LONG KSocketDevice::writeBlock(const char *data, Q_ULONG len)
 {
   return writeBlock(data, len, KSocketAddress());
 }
 
-TQ_LONG KSocketDevice::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+Q_LONG KSocketDevice::writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to)
 {
   resetError();
   if (m_sockfd == -1)
@@ -884,7 +884,7 @@ KSocketDevice::setDefaultImpl(KSocketDeviceFactoryBase* factory)
 void KSocketDevice::addNewImpl(KSocketDeviceFactoryBase* factory, int capabilities)
 {
   TQMutexLocker locker(&defaultImplFactoryMutex);
-  if (factories.tqcontains(capabilities))
+  if (factories.contains(capabilities))
     delete factories[capabilities];
   factories.insert(capabilities, factory);
 }
diff --git a/kdecore/network/ksocketdevice.h b/kdecore/network/ksocketdevice.h
index a6dd4c4d0..5f86687b2 100644
--- a/kdecore/network/ksocketdevice.h
+++ b/kdecore/network/ksocketdevice.h
@@ -124,7 +124,7 @@ public:
 
   /**
    * Returns the set of capabilities this socket class implements.
-   * The set of capabilities is defined as an OR-ed tqmask of 
+   * The set of capabilities is defined as an OR-ed mask of 
    * @ref Capabilities bits.
    *
    * The default implementation is guaranteed to always return 0. That
@@ -199,7 +199,7 @@ public:
    * Returns the number of bytes available for reading without blocking.
    */
 #ifdef USE_QT3
-  virtual TQ_LONG bytesAvailable() const;
+  virtual Q_LONG bytesAvailable() const;
 #endif
 #ifdef USE_QT4
   virtual qint64 bytesAvailable() const;
@@ -211,37 +211,37 @@ public:
    * This function is a wrapper against @ref poll. This function will wait
    * for any read events.
    */
-  virtual TQ_LONG waitForMore(int msecs, bool *timeout = 0L);
+  virtual Q_LONG waitForMore(int msecs, bool *timeout = 0L);
 
   /**
    * Reads data from this socket.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen);
 
   /**
    * Reads data and the source address from this socket.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Peeks data in the socket.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen);
 
   /**
    * Peeks the data in the socket and the source address.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Writes data to the socket.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len);
 
   /**
    * Writes the given data to the given destination address.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to);
 
   /**
    * Returns this socket's local address.
diff --git a/kdecore/network/ksockssocketdevice.cpp b/kdecore/network/ksockssocketdevice.cpp
index b9fcb6cdd..f67b90bc9 100644
--- a/kdecore/network/ksockssocketdevice.cpp
+++ b/kdecore/network/ksockssocketdevice.cpp
@@ -190,7 +190,7 @@ KSocksSocketDevice* KSocksSocketDevice::accept()
   return new KSocksSocketDevice(newfd);
 }
 
-static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
+static int socks_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
 {
   kde_socklen_t len;
   if (from)
@@ -214,7 +214,7 @@ static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAdd
   return 0;
 }
 
-TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KSocksSocketDevice::readBlock(char *data, Q_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -235,7 +235,7 @@ TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from)
+Q_LONG KSocksSocketDevice::readBlock(char *data, Q_ULONG maxlen, KSocketAddress &from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -256,7 +256,7 @@ TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddres
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KSocksSocketDevice::peekBlock(char *data, Q_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -277,7 +277,7 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+Q_LONG KSocksSocketDevice::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -298,12 +298,12 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddres
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len)
+Q_LONG KSocksSocketDevice::writeBlock(const char *data, Q_ULONG len)
 {
   return writeBlock(data, len, KSocketAddress());
 }
 
-TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+Q_LONG KSocksSocketDevice::writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to)
 {
   resetError();
   if (m_sockfd == -1)
diff --git a/kdecore/network/ksockssocketdevice.h b/kdecore/network/ksockssocketdevice.h
index 1f8453836..62de23f05 100644
--- a/kdecore/network/ksockssocketdevice.h
+++ b/kdecore/network/ksockssocketdevice.h
@@ -83,20 +83,20 @@ public:
   /**
    * Overrides reading.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen);
+  virtual Q_LONG readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Overrides peeking.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen);
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen);
+  virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Overrides writing.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len);
+  virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to);
 
   /**
    * Overrides getting socket address.
diff --git a/kdecore/network/ksrvresolverworker.cpp b/kdecore/network/ksrvresolverworker.cpp
index abb9edaaa..07e3555fa 100644
--- a/kdecore/network/ksrvresolverworker.cpp
+++ b/kdecore/network/ksrvresolverworker.cpp
@@ -51,11 +51,11 @@ bool KSrvResolverWorker::preprocess()
     return false;
 
   TQString node = nodeName();
-  if (node.tqfind('%') != -1)
-    node.truncate(node.tqfind('%'));
+  if (node.find('%') != -1)
+    node.truncate(node.find('%'));
 
-  if (node.isEmpty() || node == TQString::tqfromLatin1("*") ||
-      node == TQString::tqfromLatin1("localhost"))
+  if (node.isEmpty() || node == TQString::fromLatin1("*") ||
+      node == TQString::fromLatin1("localhost"))
     return false;		// empty == localhost
 
   encodedName = KResolver::domainToAscii(node);
@@ -225,7 +225,7 @@ bool KSrvResolverWorker::postprocess()
 
 void KSrvResolverWorker::customEvent(TQCustomEvent*)
 {
-  dns = new TQDns(TQString::tqfromLatin1(encodedName), TQDns::Srv);
+  dns = new TQDns(TQString::fromLatin1(encodedName), TQDns::Srv);
   TQObject::connect(dns, TQT_SIGNAL(resultsReady()), this, TQT_SLOT(dnsResultsReady()));
 }
 
diff --git a/kdecore/network/ksrvresolverworker_p.h b/kdecore/network/ksrvresolverworker_p.h
index df79f6c16..90074214f 100644
--- a/kdecore/network/ksrvresolverworker_p.h
+++ b/kdecore/network/ksrvresolverworker_p.h
@@ -47,8 +47,8 @@ namespace KNetwork
       struct Entry
       {
 	TQString name;
-	TQ_UINT16 port;
-	TQ_UINT16 weight;
+	Q_UINT16 port;
+	Q_UINT16 weight;
 	KNetwork::KResolver* resolver;
       };
 
@@ -57,7 +57,7 @@ namespace KNetwork
 	PriorityClass() : totalWeight(0) { }
 
 	TQValueList<Entry> entries;
-	TQ_UINT16 totalWeight;
+	Q_UINT16 totalWeight;
       };
 
     private:
@@ -66,7 +66,7 @@ namespace KNetwork
       TQCString encodedName;
       TQSemaphore *sem;
 
-      typedef TQMap<TQ_UINT16, PriorityClass> Results;
+      typedef TQMap<Q_UINT16, PriorityClass> Results;
       Results myResults;
 
     public:
diff --git a/kdecore/network/kstreamsocket.cpp b/kdecore/network/kstreamsocket.cpp
index 5f4fa6a0d..8ca4f91f6 100644
--- a/kdecore/network/kstreamsocket.cpp
+++ b/kdecore/network/kstreamsocket.cpp
@@ -246,7 +246,7 @@ void KStreamSocket::connectionEvent()
       // try to bind
       if (!bindLocallyFor(r))
 	{
-	  // could not tqfind a matching family
+	  // could not find a matching family
 	  ++d->peer;
 	  continue;
 	}
diff --git a/kdecore/svgicons/ksvgiconengine.cpp b/kdecore/svgicons/ksvgiconengine.cpp
index 858a210bb..dd54e99be 100644
--- a/kdecore/svgicons/ksvgiconengine.cpp
+++ b/kdecore/svgicons/ksvgiconengine.cpp
@@ -64,7 +64,7 @@ public:
 			oldOffset = newOffset;
 			TQString temp = element.attribute("offset");
 
-			if(temp.tqcontains("%"))
+			if(temp.contains("%"))
 			{
 				temp = temp.left(temp.length() - 1);
 				newOffset = temp.toFloat() / 100.0;
@@ -127,12 +127,12 @@ public:
 			TQColor qStopColor = m_engine->painter()->parseColor(parseColor);
 
 			// Convert in a libart suitable form
-			TQ_UINT32 stopColor = m_engine->painter()->toArtColor(qStopColor);
+			Q_UINT32 stopColor = m_engine->painter()->toArtColor(qStopColor);
 
 			int opacity = m_engine->painter()->parseOpacity(parseOpacity);
 
-			TQ_UINT32 rgba = (stopColor << 8) | opacity;
-			TQ_UINT32 r, g, b, a;
+			Q_UINT32 rgba = (stopColor << 8) | opacity;
+			Q_UINT32 r, g, b, a;
 
 			// Convert from separated to premultiplied alpha
 			a = rgba & 0xff;
@@ -170,12 +170,12 @@ public:
 
 		points = points.simplifyWhiteSpace();
 
-		if(points.tqcontains(",,") || points.tqcontains(", ,"))
+		if(points.contains(",,") || points.contains(", ,"))
 			return TQPointArray();
 
-		points.tqreplace(',', ' ');
-		points.tqreplace('\r', TQString::null);
-		points.tqreplace('\n', TQString::null);
+		points.replace(',', ' ');
+		points.replace('\r', TQString::null);
+		points.replace('\n', TQString::null);
 
 		points = points.simplifyWhiteSpace();
 
@@ -201,7 +201,7 @@ public:
 		// Combine new and old matrix
 		TQWMatrix matrix = m_engine->painter()->parseTransform(transform);
 
-		TQWMatrix *current = m_engine->painter()->tqworldMatrix();
+		TQWMatrix *current = m_engine->painter()->worldMatrix();
 		*current = matrix * *current;
 	}
 
@@ -221,9 +221,9 @@ public:
 		TQPtrList<TQDomNamedNodeMap> applyList;
 		applyList.setAutoDelete(true);
 
-		TQDomNode tqshape = node.parentNode();
-		for(; !tqshape.isNull() ; tqshape = tqshape.parentNode())
-			applyList.prepend(new TQDomNamedNodeMap(tqshape.attributes()));
+		TQDomNode shape = node.parentNode();
+		for(; !shape.isNull() ; shape = shape.parentNode())
+			applyList.prepend(new TQDomNamedNodeMap(shape.attributes()));
 
 		// Apply parent attributes
 		for(TQDomNamedNodeMap *map = applyList.first(); map != 0; map = applyList.next())
@@ -403,10 +403,10 @@ public:
 		{
 			bool filled = true;
 
-			if(element.hasAttribute("fill") && element.attribute("fill").tqcontains("none"))
+			if(element.hasAttribute("fill") && element.attribute("fill").contains("none"))
 				filled = false;
 
-			if(element.attribute("style").tqcontains("fill") && element.attribute("style").stripWhiteSpace().tqcontains("fill:none"))
+			if(element.attribute("style").contains("fill") && element.attribute("style").stripWhiteSpace().contains("fill:none"))
 				filled = false;
 
 			m_engine->painter()->drawPath(element.attribute("d"), filled);
@@ -622,7 +622,7 @@ bool KSVGIconEngine::load(int width, int height, const TQString &path)
 		d->width = w;
 		d->height = h;
 
-		d->painter->tqworldMatrix()->scale(vratiow, vratioh);
+		d->painter->worldMatrix()->scale(vratiow, vratioh);
 	}
 	else
 	{
@@ -631,10 +631,10 @@ bool KSVGIconEngine::load(int width, int height, const TQString &path)
 		double ratiow = width / d->width;
 		double ratioh = height / d->height;
 
-		d->painter->tqworldMatrix()->scale(ratiow, ratioh);
+		d->painter->worldMatrix()->scale(ratiow, ratioh);
 	}
 
-	TQWMatrix initialMatrix = *d->painter->tqworldMatrix();
+	TQWMatrix initialMatrix = *d->painter->worldMatrix();
 	d->helper->m_initialMatrix = initialMatrix;
 
 	// Apply transform
diff --git a/kdecore/svgicons/ksvgiconpainter.cpp b/kdecore/svgicons/ksvgiconpainter.cpp
index d24f56662..811dfe918 100644
--- a/kdecore/svgicons/ksvgiconpainter.cpp
+++ b/kdecore/svgicons/ksvgiconpainter.cpp
@@ -65,7 +65,7 @@ public:
 		m_useFillGradient = false;
 		m_useStrokeGradient = false;
 
-		m_tqworldMatrix = new TQWMatrix();
+		m_worldMatrix = new TQWMatrix();
 
 		// Create new image with alpha support
 		m_image = new TQImage(width, height, 32);
@@ -102,7 +102,7 @@ public:
 		art_free(m_buffer);
 
 		delete m_image;
-		delete m_tqworldMatrix;
+		delete m_worldMatrix;
 
 		for(TQMap<TQString, ArtGradientLinear *>::Iterator it = m_linearGradientMap.begin(); it != m_linearGradientMap.end(); ++it)
 		{
@@ -185,7 +185,7 @@ public:
 		m_tempBuffer = 0;
 	}
 
-	TQ_UINT32 toArtColor(const TQColor &color)
+	Q_UINT32 toArtColor(const TQColor &color)
 	{
 		// Convert in a libart suitable form
 		TQString tempName = color.name();
@@ -211,7 +211,7 @@ public:
 		return result;
 	}
 
-	void drawSVP(ArtSVP *svp, TQ_UINT32 rgb, int opacity)
+	void drawSVP(ArtSVP *svp, Q_UINT32 rgb, int opacity)
 	{
 		if(!svp)
 			return;
@@ -233,12 +233,12 @@ public:
 	void drawBPath(ArtBpath *bpath)
 	{
 		double affine[6];
-		affine[0] = m_tqworldMatrix->m11();
-		affine[1] = m_tqworldMatrix->m12();
-		affine[2] = m_tqworldMatrix->m21();
-		affine[3] = m_tqworldMatrix->m22();
-		affine[4] = m_tqworldMatrix->dx();
-		affine[5] = m_tqworldMatrix->dy();
+		affine[0] = m_worldMatrix->m11();
+		affine[1] = m_worldMatrix->m12();
+		affine[2] = m_worldMatrix->m21();
+		affine[3] = m_worldMatrix->m22();
+		affine[4] = m_worldMatrix->dx();
+		affine[5] = m_worldMatrix->dy();
 
 		ArtBpath *temp = art_bpath_affine_transform(bpath, affine);
 		ArtVpath *vec = art_bez_path_to_vec(temp, 0.25);
@@ -249,12 +249,12 @@ public:
 	void drawVPath(ArtVpath *vec)
 	{
 		double affine[6];
-		affine[0] = m_tqworldMatrix->m11();
-		affine[1] = m_tqworldMatrix->m12();
-		affine[2] = m_tqworldMatrix->m21();
-		affine[3] = m_tqworldMatrix->m22();
-		affine[4] = m_tqworldMatrix->dx();
-		affine[5] = m_tqworldMatrix->dy();
+		affine[0] = m_worldMatrix->m11();
+		affine[1] = m_worldMatrix->m12();
+		affine[2] = m_worldMatrix->m21();
+		affine[3] = m_worldMatrix->m22();
+		affine[4] = m_worldMatrix->dx();
+		affine[5] = m_worldMatrix->dy();
 
 		ArtVpath *temp = art_vpath_affine_transform(vec, affine);
 		art_free(vec);
@@ -267,7 +267,7 @@ public:
 		ArtSVP *svp;
 		ArtSVP *fillSVP = 0, *strokeSVP = 0;
 
-		TQ_UINT32 fillColor = 0, strokeColor = 0;
+		Q_UINT32 fillColor = 0, strokeColor = 0;
 
 		// Filling
 		{
@@ -461,10 +461,10 @@ public:
 			m.map(x1, y1, &x1, &y1);
 			m.map(x2, y2, &x2, &y2);
 
-			double x1n = x1 * m_tqworldMatrix->m11() + y1 * m_tqworldMatrix->m21() + m_tqworldMatrix->dx();
-			double y1n = x1 * m_tqworldMatrix->m12() + y1 * m_tqworldMatrix->m22() + m_tqworldMatrix->dy();
-			double x2n = x2 * m_tqworldMatrix->m11() + y2 * m_tqworldMatrix->m21() + m_tqworldMatrix->dx();
-			double y2n = x2 * m_tqworldMatrix->m12() + y2 * m_tqworldMatrix->m22() + m_tqworldMatrix->dy();
+			double x1n = x1 * m_worldMatrix->m11() + y1 * m_worldMatrix->m21() + m_worldMatrix->dx();
+			double y1n = x1 * m_worldMatrix->m12() + y1 * m_worldMatrix->m22() + m_worldMatrix->dy();
+			double x2n = x2 * m_worldMatrix->m11() + y2 * m_worldMatrix->m21() + m_worldMatrix->dx();
+			double y2n = x2 * m_worldMatrix->m12() + y2 * m_worldMatrix->m22() + m_worldMatrix->dy();
 
 			double dx = x2n - x1n;
 			double dy = y2n - y1n;
@@ -515,12 +515,12 @@ public:
 			else
 				fy = cy;
 
-			radial->affine[0] = m_tqworldMatrix->m11();
-			radial->affine[1] = m_tqworldMatrix->m12();
-			radial->affine[2] = m_tqworldMatrix->m21();
-			radial->affine[3] = m_tqworldMatrix->m22();
-			radial->affine[4] = m_tqworldMatrix->dx();
-			radial->affine[5] = m_tqworldMatrix->dy();
+			radial->affine[0] = m_worldMatrix->m11();
+			radial->affine[1] = m_worldMatrix->m12();
+			radial->affine[2] = m_worldMatrix->m21();
+			radial->affine[3] = m_worldMatrix->m22();
+			radial->affine[4] = m_worldMatrix->dx();
+			radial->affine[5] = m_worldMatrix->dy();
 
 			radial->fx = (fx - cx) / r;
 			radial->fy = (fy - cy) / r;
@@ -674,7 +674,7 @@ public:
 		  {
 			  QRgb *sl = reinterpret_cast<QRgb *>(m_image->scanLine(y));
 			  for(int x = 0; x < m_width; x++)
-				  sl[x] = tqRgba(line[x * 4], line[x * 4 + 1], line[x * 4 + 2], line[x * 4 + 3]);
+				  sl[x] = qRgba(line[x * 4], line[x * 4 + 1], line[x * 4 + 2], line[x * 4 + 3]);
 
 			  line += m_rowstride;
 		  }
@@ -1123,7 +1123,7 @@ private:
 	ArtSVP *m_clipSVP;
 
 	TQImage *m_image;
-	TQWMatrix *m_tqworldMatrix;
+	TQWMatrix *m_worldMatrix;
 
 	TQString m_fillRule;
 	TQString m_joinStyle;
@@ -1211,17 +1211,17 @@ TQImage *KSVGIconPainter::image()
 	return new TQImage(*d->helper->m_image);
 }
 
-TQWMatrix *KSVGIconPainter::tqworldMatrix()
+TQWMatrix *KSVGIconPainter::worldMatrix()
 {
-	return d->helper->m_tqworldMatrix;
+	return d->helper->m_worldMatrix;
 }
 
 void KSVGIconPainter::setWorldMatrix(TQWMatrix *matrix)
 {
-	if(d->helper->m_tqworldMatrix)
-		delete d->helper->m_tqworldMatrix;
+	if(d->helper->m_worldMatrix)
+		delete d->helper->m_worldMatrix;
 
-	d->helper->m_tqworldMatrix = matrix;
+	d->helper->m_worldMatrix = matrix;
 }
 
 void KSVGIconPainter::setStrokeWidth(double width)
@@ -1263,8 +1263,8 @@ void KSVGIconPainter::setStrokeColor(const TQString &stroke)
 
 		TQString url = stroke;
 
-		unsigned int start = url.tqfind("#") + 1;
-		unsigned int end = url.tqfindRev(")");
+		unsigned int start = url.find("#") + 1;
+		unsigned int end = url.findRev(")");
 
 		d->helper->m_strokeGradientReference = url.mid(start, end - start);
 	}
@@ -1291,8 +1291,8 @@ void KSVGIconPainter::setFillColor(const TQString &fill)
 
 		TQString url = fill;
 
-		unsigned int start = url.tqfind("#") + 1;
-		unsigned int end = url.tqfindRev(")");
+		unsigned int start = url.find("#") + 1;
+		unsigned int end = url.findRev(")");
 
 		d->helper->m_fillGradientReference = url.mid(start, end - start);
 	}
@@ -1315,7 +1315,7 @@ void KSVGIconPainter::setFillRule(const TQString &fillRule)
 	d->helper->m_fillRule = fillRule;
 }
 
-TQ_UINT32 KSVGIconPainter::parseOpacity(const TQString &data)
+Q_UINT32 KSVGIconPainter::parseOpacity(const TQString &data)
 {
 	int opacity = 255;
 
@@ -1323,7 +1323,7 @@ TQ_UINT32 KSVGIconPainter::parseOpacity(const TQString &data)
 	{
 		double temp;
 
-		if(data.tqcontains("%"))
+		if(data.contains("%"))
 		{
 			TQString tempString = data.left(data.length() - 1);
 			temp = double(255 * tempString.toDouble()) / 100.0;
@@ -1736,7 +1736,7 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 	double curx = 0.0, cury = 0.0, contrlx = 0.0, contrly = 0.0, xc, yc;
 	unsigned int lastCommand = 0;
 
-	TQString _d = value.tqreplace(",", " ");
+	TQString _d = value.replace(",", " ");
 	_d = _d.simplifyWhiteSpace();
 	const char *ptr = _d.latin1();
 	const char *end = _d.latin1() + _d.length() + 1;
@@ -1759,12 +1759,12 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 				if(index != -1 && lastCommand != 'z')
 				{
 					// Find last subpath
-					int tqfind = -1;
+					int find = -1;
 					for(int i = index; i >= 0; i--)
 					{
 						if(vec[i].code == ART_MOVETO_OPEN || vec[i].code == ART_MOVETO)
 						{
-							tqfind = i;
+							find = i;
 							break;
 						}
 					}
@@ -1775,8 +1775,8 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 						vec.resize(index + 1);
 
 					vec[index].code = (ArtPathcode)ART_END2;
-					vec[index].x3 = vec[tqfind].x3;
-					vec[index].y3 = vec[tqfind].y3;
+					vec[index].x3 = vec[find].x3;
+					vec[index].y3 = vec[find].y3;
 				}
 
 				curx += tox;
@@ -1798,12 +1798,12 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 				if(index != -1 && lastCommand != 'z')
 				{
 					// Find last subpath
-					int tqfind = -1;
+					int find = -1;
 					for(int i = index; i >= 0; i--)
 					{
 						if(vec[i].code == ART_MOVETO_OPEN || vec[i].code == ART_MOVETO)
 						{
-							tqfind = i;
+							find = i;
 							break;
 						}
 					}
@@ -1814,8 +1814,8 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 						vec.resize(index + 1);
 
 					vec[index].code = (ArtPathcode)ART_END2;
-					vec[index].x3 = vec[tqfind].x3;
-					vec[index].y3 = vec[tqfind].y3;
+					vec[index].x3 = vec[find].x3;
+					vec[index].y3 = vec[find].y3;
 				}
 
 				curx = tox;
@@ -2137,34 +2137,34 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 				break;
 			case 'z':
 			case 'Z':
-				int tqfind;
-				tqfind = -1;
+				int find;
+				find = -1;
 				for(int i = index; i >= 0; i--)
 				{
 					if(vec[i].code == ART_MOVETO_OPEN || vec[i].code == ART_MOVETO)
 					{
-						tqfind = i;
+						find = i;
 						break;
 					}
 				}
 
-				if(tqfind != -1)
+				if(find != -1)
 				{
-					if(vec[tqfind].x3 != curx || vec[tqfind].y3 != cury)
+					if(vec[find].x3 != curx || vec[find].y3 != cury)
 					{
 						index++;
 
 						d->helper->ensureSpace(vec, index);
 
 						vec[index].code = ART_LINETO;
-						vec[index].x3 = vec[tqfind].x3;
-						vec[index].y3 = vec[tqfind].y3;
+						vec[index].x3 = vec[find].x3;
+						vec[index].y3 = vec[find].y3;
 					}
 				}
 
 				// reset for next (sub)path
-				curx = vec[tqfind].x3;
-				cury = vec[tqfind].y3;
+				curx = vec[find].x3;
+				cury = vec[find].y3;
 
 				lastCommand = 'z';
 				break;
@@ -2231,20 +2231,20 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 	}
 
 	// Find last subpath
-	int tqfind = -1;
+	int find = -1;
 	for(int i = index; i >= 0; i--)
 	{
 		if(vec[i].code == ART_MOVETO_OPEN || vec[i].code == ART_MOVETO)
 		{
-			tqfind = i;
+			find = i;
 			break;
 		}
 	}
 
 	// Fix a problem where the .svg file used doubles as values... (sofico.svg)
-	if(curx != vec[tqfind].x3 && cury != vec[tqfind].y3)
+	if(curx != vec[find].x3 && cury != vec[find].y3)
 	{
-		if((int) curx == (int) vec[tqfind].x3 && (int) cury == (int) vec[tqfind].y3)
+		if((int) curx == (int) vec[find].x3 && (int) cury == (int) vec[find].y3)
 		{
 			index++;
 
@@ -2252,18 +2252,18 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 				vec.resize(index + 1);
 
 			vec[index].code = ART_LINETO;
-			vec[index].x3 = vec[tqfind].x3;
-			vec[index].y3 = vec[tqfind].y3;
+			vec[index].x3 = vec[find].x3;
+			vec[index].y3 = vec[find].y3;
 
-			curx = vec[tqfind].x3;
-			cury = vec[tqfind].y3;
+			curx = vec[find].x3;
+			cury = vec[find].y3;
 		}
 	}
 
 	// Handle filled paths that are not closed explicitly
 	if(filled)
 	{
-		if((int) curx != (int) vec[tqfind].x3 || (int) cury != (int) vec[tqfind].y3)
+		if((int) curx != (int) vec[find].x3 || (int) cury != (int) vec[find].y3)
 		{
 			index++;
 
@@ -2271,11 +2271,11 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 				vec.resize(index + 1);
 
 			vec[index].code = (ArtPathcode)ART_END2;
-			vec[index].x3 = vec[tqfind].x3;
-			vec[index].y3 = vec[tqfind].y3;
+			vec[index].x3 = vec[find].x3;
+			vec[index].y3 = vec[find].y3;
 
-			curx = vec[tqfind].x3;
-			cury = vec[tqfind].y3;
+			curx = vec[find].x3;
+			cury = vec[find].y3;
 		}
 	}
 
@@ -2310,12 +2310,12 @@ void KSVGIconPainter::drawImage(double x, double y, TQImage &image)
 		image = image.convertDepth(32);
 
 	double affine[6];
-	affine[0] = d->helper->m_tqworldMatrix->m11();
-	affine[1] = d->helper->m_tqworldMatrix->m12();
-	affine[2] = d->helper->m_tqworldMatrix->m21();
-	affine[3] = d->helper->m_tqworldMatrix->m22();
+	affine[0] = d->helper->m_worldMatrix->m11();
+	affine[1] = d->helper->m_worldMatrix->m12();
+	affine[2] = d->helper->m_worldMatrix->m21();
+	affine[3] = d->helper->m_worldMatrix->m22();
 	// use the world matrix to convert the coordinates
-	d->helper->m_tqworldMatrix->map(x, y, &affine[4], &affine[5]);
+	d->helper->m_worldMatrix->map(x, y, &affine[4], &affine[5]);
 
 	d->helper->art_rgba_rgba_affine(d->helper->m_buffer, 0, 0, d->helper->m_width, d->helper->m_height,
 									d->helper->m_rowstride, image.bits(), image.width(), image.height(),
@@ -2338,19 +2338,19 @@ TQColor KSVGIconPainter::parseColor(const TQString &param)
 		TQString g = colors[1];
 		TQString b = colors[2].left((colors[2].length() - 1));
 
-		if(r.tqcontains("%"))
+		if(r.contains("%"))
 		{
 			r = r.left(r.length() - 1);
 			r = TQString::number(int((double(255 * r.toDouble()) / 100.0)));
 		}
 
-		if(g.tqcontains("%"))
+		if(g.contains("%"))
 		{
 			g = g.left(g.length() - 1);
 			g = TQString::number(int((double(255 * g.toDouble()) / 100.0)));
 		}
 
-		if(b.tqcontains("%"))
+		if(b.contains("%"))
 		{
 			b = b.left(b.length() - 1);
 			b = TQString::number(int((double(255 * b.toDouble()) / 100.0)));
@@ -2560,7 +2560,7 @@ TQColor KSVGIconPainter::parseColor(const TQString &param)
 			return TQColor(245, 255, 250);
 		else if(rgbColor == "mistyrose")
 			return TQColor(255, 228, 225);
-		else if(rgbColor == "tqmoccasin")
+		else if(rgbColor == "moccasin")
 			return TQColor(255, 228, 181);
 		else if(rgbColor == "navajowhite")
 			return TQColor(255, 222, 173);
@@ -2753,7 +2753,7 @@ void KSVGIconPainter::addRadialGradientElement(ArtGradientRadial *gradient, TQDo
 	d->helper->m_radialGradientElementMap.insert(gradient, element);
 }
 
-TQ_UINT32 KSVGIconPainter::toArtColor(const TQColor &color)
+Q_UINT32 KSVGIconPainter::toArtColor(const TQColor &color)
 {
 	return d->helper->toArtColor(color);
 }
diff --git a/kdecore/svgicons/ksvgiconpainter.h b/kdecore/svgicons/ksvgiconpainter.h
index 6b00d9d7c..9ba44d2cf 100644
--- a/kdecore/svgicons/ksvgiconpainter.h
+++ b/kdecore/svgicons/ksvgiconpainter.h
@@ -41,7 +41,7 @@ public:
 
 	TQImage *image();
 
-	TQWMatrix *tqworldMatrix();
+	TQWMatrix *worldMatrix();
 
 	void finish();
 
@@ -61,7 +61,7 @@ public:
 	void setStrokeDashOffset(const TQString &dashOffset);
 	void setStrokeDashArray(const TQString &dashes);
 
-	void setWorldMatrix(TQWMatrix *tqworldMatrix);
+	void setWorldMatrix(TQWMatrix *worldMatrix);
 	void setClippingRect(int x, int y, int w, int h);
 
 	void drawRectangle(double x, double y, double w, double h, double rx, double ry);
@@ -73,8 +73,8 @@ public:
 	void drawImage(double x, double y, TQImage &image);
 
 	TQColor parseColor(const TQString &param);
-	TQ_UINT32 toArtColor(const TQColor &color);
-	TQ_UINT32 parseOpacity(const TQString &data);
+	Q_UINT32 toArtColor(const TQColor &color);
+	Q_UINT32 parseOpacity(const TQString &data);
 
 	double toPixel(const TQString &s, bool hmode);
 	double dpi();
diff --git a/kdecore/tests/kcalendartest.cpp b/kdecore/tests/kcalendartest.cpp
index 8b6e8eea4..51a40b892 100644
--- a/kdecore/tests/kcalendartest.cpp
+++ b/kdecore/tests/kcalendartest.cpp
@@ -67,7 +67,7 @@ int main(int argc, char **argv) {
     		option = args->getOption("date");
                 date = KGlobal::locale()->readDate(option);
   	} else 
-    		date = TQDate::tqcurrentDate();
+    		date = TQDate::currentDate();
 
 	args->clear(); // Free up some memory.
 	
diff --git a/kdecore/tests/kconfigtestgui.cpp b/kdecore/tests/kconfigtestgui.cpp
index af560b496..abd476396 100644
--- a/kdecore/tests/kconfigtestgui.cpp
+++ b/kdecore/tests/kconfigtestgui.cpp
@@ -121,7 +121,7 @@ KConfigTestView::KConfigTestView( TQWidget *parent, const char *name )
   pQuitButton = new TQPushButton( this, "quitbutton" );
   pQuitButton->setText( "Quit" );
   pQuitButton->setGeometry( 340, 60, 60, 60 );
-  connect( pQuitButton, TQT_SIGNAL(clicked()), tqApp, TQT_SLOT(quit()) );
+  connect( pQuitButton, TQT_SIGNAL(clicked()), qApp, TQT_SLOT(quit()) );
 
   // create a default KConfig object in order to be able to start right away
   pConfig = new KConfig( TQString::null );
diff --git a/kdecore/tests/kconfigtestgui.h b/kdecore/tests/kconfigtestgui.h
index d7e4089bf..8311952b5 100644
--- a/kdecore/tests/kconfigtestgui.h
+++ b/kdecore/tests/kconfigtestgui.h
@@ -36,7 +36,7 @@
 #include <kconfig.h>
 
 //
-// KConfigTestView tqcontains lots of Qt widgets.
+// KConfigTestView contains lots of Qt widgets.
 //
 
 class KConfigTestView : public QDialog
diff --git a/kdecore/tests/kipctest.h b/kdecore/tests/kipctest.h
index 17122fbd8..a8abd2e76 100644
--- a/kdecore/tests/kipctest.h
+++ b/kdecore/tests/kipctest.h
@@ -3,7 +3,7 @@
 
 #include <tqobject.h>
 
-class MyObject: public TQObject
+class MyObject: public QObject
 {
     Q_OBJECT
 public:
diff --git a/kdecore/tests/klocaletest.cpp b/kdecore/tests/klocaletest.cpp
index a81d867b1..a980359b0 100644
--- a/kdecore/tests/klocaletest.cpp
+++ b/kdecore/tests/klocaletest.cpp
@@ -53,7 +53,7 @@ Test::Test( TQWidget *parent, const char *name )
 {
   setCaption("Testing KLocale");
 
-  TQWidget *d = tqApp->desktop();
+  TQWidget *d = qApp->desktop();
   setGeometry((d->width()-320)>>1, (d->height()-160)>>1, 420, 420);
 
   createFields();
@@ -77,19 +77,19 @@ void Test::createFields()
   string+="Used language: ";
   string+=KGlobal::locale()->language()+"\n";
   string+="Locale encoding: ";
-  string+=TQString::tqfromLatin1(KGlobal::locale()->encoding())+"\n";
+  string+=TQString::fromLatin1(KGlobal::locale()->encoding())+"\n";
 
   string+="Localized date and time: ";
-  string+=KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime());
+  string+=KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
   string+="\nLocalized monetary numbers: ";
   string+=KGlobal::locale()->formatMoney(1234567.89) + " / \n" +KGlobal::locale()->formatMoney(-1234567.89);
   // This will not work
   // but you can copy other *.mo file
   string+="\nSome localized strings:\n";
-  string+=TQString::tqfromLatin1("Yes = ")+i18n("Yes")+"\n";
-  string+=TQString::tqfromLatin1("No = ")+i18n("No")+"\n";
-  string+=TQString::tqfromLatin1("Help = ")+i18n("Help")+"\n";
-  string+=TQString::tqfromLatin1("Cancel = ")+i18n("Cancel")+"\n";
+  string+=TQString::fromLatin1("Yes = ")+i18n("Yes")+"\n";
+  string+=TQString::fromLatin1("No = ")+i18n("No")+"\n";
+  string+=TQString::fromLatin1("Help = ")+i18n("Help")+"\n";
+  string+=TQString::fromLatin1("Cancel = ")+i18n("Cancel")+"\n";
 
   label=new TQLabel(string,this,"Label");
   label->setGeometry(10,10,400,400);
@@ -102,9 +102,9 @@ int main( int argc, char ** argv )
   KLocale::setMainCatalogue("kdelibs");
   KApplication a( argc, argv, "klocaletest" );
 
-  KGlobal::locale()->setLanguage(TQString::tqfromLatin1("en_US"));
-  KGlobal::locale()->setCountry(TQString::tqfromLatin1("C"));
-  KGlobal::locale()->setThousandsSeparator(TQString::tqfromLatin1(","));
+  KGlobal::locale()->setLanguage(TQString::fromLatin1("en_US"));
+  KGlobal::locale()->setCountry(TQString::fromLatin1("C"));
+  KGlobal::locale()->setThousandsSeparator(TQString::fromLatin1(","));
 
   TQString formatted;
   formatted = KGlobal::locale()->formatNumber( 70 ); check("formatNumber(70)",formatted,"70.00");
@@ -152,8 +152,8 @@ int main( int argc, char ** argv )
   TQDate date;
   date.setYMD( 2002, 5, 3 );
   checkDate("readDate( 3, 5, 2002 )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) );
-  date = TQDate::tqcurrentDate();
-  checkDate("readDate( TQDate::tqcurrentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) );
+  date = TQDate::currentDate();
+  checkDate("readDate( TQDate::currentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) );
 
   TQTime time;
   time = KGlobal::locale()->readTime( "11:22:33", &ok );
@@ -181,11 +181,11 @@ int main( int argc, char ** argv )
   check("formatTime(\"0:22\", as duration)", timeStr, "00:22" );
 
   kdDebug() << "setLanguage C\n";
-  KGlobal::locale()->setLanguage(TQString::tqfromLatin1("C"));
+  KGlobal::locale()->setLanguage(TQString::fromLatin1("C"));
   kdDebug() << "C: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl;
 
   kdDebug() << "setLanguage de\n";
-  KGlobal::locale()->setLanguage(TQString::tqfromLatin1("de"));
+  KGlobal::locale()->setLanguage(TQString::fromLatin1("de"));
   kdDebug() << "de: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl;
 
 
diff --git a/kdecore/tests/kmacroexpandertest.cpp b/kdecore/tests/kmacroexpandertest.cpp
index 672d1ad6a..0c41a309b 100644
--- a/kdecore/tests/kmacroexpandertest.cpp
+++ b/kdecore/tests/kmacroexpandertest.cpp
@@ -79,26 +79,26 @@ int main(int argc, char *argv[])
   s = "kedit --caption %n %f";
   check( "KMacroExpander::expandMacrosShellQuote", s, KMacroExpander::expandMacrosShellQuote(s, map), "kedit --caption 'Restaurant \"Chew It\"' 'filename.txt'");
 
-  map.tqreplace('n', "Restaurant 'Chew It'");
+  map.replace('n', "Restaurant 'Chew It'");
   s = "kedit --caption %n %f";
   check( "KMacroExpander::expandMacrosShellQuote", s, KMacroExpander::expandMacrosShellQuote(s, map), "kedit --caption 'Restaurant '\\''Chew It'\\''' 'filename.txt'");
 
   s = "kedit --caption \"%n\" %f";
   check( "KMacroExpander::expandMacrosShellQuote", s, KMacroExpander::expandMacrosShellQuote(s, map), "kedit --caption \"Restaurant 'Chew It'\" 'filename.txt'");
 
-  map.tqreplace('n', "Restaurant \"Chew It\"");
+  map.replace('n', "Restaurant \"Chew It\"");
   s = "kedit --caption \"%n\" %f";
   check( "KMacroExpander::expandMacrosShellQuote", s, KMacroExpander::expandMacrosShellQuote(s, map), "kedit --caption \"Restaurant \\\"Chew It\\\"\" 'filename.txt'");
 
-  map.tqreplace('n', "Restaurant $HOME");
+  map.replace('n', "Restaurant $HOME");
   s = "kedit --caption \"%n\" %f";
   check( "KMacroExpander::expandMacrosShellQuote", s, KMacroExpander::expandMacrosShellQuote(s, map), "kedit --caption \"Restaurant \\$HOME\" 'filename.txt'");
 
-  map.tqreplace('n', "Restaurant `echo hello`");
+  map.replace('n', "Restaurant `echo hello`");
   s = "kedit --caption \"%n\" %f";
   check( "KMacroExpander::expandMacrosShellQuote", s, KMacroExpander::expandMacrosShellQuote(s, map), "kedit --caption \"Restaurant \\`echo hello\\`\" 'filename.txt'");
 
-  map.tqreplace('n', "Restaurant `echo hello`");
+  map.replace('n', "Restaurant `echo hello`");
   s = "kedit --caption \"`echo %n`\" %f";
   check( "KMacroExpander::expandMacrosShellQuote", s, KMacroExpander::expandMacrosShellQuote(s, map), "kedit --caption \"$( echo 'Restaurant `echo hello`')\" 'filename.txt'");
 
diff --git a/kdecore/tests/kmdcodectest.cpp b/kdecore/tests/kmdcodectest.cpp
index 8ebd03888..243d0d289 100644
--- a/kdecore/tests/kmdcodectest.cpp
+++ b/kdecore/tests/kmdcodectest.cpp
@@ -96,7 +96,7 @@ void testCodec (const char* msg, Codec type, bool isFile)
 
         if (!f.exists())
         {
-          kdError() << "Could not tqfind: " << f.name () << endl;
+          kdError() << "Could not find: " << f.name () << endl;
           return;
         }
 
@@ -192,15 +192,15 @@ void MD5_timeTrial ()
     time_t endTime;
     time_t startTime;
 
-    TQ_UINT8 block[TEST_BLOCK_LEN];
-    TQ_UINT32 i;
+    Q_UINT8 block[TEST_BLOCK_LEN];
+    Q_UINT32 i;
 
     cout << "Timing test. Digesting " << TEST_BLOCK_COUNT << " blocks of "
          << TEST_BLOCK_LEN << "-byte..." << endl;
 
     // Initialize block
     for (i = 0; i < TEST_BLOCK_LEN; i++)
-        block[i] = (TQ_UINT8)(i & 0xff);
+        block[i] = (Q_UINT8)(i & 0xff);
 
     // Start timer
     time (&startTime);
@@ -308,7 +308,7 @@ void MD5_string (const char *input, const char* expected, bool rawOutput )
   if ( expected )
   {
     cout << "Expected: " << expected << endl;
-    cout << "tqStatus: " << context.verify (expected) << endl;
+    cout << "Status: " << context.verify (expected) << endl;
   }
 }
 
diff --git a/kdecore/tests/kprocesstest.h b/kdecore/tests/kprocesstest.h
index 23ac443dd..3e5d989ec 100644
--- a/kdecore/tests/kprocesstest.h
+++ b/kdecore/tests/kprocesstest.h
@@ -15,7 +15,7 @@
 #include <tqobject.h>
 #include "kprocess.h"
 
-class Dummy : public TQObject
+class Dummy : public QObject
 {
  Q_OBJECT
 
diff --git a/kdecore/tests/kprociotest.h b/kdecore/tests/kprociotest.h
index 9f948e644..6392fc708 100644
--- a/kdecore/tests/kprociotest.h
+++ b/kdecore/tests/kprociotest.h
@@ -15,7 +15,7 @@
 #include <tqobject.h>
 #include "kprocio.h"
 
-class Dummy : public TQObject
+class Dummy : public QObject
 {
  Q_OBJECT
 
diff --git a/kdecore/tests/kresolvertest.cpp b/kdecore/tests/kresolvertest.cpp
index 1b2f5148d..f1d3c11f9 100644
--- a/kdecore/tests/kresolvertest.cpp
+++ b/kdecore/tests/kresolvertest.cpp
@@ -75,8 +75,8 @@ public:
 bool tryLookup(const char* node, const char *serv)
 {
   int error;
-  TQString _node = TQString::tqfromLatin1(node);
-  TQString _serv = TQString::tqfromLatin1(serv);
+  TQString _node = TQString::fromLatin1(node);
+  TQString _serv = TQString::fromLatin1(serv);
 
   printf("\tTrying to lookup %s|%s... ", node, serv);
   TQPtrList<KAddressInfo> list = KExtendedSocket::lookup(_node, _serv, 0, &error);
@@ -138,8 +138,8 @@ bool try_pton()
 bool tryLookup6(const char *node, const char *serv)
 {
   int error;
-  TQString _node = TQString::tqfromLatin1(node);
-  TQString _serv = TQString::tqfromLatin1(serv);
+  TQString _node = TQString::fromLatin1(node);
+  TQString _serv = TQString::fromLatin1(serv);
 
   printf("\tTrying to lookup IPv6 of %s|%s... ", node, serv);
   TQPtrList<KAddressInfo> list = KExtendedSocket::lookup(_node, _serv, KExtendedSocket::ipv6Socket, &error);
diff --git a/kdecore/tests/kstddirstest.cpp b/kdecore/tests/kstddirstest.cpp
index 21b08f687..fa797d665 100644
--- a/kdecore/tests/kstddirstest.cpp
+++ b/kdecore/tests/kstddirstest.cpp
@@ -18,7 +18,7 @@ int main(int argc, char **argv)
   s = t.findResource("icon", "xv.xpm");
   if (!s.isNull()) kdDebug() << s << endl;
 
-  list = t.findAllResources("data", "ktqfind/toolbar", true);
+  list = t.findAllResources("data", "kfind/toolbar", true);
   for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {
     kdDebug() << "data " << (*it).ascii() << endl;
   }
diff --git a/kdecore/tests/ktimezonestest.cpp b/kdecore/tests/ktimezonestest.cpp
index 69ea7c8a1..650cc0512 100644
--- a/kdecore/tests/ktimezonestest.cpp
+++ b/kdecore/tests/ktimezonestest.cpp
@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
 
      // Find the current offset of the UTC timezone.
      timezone = timezones.zone("UTC");
-     printf( "UTC timezone offset should be 0: %d\n", timezone->offset(TQDateTime::tqcurrentDateTime()) );
+     printf( "UTC timezone offset should be 0: %d\n", timezone->offset(TQDateTime::currentDateTime()) );
 
      // Find some offsets for Europe/London.
      char *london = "Europe/London";
diff --git a/kdecore/tests/kurltest.cpp b/kdecore/tests/kurltest.cpp
index 535a66b9a..e80561d2c 100644
--- a/kdecore/tests/kurltest.cpp
+++ b/kdecore/tests/kurltest.cpp
@@ -1003,16 +1003,16 @@ int main(int argc, char *argv[])
   check("com2.url()", com2.url(), "http://server.com/dir/blubb/blah/");
 
   KURL utf8_1("audiocd:/By%20Name/15%20Geantra%C3%AE.wav", 106);
-  check("utf8_1.fileName()", utf8_1.fileName(), TQString::tqfromLatin1("15 Geantraî.wav"));
+  check("utf8_1.fileName()", utf8_1.fileName(), TQString::fromLatin1("15 Geantraî.wav"));
 
   KURL utf8_2("audiocd:/By%20Name/15%2fGeantra%C3%AE.wav", 106);
-  check("utf8_2.fileName()", utf8_2.fileName(), TQString::tqfromLatin1("15/Geantraî.wav"));
+  check("utf8_2.fileName()", utf8_2.fileName(), TQString::fromLatin1("15/Geantraî.wav"));
 
   KURL url_newline_1("http://www.foo.bar/foo/bar\ngnork");
-  check("url_newline_1.url()", url_newline_1.url(), TQString::tqfromLatin1("http://www.foo.bar/foo/bar%0Agnork"));
+  check("url_newline_1.url()", url_newline_1.url(), TQString::fromLatin1("http://www.foo.bar/foo/bar%0Agnork"));
 
   KURL url_newline_2("http://www.foo.bar/foo?bar\ngnork");
-  check("url_newline_2.url()", url_newline_2.url(), TQString::tqfromLatin1("http://www.foo.bar/foo?bar%0Agnork"));
+  check("url_newline_2.url()", url_newline_2.url(), TQString::fromLatin1("http://www.foo.bar/foo?bar%0Agnork"));
 
   KURL local_file_1("file://localhost/my/file");
   check("local_file_1.isLocalFile()", local_file_1.isLocalFile() ? "true" : "false", "true");
diff --git a/kdecore/tests/testqtargs.cpp b/kdecore/tests/testqtargs.cpp
index 00682e9ff..2b3606a59 100644
--- a/kdecore/tests/testqtargs.cpp
+++ b/kdecore/tests/testqtargs.cpp
@@ -35,7 +35,7 @@
   { "background <color>", I18N_NOOP("sets the default background color and an\n
 application palette (light and dark shades are\ncalculated)."), 0},
 
-  it looks for "background"  instead of "-background" so never tqfind the arg.
+  it looks for "background"  instead of "-background" so never find the arg.
 
   Software:  g++ 2.95, kdelibs from CVS Jan 28, Qt 3.01
   OS: Debian GNU/Linux 3.0 (sid)
diff --git a/kdecore/vsnprintf.c b/kdecore/vsnprintf.c
index 9001206c6..257392aa4 100644
--- a/kdecore/vsnprintf.c
+++ b/kdecore/vsnprintf.c
@@ -120,7 +120,7 @@ vsnprintf(str, n, fmt, ap)
 
 	memset(&nsa, 0, sizeof nsa);
 	nsa.sa_handler = mcatch;
-	sigemptyset(&nsa.sa_tqmask);
+	sigemptyset(&nsa.sa_mask);
 
 	p = msetup(str, n);
 	if (p == NULL) {