2150 files changed, 34741 insertions, 20051 deletions

diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index 061049432..2174f27bc 100644
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@@ -9,7 +9,11 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 3.1 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
 
 
 ##### include our cmake modules #################
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d172f466..a8321e9be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,12 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 3.1 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
 
 
 ##### general package setup #####################
@@ -18,7 +23,6 @@ cmake_minimum_required( VERSION 3.1 )
 project( tdebase )
 
 set( PACKAGE tdebase )
-set( VERSION R14.1.0 )
 
 
 ##### include essential cmake modules ###########
@@ -49,14 +53,8 @@ tde_setup_paths( )
 
 ##### add apidox targets ############
 
-if( "${CMAKE_VERSION}" VERSION_LESS "3.1" )
-  set( CMAKE_ENV "env" )
-else()
-  set( CMAKE_ENV "${CMAKE_COMMAND};-E;env" )
-endif()
-
 add_custom_target( apidox
-  COMMAND ${CMAKE_ENV}
+  COMMAND ${CMAKE_COMMAND} -E env
     "TQTDOCDIR=/usr/share/tqt3/doc/html"
     "DOXDATA=${HTML_INSTALL_DIR}/en/common"
     ${CMAKE_SOURCE_DIR}/admin/doxygen.sh
@@ -93,6 +91,7 @@ option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
 option( WITH_SASL "Enable SASL support" ${WITH_ALL_OPTIONS} )
 option( WITH_LDAP "Enable LDAP support" ${WITH_ALL_OPTIONS} )
 option( WITH_SAMBA "Enable SAMBA support" ${WITH_ALL_OPTIONS} )
+option( WITH_SFTP "Enable SFTP support" ${WITH_ALL_OPTIONS} )
 option( WITH_OPENEXR "Enable openexr support" ${WITH_ALL_OPTIONS} )
 option( WITH_XCOMPOSITE "Enable xcomposite support" ${WITH_ALL_OPTIONS} )
 option( WITH_XCURSOR "Enable xcursor support" ${WITH_ALL_OPTIONS} )
@@ -120,12 +119,14 @@ option( WITH_TDEHWLIB "Enable TDE hardware library support" ${WITH_ALL_OPTIONS}
 option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
 option( WITH_ELFICON "Enable ELF embedded metadata support" ${WITH_ALL_OPTIONS} )
 option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+option( WITH_XKB_TRANSLATIONS "Use translations for xkb messages provided by xkeyboard-config" ON )
 
 ##### options comments ##########################
 
 # WITH_SASL         affects tdeioslaves(tdeio_ldap tdeio_smtp tdeio_pop3)
 # WITH_LDAP         affects tdeioslaves(tdeio_ldap)
 # WITH_SAMBA        affects tdeioslaves(tdeio_samba) kcontrol
+# WITH_SFTP         affects tdeioslaves(tdeio_sftp)
 # WITH_OPENEXR      affects tdeioslaves(thumbnail)
 # WITH_XCOMPOSITE   affects twin kicker(taskmanager) tdm
 # WITH_XCURSOR      affects tdeioslaves(thumbnail), kcontrol(input), kdesktop
@@ -155,6 +156,7 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
 # WITH_PCRE         affects twin/compot-tde
 # WITH_SUDO_TDESU_BACKEND affects tdesu
 # WITH_SUDO_KONSOLE_SUPER_USER_COMMAND affects launching Konsole super user sessions
+# WITH_XKB_TRANSLATIONS affects kxkb
 
 # NOTE: WITH_SHADOW and WITH_PAM shouldn't be set concurrently
 #       WITH_PAM will override WITH_SHADOW
@@ -251,7 +253,7 @@ tde_conditional_add_subdirectory( BUILD_TDEINIT tdeinit )
 tde_conditional_add_subdirectory( BUILD_L10N l10n )
 tde_conditional_add_subdirectory( BUILD_PICS pics )
 tde_conditional_add_subdirectory( BUILD_APPLNK applnk )
-tde_conditional_add_subdirectory( BUILD_DOC doc )
+tde_conditional_add_project_docs( BUILD_DOC )
 tde_conditional_add_subdirectory( BUILD_LIBKONQ libkonq )
 tde_conditional_add_subdirectory( BUILD_KCMINIT kcminit )
 tde_conditional_add_subdirectory( BUILD_TWIN twin )
@@ -298,7 +300,7 @@ tde_conditional_add_subdirectory( BUILD_TQT3INTEGRATION tqt3integration )
 ##### install starttde & related stuff ##########
 
 if( BUILD_STARTTDE )
-  install( PROGRAMS starttde migratekde3 r14-xdg-update tde_release_notes
+  install( PROGRAMS starttde migratekde3 r14-xdg-update tde_release_notes tde_show_license_info
            DESTINATION ${BIN_INSTALL_DIR} )
 endif()
 
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index b60dd5dc0..b72d866df 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -23,6 +23,11 @@ tde_setup_largefiles( )
 find_package( TQt )
 find_package( TDE )
 
+# strlcat and strlcpy check
+check_function_exists( strlcat HAVE_STRLCAT )
+check_symbol_exists( strlcat "string.h" HAVE_STRLCAT_PROTO )
+check_function_exists( strlcpy HAVE_STRLCPY )
+check_symbol_exists( strlcpy "string.h" HAVE_STRLCPY_PROTO )
 
 ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids"
 
@@ -89,22 +94,36 @@ endif( )
 
 
 # sys/time.h (tdeioslave/sftp, ksmserver, ksplashml)
-if( BUILD_KSMSERVER OR BUILD_KSPLASHML OR BUILD_TDEIOSLAVES)
+if( BUILD_KSMSERVER OR BUILD_KSPLASHML OR BUILD_TDEIOSLAVES )
   check_include_file( sys/time.h HAVE_SYS_TIME_H )
   check_include_files( "sys/time.h;time.h" TIME_WITH_SYS_TIME )
 endif( )
 
-
-# pam
-if( WITH_PAM AND (BUILD_KCHECKPASS OR BUILD_TDM) )
-  check_library_exists( pam pam_start "" HAVE_PAM )
-  if( HAVE_PAM )
-    check_include_file( "security/pam_appl.h" SECURITY_PAM_APPL_H )
+# libssh (tdeioslave/sftp)
+if( BUILD_TDEIOSLAVES AND WITH_SFTP )
+  pkg_search_module( LIBSSH libssh )
+  if( NOT LIBSSH_FOUND )
+    tde_message_fatal( "LibSSH is required, but was not found on your system" )
   endif( )
-  if( HAVE_PAM AND SECURITY_PAM_APPL_H )
-    set( PAM_LIBRARY pam ${DL_LIBRARIES} )
-  else( )
-    tde_message_fatal( "pam are requested, but not found on your system" )
+endif( )
+
+
+# pam and shadow
+if( BUILD_KCHECKPASS OR BUILD_TDM )
+  if ( WITH_PAM )
+    check_library_exists( pam pam_start "" HAVE_PAM )
+    if( HAVE_PAM )
+      set( USE_PAM 1 CACHE INTERNAL "" FORCE )
+      check_include_file( "security/pam_appl.h" SECURITY_PAM_APPL_H )
+    endif( )
+    if( HAVE_PAM AND SECURITY_PAM_APPL_H )
+      set( PAM_LIBRARY pam ${DL_LIBRARIES} )
+    else( )
+      tde_message_fatal( "pam are requested, but not found on your system" )
+    endif( )
+  elseif( WITH_SHADOW )
+    set( HAVE_SHADOW 1 CACHE INTERNAL "" FORCE )
+    set( USESHADOW 1 CACHE INTERNAL "" FORCE )
   endif( )
 endif( )
 
@@ -467,9 +486,9 @@ if( WITH_ELFICON )
   if( NOT LIBR_FOUND )
       message(FATAL_ERROR "\nelficon support was requested, but libr was not found on your system" )
   endif( NOT LIBR_FOUND )
-  if( NOT "${LIBR_VERSION}" STREQUAL "0.6.0" )
+  if( "${LIBR_VERSION}" VERSION_LESS "0.6" )
       message(FATAL_ERROR "\nelficon support was requested, but the libr version on your system may not be compatible with TDE" )
-  endif( NOT "${LIBR_VERSION}" STREQUAL "0.6.0" )
+  endif( "${LIBR_VERSION}" VERSION_LESS "0.6" )
   set( HAVE_ELFICON 1 )
 endif( )
 
@@ -488,30 +507,16 @@ endif( )
 if( BUILD_KXKB )
 
   if( NOT X11_XKB_RULES_DIR )
-    pkg_search_module( XKB_CONFIG xkeyboard-config )
-    if( XKB_CONFIG_FOUND )
-      execute_process(
-        COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=xkb_base xkeyboard-config
-        OUTPUT_VARIABLE KB_RULES_DIR
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-      )
-      if( NOT "${KB_RULES_DIR}" STREQUAL "" )
-        string(REGEX REPLACE "/xkb$" "/" X11_XKB_RULES_DIR "${KB_RULES_DIR}" )
-      endif( )
+    pkg_get_variable( KB_RULES_DIR xkeyboard-config xkb_base )
+    if( KB_RULES_DIR )
+      string(REGEX REPLACE "/xkb$" "/" X11_XKB_RULES_DIR "${KB_RULES_DIR}" )
     endif( )
   endif( )
 
   if( NOT X11_XKB_RULES_DIR )
-    pkg_search_module( XKBCOMP xkbcomp )
-    if( XKBCOMP_FOUND )
-      execute_process(
-        COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=xkbconfigdir xkbcomp
-        OUTPUT_VARIABLE KB_RULES_DIR
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-      )
-      if( NOT "${KB_RULES_DIR}" STREQUAL "" )
-        string(REGEX REPLACE "/xkb$" "/" X11_XKB_RULES_DIR "${KB_RULES_DIR}" )
-      endif( )
+    pkg_get_variable( KB_RULES_DIR xkbcomp xkbconfigdir )
+    if( KB_RULES_DIR )
+      string(REGEX REPLACE "/xkb$" "/" X11_XKB_RULES_DIR "${KB_RULES_DIR}" )
     endif( )
   endif( )
 
@@ -533,16 +538,8 @@ if( BUILD_KXKB )
   endif( )
 
   if( NOT X11_XKB_RULES_DIR )
-    execute_process(
-      COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=libdir xkbfile
-      OUTPUT_VARIABLE KB_RULES_LIBDIR
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    execute_process(
-      COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix xkbfile
-      OUTPUT_VARIABLE KB_RULES_PREFIX
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
+    pkg_get_variable( KB_RULES_LIBDIR xkbfile libdir)
+    pkg_get_variable( KB_RULES_PREFIX xkbfile prefix)
     if( KB_RULES_LIBDIR AND KB_RULES_PREFIX )
       find_file( RULES_FILE
         NAMES xorg xfree86
@@ -566,4 +563,119 @@ if( BUILD_KXKB )
     message( STATUS "No additional XKb rules directory found" )
   endif( )
 
+  if( WITH_XKB_TRANSLATIONS )
+    if( NOT XKB_CONFIG_LOCALE_DIR )
+      pkg_get_variable( XKB_CONFIG_DATADIR xkeyboard-config datadir )
+      if( XKB_CONFIG_DATADIR )
+        set( XKB_CONFIG_LOCALE_DIR "${XKB_CONFIG_DATADIR}/locale" CACHE INTERNAL "" )
+        message( STATUS "Found xkeybord-config locale dir: ${XKB_CONFIG_LOCALE_DIR}" )
+      endif( )
+    endif( )
+
+    if( NOT XKB_CONFIG_LOCALE_DIR )
+      tde_message_fatal( "Translations for xkb messages were requested but the xkeyboard-config locale directory could not be determined." )
+    endif( )
+  endif( )
+
 endif( )
+
+if( BUILD_KCONTROL OR BUILD_TDM )
+  # SunOS kstat
+  check_library_exists( kstat kstat_open "" HAVE_KSTAT )
+  if( HAVE_KSTAT )
+    set( KSTAT_LIBRARIES kstat )
+  else()
+    if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+      tde_message_fatal( "libkstat not found on SunOS platform!" )
+    endif()
+    set( KSTAT_LIBRARIES "" )
+  endif( )
+
+  if( NOT DEFINED REBOOT_BINARY )
+    message( STATUS "Looking for reboot" )
+    find_program( REBOOT_BINARY reboot
+                  HINTS /sbin
+                        /usr/sbin
+    )
+    if( REBOOT_BINARY )
+      message( STATUS "Looking for reboot - ${REBOOT_BINARY}" )
+    endif( REBOOT_BINARY )
+  endif( NOT DEFINED REBOOT_BINARY )
+
+  if( NOT DEFINED POWEROFF_BINARY )
+    message( STATUS "Looking for poweroff" )
+    find_program( POWEROFF_BINARY poweroff
+                  HINTS /sbin
+                        /usr/sbin
+    )
+    if( POWEROFF_BINARY )
+      message( STATUS "Looking for poweroff - ${POWEROFF_BINARY}" )
+    endif( POWEROFF_BINARY )
+  endif( NOT DEFINED POWEROFF_BINARY )
+
+  if( NOT DEFINED HALT_BINARY )
+    message( STATUS "Looking for halt" )
+    find_program( HALT_BINARY halt
+                  HINTS /sbin
+                        /usr/sbin
+    )
+    if( HALT_BINARY )
+      message( STATUS "Looking for halt - ${HALT_BINARY}" )
+    endif( HALT_BINARY )
+  endif( NOT DEFINED HALT_BINARY )
+
+  if( NOT DEFINED SHUTDOWN_BINARY )
+    message( STATUS "Looking for shutdown" )
+    find_program( SHUTDOWN_BINARY shutdown
+                  HINTS /sbin
+                        /usr/sbin
+    )
+    if( SHUTDOWN_BINARY )
+      message( STATUS "Looking for shutdown - ${SHUTDOWN_BINARY}" )
+    endif( SHUTDOWN_BINARY )
+  endif( NOT DEFINED SHUTDOWN_BINARY )
+
+  if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+    # SunOS based systems
+    if( NOT REBOOT_BINARY AND SHUTDOWN_BINARY )
+      # emulate reboot
+      set( REBOOT_BINARY "${SHUTDOWN_BINARY} -y -i 6")
+    endif( NOT REBOOT_BINARY AND SHUTDOWN_BINARY )
+
+    if( NOT POWEROFF_BINARY AND SHUTDOWN_BINARY )
+      # emulate poweroff
+      set( POWEROFF_BINARY "${SHUTDOWN_BINARY} -y -i 5")
+    endif( NOT POWEROFF_BINARY AND SHUTDOWN_BINARY )
+
+  else( ) # default condition
+    if( NOT REBOOT_BINARY AND SHUTDOWN_BINARY )
+      # emulate reboot
+      set( REBOOT_BINARY "${SHUTDOWN_BINARY} -r now")
+    endif( NOT REBOOT_BINARY AND SHUTDOWN_BINARY )
+
+    if( NOT POWEROFF_BINARY AND SHUTDOWN_BINARY )
+      # emulate poweroff
+      set( POWEROFF_BINARY "${SHUTDOWN_BINARY} -h now")
+    endif( NOT POWEROFF_BINARY AND SHUTDOWN_BINARY )
+
+    if( NOT POWEROFF_BINARY AND HALT_BINARY )
+      # emulate poweroff
+      set( POWEROFF_BINARY "${HALT_BINARY} -p")
+    endif( NOT POWEROFF_BINARY AND HALT_BINARY )
+
+  endif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+
+  if( NOT REBOOT_BINARY )
+    tde_message_fatal( "reboot command is not defined" )
+  endif( NOT REBOOT_BINARY )
+
+  if( NOT POWEROFF_BINARY )
+    tde_message_fatal( "poweroff command is not defined" )
+  endif( NOT POWEROFF_BINARY )
+
+  message( STATUS "poweroff - ${POWEROFF_BINARY}" )
+  message( STATUS "reboot - ${REBOOT_BINARY}" )
+
+endif( BUILD_KCONTROL OR BUILD_TDM )
+
+check_include_files( "sys/time.h;sys/loadavg.h" HAVE_SYS_LOADAVG_H )
diff --git a/Makefile.am.in b/Makefile.am.in
index 793c08688..ece4e7f2c 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -9,7 +9,7 @@ COMPILE_AFTER_kcontrol = tdm kdesktop
 
 AUTOMAKE_OPTIONS = foreign 1.6.1
 
-bin_SCRIPTS = starttde migratekde3 r14-xdg-update tde_release_notes
+bin_SCRIPTS = starttde migratekde3 r14-xdg-update tde_release_notes tde_show_license_info
 
 EXTRA_DIST = admin bsd-port debian tdebase.spec.in README.pam kde.pamd tdescreensaver.pamd mkpamserv
 
diff --git a/admin b/admin
-Subproject a7f75ac0ff587d5b8694a1b78557597161f8104
+Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7
diff --git a/config.h.cmake b/config.h.cmake
index 4fab81d2f..fcee849e3 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -19,6 +19,8 @@
 // kdesktop, konsole, kcontrol, kicker
 #cmakedefine HAVE_XRENDER 1
 
+#cmakedefine HAVE_SYS_LOADAVG_H 1
+
 // taskmanager, klipper
 #cmakedefine HAVE_XFIXES 1
 
@@ -130,6 +132,33 @@
 // kcontrol/input
 #cmakedefine HAVE_LIBUSB 1
 
+// ksysguard, kcheckpass
+#cmakedefine HAVE_STRLCAT 1
+#cmakedefine HAVE_STRLCAT_PROTO 1
+#cmakedefine HAVE_STRLCPY 1
+#cmakedefine HAVE_STRLCPY_PROTO 1
+
+#if !defined(HAVE_STRLCAT_PROTO)
+#ifdef __cplusplus
+extern "C" {
+#endif
+unsigned long strlcat(char*, const char*, unsigned long);
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+#if !defined(HAVE_STRLCPY_PROTO)
+#ifdef __cplusplus
+extern "C" {
+#endif
+unsigned long strlcpy(char*, const char*, unsigned long);
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+
 // tdeprint
 #cmakedefine HAVE_SIGACTION 1
 #cmakedefine HAVE_SIGSET 1
@@ -137,6 +166,7 @@
 // tdesu
 #cmakedefine HAVE_STRUCT_UCRED 1
 #cmakedefine HAVE_GETPEEREID 1
+#cmakedefine HAVE_GETPEERUCRED 1
 #cmakedefine HAVE_SYS_SELECT_H 1
 #cmakedefine HAVE_SYS_WAIT_H 1
 #cmakedefine DEFAULT_SUPER_USER_COMMAND "@DEFAULT_SUPER_USER_COMMAND@"
@@ -146,6 +176,7 @@
 
 // kcheckpass
 #cmakedefine KCHECKPASS_PAM_SERVICE "@KCHECKPASS_PAM_SERVICE@"
+#cmakedefine HAVE_PW_ENCRYPT 1
 
 // kdesktop
 #cmakedefine TDESCREENSAVER_PAM_SERVICE "@TDESCREENSAVER_PAM_SERVICE@"
@@ -162,6 +193,7 @@
 #cmakedefine HAVE_INITGROUPS 1
 #cmakedefine HAVE_MKSTEMP 1
 #cmakedefine HAVE_SETPROCTITLE 1
+#cmakedefine HAVE_PTHREAD_SETNAME_NP 1
 #cmakedefine HAVE_SYSINFO 1
 #cmakedefine HAVE_STRNLEN 1
 #cmakedefine HAVE_CRYPT 1
@@ -213,7 +245,9 @@
 #cmakedefine XLIBDIR "@XLIBDIR@"
 
 // kxkb
+#cmakedefine WITH_XKB_TRANSLATIONS 1
 #cmakedefine X11_XKB_RULES_DIR "@X11_XKB_RULES_DIR@"
+#cmakedefine XKB_CONFIG_LOCALE_DIR "@XKB_CONFIG_LOCALE_DIR@"
 
 // tdm, kcontrol
 #cmakedefine WITH_XRANDR "@WITH_XRANDR@"
@@ -233,3 +267,7 @@
 
 // TDE man installation folder
 #define TDE_MANDIR "@MAN_INSTALL_DIR@"
+
+// System control binaries used in kcontrol/tdm
+#define POWEROFF_BINARY "@POWEROFF_BINARY@"
+#define REBOOT_BINARY "@REBOOT_BINARY@"
diff --git a/doc/kappfinder/CMakeLists.txt b/doc/kappfinder/CMakeLists.txt
new file mode 100644
index 000000000..54e4d7175
--- /dev/null
+++ b/doc/kappfinder/CMakeLists.txt
@@ -0,0 +1,6 @@
+#################################################
+#
+#  Empty CMake rules to avoid unwanted automatic
+#  installation of man-kappfinder.1.docbook
+#
+#################################################
diff --git a/doc/kate/highlighting.docbook b/doc/kate/highlighting.docbook
index 6c12a110f..f5ce8e8cb 100644
--- a/doc/kate/highlighting.docbook
+++ b/doc/kate/highlighting.docbook
@@ -250,7 +250,7 @@ Available attributes are:</term>
 <para><userinput>kateversion</userinput> specifies the latest supported &kate; version.</para>
 <para><userinput>casesensitive</userinput> defines, whether the keywords are casesensitiv or not.</para>
 <para><userinput>priority</userinput> is necessary if another highlight definition file uses the same extensions. The higher priority will win.</para>
-<para><userinput>author</userinput> contains the name of the author and his email-address.</para>
+<para><userinput>author</userinput> contains the name of the author and their email-address.</para>
 <para><userinput>license</userinput> contains the license, usually LGPL, Artistic, GPL and others.</para>
 <para><userinput>hidden</userinput> defines, whether the name should appear in &kate;'s menus.</para>
 <para>So the next line may look like this:</para>
@@ -465,7 +465,7 @@ do not need to set it, as it defaults to <emphasis>false</emphasis>.</para>
 <userinput>general</userinput> defines which indenter will be used, however we strongly
 recommend to omit this element, as the indenter usually will be set by either defining
 a File Type or by adding a mode line to the text file. If you specify an indenter though,
-you will force a specific indentation on the user, which he might not like at all.
+you will force a specific indentation on the user, which they might not like at all.
 Available attributes are:</term>
 
 <listitem>
diff --git a/doc/kate/regular-expressions.docbook b/doc/kate/regular-expressions.docbook
index c15685d75..51a9cf4e6 100644
--- a/doc/kate/regular-expressions.docbook
+++ b/doc/kate/regular-expressions.docbook
@@ -640,8 +640,8 @@ acknowledged if the following part of the searched string does match
 its <emphasis>PATTERN</emphasis>.</para>
 <para>The expression <userinput>const \w+\b(?!\s*&amp;)</userinput>
 will match at <quote>const char</quote> in the string <quote>const
-char* foo</quote> while it can not match <quote>const QString</quote>
-in <quote>const QString&amp; bar</quote> because the
+char* foo</quote> while it can not match <quote>const TQString</quote>
+in <quote>const TQString&amp; bar</quote> because the
 <quote>&amp;</quote> matches the negative lookahead assertion
 pattern.</para>
 </listitem>
diff --git a/doc/kcontrol/samba/index.docbook b/doc/kcontrol/samba/index.docbook
index 69d7b91b9..dcf058947 100644
--- a/doc/kcontrol/samba/index.docbook
+++ b/doc/kcontrol/samba/index.docbook
@@ -70,12 +70,12 @@ process (<command>smbd</command>), the next column shows the process
 <abbrev>ID</abbrev> (<acronym>pid</acronym>) of this
 <command>smbd</command>. If you kill this process the connected user
 will be disconnected. If the remote user works from &Windows;, as soon
-as this process is killed a new one will be created, so he will almost
+as this process is killed a new one will be created, so they will almost
 not notice it.</para>
 
 <para>The last column shows how many files this user has currently open.
-Here you see only, how many files he has <emphasis>open</emphasis> just
-now, you don't see how many he copied or formerly opened &etc;</para>
+Here you see only how many files they have <emphasis>open</emphasis> just
+now, you don't see how many they copied or formerly opened &etc;</para>
 
 </sect2>
 
@@ -204,4 +204,4 @@ fixed:</para>
 </sect2>
 </sect1>
 
-</article>
\ No newline at end of file
+</article>
diff --git a/doc/kcontrol/windowbehavior/index.docbook b/doc/kcontrol/windowbehavior/index.docbook
index 356e3ce0f..310c6b021 100644
--- a/doc/kcontrol/windowbehavior/index.docbook
+++ b/doc/kcontrol/windowbehavior/index.docbook
@@ -616,6 +616,13 @@ to allow moving or resizing maximized windows.</para>
 </varlistentry>
 
 <varlistentry>
+<term><guilabel>Restore size of maximized/tiled windows when moving</guilabel></term>
+<listitem>
+<para>When enabled, this feature restores the original size of a maximized or <link linkend="active-borders">tiled</link> window when the window is dragged.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
 <term><guilabel>Placement</guilabel></term>
 <listitem>
 <para>This feature determines where new windows are placed on the desktop.</para>
@@ -707,6 +714,52 @@ less.</para>
 
 </sect2>
 
+<sect2 id="active-borders">
+<title>Active Borders</title>
+
+<para><guilabel>Active Borders</guilabel> is a feature which allows you to quickly perform window management actions by moving your mouse into a desktop border.</para>
+
+<para>The corresponding section allows you to configure the function that will be performed when pushing your mouse cursor against a border or moving a window into it:</para>
+
+<variablelist>
+<varlistentry>
+<term><guilabel>Disabled</guilabel></term>
+<listitem>
+<para>This option disables the Active Borders feature.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Switch desktop</guilabel></term>
+<listitem>
+<para>Moving your mouse pointer against the side of the screen will switch to another desktop.</para>
+<para>By default the switch occurs both when moving your mouse pointer into a border and dragging a window into it. The <guilabel>Switch desktop only when moving a window</guilabel> checkbox disables the former behaviour and only switches to another desktop when a window is being dragged into a desktop border.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Tile window</guilabel></term>
+<listitem>
+<para>Dragging a window into a desktop border will tile that window at that side or corner of the screen. This feature is also known as <quote>Aerosnap</quote> or <quote>Quick Tile</quote>.</para>
+<para><guilabel>Maximize windows by dragging them to the top of the screen</guilabel> changes the behaviour of the top border of the desktop. If this option is enabled, dragging a window into the top border will not result in tiling, but the window will become maximized instead.</para>
+<para>By default dragging a tiled window does not reset its original size. This behaviour is controlled by an option in the <link linkend="moving">Moving</link> tab of this control module.</para>
+</listitem>
+</varlistentry>
+</variablelist>
+
+<para>
+<guilabel>Border activation delay</guilabel>.
+This option controls the delay before the designated active border function is performed. A higher value can prevent accidental activations of this feature.
+</para>
+
+<para>
+<guilabel>Border activation distance</guilabel>.
+This option controls how far from a desktop edge the mouse cursor should be in order to be able to activate the corresponding function. The default value is low,
+meaning that you have to be very close to the border or corner to trigger it, preventing accidental activations. A higher value means easier activation without
+having to actually push against the borders and corners.
+</para>
+</sect2>
+
 <sect2 id="advanced">
 <title>Advanced</title>
 
@@ -739,35 +792,8 @@ Use the slider widget to configure the delay.
 
 </variablelist>
 
-<variablelist>
-<title>Active Desktop Borders</title>
-
-<varlistentry>
-<term><guilabel>Disabled</guilabel></term>
-<listitem>
-<para>When this option is enabled, moving the mouse pointer to a screen
-border will change your desktop. This is useful when you want to drag
-windows from one desktop to another.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Only when moving windows</guilabel></term>
-<listitem>
-<para>Moving your mouse pointer against the side of the screen will
-switch to a new desktop only while moving a window.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Always enabled</guilabel></term>
-<listitem>
-<para>Moving your mouse pointer against the side of the screen will
-always switch to a new desktop.</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
+<sect3>
+<title>Other</title>
 
 <para>
 <guilabel>Hide utility windows for inactive applications</guilabel>. When
@@ -776,6 +802,7 @@ inactive applications will be hidden and will be shown only when the
 application becomes active. Note that applications have to mark the windows 
 with the proper window type for this feature to work.
 </para>
+</sect3>
 
 </sect2>
 
diff --git a/doc/khelpcenter/adminguide/index.docbook b/doc/khelpcenter/adminguide/index.docbook
index e474c626f..c5052185a 100644
--- a/doc/khelpcenter/adminguide/index.docbook
+++ b/doc/khelpcenter/adminguide/index.docbook
@@ -2216,7 +2216,7 @@ indicate the users home directory and the &tde; temporary directory of the
 user, &eg; <filename class="directory">/tmp/tde-bastian</filename></para>
 
 <para>The following rules makes that the user can no longer open local files
-that are outside his $<envar>HOME</envar> directory:</para>
+that are outside their $<envar>HOME</envar> directory:</para>
 
 <screenco><areaspec>
 <area id="local_rule1" coords="3"/>
@@ -2519,11 +2519,11 @@ session-4
 QCStringList interfaces()
 QCStringList functions()
 int sessionCount()
-QString currentSession()
-QString newSession()
-QString newSession(QString type)
-QString sessionId(int position)
-void activateSession(QString sessionId)
+TQString currentSession()
+TQString newSession()
+TQString newSession(TQString type)
+TQString sessionId(int position)
+void activateSession(TQString sessionId)
 void nextSession()
 void prevSession()
 void moveSessionLeft()
@@ -2541,15 +2541,15 @@ QCStringList functions()
 bool closeSession()
 bool sendSignal(int signal)
 void clearHistory()
-void renameSession(QString name)
-QString sessionName()
+void renameSession(TQString name)
+TQString sessionName()
 int sessionPID()
-QString schema()
-void setSchema(QString schema)
-QString encoding()
-void setEncoding(QString encoding)
-QString keytab()
-void setKeytab(QString keyboard)
+TQString schema()
+void setSchema(TQString schema)
+TQString encoding()
+void setEncoding(TQString encoding)
+TQString keytab()
+void setKeytab(TQString keyboard)
 QSize size()
 void setSize(QSize size)
 </screen>
diff --git a/doc/khelpcenter/faq/filemng.docbook b/doc/khelpcenter/faq/filemng.docbook
index 7620b0f00..76007bcb6 100644
--- a/doc/khelpcenter/faq/filemng.docbook
+++ b/doc/khelpcenter/faq/filemng.docbook
@@ -152,7 +152,7 @@ Foo" are properties defined in the <filename>.desktop</filename> file. If
 the icons are not defined, they simply default to the executable name
 <replaceable>foo</replaceable>.</para>
 
-<para>This way a user can change these things in &kmenuedit; for his or her
+<para>This way a user can change these things in &kmenuedit; for their
 applications. The <option>-caption</option> option is important, because no
 user will accept that the menu item <guimenuitem>Editor</guimenuitem> starts
 something called <guilabel>kedit-0.9pl4-build47</guilabel>. Instead, users
diff --git a/doc/khelpcenter/license/CMakeL10n.txt b/doc/khelpcenter/license/CMakeL10n.txt
new file mode 100644
index 000000000..6fc757869
--- /dev/null
+++ b/doc/khelpcenter/license/CMakeL10n.txt
@@ -0,0 +1,3 @@
+##### create translation templates ##############
+
+tde_l10n_create_template( "tdelicense" )
diff --git a/doc/khelpcenter/license/CMakeLists.txt b/doc/khelpcenter/license/CMakeLists.txt
new file mode 100644
index 000000000..ee0dfb94b
--- /dev/null
+++ b/doc/khelpcenter/license/CMakeLists.txt
@@ -0,0 +1,31 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+install( FILES tde_license_info.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
+
+
+##### tde_license_info (executable) #########################
+
+tde_add_executable( tde_license_info AUTOMOC
+  SOURCES mainWindow.cpp TDELicenseDlg.cpp
+  LINK tdeui-shared
+  DESTINATION ${BIN_INSTALL_DIR}
+)
diff --git a/doc/khelpcenter/license/TDELicenseDlg.cpp b/doc/khelpcenter/license/TDELicenseDlg.cpp
new file mode 100644
index 000000000..a572389db
--- /dev/null
+++ b/doc/khelpcenter/license/TDELicenseDlg.cpp
@@ -0,0 +1,122 @@
+#include <tqfile.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+
+#include <kiconloader.h>
+#include <kpushbutton.h>
+#include <kseparator.h>
+#include <kstddirs.h>
+#include <ktabwidget.h>
+#include <ktextbrowser.h>
+#include <tdelocale.h>
+
+#include "TDELicenseDlg.h"
+
+TDELicenseDlg::TDELicenseDlg(TQWidget *parent, const char *name)
+        : KDialog(parent, name)
+{
+  setCaption(i18n("TDE License"));
+  setIcon(TDEGlobal::iconLoader()->loadIcon("about_kde", TDEIcon::NoGroup, TDEIcon::SizeSmall));
+  setMinimumSize(600, 600);
+
+  TQVBoxLayout *vbox = new TQVBoxLayout(this, marginHint(), spacingHint());
+
+  // Top label
+  TQLabel *topLabel = new TQLabel(this);
+  topLabel->setText(i18n(
+          "The Trinity Desktop Environment (TDE) project is a computer desktop\n"
+          "environment for Unix-like operating systems with a primary goal of\n"
+          "retaining the function and form of traditional desktop computers.\n\n"
+          "Its components are provided under the following licenses, as applicable.\n\n"
+          "Thanks for using TDE!"));
+  vbox->addWidget(topLabel);
+
+  TQSpacerItem *spacerV = new TQSpacerItem(10, 10, TQSizePolicy::Minimum,
+          TQSizePolicy::Minimum);
+  vbox->addItem(spacerV);
+
+  // License tab widget
+  KTabWidget *twLicense = new KTabWidget(this);
+  twLicense->setTabReorderingEnabled(false);
+  twLicense->setAutomaticResizeTabs(true);
+  twLicense->setTabCloseActivatePrevious(true);
+  twLicense->setMouseWheelScroll(true);
+  twLicense->setTabPosition(TQTabWidget::Top);
+
+  KTextBrowser *tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("GPL_V2"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("GPL v2"));
+
+  tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("GPL_V3"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("GPL v3"));
+
+  tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("LGPL_V2"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("LGPL v2"));
+
+  tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("LGPL_V3"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("LGPL v3"));
+
+  tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("BSD"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("BSD"));
+
+  tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("ARTISTIC"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("Artistic"));
+
+  tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("QPL_V1.0"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("QPL v1.0"));
+
+  tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("MIT"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("MIT"));
+
+  twLicense->setCurrentPage(0);
+  vbox->addWidget(twLicense);
+
+  KSeparator *sep = new KSeparator(KSeparator::HLine, this);
+  vbox->addWidget(sep);
+
+  // Close button
+  TQHBoxLayout *hboxBottom = new TQHBoxLayout(vbox, 4);
+  TQSpacerItem *spacerHBottom = new TQSpacerItem(10, 10, TQSizePolicy::Expanding,
+          TQSizePolicy::Minimum);
+  hboxBottom->addItem(spacerHBottom);
+  KPushButton *okButton = new KPushButton(KStdGuiItem::ok(), this);
+  connect(okButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
+  okButton->setDefault(true);
+  okButton->setFocus();
+  hboxBottom->addWidget(okButton);
+}
+
+TQString TDELicenseDlg::readLicenseFile(const TQString &licenseName)
+{
+  TQString licensePath = locate("data", TQString("LICENSES/%1").arg(licenseName));
+  if (licensePath.isEmpty())
+  {
+    return i18n("License file not found!");
+  }
+
+  TQFile licenseFile(licensePath);
+  if (licenseFile.open(IO_ReadOnly))
+  {
+    TQTextStream txtstr(&licenseFile);
+    return txtstr.read();
+  }
+
+  return i18n("Unable to open license file!");
+}
+
+#include "TDELicenseDlg.moc"
diff --git a/doc/khelpcenter/license/TDELicenseDlg.h b/doc/khelpcenter/license/TDELicenseDlg.h
new file mode 100644
index 000000000..40e05a7a4
--- /dev/null
+++ b/doc/khelpcenter/license/TDELicenseDlg.h
@@ -0,0 +1,17 @@
+#ifndef __TDELICENSE_DLG_H__
+#define __TDELICENSE_DLG_H__
+
+#include <kdialog.h>
+
+class TDELicenseDlg : public KDialog
+{
+  TQ_OBJECT
+
+public:
+  TDELicenseDlg(TQWidget *parent = 0, const char *name = 0);
+
+protected:
+  static TQString readLicenseFile(const TQString &licenseName);
+};
+
+#endif
diff --git a/doc/khelpcenter/license/mainWindow.cpp b/doc/khelpcenter/license/mainWindow.cpp
new file mode 100644
index 000000000..78b50f576
--- /dev/null
+++ b/doc/khelpcenter/license/mainWindow.cpp
@@ -0,0 +1,40 @@
+/*
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of version 2 of the GNU General Public
+    License as published by the Free Software Foundation
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdelocale.h>
+
+#include "TDELicenseDlg.h"
+
+int main(int argc, char *argv[])
+{
+  TDELocale::setMainCatalogue("tdelicense");
+  TDEAboutData aboutData("TDELicense", I18N_NOOP("TDE License"),
+          "0.1", I18N_NOOP("TDE License"), TDEAboutData::License_GPL,
+          "(c) 2023, TDE Developers");
+  TDECmdLineArgs::init(argc,argv, &aboutData);
+  TDEApplication::addCmdLineOptions();
+  TDEApplication app;
+  TQObject::connect(tqApp, TQ_SIGNAL(lastWindowClosed()), tqApp, TQ_SLOT(quit()));
+
+  TDELicenseDlg *licenseDlg = new TDELicenseDlg();
+  app.setMainWidget(licenseDlg);
+  licenseDlg->show();
+
+  return app.exec();
+}
diff --git a/doc/khelpcenter/license/tde_license_info.desktop b/doc/khelpcenter/license/tde_license_info.desktop
new file mode 100644
index 000000000..3cabcfad0
--- /dev/null
+++ b/doc/khelpcenter/license/tde_license_info.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=tde_show_license_info
+Exec=tde_show_license_info
+Type=Application
+X-TDE-autostart-phase=2
+X-TDE-StartupNotify=false
+X-TDE-UniqueApplet=true
+Categories=System;
diff --git a/doc/khelpcenter/releasenotes/CMakeLists.txt b/doc/khelpcenter/releasenotes/CMakeLists.txt
index 4392e53e4..39014a623 100644
--- a/doc/khelpcenter/releasenotes/CMakeLists.txt
+++ b/doc/khelpcenter/releasenotes/CMakeLists.txt
@@ -6,6 +6,8 @@
 #
 #################################################
 
+tde_auto_add_subdirectories()
+
 tde_create_handbook( DESTINATION khelpcenter/releasenotes )
 
 install( FILES tde_release_notes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
diff --git a/doc/khelpcenter/releasenotes/README b/doc/khelpcenter/releasenotes/README
deleted file mode 100644
index 8a9d1b1d8..000000000
--- a/doc/khelpcenter/releasenotes/README
+++ /dev/null
@@ -1,9 +0,0 @@
-To update the Release Notes in the help handbook:
-
-* For archival purposes, copy index.docbook to index-Rxx.yy.zz.docbook,
-  where Rxx.yy.zz is the previous release version. For example.
-  index-R14.0.0.docbook.
-
-* Edit index.docbook as necessary for the next release. For example, R14.0.1.
-
-No changes or updates are needed in ./release_notes.desktop or ../../tde_release_notes.
diff --git a/doc/khelpcenter/releasenotes/index.docbook b/doc/khelpcenter/releasenotes/index.docbook
index aeb5f47b4..607fdff4f 100644
--- a/doc/khelpcenter/releasenotes/index.docbook
+++ b/doc/khelpcenter/releasenotes/index.docbook
@@ -1,22 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
 
-  <!ENTITY r14.0.00 SYSTEM "r14.0.00.docbook">
-  <!ENTITY r14.0.01 SYSTEM "r14.0.01.docbook">
-  <!ENTITY r14.0.02 SYSTEM "r14.0.02.docbook">
-  <!ENTITY r14.0.03 SYSTEM "r14.0.03.docbook">
-  <!ENTITY r14.0.04 SYSTEM "r14.0.04.docbook">
-  <!ENTITY r14.0.05 SYSTEM "r14.0.05.docbook">
-  <!ENTITY r14.0.06 SYSTEM "r14.0.06.docbook">
-  <!ENTITY r14.0.07 SYSTEM "r14.0.07.docbook">
-  <!ENTITY r14.0.08 SYSTEM "r14.0.08.docbook">
-  <!ENTITY r14.0.09 SYSTEM "r14.0.09.docbook">
-  <!ENTITY r14.0.10 SYSTEM "r14.0.10.docbook">
-  <!ENTITY r14.0.11 SYSTEM "r14.0.11.docbook">
-  <!ENTITY r14.0.12 SYSTEM "r14.0.12.docbook">
-  <!ENTITY r14.0.13 SYSTEM "r14.0.13.docbook">
 
 ]>
 
@@ -51,34 +37,12 @@
 </articleinfo>
 
 <sect1 id="release-notes-introduction">
-<title>Introduction</title>
+<title></title>
 
-<para>This  document contains important information for users, developers, and  packagers. This document is
-intended for people who are migrating from previous versions of Trinity. If you are a using Trinity for the
-first time, then you can ignore the contents of this document.</para>
-
-<para>The Trinity Desktop is a full software desktop environment designed for Unix-like operating systems,
-intended  for computer users preferring a traditional desktop model focusing primarily on retaining the overall
-KDE 3.5 user experience and efficiency. Trinity is free/libre software.</para>
-
-<para>First, thank you to the many people who contributed to all of these improvements. Many people played a
-role, including bug fixing, enhancements, testing, etc.</para>
+<para><ulink url="help:/khelpcenter/releasenotes/r14.2.x">Release Notes for R14.2.x series</ulink></para>
+<para><ulink url="help:/khelpcenter/releasenotes/r14.1.x">Release Notes for R14.1.x series</ulink></para>
+<para><ulink url="help:/khelpcenter/releasenotes/r14.0.x">Release Notes for R14.0.x series</ulink></para>
 
 </sect1>
 
-&r14.0.13;
-&r14.0.12;
-&r14.0.11;
-&r14.0.10;
-&r14.0.09;
-&r14.0.08;
-&r14.0.07;
-&r14.0.06;
-&r14.0.05;
-&r14.0.04;
-&r14.0.03;
-&r14.0.02;
-&r14.0.01;
-&r14.0.00;
-
 </article>
diff --git a/doc/khelpcenter/releasenotes/r14.0.13.docbook b/doc/khelpcenter/releasenotes/r14.0.13.docbook
deleted file mode 100644
index 3308fd79f..000000000
--- a/doc/khelpcenter/releasenotes/r14.0.13.docbook
+++ /dev/null
@@ -1,12 +0,0 @@
-<sect1 id="release-notes-r14.0.13">
-<title>R14.0.13 Release Notes (draft)</title>
-
-<para>R14.0.13 is the thirteenth maintenance release of the R14.0 series,
-and is built on and improves the previous versions.</para>
-<para>Maintenance releases are intended to promptly bring bug fixes and
-new features to users, while preserving overall stability through the
-avoidance of both major API or feature changes and major codebase re-factoring.</para>
-
-<para>The ongoing temporary list of changes introduced by this release can be found <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/83">here</ulink>.</para>
-
-</sect1>
diff --git a/doc/khelpcenter/releasenotes/r14.0.x/CMakeLists.txt b/doc/khelpcenter/releasenotes/r14.0.x/CMakeLists.txt
new file mode 100644
index 000000000..95bb8e0e6
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.0.x/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION khelpcenter/releasenotes/r14.0.x )
diff --git a/doc/khelpcenter/releasenotes/r14.0.x/index.docbook b/doc/khelpcenter/releasenotes/r14.0.x/index.docbook
new file mode 100644
index 000000000..c4fb2a617
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.0.x/index.docbook
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+
+  <!ENTITY r14.0.00 SYSTEM "r14.0.00.docbook">
+  <!ENTITY r14.0.01 SYSTEM "r14.0.01.docbook">
+  <!ENTITY r14.0.02 SYSTEM "r14.0.02.docbook">
+  <!ENTITY r14.0.03 SYSTEM "r14.0.03.docbook">
+  <!ENTITY r14.0.04 SYSTEM "r14.0.04.docbook">
+  <!ENTITY r14.0.05 SYSTEM "r14.0.05.docbook">
+  <!ENTITY r14.0.06 SYSTEM "r14.0.06.docbook">
+  <!ENTITY r14.0.07 SYSTEM "r14.0.07.docbook">
+  <!ENTITY r14.0.08 SYSTEM "r14.0.08.docbook">
+  <!ENTITY r14.0.09 SYSTEM "r14.0.09.docbook">
+  <!ENTITY r14.0.10 SYSTEM "r14.0.10.docbook">
+  <!ENTITY r14.0.11 SYSTEM "r14.0.11.docbook">
+  <!ENTITY r14.0.12 SYSTEM "r14.0.12.docbook">
+  <!ENTITY r14.0.13 SYSTEM "r14.0.13.docbook">
+
+]>
+
+<article id="release-notes-14-0-x" lang="&language;">
+<title>Release Notes for R14.0.x series</title>
+
+<articleinfo>
+<authorgroup>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<date>&tde-release-date;</date>
+<releaseinfo>&tde-release-version;</releaseinfo>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<!-- <legalnotice>&FDLNotice;</legalnotice> -->
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>release notes</keyword>
+<keyword>R14.0.x</keyword>
+</keywordset>
+
+</articleinfo>
+
+<!-- empty section to avoid the first docbook to be shown
+     as part of the index page, instead of just a link-->
+<sect1 id="release-notes-r14-0-x-introduction">
+<title></title>
+<para></para>
+</sect1>
+
+&r14.0.13;
+&r14.0.12;
+&r14.0.11;
+&r14.0.10;
+&r14.0.09;
+&r14.0.08;
+&r14.0.07;
+&r14.0.06;
+&r14.0.05;
+&r14.0.04;
+&r14.0.03;
+&r14.0.02;
+&r14.0.01;
+&r14.0.00;
+
+</article>
diff --git a/doc/khelpcenter/releasenotes/r14.0.00.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.00.docbook
index 9cd295e1b..9cd295e1b 100644
--- a/doc/khelpcenter/releasenotes/r14.0.00.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.00.docbook
diff --git a/doc/khelpcenter/releasenotes/r14.0.01.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.01.docbook
index 022fe7fcf..022fe7fcf 100644
--- a/doc/khelpcenter/releasenotes/r14.0.01.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.01.docbook
diff --git a/doc/khelpcenter/releasenotes/r14.0.02.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.02.docbook
index 84281cf3b..84281cf3b 100644
--- a/doc/khelpcenter/releasenotes/r14.0.02.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.02.docbook
diff --git a/doc/khelpcenter/releasenotes/r14.0.03.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.03.docbook
index 92f18b3e4..92f18b3e4 100644
--- a/doc/khelpcenter/releasenotes/r14.0.03.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.03.docbook
diff --git a/doc/khelpcenter/releasenotes/r14.0.04.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.04.docbook
index 971dbc3d1..971dbc3d1 100644
--- a/doc/khelpcenter/releasenotes/r14.0.04.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.04.docbook
diff --git a/doc/khelpcenter/releasenotes/r14.0.05.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.05.docbook
index 12353c5c2..12353c5c2 100644
--- a/doc/khelpcenter/releasenotes/r14.0.05.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.05.docbook
diff --git a/doc/khelpcenter/releasenotes/r14.0.06.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.06.docbook
index 2396174b3..2396174b3 100644
--- a/doc/khelpcenter/releasenotes/r14.0.06.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.06.docbook
diff --git a/doc/khelpcenter/releasenotes/r14.0.07.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.07.docbook
index d902655d0..d902655d0 100644
--- a/doc/khelpcenter/releasenotes/r14.0.07.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.07.docbook
diff --git a/doc/khelpcenter/releasenotes/r14.0.08.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.08.docbook
index 3d1d7e28d..3d1d7e28d 100644
--- a/doc/khelpcenter/releasenotes/r14.0.08.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.08.docbook
diff --git a/doc/khelpcenter/releasenotes/r14.0.09.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.09.docbook
index 91373133d..91373133d 100644
--- a/doc/khelpcenter/releasenotes/r14.0.09.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.09.docbook
diff --git a/doc/khelpcenter/releasenotes/r14.0.10.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.10.docbook
index a075dcbe7..a075dcbe7 100644
--- a/doc/khelpcenter/releasenotes/r14.0.10.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.10.docbook
diff --git a/doc/khelpcenter/releasenotes/r14.0.11.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.11.docbook
index da6a62cdc..da6a62cdc 100644
--- a/doc/khelpcenter/releasenotes/r14.0.11.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.11.docbook
diff --git a/doc/khelpcenter/releasenotes/r14.0.12.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.12.docbook
index 69ec96ad5..69ec96ad5 100644
--- a/doc/khelpcenter/releasenotes/r14.0.12.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.12.docbook
diff --git a/doc/khelpcenter/releasenotes/r14.0.x/r14.0.13.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.13.docbook
new file mode 100644
index 000000000..5f3c2a9ed
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.13.docbook
@@ -0,0 +1,127 @@
+<sect1 id="release-notes-r14.0.13">
+<title>R14.0.13 Release Notes</title>
+
+<para>R14.0.13 is the thirteenth maintenance release of the R14.0 series,
+and is built on and improves the previous maintenance versions.</para>
+<para>Maintenance releases are intended to promptly bring bug fixes and new
+features to users, while preserving overall stability through the avoidance
+of both major API or feature changes and major codebase re-factoring. </para>
+<para>Below is a summary of some of the most important changes introduced by
+this release.</para>
+
+
+<sect2 id="release-notes-r14.0.13-new-applications">
+<title>New applications</title>
+<itemizedlist>
+  <listitem><para>tdeio-appinfo: a TDEIO slave (appinfo:/) that combines an application's configuration, data, manual and temp files and folders into a single view (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeio-appinfo">TDE/tdeio-appinfo</ulink>)</para></listitem>
+  <listitem><para>twin-style-machbunt: a KDE window decoration theme from SuSE 9.1/9.2 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-machbunt">TDE/twin-style-machbunt</ulink>)</para></listitem>
+</itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.0.13-enhancements">
+<title>Enhancements</title>
+  <itemizedlist>
+    <listitem><para>Ctrl + mouse wheel can now be used to increase/decrease the font size in the following applications:</para>
+      <itemizedlist>
+        <listitem><para>Konsole (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/297">TDE/tdebase#297</ulink>)</para></listitem>
+        <listitem><para>Kate, KWrite, TDevelop and other applications using the Kate part editor (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/180">TDE/tdelibs#180</ulink>)</para></listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem><para>Kate: added syntax highlighting for Markdown files (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/170">TDE/tdelibs#170</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/174">TDE/tdelibs#174</ulink>)</para></listitem>
+    <listitem><para>Improved user experience when setting a wallpaper (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/280">TDE/tdebase#280</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/285">TDE/tdebase#285</ulink>)</para></listitem>
+    <listitem><para>Offer all available options to set an image as background from Konqueror's action menu (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/281">TDE/tdebase#281</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/285">TDE/tdebase#285</ulink>)</para></listitem>
+    <listitem><para>Taskbar: <interface>Move Task</interface> and drag-n-drop are now available also for grouped task buttons (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/295">TDE/tdebase#295</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/98">TDE/tde#98</ulink>)</para></listitem>
+    <listitem><para>Improvements to khotkeys <interface>Input Actions</interface>:</para>
+      <itemizedlist>
+        <listitem><para>New <interface>move up</interface>/<interface>move down</interface> buttons (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/commit/5e4ca4df9bb34e10a897e32e7e0ca8645b97f293">commit 5e4ca4df</ulink>)</para></listitem>
+        <listitem><para>Fixes to GUI for creating/editing actions (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/commit/0c22a14875913dc185e029d0078a8d15c9ffe102">commit 0c22a148</ulink>)</para></listitem>
+        <listitem><para>New `waiting` action component to introduce a delay between steps (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/267">TDE/tdebase#267</ulink>)</para></listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem><para>New SFTP tdeioslave based on libssh (KDE backport) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/279">TDE/tdebase#279</ulink>)</para></listitem>
+    <listitem><para>Added support for ffmpeg 5.0 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/akode/pulls/9">TDE/akode#9</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/akode/pulls/10">TDE/akode#10</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k3b/pulls/14">TDE/k3b#14</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k3b/pulls/16">TDE/k3b#16</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k9copy/pulls/5">TDE/k9copy#5</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k9copy/pulls/6">TDE/k9copy#6</ulink>)</para></listitem>
+    <listitem><para>Added support for Jasper 3.x (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/162">TDE/tdelibs#162</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/5">TDE/digikam#5</ulink>)</para></listitem>
+    <listitem><para>Added support for Poppler >= 22.04 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdegraphics/pulls/45">TDE/tdegraphics#45</ulink>)</para></listitem>
+    <listitem><para>Improvements to Python3 Support (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/sip4-tqt/pulls/7">TDE/sip4-tqt#7</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/sip4-tqt/pulls/8">TDE/sip4-tqt#8</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/python-tqt/pulls/7">TDE/python-tqt#7</ulink>)</para></listitem>
+    <listitem><para>Added man pages for several TDE applications (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/abakus/pulls/6">TDE/abakus#6</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/amarok/pulls/34">TDE/amarok#34</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/arts/pulls/8">TDE/arts#8</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/k3b/pulls/18">TDE/k3b#18</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/k9copy/pulls/7">TDE/k9copy#7</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/kile/pulls/3">TDE/kile#3</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/koffice/pulls/28">TDE/koffice#28</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/krecipes/pulls/1">TDE/krecipes#1</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/ktorrent/pulls/4">TDE/ktorrent#4</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/libksquirrel/pulls/3">TDE/libksquirrel#3</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/rosegarden/pulls/4">TDE/rosegarden#4</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tellico/pulls/4">TDE/tellico#4</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdeaddons/pulls/13">TDE/tdeaddons#13</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdeartwork/pulls/21">TDE/tdeartwork#21</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebase/pulls/275">TDE/tdebase#275</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebindings/pulls/11">TDE/tdebindings#11</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdegraphics/pulls/47">TDE/tdegraphics#47</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdemultimedia/pulls/36">TDE/tdemultimedia#36</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdenetwork/pulls/45">TDE/tdenetwork#45</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdesdk/pulls/13">TDE/tdesdk#13</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdeutils/pulls/41">TDE/tdeutils#41</ulink>)</para></listitem>
+    <listitem><para>Improved API visualization (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/167">TDE/tdelibs#167</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/169">TDE/tdelibs#169</ulink>)</para></listitem>
+    <listitem><para>Use gender-neutral language (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebase/pulls/286">TDE/tdebase#286</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdepim/pulls/69">TDE/tdepim#69</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdemultimedia/pulls/37">TDE/tdemultimedia#37</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdegames/pulls/16">TDE/tdegames#16</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.0.13-bug-fixes">
+<title>Bug fixes</title>
+  <itemizedlist>
+    <listitem><para>Fixed opening of media:/ and system:/media/ URLs from non-TDE applications (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/157">TDE/tdelibs#157</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebase/issues/224">TDE/tdebase#224</ulink>)</para></listitem>
+    <listitem><para>Fixed compatibility with openSSL 3.0 API (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/175">TDE/tdelibs#175</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/177">TDE/tdelibs#177</ulink>)</para></listitem>
+    <listitem><para>Fixed display of TQMap/TQValueList in dcopclient (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/168">TDE/tdelibs#168</ulink>)</para></listitem>
+    <listitem><para>tdebindings: fixed FTBFS when tdehw is not present (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebindings/pulls/10">TDE/tdebindings#10</ulink>)</para></listitem>
+    <listitem><para>tqt3: fixed rendering of listviews with SGI widget style (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tqt3/pulls/64">TDE/tqt3#64</ulink>)</para></listitem>
+    <listitem><para>Fixed various FTBFS when building with clang</para></listitem>
+    <listitem><para>Fixed font styles detection in TDE font dialogs (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/164">TDE/tdelibs#164</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/koffice/pulls/24">TDE/koffice#24</ulink>)</para></listitem>
+    <listitem><para>tdeio-man: fixed visualization of man pages for TDE applications (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebase/pulls/274">TDE/tdebase#274</ulink>)</para></listitem>
+    <listitem><para>basket: fixed SEGV crash when moving new empty notes (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/basket/pulls/12">TDE/basket#12</ulink>)</para></listitem>
+    <listitem><para>kgtk-qt3: added support for gtk2 with glibc 2.34 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/kgtk-qt3/pulls/4">TDE/kgtk-qt3#4</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.0.13-security">
+<title>Security</title>
+  <itemizedlist>
+    <listitem><para>FISH protocol: security fix for CVE-2020-12755 (backport from KDE) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebase/pulls/282">TDE/tdebase#282</ulink>)</para></listitem>
+    <listitem><para>KMail: fixed vulnerability to EFAIL (backport from KDE) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdepim/pulls/22">TDE/tdepim#22</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdepim/pulls/70">TDE/tdepim#70</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.0.13-distro-support">
+<title>Distro support</title>
+  <itemizedlist>
+    <listitem><para>Gentoo: several improvements and addition to supported ebuilds</para></listitem>
+    <listitem><para>Ubuntu: dropped Groovy (20.10), added Kinetic (22.10)</para></listitem>
+    <listitem><para>Fedora: added support for <ulink url="http://mirror.ppa.trinitydesktop.org/trinity/rpm/f36">v36</ulink> and <ulink url="http://mirror.ppa.trinitydesktop.org/trinity/rpm/f37">37</ulink></para></listitem>
+    <listitem><para>Arch: added builds for arm64 and armhf</para></listitem>
+    <listitem><para>OpenSuSE: added support for <ulink url="http://mirror.ppa.trinitydesktop.org/trinity/rpm/opensuse15.4">15.4</ulink></para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.0.13-additional-info">
+<title>Additional info</title>
+  <itemizedlist>
+    <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.0.13">Full release notes on TDE wiki</ulink></para></listitem>
+    <listitem><para><ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/82">TGW issue list</ulink></para></listitem>
+    <listitem><para><ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.0.13">Detailed commit change log</ulink></para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.0.13-developers-info">
+<title>Additional info for developers/packagers</title>
+  <itemizedlist>
+    <listitem><para>Module version is now automatically added to tarball and detected by cmake at build time (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/scripts/pulls/4">TDE/scripts#4</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tde-common-cmake/pulls/84">TDE/tde-common-cmake#84</ulink>)</para></listitem>
+    <listitem><para>CMake Trinity's macros can now be used with pure TQt applications which require parsing of .ui files (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tde-common-cmake/pulls/85">TDE/tde-common-cmake#85</ulink>)</para></listitem>
+    <listitem><para>Modules converted to cmake:</para>
+      <itemizedlist>
+        <listitem><para>gtk3-tqt-engine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/gtk3-tqt-engine/pulls/2">TDE/gtk3-tqt-engine#2</ulink>)</para></listitem>
+        <listitem><para>tderadio (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tderadio/pulls/4">TDE/tderadio#4</ulink>)</para></listitem>
+        <listitem><para>koffice-i18n (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/koffice-i18n/pulls/1">TDE/koffice-i18n#1</ulink>)</para></listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem><para>Dropped autotools support for the following modules:</para>
+      <itemizedlist>
+        <listitem><para>rosegarden (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/rosegarden/pulls/5">TDE/rosegarden#5</ulink>)</para></listitem>
+        <listitem><para>tdeio-locate (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdeio-locate/pulls/2">TDE/tdeio-locate#2</ulink>)</para></listitem>
+        <listitem><para>k3b (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/k3b/pulls/19">TDE/k3b#19</ulink>)</para></listitem>
+        <listitem><para>tdepowersave (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdepowersave/pulls/10">TDE/tdepowersave#10</ulink>)</para></listitem>
+        <listitem><para>tastymenu (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tastymenu/pulls/3">TDE/tastymenu#3</ulink>)</para></listitem>
+        <listitem><para>gtk-qt-engine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/gtk-qt-engine/pulls/9">TDE/gtk-qt-engine#9</ulink>)</para></listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+</sect2>
+
+</sect1>
+
diff --git a/doc/khelpcenter/releasenotes/r14.1.x/CMakeLists.txt b/doc/khelpcenter/releasenotes/r14.1.x/CMakeLists.txt
new file mode 100644
index 000000000..124c38743
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.1.x/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION khelpcenter/releasenotes/r14.1.x )
diff --git a/doc/khelpcenter/releasenotes/r14.1.x/index.docbook b/doc/khelpcenter/releasenotes/r14.1.x/index.docbook
new file mode 100644
index 000000000..4f03b6ead
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.1.x/index.docbook
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+
+  <!ENTITY r14.1.00 SYSTEM "r14.1.00.docbook">
+  <!ENTITY r14.1.01 SYSTEM "r14.1.01.docbook">
+  <!ENTITY r14.1.02 SYSTEM "r14.1.02.docbook">
+]>
+
+<article id="release-notes-14-1-x" lang="&language;">
+<title>Release Notes for R14.1.x series</title>
+
+<articleinfo>
+<authorgroup>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<date>&tde-release-date;</date>
+<releaseinfo>&tde-release-version;</releaseinfo>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<!-- <legalnotice>&FDLNotice;</legalnotice> -->
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>release notes</keyword>
+<keyword>R14.1.x</keyword>
+</keywordset>
+
+</articleinfo>
+
+<!-- empty section to avoid the first docbook to be shown
+     as part of the index page, instead of just a link-->
+<sect1 id="release-notes-r14-1-x-introduction">
+<title></title>
+<para></para>
+</sect1>
+
+&r14.1.02;
+&r14.1.01;
+&r14.1.00;
+
+</article>
diff --git a/doc/khelpcenter/releasenotes/r14.1.x/r14.1.00.docbook b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.00.docbook
new file mode 100644
index 000000000..057131b3d
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.00.docbook
@@ -0,0 +1,194 @@
+<sect1 id="release-notes-r14.1.0">
+<title>R14.1.0 Release Notes</title>
+
+<para>This document tracks some of the most important changes introduced in release R14.1.0, which marks the switch from the old R14.0.x to the new R14.1.x series and therefore
+comes with a bigger list of changes.</para><para>Several items in this list refer to a multitude of commits, so direct link to them has not been provided to avoid cluttering the overall page. Please refer to the detailed commit <ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.1.0">change log</ulink> for further information.</para>
+<para>Additionally, the <ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.0">full release notes</ulink> on TDE wiki contains screenshots of some of the new features.</para>
+
+<sect2 id="release-notes-r14.1.0-new-applications">
+<title>New applications</title>
+  <itemizedlist>
+    <listitem><para>tdebluez: provides modern Bluetooth functionality (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebluez">TDE/tdebluez</ulink>)</para></listitem>
+    <listitem><para>kplayer: multimedia player with mplayer backend (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kplayer">TDE/kplayer</ulink>)</para></listitem>
+    <listitem><para>tdehwdevicetray: provides an easy access to storage devices and their operations</para></listitem>
+    <listitem><para>ksplash: added new Moodin-based theme "Architecture" (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=2553">bug 2553</ulink>)</para></listitem>
+    <listitem><para>icewm-based Helix theme (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeartwork/pulls/2">TDE/artwork#2</ulink>)</para></listitem>
+    <listitem><para>icewm-based Brise theme (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeartwork/pulls/6">TDE/artwork#6</ulink>) (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=2833">bug 2833</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-new-functionalities">
+<title>New functionalities</title>
+  <itemizedlist>
+    <listitem><para>Added support for Python 3 throughout TDE</para></listitem>
+    <listitem><para>Added support for LUKS disks. Common LUKS operations can now be handled via GUI, tdeio_media_mounthelper and DCOP calls</para></listitem>
+    <listitem><para>Added support for PKI (X.509, PKCS, cryptographic card devices) as part of tdehw library and libtdeldap</para></listitem>
+    <listitem><para>New notification interface for storage device plug/unplugged events (through tdehwdevicetray)</para></listitem>
+    <listitem><para>Expanded DCOP interface for mediamanager with several new fuctions available, which allow finer control over storage device operations</para></listitem>
+		<listitem><para>Added support for hybrid suspend (aka suspend to RAM + suspend to disk)</para></listitem>
+    <listitem><para>Ark: added support for lzip/tar-lzma files</para></listitem>
+    <listitem><para>tdelibs: added passive notification panel (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/commit/9cca7662">9cca7662</ulink>)</para></listitem>
+    <listitem><para>Added MIT license to the set of distributed licenses and new application to show TDE license information (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/197">TDE/tdelibs#197</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/318">TDE/tdebase#318</ulink>)</para></listitem>
+    <listitem><para>New "session panel" in Kate to ease managing multiple sessions and switching among them. Note: the format for save session files has changed, but existing session will transparently be imported and updated to the newer format </para></listitem>
+    <listitem><para>konqueror: added "double-click moves to parent folder" feature (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/commit/3aa5fc08">3aa5fc08</ulink>)</para></listitem>
+    <listitem><para>konqueror: new sorting/grouping actions for listviews</para></listitem>
+    <listitem><para>konqueror: added support for locale based file sorting</para></listitem>
+    <listitem><para>New TCC configuration module for Trash and additional options to control the trash size policy</para></listitem>
+    <listitem><para>KSSLCertificate: added CRL handling support</para></listitem>
+    <listitem><para>tdemultimedia/tdeutils: added initial basic support for PulseAudio</para></listitem>
+    <listitem><para>tdefilereplace: several new options and functions added (sorting results, max depth, save/restore search results and search strings)</para></listitem>
+    <listitem><para>krusader: added support for xz archives</para></listitem>
+    <listitem><para>kweather: added support for XDG icon names, revamped configuration dialog, add support for system icon theme  </para></listitem>
+    <listitem><para>ksnapshot: added option to view/edit the image in KolourPaint or in another application (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/pulls/50">TDE/tdegraphics#50</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-enhancements">
+<title>Enhancements</title>
+  <itemizedlist>
+    <listitem><para>Major rework of storage media handling code, providing improved support for LUKS disks, udisks2 and udevil and a consistent interface across TDE. </para></listitem>
+    <listitem><para>Enhanced taskbar setting GUI (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/266">TDE/tdebase#266</ulink>)</para></listitem>
+    <listitem><para>kate: added option to suppress 'Find in files' error dialog (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=1911">bug 1911</ulink>)</para></listitem>
+    <listitem><para>Added 'Delete Line' menu entry in Kate, KWrite and TDevelop (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=1907">bug 1907</ulink>)</para></listitem>
+    <listitem><para>Major enhancement of performances under specific heavy load tasks (for example Konqueror scanning huge folder structures) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/309">TDE/tdebase#309</ulink>)</para></listitem>
+    <listitem><para>kxkb: improved configuration dialog which simplifies setting keyboard shortcuts for layout switching (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/304">TDE/tdebase#304</ulink>)</para></listitem>
+    <listitem><para>dbus-1-tqt: vast improvements to dbusxml2qt3 tool and to the contents and usage of the generated code (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/dbus-1-tqt/pulls">dbus-1-tqt PRs</ulink>)</para></listitem>
+    <listitem><para>dbus-1-tqt: added generation of api documentation based on doxygen (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/dbus-1-tqt/pulls/10">TDE/dbus-1-tqt#10</ulink>)</para></listitem>
+    <listitem><para>kdcop: added double click functionality to expand/collapse non leaf items (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=2503">bug 2503</ulink>)</para></listitem>
+    <listitem><para>tqt3: new TQStringVariantMap type and iterators (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/commit/d795939c">d795939c</ulink>)</para></listitem>
+    <listitem><para>tqt3: added "operator[]" to TQPtrList (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/commit/6b220f98">6b220f98</ulink>)</para></listitem>
+    <listitem><para>Extended KEditListBox's API with new signals (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/commit/88413aaa">88413aaa</ulink> - commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/commit/fa49e53">fa49e53a</ulink>)</para></listitem>
+    <listitem><para>konsole: added support for mouse wheel events in the alternate screen, i.e. in applications such as vim, less, ... (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=2597">bug 2597</ulink>)</para></listitem>
+    <listitem><para>ksnapshot: remember window position before/after a snapshot is taken (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/issues/55">TDE/tdegraphics#55</ulink>)</para></listitem>
+    <listitem><para>ksmserver: added 'startupCompleted()' DCOP method to check when session restoration/creation has finished (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/commit/b45b9ed9">b45b9ed9</ulink>)</para></listitem>
+    <listitem><para>dolphin: fixed navigation through jar, txz and lzma archives (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/dolphin/issues/4">TDE/dolphin#4</ulink>)</para></listitem>
+    <listitem><para>knights: added additional theme pack (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=2663">bug 2663</ulink>)</para></listitem>
+    <listitem><para>tdenetwork: use standalone libvncserver for krfb and libvncclient for krdc</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-bug-fixes">
+<title>Bug fixes</title>
+  <itemizedlist>
+    <listitem><para>filelight: fixed SEGV caused by dereferencing null pointer (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/filelight/issues/3">TDE/filelight#3</ulink>)</para></listitem>
+    <listitem><para>gtk-tqt-engine: fixed crash when SESSION_MANAGER environment variable is not set (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gtk-qt-engine/commit/959798f45">959798f45</ulink>)</para></listitem>
+    <listitem><para>yakuake: fixed support for dcop calls with multiple terminals (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=2537">bug 2537</ulink>)</para></listitem>
+    <listitem><para>Fixed incorrect handling of certificate dates in viewer module (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/commit/a837e132">a837e132</ulink>)</para></listitem>
+    <listitem><para>tdefile: autocalculate folder size in KPropertiesDialog only for real local items (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/190">TDE/tdelibs#190</ulink>)</para></listitem>
+    <listitem><para>tdeprint: relaxed page orientation and size selection when an initial setting is already provided (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/194">TDE/tdelibs#194</ulink>)</para></listitem>
+    <listitem><para>Fixed mangling of '@' in KURL's pretty printing (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/issues/71">TDE/tdepim#71</ulink>)</para></listitem>
+    <listitem><para>kalarm: fixed problem with date/time selection for recurrent events (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=304">bug 304</ulink>)</para></listitem>
+    <listitem><para>kalarm: fixed long startup delay when autostarted at login (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=1610">bug 1610</ulink>)</para></listitem>
+    <listitem><para>konqueror: fixed SEGV when the KPropertiesDialog is opened on the root (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/310">TDE/tdebase#310</ulink>)</para></listitem>
+    <listitem><para>kmail: added menu options to toggle "Show Message Structure" (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/pulls/25">TDE/tdepim#25</ulink>)</para></listitem>
+    <listitem><para>kpdf: fixed issue with certain fonts not being correctly displayed (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/pulls/57">TDE/tdegraphics#57</ulink>)</para></listitem>
+    <listitem><para>tqscintilla: fixed SEGV at runtime caused by invalid platform detection at build time (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqscintilla/pulls/3">TDE/tqscintilla#3</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-renames-and-moves">
+<title>Renames and moves</title>
+  <itemizedlist>
+    <listitem><para>tdefilereplace has been moved from tdewebdev to tdeutils (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=767">bug 767</ulink>)</para></listitem>
+    <listitem><para>sip4-tqt: python module renamed to sip_tqt (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/sip4-tqt/pulls/2">TDE/sip4-tqt#2</ulink>)</para></listitem>
+    <listitem><para>sip4-tqt: entry step to rename qt* python modules to tqt* (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/sip4-tqt/pulls/10">TDE/sip4-tqt#10</ulink>)</para></listitem>
+    <listitem><para>pytqt: repository renamed from python-tqt to pytqt (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/pytqt">TDE/pytqt</ulink>)</para></listitem>
+    <listitem><para>pytqt: rename qt* python modules to tqt* (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/pytqt/pulls/13">TDE/pytqt#13</ulink>)</para></listitem>
+    <listitem><para>pytqt: renamed QScintilla to TQScintilla (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/pytqt/pulls/5">TDE/pytqt#5</ulink>)</para></listitem>
+    <listitem><para>pytqt: renamed python extension module from python_tqt to PyTQt (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/pytqt/pulls/12">TDE/pytqt#12</ulink>)</para></listitem>
+    <listitem><para>python-trinity repository renamed to pytde (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/pytde">TDE/pytde</ulink>)</para></listitem>
+    <listitem><para>tde-common-cmake moved from common to dependencies and renamed to tde-cmake (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-cmake">TDE/tde-cmake</ulink>)</para></listitem>
+    <listitem><para>tqt3: several QT_* macros have been renamed into TQT_* equivalents.</para></listitem>
+    <listitem><para>tqt3: IconView widget moved to src/widgets folder (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/commit/a41a0349">a41a0349</ulink>)</para></listitem>
+    <listitem><para>tqt3: removed dummy "int" parameter from "TQVariant(bool, int)" (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/commit/cfc76de7">cfc76de7</ulink>)</para></listitem>
+    <listitem><para>tqt3: renamed tqt-kde integration to tqt-tde (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/commit/a410cb03">a410cb03</ulink>)</para></listitem>
+    <listitem><para>tdelibs: tdehw lib is now built as a standalone library</para></listitem>
+    <listitem><para>tdeaddons: removed mediarealfolder konqueror plugin, which has been integrated into tdebase's media tdeioslave (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaddons/commit/025f091b">025f091b</ulink>)</para></listitem>
+    <listitem><para>renamed "Suspend to disk" to "Hibernate" and "Suspend to RAM" to "Suspend"</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-removed-applications">
+<title>Removed applications, code repositories or features</title>
+  <itemizedlist>
+    <listitem><para>Removed support for Python 2 throughout TDE</para></listitem>
+    <listitem><para>Removed any pending support for HAL</para></listitem>
+    <listitem><para>Removed the following modules: adept, libraries/mlt, libraries/mlt++, kpowersave, knetworkmanager8, tde-construct</para></listitem>
+    <listitem><para>Removed support for building using qt3. Now TDE only uses TQt3</para></listitem>
+    <listitem><para>tqt3: removed the following Qt2 classes (TQList/TQListIterator, TQStack, TQVector) and replaced them with TQt3 equivalent ones (TQPtrList/TQPtrListIterator, TQPtrStack, TQPtrVector). Also removed some old Qt1-related code.</para></listitem>
+    <listitem><para>kpdf: drop suport for t1lib (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/issues/39">TDE/tdegraphics#39</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-deprecated-applications">
+<title>Deprecated applications</title>
+  <para>These are no longer built by default and will be removed in R14.2.0</para>
+  <itemizedlist>
+    <listitem><para>tdegraphics: kmrml (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/commit/ff75de8d">ff75de8d</ulink>)</para></listitem>
+    <listitem><para>tdepim: kitchensync (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/commit/43f0ce5">43f0ce5</ulink>)</para></listitem>
+    <listitem><para>tqtinterface: this module is not deprecated but it will be merged with tqt3 in R14.2.0 and no longer required (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqtinterface">TDE/tqtinterface</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-distro-support">
+<title>Distro support</title>
+  <itemizedlist>
+    <listitem><para>Ubuntu: dropped Hirsute (21.04), added Lunar (23.04)</para></listitem>
+    <listitem><para>Raspbian: dropped raspbian-stretch</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-cmake-conversions">
+<title>CMake conversions and dropped autotools</title>
+  <itemizedlist>
+    <listitem><para>Modules converted to cmake:</para>
+      <itemizedlist>
+        <listitem><para>bibletime (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/bibletime/pulls/2">TDE/bibletime#2</ulink>)</para></listitem>
+        <listitem><para>desktop-effects-tde (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/desktop-effects-tde/pulls/3">TDE/desktop-effects-tde#3</ulink>)</para></listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+  <itemizedlist>
+    <listitem><para>Dropped autotools support for the following modules:</para>
+      <itemizedlist>
+        <listitem><para>bibletime (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/bibletime/pulls/3">TDE/bibletime#3</ulink>)</para></listitem>
+        <listitem><para>gtk3-tqt-engine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gtk3-tqt-engine/pulls/3">TDE/gtk3-tqt-engine#3</ulink>)</para></listitem>
+				<listitem><para>gwenview-i18n (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview-i18n/pulls/1">TDE/gwenview-i18n#1</ulink>)</para></listitem>
+				<listitem><para>kbfx (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kbfx/pulls/2">TDE/kbfx#2</ulink>)</para></listitem>
+        <listitem><para>kgtk-qt3 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kgtk-qt3/pulls/6">TDE/kgtk-qt3#6</ulink>)</para></listitem>
+				<listitem><para>kmymoney (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kmymoney/pulls/4">TDE/kmymoney#4</ulink>)</para></listitem>
+        <listitem><para>koffice-i18n (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/koffice-i18n/pulls/2">TDE/koffice-i18n#2</ulink>) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/koffice-i18n/pulls/3">TDE/koffice-i18n#3</ulink>)</para></listitem>
+				<listitem><para>konversation (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/konversation/pulls/3">TDE/konversation#3</ulink>)</para></listitem>
+				<listitem><para>kpilot (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kpilot/pulls/7">TDE/kpilot#7</ulink>)</para></listitem>
+        <listitem><para>tderadio (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tderadio/pulls/6">TDE/tderadio#6</ulink>)</para></listitem>
+				<listitem><para>tdesvn (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdesvn/pulls/7">TDE/tdesvn#7</ulink>)</para></listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-updating-from-r14.0.x">
+<title>Updating from R14.0.x</title>
+<para>There will be no more releases in the R14.0.x series, therefore you should consider switching to R14.1.x during the next TDE update. This will require updating the URL from which packages are downloaded and should be a relatively straight forward process.</para>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-additional-info">
+<title>Additional info</title>
+  <itemizedlist>
+    <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.0">Full release notes</ulink> on TDE wiki</para></listitem>
+    <listitem><para>TGW <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/3">issue list</ulink></para></listitem>
+    <listitem><para>Detailed commit <ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.1.0">change log</ulink></para></listitem>
+  </itemizedlist>
+</sect2>
+
+</sect1>
diff --git a/doc/khelpcenter/releasenotes/r14.1.x/r14.1.01.docbook b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.01.docbook
new file mode 100644
index 000000000..2e3803d32
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.01.docbook
@@ -0,0 +1,111 @@
+<sect1 id="release-notes-r14.1.1">
+<title>R14.1.1 Release Notes</title>
+
+<para>This document tracks some of the most important changes introduced in release R14.1.1, the first maintenance release of the R14.1.x series.</para>
+<para>The <ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.1">full release notes</ulink> on TDE wiki contains screenshots of some of the new features.</para>
+
+<sect2 id="release-notes-r14.1.1-new-applications">
+<title>New applications</title>
+  <itemizedlist>
+    <listitem><para>kommando: a "Neverwinter Nights"-like wheelmenu for TDE (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kommando">TDE/kommando</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.1-new-functionalities">
+<title>New functionalities and enhancements</title>
+  <itemizedlist>
+    <listitem><para>twin: added support for aerosnap-style window tiling, improved Active Border functionality and add Active Corners (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/331">TDE/tdebase#331</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/365">TDE/tdebase#365</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/371">TDE/tdebase#371</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/375">TDE/tdebase#375</ulink>)</para></listitem>
+    <listitem><para>konqueror: added option to enable/disable using double click to navitage to the parent folder (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/329">TDE/tdebase#329</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/341">TDE/tdebase#341</ulink>)</para></listitem>
+    <listitem><para>konqueror: extended 'double click to move to parent' functionality to iconview modes (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/386">TDE/tdebase#386</ulink>)</para></listitem>
+    <listitem><para>kxkb: re-added TDE shortcuts to switch keyboard layout forward or backward (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/342">TDE/tdebase#342</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/352">TDE/tdebase#352</ulink>)</para></listitem>
+    <listitem><para>kkbswitch: added global shortcuts for switching to previous/next group (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kkbswitch/issues/6">TDE/kkbswitch#6</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kkbswitch/pulls/7">TDE/kkbswitch#7</ulink>)</para></listitem>
+    <listitem><para>twin: added 'shade' to the left mouse button click menu for active windows in TCC module (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/337">TDE/tdebase#337</ulink>)</para></listitem>
+    <listitem><para>Offer all available options to set an image as background from Dolphin's action menu (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/dolphin/issues/17">TDE/dolphin#17</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/dolphin/pulls/18">TDE/dolphin#18</ulink>)</para></listitem>
+    <listitem><para>added a few new wallpapers (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeartwork/pulls/24">TDE/tdeartwork#24</ulink>)</para></listitem>
+    <listitem><para>added man pages for several TDE applications (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/ksquirrel/pulls/3">TDE/ksquirrel#3</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kmyfirewall/pulls/3">TDE/kmyfirewall#3</ulink>)</para></listitem>
+    <listitem><para>improved support for SunOS/Illumos/DilOS (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/131">TDE/tde#131</ulink>)</para></listitem>
+    <listitem><para>tdebluez: added API documentation (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebluez/pulls/23">TDE/tdebluez#23</ulink>)</para></listitem>
+    <listitem><para>added link to TDE release notes to khelpcenter home page (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/332">TDE/tdebase#332</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/353">TDE/tdebase#353</ulink>)</para></listitem>
+    <listitem><para>kmix: improved Preferences dialog (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/pulls/35">TDE/tdemultimedia#35</ulink>)</para></listitem>
+    <listitem><para>tdebase: updated currency for European countries that have switched to euro (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/137">TDE/tde#137</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/385">TDE/tdebase#385</ulink>)</para></listitem>
+    <listitem><para>tdepowersave: made brightness percentage control more accurate (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepowersave/pulls/17">TDE/tdepowersave#17</ulink>)</para></listitem>
+    <listitem><para>kmilo: improve brightness OSD feedback by displaying the actual value (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeutils/pulls/55">TDE/tdeutils#55</ulink>)</para></listitem>
+    <listitem><para>amarok: avoid double logarithmic volume scaling when using libxine >= 1.2.13 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/issues/40">TDE/tdemultimedia#40</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/amarok/pulls/46">TDE/amarok#46</ulink>)</para></listitem>
+    <listitem><para>add logarithmic volume control to kaffeine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kaffeine/pulls/22">TDE/kaffeine#22</ulink>) and codeine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/pulls/9">TDE/codeine#9</ulink>)</para></listitem>
+    <listitem><para>replace three dot ellipsis with equally spaced ellipsis (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/394">TDE/tdebase#394</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.1-bug-fixes">
+<title>Bug fixes</title>
+  <itemizedlist>
+    <listitem><para>fixed high CPU/slow speed issue observed in some RPM distros with R14.1.0 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/128">TDE/tde#128</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/pulls/75">TDE/tqt3#75</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/206">TDE/tdelibs#206</ulink>)</para></listitem>
+    <listitem><para>tdepowersave: fixed high CPU/slow speed issue observed in some hardware when autodimm was enabled (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/136">TDE/tde#136</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepowersave/pulls/14">TDE/tdepowersave#14</ulink>)</para></listitem>
+    <listitem><para>arts: fixed crash on TDE startup (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/arts/issues/5">TDE/arts#5</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/arts/pulls/11">TDE/arts#11</ulink>, <ulink url="https://bugs.pearsoncomputing.net/show_bug.cgi?id=3042">bug 3042</ulink>)</para></listitem>
+    <listitem><para>tqt3: fixed support for recursive mutexes (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/pulls/68">TDE/tqt3#68</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/pulls/72">TDE/tqt3#72</ulink>, <ulink url="http://bugs.trinitydesktop.org/show_bug.cgi?id=2462">bug 2462</ulink>, <ulink url="http://bugs.trinitydesktop.org/show_bug.cgi?id=2526">bug 2526</ulink>)</para></listitem>
+    <listitem><para>chalk: fixed SEGV when loading a PNG previously created from the same application (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/koffice/issues/20">TDE/koffice#20</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/koffice/pulls/34">TDE/koffice#34</ulink>)</para></listitem>
+    <listitem><para>tdebase: fixed kcheckpass support for shadow passwords without PAM (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/354">TDE/tdebase#354</ulink>)</para></listitem>
+    <listitem><para>tdelibs: fixed intentation when displaying API documentation code (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/207">TDE/tdelibs#207</ulink>)</para></listitem>
+    <listitem><para>tdetoys: fixed pixelated icons bug in KWeather (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdetoys/issues/19">TDE/tdetoys#19</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdetoys/pulls/22">TDE/tdetoys#22</ulink>)</para></listitem>
+    <listitem><para>fixed image conversion naming of files with multiple dots in the name (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/376">TDE/tdebase#376</ulink>) in konqueror (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaddons/pulls/18">TDE/tdeaddons#18</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaddons/pulls/20">TDE/tdeaddons#20</ulink>) and dolphin (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/dolphin/pulls/19">TDE/dolphin#19</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/dolphin/pulls/21">TDE/dolphin#21</ulink>)</para></listitem>
+    <listitem><para>fixed value returned by 'brightnessGet' DCOP call (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepowersave/pulls/15">TDE/tdepowersave#15</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeutils/pulls/53">TDE/tdeutils#53</ulink>)</para></listitem>
+    <listitem><para>added support for libexiv2 0.28.0 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libkexiv2/issues/3">TDE/libkexiv2#3</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libkexiv2/pulls/4">TDE/libkexiv2#4</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview/issues/7">TDE/gwenview#7</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview/pulls/8">TDE/gwenview#8</ulink>)</para></listitem>
+    <listitem><para>aligned string hashing function to upstream `gettext` code to ensure translation strings are correctly found (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/228">TDE/tdelibs#228</ulink>)</para></listitem>
+    <listitem><para>k3b: fixed detection and linking of taglib (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k3b/pulls/30">TDE/k3b#30</ulink>)</para></listitem>
+    <listitem><para>codeine: fixed volume slider functionality (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/pulls/8">TDE/codeine#8</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.1-distro-support">
+<title>Distro support</title>
+  <itemizedlist>
+    <listitem><para>This is the last version to support Debian Stretch and Ubuntu Xenial. From R14.1.2, package builds for those versions won't be avaiable</para></listitem>
+    <listitem><para>Added support for Debian Bookworm and Ubuntu Mantic</para></listitem>
+    <listitem><para>Removed support for Ubuntu Impish</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.1-cmake-conversions">
+<title>CMake conversions</title>
+  <itemizedlist>
+    <listitem><para>libksquirrel (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libksquirrel/pulls/5">TDE/libksquirrel#5</ulink>)</para></listitem>
+    <listitem><para>k9copy (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k9copy/pulls/13">TDE/k9copy#13</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.1-dropped-code-applications">
+<title>Drop code/applications</title>
+  <itemizedlist>
+    <listitem><para>Dropped old Qt1/Qt2 stuff which does not affect public API (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/130">TDE/tde#130</ulink>)</para></listitem>
+    <listitem><para>Dropped Qt4 specific stuff which does not affect public API (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdevelop/pulls/21">TDE/tdevelop#21</ulink>)</para></listitem>
+    <listitem><para>Dropped autotools support for various modules (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libltdl/pulls/3">TDE/libltdl#3</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/keximdb/pulls/3">TDE/keximdb#3</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/desktop-effects-tde/pulls/7">TDE/desktop-effects</ulink>)</para></listitem>
+    <listitem><para>Dropped support for building in Symbian OS (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/amarok/pulls/45">TDE/amarok#45</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/pulls/85">TDE/tdepim#85</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/222">TDE/tdelibs#222</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.1-info-developers">
+<title>Info for developers/packagers</title>
+  <itemizedlist>
+    <listitem><para>Added support for creating tarballs from head on a git tag (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/scripts/pulls/6">TDE/scripts#6</ulink>)</para></listitem>
+    <listitem><para>Partial work on merging tqtinterface into tqt3. Changes do not affect any API (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/135">TDE/tde#135</ulink>)</para></listitem>
+    <listitem><para>tde-admin-common: added support for auto MOC-ing of classes using TQ_OBJECT (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-common-admin/pulls/17">TDE/tde-common</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.1-additional-info">
+<title>Additional info</title>
+  <itemizedlist>
+    <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.1">Full release notes</ulink> on TDE wiki</para></listitem>
+    <listitem><para>TGW <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/121">issue list</ulink></para></listitem>
+    <listitem><para>Detailed commit <ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.1.1">change log</ulink></para></listitem>
+  </itemizedlist>
+</sect2>
+
+</sect1>
diff --git a/doc/khelpcenter/releasenotes/r14.1.x/r14.1.02.docbook b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.02.docbook
new file mode 100644
index 000000000..e4ea66b86
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.02.docbook
@@ -0,0 +1,129 @@
+<sect1 id="release-notes-r14.1.2">
+<title>R14.1.2 Release Notes</title>
+
+<para>This document tracks some of the most important changes introduced in release R14.1.2, the second maintenance release of the R14.1.x series.</para>
+<para>The <ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.2">full release notes</ulink> on TDE wiki contains screenshots of some of the new features.</para>
+
+<sect2 id="release-notes-r14.1.2-new-applications">
+<title>New applications</title>
+  <itemizedlist>
+    <listitem><para>tde-style-polyester: a widget style and TWin decoration aimed to be a good balance between eye candy and simplicity (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-style-polyester">TDE/tde-style-polyester</ulink>)</para></listitem>
+    <listitem><para>twin-style-fahrenheit: a nice TWin style decoration from the KDE 3.2 days (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-fahrenheit">TDE/twin-style-fahrenheit</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.2-new-functionalities">
+<title>New functionalities and enhancements</title>
+  <itemizedlist>
+    <listitem><para>ksnapshot: added delay functionality to 'Region' mode (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/issues/71">TDE/tdegraphics#71</ulink>)</para></listitem>
+    <listitem><para>ksnapshot: add `setPixmap` DCOP call to allow setting the pixmap remotely (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/issues/77">TDE/tdegraphics#77</ulink>)</para></listitem>
+    <listitem><para>tdebase: added six new color schemes (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/403">TDE/tdebase#403</ulink>)</para></listitem>
+    <listitem><para>tdebase: added GUI option to choose between standard and Ubuntu-style shutdown dialog (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/468">TDE/tdebase#468</ulink>)</para></listitem>
+    <listitem><para>twin: access window tiling via DCOP (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/436">TDE/tdebase#436</ulink>)</para></listitem>
+    <listitem><para>tdeioslave/sftp: overhaul of authentication methods (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/443">TDE/tdebase#443</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/447">TDE/tdebase#447</ulink>)</para></listitem>
+    <listitem><para>konsole: added ability to reset tab color to default (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/issues/217">TDE/tdelibs#217</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/379">TDE/tdebase#379</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/issues/133">TDE/tdelibs#133</ulink>)</para></listitem>
+    <listitem><para>kmix: new system tray icons reflecting current volume level (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/issues/31">TDE/tdemultimedia#31</ulink>)</para></listitem>
+    <listitem><para>tde-ia-ora: five new styles based on GTK engine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-style-ia-ora/issues/10">TDE/tde-style-ia-ora#10</ulink>)</para></listitem>
+    <listitem><para>kstreamripper: various improvements to logic and GUI (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/151">TDE/tde#151</ulink>)</para></listitem>
+    <listitem><para>tqt3: added support for HistoryBack and HistoryForward buttons (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/98">TDE/tqt3#98</ulink>)</para></listitem>
+    <listitem><para>kxkb: added notification for keyboard layout switch (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/438">TDE/tdebase#438</ulink>)</para></listitem>
+    <listitem><para>kxkb: utilize translations provided by xkeyboard-config if available (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/449">TDE/tdebase#449</ulink>)</para></listitem>
+    <listitem><para>kmail: added ability to open the HTML body of an email in an external browser (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/issues/94">TDE/tdepim#94</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/issues/103">TDE/tdepim#103</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/issues/114">TDE/tdepim#114</ulink>)</para></listitem>
+    <listitem><para>tdelibs: improved kdirlister functionality for remote folders (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/issues/259">TDE/tdelibs#259</ulink>)</para></listitem>
+    <listitem><para>gwenview: added option to allow avoiding loading of metadata (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview/issues/22">TDE/gwenview#22</ulink>)</para></listitem>
+    <listitem><para>zeroconf ioslave: added support for SFTP servers (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork/issues/75">TDE/tdenetwork#75</ulink>)</para></listitem>
+    <listitem><para>tqtinterface: added missing `inputmethod` files (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqtinterface/issues/21">TDE/tqtinterface#21</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqtinterface/issues/24">TDE/tqtinterface#24</ulink>)</para></listitem>
+    <listitem><para>added support for python 3.12 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/150">TDE/tde#150</ulink>)</para></listitem>
+    <listitem><para>added support for libpoppler 24.02 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/issues/85">TDE/tdegraphics#85</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/issues/86">TDE/tdegraphics#86</ulink>)</para></listitem>
+    <listitem><para>added support for taglib 2 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/162">TDE/tde#162</ulink>)</para></listitem>
+    <listitem><para>quanta: added support for libxml2-2.12.0 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdewebdev/issues/42">TDE/tdewebdev#42</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdewebdev/issues/43">TDE/tdewebdev#43</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.2-bug-fixes">
+<title>Bug fixes</title>
+  <itemizedlist>
+    <listitem><para>tqt3: several memory leak fixes and other small changes (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/130">TDE/tqt3#130</ulink>)</para></listitem>
+    <listitem><para>kicker's quicklauncher: empty urls are ignored (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/418">TDE/tdebase#418</ulink>)</para></listitem>
+    <listitem><para>noatun: fixed crash when empty items were found in the playlist (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/issues/53">TDE/tdemultimedia#53</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/issues/54">TDE/tdemultimedia#54</ulink>)</para></listitem>
+    <listitem><para>kaffeine (with xine backend): fixed file filters in 'Open dialog' from second opening onwards (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/issues/58">TDE/tdemultimedia#58</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kaffeine/issues/27">TDE/kaffeine#27</ulink>)</para></listitem>
+    <listitem><para>twin: fixed resizing issues with various Virtual Terminal based applications (xfce and mate terminals, gvim) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/57">TDE/tde#57</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/384">TDE/tdebase#384</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/411">TDE/tdebase#411</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/431">TDE/tdebase#431</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/434">TDE/tdebase#434</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/437">TDE/tdebase#437</ulink>)</para></listitem>
+    <listitem><para>twin: fixed functionality of `showWindowMenuAt` DCOP call (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/433">TDE/tdebase#433</ulink>)</para></listitem>
+    <listitem><para>twin: fixed startup crash when `Active borders` are set to `Switch desktop` (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/455">TDE/tdebase#455</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/464">TDE/tdebase#464</ulink>)</para></listitem>
+    <listitem><para>kdiff3: fixed pasting UTF8 text from clipboard (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kdiff3/issues/14">TDE/kdiff3#14</ulink>)</para></listitem>
+    <listitem><para>tdm (debian-like distros): prevent unwanted restarting of service during upgrade (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/409">TDE/tdebase#409</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/issues/263">TDE/tde-packaging#263</ulink>)</para></listitem>
+    <listitem><para>kmplayer: solved crash on opening of settings dialog when building without xine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kmplayer/issues/14">TDE/kmplayer#14</ulink>)</para></listitem>
+    <listitem><para>kmilo: fixed regression affecting brightness value shown on OSD feedback (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeutils/issues/68">TDE/tdeutils#68</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeutils/issues/69">TDE/tdeutils#69</ulink>)</para></listitem>
+    <listitem><para>fixed tqdesigner and tdevelop crashes caused by invalid pointers (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/97">TDE/tqt3#97</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/99">TDE/tqt3#99</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdevelop/issues/35">TDE/tdevelop#35</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdevelop/issues/40">TDE/tdevelop#40</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdevelop/issues/41">TDE/tdevelop#41</ulink>)</para></listitem>
+    <listitem><para>tde-guidance: fixed functionality of mountconfig module (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-guidance/issues/11">TDE/tde-guidance#11</ulink>)</para></listitem>
+    <listitem><para>kmix: fixed problem causing kmix (and possible other programs) to be unable to run after installation (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/issues/29">TDE/tdemultimedia#29</ulink>)</para></listitem>
+    <listitem><para>tdelibs: fixed detection of removable devices with recent linux kernels (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/148">TDE/tde#148</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/issues/248">TDE/tdelibs#248</ulink>)</para></listitem>
+    <listitem><para>krfb: fixed crash on VNC client disconnection (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libtdevnc/issues/2">TDE/libtdevnc#2</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libtdevnc/issues/10">TDE/libtdevnc#10</ulink>, <ulink url="https://bugs.pearsoncomputing.net/show_bug.cgi?id=2972">bug 2972</ulink>)</para></listitem>
+    <listitem><para>kxkb: fixed bug which was causing the loss of `setxkbmap` options already set (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/391">TDE/tdebase#391</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/451">TDE/tdebase#451</ulink>)</para></listitem>
+    <listitem><para>korganizer: do not add unnecessary quotes around Organizer and Attendees (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/issues/108">TDE/tdepim#108</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/issues/109">TDE/tdepim#109</ulink>)</para></listitem>
+    <listitem><para>gwenview: fixed opening correct file over ftp protocol (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview/issues/20">TDE/gwenview#20</ulink>)</para></listitem>
+      </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.2-distro-support">
+<title>Distro support</title>
+  <itemizedlist>
+    <listitem><para>Dropped Debian Stretch and Ubuntu Xenial (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/issues/257">TDE/tde-packaging#257</ulink>)</para></listitem>
+    <listitem><para>Added support for Ubuntu Noble (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/issues/264">TDE/tde-packaging#264</ulink>)</para></listitem>
+    <listitem><para>Added Fedora 40 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/169">TDE/tde#169</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.2-cmake-conversions">
+<title>CMake conversions</title>
+  <itemizedlist>
+    <listitem><para>gwenview (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview/issues/30">TDE/gwenview#30</ulink>)</para></listitem>
+    <listitem><para>smb4k (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/smb4k/issues/13">TDE/smb4k#13</ulink>)</para></listitem>
+    <listitem><para>soundkonverter (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/soundkonverter/issues/13">TDE/soundkonverter#13</ulink>)</para></listitem>
+    <listitem><para>tde-guidance (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-guidance/issues/13">TDE/tde-guidance#13</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.2-dropped-code-applications">
+<title>Drop code/applications</title>
+  <itemizedlist>
+    <listitem><para>Dropped autotools support for various modules (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k9copy/issues/20">TDE/k9copy#20</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libksquirrel/issues/11">TDE/libksquirrel#11</ulink>)</para></listitem>
+    <listitem><para>tde-guidance: removed grubconfig and wineconfig modules (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-guidance">TDE/tde-guidance#12</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.2-info-developers">
+<title>Info for developers/packagers</title>
+  <itemizedlist>
+    <listitem><para>Partial work on merging tqtinterface into tqt3. Changes do not affect any API (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/145">TDE/tde#145</ulink>)</para></listitem>
+    <listitem><para>debian-like distros: changed debhelper compatibility level to 10 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/issues/255">TDE/tde-packaging#255</ulink>)</para></listitem>
+    <listitem><para>minimum cmake version raised from 3.1 to 3.5</para></listitem>
+    <listitem><para>uncrustify-trinity has been updated to upstream version 0.78.1 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/extra-dependencies/issues/12">TDE/extra-dependencies#12</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/extra-dependencies/issues/13">TDE/extra-dependencies#13</ulink>)</para></listitem>
+    <listitem><para>libr: removed libglade related code, updated library version to 0.7.0 and .so binary version to 1.0.0 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libr/issues/11">TDE/libr#11</ulink>)</para></listitem>
+    <listitem><para>libr for debian like distros: libr0 package has been upgraded to libr1 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/issues/262">TDE/tde-packaging#262</ulink>)</para></listitem>
+    <listitem><para>libr: made dependency upon gtk optional (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libr/issues/12">TDE/libr#12</ulink>)</para></listitem>
+    <listitem><para>DEB: automatically add ldconfig trigger if the package contains plugins (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/issues/266">TDE/tde-packaging#266</ulink>)</para></listitem>
+    <listitem><para>tdebase: dependency on libssh is now associated to sftp building option (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/441">TDE/tdebase#441</ulink>)</para></listitem>
+    <listitem><para>kdbusnotification: allow to specify the path of `dbus-binding-tool` using a cmake define (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kdbusnotification/issues/7">TDE/kdbusnotification#7</ulink>)</para></listitem>
+    <listitem><para>scripts: removed `astyle` files (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/scripts/issues/7">TDE/scripts#7</ulink>)</para></listitem>
+    <listitem><para>`auto_ptr` has been replaced by modern and supported alternatives (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/157">TDE/tde#157</ulink>)</para></listitem>
+    <listitem><para>tqt3: fixed building with `_FORTIFY_SOURCE=3` (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/70">TDE/tqt3#70</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/100">TDE/tqt3#100</ulink>)</para></listitem>
+    <listitem><para>tqt3: allow to build with `-no-thread` option (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/120">TDE/tqt3#120</ulink>)</para></listitem>
+    <listitem><para>tqt3: enable thread support by default (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/122">TDE/tqt3#122</ulink>)</para></listitem>
+    <listitem><para>tde-cmake: set cmake minimum version in a centralized place (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/164">TDE/tde#164</ulink>)</para></listitem>
+    <listitem><para>added support for 64bit `time_t` on deb-based 32-bit distros (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/issues/281">TDE/tde-packaging#281</ulink>)</para></listitem>
+    <listitem><para>fix building with c++17 standard (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/168">TDE/tde#168</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.2-additional-info">
+<title>Additional info</title>
+  <itemizedlist>
+    <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.2">Full release notes (with screenshots)</ulink> on TDE wiki</para></listitem>
+    <listitem><para><ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/144">This release notes</ulink> on TGW</para></listitem>
+    <listitem><para>TGW <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/143">issue and PR list</ulink></para></listitem>
+    <listitem><para>Detailed commit <ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.1.2">change log</ulink></para></listitem>
+  </itemizedlist>
+</sect2>
+
+</sect1>
diff --git a/doc/khelpcenter/releasenotes/r14.2.x/CMakeLists.txt b/doc/khelpcenter/releasenotes/r14.2.x/CMakeLists.txt
new file mode 100644
index 000000000..51db5fe0c
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.2.x/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION khelpcenter/releasenotes/r14.2.x )
diff --git a/doc/khelpcenter/releasenotes/r14.2.x/index.docbook b/doc/khelpcenter/releasenotes/r14.2.x/index.docbook
new file mode 100644
index 000000000..c318f144a
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.2.x/index.docbook
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+
+  <!ENTITY r14.2.00 SYSTEM "r14.2.00.docbook">
+]>
+
+<article id="release-notes-14.2-x" lang="&language;">
+<title>Release Notes for R14.2.x series</title>
+
+<articleinfo>
+<authorgroup>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<date>&tde-release-date;</date>
+<releaseinfo>&tde-release-version;</releaseinfo>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<!-- <legalnotice>&FDLNotice;</legalnotice> -->
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>release notes</keyword>
+<keyword>R14.2.x</keyword>
+</keywordset>
+
+</articleinfo>
+
+<!-- empty section to avoid the first docbook to be shown
+     as part of the index page, instead of just a link-->
+<sect1 id="release-notes-r14.2-x-introduction">
+<title></title>
+<para></para>
+</sect1>
+
+&r14.2.00;
+
+</article>
diff --git a/doc/khelpcenter/releasenotes/r14.2.x/r14.2.00.docbook b/doc/khelpcenter/releasenotes/r14.2.x/r14.2.00.docbook
new file mode 100644
index 000000000..3b1c31ea7
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.2.x/r14.2.00.docbook
@@ -0,0 +1,6 @@
+<sect1 id="release-notes-r14.2.0">
+<title>R14.2.0 Release Notes (draft)</title>
+
+<para>The ongoing temporary list of changes introduced by this release can be found <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/125">here</ulink>.</para>
+
+</sect1>
diff --git a/doc/khelpcenter/userguide/switching-sessions.docbook b/doc/khelpcenter/userguide/switching-sessions.docbook
index 0c15df8e1..3d38adb9c 100644
--- a/doc/khelpcenter/userguide/switching-sessions.docbook
+++ b/doc/khelpcenter/userguide/switching-sessions.docbook
@@ -5,9 +5,9 @@
 <para>From version 3.3 onwards, &tde; provides a session management
 system which allows you to switch between different user account on
 one computer. You can stay logged in and &eg; let your sister,
-brother, wife, neigbour or whoever read her or his emails just for a
+brother, wife, neigbour or whoever read their emails just for a
 moment. Before you had to log off (therefore &eg; close programs or
-save documents) and let her or him log in.</para>
+save documents) and let them log in.</para>
 
 <para>Now it's almost as easy as switching to another virtual desktop.</para>
 
@@ -36,8 +36,8 @@ submenu.</para>
 <varlistentry>
 <term>Switch User with the screensaver</term>
 <listitem><para>If you have activated your screensaver and another user
-wants to log in she or he can simply press the <guibutton>Switch
-User...</guibutton> button and log into another session.</para>
+wants to log in, they can simply press the <guibutton>Switch User...</guibutton>
+button and log into another session.</para>
 </listitem>
 </varlistentry>
 
diff --git a/doc/khelpcenter/userguide/under-the-hood.docbook b/doc/khelpcenter/userguide/under-the-hood.docbook
index 0f7dbe111..923ecba46 100644
--- a/doc/khelpcenter/userguide/under-the-hood.docbook
+++ b/doc/khelpcenter/userguide/under-the-hood.docbook
@@ -53,7 +53,7 @@ which are in in the file <filename>kmailrc</filename>).
 
 <para>So why would you want to touch the configuration files at all? Well, first you need it
 when you want to enforce the KIOSK mode. Perhaps a developer has asked you
-to add an entry to help him to solve a problem with the application. Perhaps you want to recover from
+to add an entry to help them to solve a problem with the application. Perhaps you want to recover from
 a problem without having to remove all the <filename
 class="directory">.kde</filename> directory. Perhaps you want to learn more
 about the depths of &tde;.</para>
diff --git a/doc/khelpcenter/welcome.docbook b/doc/khelpcenter/welcome.docbook
index b408e625d..73719b6fb 100644
--- a/doc/khelpcenter/welcome.docbook
+++ b/doc/khelpcenter/welcome.docbook
@@ -9,6 +9,9 @@
 <para>The Trinity team welcomes you to user-friendly &UNIX; desktop computing.</para>
 
 <sect1 id="welcome-information-about-tde">
+<title></title>
+
+<sect2 id="welcome-to-tde-section">
 <title>Information about &tde;</title>
 
 <para>The Trinity Desktop Environment (&tde;) is a graphical desktop environment for &UNIX; workstations. The
@@ -26,10 +29,7 @@ professional graphical design along with the technical advantages of
 
 <para><link linkend="support">Supporting the &tde; Project</link></para>
 
-</sect1>
-
-<sect1 id="welcome-getting-the-most-out-of-tde">
-<title>Getting the most out of &tde;</title>
+</sect2>
 
 <sect2 id="welcome-general-documentation">
 <title>General documentation</title>
@@ -42,15 +42,5 @@ professional graphical design along with the technical advantages of
 
 </sect2>
 
-<sect2 id="welcome-basic-applications">
-<title>Basic applications</title>
-
-<para><ulink url="help:/kicker">Desktop Panel (Kicker)</ulink></para>
-
-<para><ulink url="help:/kcontrol">Control Center</ulink></para>
-
-<para><ulink url="help:/konqueror">File Manager</ulink></para>
-
-</sect2>
 </sect1>
 </chapter>
diff --git a/doc/khelpcenter/whatistde.docbook b/doc/khelpcenter/whatistde.docbook
index b93bab5dd..bc094ea40 100644
--- a/doc/khelpcenter/whatistde.docbook
+++ b/doc/khelpcenter/whatistde.docbook
@@ -19,7 +19,7 @@ flow philosophy.</para>
 version 3.5, originally written by the KDE Team, a world-wide network of
 software engineers committed to Free Software development. This group's
 major goal in free software development is to provide high quality software
-that empowers the user with easy control of his computer's resources.</para>
+that empowers the user with easy control of their computer's resources.</para>
 
 <para>The &tde; developers continue the tradition of KDE 3.5.</para>
 
diff --git a/doc/kompmgr/index.docbook b/doc/kompmgr/index.docbook
index 62eb11377..85498153d 100644
--- a/doc/kompmgr/index.docbook
+++ b/doc/kompmgr/index.docbook
@@ -182,7 +182,7 @@ fix this.</para>
 
 <sect1 id="shadows">
 <title>Shadows</title>
-<para>Why should anyone want his windows to throw shadows? Well, maybe just
+<para>Why should anyone want their windows to throw shadows? Well, maybe just
 because it looks cute, or because it allows a better window separation,
 or... because it looks cute!</para> 
 <variablelist>
diff --git a/doc/konqueror/commands.docbook b/doc/konqueror/commands.docbook
index e34e13253..d6ab43668 100644
--- a/doc/konqueror/commands.docbook
+++ b/doc/konqueror/commands.docbook
@@ -549,19 +549,147 @@ viewing a folder in Icon Mode.</para></listitem>
 <varlistentry>
 <term><menuchoice>
 <guimenu>View</guimenu>
+<guimenuitem>Show Hidden Files</guimenuitem>
+</menuchoice></term>
+<listitem><para>Show hidden (dot) files.</para></listitem>
+</varlistentry>
+
+
+<varlistentry>
+
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guisubmenu>Sort</guisubmenu>
+</menuchoice></term>
+<listitem>
+
+<para>In
+<emphasis role="bold">Icon View</emphasis> or
+<emphasis role="bold">MultiColumn View</emphasis>:
+Choose order in which items are presented in the window.
+</para>
+
+<para>In
+<emphasis role="bold">Detailed List View</emphasis>,
+<emphasis role="bold">Tree View</emphasis>,
+<emphasis role="bold">Text View</emphasis> or
+<emphasis role="bold">Info List View</emphasis>:
+Access the following sort options &amp; actions submenu.
+<variablelist>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Alt;<keycap>1</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guisubmenu>Sort</guisubmenu>
+<guimenuitem>Unicode based</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+Sort file names in numeric Unicode character codepoint order.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Alt;<keycap>2</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guisubmenu>Sort</guisubmenu>
+<guimenuitem>Unicode based, case-insensitive</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+This is a <guimenuitem>Unicode based</guimenuitem> sort, modified so
+that upper and lower case alphabetic character variants sort together.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Alt;<keycap>3</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guisubmenu>Sort</guisubmenu>
+<guimenuitem>Locale based</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+Sort file names according to the rules of the current locale.
+The current locale can be displayed using the command
+<literal>`locale | grep COLL`</literal>.
+If the value of <literal>'LC_COLLATE'</literal> is either
+<literal>'C'</literal> or <literal>'POSIX'</literal>, then the
+sort order will be identical to <guimenuitem>Unicode based</guimenuitem>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>F</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
 <guisubmenu>Sort</guisubmenu>
+<guimenuitem>Group Directories First</guimenuitem>
 </menuchoice></term>
-<listitem><para>Choose order in which items are presented in the
-window when in Icon or MultiColumn View mode.</para></listitem>
+<listitem><para>
+Folders will be listed <emphasis>before</emphasis> non-folders,
+regardless of sort column and order.
+</para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>H</keycap></keycombo>
+</shortcut><guimenu>View</guimenu>
+<guisubmenu>Sort</guisubmenu>
+<guimenuitem>Group Hidden First</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+If "hidden" files and folders are visible, they will be listed
+<emphasis>before</emphasis> non-hidden files and folders,
+regardless of sort column and order.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>
+</shortcut>
 <guimenu>View</guimenu>
-<guimenuitem>Case Insensitive Sort</guimenuitem>
+<guisubmenu>Sort</guisubmenu>
+<guimenuitem>Alternate Sort Order</guimenuitem>
 </menuchoice></term>
-<listitem><para>Choose whether the sort order in Tree, Detailed List
-or Text View modes is case sensitive.</para></listitem>
+<listitem><para>
+Users may sort the list in different ways by clicking on different
+columns. This action allows one to toggle sorting between the two
+most recently clicked sort columns without using the mouse.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guisubmenu>Sort</guisubmenu>
+<guimenuitem>Reverse Sort Order</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+Toggle between ascending and descending ordering of current sort
+column without using the mouse.
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+</para>
+</listitem>
+
 </varlistentry>
 
 <varlistentry>
@@ -641,14 +769,6 @@ MultiColumn View modes.</para></listitem>
 <varlistentry>
 <term><menuchoice>
 <guimenu>View</guimenu>
-<guimenuitem>Show Hidden Files</guimenuitem>
-</menuchoice></term>
-<listitem><para>Show hidden (dot) files.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><menuchoice>
-<guimenu>View</guimenu>
 <guimenuitem>Show details...</guimenuitem>
 </menuchoice></term>
 <listitem><para>Lets you choose which file and folder details are
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook
index 5f3350c77..08ca89534 100644
--- a/doc/ksplashml/index.docbook
+++ b/doc/ksplashml/index.docbook
@@ -607,7 +607,7 @@ follows:</para>
 
 <programlisting>
 DCOPClient *c = kapp-&gt;dcopClient();
-QString error;
+TQString error;
 QCString KSplashName;
 int pid = 0;
 QStringList args;
@@ -644,10 +644,10 @@ data))
 <para>Whenever you want to display a message with or without an icon, use</para>
 
 <programlisting>
-    arg &lt;&lt; QString("iconName") &lt;&lt; QString("programName") &lt;&lt;
-QString("Some description");
+    arg &lt;&lt; TQString("iconName") &lt;&lt; TQString("programName") &lt;&lt;
+TQString("Some description");
     if (!(c-&gt;send(KSplashName, "KSplashIface",
-"programStarted(QString,QString,QString)", data))
+"programStarted(TQString,TQString,TQString)", data))
     {
       // Some error processing here.
     }
@@ -791,7 +791,7 @@ functions <function>slotSetText</function>,
 <function>slotSetPixmap</function>, <function>slotUpdateProgress</function> and
 <function>slotUpdateSteps</function> to make it usable.</para></listitem>
 <listitem><para>The constructor should take the form
-<literal>ThemeEngine( QWidget *parent, const char *name, const QStringList
+<literal>ThemeEngine( TQWidget *parent, const char *name, const QStringList
 &amp;args )</literal>
 so that it can be used with
 <classname>KGenericFactory</classname>.</para></listitem>
@@ -822,7 +822,7 @@ class RotWidget;
 
 class Cfg2k: public ThemeEngineConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Cfg2k( TDEConfig * );
 };
@@ -830,13 +830,13 @@ public:
 class ObjKsTheme;
 class Theme2k: public ThemeEngine
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
-  Theme2k( QWidget *, const char *, const QStringList&amp; );
+  Theme2k( TQWidget *, const char *, const QStringList&amp; );
 
-  inline const QString name()
+  inline const TQString name()
   {
-    return( QString("KSplash2k") );
+    return( TQString("KSplash2k") );
   }
   inline const KDialogBase *config( TDEConfig *kc )
   {
@@ -853,7 +853,7 @@ public:
   };
 
 public slots:
-  inline void slotSetText( const QString&amp; s )
+  inline void slotSetText( const TQString&amp; s )
   {
     if( mText &amp;&amp; mText-&gt;text() != s ) mText-&gt;setText( s );
   };
@@ -864,9 +864,9 @@ private:
 
   QLabel *mText;
   RotWidget *mRotator;
-  QColor mTBgColor, mTFgColor, mRotColor1, mRotColor2, mStatusColor;
+  TQColor mTBgColor, mTFgColor, mRotColor1, mRotColor2, mStatusColor;
   int mRotSpeed;
-  QString mWndTitle, mLogoFile;
+  TQString mWndTitle, mLogoFile;
 };
 
 #endif
@@ -878,7 +878,7 @@ the naming conventions, and is inherited from
 <classname>ThemeEngine</classname>. It provides
 a <methodname>Theme2k::names()</methodname>, and has a constructor that takes
 the required
-parameters: <function>Theme2k( QWidget *, const char *, const QStringList&amp;
+parameters: <function>Theme2k( TQWidget *, const char *, const QStringList&amp;
 );</function>
 and also provides a simple <methodname>Theme2k::slotSetText()</methodname>
 method. For the moment,
@@ -913,7 +913,7 @@ straightforward.</para>
 <example>
 <title>Plugin constructor</title>
 <programlisting>
-Theme2k::Theme2k( QWidget *parent, const char *name, const QStringList &amp;args
+Theme2k::Theme2k( TQWidget *parent, const char *name, const QStringList &amp;args
  )
     :ThemeEngine( parent, name, args )
 {
@@ -938,10 +938,10 @@ void Theme2k::readSettings()
   if( !cfg )
     return;
 
-  cfg-&gt;setGroup( QString("KSplash Theme: %1").arg(mTheme-&gt;theme()) );
+  cfg-&gt;setGroup( TQString("KSplash Theme: %1").arg(mTheme-&gt;theme()) );
 
-  QColor DefaultTBgColor( Qt::darkBlue );
-  QColor DefaultTFgColor( Qt::white );
+  TQColor DefaultTBgColor( TQt::darkBlue );
+  TQColor DefaultTFgColor( TQt::white );
 
   mTBgColor = cfg-&gt;readColorEntry( "Title Background Color",
 &amp;DefaultTBgColor );
@@ -949,14 +949,14 @@ void Theme2k::readSettings()
 &amp;DefaultTFgColor );
   mStatusColor = cfg-&gt;readColorEntry("Status Text Color", &amp;mTBgColor );
 
-  QColor DefaultRot1( Qt::darkBlue );
-  QColor DefaultRot2( Qt::cyan );
+  TQColor DefaultRot1( TQt::darkBlue );
+  TQColor DefaultRot2( TQt::cyan );
   mRotColor1 = cfg-&gt;readColorEntry( "Rotator Color 1", &amp;DefaultRot1 );
   mRotColor2 = cfg-&gt;readColorEntry( "Rotator Color 2", &amp;DefaultRot2 );
 
   mRotSpeed = cfg-&gt;readNumEntry( "Rotator Speed", 30 );
   mWndTitle = cfg-&gt;readEntry( "Window Title", i18n("Please wait...") );
-  mLogoFile = cfg-&gt;readEntry( "Logo File", QString::null );
+  mLogoFile = cfg-&gt;readEntry( "Logo File", TQString::null );
 }
 </programlisting>
 </example>
@@ -1112,7 +1112,7 @@ K_EXPORT_COMPONENT_FACTORY( ksplash2k, KGenericFactory&lt;Theme2k&gt; );
 Cfg2k::Cfg2k( TDEConfig * )
 {}
 
-Theme2k::Theme2k( QWidget *parent, const char *name, const QStringList &amp;args
+Theme2k::Theme2k( TQWidget *parent, const char *name, const QStringList &amp;args
  )
     :ThemeEngine( parent, name, args )
 {
@@ -1134,10 +1134,10 @@ void Theme2k::initUi()
   lbl-&gt;setPaletteForegroundColor( mTFgColor );
 
   QLabel *logo = new QLabel( vbox );
-  logo-&gt;setPalette( Qt::white );
+  logo-&gt;setPalette( TQt::white );
 
-  QString px( locate( "appdata", mTheme-&gt;themeDir() +
-(mLogoFile.isNull()?QString("/Logo.png"):mLogoFile) ) );
+  TQString px( locate( "appdata", mTheme-&gt;themeDir() +
+(mLogoFile.isNull()?TQString("/Logo.png"):mLogoFile) ) );
   if (px.isNull())
     px = locate("appdata","Themes/Default/splash_top.png");
   if( !px.isNull() )
@@ -1178,10 +1178,10 @@ void Theme2k::readSettings()
   if( !cfg )
     return;
 
-  cfg-&gt;setGroup( QString("KSplash Theme: %1").arg(mTheme-&gt;theme()) );
+  cfg-&gt;setGroup( TQString("KSplash Theme: %1").arg(mTheme-&gt;theme()) );
 
-  QColor DefaultTBgColor( Qt::darkBlue );
-  QColor DefaultTFgColor( Qt::white );
+  TQColor DefaultTBgColor( TQt::darkBlue );
+  TQColor DefaultTFgColor( TQt::white );
 
   mTBgColor = cfg-&gt;readColorEntry( "Title Background Color",
 &amp;DefaultTBgColor );
@@ -1189,14 +1189,14 @@ void Theme2k::readSettings()
 &amp;DefaultTFgColor );
   mStatusColor = cfg-&gt;readColorEntry("Status Text Color", &amp;mTBgColor );
 
-  QColor DefaultRot1( Qt::darkBlue );
-  QColor DefaultRot2( Qt::cyan );
+  TQColor DefaultRot1( TQt::darkBlue );
+  TQColor DefaultRot2( TQt::cyan );
   mRotColor1 = cfg-&gt;readColorEntry( "Rotator Color 1", &amp;DefaultRot1 );
   mRotColor2 = cfg-&gt;readColorEntry( "Rotator Color 2", &amp;DefaultRot2 );
 
   mRotSpeed = cfg-&gt;readNumEntry( "Rotator Speed", 30 );
   mWndTitle = cfg-&gt;readEntry( "Window Title", i18n("Please wait...") );
-  mLogoFile = cfg-&gt;readEntry( "Logo File", QString::null );
+  mLogoFile = cfg-&gt;readEntry( "Logo File", TQString::null );
 }
 </programlisting>
 </sect1>
@@ -1216,11 +1216,11 @@ void Theme2k::readSettings()
 /**
  * @short Display a rotating-gradient widget.
  */
-class 	RotWidget: public QWidget
+class 	RotWidget: public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
-  RotWidget( QWidget *, const QColor&amp;, const QColor&amp;, int );
+  RotWidget( TQWidget *, const TQColor&amp;, const TQColor&amp;, int );
   ~RotWidget();
 
 private slots:
@@ -1231,7 +1231,7 @@ protected:
   void	paintEvent( QPaintEvent * );
   void	resizeEvent( QResizeEvent * );
 
-  QColor m_color1, m_color2;
+  TQColor m_color1, m_color2;
   int m_step, m_speed;
   QTimer *m_stepTimer;
 
@@ -1255,9 +1255,9 @@ protected:
 #include "rotwidget.h"
 #include "rotwidget.moc"
 
-RotWidget::RotWidget( QWidget *parent, const QColor&amp; c1, const QColor&amp;
+RotWidget::RotWidget( TQWidget *parent, const TQColor&amp; c1, const TQColor&amp;
 c2, int sp )
-    :QWidget(parent), m_color1(c1), m_color2(c2), m_step(0), m_speed(sp)
+    :TQWidget(parent), m_color1(c1), m_color2(c2), m_step(0), m_speed(sp)
 {
   if( (m_speed &lt;= 0) || (m_speed &gt; 20) )
     m_speed = 1;
@@ -1267,7 +1267,7 @@ c2, int sp )
     preparePixmap( i );
 
   m_stepTimer = new QTimer( this );
-  connect(m_stepTimer, SIGNAL(timeout()), this, SLOT(stepEvent()));
+  connect(m_stepTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(stepEvent()));
   m_stepTimer-&gt;start( 50 );
 }
 
@@ -1296,7 +1296,7 @@ void RotWidget::paintEvent( QPaintEvent *pe )
     bitBlt( this, r.x(), r.y(), m_stepPixmap.at( m_step ), r.x(), r.y(),
 r.width(), r.height() );
   else
-    p.fillRect( rect(), Qt::black );
+    p.fillRect( rect(), TQt::black );
   p.end();
 }
 
diff --git a/doc/kwrite/index.docbook b/doc/kwrite/index.docbook
index 08a3e3bca..b21989121 100644
--- a/doc/kwrite/index.docbook
+++ b/doc/kwrite/index.docbook
@@ -567,8 +567,8 @@ The toolbar, which is located at the top of the dialog, has left and
 right arrow buttons that let the user move back and forth through
 previously selected folders as well as an up arrow button for moving
 up the folder tree. The button with the little house takes the user
-to his or her home folder and the one with the two arrows curved in
-on each other updates the view of the current folder. The flag button
+to their home folder and the one with the two arrows curved in on
+each other updates the view of the current folder. The flag button
 lets the user set a new bookmark at the current folder or go to one
 that was previously set.
 </para>
@@ -1690,7 +1690,7 @@ a key combination for the command in question by means of the check boxes and
 key button. For example, with the About &tde; command selected in the display
 window, the user could select &Ctrl; and <keycap>Alt</keycap>, click on  the key
 button, and then press the <keycap>K</keycap> key on the keyboard.  This would
-mean that anytime he or she held down the &Ctrl; and  <keycap>Alt</keycap>
+mean that anytime they held down the &Ctrl; and  <keycap>Alt</keycap>
 buttons and pressed <keycap>K</keycap> (while using
 &kwrite;) the About &tde; display box would be called.</para>
 </listitem>
@@ -1822,7 +1822,7 @@ along the bottom of the box the user can control the process.
 </para>
 
 <para>
-She or he may invoke the <guilabel>Help</guilabel> system, accept the
+They may invoke the <guilabel>Help</guilabel> system, accept the
 current settings and close the dialog by means of the
 <guibutton>OK</guibutton> button, or <guibutton>Cancel</guibutton> the
 process. The categories <guilabel>Colors</guilabel>,
@@ -2623,7 +2623,7 @@ follows:</para>
 <para>
 The user can configure the default appearance for
 particular items. This would allow a programmer to more easily identify
-different items (types of entries) in his or her code.
+different items (types of entries) in their code.
 </para>
 
 <variablelist>
diff --git a/doc/man/appletproxy.1 b/doc/man/appletproxy.1
new file mode 100644
index 000000000..3ab13208f
--- /dev/null
+++ b/doc/man/appletproxy.1
@@ -0,0 +1,163 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH APPLETPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel applet proxy"
+.SH NAME
+appletproxy
+\- TDE kicker panel applet proxy
+.SH SYNOPSIS
+\fBappletproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
+.SH DESCRIPTION
+\fBappletproxy\fP is a small application that allows you to run a kicker applet outside of \fBkicker\fP itself. The applet will appear in it's own window, making this a convenient way to debug panel applets.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B desktopfile
+The applet's desktop file
+.SS 
+.SS Options:
+.TP
+.B  \-\-configfile  <file>
+The config file to be used
+.TP
+.B  \-\-callbackid  <id>
+DCOP callback id of the applet container
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS
+.SH FILES
+\fI/usr/share/apps/kicker/applets\fP
+kicker applets directory
+.SH SEE ALSO
+\fBkicker\fP(1), \fBextensionproxy\fP(1)
+.SH AUTHORS
+.nf
+Matthias Elter <elter@kde.org>
+.br
+Matthias Ettrich <ettrich@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/drkonqi.1 b/doc/man/drkonqi.1
new file mode 100644
index 000000000..987164834
--- /dev/null
+++ b/doc/man/drkonqi.1
@@ -0,0 +1,175 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH DRKONQI 1 "June 2006" "Trinity Desktop Environment" "TDE crash handler"
+.SH NAME
+drkonqi
+\- TDE crash handler gives the user feedback if a program crashed
+.SH SYNOPSIS
+\fBdrkonqi\fP [Qt\-options] [TDE\-options] [options] 
+.SH DESCRIPTION
+The TDE crash handler gives the user feedback if a program crashed.
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-signal  <number>
+The signal number that was caught
+.TP
+.B  \-\-appname  <name>
+Name of the program
+.TP
+.B  \-\-apppath  <path>
+Path to the executable
+.TP
+.B  \-\-appversion  <version>
+The version of the program
+.TP
+.B  \-\-bugaddress  <address>
+The bug address to use
+.TP
+.B  \-\-programname  <name>
+Translated name of the program
+.TP
+.B  \-\-pid  <pid>
+The PID of the program
+.TP
+.B  \-\-startupid  <id>
+Startup ID of the program
+.TP
+.B  \-\-tdeinit  
+The program was started by tdeinit
+.TP
+.B  \-\-safer  
+Disable arbitrary disk access
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+Hans Petter Bieker <bieker@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/extensionproxy.1 b/doc/man/extensionproxy.1
new file mode 100644
index 000000000..4ea041189
--- /dev/null
+++ b/doc/man/extensionproxy.1
@@ -0,0 +1,163 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH EXTENSIONPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel extension proxy"
+.SH NAME
+extensionproxy
+\- TDE kicker panel extension proxy
+.SH SYNOPSIS
+\fBextensionproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
+.SH DESCRIPTION
+\fBextensionproxy\fP is a small application that allows you to run a kicker extension outside of \fBkicker\fP itself.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B desktopfile
+The extension's desktop file
+.SS 
+.SS Options:
+.TP
+.B  \-\-configfile  <file>
+The config file to be used
+.TP
+.B  \-\-callbackid  <id>
+DCOP callback id of the extension container
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS
+.SH FILES
+\fI/usr/share/apps/kicker/extensions\fP
+kicker extensions directory
+.SH SEE ALSO
+\fBkicker\fP(1), \fBappletproxy\fP(1)
+.SH AUTHORS
+.nf
+Matthias Elter <elter@kde.org>
+.br
+Matthias Ettrich <ettrich@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/gentdmconf.1 b/doc/man/gentdmconf.1
new file mode 100644
index 000000000..d98e166c2
--- /dev/null
+++ b/doc/man/gentdmconf.1
@@ -0,0 +1,91 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH GENTDMCONF 1 "June 2006" "Trinity Desktop Environment" "generate configuration files for tdm"
+.SH NAME
+gentdmconf
+\- generate configuration files for tdm
+.SH SYNOPSIS
+\fBgentdmconf\fP
+.RB [ \-\-in
+.IR /path/to/new/tdm\-config\-dir ]
+.RS 11
+.RB [ \-\-old\-xdm
+.IR /path/to/old/xdm\-dir ]
+.br
+.RB [ \-\-old\-kde
+.IR /path/to/old/kde\-config\-dir ]
+.br
+.RB [ \-\-no\-old ]
+.RB [ \-\-no\-old\-xdm ]
+.RB [ \-\-no\-old\-kde ]
+.RB [ \-\-old\-scripts ]
+.br
+.RB [ \-\-no\-old\-scripts ]
+.RB [ \-\-old\-confs ]
+.RB [ \-\-no\-backup ]
+.br
+.RB [ \-\-no\-in\-notice ]
+.RE
+
+.SH DESCRIPTION
+\fBgentdmconf\fP is used to generate configuration files for \fBtdm\fP.
+.br
+If an older xdm/tdm configuration is found, its config files are "absorbed";
+if it lives in the new target directory, its scripts are reused (and possibly
+modified) as well, otherwise the scripts are ignored and default scripts are
+installed.
+.SH OPTIONS
+.TP
+.BI \-\-in \ /path/to/new/tdm\-config\-dir
+In which directory to put the new configuration. You can use this to support a $(DESTDIR), but not to change the final location of the installation \- the paths inside the files are not affected.
+.br
+Default is \fI/etc/trinity/tdm\fP.
+.TP
+.BI \-\-old\-xdm \ /path/to/old/xdm\-dir
+Where to look for the config files of an \fBxdm\fP / older \fBtdm\fP. Default is to scan
+.IR /etc/X11/tdm , \ $XLIBDIR/tdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ;
+there in turn look for \fItdm\-config\fP and \fIxdm\-config\fP.
+.br
+Note that you possibly need to use \fB\-\-no\-old\-kde\fP to make this take effect.
+.TP
+.BI \-\-old\-kde \ /path/to/old/kde\-config\-dir
+Where to look for the \fItdmrc\fP of an older \fBtdm\fP.
+.br
+.RI Default\ is\ to\ scan\  /etc/trinity \ and\ { /usr,/usr/local ,
+.RI { /opt,/usr/local }{ trinity,kde,kde2,kde1 }} /share/config .
+.TP
+.B \-\-no\-old
+Don't look at older xdm/tdm configurations, just create default config.
+.TP
+.B \-\-no\-old\-xdm
+Don't look at older xdm configurations.
+.TP
+.B \-\-no\-old\-kde
+Don't look at older tdm configurations.
+.TP
+.B \-\-old\-scripts
+Directly use all scripts from the older xdm/tdm configuration.
+.TP
+.B \-\-no\-old\-scripts
+Don't use scripts from the older xdm/tdm configuration even if it lives in the new target directory.
+.TP
+.B \-\-old\-confs
+Directly use all ancillary config files from the older xdm/tdm configuration. This is usually a bad idea.
+.TP
+.B \-\-no\-backup
+Overwrite/delete old config files instead of backing them up.
+.TP
+.B \-\-no\-in\-notice
+Don't put the notice about \fB\-\-in\fP being used into the generated README.
+.SH SEE ALSO
+.BR tdm (1)
+.SH AUTHORS
+.nf
+Oswald Buddenhagen <ossi@kde.org>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/kappfinder.1 b/doc/man/kappfinder.1
new file mode 100644
index 000000000..ec8eae964
--- /dev/null
+++ b/doc/man/kappfinder.1
@@ -0,0 +1,54 @@
+.TH KAPPFINDER 1 "August, 24 2003"
+.SH NAME
+kappfinder \- searches for program to add to the Kde menu
+.SH SYNOPSIS
+.B kappfinder
+.RI [ options ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kappfinder
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBkappfinder\fP is a program that searches your system for applications that can be inserted in the TDE menu, but that are not yet there. User can then select individually each of them and choose whether to add them.
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
+.B \-\-dir directory
+Use this option to set where the .desktop files will be installed (default is $(HOME)/.trinity/share/applnk
+
+.SH SEE ALSO
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
+.SH AUTHOR
+This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
+for the Debian GNU/Linux project (but may be used by others).
+.PP
+kappfinder was written by the KDE project
diff --git a/doc/man/kasbar.1 b/doc/man/kasbar.1
new file mode 100644
index 000000000..7d57958d2
--- /dev/null
+++ b/doc/man/kasbar.1
@@ -0,0 +1,148 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KASBAR 1 "June 2006" "Trinity Desktop Environment" "An alternative task manager"
+.SH NAME
+kasbar
+\- An alternative task manager
+.SH SYNOPSIS
+\fBkasbar\fP [Qt\-options] [TDE\-options] [options] 
+.SH DESCRIPTION
+The \fBKasBar\fP is an iconic replacement of the taskbar. It always shows the icons of all currently running applications on any desktop, they can be chosen by clicking with the left mouse button. The active window is highlighted, minimized windows will show a little triangle pointing downwards instead of the square in the lower right of the icons. A triangle pointing to the right indicates that the application is shaded.
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-test  
+Test the basic kasbar code
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS 
+
+.SH SEE ALSO
+\fBkicker\fP(1)
+.SH AUTHORS
+.nf
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/kate.1 b/doc/man/kate.1
new file mode 100644
index 000000000..e48268d6f
--- /dev/null
+++ b/doc/man/kate.1
@@ -0,0 +1,83 @@
+.TH KATE 1 "May 2006"
+.SH NAME
+kate \- TDE Advanced Text Editor
+.SH SYNOPSIS
+.B kate
+.RI [ options ] [file(s)]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kate
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBkate\fP is a powerful text editor for TDE. It allows multiple documents (MDI interface), syntax coloration for many languages, ...
+
+It is able to expand or collapse parts of code (C functions, ...), can handle complete projects, and includes a terminal emulator.
+
+Kate is primarily intended for developers but can be used by anyone. It will for example be very useful to edit configuration files for example.
+
+It can handle plugins to expand its capabilities (more languages support, vim/Emacs compatibility, ...)
+
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
+.B \-s, \-\-start <name>
+Start Kate with a given session
+.TP
+.B \-u, \-\-use
+Use a already running kate instance (if possible)
+.TP
+.B \-p, \-\-pid <pid>
+Only try to reuse kate instance with this pid
+.TP
+.B \-e, \-\-encoding <name>
+Set encoding for the file to open
+.TP
+.B \-l, \-\-line <line>
+Navigate to this line
+.TP
+.B \-c, \-\-column <column>
+Navigate to this column
+.TP
+.B \-i, \-\-stdin
+Read the contents of stdin
+.TP
+.B file(s)
+is the file or the files to open
+
+.SH SEE ALSO
+.BR kwrite (1)
+.PP
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
+.SH AUTHOR
+This manual page was written by Clement Stenac <zorglub@via.ecp.fr>, for Debian GNU/Linux, but may be used by others.
+.PP
+kate was written by the KDE project
diff --git a/doc/man/kblankscrn.kss.1 b/doc/man/kblankscrn.kss.1
new file mode 100644
index 000000000..46b2d4e1a
--- /dev/null
+++ b/doc/man/kblankscrn.kss.1
@@ -0,0 +1,156 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KBLANKSCRN.KSS 1 "June 2006" "Trinity Desktop Environment" "TDE screen saver"
+.SH NAME
+kblankscrn.kss
+\- TDE screensaver which shows a blank screen
+.SH SYNOPSIS
+\fBkblankscrn.kss\fP [Qt\-options] [TDE\-options] [options] 
+.SH DESCRIPTION
+\fBKBlankScreen\fP is a screensaver which shows a blank screen.
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-setup  
+Setup screen saver
+.TP
+.B  \-\-window\-id  wid
+Run in the specified XWindow
+.TP
+.B  \-\-root  
+Run in the root XWindow
+.TP
+.B  \-\-demo  
+Start screen saver in demo mode [default]
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+The KDE Project <www.kde.org>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/kcheckpass.1 b/doc/man/kcheckpass.1
new file mode 100644
index 000000000..fa5a4c817
--- /dev/null
+++ b/doc/man/kcheckpass.1
@@ -0,0 +1,49 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH  KCHECKPASS 1 "June 2006" "Trinity Desktop Environment" "authentication software"
+.SH NAME
+kcheckpass
+\- The KCheckPass authentication software
+.SH SYNOPSIS
+\fBkcheckpass\fP
+.SH DESCRIPTION
+\fBKCheckPass\fP is TDE's authentication program. It is meant to be
+used by any software in need of user authentication, most
+notably screensavers.
+.sp 1
+It enhances security be the following means:
+.br
+.IP "     \-"
+It's only a small program, which is hopefully simple enough to
+allow it to be SUID root. Setting it to SUID root is necessary
+on Shadow Password systems.
+.IP "     \-"
+No other program in need of user authentication, must be
+SUID root.
+.IP "     \-"
+It provides a single implementation to check passwords. So one only must take a closer look at \fBKCheckPass\fP to ensure password security. It's much easier for programs using \fBKCheckPass\fP to preserve security.
+.PP
+.br
+\fBTechnique:\fP
+.sp 1
+\fBKCheckPass\fP is a simple password checker. Just invoke and send it the password on stdin.
+.sp 1
+If the password was accepted, the program exits with 0;
+.br
+if it was rejected, it exits with 1. Any other exit code signals an error.
+
+.SH AUTHORS
+.nf
+Olaf Kirch <okir@caldera.de>
+.br
+Christian Esken <esken@kde.org>
+.br
+Oswald Buddenhagen <ossi@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/kcminit.1 b/doc/man/kcminit.1
new file mode 100644
index 000000000..4c557456e
--- /dev/null
+++ b/doc/man/kcminit.1
@@ -0,0 +1,153 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KCMINIT 1 "June 2006" "Trinity Desktop Environment" "Trinity Control Modules initialization"
+.SH NAME
+kcminit
+\- runs startups initialization for Control Modules.
+.SH SYNOPSIS
+\fBkcminit\fP [Qt\-options] [TDE\-options] [options] module 
+.SH DESCRIPTION
+\fBkcminit\fP runs startups initialization for Control Modules.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B module
+Configuration module to run
+.SS Options:
+.TP
+.B  \-\-list  
+List modules that are run at startup
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+Matthias Hoelzer\-Kluepfel <hoelzer@kde.org>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/kdcop.1 b/doc/man/kdcop.1
new file mode 100644
index 000000000..1c01dcc47
--- /dev/null
+++ b/doc/man/kdcop.1
@@ -0,0 +1,159 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KDCOP 1 "June 2006" "Trinity Desktop Environment" "A graphical DCOP browser/client"
+.SH NAME
+kdcop
+\- A graphical DCOP browser/client
+.SH SYNOPSIS
+\fBkdcop\fP [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+\fBkdcop\fP is a browser/executor for DCOP. It queries the DCOP clients in a system,
+their interfaces, and the interfaces' arguments. You can even execute DCOP
+calls by double\-clicking on a call. If the method has parameters, \fBkdcop\fP will
+open a dialog and prompt you for them. If the method returns a return value,
+you will see it in a message box after the call.
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/kdcop/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/kdcop/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Matthias Kalle Dalheimer <kalle@kde.org>
+.br
+Rik Hemsley <rik@kde.org>
+.br
+Ian Reinhart Geiser <geiseri@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/kdialog.1 b/doc/man/kdialog.1
new file mode 100644
index 000000000..243709ed1
--- /dev/null
+++ b/doc/man/kdialog.1
@@ -0,0 +1,209 @@
+.TH KDIALOG "1" "December 2002" "TDE" "TDE Application"
+.SH NAME
+kdialog \- Show TDE dialog boxes from shell scripts
+.SH SYNOPSIS
+.B kdialog
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIarg\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kdialog
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+.B kdialog
+allows to display dialog boxes from shell scripts.
+The syntax is very much inspired from the 
+.B dialog
+command
+(which shows text mode dialogs).
+.SH OPTIONS
+.TP
+.BI \-\-yesno " text"
+Question message box with yes/no buttons
+.TP
+.BI \-\-yesnocancel " text"
+Question message box with yes/no/cancel buttons
+.TP
+.BI \-\-warningyesno " text"
+Warning message box with yes/no buttons
+.TP
+.BI \-\-warningcontinuecancel " text"
+Warning message box with continue/cancel buttons
+.TP
+.BI \-\-warningyesnocancel " text"
+Warning message box with yes/no/cancel buttons
+.TP
+.BI \-\-sorry " text"
+\&'Sorry' message box
+.TP
+.BI \-\-error " text"
+\&'Error' message box
+.TP
+.BI \-\-msgbox " text"
+Message Box dialog
+.TP
+.BI \-\-inputbox " text init"
+Input Box dialog
+.TP
+.BI \-\-password " text"
+Password dialog
+.TP
+.RI \fB\-\-textbox\fP \ file " [" width "] [" height ]
+Text Box dialog
+.TP
+.RI \fB\-\-menu\fP \ text " [" "tag item" "] [" "tag item" "] ..."
+Menu dialog
+.TP
+.RI \fB\-\-checklist\fP \ text " [" "tag item status" "] ..."
+Check List dialog
+.TP
+.RI \fB\-\-radiolist\fP " text" " [" "tag item status" "] ..."
+Radio List dialog
+.TP
+.BI \-\-title " text"
+Dialog title
+.TP
+.B \-\-separate\-output
+Return list items on separate lines (for checklist option)
+.SS "Arguments:"
+.TP
+arg
+Arguments - depending on main option
+.SS "Generic options:"
+.TP
+.B \-\-help
+Show help about options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-tde
+Show TDE specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+.B \-\-license
+Show license information
+.TP
+.B \-\-
+End of options
+.SS "Qt options:"
+.TP
+.BI \-\-display \ displayname
+Use the X-server display \fIdisplayname\fP.
+.TP
+.BI \-\-session \ sessionId
+Restore the application for the given \fIsessionId\fP.
+.TP
+.B \-\-cmap
+Causes the application to install a private color
+map on an 8-bit display.
+.TP
+.BI \-\-ncols \ count
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+running under a debugger can cause an implicit
+.B \-nograb, use \fB\-dograb\fR to override.
+.TP
+.B \-\-sync
+switches to synchronous mode for debugging.
+.TP
+.BI "\-\-fn\fR, \fP\-\-font" \ fontname
+defines the application font.
+.TP
+.BI "-\-bg\fR, \fB\-\-background"  \ color
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
+sets the default foreground color.
+.TP
+.BI \-\-btn\fR, \fB\-\-button \ color
+sets the default button color.
+.TP
+.BI \-\-name \ name
+sets the application name.
+.TP
+.BI \-\-title \ title
+sets the application title (caption).
+.TP
+.B \-\-visual TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display.
+.TP
+.BI \-\-inputstyle \ inputstyle
+sets XIM (X Input Method) input style. Possible
+values are 
+.BR onthespot ", " overthespot ", " offthespot and root .
+.TP
+.BI \-\-im " XIM-server"
+set XIM server.
+.TP
+.B \-\-noxim
+disable XIM.
+.TP
+.B \-\-reverse
+mirrors the whole layout of widgets.
+.SS "TDE options:"
+.TP
+.BI \-\-caption \ caption
+Use \fIcaption\fP as name in the titlebar.
+.TP
+.BI \-\-icon \ icon
+Use \fIicon\fP as the application icon.
+.TP
+.BI \-\-miniicon \ icon
+Use \fIicon\fP as the icon in the titlebar.
+.TP
+.BI \-\-config \ filename
+Use alternative configuration file.
+.TP
+.BI \-\-dcopserver \ server
+Use the DCOP Server specified by \fIserver\fP.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.BI \-\-style \ style
+sets the application GUI style.
+.TP
+.BI \-\-geometry \ geometry
+sets the client geometry of the main widget.
+.SH AUTHOR
+KDialog was written by
+.nh
+.ad l
+David Faure <faure@kde.org>,
+Nick Thompson,
+Nick Thompson,
+Matthias Hoelzer <hoelzer@kde.org> and
+David Gumbel <david.guembel@gmx.net>.
+.br
+.hy
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+.ad l
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/keditbookmarks.1 b/doc/man/keditbookmarks.1
new file mode 100644
index 000000000..23606dccb
--- /dev/null
+++ b/doc/man/keditbookmarks.1
@@ -0,0 +1,181 @@
+.\" This file was generated by kdemangen.pl
+.TH KEDITBOOKMARKS 1 "Jan 2005" "Trinity Desktop Environment" "Konqueror Bookmarks Editor"
+.SH NAME
+keditbookmarks
+- Konqueror Bookmark Editor
+.SH SYNOPSIS
+keditbookmarks [Qt-options] [TDE-options] [options] [file] 
+.SH DESCRIPTION
+Bookmark editor for TDE.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B file
+File to edit
+.SS Options:
+.TP
+.B  --importmoz  <filename>
+Import bookmarks from a file in Mozilla format
+.TP
+.B  --importns  <filename>
+Import bookmarks from a file in Netscape (4.x and earlier) format
+.TP
+.B  --importie  <filename>
+Import bookmarks from a file in Internet Explorer's Favorites format
+.TP
+.B  --importopera  <filename>
+Import bookmarks from a file in Opera format
+.TP
+.B  --exportmoz  <filename>
+Export bookmarks to a file in Mozilla format
+.TP
+.B  --exportns  <filename>
+Export bookmarks to a file in Netscape (4.x and earlier) format
+.TP
+.B  --exporthtml  <filename>
+Export bookmarks to a file in a printable HTML format
+.TP
+.B  --exportie  <filename>
+Export bookmarks to a file in Internet Explorer's Favorites format
+.TP
+.B  --exportopera  <filename>
+Export bookmarks to a file in Opera format
+.TP
+.B  --address  <address>
+Open at the given position in the bookmarks file
+.TP
+.B  --customcaption  <caption>
+Set the user readable caption for example "Konsole"
+.TP
+.B  --nobrowser  
+Hide all browser related functions
+.SS 
+.SS Generic options:
+.TP
+.B  --help  
+Show help about options
+.TP
+.B  --help-qt  
+Show Qt specific options
+.TP
+.B  --help-tde  
+Show TDE specific options
+.TP
+.B  --help-all  
+Show all options
+.TP
+.B  --author  
+Show author information
+.TP
+.B -v,  --version  
+Show version information
+.TP
+.B  --license  
+Show license information
+.TP
+.B  --  
+End of options
+.SS 
+.SS TDE options:
+.TP
+.B  --caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  --icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  --miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  --config  <filename>
+Use alternative configuration file
+.TP
+.B  --dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  --nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  --waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  --style  <style>
+sets the application GUI style
+.TP
+.B  --geometry  <geometry>
+sets the client geometry of the main widget
+.SS 
+.SS Qt options:
+.TP
+.B  --display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  --session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  --cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  --ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  --nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  --dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  --sync  
+switches to synchronous mode for debugging
+.TP
+.B --fn,  --font  <fontname>
+defines the application font
+.TP
+.B --bg,  --background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B --fg,  --foreground  <color>
+sets the default foreground color
+.TP
+.B --btn,  --button  <color>
+sets the default button color
+.TP
+.B  --name  <name>
+sets the application name
+.TP
+.B  --title  <title>
+sets the application title (caption)
+.TP
+.B  --visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  --inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  --im  <XIM server>
+set XIM server
+.TP
+.B  --noxim  
+disable XIM
+.TP
+.B  --reverse  
+mirrors the whole layout of widgets
+.SS 
+.SH AUTHORS
+.nf
+David Faure <faure@kde.org>
+.br
+Alexander Kellett <lypanov@kde.org>
+.br
+
diff --git a/doc/man/kfind.1 b/doc/man/kfind.1
new file mode 100644
index 000000000..55542fd66
--- /dev/null
+++ b/doc/man/kfind.1
@@ -0,0 +1,58 @@
+.TH KFIND 1 "August, 25 2003"
+.SH NAME
+kfind \- TDE find tool
+.SH SYNOPSIS
+.B kfind
+.RI [ options ]  [searchpath]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kfind
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBkfind\fP is a find tool for TDE. It allows fine tuning of the search options (name, path, type, plain text search, meta search, modification date, size, user, group, ...)
+
+It also permits to save the results of the search in a file, which is a plain-text list of file URIs. (file:/path_to_file)
+
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+.TP
+.B \-v, \-\-version
+Show version of program.
+
+.TP
+.B searchpath
+is the path in which the search must be done
+
+.SH SEE ALSO
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
+.SH AUTHOR
+This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
+for the Debian GNU/Linux project (but may be used by others).
+.PP
+kfind was written by the KDE project
diff --git a/doc/man/kfmclient.1 b/doc/man/kfmclient.1
new file mode 100644
index 000000000..67cbed380
--- /dev/null
+++ b/doc/man/kfmclient.1
@@ -0,0 +1,222 @@
+.\" This file was generated by kdemangen.pl
+.\" Further edits by Adeodato Simó. COMMANDS and EXAMPLES sections added.
+.TH KFMCLIENT 1 "Jan 2005" "Trinity Desktop Environment" "TDE tool for opening URLs from the command line"
+.SH NAME
+kfmclient
+- TDE tool for opening URLs from the command line
+.SH SYNOPSIS
+kfmclient [Qt-options] [TDE-options] [options] command [URL(s)] 
+.SH DESCRIPTION
+kfmclient is a tool for opening local and remote URLs in Konqueror from
+the command line.
+.SH COMMANDS
+.SS
+.SS openURL
+.TP
+kfmclient openURL \fIurl\fR [ \fImimetype\fR ]
+Opens a window showing \fIurl\fR. \fIurl\fR may be a relative path or file name,
+such as . or subdir/. If \fIurl\fR is omitted, $HOME is used instead.
+
+If \fImimetype\fR is specified, it will be used to determine the component
+that Konqueror should use. For instance, set it to text/html for a web
+page, to make it appear faster.
+.SS newTab
+.TP
+kfmclient newTab \fIurl\fR [ \fImimetype\fR ]
+Same as above but opens a new tab with \fIurl\fR in an existing Konqueror
+window on the current active desktop if possible.
+.SS openProfile
+.TP
+kfmclient openProfile \fIprofile\fR [ \fIurl\fR ]
+Opens a window using the given profile. \fIprofile\fR is a file under
+~/.trinity/share/apps/konqueror/profiles. \fIurl\fR is an optional URL to open.
+.SS openProperties
+.TP
+kfmclient openProperties \fIurl\fR
+Opens a properties menu.
+.SS exec
+.TP
+kfmclient exec [ \fIurl\fR [ \fIbinding\fR ] ]
+Tries to execute \fIurl\fR. \fIurl\fR may be a usual URL, this URL will
+be opened. You may omit \fIbinding\fR. In this case the default binding
+is tried. Of course URL may be the URL of a document, or it may be a
+*.desktop file.
+This way you could for example mount a device by passing 'Mount default'
+as binding to 'cdrom.desktop'.
+.SS move
+.TP
+kfmclient move \fIsrc\fR \fIdest\fR
+Moves the URL \fIsrc\fR to \fIdest\fR. \fIsrc\fR may be a list of URLs.
+.SS copy
+.TP
+kfmclient copy \fIsrc\fR \fIdest\fR
+Copies the URL \fIsrc\fR to \fIdest\fR. \fIsrc\fR may be a list of URLs.
+.SS download
+.TP
+kfmclient download [ \fIsrc\fR ]
+Copies the URL \fIsrc\fR to a user specified location. \fIsrc\fR may be
+a list of URLs, if not present then a URL will be requested.
+.SS sortDesktop
+.TP
+kfmclient sortDesktop
+Rearranges all icons on the desktop.
+.SS configure
+.TP
+kfmclient configure
+Re-read Konqueror's configuration.
+.SS configureDesktop
+.TP
+kfmclient configureDesktop
+Re-read kdesktop's configuration.
+.SH OPTIONS
+.SS
+.SS Generic options:
+.TP
+.B  --help  
+Show help about options
+.TP
+.B  --help-qt  
+Show Qt specific options
+.TP
+.B  --help-tde  
+Show TDE specific options
+.TP
+.B  --help-all  
+Show all options
+.TP
+.B  --author  
+Show author information
+.TP
+.B -v,  --version  
+Show version information
+.TP
+.B  --license  
+Show license information
+.TP
+.B  --  
+End of options
+.SS 
+.SS TDE options:
+.TP
+.B  --caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  --icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  --miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  --config  <filename>
+Use alternative configuration file
+.TP
+.B  --dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  --nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  --waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  --style  <style>
+sets the application GUI style
+.TP
+.B  --geometry  <geometry>
+sets the client geometry of the main widget
+.SS 
+.SS Qt options:
+.TP
+.B  --display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  --session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  --cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  --ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  --nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  --dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  --sync  
+switches to synchronous mode for debugging
+.TP
+.B --fn,  --font  <fontname>
+defines the application font
+.TP
+.B --bg,  --background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B --fg,  --foreground  <color>
+sets the default foreground color
+.TP
+.B --btn,  --button  <color>
+sets the default button color
+.TP
+.B  --name  <name>
+sets the application name
+.TP
+.B  --title  <title>
+sets the application title (caption)
+.TP
+.B  --visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  --inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  --im  <XIM server>
+set XIM server
+.TP
+.B  --noxim  
+disable XIM
+.TP
+.B  --reverse  
+mirrors the whole layout of widgets
+.SH EXAMPLES
+.TP
+kfmclient exec file:/root/Desktop/cdrom.desktop "Mount default"
+Mounts the CD-ROM.
+.TP
+kfmclient exec file:/home/weis/data/test.html
+Opens the file with default binding.
+.TP
+kfmclient exec file:/home/weis/data/test.html Netscape
+Opens the file with netscape.
+.TP
+kfmclient exec ftp://localhost/
+Opens new window with URL.
+.TP
+kfmclient exec file:/root/Desktop/emacs.desktop
+Starts emacs.
+.TP
+kfmclient exec file:/root/Desktop/cdrom.desktop
+Opens the CD-ROM's mount directory.
+.TP
+kfmclient exec .
+Opens the current directory. Very convenient.
+.SH OTHER
+This manual page was written by Adeodato Simo <asp16@alu.ua.es> for the
+Debian system (but may be used by others).
+
+This manual page can be redistribute and/or modified it under the terms
+of the GNU General Public License as published by the Free Software
+Foundation; version 2 dated June, 1991.
+.nf
diff --git a/doc/man/khotkeys.1 b/doc/man/khotkeys.1
new file mode 100644
index 000000000..34d754b05
--- /dev/null
+++ b/doc/man/khotkeys.1
@@ -0,0 +1,150 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KHOTKEYS 1 "June 2006" "Trinity Desktop Environment" "KHotKeys daemon"
+.SH NAME
+khotkeys
+\- daemon to bind actions to triggers and conditions
+.SH SYNOPSIS
+\fBkhotkeys\fP [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+\fBKHotKeys\fP is a utility that allows you to bind actions to triggers and conditions. The most common case is where action means launching some  command/application/URL, the trigger is some key combination pressed and condition is some window being (not) active/existing.
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.SS
+
+.SH FILES
+.I ~/.trinity/share/config/khotkeysrc
+\fBkhotkeys\fP configuration file
+
+.SH AUTHORS
+.nf
+Lubos Lunak <l.lunak@kde.org>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/kicker.1 b/doc/man/kicker.1
new file mode 100644
index 000000000..1d17fa199
--- /dev/null
+++ b/doc/man/kicker.1
@@ -0,0 +1,171 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KICKER 1 "June 2006" "Trinity Desktop Environment" "The TDE panel"
+.SH NAME
+kicker
+\- The TDE panel
+.SH SYNOPSIS
+\fBkicker\fP [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+\fBKicker\fP is the TDE application starter panel and is also capable of some useful applets and extensions. It usually resides on the bottom of the desktop.
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+
+.SH SEE ALSO
+\fBkasbar\fP(1)
+.sp 1
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/kicker/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/kicker/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Aaron J. Seigo <aseigo@kde.org>
+.br
+Matthias Elter <elter@kde.org>
+.br
+Matthias Ettrich <ettrich@kde.org>
+.br
+Wilco Greven <greven@kde.org>
+.br
+Rik Hemsley <rik@kde.org>
+.br
+Daniel M. Duley <mosfet@kde.org>
+.br
+Preston Brown <pbrown@kde.org>
+.br
+John Firebaugh <jfirebaugh@kde.org>
+.br
+Waldo Bastian <bastian@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/kjobviewer.1 b/doc/man/kjobviewer.1
new file mode 100644
index 000000000..6dae2692e
--- /dev/null
+++ b/doc/man/kjobviewer.1
@@ -0,0 +1,202 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KJOBVIEWER 1 "June 2006" "Trinity Desktop Environment" "A print job viewer"
+.SH NAME
+kjobviewer
+\- a print job viewer
+.SH SYNOPSIS
+\fBkjobviewer\fP [Qt\-options] [TDE\-options] [options] 
+.SH DESCRIPTION
+\fBKJobViewer\fP is a powerful queue and spool manager. You can view jobs in the different queues waiting for print as well as manipulate jobs in many ways.
+.sp 1
+The details are, again, as with all other modules of \fBTDEPrint\fP, dependent on the print subsystem in use. \fBCUPS\fP, as is usual now, in this field is the most feature\-complete system for "doing something with jobs that are sent away already and wait for print, possibly on a remote print server".
+.sp 1
+With kjobviewer you can...
+.IP "     \-"
+see an overview for a certain queue or see all jobs on all queues;
+.IP "     \-"
+filter the list to see your "own" jobs only;
+.IP "     \-"
+sort the pending jobs according to different criteria (size, ownership, job\-ide, job\-name; billing\-tags);
+.IP "     \-"
+stop a job from printing, putting it into a "held" state;
+.IP "     \-"
+re\-start a held job;
+.IP "     \-"
+manually release a job that was sent to "hold" from the client already;
+.IP "     \-"
+reschedule a job for printing at a specified time;
+.IP "     \-"
+increase or decrease the job\-priorities (allowed values are 1\-100) to re-arrange the order of automatic printing;
+.IP "     \-"
+move a job to a different print\-queue;
+.IP "     \-"
+stop jobs from leaving the queue (while still accepting incoming ones);
+.IP "     \-"
+reject new incoming jobs (while still printing all the pending ones until the queue is empty);
+.IP "     \-"
+check and re\-set all job options \-\- even adapt them to another target printet which might have a complete different set of commands;
+.IP "     \-"
+view the existing and re\-assign a new job\-billing tag to a job;
+.IP "     \-"
+pop up on screen a nicely formatted report of IPP attributes for any job and also print it;
+.IP "     \-"
+increase or decrease the number of required copies;
+.IP "     \-"
+cancel and delete a no-longer\-required job.
+.PP
+Note, that some of these manipulations require job ownership or root access.
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-d  
+<printer\-name>         The printer for which jobs are requested
+.TP
+.B  \-\-noshow  
+Show job viewer at startup
+.TP
+.B  \-\-all  
+Show jobs for all printers
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/kjobviewer/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/kjobviewer/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Michael Goffioul <tdeprint@swing.be>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/kmenuedit.1 b/doc/man/kmenuedit.1
new file mode 100644
index 000000000..fd5c7daf5
--- /dev/null
+++ b/doc/man/kmenuedit.1
@@ -0,0 +1,51 @@
+.TH KMENUEDIT 1 "August, 24 2003"
+.SH NAME
+kmenuedit \- editor for the TDE menu
+.SH SYNOPSIS
+.B kmenuedit
+.RI [ options ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kmenuedit
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBkmenuedit\fP is a powerful editor for the TDE menu. It allows you to add, remove, or move items in the menu, add sub-menus, ...
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+.TP
+.B \-v, \-\-version
+Show version of program.
+
+.SH SEE ALSO
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
+.SH AUTHOR
+This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
+for the Debian GNU/Linux project (but may be used by others).
+.PP
+kmenuedit was written by the KDE project
diff --git a/doc/man/knetattach.1 b/doc/man/knetattach.1
new file mode 100644
index 000000000..84bc38fcf
--- /dev/null
+++ b/doc/man/knetattach.1
@@ -0,0 +1,164 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KNETATTACH 1 "June 2006" "Trinity Desktop Environment" "TDE Network Wizard"
+.SH NAME
+knetattach
+\- TDE Network Wizard
+.SH SYNOPSIS
+\fBknetattach\fP [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+The \fBTDE Network Wizard\fP is an application which makes it easier to integrate your network resources with your Trinity Desktop.
+.sp 1
+The program, also known as the \fBNetwork Folder Wizard\fP, allows easy addition and integration of various network folders with your Trinity desktop.
+.sp 1
+The \fBNetwork Folder Wizard\fP currently allows you to add four types of network folders:
+.br
+.RS 3
+\- WebDav
+.br
+\- FTP
+.br
+\- Microsoft(R) Windows(R) (Samba) network drives
+.br
+\- SSH
+.RE
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/knetattach/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/knetattach/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+George Staikos <staikos@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/konqueror.1 b/doc/man/konqueror.1
new file mode 100644
index 000000000..0515c4f87
--- /dev/null
+++ b/doc/man/konqueror.1
@@ -0,0 +1,245 @@
+.\" This file was generated by kdemangen.pl
+.TH KONQUEROR 1 "Jan 2005" "Trinity Desktop Environment" "Web browser, file manager, ..."
+.SH NAME
+konqueror
+- Web browser, file manager, ...
+.SH SYNOPSIS
+konqueror [Qt-options] [TDE-options] [options] [URL] 
+.SH DESCRIPTION
+Konqueror is the file manager for the Trinity Desktop Environment.
+It supports basic file management on local UNIX filesystems,
+from simple cut/copy and paste operations to advanced remote
+and local network file browsing.
+
+It is also the canvas for all the latest TDE technology,
+from KIO slaves (which provide mechanisms for file access) to
+component embedding via the KParts object interface, and it
+is one of the most customizable applications available.
+
+Konqueror is an Open Source web browser with HTML4.0 compliance,
+supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
+as well as Netscape plugins (for example, Flash or RealVideo plugins).
+
+It is a universal viewing application, capable of embedding
+read-only viewing components in itself to view
+documents without ever launching another application.
+
+This package is part of the official TDE base module.
+
+
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B URL
+Location to open
+.SS Options:
+.TP
+.B  --silent  
+Start without a default window
+.TP
+.B  --preload  
+Preload for later use
+.TP
+.B  --profile  <profile>
+Profile to open
+.TP
+.B  --profiles  
+List available profiles
+.TP
+.B  --mimetype  <mimetype>
+Mimetype to use for this URL (e.g. text/html or inode/directory)
+.TP
+.B  --select  
+For URLs that point to files, opens the directory and selects the file, instead of opening the actual file
+.SS 
+.SS Generic options:
+.TP
+.B  --help  
+Show help about options
+.TP
+.B  --help-qt  
+Show Qt specific options
+.TP
+.B  --help-tde  
+Show TDE specific options
+.TP
+.B  --help-all  
+Show all options
+.TP
+.B  --author  
+Show author information
+.TP
+.B -v,  --version  
+Show version information
+.TP
+.B  --license  
+Show license information
+.TP
+.B  --  
+End of options
+.SS 
+.SS TDE options:
+.TP
+.B  --caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  --icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  --miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  --config  <filename>
+Use alternative configuration file
+.TP
+.B  --dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  --nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  --waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  --style  <style>
+sets the application GUI style
+.TP
+.B  --geometry  <geometry>
+sets the client geometry of the main widget
+.SS 
+.SS Qt options:
+.TP
+.B  --display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  --session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  --cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  --ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  --nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  --dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  --sync  
+switches to synchronous mode for debugging
+.TP
+.B --fn,  --font  <fontname>
+defines the application font
+.TP
+.B --bg,  --background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B --fg,  --foreground  <color>
+sets the default foreground color
+.TP
+.B --btn,  --button  <color>
+sets the default button color
+.TP
+.B  --name  <name>
+sets the application name
+.TP
+.B  --title  <title>
+sets the application title (caption)
+.TP
+.B  --visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  --inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  --im  <XIM server>
+set XIM server
+.TP
+.B  --noxim  
+disable XIM
+.TP
+.B  --reverse  
+mirrors the whole layout of widgets
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/konqueror/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/konqueror/'"
+from the command-line.
+.br
+.SH AUTHORS
+.nf
+David Faure <faure@kde.org>
+.br
+Simon Hausmann <hausmann@kde.org>
+.br
+Michael Reiher <michael.reiher@gmx.de>
+.br
+Matthias Welk <welk@fokus.gmd.de>
+.br
+Alexander Neundorf <neundorf@kde.org>
+.br
+Michael Brade <brade@kde.org>
+.br
+Lars Knoll <knoll@kde.org>
+.br
+Dirk Mueller <mueller@kde.org>
+.br
+Peter Kelly <pmk@post.com>
+.br
+Waldo Bastian <bastian@kde.org>
+.br
+Germain Garand <germain@ebooksfrance.org>
+.br
+Leo Savernik <l.savernik@aon.at>
+.br
+Stephan Kulow <coolo@kde.org>
+.br
+Antti Koivisto <koivisto@kde.org>
+.br
+Apple Safari Developers
+.br
+Harri Porten <porten@kde.org>
+.br
+Koos Vriezen <koos.vriezen@xs4all.nl>
+.br
+Matt Koss <koss@miesto.sk>
+.br
+Alex Zepeda <zipzippy@sonic.net>
+.br
+Richard Moore <rich@kde.org>
+.br
+Dima Rogozin <dima@mercury.co.il>
+.br
+Wynn Wilkes <wynnw@calderasystems.com>
+.br
+Stefan Schimanski <schimmi@kde.org>
+.br
+George Staikos <staikos@kde.org>
+.br
+Dawit Alemayehu <adawit@kde.org>
+.br
+Carsten Pfeiffer <pfeiffer@kde.org>
+.br
+Torsten Rahn <torsten@kde.org>
+.br
+Torben Weis <weis@kde.org>
+.br
+Joseph Wenninger <jowenn@kde.org>
+.br
+
diff --git a/doc/man/konsole.1 b/doc/man/konsole.1
new file mode 100644
index 000000000..5de5500b4
--- /dev/null
+++ b/doc/man/konsole.1
@@ -0,0 +1,179 @@
+.\" The draft of this file was generated by kdemangen.pl and edited after.
+.TH Konsole 1 "Nov 2005" "Trinity Desktop Environment" ""
+.SH NAME
+.BR Konsole
+\- X terminal emulator for TDE.
+.SH SYNOPSIS
+.BR Konsole 
+[Qt\-options] [TDE\-options] [options] [args] 
+.SH DESCRIPTION
+Konsole is an X terminal emulation which provides a command-line interface
+(CLI) while using the graphical Trinity Desktop Environment. Konsole helps to
+better organize user's desktop by containing multiple sessions in a single
+window (a less cluttered desktop).
+.PP
+Konsole advanced features include simple configuration and the ability to use
+multiple terminal shells in a single window, making for a less
+cluttered desktop.
+.PP
+Using Konsole, a user can open:
+.PP
+.RS
+Linux console sessions
+.PP
+Shell sessions
+.PP
+Screen sessions
+.PP
+Midnight Commander file manager sessions
+.PP
+Root console sessions
+.PP
+Root Midnight Commander sessions
+.PP
+User created sessions
+.RE
+
+These sessions can be renamed to help you keep track of all your shells,
+or signaled (STOP, CONT, HUP, INT, TERM, KILL).
+.PP
+For more control over konsole, a user can:
+hide/show the menubar and/or frame;
+select the size of a konsole window, fonts, color
+schemes, and key mapping;
+change location of the scrollbar or hide the scrollbar;
+change location of the tabbar or hide the tabbar.
+.PP
+All chosen settings can be made the default for forthcoming sessions by
+saving them.
+.SH OPTIONS
+.SS
+.SS Konsole specific options:
+.TP
+.B  \-\-name  <name>
+Set window class
+.TP
+.B  \-\-ls  
+Start login shell
+.B \-T <title>                
+Set the window title
+.TP
+.B  \-\-tn  <terminal>
+Specify terminal type as set in the TERM [xterm]
+environment variable
+.TP
+.B  \-\-noclose  
+Do not close Konsole when command exits
+.TP
+.B  \-\-nohist  
+Do not save lines in history
+.TP
+.B  \-\-nomenubar  
+Do not display menubar
+.TP
+.B \-\-notabbar,  \-\-notoolbar  
+Do not display tab bar
+.TP
+.B  \-\-noframe  
+Do not display frame
+.TP
+.B  \-\-noscrollbar  
+Do not display scrollbar
+.TP
+.B  \-\-noxft  
+Do not use Xft (anti-aliasing)
+.TP
+.B  \-\-vt_sz CCxLL             
+Terminal size in columns x lines
+.TP
+.B  \-\-noresize  
+Terminal size is fixed
+.TP
+.B  \-\-type  <type>
+Start with given session type
+.TP
+.B  \-\-types  
+List available session types
+.TP
+.B  \-\-keytab  <name>
+Set keytab to 'name'
+.TP
+.B  \-\-keytabs  
+List available keytabs
+.TP
+.B  \-\-profile  <name>
+Start with given session profile
+.TP
+.B  \-\-profiles  
+List available session profiles
+.TP
+.B  \-\-schema  <name>
+| <file>  Set schema to 'name' or use 'file'
+.TP
+.B \-\-schemas,  \-\-schemata  
+List available schemata
+.TP
+.B  \-\-script  
+Enable extended DCOP Qt functions
+.TP
+.B  \-\-workdir  <dir>
+Change working directory to 'dir'
+.TP
+.B \-e <command> [ arguments ]
+Execute 'command' instead of shell. It also sets the window title and 
+icon name to be the basename of the program being executed if neither 
+-T nor -n are given on the command line. 
+This must be the last option on the command line.
+.SS 
+.SS Arguments:
+.TP
+.B args
+Arguments for 'command'
+.SS
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/konsole/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/konsole/'"
+from the command-line.
+.BR
+
+Konsole homepage: 
+.BR http://konsole.kde.org/
+.SH AUTHORS
+Kurt V. Hindenburg <kurt.hindenburg@kdemail.net>
+
+Lars Doelle <lars.doelle@on-line.de>
+.BR
+.SH OTHER
+This manual page was written by Ana Beatriz Guerrero Lopez <ana@ekaia.org> for the Debian
+system (but may be used by others).
+.BR
+
diff --git a/doc/man/kpager.1 b/doc/man/kpager.1
new file mode 100644
index 000000000..63a24f267
--- /dev/null
+++ b/doc/man/kpager.1
@@ -0,0 +1,53 @@
+.TH KPAGER 1 "August, 24 2003"
+.SH NAME
+kpager \- Trinity desktop pager
+.SH SYNOPSIS
+.B kpager
+.RI [ options ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kpager
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBkpager\fP is a desktop pager for the Trinity desktop. It creates mini-views of the different Trinity desktops. These views show the real content of the desktop, or only icons. 
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
+.B \-\-hidden
+Create the preview of the desktops, but hide the window
+.SH SEE ALSO
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
+.SH AUTHOR
+This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
+for the Debian GNU/Linux project (but may be used by others).
+.PP
+kpager was written by the KDE project
diff --git a/doc/man/kpersonalizer.1 b/doc/man/kpersonalizer.1
new file mode 100644
index 000000000..01dc0b3cc
--- /dev/null
+++ b/doc/man/kpersonalizer.1
@@ -0,0 +1,66 @@
+.TH KPERSONALIZER 1
+.SH NAME
+kpersonalizer - TDE basic settings wizard
+
+.SH SYNOPSIS
+
+.B kpersonalizer [OPTION...]
+
+.SH DESCRIPTION
+
+The TDE Personalizer (KPersonalizer) is a wizard to configure TDE, and should automatically be run the first time a user runs TDE, to allow the user to configure basic TDE settings.
+.PP
+KPersonalizer allows the user to set locales, desktop behavior, enable accessibility features, and so forth. The options can be changed later by the Trinity Control Center application.
+
+.SH OPTIONS
+
+KPersonalizer accepts the following options:
+.PP
+.B Help options
+.TP
+.B \-\-help
+Show help about options.
+.TP
+.B \-\-help-qt
+Show Qt specific options.
+.TP
+.B \-\-help-tde 
+Show TDE specific options.
+.TP
+.B \-\-help-all 
+Show all options.
+.TP
+.B \-\-author
+Show author information.
+.TP
+.B \-v, \-\-version
+Show version information.
+.TP
+.B \-\-license 
+Show license information. 
+
+.PP
+.B Options
+.TP
+.B \-r 
+KPersonalizer is restarted by itself. 
+.TP
+.B \-\-before-session 
+KPersonalizer is started before the TDE session.
+
+.SH EXAMPLES
+.TP
+.B kpersonalizer
+Run kpersonalizer to set (or reset) TDE preferences.
+.TP
+.B kpersonalizer --before-session
+Run kpersonalizer before the first TDE session. 
+
+.SH AUTHORS
+
+Kpersonalizer was written by Ralf Nolden <nolden@kde.org>, Carsten Wolff <wolff@kde.org>, qwertz <kraftw@gmx.de>, and Bernhard Rosenkraenzer <bero@redhat.com>.
+.PP
+This  manual page was written by Joe Brockmeier <jzb@zonker.net>, for the Debian GNU/Linux project, but may be used by others.
+.SH "SEE ALSO"
+.TP
+.BR khelpcenter (1)
diff --git a/doc/man/kprinter.1 b/doc/man/kprinter.1
new file mode 100644
index 000000000..a3ecdc88b
--- /dev/null
+++ b/doc/man/kprinter.1
@@ -0,0 +1,209 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KPRINTER 1 "June 2006" "Trinity Desktop Environment" "A printer tool for TDE"
+.SH NAME
+kprinter
+\- a printer tool for TDE
+.SH SYNOPSIS
+\fBkprinter\fP [Qt\-options] [TDE\-options] [options] file(s) 
+.SH DESCRIPTION
+\fBKPrinter\fP opens automatically when you click on the "Print" icon of any TDE application. Choose your print job settings by going through the dialog and then click on the "Print" button.
+.sp 1
+\fBkprinter\fP is a very versatile tool. Depending on the actual features and power of the print subsystem of your computer, \fBkprinter\fP translates the former's abilities into a nice and easy\-to\-understand GUI. If your print subsystem does not support duplexing, \fBkprinter\fP will not show the option. If your print subsystem is CUPS, kprinter is at its peak shape.
+.sp 1
+With \fBKPrinter\fP you can...
+.IP "     \-"
+switch "on the fly" the print subsystem\-to\-use,
+.IP "     \-"
+start the Add Printer Wizard,
+.IP "     \-"
+choose the target printer,
+.IP "     \-"
+possibly select one or more files to print,
+.IP "     \-"
+drag'n'drop files for print,
+.IP "     \-"
+check for or set the print options,
+.IP "     \-"
+schedule the job for later printing,
+.IP "     \-"
+tag the print job with accounting information for billing purposes,
+.IP "     \-"
+set the job priority for a higher or lower level to influence the order of the job queue,
+.IP "     \-"
+access the TDEPrint configurator,
+.IP "     \-"
+and activate (or disable) a viewing filter that shows all or just the selected few printers relevant to the user.
+.SP
+.SH OPTIONS
+.SS
+.SS Arguments:
+file(s)                   Files to load
+.SS Options:
+.TP
+.B  \-c  
+Make an internal copy of the files to print
+.TP
+.B \-P,  \-d  <printer>
+Printer/destination to print on
+.TP
+.B \-J,  \-t  <title>
+Title/Name for the print job
+.TP
+.B \-#, \-n <number>
+Number of copies
+.TP
+.B  \-o  
+<option=value>         Printer option
+.TP
+.B  \-j  <mode>
+Job output mode (gui, console, none) [gui]
+.TP
+.B  \-\-system  <printsys>
+Print system to use (lpd, cups)
+.TP
+.B  \-\-stdin  
+Allow printing from STDIN
+.TP
+.B  \-\-nodialog  
+Do not show the print dialog (print directly)
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\fB\-\-nograb\fP, use \fB\-\-dograb\fP to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/kprinter/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/kprinter/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Michael Goffioul <tdeprint@swing.be>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/krandom.kss.1 b/doc/man/krandom.kss.1
new file mode 100644
index 000000000..4a13d95ec
--- /dev/null
+++ b/doc/man/krandom.kss.1
@@ -0,0 +1,152 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KRANDOM.KSS 1 "June 2006" "Trinity Desktop Environment" "TDE screen saver"
+.SH NAME
+krandom.kss
+\- Start a random TDE screen saver
+.SH SYNOPSIS
+\fBkrandom.kss\fP [Qt\-options] [TDE\-options] [options] 
+.SH DESCRIPTION
+\fBkrandom.kss\fP starts a random TDE screen saver.
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-setup  
+Setup screen saver
+.TP
+.B  \-\-window\-id  wid
+Run in the specified XWindow
+.TP
+.B  \-\-root  
+Run in the root XWindow
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/kreadconfig.1 b/doc/man/kreadconfig.1
new file mode 100644
index 000000000..3bb6c4d0b
--- /dev/null
+++ b/doc/man/kreadconfig.1
@@ -0,0 +1,173 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KREADCONFIG 1 "June 2006" "Trinity Desktop Environment" "Read TDEConfig entries"
+.SH NAME
+kreadconfig
+\- Read TDEConfig entries (for use in shell scripts)
+.SH SYNOPSIS
+\fBkreadconfig\fP [Qt\-options] [TDE\-options] [options] 
+.SH DESCRIPTION
+\fBkreadconfig\fP is a command line tool to retrieve values from TDE configuration files.
+.sp 1
+If a file given via option \fB\-\-file\fP does not contain a path the TDE standard configuration directory is used.
+.SS Example:
+.TP
+\fBkreadconfig \-\-group\fP Directories \fB--key\fP dir_tmp
+read the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories from TDE's main configuration file
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-file  <file>
+Use <file> instead of global config
+.TP
+.B  \-\-group  <group>
+Group to look in [TDE]
+.TP
+.B  \-\-key  <key>
+Key to look for
+.TP
+.B  \-\-default  <default>
+Default value
+.TP
+.B  \-\-type  <type>
+Type of variable
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS
+
+.SH FILES
+.I /etc/trinity/system.kdeglobals
+global TDE configuration file
+.I ~/.trinity/share/config
+standard configuration directory
+
+.SH AUTHORS
+.nf
+Bernhard Rosenkraenzer <bero@redhat.com>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/krootimage.1 b/doc/man/krootimage.1
new file mode 100644
index 000000000..e9b19a604
--- /dev/null
+++ b/doc/man/krootimage.1
@@ -0,0 +1,151 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KROOTIMAGE 1 "June 2006" "Trinity Desktop Environment" "helper program"
+.SH NAME
+krootimage
+\- set desktop background for tdm
+.SH SYNOPSIS
+\fBkrootimage\fP [Qt\-options] [TDE\-options] config 
+.SH DESCRIPTION
+\fBkrootimage\fP is a helper program for \fBtdm\fP to set the desktop background.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B config
+Name of the configuration file
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+.SH SEE ALSO
+.BR tdm (1)
+.SH AUTHORS
+.nf
+Matthias Hoelzer\-Kluepfel <hoelzer@kde.org>
+.br
+Oswald Buddenhagen <ossi@kde.org>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/kstart.1 b/doc/man/kstart.1
new file mode 100644
index 000000000..9d3a77ddc
--- /dev/null
+++ b/doc/man/kstart.1
@@ -0,0 +1,215 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KSTART 1 "June 2006" "Trinity Desktop Environment" "application launch utility"
+.SH NAME
+kstart
+\- Utility to launch applications with special window properties 
+.SH SYNOPSIS
+\fBkstart\fP [Qt\-options] [TDE\-options] [options] command 
+.SH DESCRIPTION
+Utility to launch applications with special window properties.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B command
+Command to execute
+.SS 
+.SS Options:
+.TP
+.B  \-\-window  <regexp>
+A regular expression matching the window title
+.TP
+.B  \-\-windowclass  <class>
+A string matching the window class (WM_CLASS property)
+The window class can be found out by running
+'xprop | grep WM_CLASS' and clicking on a window
+(use either both parts separated by a space or only the right part).
+NOTE: If you specify neither window title nor window class,
+then the very first window to appear will be taken;
+omitting both options is NOT recommended.
+.TP
+.B  \-\-desktop  <number>
+Desktop on which to make the window appear
+.TP
+.B  \-\-currentdesktop  
+Make the window appear on the desktop that was active
+when starting the application
+.TP
+.B  \-\-alldesktops  
+Make the window appear on all desktops
+.TP
+.B  \-\-iconify  
+Iconify the window
+.TP
+.B  \-\-maximize  
+Maximize the window
+.TP
+.B  \-\-maximize\-vertically  
+Maximize the window vertically
+.TP
+.B  \-\-maximize\-horizontally  
+Maximize the window horizontally
+.TP
+.B  \-\-fullscreen  
+Show window fullscreen
+.TP
+.B  \-\-type  <type>
+The window type: Normal, Desktop, Dock, Tool, 
+Menu, Dialog, TopMenu or Override
+.TP
+.B  \-\-activate  
+Jump to the window even if it is started on a 
+different virtual desktop
+.TP
+.B \-\-ontop,  \-\-keepabove  
+Try to keep the window above other windows
+.TP
+.B \-\-onbottom,  \-\-keepbelow  
+Try to keep the window below other windows
+.TP
+.B  \-\-skiptaskbar  
+The window does not get an entry in the taskbar
+.TP
+.B  \-\-skippager  
+The window does not get an entry on the pager
+.TP
+.B  \-\-tosystray  
+The window is sent to the system tray in Kicker
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+Matthias Ettrich <ettrich@kde.org>
+.br
+David Faure <faure@kde.org>
+.br
+Richard J. Moore <rich@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/ksystraycmd.1 b/doc/man/ksystraycmd.1
new file mode 100644
index 000000000..4807276c0
--- /dev/null
+++ b/doc/man/ksystraycmd.1
@@ -0,0 +1,189 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KSYSTRAYCMD 1 "June 2006" "Trinity Desktop Environment" "system tray utility"
+.SH NAME
+ksystraycmd
+\- Allows any application to be kept in the system tray
+.SH SYNOPSIS
+\fBksystraycmd\fP [Qt\-options] [TDE\-options] [options] command 
+.SH DESCRIPTION
+The system tray is an area in which an application can display a small window.
+It may be used to display status information or provide quick access to commands.
+Normally tray icons are developed as part of an application.
+\fBksystraycmd\fP allows any application to be kept in the system tray.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B command
+Command to execute
+.SS 
+.SS Options:
+.TP
+.B  \-\-window  <regexp>
+A regular expression matching the window title
+If you do not specify one, then the very first window
+to appear will be taken \- not recommended.
+.TP
+.B  \-\-wid  <int>
+The window id of the target window
+Specifies the id of the window to use. If the id starts with 0x
+it is assumed to be in hex.
+.TP
+.B  \-\-hidden  
+Hide the window to the tray on startup
+.TP
+.B  \-\-startonshow  
+Wait until we are told to show the window before
+executing the command
+.TP
+.B  \-\-tooltip  <text>
+Sets the initial tooltip for the tray icon
+.TP
+.B  \-\-keeprunning  
+Keep the tray icon even if the client exits. This option
+has no effect unless startonshow is specified.
+.TP
+.B  \-\-ownicon  
+Use ksystraycmd's icon instead of window's icon in systray
+(should be used with \-\-icon to specify ksystraycmd icon)
+.TP
+.B  \-\-ontop  
+Try to keep the window above other windows
+.TP
+.B  \-\-quitonhide  
+Quit the client when we are told to hide the window.
+This has no effect unless startonshow is specified and implies keeprunning.
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+Richard Moore <rich@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/ktrash.1 b/doc/man/ktrash.1
new file mode 100644
index 000000000..0094c84fa
--- /dev/null
+++ b/doc/man/ktrash.1
@@ -0,0 +1,155 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KTRASH 1 "June 2006" "Trinity Desktop Environment" "helper program"
+.SH NAME
+ktrash
+\- Helper program to handle the TDE trash can
+.SH SYNOPSIS
+\fBktrash\fP [Qt\-options] [TDE\-options] [options]
+.SH DESCRIPTION
+\fBktrash\fP is a helper program to handle the TDE trash can.
+.sp 1
+Note: to move files to the trash, do not use \fBktrash\fP, but "\fBkfmclient\fP move 'url' trash:/"
+.SH OPTIONS
+.SS
+.SS Options:
+.TP
+.B  \-\-empty  
+Empty the contents of the trash
+.TP
+.B  \-\-restore  <file>
+Restore a trashed file to its original location
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+.SH SEE ALSO
+\fBkfmclient\fP(1)
+.SH AUTHORS
+.nf
+David Faure <faure@kde.org>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/kwrite.1 b/doc/man/kwrite.1
new file mode 100644
index 000000000..f7d39f61d
--- /dev/null
+++ b/doc/man/kwrite.1
@@ -0,0 +1,60 @@
+.TH KWRITE 1 "August, 25 2003"
+.SH NAME
+kwrite \- TDE text editor
+.SH SYNOPSIS
+.B kwrite
+.RI [ options ]  [file]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kwrite
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBkwrite\fP is a text editor for TDE, that is a light version of \fIkate\fP.
+It allows syntax coloration for many langages.
+
+It is able to expand or collapse parts of code (C functions, ...).
+
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+.TP
+.B \-v, \-\-version
+Show version of program.
+
+.B file
+is the file to open
+
+.SH SEE ALSO
+.BR kate (1)
+.PP
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
+.SH AUTHOR
+This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
+for the Debian GNU/Linux project (but may be used by others).
+.PP
+kwrite was written by the KDE project
diff --git a/doc/man/kwriteconfig.1 b/doc/man/kwriteconfig.1
new file mode 100644
index 000000000..b347b9849
--- /dev/null
+++ b/doc/man/kwriteconfig.1
@@ -0,0 +1,173 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KWRITECONFIG 1 "June 2006" "Trinity Desktop Environment" "Write TDEConfig entries"
+.SH NAME
+kwriteconfig
+\- Write TDEConfig entries (for use in shell scripts)
+.SH SYNOPSIS
+\fBkwriteconfig\fP [Qt\-options] [TDE\-options] [options] value 
+.SH DESCRIPTION
+\fBkwriteconfig\fP is a command line tool to write values in TDE configuration files.
+Nonexisting files/groups/keys will be created.
+.sp 1
+If a file given via option \fB\-\-file\fP does not contain a path the TDE standard configuration directory is used.
+.SS Example:
+.TP
+\fBkwriteconfig \-\-file\fP \fImyrc\fP \fB\-\-group\fP Directories \fB\-\-key\fP dir_tmp /tmp
+writes the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories in configuration \fBfile\fP \fImyrc\fP
+
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B value
+The value to write. Mandatory, on a shell use '' for empty
+.SS Options:
+.TP
+.B  \-\-file  <file>
+Use <file> instead of global config
+.TP
+.B  \-\-group  <group>
+Group to look in [TDE]
+.TP
+.B  \-\-key  <key>
+Key to look for
+.TP
+.B  \-\-type  <type>
+Type of variable. Use "bool" for a boolean, otherwise it is treated as a string
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+Luis Pedro Coelho <luis_pedro@netcabo.pt>
+.br
+Bernhard Rosenkraenzer <bero@redhat.com>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/kxkb.1 b/doc/man/kxkb.1
new file mode 100644
index 000000000..9a6a6bcf6
--- /dev/null
+++ b/doc/man/kxkb.1
@@ -0,0 +1,163 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KXKB 1 "June 2006" "Trinity Desktop Environment" "A utility to switch keyboard maps"
+.SH NAME
+kxkb
+\- A utility to switch keyboard maps
+.SH SYNOPSIS
+\fBkxkb\fP [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+\fBKxkb\fP is a keyboard layout switching utility based on X11 xkb extension. It allows to use different keyboard layouts for inputing text. \fBKxkb\fP features keyboard layout indicator.
+.sp 1
+\fBKxkb\fP starts automatically and stays in system tray as a flag with 2 or 3 letter abbreviation of layout name on top of it if more than one layout is defined or Show indicator for single layout option is turned on.
+.sp 1
+When \fBKxkb\fP is running you can change layouts clicking on its tray icon with the mouse or pressing its keyboard shortcut. Keyboard shortcut or mouse click will switch to next layout or alternatively you can right mouse button click the \fBKxkb\fP icon and select layout from the list.
+.sp 1
+Right mouse button clicking on the \fBKxkb\fP icon you can start its configuration by selecting Configure... or by opening \fBControl Center\fP and selecting Localization/Keyboard Layout. Alternatively, you can start it by typing \fBtdecmshell keyboard_layout\fP in a terminal.
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/kxkb/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/kxkb/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Andriy Rysin <rysin@kde.org>
+.br
+Shaheed Haque <srhaque@iee.org>
+.br
+Ilya Konstantinov <kde\-devel@future.galanet.net>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/starttde.1 b/doc/man/starttde.1
new file mode 100644
index 000000000..73ab27b9c
--- /dev/null
+++ b/doc/man/starttde.1
@@ -0,0 +1,46 @@
+.TH starttde 1 "Jan 17, 2005"
+.SH NAME
+starttde \- Starts up the Trinity Desktop Environment 
+.SH SYNOPSIS
+.B starttde
+.br
+.SH DESCRIPTION
+This manual page documents briefly the
+.B starttde
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+The \fBstarttde\fP script starts up the Trinity Desktop Environment and
+is typically executed by your login manager (e.g. xdm, gdm, tdm, wdm or from
+your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which
+will load your last session, or a default session that includes the standard
+TDE programs if no saved session is available.
+
+\fBstarttde\fP, with ksmserver, is a standard X11R6 session manager that can manage
+any X11R6 SM compliant program.
+
+\fBstarttde\fP and ksmserver use the contents of the ~/.trinity directory
+for starting previously saved sessions. Source scripts found in ~/.trinity/env/*.sh
+can be used to define environment variables that will be available to all TDE 
+programs.
+
+For anything else (that doesn't set env vars, or that needs a window manager),
+better use the ~/.trinity/Autostart folder.
+
+At the end of a session, the scripts found in ~/.trinity/shutdown will be executed.
+
+
+.SH OPTIONS
+\fBstarttde\fP takes no command line options.
+
+.SH AUTHOR
+\fBstarttde\fP is written by the KDE Project.
+
+This manual page was written by Philipp Grau.
+
+.SH "REPORTING BUGS"
+Report bugs of this modified Debian version of starttde to the Bug
+Tracking System at: http://bugs.debian.org
+.SH COPYRIGHT
+Copyright \(co 2005 Philipp Grau.
diff --git a/doc/man/tdedebugdialog.1 b/doc/man/tdedebugdialog.1
new file mode 100644
index 000000000..af48f59e6
--- /dev/null
+++ b/doc/man/tdedebugdialog.1
@@ -0,0 +1,200 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH TDEDEBUGDIALOG 1 "June 2006" "Trinity Desktop Environment" "control debug output"
+.SH NAME
+tdedebugdialog
+\- A dialog box for setting preferences for debug output
+.SH SYNOPSIS
+\fBtdedebugdialog\fP [Qt\-options] [TDE\-options] [options] 
+.SH DESCRIPTION
+\fBTDEDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
+.sp 1
+If you simply start \fBtdedebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled.
+.sp 1
+If you start \fBtdedebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.
+.sp 1
+In full mode, first you should select the debug area you are interested in from the drop down list at the top.
+.sp 1
+You may independently set the output for various types of messages:
+.sp 1
+.RS 3
+\- Information
+.br
+\- Warning
+.br
+\- Error
+.br
+\- Fatal Error
+.RE
+.PP
+For each of these types, you can set the following:
+.sp 1
+\fBOutput to\fP:
+.br
+In this Combobox, you can choose where the messages should be output. The choices are: \fBFile\fP?, \fBMessage Box\fP, \fBShell\fP (meaning stderr), \fBSyslog\fP an \fBNone\fP. Please do not direct fatal messages to syslog unless you are the system administrator yourself. The default is ?Message Box?.
+.sp 1
+\fBFilename:\fP
+.br
+This is only enabled when you have chosen \fBFile\fP as the output and provides the name of that file (which is interpreted as relative to the current folder). The default is \fIkdebug.dbg\fP.
+Apart from this, you can also tick the checkbox Abort on fatal errors. In this case, if a diagnostic message with the severity level TDEBUG_FATAL is output, the application aborts with a SIGABRT after outputting the message.
+.sp 1
+When you close the dialog by pressing OK, your entries apply immediately and are saved in \fIkdebugrc\fP. When you press Cancel, your entries are discarded and the old ones are restored.
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-fullmode  
+Show the fully\-fledged dialog instead of the default list dialog
+.TP
+.B  \-\-on  <area>
+Turn area on
+.TP
+.B  \-\-off  <area>
+Turn area off
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.SS
+
+.SH FILES
+.I ~/.trinity/share/config/kdebugrc
+\fBtdedebugdialog\fP configuration file
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/tdedebugdialog/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/tdedebugdialog/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+David Faure <faure@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/tdeio_media_mounthelper.1 b/doc/man/tdeio_media_mounthelper.1
new file mode 100644
index 000000000..1e7b055f6
--- /dev/null
+++ b/doc/man/tdeio_media_mounthelper.1
@@ -0,0 +1,163 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KIO_MEDIA_MOUNTHELPER 1 "June 2006" "Trinity Desktop Environment" "helper program"
+.SH NAME
+tdeio_media_mounthelper
+\- tdeio_media_mounthelper
+.SH SYNOPSIS
+\fBtdeio_media_mounthelper\fP [Qt\-options] [TDE\-options] [options] URL 
+.SH DESCRIPTION
+\fBtdeio_media_mounthelper\fP is a helper program to handle the mounting of media in TDE. It is part of the KIO subsystem.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B URL
+media:/ URL to mount/unmount/eject/remove
+.SS Options:
+.TP
+.B  \-u  
+Unmount given URL
+.TP
+.B  \-m  
+Mount given URL (default)
+.TP
+.B  \-e  
+Eject given URL via tdeeject
+.TP
+.B  \-s  
+Unmount and Eject given URL (necessary for some USB devices)
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+.SH AUTHORS
+.nf
+Waldo Bastian <bastian@kde.org>
+.br
+Kevin Ottens <ervin@ipsquad.net>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/tdeio_system_documenthelper.1 b/doc/man/tdeio_system_documenthelper.1
new file mode 100644
index 000000000..270dd86e6
--- /dev/null
+++ b/doc/man/tdeio_system_documenthelper.1
@@ -0,0 +1,22 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH  tdeio_system_documenthelper 1 "June 2006" "Trinity Desktop Environment" "helper script"
+.SH NAME
+tdeio_system_documenthelper
+\- TDE helper script used by document.desktop
+.SH SYNOPSIS
+\fBtdeio_system_documenthelper\fP
+
+.SH DESCRIPTION
+The script is used by document.desktop entry to determine if it must be shown or not.
+
+.SH AUTHORS
+.nf
+Kevin Ottens <ervin@ipsquad.net>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/tdepasswd.1 b/doc/man/tdepasswd.1
new file mode 100644
index 000000000..e09aff0e2
--- /dev/null
+++ b/doc/man/tdepasswd.1
@@ -0,0 +1,169 @@
+.TH TDEPASSWD 1
+
+.SH NAME
+tdepasswd \- graphical frontend to change the user's password
+
+.SH SYNOPSIS
+.B tdepasswd [ \fIQt-options\fR ] [ \fITDE-options\fR ] \fIoptions\fR
+
+.SH DESCRIPTION
+Changes a UNIX password.
+
+.SH OPTIONS
+.B Generic options:
+.TP
+.HP
+.B \-\-help
+Show help about options
+.TP
+.HP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.HP
+.B \-\-help\-tde
+Show TDE specific options
+.TP
+.HP
+.B \-\-help\-all
+Show all options
+.TP
+.HP
+.B \-\-author
+Show author information
+.TP
+.HP
+.B \-v\fR, \fB \-\-version
+Show version information
+.TP
+.HP
+.B \-\-license
+Show license information
+.TP
+.B Qt options:
+.TP
+.HP
+.B \-\-display <displayname>
+Use the X-server display 'displayname'.
+.TP
+.HP
+.B \-\-session <sessionId>
+Restore the application for the given 'sessionId'.
+.TP
+.HP
+.B \-\-cmap
+Causes the application to install a private 
+color map on an 8-bit display.
+.TP
+.HP
+.B \-\-ncols <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.HP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.HP
+.B \-\-dograb
+Running under a debugger can cause an implicit
+-nograb, use -dograb to override.
+.TP
+.HP
+.B \-\-sync
+Switches to synchronous mode for debugging.
+.TP
+.HP
+.B \-\-fn, \-\-font <fontname>
+Defines the application font.
+.TP
+.HP
+.B \-\-bg, \-\-background <color> 
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.HP
+.B \-\-fg, \-\-foreground <color> 
+Sets the default foreground color.
+.TP
+.HP
+.B \-\-btn, \-\-button <color>
+Sets the default button color.
+.TP
+.HP
+.B \-\-name <name>
+Sets the application name.
+.TP
+.HP
+.B \-\-title <title>
+Sets the application title (caption).
+.TP
+.HP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on
+an 8-bit display.
+.TP
+.HP
+.B \-\-inputstyle <inputstyle>
+Sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root.
+.TP
+.HP
+.B \-\-im <XIM server>
+Set XIM server.
+.TP
+.HP
+.B \-\-noxim
+Disable XIM.
+.TP
+.HP
+.B \-\-reverse
+Mirrors the whole layout of widgets.
+.TP
+.B TDE options:
+.TP
+.HP
+.B \-\-caption <caption>
+Use 'caption' as name in the titlebar.
+.TP
+.HP
+.B \-\-icon <icon>
+Use 'icon' as the application icon.
+.TP
+.HP
+.B \-\-miniicon <icon>
+Use 'icon' as the icon in the titlebar.
+.TP
+.HP
+.B \-\-config <filename>
+Use alternative configuration file.
+.TP
+.HP
+.B \-\-dcopserver <server>
+Use the DCOP Server specified by 'server'.
+.TP
+.HP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.HP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.HP
+.B \-\-style <style>
+Sets the application GUI style.
+.TP
+.HP
+.B \-\-geometry <geometry>
+Sets the client geometry of the main widget.
+
+.SH "SEE ALSO"
+.BR passwd (1).
+
+.SH AUTHOR
+Andre Ramos <andre@alunos.di.fc.ul.pt>
diff --git a/doc/man/tdeprintfax.1 b/doc/man/tdeprintfax.1
new file mode 100644
index 000000000..e407c294e
--- /dev/null
+++ b/doc/man/tdeprintfax.1
@@ -0,0 +1,160 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH TDEPRINTFAX 1 "June 2006" "Trinity Desktop Environment" "A fax utility"
+.SH NAME
+tdeprintfax
+\- a interface to fax-packages
+.SH SYNOPSIS
+\fBtdeprintfax\fP [Qt\-options] [TDE\-options] [options] [file] 
+.SH DESCRIPTION
+\fBtdeprintfax\fP is a small fax utility to be used with tdeprint.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B file
+File to fax (added to the file list)
+.SS Options:
+.TP
+.B  \-\-phone  
+Phone number to fax to
+.TP
+.B  \-\-immediate  
+Send fax immediately
+.TP
+.B  \-\-batch  
+Exit after sending
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+Michael Goffioul <tdeprint@swing.be>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/tdesu.1 b/doc/man/tdesu.1
new file mode 100644
index 000000000..fa8c45e09
--- /dev/null
+++ b/doc/man/tdesu.1
@@ -0,0 +1,102 @@
+.TH TDESU 1 "May 2005" "Trinity Desktop Environment" "Runs a program with elevated privileges."
+.SH NAME
+tdesu \- Runs a program with elevated privileges.
+.SH SYNOPSIS
+\fBtdesu\fR [Qt\-options] [TDE\-options] [tdesu options] command 
+.SH DESCRIPTION
+Runs a program with elevated privileges.
+.PP
+TDE su is a graphical front end to the Unix \fBsu\fR utility. It allows you to run programs as another user by entering their password. It is not a SUID root program, but runs unprivileged. The system program \fBsu\fR is used for acquiring special privileges.
+.PP
+\fBtdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBtdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBtdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBtdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security.
+.PP
+\fBtdesu\fR uses normally \fBsu\fR to gain root by using the root password. \fBtdesu\fR can also be configured to use other commands to gain root like sudo to use users password.
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  --help
+Show help about options
+.TP
+.B  --help-qt
+Show Qt specific options
+.TP
+.B  --help-tde
+Show TDE specific options
+.TP
+.B  --help-all
+Show all options
+.TP
+.B  --author
+Show author information
+.TP
+.B -v,  --version
+Show version information
+.TP
+.B  --license
+Show license information
+.SS
+.SS tdesu Options:
+.TP
+.TP
+.B -c <command>
+Specifies the command to run
+.TP
+.B -f <file>
+Run command under target uid if <file> is not writable
+.TP
+.B -u <user>
+Specifies the target uid [default is root]
+.TP
+.B -n
+Do not keep password
+.TP
+.B -s
+Stop the daemon (forgets all passwords)
+.TP
+.B -t
+Enable terminal output (no password keeping)
+.TP
+.B -p <prio>
+Set priority value: 0 <= prio <= 100, 0 is lowest [default is 50]
+.TP
+.B -r
+Use realtime scheduling
+.TP
+.B  --nonewdcop
+Let command use existing dcopserver
+.TP
+.B -i <icon name>
+Specify icon to use in the password dialog
+.TP
+.B -d
+Do not show the command to be run in the dialog
+.SS 
+.SS Arguments:
+.TP
+.B command
+Specifies the command to run
+
+.SH CONFIGURATION FILES
+.PP
+\fBtdesu\fR can be configured with a default configuration file /etc/trinity/tdesurc and with a per user configuration file in .trinity/share/config/tdesurc. Alternative a section could be added to kdeglobals.
+.SH EXAMPLE
+The configuration item for the configuration files is the following:
+.br
+[super-user-command] 
+.br
+super-user-command=sudo
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center. You can also enter the URL
+.BR help:/tdesu/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/tdesu/'"
+from the command-line.
+.br
+.SH AUTHORS
+.br
+Geert Jansen <jansen@kde.org>
+.br
+Pietro Iglio <iglio@fub.it>
+.PP
+This manual page was written by Christopher Martin <chrsmrtn@debian.org> for Debian GNU/Linux, but may be used by others. It borrows from an earlier manpage by Karolina Lindqvist <pgd\-karolinali@algonet.se>.
diff --git a/doc/man/tdm.1 b/doc/man/tdm.1
new file mode 100644
index 000000000..1150fe5a8
--- /dev/null
+++ b/doc/man/tdm.1
@@ -0,0 +1,116 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH TDM 1 "June 2006" "Trinity Desktop Environment" "Trinity Display Manager"
+.SH NAME
+tdm
+\- Trinity Display Manager
+.SH SYNOPSIS
+\fBtdm\fP [options] [tty]
+.SH DESCRIPTION
+\fBtdm\fP is the Trinity display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session.
+.br
+\fBtdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network.
+.sp 1
+\fBtdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP.
+.SH OPTIONS
+.TP
+.B \-daemon
+Daemonize even when started by init
+.TP
+.B \-nodaemon
+Don't daemonize even when started from command line
+.TP
+.BI \-config\  file
+Use alternative master configuration file
+.TP
+.BR \-xrm \ res
+Override frontend\-specific resource
+.TP
+.BI \-error\  file
+Use alternative log file
+.TP
+.BR \-debug \ num
+Debug option bitfield:
+.RS 11
+0x1   \- core log
+.br
+0x2   \- config reader log
+.br
+0x4   \- greeter log
+.br
+0x8   \- IPC log
+.br
+0x10  \- session sub-daemon post-fork delay
+.br
+0x20  \- config reader post-start delay
+.br
+0x40  \- greeter post-start delay
+.br
+0x80  \- don't use syslog
+.br
+0x100 \- core Xauth log
+.br
+0x400 \- valgrind config reader and greeter
+.br
+0x800 \- strace config reader and greeter
+.RE
+.SH FILES
+.TP
+.I /etc/trinity/tdm/backgroundrc
+configuration file with background settings
+.TP
+.I /etc/trinity/tdm/tdm.options
+options for X display manager tdm
+.TP
+.I /etc/trinity/tdm/tdmrc
+the tdm configuration file
+.TP
+.I /etc/trinity/tdm/Xaccess
+access control file for XDMCP connections
+.TP
+.I /etc/trinity/tdm/Xservers
+list of local X-servers
+.TP
+.I /etc/trinity/tdm/Xreset
+script to run as root after session exits
+.TP
+.I /etc/trinity/tdm/Xsession
+script to run as user after login of user
+.TP
+.I /etc/trinity/tdm/Xsetup
+script to run as root before the login dialog appears
+.sp 1
+this script can be edited to disable or modify the running of \fBxconsole\fP on the tdm greeter screen
+.TP
+.I /etc/trinity/tdm/Xstartup
+script to run as root before session starts
+.TP
+.I /etc/trinity/tdm/Xwilling
+output of this script is displayed in the chooser window
+.SH SEE ALSO
+.BR tdm.options (5),\  tdmctl (1),\  tdm_config (1),\  tdm_greet (1),\  startx (1),\  X (7x),\  xconsole (1),\  xdm (1)
+.TP
+.I /opt/trinity/share/doc/tdm/README.gz
+Information about \fBtdm\fP and its options
+.sp 1
+.RE
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/tdm/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/tdm/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Steffen Hansen <hansen@kde.org>
+.br
+Thomas Tanghus <tanghus@earthling.net>
+.br
+Oswald Buddenhagen <ossi@kde.org>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/tdm_config.1 b/doc/man/tdm_config.1
new file mode 100644
index 000000000..b8753b168
--- /dev/null
+++ b/doc/man/tdm_config.1
@@ -0,0 +1,22 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH  TDM_CONFIG 1 "June 2006" "Trinity Desktop Environment" "helper program"
+.SH NAME
+tdm_config
+\- helper programm for tdm to read configuration files
+.SH SYNOPSIS
+\fBtdm_config\fP
+.SH DESCRIPTION
+\fBtdm_config\fP is a helper program for \fBtdm\fP to read configuration files.
+.SH SEE ALSO
+\fBtdm\fP(1)
+.SH AUTHORS
+.nf
+Oswald Buddenhagen <ossi@kde.org>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/tdm_greet.1 b/doc/man/tdm_greet.1
new file mode 100644
index 000000000..10b7bde6e
--- /dev/null
+++ b/doc/man/tdm_greet.1
@@ -0,0 +1,22 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH  TDM_GREET 1 "June 2006" "Trinity Desktop Environment" "TDE greeter module"
+.SH NAME
+tdm_greet
+\- TDE greeter module for tdm
+.SH SYNOPSIS
+\fBtdm_greet\fP
+.SH DESCRIPTION
+\fBtdm_greet\fP is a TDE greeter module for \fBtdm\fP. It shows the login dialog.
+.SH SEE ALSO
+.BR tdm (1)
+.SH AUTHORS
+.nf
+Oswald Buddenhagen <ossi@kde.org>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/tdmctl.1 b/doc/man/tdmctl.1
new file mode 100644
index 000000000..82be6ae16
--- /dev/null
+++ b/doc/man/tdmctl.1
@@ -0,0 +1,220 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH TDMCTL 1 "June 2006" "Trinity Desktop Environment" "TDM remote control application"
+.SH NAME
+tdmctl
+\- tdm remote control application
+.SH SYNOPSIS
+\fBtdmctl\fP [options] [command [command arguments]]
+.SH DESCRIPTION
+\fBtdmctl\fP is an application to remote\-control \fBtdm\fP. It makes use of UNIX domain sockets.
+.sp 1
+There are two types of sockets: the global one (dmctl) and the per\-display ones (dmctl\-<display>). The global one's subdir is owned by root, the subdirs of the per\-display ones' are owned by the user currently owning the session (root or the logged in user).
+.sp 1
+The directory in which the sockets are located is determined this way:
+.RS 3
+\- the \fB\-s\fP option is examined
+.br
+\- the $DM_CONTROL variable is examined
+.br
+\- the tdm config file is searched for the FifoDir key
+.br
+.RI \- /var/run/xdmctl \ and\  /var/run \ are\ tried
+.RE
+.sp 1
+If $DISPLAY is set (or \fB\-d\fP was specified) and \fB\-g\fP was not specified, the
+display\-specific control socket will be used, otherwise the global one.
+.sp 1
+Tokens in the command and the reply are tab\-separated.
+Command arguments can be specified as separate command line parameters,
+in which case they are simply concatenated with tabs in between.
+.sp 1
+If the command is '\-', \fBtdmctl\fP reads commands from stdin.
+The default command is 'caps'.
+.SH OPTIONS
+.SS
+.SS Options:
+.TP
+.B \-h \-help
+print help message.
+.TP
+.B \-g \-global
+Use global control socket even if $DISPLAY is set
+.TP
+.B \-d \-display
+Override $DISPLAY
+.TP
+.B \-s \-sockets
+Override $DM_CONTROL
+.TP
+.B \-c \-config
+Use alternative tdm config file
+.SS Commands:
+.br
+.SS Global commands:
+.TP 
+.B login
+display (now|schedule) user password [session_arguments]
+.br
+ login user at specified display. if "now" is specified, a possibly running session is killed, otherwise the login is done after the session exits.
+.br
+session_arguments are printf\-like escaped contents for \fI.dmrc\fP. Unlisted keys will default to previously saved values.
+.SS Per\-display commands:
+.TP 
+.B lock
+The display is marked as locked. If the X\-Server crashes in this state, no auto\-relogin will be performed even if the option is on.
+.TP 
+.B unlock
+Reverse the effect of "lock": re\-enable auto\-relogin.
+.TP 
+.B suicide
+The currently running session is forcibly terminated. No auto\-relogin is attempted, but a scheduled "login" command will be executed.
+.SS Commands for all sockets:
+.TP
+.B caps
+Returns a list of this socket's capabilities:
+.IP "    \- tdm"
+identifies tdm, in case some other DM implements this protocol, too.
+.IP "    \- list, activate, lock, suicide, login"
+the respective command is supported.
+.IP "    \- bootoptions"
+the "listbootoptions" command and the "=" option to "shutdown" are supported.
+.IP "    \- shutdown <list>"
+"shutdown" is supported and allowed to the listed users (comma\-separated). "*" means all authenticated users.
+.IP "    \- shutdown"
+"shutdown" is supported and allowed to everybody.
+.IP "    \- nuke <list>"
+forced shutdown is allowed to the listed users.
+.IP "    \- nuke"
+forced shutdown is allowed to everybody.
+.IP "    \- reserve <number>"
+reserve displays are configured and <number> are available at this time.
+.TP 
+\fBlist\fP [all|alllocal]
+.br
+Return a list of running sessions. By default all active sessions are listed. If "all" is specified, passive sessions are listed as well. If "alllocal" is specified, passive sessions are listed as well, but all incoming remote sessions are skipped.
+.sp 1
+Each session entry is a comma\-separated tuple of:
+.RS 7
+\- Display or TTY name
+.br
+\- VT name for local sessions
+.br
+\- Logged in user's name, empty for passive sessions and outgoing
+.br
+  remote sessions (local chooser mode)
+.br
+\- Session type or remote host for outgoing remote sessions,
+.br
+  empty for passive sessions
+.br
+\- A flag field:
+.RS 5
+\- "t" for tty sessions
+.br
+\- "*" for the display belonging to the requesting socket
+.br
+\- "!" for sessions that cannot be killed by the requesting
+.br
+  socket
+.br
+\- New flags might be added later
+.br
+.RE
+\- New fields might be added later
+.RE
+.TP
+\fBreserve\fP [timeout in seconds]
+.br
+Start a reserve login screen. If nobody logs in within the specified amount of time (one minute by default), the display is removed again. When the session on the display exits, the display is removed, too.
+.br
+Permitted only on sockets of local displays and the global socket.
+.TP
+\fBactivate\fP (vt|display)
+.br
+Switch to a particular VT (virtual terminal). The VT may be specified either directly (e.g., vt3) or by a display using it (e.g., :2).
+.br
+Permitted only on sockets of local displays and the global socket.
+.TP
+.B listbootoptions
+List available boot options.
+.br
+=> "ok" list default current default and current are indices into the list and are \-1 if unset or undeterminable.
+.TP
+\fBshutdown\fP (reboot|halt) [=bootchoice]
+.br
+  (ask|trynow|forcenow|schedule|start
+.br
+   (\-1|end (force|forcemy|cancel)))
+.br
+.RS 7
+Request a system shutdown, either a reboot or a halt/poweroff.
+.sp 1
+An OS choice for the next boot may be specified from the list returned by "listbootoptions".
+.sp 1
+Shutdowns requested from per\-display sockets are executed when the current session on that display exits. Such a request may pop up a dialog asking for confirmation and/or authentication.
+.sp 1
+start is the time for which the shutdown is scheduled. If it starts with a plus\-sign, the current time is added. Zero means immediately.
+.sp 1
+end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBTDM\fP can do one of the following:
+.RS 3
+- "cancel" \- give up the shutdown.
+.br
+- "force" \- shut down nonetheless.
+.br
+- "forcemy" \- shut down nonetheless if all active sessions
+.br
+   belong to the requesting user. Only for per\-display sockets.
+.RE
+.sp 1
+start and end are specified in seconds since the UNIX epoch.
+.sp 1
+"trynow" is a synonym for "0 0 cancel", "forcenow" for "0 0 force" and "schedule" for "0 \-1".
+.sp 1
+"ask" attempts an immediate shutdown and interacts with the user if active sessions are still running. Only for per\-display sockets.
+.RE
+.TP
+\fBshutdown cancel\fP [local|global]
+.br
+Cancel a scheduled shutdown. The global socket always cancels the currently pending shutdown, while per\-display sockets default to cancelling their queued request.
+.TP
+\fBshutdown status\fP
+Return a list with information about shutdowns.
+.br
+The entries are comma\-separated tuples of:
+.RS 10
+\- ("global"|"local") \- pending vs. queued shutdown. A local
+.br
+  entry can be returned only by a per\-display socket.
+.br
+\- ("halt"|"reboot")
+.br
+\- start
+.br
+\- end
+.br
+\- ("ask"|"force"|"forcemy"|"cancel")
+.br
+\- Numeric user ID of the requesting user, \-1 for the global
+.br
+  socket.
+.br
+\- The next boot OS choice or "\-" for none.
+.br
+\- New fields might be added later.
+.RE
+.SH SEE ALSO
+.BR tdm (1)
+.TP
+.I /opt/trinity/share/doc/tdm/README.gz
+Information about the command sockets (and \fBtdm\fP)
+.SH AUTHORS
+.nf
+Oswald Buddenhagen <ossi@kde.org>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/tdeprint/cups-config.docbook b/doc/tdeprint/cups-config.docbook
index 8f7bf8677..637ce9619 100644
--- a/doc/tdeprint/cups-config.docbook
+++ b/doc/tdeprint/cups-config.docbook
@@ -475,7 +475,7 @@ url="http://localhost:631/">http://localhost:631/</ulink>).</para>
 to <systemitem class="username">root</systemitem>, so never do this,
 as it only involves dangers. Should anyone discover security
 vulnerabilities in one of the used file filters, printer drivers or
-<acronym>CGI</acronym> programs, he could remotely execute arbitrary
+<acronym>CGI</acronym> programs, they could remotely execute arbitrary
 commands on your system with root user privileges. Always use an
 unprivileged account for the server directive
 <guilabel>User</guilabel>.</para>
diff --git a/doc/tdeprint/cupsoptions.docbook b/doc/tdeprint/cupsoptions.docbook
index 0648510db..5468e0594 100644
--- a/doc/tdeprint/cupsoptions.docbook
+++ b/doc/tdeprint/cupsoptions.docbook
@@ -121,7 +121,7 @@ users:</para>
 <para>will allow the usage of this (believe me: very nice and also very
 professional) printer to only the three mentioned users and at the same
 time deny it to all others. If another user wants to print on the
-DigiMaster via this &CUPS; server, he will receive an error message
+DigiMaster via this &CUPS; server, they will receive an error message
 along the lines <errortype>client-error-not-possible</errortype>.</para>
 
 <screen><userinput><command>lpadmin</command> <option>-p</option> <parameter>HeidelbergDigimaster9110</parameter> <option>-v</option> <parameter>lpd:/10.160.16.99/mqueue</parameter> <option>-u</option> <parameter>deny:tackat,boss,waba</parameter> <option>-E</option> <option>-P</option> <parameter>/home/kurt/PPDs/DVHV.ppd</parameter></userinput></screen>
@@ -129,7 +129,7 @@ along the lines <errortype>client-error-not-possible</errortype>.</para>
 <para>will deny the usage of this same printer to the three mentioned
 users and at the same time allow it to all others. If
 <quote>denied</quote> user wants to print on the DigiMaster via this
-&CUPS; server, he will receive an error message along the lines
+&CUPS; server, they will receive an error message along the lines
 <errortype>client-error-not-possible</errortype>.</para>
 
 <note>
@@ -255,8 +255,8 @@ is defined)</para>
 <sect3>
 <title>Related Error Messages</title>
 
-<para>Once a user reaches his quota limit, he'll get a
-<errortype>client-error-not-possible</errortype> message, if he wants to
+<para>Once a user reaches their quota limit, they'll get a
+<errortype>client-error-not-possible</errortype> message, if they want to
 print.</para>
 
 </sect3>
@@ -315,7 +315,7 @@ file.</para>
 </question>
 <answer>
 <para>User is either not allowed to print to a certain printer or has
-achieved his quota (based on file size and/or page number)</para>
+achieved their quota (based on file size and/or page number)</para>
 </answer>
 </qandaentry>
 
diff --git a/doc/tdeprint/rlpr.docbook b/doc/tdeprint/rlpr.docbook
index fab48d7bb..a8def77e6 100644
--- a/doc/tdeprint/rlpr.docbook
+++ b/doc/tdeprint/rlpr.docbook
@@ -8,7 +8,7 @@ Utility</title>
 <para>Printer management: basic operations are supported
 (add/remove/modify).</para>
 
-<para>Each user can predefine the printers he wants to use by specifying
+<para>Each user can predefine the printers they want to use by specifying
 the host and related printer queues. Printers are stored on a <quote>per
 user basis</quote>. This module is built around the
 <application>rlpr</application> utility <ulink
diff --git a/doc/tdeprint/theory.docbook b/doc/tdeprint/theory.docbook
index 909cd19bb..4722ec366 100644
--- a/doc/tdeprint/theory.docbook
+++ b/doc/tdeprint/theory.docbook
@@ -17,7 +17,7 @@ needs extra theory to solve a practical problem.</para>
 
 
 <para>Earlier on in history, every developer of a program that was
-capable of producing printable output had to write his own printer
+capable of producing printable output had to write their own printer
 drivers too.  That was quite complicated, because different programs
 have different file formats.  Even programs with the same purpose, for
 example: word processors, often do not understand each other's formats.
@@ -41,8 +41,8 @@ paper (or other output devices, like monitors, photo typesetters, &etc;)
 in a common way, was a move that filled a big gap. <!-- FIXME --></para>
 
 <para>One such development was &PostScript; by Adobe.  It meant that an
-application programmer could concentrate on making his program generate
-a &PostScript; language description of his printable page, while
+application programmer could concentrate on making their program generate
+a &PostScript; language description of their printable page, while
 printing device developers could focus on making their devices
 &PostScript; literate.</para>
 
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp
index 8078f94be..813020190 100644
--- a/drkonqi/backtrace.cpp
+++ b/drkonqi/backtrace.cpp
@@ -89,7 +89,7 @@ void BackTrace::start()
   {
     TQObject * o = parent();
 
-    if (o && !o->inherits(TQWIDGET_OBJECT_NAME_STRING))
+    if (o && !o->inherits("TQWidget"))
     {
       o = NULL;
     }
@@ -148,10 +148,10 @@ void BackTrace::start()
     *m_proc << "tdesu -t --comment \"" << i18n("Administrative access is required to generate a backtrace") << "\" -c \"" << m_temp_cmd->name() << "\"";
   }
 
-  connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
-          TQT_SLOT(slotReadInput(TDEProcess*, char*, int)));
-  connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)),
-          TQT_SLOT(slotProcessExited(TDEProcess*)));
+  connect(m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+          TQ_SLOT(slotReadInput(TDEProcess*, char*, int)));
+  connect(m_proc, TQ_SIGNAL(processExited(TDEProcess*)),
+          TQ_SLOT(slotProcessExited(TDEProcess*)));
 
   m_proc->start ( TDEProcess::NotifyOnExit, TDEProcess::All );
 }
diff --git a/drkonqi/backtrace.h b/drkonqi/backtrace.h
index 94f5bcf9f..5bcd1822e 100644
--- a/drkonqi/backtrace.h
+++ b/drkonqi/backtrace.h
@@ -36,7 +36,7 @@ class KTempFile;
 
 class BackTrace : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   BackTrace(const KrashConfig *krashconf, TQObject *parent,
diff --git a/drkonqi/bugdescriptiondialog.cpp b/drkonqi/bugdescriptiondialog.cpp
index 6d6b2d75a..32c7b4b2d 100644
--- a/drkonqi/bugdescriptiondialog.cpp
+++ b/drkonqi/bugdescriptiondialog.cpp
@@ -94,7 +94,7 @@ BugDescriptionDialog::BugDescriptionDialog( TQWidget * parentw, bool modal, cons
 	lay->addWidget( m_descriptionLabel );
 	
 	// The multiline-edit
-	m_lineedit = new TQMultiLineEdit( parent, TQMULTILINEEDIT_OBJECT_NAME_STRING );
+	m_lineedit = new TQMultiLineEdit( parent, "TQMultiLineEdit" );
 	m_lineedit->setMinimumHeight( 180 ); // make it big
 	m_lineedit->setWordWrap(TQMultiLineEdit::WidgetWidth);
 	lay->addWidget( m_lineedit, 10 /*stretch*/ );
diff --git a/drkonqi/crashtest.cpp b/drkonqi/crashtest.cpp
index f1ff70df4..0141b1031 100644
--- a/drkonqi/crashtest.cpp
+++ b/drkonqi/crashtest.cpp
@@ -21,7 +21,7 @@ void WorkerObject::run()
 #define SET_UP_WORKER(x, y)												\
 	WorkerObject x;													\
 	x.moveToThread(&y);												\
-	TQTimer::singleShot(0, &x, SLOT(run()));
+	TQTimer::singleShot(0, &x, TQ_SLOT(run()));
 
 static TDECmdLineOptions options[] =
 {
diff --git a/drkonqi/crashtest.h b/drkonqi/crashtest.h
index a3fe0cb2a..d2a769a1b 100644
--- a/drkonqi/crashtest.h
+++ b/drkonqi/crashtest.h
@@ -31,7 +31,7 @@
 
 class WorkerObject : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public slots:
 		void run();
diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp
index 4e3622e12..2de6fb3f8 100644
--- a/drkonqi/debugger.cpp
+++ b/drkonqi/debugger.cpp
@@ -64,10 +64,10 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent,
   //m_copyButton = new KPushButton( KStdGuiItem::copy(), w );
   KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "edit-copy" ) );
   m_copyButton = new KPushButton( item, w );
-  connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) );
+  connect( m_copyButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCopy() ) );
   m_copyButton->setEnabled( false );
   m_saveButton = new KPushButton( m_krashconf->safeMode() ? KStdGuiItem::save() : KStdGuiItem::saveAs(), w );
-  connect( m_saveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSave() ) );
+  connect( m_saveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSave() ) );
   m_saveButton->setEnabled( false );
 }
 
@@ -193,12 +193,12 @@ void KrashDebugger :: startDebugger()
   }
   m_status->setText(i18n("Loading symbols..."));
 
-  m_proctrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this));
+  m_proctrace = new BackTrace(m_krashconf, this);
 
-  connect(m_proctrace, TQT_SIGNAL(append(const TQString &)),
-          TQT_SLOT(slotAppend(const TQString &)));
-  connect(m_proctrace, TQT_SIGNAL(done(const TQString&)), TQT_SLOT(slotDone(const TQString&)));
-  connect(m_proctrace, TQT_SIGNAL(someError()), TQT_SLOT(slotSomeError()));
+  connect(m_proctrace, TQ_SIGNAL(append(const TQString &)),
+          TQ_SLOT(slotAppend(const TQString &)));
+  connect(m_proctrace, TQ_SIGNAL(done(const TQString&)), TQ_SLOT(slotDone(const TQString&)));
+  connect(m_proctrace, TQ_SIGNAL(someError()), TQ_SLOT(slotSomeError()));
 
   m_proctrace->start();
 }
diff --git a/drkonqi/debugger.h b/drkonqi/debugger.h
index 0604d5fcf..64276b2c8 100644
--- a/drkonqi/debugger.h
+++ b/drkonqi/debugger.h
@@ -38,7 +38,7 @@ class BackTrace;
 
 class KrashDebugger : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KrashDebugger(const KrashConfig *krashconf, TQWidget *parent = 0, const char *name = 0);
diff --git a/drkonqi/drbugreport.h b/drkonqi/drbugreport.h
index a76740416..17585c321 100644
--- a/drkonqi/drbugreport.h
+++ b/drkonqi/drbugreport.h
@@ -34,7 +34,7 @@ class TDEAboutData;
 
 class DrKBugReport : public KBugReport
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/drkonqi/krashconf.h b/drkonqi/krashconf.h
index d3d27e160..be823cba1 100644
--- a/drkonqi/krashconf.h
+++ b/drkonqi/krashconf.h
@@ -36,7 +36,7 @@
 
 class KrashConfig : public TQObject, public KrashDCOPInterface
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KrashConfig();
diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp
index a4ad27603..0e3a38a49 100644
--- a/drkonqi/toplevel.cpp
+++ b/drkonqi/toplevel.cpp
@@ -89,8 +89,8 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name)
   showButton( User2, m_krashconf->showDebugger() );
   showButton( User3, true );
 
-  connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(accept()));
-  connect(m_krashconf, TQT_SIGNAL(newDebuggingApplication(const TQString&)), TQT_SLOT(slotNewDebuggingApp(const TQString&)));
+  connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(accept()));
+  connect(m_krashconf, TQ_SIGNAL(newDebuggingApplication(const TQString&)), TQ_SLOT(slotNewDebuggingApp(const TQString&)));
 
   if ( !m_krashconf->safeMode() && kapp->dcopClient()->attach() )
     kapp->dcopClient()->registerAs( kapp->name() );
@@ -156,12 +156,12 @@ void Toplevel :: slotUser1()
   m_bugreport = new DrKBugReport(0, true, m_krashconf->aboutData());
 
   if (i == KMessageBox::Yes) {
-    TQApplication::setOverrideCursor ( tqwaitCursor );
+    TQApplication::setOverrideCursor ( TQt::waitCursor );
 
     // generate the backtrace
-    BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this));
-    connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotBacktraceSomeError()));
-    connect(backtrace, TQT_SIGNAL(done(const TQString &)), TQT_SLOT(slotBacktraceDone(const TQString &)));
+    BackTrace *backtrace = new BackTrace(m_krashconf, this);
+    connect(backtrace, TQ_SIGNAL(someError()), TQ_SLOT(slotBacktraceSomeError()));
+    connect(backtrace, TQ_SIGNAL(done(const TQString &)), TQ_SLOT(slotBacktraceDone(const TQString &)));
 
     backtrace->start();
 
@@ -195,12 +195,12 @@ void Toplevel :: slotNewDebuggingApp(const TQString& launchName)
 void Toplevel :: slotUser3()
 {
 	enableButton(User3, false);
-	TQApplication::setOverrideCursor ( tqwaitCursor );
+	TQApplication::setOverrideCursor ( TQt::waitCursor );
 
 	// generate the backtrace
-	BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this));
-	connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotSendReportBacktraceSomeError()));
-	connect(backtrace, TQT_SIGNAL(done(const TQString &)), TQT_SLOT(slotSendReportBacktraceDone(const TQString &)));
+	BackTrace *backtrace = new BackTrace(m_krashconf, this);
+	connect(backtrace, TQ_SIGNAL(someError()), TQ_SLOT(slotSendReportBacktraceSomeError()));
+	connect(backtrace, TQ_SIGNAL(done(const TQString &)), TQ_SLOT(slotSendReportBacktraceDone(const TQString &)));
 
 	backtrace->start();
 
@@ -399,13 +399,13 @@ int Toplevel::postCrashDataToServer(TQCString data) {
 	TDEIO::TransferJob* job = TDEIO::http_post(url, postData, true);
 	job->addMetaData("content-type", TQString("Content-Type: multipart/form-data; boundary=%1").arg(formDataBoundary));
 	job->addMetaData("referrer", "http://drkonqi-client.crashreport.trinitydesktop.org");
-	connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(postCrashDataToServerData(TDEIO::Job *, const TQByteArray &)));
-	connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(postCrashDataToServerResult(TDEIO::Job *)));
-// 	connect(job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
-// 		TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
-// 	connect(job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
-// 		TQT_SLOT(mimetype(TDEIO::Job *, const TQString &)));
-	connect(job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)), TQT_SLOT(postCrashDataToServerDataRedirection(TDEIO::Job *, const KURL&)));
+	connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQ_SLOT(postCrashDataToServerData(TDEIO::Job *, const TQByteArray &)));
+	connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(postCrashDataToServerResult(TDEIO::Job *)));
+// 	connect(job, TQ_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
+// 		TQ_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
+// 	connect(job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+// 		TQ_SLOT(mimetype(TDEIO::Job *, const TQString &)));
+	connect(job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)), TQ_SLOT(postCrashDataToServerDataRedirection(TDEIO::Job *, const KURL&)));
 
 	return 0;
 }
diff --git a/drkonqi/toplevel.h b/drkonqi/toplevel.h
index 06b23173b..c3179e907 100644
--- a/drkonqi/toplevel.h
+++ b/drkonqi/toplevel.h
@@ -42,7 +42,7 @@ class BugDescription;
 
 class Toplevel : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   Toplevel(KrashConfig *krash, TQWidget *parent = 0, const char * name = 0);
diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp
index fd6fd1283..a5290e531 100644
--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@@ -77,23 +77,23 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
   layout->addWidget( mSummary );
 
   KButtonBox* bbox = new KButtonBox( this );
-  mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "edit-find"), TQT_TQOBJECT(this), TQT_SLOT( slotScan() ) );
+  mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "edit-find"), this, TQ_SLOT( slotScan() ) );
   bbox->addStretch( 5 );
-  mSelectButton = bbox->addButton( i18n( "Select All" ), TQT_TQOBJECT(this),
-                                   TQT_SLOT( slotSelectAll() ) );
+  mSelectButton = bbox->addButton( i18n( "Select All" ), this,
+                                   TQ_SLOT( slotSelectAll() ) );
   mSelectButton->setEnabled( false );
-  mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this),
-                                     TQT_SLOT( slotUnselectAll() ) );
+  mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), this,
+                                     TQ_SLOT( slotUnselectAll() ) );
   mUnSelectButton->setEnabled( false );
   bbox->addStretch( 5 );
-  mApplyButton = bbox->addButton( KStdGuiItem::apply(), TQT_TQOBJECT(this), TQT_SLOT( slotCreate() ) );
+  mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQ_SLOT( slotCreate() ) );
   mApplyButton->setEnabled( false );
-  bbox->addButton( KStdGuiItem::close(), TQT_TQOBJECT(kapp), TQT_SLOT( quit() ) );
+  bbox->addButton( KStdGuiItem::close(), kapp, TQ_SLOT( quit() ) );
   bbox->layout();
 
   layout->addWidget( bbox );
 
-	connect( kapp, TQT_SIGNAL( lastWindowClosed() ), kapp, TQT_SLOT( quit() ) );
+	connect( kapp, TQ_SIGNAL( lastWindowClosed() ), kapp, TQ_SLOT( quit() ) );
 
   mAppCache.setAutoDelete( true );
 
@@ -105,7 +105,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
   TDEStartupInfo::appStarted();
 
   TQAccel *accel = new TQAccel( this );
-  accel->connectItem( accel->insertItem( Key_Q + CTRL ), kapp, TQT_SLOT( quit() ) );
+  accel->connectItem( accel->insertItem( Key_Q + CTRL ), kapp, TQ_SLOT( quit() ) );
 
   TDEAcceleratorManager::manage( this );
 }
diff --git a/kappfinder/toplevel.h b/kappfinder/toplevel.h
index 69e83eb5a..9e3dd2422 100644
--- a/kappfinder/toplevel.h
+++ b/kappfinder/toplevel.h
@@ -35,7 +35,7 @@ class TQPushButton;
 
 class TopLevel : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     TopLevel( const TQString &destDir, TQWidget *parent = 0, const char *name = 0 );
diff --git a/kate/README b/kate/README
index 67eb04be6..6d0d7d04d 100644
--- a/kate/README
+++ b/kate/README
@@ -19,6 +19,6 @@ Licensing:
 The Kate app/utils/interfaces and KWrite app are licensed under the LGPL VERSION 2.
 
                 *** Undocumented features in Kate version 2.5.2 ***
-* The KateApplication DCOP interface has a function QString session() that
+* The KateApplication DCOP interface has a function TQString session() that
 returns the name of the active session (which might be an empty string).
 (but hey, documentation of the DCOP interface is missing completely)
\ No newline at end of file
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index 0176545fa..0e4c18121 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -69,10 +69,10 @@ KateApp::KateApp (TDECmdLineArgs *args)
   m_application = new Kate::Application (this);
 
   // doc + project man
-  m_docManager = new KateDocManager (TQT_TQOBJECT(this));
+  m_docManager = new KateDocManager (this);
 
   // init all normal plugins
-  m_pluginManager = new KatePluginManager (TQT_TQOBJECT(this));
+  m_pluginManager = new KatePluginManager (this);
 
   // session manager up
   m_sessionManager = KateSessionManager::self();
diff --git a/kate/app/kateapp.h b/kate/app/kateapp.h
index f421df5a7..47918a46f 100644
--- a/kate/app/kateapp.h
+++ b/kate/app/kateapp.h
@@ -41,7 +41,7 @@ class TDECmdLineArgs;
  */
 class KDE_EXPORT KateApp : public TDEApplication
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   /**
    * constructors & accessor to app object + plugin interface for it
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index 883730c08..1d3cfd5aa 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -102,7 +102,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   config->setGroup("General");
 
   // GROUP with the one below: "Appearance"
-  TQButtonGroup *bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("&Appearance"), frGeneral );
+  TQButtonGroup *bgStartup = new TQButtonGroup( 1, TQt::Horizontal, i18n("&Appearance"), frGeneral );
   lo->addWidget( bgStartup );
 
   // show full path in title
@@ -110,13 +110,13 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   cb_fullPath = new TQCheckBox(i18n("&Show full path in title"), bgStartup);
   cb_fullPath->setChecked(mainWindow->viewManager()->getShowFullPath());
   TQWhatsThis::add(cb_fullPath, i18n("If this option is checked, the full document path will be shown in the window caption."));
-  connect(cb_fullPath, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(cb_fullPath, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   // show session name in title
   cb_showSessionName = new TQCheckBox(i18n("Show s&ession name in title"), bgStartup);
   cb_showSessionName->setChecked(parent->showSessionName);
   TQWhatsThis::add(cb_showSessionName, i18n("If this option is checked, the session name will be shown in the window caption."));
-  connect(cb_showSessionName, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(cb_showSessionName, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   // sort filelist if desired
   cb_sortFiles = new TQCheckBox(bgStartup);
@@ -124,10 +124,10 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   cb_sortFiles->setChecked(parent->filelist->sortType() == KateFileList::sortByName);
   TQWhatsThis::add( cb_sortFiles, i18n(
         "If this is checked, the files in the file list will be sorted alphabetically.") );
-  connect( cb_sortFiles, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( cb_sortFiles, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
 
   // GROUP with the one below: "Behavior"
-  bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("&Behavior"), frGeneral );
+  bgStartup = new TQButtonGroup( 1, TQt::Horizontal, i18n("&Behavior"), frGeneral );
   lo->addWidget( bgStartup );
 
   // number of recent files
@@ -142,7 +142,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
         "some items forgotten.</qt>") );
   TQWhatsThis::add( lNrf, numRecentFileHelpString );
   TQWhatsThis::add( sb_numRecentFiles, numRecentFileHelpString );
-  connect( sb_numRecentFiles, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( sb_numRecentFiles, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) );
 
   // Use only one instance of kate (MDI) ?
   cb_useInstance = new TQCheckBox(bgStartup);
@@ -151,7 +151,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   TQWhatsThis::add( cb_useInstance, i18n(
         "When checked, all files opened from outside of Kate will only use the "
         "currently opened instance of Kate.") );
-  connect( cb_useInstance, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( cb_useInstance, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
 
   // sync the konsole ?
   cb_syncKonsole = new TQCheckBox(bgStartup);
@@ -161,7 +161,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
         "If this is checked, the built in Konsole will <code>cd</code> to the directory "
         "of the active document when started and whenever the active document changes, "
         "if the document is a local file.") );
-  connect( cb_syncKonsole, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( cb_syncKonsole, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
 
   // modified files notification
   cb_modNotifications = new TQCheckBox(
@@ -172,11 +172,11 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
       "files that have been modified on the hard disk. If not enabled, you will "
       "be asked what to do with a file that has been modified on the hard disk only "
       "when that file gains focus inside Kate.") );
-  connect( cb_modNotifications, TQT_SIGNAL( toggled( bool ) ),
-           this, TQT_SLOT( slotChanged() ) );
+  connect( cb_modNotifications, TQ_SIGNAL( toggled( bool ) ),
+           this, TQ_SLOT( slotChanged() ) );
 
   // GROUP with the one below: "Meta-informations"
-  bgStartup = new TQButtonGroup( 2, Qt::Horizontal, i18n("Meta-Information"), frGeneral );
+  bgStartup = new TQButtonGroup( 2, TQt::Horizontal, i18n("Meta-Information"), frGeneral );
   lo->addWidget( bgStartup );
 
   // save meta infos
@@ -187,7 +187,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
         "Check this if you want document configuration like for example "
         "bookmarks to be saved past editor sessions. The configuration will be "
         "restored if the document has not changed when reopened."));
-  connect( cb_saveMetaInfos, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( cb_saveMetaInfos, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
 
   // meta infos days
   TQHBox *hbDmf = new TQHBox( bgStartup );
@@ -198,8 +198,8 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   sb_daysMetaInfos->setSuffix(i18n(" day(s)"));
   sb_daysMetaInfos->setValue( KateDocManager::self()->getDaysMetaInfos() );
   lDmf->setBuddy( sb_daysMetaInfos );
-  connect( cb_saveMetaInfos, TQT_SIGNAL( toggled( bool ) ), hbDmf, TQT_SLOT( setEnabled( bool ) ) );
-  connect( sb_daysMetaInfos, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( cb_saveMetaInfos, TQ_SIGNAL( toggled( bool ) ), hbDmf, TQ_SLOT( setEnabled( bool ) ) );
+  connect( sb_daysMetaInfos, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) );
 
   lo->addStretch(1); // :-] works correct without autoadd
   //END General page
@@ -214,7 +214,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   lo->setSpacing(KDialog::spacingHint());
 
   // GROUP with the one below: "Startup"
-  bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Elements of Sessions"), frSessions );
+  bgStartup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Elements of Sessions"), frSessions );
   lo->addWidget( bgStartup );
 
   // restore view  config
@@ -224,11 +224,11 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   cb_restoreVC->setChecked( config->readBoolEntry("Restore Window Configuration", true) );
   TQWhatsThis::add(cb_restoreVC, i18n(
         "Check this if you want all your views and frames restored each time you open Kate"));
-  connect( cb_restoreVC, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( cb_restoreVC, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
 
   TQRadioButton *rb1, *rb2, *rb3;
 
-  sessions_start = new TQButtonGroup( 1, Qt::Horizontal, i18n("Behavior on Application Startup"), frSessions );
+  sessions_start = new TQButtonGroup( 1, TQt::Horizontal, i18n("Behavior on Application Startup"), frSessions );
   lo->add (sessions_start);
 
   sessions_start->setRadioButtonExclusive( true );
@@ -245,11 +245,11 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   else
     sessions_start->setButton (2);
 
-  connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(rb3, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(rb3, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
-  sessions_exit = new TQButtonGroup( 1, Qt::Horizontal, i18n("Behavior on Application Exit or Session Switch"), frSessions );
+  sessions_exit = new TQButtonGroup( 1, TQt::Horizontal, i18n("Behavior on Application Exit or Session Switch"), frSessions );
   lo->add (sessions_exit);
 
   sessions_exit->setRadioButtonExclusive( true );
@@ -266,9 +266,9 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   else
     sessions_exit->setButton (2);
 
-  connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(rb3, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(rb3, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   lo->addStretch(1); // :-] works correct without autoadd
   //END Session page
@@ -282,7 +282,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
                               BarIcon("document-open", TDEIcon::SizeSmall) );
   fileSelConfigPage = new KFSConfigPage( page, "file selector config page",
                                          mainWindow->fileselector );
-  connect( fileSelConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
+  connect( fileSelConfigPage, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) );
   path.clear();
 
   path << i18n("Application") << i18n("Document List");
@@ -290,14 +290,14 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   BarIcon("view_text", TDEIcon::SizeSmall) );
   filelistConfigPage = new KFLConfigPage( page, "file list config page",
 					  mainWindow->filelist );
-  connect( filelistConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
+  connect( filelistConfigPage, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) );
   path.clear();
 
   path << i18n("Application") << i18n("Plugins");
   /*TQVBox **/page=addVBoxPage(path,i18n("Plugin Manager"),
                           BarIcon("connect_established",TDEIcon::SizeSmall));
   KateConfigPluginPage *configPluginPage = new KateConfigPluginPage(page, this);
-  connect( configPluginPage, TQT_SIGNAL( changed() ), TQT_TQOBJECT(this), TQT_SLOT( slotChanged() ) );
+  connect( configPluginPage, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) );
 
   // Tools->External Tools menu
   path.clear();
@@ -305,7 +305,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   page = addVBoxPage( path, i18n("External Tools"),
       BarIcon("configure", TDEIcon::SizeSmall) );
   configExternalToolsPage = new KateExternalToolsConfigWidget(page, "external tools config page");
-  connect( configExternalToolsPage, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotChanged()) );
+  connect( configExternalToolsPage, TQ_SIGNAL(changed()), this, TQ_SLOT(slotChanged()) );
 
   // editor widgets from kwrite/kwdialog
   path.clear();
@@ -320,7 +320,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
                               KTextEditor::configInterfaceExtension (v->document())->configPagePixmap(i, TDEIcon::SizeSmall) );
 
     KTextEditor::ConfigPage *cPage = KTextEditor::configInterfaceExtension (v->document())->configPage(i, page);
-    connect( cPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
+    connect( cPage, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) );
     editorPages.append (cPage);
   }
 
@@ -356,7 +356,7 @@ void KateConfigDialog::addPluginPage (Kate::Plugin *plugin)
     PluginPageListItem *info=new PluginPageListItem;
     info->plugin = plugin;
     info->page = Kate::pluginConfigInterfaceExtension(plugin)->configPage (i, page);
-    connect( info->page, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
+    connect( info->page, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) );
     pluginPages.append(info);
   }
 }
diff --git a/kate/app/kateconfigdialog.h b/kate/app/kateconfigdialog.h
index a90cdd1c0..91b84ee5d 100644
--- a/kate/app/kateconfigdialog.h
+++ b/kate/app/kateconfigdialog.h
@@ -43,7 +43,7 @@ struct PluginPageListItem
 
 class KateConfigDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateConfigDialog (KateMainWindow *parent, Kate::View *view);
diff --git a/kate/app/kateconfigplugindialogpage.cpp b/kate/app/kateconfigplugindialogpage.cpp
index 90d7262e5..d2b17eb52 100644
--- a/kate/app/kateconfigplugindialogpage.cpp
+++ b/kate/app/kateconfigplugindialogpage.cpp
@@ -82,7 +82,7 @@ KateConfigPluginPage::KateConfigPluginPage(TQWidget *parent, KateConfigDialog *d
   listView->addColumn(i18n("Comment"));
   TQWhatsThis::add(listView,i18n("Here you can see all available Kate plugins. Those with a check mark are loaded, and will be loaded again the next time Kate is started."));
 
-  connect(listView, TQT_SIGNAL(stateChange(KatePluginListItem *, bool)), this, TQT_SLOT(stateChange(KatePluginListItem *, bool)));
+  connect(listView, TQ_SIGNAL(stateChange(KatePluginListItem *, bool)), this, TQ_SLOT(stateChange(KatePluginListItem *, bool)));
 
   KatePluginList &pluginList (KatePluginManager::self()->pluginList());
   for (unsigned int i=0; i < pluginList.size(); ++i)
diff --git a/kate/app/kateconfigplugindialogpage.h b/kate/app/kateconfigplugindialogpage.h
index 009f30739..018c97dfa 100644
--- a/kate/app/kateconfigplugindialogpage.h
+++ b/kate/app/kateconfigplugindialogpage.h
@@ -31,7 +31,7 @@ class KatePluginListItem;
 
 class KatePluginListView : public TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KatePluginListItem;
 
@@ -47,7 +47,7 @@ class KatePluginListView : public TDEListView
 
 class KateConfigPluginPage: public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateConfigPluginPage(TQWidget *parent, class KateConfigDialog *dialog);
diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp
index cb49ef16e..1e87a59d8 100644
--- a/kate/app/kateconsole.cpp
+++ b/kate/app/kateconsole.cpp
@@ -50,7 +50,7 @@ KateConsole::KateConsole (KateMainWindow *mw, KateMDI::ToolView* parent)
 KateConsole::~KateConsole ()
 {
   if (m_part)
-    disconnect ( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
+    disconnect ( m_part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) );
 }
 
 void KateConsole::loadConsoleIfNeeded()
@@ -64,7 +64,7 @@ void KateConsole::loadConsoleIfNeeded()
 
   if (!factory) return;
 
-  m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this),"libkonsolepart", "KParts::ReadOnlyPart"));
+  m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this,"libkonsolepart", "KParts::ReadOnlyPart"));
 
   if (!m_part) return;
 
@@ -74,7 +74,7 @@ void KateConsole::loadConsoleIfNeeded()
 
   m_part->widget()->show();
 
-  connect ( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
+  connect ( m_part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) );
 
   if (m_mw->viewManager()->activeView())
     if (m_mw->viewManager()->activeView()->getDoc()->url().isValid())
diff --git a/kate/app/kateconsole.h b/kate/app/kateconsole.h
index dabfda38d..77fa455a4 100644
--- a/kate/app/kateconsole.h
+++ b/kate/app/kateconsole.h
@@ -44,7 +44,7 @@ class KateMainWindow;
  */
 class KateConsole : public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp
index aac535a7e..d592edd13 100644
--- a/kate/app/katedocmanager.cpp
+++ b/kate/app/katedocmanager.cpp
@@ -116,7 +116,7 @@ Kate::Document *KateDocManager::createDoc ()
   emit documentCreated ((Kate::Document *)doc);
   emit m_documentManager->documentCreated ((Kate::Document *)doc);
 
-  connect(doc,TQT_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,TQT_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char)));
+  connect(doc,TQ_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,TQ_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char)));
   return (Kate::Document *)doc;
 }
 
@@ -256,7 +256,7 @@ Kate::Document *KateDocManager::openURL (const KURL& url,const TQString &encodin
       }
     }
 
-    connect(doc, TQT_SIGNAL(modStateChanged(Kate::Document *)), this, TQT_SLOT(slotModChanged(Kate::Document *)));
+    connect(doc, TQ_SIGNAL(modStateChanged(Kate::Document *)), this, TQ_SLOT(slotModChanged(Kate::Document *)));
 
     emit initialDocumentReplaced();
 
@@ -597,7 +597,7 @@ bool KateDocManager::computeUrlMD5(const KURL &url, TQCString &result)
   {
     KMD5 md5;
 
-    if (!md5.update(TQT_TQIODEVICE_OBJECT(f)))
+    if (!md5.update(f))
       return false;
 
     md5.hexDigest(result);
diff --git a/kate/app/katedocmanager.h b/kate/app/katedocmanager.h
index 569aa9853..81ff7a5c8 100644
--- a/kate/app/katedocmanager.h
+++ b/kate/app/katedocmanager.h
@@ -52,11 +52,11 @@ class KateDocumentInfo
     unsigned char modifiedOnDiscReason;
 };
 
-typedef QPair<KURL,TQDateTime> TPair;
+typedef TQPair<KURL,TQDateTime> TPair;
 
 class KateDocManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateDocManager (TQObject *parent);
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index 0b592b03a..e93e758ea 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -185,12 +185,12 @@ void KateExternalToolsCommand::reload () {
 }
 
 bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQString &) {
-	TQWidget *wv=tqt_dynamic_cast<TQWidget*>(view);
+	TQWidget *wv=dynamic_cast<TQWidget*>(view);
 	if (!wv) {
 // 		kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl;
 		return false;
 	}
-  KateMDI::MainWindow *dmw=tqt_dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
+  KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
 	if (!dmw) {
 // 		kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl;
 		return false;
@@ -200,7 +200,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt
 	if (actionName.isEmpty()) return false;
 // 	kdDebug(13001)<<"actionName is not empty:"<<actionName<<endl;
 	KateExternalToolsMenuAction *a=
-		tqt_dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external"));
+		dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external"));
 	if (!a) return false;
 // 	kdDebug(13001)<<"trying to find action"<<endl;
 	TDEAction *a1=a->actionCollection()->action(static_cast<const char *>(actionName.utf8()));
@@ -225,7 +225,7 @@ KateExternalToolAction::KateExternalToolAction( TQObject *parent,
   if ( ! t->icon.isEmpty() )
     setIconSet( SmallIconSet( t->icon ) );
 
-  connect( this ,TQT_SIGNAL(activated()), this, TQT_SLOT(slotRun()) );
+  connect( this ,TQ_SIGNAL(activated()), this, TQ_SLOT(slotRun()) );
 }
 
 bool KateExternalToolAction::expandMacro( const TQString &str, TQStringList &ret )
@@ -300,7 +300,7 @@ KateExternalToolsMenuAction::KateExternalToolsMenuAction( const TQString &text,
 
   m_actionCollection = new TDEActionCollection( mainwindow );
 
-  connect(KateDocManager::self(),TQT_SIGNAL(documentChanged()),this,TQT_SLOT(slotDocumentChanged()));
+  connect(KateDocManager::self(),TQ_SIGNAL(documentChanged()),this,TQ_SLOT(slotDocumentChanged()));
 
   reload();
 }
@@ -389,7 +389,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged()
     TDEActionPtrList actions = m_actionCollection->actions();
     for (TDEActionPtrList::iterator it = actions.begin(); it != actions.end(); ++it )
     {
-      KateExternalToolAction *action = tqt_dynamic_cast<KateExternalToolAction*>(*it);
+      KateExternalToolAction *action = dynamic_cast<KateExternalToolAction*>(*it);
       if ( action )
       {
         l = action->tool->mimetypes;
@@ -438,7 +438,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leName = new TQLineEdit( w );
   lo->addWidget( leName, 1, 2 );
   l = new TQLabel( leName, i18n("&Label:"), w );
-  l->setAlignment( l->alignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|TQt::AlignRight );
   lo->addWidget( l, 1, 1 );
   if ( tool ) leName->setText( tool->name );
   TQWhatsThis::add( leName, i18n(
@@ -453,7 +453,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   teCommand = new TQTextEdit( w );
   lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 );
   l = new TQLabel( teCommand, i18n("S&cript:"), w );
-  l->setAlignment( Qt::AlignTop|Qt::AlignRight );
+  l->setAlignment( TQt::AlignTop|TQt::AlignRight );
   lo->addWidget( l, 2, 1 );
   if ( tool ) teCommand->setText( tool->command );
   TQWhatsThis::add( teCommand, i18n(
@@ -476,7 +476,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leExecutable = new TQLineEdit( w );
   lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 );
   l = new TQLabel( leExecutable, i18n("&Executable:"), w );
-  l->setAlignment( l->alignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|TQt::AlignRight );
   lo->addWidget( l, 3, 1 );
   if ( tool ) leExecutable->setText( tool->tryexec );
   TQWhatsThis::add( leExecutable, i18n(
@@ -487,7 +487,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leMimetypes = new TQLineEdit( w );
   lo->addWidget( leMimetypes, 4, 2 );
   l = new TQLabel( leMimetypes, i18n("&Mime types:"), w );
-  l->setAlignment( l->alignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|TQt::AlignRight );
   lo->addWidget( l, 4, 1 );
   if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") );
   TQWhatsThis::add( leMimetypes, i18n(
@@ -498,14 +498,14 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   TQToolButton *btnMTW = new TQToolButton(w);
   lo->addWidget( btnMTW, 4, 3 );
   btnMTW->setIconSet(TQIconSet(SmallIcon("wizard")));
-  connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg()));
+  connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg()));
   TQWhatsThis::add( btnMTW, i18n(
       "Click for a dialog that can help you creating a list of mimetypes.") );
 
   cmbSave = new TQComboBox(w);
   lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 );
   l = new TQLabel( cmbSave, i18n("&Save:"), w );
-  l->setAlignment( l->alignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|TQt::AlignRight );
   lo->addWidget( l, 5, 1 );
   TQStringList sl;
   sl << i18n("None") << i18n("Current Document") << i18n("All Documents");
@@ -520,7 +520,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leCmdLine = new TQLineEdit( w );
   lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 );
   l = new TQLabel( leCmdLine, i18n("&Command line name:"), w );
-  l->setAlignment( l->alignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|TQt::AlignRight );
   lo->addWidget( l, 6, 1 );
   if ( tool ) leCmdLine->setText( tool->cmdname );
   TQWhatsThis::add( leCmdLine, i18n(
@@ -562,33 +562,33 @@ KateExternalToolsConfigWidget::KateExternalToolsConfigWidget( TQWidget *parent,
 
   lbTools = new TDEListBox( this );
   lo->addMultiCellWidget( lbTools, 1, 4, 0, 3 );
-  connect( lbTools, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) );
+  connect( lbTools, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) );
 
   btnNew = new TQPushButton( i18n("&New..."), this );
   lo->addWidget( btnNew, 5, 0 );
-  connect( btnNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()) );
+  connect( btnNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNew()) );
 
   btnRemove = new TQPushButton( i18n("&Remove"), this );
   lo->addWidget( btnRemove, 5, 2 );
-  connect( btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemove()) );
+  connect( btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemove()) );
 
   btnEdit = new TQPushButton( i18n("&Edit..."), this );
   lo->addWidget( btnEdit, 5, 1 );
-  connect( btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit()) );
+  connect( btnEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit()) );
 
   TQPushButton *b = new TQPushButton( i18n("Insert &Separator"), this );
   lo->addWidget( b, 5, 3 );
-  connect( b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInsertSeparator()) );
+  connect( b, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInsertSeparator()) );
 
   btnMoveUp = new TQPushButton( SmallIconSet("go-up"), "", this );
   lo->addWidget( btnMoveUp, 2, 4 );
-  connect( btnMoveUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveUp()) );
+  connect( btnMoveUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveUp()) );
 
   btnMoveDwn = new TQPushButton( SmallIconSet("go-down"), "", this );
   lo->addWidget( btnMoveDwn, 3, 4 );
-  connect( btnMoveDwn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDown()) );
+  connect( btnMoveDwn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveDown()) );
 
-  connect( lbTools, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), this,  TQT_SLOT( slotEdit() ) );
+  connect( lbTools, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ), this,  TQ_SLOT( slotEdit() ) );
 
   lo->setRowStretch( 1, 1 );
   lo->setRowStretch( 4, 1 );
diff --git a/kate/app/kateexternaltools.h b/kate/app/kateexternaltools.h
index ef3a9e9fd..aeefb0aa5 100644
--- a/kate/app/kateexternaltools.h
+++ b/kate/app/kateexternaltools.h
@@ -55,7 +55,7 @@ class KateExternalToolsMenuAction : public TDEActionMenu
 {
   friend class KateExternalToolAction;
 
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KateExternalToolsMenuAction( const TQString &text=TQString::null, TQObject *parent=0, const char* name=0, class KateMainWindow *mw=0 );
     ~KateExternalToolsMenuAction() {};
@@ -80,7 +80,7 @@ class KateExternalToolsMenuAction : public TDEActionMenu
  */
 class KateExternalToolAction : public TDEAction, public KWordMacroExpander
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KateExternalToolAction( TQObject *parent, const char *name, class KateExternalTool *t );
     ~KateExternalToolAction();
@@ -142,7 +142,7 @@ class KateExternalTool
  */
 class KateExternalToolsConfigWidget : public Kate::ConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KateExternalToolsConfigWidget( TQWidget *parent, const char* name);
     virtual ~KateExternalToolsConfigWidget();
@@ -201,7 +201,7 @@ class KateExternalToolsConfigWidget : public Kate::ConfigPage
  */
 class KateExternalToolServiceEditor : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index 9dd958a5d..b33d0149b 100644
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@@ -94,7 +94,7 @@ KateFileList::KateFileList (KateMainWindow *main,
   m_editShade = TQColor( 255, 102, 153 );
   m_enableBgShading = false;
 
-  setFocusPolicy ( TQ_NoFocus  );
+  setFocusPolicy ( TQWidget::NoFocus  );
 
   viewManager = _viewManager;
 
@@ -107,7 +107,7 @@ KateFileList::KateFileList (KateMainWindow *main,
 
   setupActions ();
 
-  connect(this,TQT_SIGNAL(moved()),this,TQT_SLOT(updateFileListLocations()));
+  connect(this,TQ_SIGNAL(moved()),this,TQ_SLOT(updateFileListLocations()));
 
   for (uint i = 0; i < KateDocManager::self()->documents(); i++)
   {
@@ -115,18 +115,18 @@ KateFileList::KateFileList (KateMainWindow *main,
     slotModChanged (KateDocManager::self()->document(i));
   }
 
-  connect(KateDocManager::self(),TQT_SIGNAL(documentCreated(Kate::Document *)),
-	  this,TQT_SLOT(slotDocumentCreated(Kate::Document *)));
-  connect(KateDocManager::self(),TQT_SIGNAL(documentDeleted(uint)),
-	  this,TQT_SLOT(slotDocumentDeleted(uint)));
+  connect(KateDocManager::self(),TQ_SIGNAL(documentCreated(Kate::Document *)),
+	  this,TQ_SLOT(slotDocumentCreated(Kate::Document *)));
+  connect(KateDocManager::self(),TQ_SIGNAL(documentDeleted(uint)),
+	  this,TQ_SLOT(slotDocumentDeleted(uint)));
 
   // don't Honour KDE single/double click setting, this files are already open,
   // no need for hassle of considering double-click
-  connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-	  this,TQT_SLOT(slotActivateView(TQListViewItem *)));
-  connect(viewManager,TQT_SIGNAL(viewChanged()), this,TQT_SLOT(slotViewChanged()));
-  connect(this,TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint &, int )),
-	  this,TQT_SLOT(slotMenu ( TQListViewItem *, const TQPoint &, int )));
+  connect(this,TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+	  this,TQ_SLOT(slotActivateView(TQListViewItem *)));
+  connect(viewManager,TQ_SIGNAL(viewChanged()), this,TQ_SLOT(slotViewChanged()));
+  connect(this,TQ_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint &, int )),
+	  this,TQ_SLOT(slotMenu ( TQListViewItem *, const TQPoint &, int )));
 }
 
 KateFileList::~KateFileList ()
@@ -136,20 +136,20 @@ KateFileList::~KateFileList ()
 
 void KateFileList::setupActions ()
 {
-  windowNext = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotPrevDocument()), m_main->actionCollection());
-  windowPrev = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotNextDocument()), m_main->actionCollection());
+  windowNext = KStdAction::back(this, TQ_SLOT(slotPrevDocument()), m_main->actionCollection());
+  windowPrev = KStdAction::forward(this, TQ_SLOT(slotNextDocument()), m_main->actionCollection());
   sortAction = new TDESelectAction( i18n("Sort &By"), 0,
       m_main->actionCollection(), "filelist_sortby"  );
   listMoveFileUp = new TDEAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" );
   //listMoveFileUp->setShortcut(TDEShortcut(CTRL + SHIFT + Key_Comma));
   listMoveFileDown = new TDEAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" );
   //listMoveFileDown->setShortcut(TDEShortcut(CTRL + SHIFT + Key_Period));
-  connect( listMoveFileUp, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileUp()) );
-  connect( listMoveFileDown, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileDown()) );
+  connect( listMoveFileUp, TQ_SIGNAL(activated()), this, TQ_SLOT(moveFileUp()) );
+  connect( listMoveFileDown, TQ_SIGNAL(activated()), this, TQ_SLOT(moveFileDown()) );
   TQStringList l;
   l << i18n("Opening Order") << i18n("Document Name") << i18n("URL") << i18n("Manual Placement");
   sortAction->setItems( l );
-  connect( sortAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setSortType(int)) );
+  connect( sortAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setSortType(int)) );
 }
 
 void KateFileList::updateActions ()
@@ -227,9 +227,9 @@ void KateFileList::slotPrevDocument()
 void KateFileList::slotDocumentCreated (Kate::Document *doc)
 {
   new KateFileListItem( this, doc/*, doc->documentNumber()*/ );
-  connect(doc,TQT_SIGNAL(modStateChanged(Kate::Document *)),this,TQT_SLOT(slotModChanged(Kate::Document *)));
-  connect(doc,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(slotNameChanged(Kate::Document *)));
-  connect(doc,TQT_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,TQT_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char)));
+  connect(doc,TQ_SIGNAL(modStateChanged(Kate::Document *)),this,TQ_SLOT(slotModChanged(Kate::Document *)));
+  connect(doc,TQ_SIGNAL(nameChanged(Kate::Document *)),this,TQ_SLOT(slotNameChanged(Kate::Document *)));
+  connect(doc,TQ_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,TQ_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char)));
 
   sort();
   updateFileListLocations();
@@ -267,7 +267,7 @@ void KateFileList::slotActivateView( TQListViewItem *item )
   if (info && info->modifiedOnDisc) {
     // Simulate mouse button release, otherwise the paused DND operation
     // will reactivate as soon as the mouse re-enters the list view!
-    TQMouseEvent e(TQEvent::MouseButtonRelease, m_lastMouseDownPos, Qt::LeftButton, 0);
+    TQMouseEvent e(TQEvent::MouseButtonRelease, m_lastMouseDownPos, TQt::LeftButton, 0);
     contentsMouseReleaseEvent(&e);
   }
 
@@ -659,7 +659,7 @@ KFLConfigPage::KFLConfigPage( TQWidget* parent, const char *name, KateFileList *
   int spacing = KDialog::spacingHint();
   lo1->setSpacing( spacing );
 
-  TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Background Shading"), this );
+  TQGroupBox *gb = new TQGroupBox( 1, TQt::Horizontal, i18n("Background Shading"), this );
   lo1->addWidget( gb );
 
   TQWidget *g = new TQWidget( gb );
@@ -707,11 +707,11 @@ KFLConfigPage::KFLConfigPage( TQWidget* parent, const char *name, KateFileList *
   reload();
 
   slotEnableChanged();
-  connect( cbEnableShading, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotMyChanged()) );
-  connect( cbEnableShading, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableChanged()) );
-  connect( kcbViewShade, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotMyChanged()) );
-  connect( kcbEditShade, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotMyChanged()) );
-  connect( cmbSort, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMyChanged()) );
+  connect( cbEnableShading, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotMyChanged()) );
+  connect( cbEnableShading, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableChanged()) );
+  connect( kcbViewShade, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(slotMyChanged()) );
+  connect( kcbEditShade, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(slotMyChanged()) );
+  connect( cmbSort, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMyChanged()) );
 }
 
 void KFLConfigPage::apply()
diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h
index 24a62c7a5..1112c1235 100644
--- a/kate/app/katefilelist.h
+++ b/kate/app/katefilelist.h
@@ -76,7 +76,7 @@ class KateFileListItem : public TQListViewItem
 
 class KateFileList : public TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KFLConfigPage;
 
@@ -172,7 +172,7 @@ class KateFileList : public TDEListView
 };
 
 class KFLConfigPage : public Kate::ConfigPage {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KFLConfigPage( TQWidget* parent=0, const char *name=0, KateFileList *fl=0 );
     virtual ~KFLConfigPage() {};
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index 4bba68ded..a9c9d2c16 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -113,14 +113,14 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
 {
   mActionCollection = new TDEActionCollection( this );
 
-  TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar );
+  TQtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );
 
   KateFileSelectorToolBarParent *tbp=new KateFileSelectorToolBarParent(this);
   toolbar = new KateFileSelectorToolBar(tbp);
   tbp->setToolBar(toolbar);
   toolbar->setMovingEnabled(false);
   toolbar->setFlat(true);
-  tqInstallMsgHandler( oldHandler );
+  qInstallMsgHandler( oldHandler );
 
   cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
   cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
@@ -132,8 +132,8 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
   dir = new KDirOperator(KURL(), this, "operator");
   dir->setView(KFile::/* Simple */Detail);
   dir->view()->setSelectionMode(KFile::Extended);
-  connect ( dir, TQT_SIGNAL( viewChanged(KFileView *) ),
-                   this, TQT_SLOT( selectorViewChanged(KFileView *) ) );
+  connect ( dir, TQ_SIGNAL( viewChanged(KFileView *) ),
+                   this, TQ_SLOT( selectorViewChanged(KFileView *) ) );
   setStretchFactor(dir, 2);
 
   TDEActionCollection *coll = dir->actionCollection();
@@ -159,37 +159,37 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
   filter = new KHistoryCombo( true, filterBox, "filter");
   filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
   filterBox->setStretchFactor(filter, 2);
-  connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) );
+  connect( btnFilter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( btnFilterClick() ) );
 
-  connect( filter, TQT_SIGNAL( activated(const TQString&) ),
-                   TQT_SLOT( slotFilterChange(const TQString&) ) );
-  connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ),
-           filter, TQT_SLOT( addToHistory(const TQString&) ) );
+  connect( filter, TQ_SIGNAL( activated(const TQString&) ),
+                   TQ_SLOT( slotFilterChange(const TQString&) ) );
+  connect( filter, TQ_SIGNAL( returnPressed(const TQString&) ),
+           filter, TQ_SLOT( addToHistory(const TQString&) ) );
 
   // tdeaction for the dir sync method
   acSyncDir = new TDEAction( i18n("Current Document Folder"), "curfiledir", 0,
-        TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
+        this, TQ_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
   toolbar->setIconText( TDEToolBar::IconOnly );
   toolbar->setIconSize( 16 );
   toolbar->setEnableContextMenu( false );
 
-  connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL&  )),
-             this,  TQT_SLOT( cmbPathActivated( const KURL& ) ));
-  connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString&  )),
-             this,  TQT_SLOT( cmbPathReturnPressed( const TQString& ) ));
-  connect(dir, TQT_SIGNAL(urlEntered(const KURL&)),
-             this, TQT_SLOT(dirUrlEntered(const KURL&)) );
+  connect( cmbPath, TQ_SIGNAL( urlActivated( const KURL&  )),
+             this,  TQ_SLOT( cmbPathActivated( const KURL& ) ));
+  connect( cmbPath, TQ_SIGNAL( returnPressed( const TQString&  )),
+             this,  TQ_SLOT( cmbPathReturnPressed( const TQString& ) ));
+  connect(dir, TQ_SIGNAL(urlEntered(const KURL&)),
+             this, TQ_SLOT(dirUrlEntered(const KURL&)) );
 
-  connect(dir, TQT_SIGNAL(finishedLoading()),
-             this, TQT_SLOT(dirFinishedLoading()) );
+  connect(dir, TQ_SIGNAL(finishedLoading()),
+             this, TQ_SLOT(dirFinishedLoading()) );
 
   // enable dir sync button if current doc has a valid URL
-  connect ( viewmanager, TQT_SIGNAL( viewChanged() ),
-              this, TQT_SLOT( kateViewChanged() ) );
+  connect ( viewmanager, TQ_SIGNAL( viewChanged() ),
+              this, TQ_SLOT( kateViewChanged() ) );
 
   // Connect the bookmark handler
-  connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )),
-           this, TQT_SLOT( setDir( const TQString& ) ) );
+  connect( bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )),
+           this, TQ_SLOT( setDir( const TQString& ) ) );
 
   waitingUrl = TQString::null;
 
@@ -234,7 +234,7 @@ void KateFileSelector::readConfig(TDEConfig *config, const TQString & name)
     TQString loc( config->readPathEntry( "location" ) );
     if ( ! loc.isEmpty() ) {
 //       waitingDir = loc;
-//       TQTimer::singleShot(0, this, TQT_SLOT(initialDirChangeHack()));
+//       TQTimer::singleShot(0, this, TQ_SLOT(initialDirChangeHack()));
       setDir( loc );
     }
   }
@@ -485,7 +485,7 @@ bool KateFileSelector::eventFilter( TQObject* o, TQEvent *e )
       And the popup is rather useless, if the paths are only partly visible.
   */
   TQListBox *lb = cmbPath->listBox();
-  if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lb) && e->type() == TQEvent::Show ) {
+  if ( o == lb && e->type() == TQEvent::Show ) {
     int add = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0;
     int w = TQMIN( mainwin->width(), lb->contentsWidth() + add );
     lb->resize( w, lb->height() );
@@ -532,23 +532,23 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KateFileSelect
   lo->setSpacing( spacing );
 
   // Toolbar - a lot for a little...
-  TQGroupBox *gbToolbar = new TQGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this );
+  TQGroupBox *gbToolbar = new TQGroupBox( 1, TQt::Vertical, i18n("Toolbar"), this );
   acSel = new TDEActionSelector( gbToolbar );
   acSel->setAvailableLabel( i18n("A&vailable actions:") );
   acSel->setSelectedLabel( i18n("S&elected actions:") );
   lo->addWidget( gbToolbar );
-  connect( acSel, TQT_SIGNAL( added( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) );
-  connect( acSel, TQT_SIGNAL( removed( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) );
-  connect( acSel, TQT_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) );
-  connect( acSel, TQT_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) );
+  connect( acSel, TQ_SIGNAL( added( TQListBoxItem * ) ), this, TQ_SLOT( slotMyChanged() ) );
+  connect( acSel, TQ_SIGNAL( removed( TQListBoxItem * ) ), this, TQ_SLOT( slotMyChanged() ) );
+  connect( acSel, TQ_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQ_SLOT( slotMyChanged() ) );
+  connect( acSel, TQ_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQ_SLOT( slotMyChanged() ) );
 
   // Sync
-  TQGroupBox *gbSync = new TQGroupBox( 1, Qt::Horizontal, i18n("Auto Synchronization"), this );
+  TQGroupBox *gbSync = new TQGroupBox( 1, TQt::Horizontal, i18n("Auto Synchronization"), this );
   cbSyncActive = new TQCheckBox( i18n("When a docu&ment becomes active"), gbSync );
   cbSyncShow = new TQCheckBox( i18n("When the file selector becomes visible"), gbSync );
   lo->addWidget( gbSync );
-  connect( cbSyncActive, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) );
-  connect( cbSyncShow, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) );
+  connect( cbSyncActive, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotMyChanged() ) );
+  connect( cbSyncShow, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotMyChanged() ) );
 
   // Histories
   TQHBox *hbPathHist = new TQHBox ( this );
@@ -556,22 +556,22 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KateFileSelect
   sbPathHistLength = new TQSpinBox( hbPathHist );
   lbPathHist->setBuddy( sbPathHistLength );
   lo->addWidget( hbPathHist );
-  connect( sbPathHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotMyChanged() ) );
+  connect( sbPathHistLength, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotMyChanged() ) );
 
   TQHBox *hbFilterHist = new TQHBox ( this );
   TQLabel *lbFilterHist = new TQLabel( i18n("Remember &filters:"), hbFilterHist );
   sbFilterHistLength = new TQSpinBox( hbFilterHist );
   lbFilterHist->setBuddy( sbFilterHistLength );
   lo->addWidget( hbFilterHist );
-  connect( sbFilterHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotMyChanged() ) );
+  connect( sbFilterHistLength, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotMyChanged() ) );
 
   // Session
-  TQGroupBox *gbSession = new TQGroupBox( 1, Qt::Horizontal, i18n("Session"), this );
+  TQGroupBox *gbSession = new TQGroupBox( 1, TQt::Horizontal, i18n("Session"), this );
   cbSesLocation = new TQCheckBox( i18n("Restore loca&tion"), gbSession );
   cbSesFilter = new TQCheckBox( i18n("Restore last f&ilter"), gbSession );
   lo->addWidget( gbSession );
-  connect( cbSesLocation, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) );
-  connect( cbSesFilter, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) );
+  connect( cbSesLocation, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotMyChanged() ) );
+  connect( cbSesFilter, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotMyChanged() ) );
 
   // make it look nice
   lo->addStretch( 1 );
diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h
index 5de8f74cb..09ea07a76 100644
--- a/kate/app/katefileselector.h
+++ b/kate/app/katefileselector.h
@@ -48,7 +48,7 @@ class KFileView;
 /* I think this fix for not moving toolbars is better */
 class KateFileSelectorToolBar: public TDEToolBar
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KateFileSelectorToolBar(TQWidget *parent);
 	virtual ~KateFileSelectorToolBar();
@@ -58,7 +58,7 @@ public:
 
 class KateFileSelectorToolBarParent: public TQFrame
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KateFileSelectorToolBarParent(TQWidget *parent);
 	~KateFileSelectorToolBarParent();
@@ -71,7 +71,7 @@ protected:
 
 class KateFileSelector : public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KFSConfigPage;
 
@@ -144,7 +144,7 @@ class KateFileSelector : public TQVBox
     user closed session.
 */
 class KFSConfigPage : public Kate::ConfigPage {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KFSConfigPage( TQWidget* parent=0, const char *name=0, KateFileSelector *kfs=0);
     virtual ~KFSConfigPage() {};
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index 70f067100..00bd1dcd6 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -101,7 +101,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
 
   TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this);
   lPattern->setFixedSize(lPattern->sizeHint());
-  loInput->addWidget(lPattern, 0, 0, Qt::AlignRight | Qt::AlignVCenter);
+  loInput->addWidget(lPattern, 0, 0, TQt::AlignRight | TQt::AlignVCenter);
 
   TQBoxLayout *loPattern = new TQHBoxLayout( 4 );
   loInput->addLayout( loPattern, 0, 1 );
@@ -128,7 +128,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
 
   TQLabel *lTemplate = new TQLabel(i18n("Template:"), this);
   lTemplate->setFixedSize(lTemplate->sizeHint());
-  loInput->addWidget(lTemplate, 1, 0, Qt::AlignRight | Qt::AlignVCenter);
+  loInput->addWidget(lTemplate, 1, 0, TQt::AlignRight | TQt::AlignVCenter);
 
   TQBoxLayout *loTemplate = new TQHBoxLayout(4);
   loInput->addLayout(loTemplate, 1, 1);
@@ -147,13 +147,13 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
 
   TQLabel *lFiles = new TQLabel(i18n("Files:"), this);
   lFiles->setFixedSize(lFiles->sizeHint());
-  loInput->addWidget(lFiles, 2, 0, Qt::AlignRight | Qt::AlignVCenter);
+  loInput->addWidget(lFiles, 2, 0, TQt::AlignRight | TQt::AlignVCenter);
 
   TQBoxLayout *loFiles = new TQHBoxLayout( 2 );
   loInput->addLayout( loFiles, 2, 1 );
 
   cmbFiles = new KComboBox(true, this);
-  lFiles->setBuddy(TQT_TQWIDGET(cmbFiles->focusProxy()));
+  lFiles->setBuddy(cmbFiles->focusProxy());
   cmbFiles->setMinimumSize(cmbFiles->sizeHint());
   cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion);
   cmbFiles->setDuplicatesEnabled(false);
@@ -168,7 +168,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
 
   TQLabel *lDir = new TQLabel(i18n("Folder:"), this);
   lDir->setFixedSize(lDir->sizeHint());
-  loInput->addWidget(lDir, 3, 0, Qt::AlignRight | Qt::AlignVCenter);
+  loInput->addWidget(lDir, 3, 0, TQt::AlignRight | TQt::AlignVCenter);
 
   TQBoxLayout *loDir = new TQHBoxLayout(3);
   loInput->addLayout(loDir, 3, 1);
@@ -189,7 +189,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
   cbRecursive->setChecked(config->readBoolEntry("Recursive", true));
   loDir->addWidget(cbRecursive);
 
-  KButtonBox *actionbox = new KButtonBox(this, Qt::Vertical);
+  KButtonBox *actionbox = new KButtonBox(this, TQt::Vertical);
   layout->addWidget(actionbox, 0, 2);
   actionbox->addStretch();
   btnSearch = static_cast<KPushButton*>(actionbox->addButton(KGuiItem(i18n("Find"),"edit-find")));
@@ -262,16 +262,16 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
   cmbFiles->installEventFilter( this );
   cmbDir->comboBox()->installEventFilter( this );
 
-  connect( cmbTemplate, TQT_SIGNAL(activated(int)),
-           TQT_SLOT(templateActivated(int)) );
-  connect( lbResult, TQT_SIGNAL(selected(const TQString&)),
-           TQT_SLOT(itemSelected(const TQString&)) );
-  connect( btnSearch, TQT_SIGNAL(clicked()),
-           TQT_SLOT(slotSearch()) );
-  connect( btnClear, TQT_SIGNAL(clicked()),
-           TQT_SLOT(slotClear()) );
-  connect( cmbPattern->lineEdit(), TQT_SIGNAL(textChanged ( const TQString & )),
-           TQT_SLOT( patternTextChanged( const TQString & )));
+  connect( cmbTemplate, TQ_SIGNAL(activated(int)),
+           TQ_SLOT(templateActivated(int)) );
+  connect( lbResult, TQ_SIGNAL(selected(const TQString&)),
+           TQ_SLOT(itemSelected(const TQString&)) );
+  connect( btnSearch, TQ_SIGNAL(clicked()),
+           TQ_SLOT(slotSearch()) );
+  connect( btnClear, TQ_SIGNAL(clicked()),
+           TQ_SLOT(slotClear()) );
+  connect( cmbPattern->lineEdit(), TQ_SIGNAL(textChanged ( const TQString & )),
+           TQ_SLOT( patternTextChanged( const TQString & )));
 
   patternTextChanged( cmbPattern->lineEdit()->text());
 }
@@ -389,15 +389,15 @@ void GrepTool::slotSearch()
   *childproc << "/dev/null"; //trick to have grep always display the filename
   *childproc << ";";
 
-  connect( childproc, TQT_SIGNAL(processExited(TDEProcess *)),
-           TQT_SLOT(childExited()) );
-  connect( childproc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-           TQT_SLOT(receivedOutput(TDEProcess *, char *, int)) );
-  connect( childproc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-           TQT_SLOT(receivedErrOutput(TDEProcess *, char *, int)) );
+  connect( childproc, TQ_SIGNAL(processExited(TDEProcess *)),
+           TQ_SLOT(childExited()) );
+  connect( childproc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+           TQ_SLOT(receivedOutput(TDEProcess *, char *, int)) );
+  connect( childproc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+           TQ_SLOT(receivedErrOutput(TDEProcess *, char *, int)) );
 
   // actually it should be checked whether the process was started successfully
-  lbResult->setCursor( TQCursor(Qt::WaitCursor) );
+  lbResult->setCursor( TQCursor(TQt::WaitCursor) );
   btnClear->setEnabled( false );
   btnSearch->setGuiItem( KGuiItem(i18n("Cancel"), "button_cancel"));
   childproc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
@@ -532,8 +532,8 @@ void GrepTool::setDirName(const TQString &dir){
 bool GrepTool::eventFilter( TQObject *o, TQEvent *e )
 {
   if ( e->type() == TQEvent::KeyPress && (
-       ((TQKeyEvent*)e)->key() == Qt::Key_Return ||
-       ((TQKeyEvent*)e)->key() == Qt::Key_Enter ) )
+       ((TQKeyEvent*)e)->key() == TQt::Key_Return ||
+       ((TQKeyEvent*)e)->key() == TQt::Key_Enter ) )
   {
     slotSearch();
     return true;
diff --git a/kate/app/kategrepdialog.h b/kate/app/kategrepdialog.h
index 1bd930735..dbe722f20 100644
--- a/kate/app/kategrepdialog.h
+++ b/kate/app/kategrepdialog.h
@@ -37,7 +37,7 @@ class TQEvent;
 
 class GrepTool : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     GrepTool(TQWidget *parent, const char *name=0);
diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp
index 2d933669a..9afa644cb 100644
--- a/kate/app/katemailfilesdialog.cpp
+++ b/kate/app/katemailfilesdialog.cpp
@@ -77,7 +77,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow  *mainwin )
     i++;
   }
   list->hide();
-  connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) );
+  connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotShowButton()) );
   mw->setMinimumSize( lInfo->sizeHint() );
 }
 
diff --git a/kate/app/katemailfilesdialog.h b/kate/app/katemailfilesdialog.h
index a2de4e504..4b60a1946 100644
--- a/kate/app/katemailfilesdialog.h
+++ b/kate/app/katemailfilesdialog.h
@@ -36,7 +36,7 @@ class KateMainWindow;
     
 */
 class KateMailDialog : public KDialogBase {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KateMailDialog( TQWidget *parent=0,
                           KateMainWindow *mainwin=0 );
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 906bac6f5..811145182 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -168,13 +168,13 @@ KateMainWindow::KateMainWindow (TDEConfig *sconfig, const TQString &sgroup)
 
   // connect documents menu aboutToshow
   documentMenu = (TQPopupMenu*)factory()->container("documents", this);
-  connect(documentMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(documentMenuAboutToShow()));
+  connect(documentMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(documentMenuAboutToShow()));
 
   // caption update
   for (uint i = 0; i < KateDocManager::self()->documents(); i++)
     slotDocumentCreated (KateDocManager::self()->document(i));
 
-  connect(KateDocManager::self(),TQT_SIGNAL(documentCreated(Kate::Document *)),this,TQT_SLOT(slotDocumentCreated(Kate::Document *)));
+  connect(KateDocManager::self(),TQ_SIGNAL(documentCreated(Kate::Document *)),this,TQ_SLOT(slotDocumentCreated(Kate::Document *)));
 
   readOptions();
 
@@ -216,7 +216,7 @@ void KateMainWindow::setupMainWindow ()
 
   KateMDI::ToolView *t = createToolView("kate_fileselector", KMultiTabBar::Left, SmallIcon("document-open"), i18n("Filesystem Browser"));
   fileselector = new KateFileSelector( this, m_viewManager, t, "operator");
-  connect(fileselector->dirOperator(),TQT_SIGNAL(fileSelected(const KFileItem*)),this,TQT_SLOT(fileSelected(const KFileItem*)));
+  connect(fileselector->dirOperator(),TQ_SIGNAL(fileSelected(const KFileItem*)),this,TQ_SLOT(fileSelected(const KFileItem*)));
 
   KateMDI::ToolView *st = createToolView("kate_sessionpanel", KMultiTabBar::Left, SmallIcon("view_choose"), i18n("Sessions"));
   m_sessionpanel = new KateSessionPanel( this, m_viewManager, st, "sessionpanel");
@@ -226,8 +226,8 @@ void KateMainWindow::setupMainWindow ()
   {
     t = createToolView("kate_greptool", KMultiTabBar::Bottom, SmallIcon("filefind"), i18n("Find in Files") );
     greptool = new GrepTool( t, "greptool" );
-    connect(greptool, TQT_SIGNAL(itemSelected(const TQString &,int)), this, TQT_SLOT(slotGrepToolItemSelected(const TQString &,int)));
-    connect(t,TQT_SIGNAL(visibleChanged(bool)),this, TQT_SLOT(updateGrepDir (bool)));
+    connect(greptool, TQ_SIGNAL(itemSelected(const TQString &,int)), this, TQ_SLOT(slotGrepToolItemSelected(const TQString &,int)));
+    connect(t,TQ_SIGNAL(visibleChanged(bool)),this, TQ_SLOT(updateGrepDir (bool)));
     // WARNING HACK - anders: showing the greptool seems to make the menu accels work
     greptool->show();
 
@@ -243,25 +243,25 @@ void KateMainWindow::setupActions()
 {
   TDEAction *a;
 
-  KStdAction::openNew( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document"));
-  KStdAction::open( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing"));
+  KStdAction::openNew( m_viewManager, TQ_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document"));
+  KStdAction::open( m_viewManager, TQ_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing"));
 
-  fileOpenRecent = KStdAction::openRecent (TQT_TQOBJECT(m_viewManager), TQT_SLOT(openURL (const KURL&)), actionCollection());
+  fileOpenRecent = KStdAction::openRecent (m_viewManager, TQ_SLOT(openURL (const KURL&)), actionCollection());
   fileOpenRecent->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again."));
 
-  a=new TDEAction( i18n("Save A&ll"),"save_all", CTRL+Key_L, KateDocManager::self(), TQT_SLOT( saveAll() ), actionCollection(), "file_save_all" );
+  a=new TDEAction( i18n("Save A&ll"),"save_all", CTRL+Key_L, KateDocManager::self(), TQ_SLOT( saveAll() ), actionCollection(), "file_save_all" );
   a->setWhatsThis(i18n("Save all open, modified documents to disk."));
 
-  KStdAction::close( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document."));
+  KStdAction::close( m_viewManager, TQ_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document."));
 
-  a=new TDEAction( i18n( "Clos&e All" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" );
+  a=new TDEAction( i18n( "Clos&e All" ), 0, this, TQ_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" );
   a->setWhatsThis(i18n("Close all open documents."));
 
-  KStdAction::mail( TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments."));
+  KStdAction::mail( this, TQ_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments."));
 
-  KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window"));
+  KStdAction::quit( this, TQ_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window"));
 
-  a=new TDEAction(i18n("&New Window"), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection(), "view_new_view");
+  a=new TDEAction(i18n("&New Window"), "window-new", 0, this, TQ_SLOT(newWindow()), actionCollection(), "view_new_view");
   a->setWhatsThis(i18n("Create a new Kate view (a new window with the same document list)."));
 
   if ( KateApp::self()->authorize("shell_access") )
@@ -271,64 +271,64 @@ void KateMainWindow::setupActions()
   }
 
   TDEToggleAction* showFullScreenAction = KStdAction::fullScreen( 0, 0, actionCollection(),this);
-  connect( showFullScreenAction,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(slotFullScreen(bool)));
+  connect( showFullScreenAction,TQ_SIGNAL(toggled(bool)), this,TQ_SLOT(slotFullScreen(bool)));
 
   documentOpenWith = new TDEActionMenu(i18n("Open W&ith"), actionCollection(), "file_open_with");
   documentOpenWith->setWhatsThis(i18n("Open the current document using another application registered for its file type, or an application of your choice."));
-  connect(documentOpenWith->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(mSlotFixOpenWithMenu()));
-  connect(documentOpenWith->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenWithMenuAction(int)));
+  connect(documentOpenWith->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(mSlotFixOpenWithMenu()));
+  connect(documentOpenWith->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOpenWithMenuAction(int)));
 
-  a=KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editKeys()), actionCollection());
+  a=KStdAction::keyBindings(this, TQ_SLOT(editKeys()), actionCollection());
   a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
 
-  a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
+  a=KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection());
   a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
 
-  TDEAction* settingsConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure");
+  TDEAction* settingsConfigure = KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection(), "settings_configure");
   settingsConfigure->setWhatsThis(i18n("Configure various aspects of this application and the editing component."));
 
   // pipe to terminal action
   if (KateApp::self()->authorize("shell_access"))
-    new TDEAction(i18n("&Pipe to Console"), "pipe", 0, TQT_TQOBJECT(console), TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal");
+    new TDEAction(i18n("&Pipe to Console"), "pipe", 0, console, TQ_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal");
 
   // tip of the day :-)
-  KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application."));
+  KStdAction::tipOfDay( this, TQ_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application."));
 
   if (KatePluginManager::self()->pluginList().count() > 0)
   {
-    a=new TDEAction(i18n("&Plugins Handbook"), 0, TQT_TQOBJECT(this), TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents");
+    a=new TDEAction(i18n("&Plugins Handbook"), 0, this, TQ_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents");
     a->setWhatsThis(i18n("This shows help files for various available plugins."));
   }
 
-  connect(m_viewManager,TQT_SIGNAL(viewChanged()),TQT_TQOBJECT(this),TQT_SLOT(slotWindowActivated()));
-  connect(m_viewManager,TQT_SIGNAL(viewChanged()),TQT_TQOBJECT(this),TQT_SLOT(slotUpdateOpenWith()));
+  connect(m_viewManager,TQ_SIGNAL(viewChanged()),this,TQ_SLOT(slotWindowActivated()));
+  connect(m_viewManager,TQ_SIGNAL(viewChanged()),this,TQ_SLOT(slotUpdateOpenWith()));
 
   slotWindowActivated ();
 
   // session actions
   new TDEAction(i18n("&New"), "list-add", 0, 
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotNewSession()), actionCollection(), "session_new");
+      m_sessionpanel, TQ_SLOT(slotNewSession()), actionCollection(), "session_new");
   new TDEAction(i18n("&Save"), "document-save", 0, 
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSaveSession()), actionCollection(), "session_save");
+      m_sessionpanel, TQ_SLOT(slotSaveSession()), actionCollection(), "session_save");
   new TDEAction(i18n("Save &As..."), "document-save-as", 0, 
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSaveSessionAs()), actionCollection(), "session_save_as");
+      m_sessionpanel, TQ_SLOT(slotSaveSessionAs()), actionCollection(), "session_save_as");
   new TDEAction(i18n("&Rename"), "edit_user", 0,
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotRenameSession()), actionCollection(), "session_rename");
+      m_sessionpanel, TQ_SLOT(slotRenameSession()), actionCollection(), "session_rename");
   new TDEAction(i18n("&Delete"), "edit-delete", 0,
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotDeleteSession()), actionCollection(), "session_delete");
+      m_sessionpanel, TQ_SLOT(slotDeleteSession()), actionCollection(), "session_delete");
   new TDEAction(i18n("Re&load"), "reload", 0,
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotReloadSession()), actionCollection(), "session_reload");
+      m_sessionpanel, TQ_SLOT(slotReloadSession()), actionCollection(), "session_reload");
   new TDEAction(i18n("Acti&vate"), "forward", 0,
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotActivateSession()), actionCollection(), "session_activate");
+      m_sessionpanel, TQ_SLOT(slotActivateSession()), actionCollection(), "session_activate");
   new TDEToggleAction(i18n("Toggle read &only"), "encrypted", 0,
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSessionToggleReadOnly()), actionCollection(), "session_toggle_read_only");
+      m_sessionpanel, TQ_SLOT(slotSessionToggleReadOnly()), actionCollection(), "session_toggle_read_only");
   new TDEAction(i18n("Move &Up"), "go-up", 0,
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSessionMoveUp()), actionCollection(), "session_move_up");
+      m_sessionpanel, TQ_SLOT(slotSessionMoveUp()), actionCollection(), "session_move_up");
   new TDEAction(i18n("Move Do&wn"), "go-down", 0,
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSessionMoveDown()), actionCollection(), "session_move_down");
+      m_sessionpanel, TQ_SLOT(slotSessionMoveDown()), actionCollection(), "session_move_down");
   new KateSessionListActionMenu(this, i18n("Sele&ct session"), actionCollection(), "session_list");
 
-  connect(m_sessionpanel, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged()));
+  connect(m_sessionpanel, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
 }
 
 KateTabWidget *KateMainWindow::tabWidget ()
@@ -412,7 +412,7 @@ void KateMainWindow::slotEditToolbars()
 {
   saveMainWindowSettings( KateApp::self()->config(), "MainWindow" );
   KEditToolbar dlg( factory() );
-  connect( &dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()) );
+  connect( &dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig()) );
   dlg.exec();
 }
 
@@ -514,7 +514,7 @@ void KateMainWindow::documentMenuAboutToShow()
     Kate::Document* doc = ((KateFileListItem *)item)->document();
     documentMenu->insertItem (
           doc->isModified() ? i18n("'document name [*]', [*] means modified", "%1 [*]").arg(name) : name,
-          m_viewManager, TQT_SLOT (activateView (int)), 0,
+          m_viewManager, TQ_SLOT (activateView (int)), 0,
           ((KateFileListItem *)item)->documentNumber () );
 
     item = item->nextSibling();
@@ -816,9 +816,9 @@ bool KateMainWindow::showModOnDiskPrompt()
 
 void KateMainWindow::slotDocumentCreated (Kate::Document *doc)
 {
-  connect(doc,TQT_SIGNAL(modStateChanged(Kate::Document *)),this,TQT_SLOT(updateCaption(Kate::Document *)));
-  connect(doc,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(slotNameChanged(Kate::Document *)));
-  connect(doc,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(slotUpdateOpenWith()));
+  connect(doc,TQ_SIGNAL(modStateChanged(Kate::Document *)),this,TQ_SLOT(updateCaption(Kate::Document *)));
+  connect(doc,TQ_SIGNAL(nameChanged(Kate::Document *)),this,TQ_SLOT(slotNameChanged(Kate::Document *)));
+  connect(doc,TQ_SIGNAL(nameChanged(Kate::Document *)),this,TQ_SLOT(slotUpdateOpenWith()));
 
   updateCaption (doc);
 }
@@ -937,7 +937,7 @@ void KateMainWindow::activateSession(int sessionId)
 KateSessionListActionMenu::KateSessionListActionMenu(KateMainWindow *mw, const TQString &text, TQObject *parent, const char *name)
   : TDEActionMenu(text, parent, name), m_mainWindow(mw)
 {
-  connect(popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShow()));
+  connect(popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShow()));
 }
 
 //-------------------------------------------
@@ -948,6 +948,6 @@ void KateSessionListActionMenu::slotAboutToShow()
   TQPtrList<KateSession> &sessions = KateApp::self()->sessionManager()->getSessionsList();
   for (int idx = 0;  idx < (int)sessions.count();  ++idx)
   {
-    popupMenu()->insertItem(sessions[idx]->getSessionName(), m_mainWindow, TQT_SLOT(activateSession(int)), 0, idx);
+    popupMenu()->insertItem(sessions[idx]->getSessionName(), m_mainWindow, TQ_SLOT(activateSession(int)), 0, idx);
   }
 }
diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h
index f458bd705..1e8839991 100644
--- a/kate/app/katemainwindow.h
+++ b/kate/app/katemainwindow.h
@@ -47,7 +47,7 @@ class KateExternalToolsMenuAction;
 
 class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KateConfigDialog;
   friend class KateViewManager;
@@ -222,7 +222,7 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
 
 class KateSessionListActionMenu : public TDEActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSessionListActionMenu(KateMainWindow *mw, const TQString &text, TQObject *parent = NULL, const char *name = NULL);
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 473d26014..15b4e62d1 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -71,8 +71,8 @@ ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const TDEShor
  : TDEToggleAction(text,cut,parent,name)
  , m_tv(tv)
 {
-  connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool)));
-  connect(m_tv,TQT_SIGNAL(visibleChanged(bool)),this,TQT_SLOT(visibleChanged(bool)));
+  connect(this,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool)));
+  connect(m_tv,TQ_SIGNAL(visibleChanged(bool)),this,TQ_SLOT(visibleChanged(bool)));
 
   setChecked(m_tv->visible());
 }
@@ -123,8 +123,8 @@ GUIClient::GUIClient ( MainWindow *mw )
  , KXMLGUIClient ( mw )
  , m_mw (mw)
 {
-  connect( m_mw->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ),
-           this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) );
+  connect( m_mw->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ),
+           this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) );
 
   if ( domDocument().documentElement().isNull() )
   {
@@ -142,8 +142,8 @@ GUIClient::GUIClient ( MainWindow *mw )
                                             CTRL|ALT|SHIFT|Key_F, actionCollection(), "kate_mdi_sidebar_visibility" );
   m_showSidebarsAction->setCheckedState(i18n("Hide Side&bars"));
   m_showSidebarsAction->setChecked( m_mw->sidebarsVisible() );
-  connect( m_showSidebarsAction, TQT_SIGNAL( toggled( bool ) ),
-           m_mw, TQT_SLOT( setSidebarsVisible( bool ) ) );
+  connect( m_showSidebarsAction, TQ_SIGNAL( toggled( bool ) ),
+           m_mw, TQ_SLOT( setSidebarsVisible( bool ) ) );
 
   m_toolMenu->insert( m_showSidebarsAction );
   m_toolMenu->insert( new TDEActionSeparator( m_toolMenu ) );
@@ -256,8 +256,8 @@ bool ToolView::visible () const
 void ToolView::childEvent ( TQChildEvent *ev )
 {
   // set the widget to be focus proxy if possible
-  if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqt_cast(TQWIDGET_OBJECT_NAME_STRING)) {
-    setFocusProxy (::tqqt_cast<QWidget*>(TQT_TQOBJECT(ev->child())));
+  if (ev->inserted() && ev->child() && ev->child()->tqt_cast("TQWidget")) {
+    setFocusProxy (::tqt_cast<TQWidget*>(ev->child()));
 }
 
   TQVBox::childEvent (ev);
@@ -286,7 +286,7 @@ Sidebar::~Sidebar ()
 void Sidebar::setSplitter (Splitter *sp)
 {
   m_splitter = sp;
-  m_ownSplit = new Splitter ((position() == KMultiTabBar::Top || position() == KMultiTabBar::Bottom) ? Qt::Horizontal : Qt::Vertical, m_splitter);
+  m_ownSplit = new Splitter ((position() == KMultiTabBar::Top || position() == KMultiTabBar::Bottom) ? TQt::Horizontal : TQt::Vertical, m_splitter);
   m_ownSplit->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
   m_ownSplit->setChildrenCollapsible( false );
   m_splitter->setResizeMode( m_ownSplit, TQSplitter::KeepSize );
@@ -332,7 +332,7 @@ ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolVi
 
   show ();
 
-  connect(tab(newId),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int)));
+  connect(tab(newId),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(tabClicked(int)));
   tab(newId)->installEventFilter(this);
 
   return widget;
@@ -449,7 +449,7 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev)
   if (ev->type()==TQEvent::ContextMenu)
   {
     TQContextMenuEvent *e = (TQContextMenuEvent *) ev;
-    KMultiTabBarTab *bt = tqt_dynamic_cast<KMultiTabBarTab*>(obj);
+    KMultiTabBarTab *bt = dynamic_cast<KMultiTabBarTab*>(obj);
     if (bt)
     {
       kdDebug()<<"Request for popup"<<endl;
@@ -480,8 +480,8 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev)
         if (position() != 3)
           p->insertItem(SmallIconSet("go-down"), i18n("Bottom Sidebar"),3);
 
-        connect(p, TQT_SIGNAL(activated(int)),
-              this, TQT_SLOT(buttonPopupActivate(int)));
+        connect(p, TQ_SIGNAL(activated(int)),
+              this, TQ_SLOT(buttonPopupActivate(int)));
 
         p->exec(e->globalPos());
         delete p;
@@ -596,7 +596,7 @@ void Sidebar::restoreSession (TDEConfig *config)
       // readd the button
       int newId = m_widgetToId[tv];
       appendTab (tv->icon, newId, tv->text);
-      connect(tab(newId),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int)));
+      connect(tab(newId),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(tabClicked(int)));
       tab(newId)->installEventFilter(this);
 
       // reshuffle in splitter
@@ -672,7 +672,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
 
   m_sidebars[KMultiTabBar::Left] = new Sidebar (KMultiTabBar::Left, this, hb);
 
-  m_hSplitter = new Splitter (Qt::Horizontal, hb);
+  m_hSplitter = new Splitter (TQt::Horizontal, hb);
   m_hSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
 
   m_sidebars[KMultiTabBar::Left]->setSplitter (m_hSplitter);
@@ -682,7 +682,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
 
   m_sidebars[KMultiTabBar::Top] = new Sidebar (KMultiTabBar::Top, this, vb);
 
-  m_vSplitter = new Splitter (Qt::Vertical, vb);
+  m_vSplitter = new Splitter (TQt::Vertical, vb);
   m_vSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
 
   m_sidebars[KMultiTabBar::Top]->setSplitter (m_vSplitter);
diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h
index f37d56ef3..f9eef3bda 100644
--- a/kate/app/katemdi.h
+++ b/kate/app/katemdi.h
@@ -40,7 +40,7 @@ namespace KateMDI {
 /** This class is needed because TQSplitter cant return an index for a widget. */
 class Splitter : public TQSplitter
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
@@ -60,7 +60,7 @@ class Splitter : public TQSplitter
 
 class ToggleToolViewAction : public TDEToggleAction
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
@@ -79,7 +79,7 @@ class ToggleToolViewAction : public TDEToggleAction
 
 class GUIClient : public TQObject, public KXMLGUIClient
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
@@ -104,7 +104,7 @@ class GUIClient : public TQObject, public KXMLGUIClient
 
 class ToolView : public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   friend class Sidebar;
@@ -179,7 +179,7 @@ class ToolView : public TQVBox
 
 class Sidebar : public KMultiTabBar
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
@@ -252,7 +252,7 @@ class Sidebar : public KMultiTabBar
 
 class MainWindow : public KParts::MainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   friend class ToolView;
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index c908b3617..3babd75e8 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -99,7 +99,7 @@ KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, cons
   for ( uint i=0; i < docs.size(); i++ )
     new KateDocItem( docs[i], l[ (uint)KateDocManager::self()->documentInfo( docs[i] )->modifiedOnDiscReason ], lvDocuments );
 
-  connect( lvDocuments, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) );
+  connect( lvDocuments, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) );
 
   // diff button
   TQHBox *lo2 = new TQHBox ( w );
@@ -111,7 +111,7 @@ KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, cons
       "Calculates the difference between the the editor contents and the disk "
       "file for the selected document, and shows the difference with the "
       "default application. Requires diff(1).") );
-  connect( btnDiff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDiff()) );
+  connect( btnDiff, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDiff()) );
 
   slotSelectionChanged();
   m_tmpfile = 0;
@@ -216,8 +216,8 @@ void KateMwModOnHdDialog::slotDiff()
   KProcIO *p = new KProcIO();
   p->setComm( TDEProcess::All );
   *p << "diff" << "-u" << "-" <<  doc->url().path();
-  connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) );
-  connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) );
+  connect( p, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotPDone(TDEProcess*)) );
+  connect( p, TQ_SIGNAL(readReady(KProcIO*)), this, TQ_SLOT(slotPRead(KProcIO*)) );
 
   setCursor( WaitCursor );
 
diff --git a/kate/app/katemwmodonhddialog.h b/kate/app/katemwmodonhddialog.h
index ff2f4989d..2ca012f84 100644
--- a/kate/app/katemwmodonhddialog.h
+++ b/kate/app/katemwmodonhddialog.h
@@ -33,7 +33,7 @@ class TDEProcess;
  */
 class KateMwModOnHdDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KateMwModOnHdDialog( DocVector docs, TQWidget *parent=0, const char *name=0 );
     ~KateMwModOnHdDialog();
diff --git a/kate/app/katepluginmanager.h b/kate/app/katepluginmanager.h
index 1617c5501..e8fbddcb0 100644
--- a/kate/app/katepluginmanager.h
+++ b/kate/app/katepluginmanager.h
@@ -43,7 +43,7 @@ typedef TQValueList<KatePluginInfo> KatePluginList;
 
 class KatePluginManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KatePluginManager(TQObject *parent);
diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp
index 9ff79dfb4..4fca9b763 100644
--- a/kate/app/katesavemodifieddialog.cpp
+++ b/kate/app/katesavemodifieddialog.cpp
@@ -156,11 +156,11 @@ KateSaveModifiedDialog::KateSaveModifiedDialog(TQWidget *parent, TQPtrList<Kate:
 		}
 		m_documentRoot->setOpen(true);
 	} else m_documentRoot=0;
-	connect(m_list, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotItemSelected()));
-	connect(m_list, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotItemSelected()));
-	connect(m_list, TQT_SIGNAL(spacePressed(TQListViewItem *)), TQT_SLOT(slotItemSelected()));
+	connect(m_list, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(slotItemSelected()));
+	connect(m_list, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotItemSelected()));
+	connect(m_list, TQ_SIGNAL(spacePressed(TQListViewItem *)), TQ_SLOT(slotItemSelected()));
 	if(documents.count()>3) { //For 3 or less, it would be quicker just to tick or untick them yourself, so don't clutter the gui.
-		connect(new TQPushButton(i18n("Se&lect All"),box),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotSelectAll()));
+		connect(new TQPushButton(i18n("Se&lect All"),box),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotSelectAll()));
 	}
 }
 
diff --git a/kate/app/katesavemodifieddialog.h b/kate/app/katesavemodifieddialog.h
index 92036c63c..e66da24d4 100644
--- a/kate/app/katesavemodifieddialog.h
+++ b/kate/app/katesavemodifieddialog.h
@@ -26,7 +26,7 @@ class TQListViewItem;
 class TDEListView;
 
 class KateSaveModifiedDialog: public KDialogBase {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KateSaveModifiedDialog(TQWidget *parent, TQPtrList<Kate::Document> documents);
 	virtual ~KateSaveModifiedDialog();
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index bab8dce56..d57101310 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -847,8 +847,8 @@ KateSessionChooser::KateSessionChooser(TQWidget *parent)
   m_listview->setSorting(-1);
   m_listview->setResizeMode(TQListView::LastColumn);
 
-  connect (m_listview, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
-  connect (m_listview, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotUser2()));
+  connect (m_listview, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
+  connect (m_listview, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotUser2()));
 
   TQPtrList<KateSession> &sessions = KateSessionManager::self()->getSessionsList();
   for (int idx = sessions.count()-1;  idx >= 0;  --idx)
diff --git a/kate/app/katesession.h b/kate/app/katesession.h
index e4a31f441..fa267e91f 100644
--- a/kate/app/katesession.h
+++ b/kate/app/katesession.h
@@ -175,7 +175,7 @@ class KateSession
 //FIXME add kdDebug statement to ease debugging
 class KateSessionManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 	public:
 
@@ -503,7 +503,7 @@ class KateSessionChooserItem : public TDEListViewItem
 //FIXME create one single KateSessionChooser and reuse it all the time
 class KateSessionChooser : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		enum Result
diff --git a/kate/app/katesessionpanel.cpp b/kate/app/katesessionpanel.cpp
index c2f262ff8..e05da91cd 100644
--- a/kate/app/katesessionpanel.cpp
+++ b/kate/app/katesessionpanel.cpp
@@ -64,7 +64,7 @@ KateSessionNameChooser::KateSessionNameChooser(TQWidget *parent, bool showSwitch
 		m_activateCB->setChecked(true);
 	}
 
-  connect(m_sessionNameLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotTextChanged()));
+  connect(m_sessionNameLE, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged()));
   slotTextChanged();  // update button status
 }
 
@@ -146,28 +146,28 @@ KateSessionPanel::KateSessionPanel(KateMainWindow *mainWindow, KateViewManager *
   //m_listview->setRootIsDecorated(true);  // FIXME disabled until doc list software is developed
 
 
-  connect(m_listview, TQT_SIGNAL(selectionChanged()),
-          this, TQT_SLOT(slotSelectionChanged()));
-  connect(m_listview, TQT_SIGNAL(executed(TQListViewItem*)),
-          this, TQT_SLOT(slotItemExecuted(TQListViewItem*)));
-  connect(m_listview, TQT_SIGNAL(returnPressed(TQListViewItem*)),
-          this, TQT_SLOT(slotItemExecuted(TQListViewItem*)));
-  connect(KateApp::self(), TQT_SIGNAL(optionsChanged()),
-          this, TQT_SLOT(slotSelectionChanged()));
-  connect(m_sessionManager, TQT_SIGNAL(switchOptionChanged()),
-          this, TQT_SLOT(slotSelectionChanged()));
-  connect(m_sessionManager, TQT_SIGNAL(sessionActivated(int, int)),
-          this, TQT_SLOT(slotSessionActivated(int, int)));
-  connect(m_sessionManager, TQT_SIGNAL(sessionCreated(int)),
-          this, TQT_SLOT(slotSessionCreated(int)));
-  connect(m_sessionManager, TQT_SIGNAL(sessionDeleted(int)),
-          this, TQT_SLOT(slotSessionDeleted(int)));
-  connect(m_sessionManager, TQT_SIGNAL(sessionsSwapped(int, int)),
-          this, TQT_SLOT(slotSessionsSwapped(int, int)));
-  connect(m_sessionManager, TQT_SIGNAL(sessionRenamed(int)),
-          this, TQT_SLOT(slotSessionRenamed(int)));
-  connect(m_listview, TQT_SIGNAL(itemRenamed(TQListViewItem*)),
-          this, TQT_SLOT(slotLVSessionRenamed(TQListViewItem*)));
+  connect(m_listview, TQ_SIGNAL(selectionChanged()),
+          this, TQ_SLOT(slotSelectionChanged()));
+  connect(m_listview, TQ_SIGNAL(executed(TQListViewItem*)),
+          this, TQ_SLOT(slotItemExecuted(TQListViewItem*)));
+  connect(m_listview, TQ_SIGNAL(returnPressed(TQListViewItem*)),
+          this, TQ_SLOT(slotItemExecuted(TQListViewItem*)));
+  connect(KateApp::self(), TQ_SIGNAL(optionsChanged()),
+          this, TQ_SLOT(slotSelectionChanged()));
+  connect(m_sessionManager, TQ_SIGNAL(switchOptionChanged()),
+          this, TQ_SLOT(slotSelectionChanged()));
+  connect(m_sessionManager, TQ_SIGNAL(sessionActivated(int, int)),
+          this, TQ_SLOT(slotSessionActivated(int, int)));
+  connect(m_sessionManager, TQ_SIGNAL(sessionCreated(int)),
+          this, TQ_SLOT(slotSessionCreated(int)));
+  connect(m_sessionManager, TQ_SIGNAL(sessionDeleted(int)),
+          this, TQ_SLOT(slotSessionDeleted(int)));
+  connect(m_sessionManager, TQ_SIGNAL(sessionsSwapped(int, int)),
+          this, TQ_SLOT(slotSessionsSwapped(int, int)));
+  connect(m_sessionManager, TQ_SIGNAL(sessionRenamed(int)),
+          this, TQ_SLOT(slotSessionRenamed(int)));
+  connect(m_listview, TQ_SIGNAL(itemRenamed(TQListViewItem*)),
+          this, TQ_SLOT(slotLVSessionRenamed(TQListViewItem*)));
 
   TQPtrList<KateSession>& sessions = m_sessionManager->getSessionsList();
   for (int idx = sessions.count() - 1;  idx >= 0;  --idx)
@@ -199,45 +199,45 @@ void KateSessionPanel::setup_toolbar()
   TDEAction *a;
 
   a = new TDEAction(i18n("New"), SmallIcon("list-add"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotNewSession()), m_actionCollection, "session_new");
+          this, TQ_SLOT(slotNewSession()), m_actionCollection, "session_new");
   a->setWhatsThis(i18n("Create a new session and switch to it."));
   a->plug(m_toolbar);
 
   a = new TDEAction(i18n("Save"), SmallIcon("document-save"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotSaveSession()), m_actionCollection, "session_save");
+          this, TQ_SLOT(slotSaveSession()), m_actionCollection, "session_save");
   a->setWhatsThis(i18n("Save the selected session."));
   a->plug(m_toolbar);
 
   a = new TDEAction(i18n("Save as..."), SmallIcon("document-save-as"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotSaveSessionAs()), m_actionCollection, "session_save_as");
+          this, TQ_SLOT(slotSaveSessionAs()), m_actionCollection, "session_save_as");
   a->setWhatsThis(i18n("Save an unsaved session with a new name or clone an already saved session "
                        "into a new session."));
   a->plug(m_toolbar);
 
   a = new TDEAction(i18n("Rename"), SmallIcon("edit_user"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotRenameSession()), m_actionCollection, "session_rename");
+          this, TQ_SLOT(slotRenameSession()), m_actionCollection, "session_rename");
   a->setWhatsThis(i18n("Rename the selected session."));
   a->plug(m_toolbar);
 
   a = new TDEAction(i18n("Delete"), SmallIcon("edit-delete"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotDeleteSession()), m_actionCollection, "session_delete");
+          this, TQ_SLOT(slotDeleteSession()), m_actionCollection, "session_delete");
   a->setWhatsThis(i18n("Delete the selected session."));
   a->plug(m_toolbar);
 
   a = new TDEAction(i18n("Reload"), SmallIcon("reload"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotReloadSession()), m_actionCollection, "session_reload");
+          this, TQ_SLOT(slotReloadSession()), m_actionCollection, "session_reload");
   a->setWhatsThis(i18n("Reload the last saved state of the selected session."));
   a->plug(m_toolbar);
 
   m_toolbar->insertLineSeparator();
 
   a = new TDEAction(i18n("Activate"), SmallIcon("forward"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotActivateSession()), m_actionCollection, "session_activate");
+          this, TQ_SLOT(slotActivateSession()), m_actionCollection, "session_activate");
   a->setWhatsThis(i18n("Activate the selected session."));
   a->plug(m_toolbar);
 
 	TDEToggleAction *tglA = new TDEToggleAction(i18n("Toggle read only"), SmallIcon("encrypted"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotSessionToggleReadOnly()), m_actionCollection, "session_toggle_read_only");
+          this, TQ_SLOT(slotSessionToggleReadOnly()), m_actionCollection, "session_toggle_read_only");
   tglA->setWhatsThis(i18n("Toggle read only status for the selected session.<p>"
 					"In a read only session, you can work as usual but the list of documents in the session "
           "will not be saved when you exit Kate or switch to another session.<p>"
@@ -245,12 +245,12 @@ void KateSessionPanel::setup_toolbar()
   tglA->plug(m_toolbar);
 
   a = new TDEAction(i18n("Move Up"), SmallIcon("go-up"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotSessionMoveUp()), m_actionCollection, "session_move_up");
+          this, TQ_SLOT(slotSessionMoveUp()), m_actionCollection, "session_move_up");
   a->setWhatsThis(i18n("Move up the selected session."));
   a->plug(m_toolbar);
 
   a = new TDEAction(i18n("Move Down"), SmallIcon("go-down"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotSessionMoveDown()), m_actionCollection, "session_move_down");
+          this, TQ_SLOT(slotSessionMoveDown()), m_actionCollection, "session_move_down");
   a->setWhatsThis(i18n("Move down the selected session."));
   a->plug(m_toolbar);
 }
diff --git a/kate/app/katesessionpanel.h b/kate/app/katesessionpanel.h
index 023de53e2..d8b1e156c 100644
--- a/kate/app/katesessionpanel.h
+++ b/kate/app/katesessionpanel.h
@@ -45,7 +45,7 @@ class TDEActionCollection;
 //FIXME improve string to distinguish between new session and saving an unnamed session
 class KateSessionNameChooser : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 
@@ -72,7 +72,7 @@ class KateSessionNameChooser : public KDialogBase
 //BEGIN KateSessionPanelToolBarParent
 class KateSessionPanelToolBarParent: public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSessionPanelToolBarParent(TQWidget *parent) : TQFrame(parent), m_tbar(0) {}
@@ -109,7 +109,7 @@ class KateSessionPanelItem : public TDEListViewItem
 //BEGIN KateSessionPanel
 class KateSessionPanel : public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  	friend class KateMainWindow;
  	
diff --git a/kate/app/katetabwidget.cpp b/kate/app/katetabwidget.cpp
index e2ac7e8b3..20f2a230d 100644
--- a/kate/app/katetabwidget.cpp
+++ b/kate/app/katetabwidget.cpp
@@ -32,7 +32,7 @@ KateTabWidget::KateTabWidget(TQWidget* parent, const char* name)
 
   setHoverCloseButton(true);
 
-  connect(this, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*)));
+  connect(this, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeTab(TQWidget*)));
 }
 
 KateTabWidget::~KateTabWidget()
diff --git a/kate/app/katetabwidget.h b/kate/app/katetabwidget.h
index 7e4327595..6bac94e1b 100644
--- a/kate/app/katetabwidget.h
+++ b/kate/app/katetabwidget.h
@@ -24,7 +24,7 @@
 
 class KateTabWidget : public KTabWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum TabWidgetVisibility {
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 7682b6cfd..6ae57f2ec 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -71,7 +71,7 @@ KateViewManager::KateViewManager (KateMainWindow *parent)
 
   m_viewManager = new Kate::ViewManager (this);
   m_currentContainer=0;
- connect(m_mainWindow->tabWidget(),TQT_SIGNAL(currentChanged(TQWidget*)),this,TQT_SLOT(tabChanged(TQWidget*)));
+ connect(m_mainWindow->tabWidget(),TQ_SIGNAL(currentChanged(TQWidget*)),this,TQ_SLOT(tabChanged(TQWidget*)));
  slotNewTab();
  tabChanged(m_mainWindow->tabWidget()->currentPage());
 
@@ -94,47 +94,47 @@ void KateViewManager::setupActions ()
   /**
    * tabbing
    */
-  a=new TDEAction ( i18n("New Tab"),"tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTab()),
+  a=new TDEAction ( i18n("New Tab"),"tab_new", 0, this, TQ_SLOT(slotNewTab()),
                   m_mainWindow->actionCollection(), "view_new_tab" );
 
-  m_closeTab = new TDEAction ( i18n("Close Current Tab"),"tab_remove",0,TQT_TQOBJECT(this),TQT_SLOT(slotCloseTab()),
+  m_closeTab = new TDEAction ( i18n("Close Current Tab"),"tab_remove",0,this,TQ_SLOT(slotCloseTab()),
                              m_mainWindow->actionCollection(),"view_close_tab");
 
   m_activateNextTab
       = new TDEAction( i18n( "Activate Next Tab" ),
                      TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(),
-                     TQT_TQOBJECT(this), TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" );
+                     this, TQ_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" );
 
   m_activatePrevTab
       = new TDEAction( i18n( "Activate Previous Tab" ),
                      TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(),
-                     TQT_TQOBJECT(this), TQT_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" );
+                     this, TQ_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" );
 
   /**
    * view splitting
    */
-  a=new TDEAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT(
+  a=new TDEAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, this, TQ_SLOT(
                   slotSplitViewSpaceVert() ), m_mainWindow->actionCollection(), "view_split_vert");
 
   a->setWhatsThis(i18n("Split the currently active view vertically into two views."));
 
-  a=new TDEAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT(
+  a=new TDEAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, this, TQ_SLOT(
                   slotSplitViewSpaceHoriz() ), m_mainWindow->actionCollection(), "view_split_horiz");
 
   a->setWhatsThis(i18n("Split the currently active view horizontally into two views."));
 
-  m_closeView = new TDEAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this),
-                    TQT_SLOT( slotCloseCurrentViewSpace() ), m_mainWindow->actionCollection(),
+  m_closeView = new TDEAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, this,
+                    TQ_SLOT( slotCloseCurrentViewSpace() ), m_mainWindow->actionCollection(),
                     "view_close_current_space" );
 
   m_closeView->setWhatsThis(i18n("Close the currently active splitted view"));
 
-  goNext=new TDEAction(i18n("Next View"),Key_F8,TQT_TQOBJECT(this),
-                     TQT_SLOT(activateNextView()),m_mainWindow->actionCollection(),"go_next");
+  goNext=new TDEAction(i18n("Next View"),Key_F8,this,
+                     TQ_SLOT(activateNextView()),m_mainWindow->actionCollection(),"go_next");
 
   goNext->setWhatsThis(i18n("Make the next split view the active one."));
 
-  goPrev=new TDEAction(i18n("Previous View"),SHIFT+Key_F8, TQT_TQOBJECT(this), TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev");
+  goPrev=new TDEAction(i18n("Previous View"),SHIFT+Key_F8, this, TQ_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev");
 
   goPrev->setWhatsThis(i18n("Make the previous split view the active one."));
 
@@ -142,16 +142,16 @@ void KateViewManager::setupActions ()
    * buttons for tabbing
    */
   TQToolButton *b = new TQToolButton( m_mainWindow->tabWidget() );
-  connect( b, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( slotNewTab() ) );
+  connect( b, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( slotNewTab() ) );
   b->setIconSet( SmallIcon( "tab_new" ) );
   b->adjustSize();
   TQToolTip::add(b, i18n("Open a new tab"));
   m_mainWindow->tabWidget()->setCornerWidget( b, TopLeft );
 
   b = m_closeTabButton = new TQToolButton( m_mainWindow->tabWidget() );
-  connect( b, TQT_SIGNAL( clicked() ),
-            this, TQT_SLOT( slotCloseTab() ) );
+  connect( b, TQ_SIGNAL( clicked() ),
+            this, TQ_SLOT( slotCloseTab() ) );
   b->setIconSet( SmallIcon( "tab_remove" ) );
   b->adjustSize();
   TQToolTip::add(b, i18n("Close the current tab"));
@@ -199,8 +199,8 @@ void KateViewManager::slotNewTab()
   m_viewSpaceContainerList.append(container);
   m_mainWindow->tabWidget()->addTab (container, "");
 
-  connect(container,TQT_SIGNAL(viewChanged()),this,TQT_SIGNAL(viewChanged()));
-  connect(container,TQT_SIGNAL(viewChanged()),m_viewManager,TQT_SIGNAL(viewChanged()));
+  connect(container,TQ_SIGNAL(viewChanged()),this,TQ_SIGNAL(viewChanged()));
+  connect(container,TQ_SIGNAL(viewChanged()),m_viewManager,TQ_SIGNAL(viewChanged()));
 
   if (!m_init)
   {
diff --git a/kate/app/kateviewmanager.h b/kate/app/kateviewmanager.h
index d16b59dc2..f67eb4758 100644
--- a/kate/app/kateviewmanager.h
+++ b/kate/app/kateviewmanager.h
@@ -38,7 +38,7 @@ class TQToolButton;
 
 class KateViewManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewManager (KateMainWindow *parent);
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index 7278d7d2a..8c552a82f 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -139,8 +139,8 @@ void KateViewSpace::addView(Kate::View* v, bool show)
 
 void KateViewSpace::removeView(Kate::View* v)
 {
-  disconnect( v->getDoc(), TQT_SIGNAL(modifiedChanged()),
-              mStatusBar, TQT_SLOT(modifiedChanged()) );
+  disconnect( v->getDoc(), TQ_SIGNAL(modifiedChanged()),
+              mStatusBar, TQ_SLOT(modifiedChanged()) );
 
   bool active = ( v == currentView() );
 
@@ -168,12 +168,12 @@ bool KateViewSpace::showView(uint documentNumber)
   for( ; it.current(); --it ) {
     if (((Kate::Document*)it.current()->getDoc())->documentNumber() == documentNumber) {
       if ( currentView() )
-        disconnect( currentView()->getDoc(), TQT_SIGNAL(modifiedChanged()),
-                    mStatusBar, TQT_SLOT(modifiedChanged()) );
+        disconnect( currentView()->getDoc(), TQ_SIGNAL(modifiedChanged()),
+                    mStatusBar, TQ_SLOT(modifiedChanged()) );
 
       Kate::View* kv = it.current();
-      connect( kv->getDoc(), TQT_SIGNAL(modifiedChanged()),
-               mStatusBar, TQT_SLOT(modifiedChanged()) );
+      connect( kv->getDoc(), TQ_SIGNAL(modifiedChanged()),
+               mStatusBar, TQ_SLOT(modifiedChanged()) );
 
       mViewList.removeRef( kv );
       mViewList.append( kv );
@@ -311,29 +311,29 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name )
 {
   m_lineColLabel = new TQLabel( this );
   addWidget( m_lineColLabel, 0, false );
-  m_lineColLabel->setAlignment( Qt::AlignCenter );
+  m_lineColLabel->setAlignment( TQt::AlignCenter );
   m_lineColLabel->installEventFilter( this );
 
   m_modifiedLabel = new TQLabel( TQString("   "), this );
   addWidget( m_modifiedLabel, 0, false );
-  m_modifiedLabel->setAlignment( Qt::AlignCenter );
+  m_modifiedLabel->setAlignment( TQt::AlignCenter );
   m_modifiedLabel->installEventFilter( this );
 
   m_insertModeLabel = new TQLabel( i18n(" INS "), this );
   addWidget( m_insertModeLabel, 0, false );
-  m_insertModeLabel->setAlignment( Qt::AlignCenter );
+  m_insertModeLabel->setAlignment( TQt::AlignCenter );
   m_insertModeLabel->installEventFilter( this );
 
   m_selectModeLabel = new TQLabel( i18n(" NORM "), this );
   addWidget( m_selectModeLabel, 0, false );
-  m_selectModeLabel->setAlignment( Qt::AlignCenter );
+  m_selectModeLabel->setAlignment( TQt::AlignCenter );
   m_selectModeLabel->installEventFilter( this );
 
   m_fileNameLabel=new KSqueezedTextLabel( this );
   addWidget( m_fileNameLabel, 1, true );
   m_fileNameLabel->setMinimumSize( 0, 0 );
   m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
-  m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
+  m_fileNameLabel->setAlignment( /*TQt::AlignRight*/TQt::AlignLeft );
   m_fileNameLabel->installEventFilter( this );
 
   installEventFilter( this );
@@ -412,7 +412,7 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e)
     if ( m_viewSpace->currentView() )
       m_viewSpace->currentView()->setFocus();
 
-    if ( ((TQMouseEvent*)e)->button()==Qt::RightButton)
+    if ( ((TQMouseEvent*)e)->button()==TQt::RightButton)
       showMenu();
 
     return true;
diff --git a/kate/app/kateviewspace.h b/kate/app/kateviewspace.h
index 7c4674ec1..3b238beb8 100644
--- a/kate/app/kateviewspace.h
+++ b/kate/app/kateviewspace.h
@@ -39,7 +39,7 @@ class KateViewSpaceContainer;
 
 class KateVSStatusBar : public KStatusBar
 {
-  Q_OBJECT
+  TQ_OBJECT
 
    public:
       KateVSStatusBar ( KateViewSpace *parent = 0L, const char *name = 0L );
@@ -73,7 +73,7 @@ class KateViewSpace : public TQVBox
   friend class KateViewSpaceContainer;
   friend class KateVSStatusBar;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewSpace(KateViewSpaceContainer *, TQWidget* parent=0, const char* name=0);
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index 6e2b5d0ea..50e0d7ea2 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -69,14 +69,14 @@ KateViewSpaceContainer::KateViewSpaceContainer (TQWidget *parent, KateViewManage
   m_viewSpaceList.setAutoDelete(true);
 
   KateViewSpace* vs = new KateViewSpace( this, this );
-  connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString&)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString&)));
+  connect(this, TQ_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString&)), vs, TQ_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString&)));
   vs->setActive( true );
   m_viewSpaceList.append(vs);
-  connect( this, TQT_SIGNAL(viewChanged()), this, TQT_SLOT(slotViewChanged()) );
-  connect(KateDocManager::self(), TQT_SIGNAL(initialDocumentReplaced()), this, TQT_SIGNAL(viewChanged()));
+  connect( this, TQ_SIGNAL(viewChanged()), this, TQ_SLOT(slotViewChanged()) );
+  connect(KateDocManager::self(), TQ_SIGNAL(initialDocumentReplaced()), this, TQ_SIGNAL(viewChanged()));
 
-  connect(KateDocManager::self(),TQT_SIGNAL(documentCreated(Kate::Document *)),this,TQT_SLOT(documentCreated(Kate::Document *)));
-  connect(KateDocManager::self(),TQT_SIGNAL(documentDeleted(uint)),this,TQT_SLOT(documentDeleted(uint)));
+  connect(KateDocManager::self(),TQ_SIGNAL(documentCreated(Kate::Document *)),this,TQ_SLOT(documentCreated(Kate::Document *)));
+  connect(KateDocManager::self(),TQ_SIGNAL(documentDeleted(uint)),this,TQ_SLOT(documentDeleted(uint)));
 }
 
 KateViewSpaceContainer::~KateViewSpaceContainer ()
@@ -122,17 +122,17 @@ bool KateViewSpaceContainer::createView ( Kate::Document *doc )
   // popup menu
   view->installPopup ((TQPopupMenu*)(mainWindow()->factory()->container("tdetexteditor_popup", mainWindow())) );
 
-  connect(view->getDoc(),TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(statusMsg()));
-  connect(view,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(statusMsg()));
-  connect(view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(statusMsg()));
-  connect(view->getDoc(), TQT_SIGNAL(undoChanged()), this, TQT_SLOT(statusMsg()));
-  connect(view,TQT_SIGNAL(dropEventPass(TQDropEvent *)), mainWindow(),TQT_SLOT(slotDropEvent(TQDropEvent *)));
-  connect(view,TQT_SIGNAL(gotFocus(Kate::View *)),this,TQT_SLOT(activateSpace(Kate::View *)));
+  connect(view->getDoc(),TQ_SIGNAL(nameChanged(Kate::Document *)),this,TQ_SLOT(statusMsg()));
+  connect(view,TQ_SIGNAL(cursorPositionChanged()),this,TQ_SLOT(statusMsg()));
+  connect(view,TQ_SIGNAL(newStatus()),this,TQ_SLOT(statusMsg()));
+  connect(view->getDoc(), TQ_SIGNAL(undoChanged()), this, TQ_SLOT(statusMsg()));
+  connect(view,TQ_SIGNAL(dropEventPass(TQDropEvent *)), mainWindow(),TQ_SLOT(slotDropEvent(TQDropEvent *)));
+  connect(view,TQ_SIGNAL(gotFocus(Kate::View *)),this,TQ_SLOT(activateSpace(Kate::View *)));
 
   activeViewSpace()->addView( view );
   activateView( view );
-  connect( doc, TQT_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),
-      activeViewSpace(), TQT_SLOT(modifiedOnDisc(Kate::Document *, bool, unsigned char)) );
+  connect( doc, TQ_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),
+      activeViewSpace(), TQ_SLOT(modifiedOnDisc(Kate::Document *, bool, unsigned char)) );
 
   return true;
 }
@@ -256,7 +256,7 @@ void KateViewSpaceContainer::reactivateActiveView() {
     activateView(view);
   } else if (m_pendingViewCreation) {
     m_pendingViewCreation=false;
-    disconnect(m_pendingDocument,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(slotPendingDocumentNameChanged()));
+    disconnect(m_pendingDocument,TQ_SIGNAL(nameChanged(Kate::Document *)),this,TQ_SLOT(slotPendingDocumentNameChanged()));
     createView(m_pendingDocument);
   }
 }
@@ -378,7 +378,7 @@ void KateViewSpaceContainer::closeViews(uint documentNumber)
     }
 
   if (m_blockViewCreationAndActivation) return;
-  TQTimer::singleShot(0,this,TQT_SIGNAL(viewChanged()));
+  TQTimer::singleShot(0,this,TQ_SIGNAL(viewChanged()));
   //emit m_viewManager->viewChanged ();
 }
 
@@ -450,10 +450,10 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
 
   TQValueList<int> psizes;
   if ( ! isFirstTime )
-    if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->parentWidget()->tqt_cast(TQSPLITTER_OBJECT_NAME_STRING)) )
+    if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->parentWidget()->tqt_cast("TQSplitter")) )
       psizes = ps->sizes();
 
-  Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal;
+  TQt::Orientation o = isHoriz ? TQt::Vertical : TQt::Horizontal;
   KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget());
   s->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
 
@@ -471,7 +471,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
     s->moveToFirst( vsNew );
 
   if (!isFirstTime)
-    if (TQSplitter *ps = static_cast<TQSplitter*>(s->parentWidget()->tqt_cast(TQSPLITTER_OBJECT_NAME_STRING)) )
+    if (TQSplitter *ps = static_cast<TQSplitter*>(s->parentWidget()->tqt_cast("TQSplitter")) )
       ps->setSizes( psizes );
 
   s->show();
@@ -481,7 +481,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
   sizes << space << space;
   s->setSizes( sizes );
 
-  connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vsNew, TQT_SLOT(slotStatusChanged(Kate::View *, int, int,int, bool, int, const TQString &)));
+  connect(this, TQ_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vsNew, TQ_SLOT(slotStatusChanged(Kate::View *, int, int,int, bool, int, const TQString &)));
   m_viewSpaceList.append( vsNew );
   activeViewSpace()->setActive( false );
   vsNew->setActive( true, true );
@@ -716,7 +716,7 @@ void KateViewSpaceContainer::restoreSplitter( TDEConfig* config, const TQString
 {
   config->setGroup( group );
 
-  KateMDI::Splitter* s = new KateMDI::Splitter((Qt::Orientation)config->readNumEntry("Orientation"), parent);
+  KateMDI::Splitter* s = new KateMDI::Splitter((TQt::Orientation)config->readNumEntry("Orientation"), parent);
 
   TQStringList children = config->readListEntry( "Children" );
   for (TQStringList::Iterator it=children.begin(); it!=children.end(); ++it)
@@ -726,7 +726,7 @@ void KateViewSpaceContainer::restoreSplitter( TDEConfig* config, const TQString
     {
      KateViewSpace* vs = new KateViewSpace( this, s );
 
-     connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString &)));
+     connect(this, TQ_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vs, TQ_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString &)));
 
      if (m_viewSpaceList.isEmpty())
        vs->setActive (true);
diff --git a/kate/app/kateviewspacecontainer.h b/kate/app/kateviewspacecontainer.h
index 2f1fa5372..a5f04f1ee 100644
--- a/kate/app/kateviewspacecontainer.h
+++ b/kate/app/kateviewspacecontainer.h
@@ -34,7 +34,7 @@ class KateMainWindow;
 
 class KateViewSpaceContainer: public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KateViewSpace;
   friend class KateVSStatusBar;
diff --git a/kate/app/kbookmarkhandler.h b/kate/app/kbookmarkhandler.h
index 612c15a18..274218e04 100644
--- a/kate/app/kbookmarkhandler.h
+++ b/kate/app/kbookmarkhandler.h
@@ -32,7 +32,7 @@ class TDEPopupMenu;
 
 class KBookmarkHandler : public TQObject, public KBookmarkOwner
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 );
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 00eb85a68..dea6c95b6 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -96,11 +96,11 @@ KWrite::KWrite (KTextEditor::Document *doc)
 
   setAcceptDrops(true);
 
-  connect(m_view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(newCaption()));
-  connect(m_view,TQT_SIGNAL(viewStatusMsg(const TQString &)),this,TQT_SLOT(newStatus(const TQString &)));
-  connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(newCaption()));
-  connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(slotFileNameChanged()));
-  connect(m_view,TQT_SIGNAL(dropEventPass(TQDropEvent *)),this,TQT_SLOT(slotDropEvent(TQDropEvent *)));
+  connect(m_view,TQ_SIGNAL(newStatus()),this,TQ_SLOT(newCaption()));
+  connect(m_view,TQ_SIGNAL(viewStatusMsg(const TQString &)),this,TQ_SLOT(newStatus(const TQString &)));
+  connect(m_view->document(),TQ_SIGNAL(fileNameChanged()),this,TQ_SLOT(newCaption()));
+  connect(m_view->document(),TQ_SIGNAL(fileNameChanged()),this,TQ_SLOT(slotFileNameChanged()));
+  connect(m_view,TQ_SIGNAL(dropEventPass(TQDropEvent *)),this,TQ_SLOT(slotDropEvent(TQDropEvent *)));
 
   setXMLFile( "kwriteui.rc" );
   createShellGUI( true );
@@ -139,41 +139,41 @@ KWrite::~KWrite()
 
 void KWrite::setupActions()
 {
-  KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document"));
+  KStdAction::close( this, TQ_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document"));
 
   // setup File menu
-  KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document"));
-  KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document"));
-  KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing"));
+  KStdAction::print(this, TQ_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document"));
+  KStdAction::openNew( this, TQ_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document"));
+  KStdAction::open( this, TQ_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing"));
 
-  m_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotOpen(const KURL&)),
+  m_recentFiles = KStdAction::openRecent(this, TQ_SLOT(slotOpen(const KURL&)),
                                          actionCollection());
   m_recentFiles->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again."));
 
-  TDEAction *a=new TDEAction(i18n("&New Window"), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT(newView()),
+  TDEAction *a=new TDEAction(i18n("&New Window"), "window-new", 0, this, TQ_SLOT(newView()),
               actionCollection(), "view_new_view");
   a->setWhatsThis(i18n("Create another view containing the current document"));
 
-  a=new TDEAction(i18n("Choose Editor Component..."),0,TQT_TQOBJECT(this),TQT_SLOT(changeEditor()),
+  a=new TDEAction(i18n("Choose Editor Component..."),0,this,TQ_SLOT(changeEditor()),
 		actionCollection(),"settings_choose_editor");
   a->setWhatsThis(i18n("Override the system wide setting for the default editing component"));
 
-  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view"));
+  KStdAction::quit(this, TQ_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view"));
 
   // setup Settings menu
   setStandardToolBarMenuEnabled(true);
 
-  m_paShowStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
+  m_paShowStatusBar = KStdAction::showStatusbar(this, TQ_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
   m_paShowStatusBar->setWhatsThis(i18n("Use this command to show or hide the view's statusbar"));
 
-  m_paShowPath = new TDEToggleAction(i18n("Sho&w Path"), 0, TQT_TQOBJECT(this), TQT_SLOT(newCaption()),
+  m_paShowPath = new TDEToggleAction(i18n("Sho&w Path"), 0, this, TQ_SLOT(newCaption()),
                     actionCollection(), "set_showPath");
   m_paShowPath->setCheckedState(i18n("Hide Path"));
   m_paShowPath->setWhatsThis(i18n("Show the complete document path in the window caption"));
-  a=KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editKeys()), actionCollection());
+  a=KStdAction::keyBindings(this, TQ_SLOT(editKeys()), actionCollection());
   a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
 
-  a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(editToolbars()), actionCollection());
+  a=KStdAction::configureToolbars(this, TQ_SLOT(editToolbars()), actionCollection());
   a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
 }
 
@@ -299,7 +299,7 @@ void KWrite::editToolbars()
 {
   saveMainWindowSettings( kapp->config(), "MainWindow" );
   KEditToolbar *dlg = new KEditToolbar(guiFactory());
-  connect( dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()) );
+  connect( dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig()) );
   dlg->exec();
   delete dlg;
 }
diff --git a/kate/app/kwritemain.h b/kate/app/kwritemain.h
index 5718d1e67..5a4187c3b 100644
--- a/kate/app/kwritemain.h
+++ b/kate/app/kwritemain.h
@@ -37,7 +37,7 @@ class TDERecentFilesAction;
 
 class KWrite : public KParts::MainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
@@ -122,7 +122,7 @@ class KWrite : public KParts::MainWindow
 
 class KWriteEditorChooser: public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kate/interfaces/application.h b/kate/interfaces/application.h
index 52eb129d5..8cbc9abce 100644
--- a/kate/interfaces/application.h
+++ b/kate/interfaces/application.h
@@ -39,7 +39,7 @@ class KDE_EXPORT Application : public TQObject
 {
   friend class PrivateApplication;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kate/interfaces/documentmanager.h b/kate/interfaces/documentmanager.h
index 8b5f554af..d3f55fdf5 100644
--- a/kate/interfaces/documentmanager.h
+++ b/kate/interfaces/documentmanager.h
@@ -30,7 +30,7 @@ class KDE_EXPORT DocumentManager : public TQObject
 {
   friend class PrivateDocumentManager;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     DocumentManager ( void *documentManager  );
diff --git a/kate/interfaces/mainwindow.h b/kate/interfaces/mainwindow.h
index 27a847ac3..7e9033ce3 100644
--- a/kate/interfaces/mainwindow.h
+++ b/kate/interfaces/mainwindow.h
@@ -33,7 +33,7 @@ class KDE_EXPORT MainWindow : public TQObject
 {
   friend class PrivateMainWindow;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     MainWindow (void *mainWindow);
diff --git a/kate/interfaces/plugin.h b/kate/interfaces/plugin.h
index 00932c5ff..bc79a0491 100644
--- a/kate/interfaces/plugin.h
+++ b/kate/interfaces/plugin.h
@@ -36,7 +36,7 @@ class KDE_EXPORT Plugin : public TQObject
 {
   friend class PrivatePlugin;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     Plugin (Application *application = 0, const char *name = 0 );
diff --git a/kate/interfaces/pluginconfiginterfaceextension.h b/kate/interfaces/pluginconfiginterfaceextension.h
index 8a64ec090..d70d35069 100644
--- a/kate/interfaces/pluginconfiginterfaceextension.h
+++ b/kate/interfaces/pluginconfiginterfaceextension.h
@@ -28,7 +28,7 @@ namespace Kate
 
 class KDE_EXPORT PluginConfigPage : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     PluginConfigPage ( TQWidget *parent=0, const char *name=0 );
diff --git a/kate/interfaces/pluginmanager.h b/kate/interfaces/pluginmanager.h
index 0aeb7785e..26d77b26c 100644
--- a/kate/interfaces/pluginmanager.h
+++ b/kate/interfaces/pluginmanager.h
@@ -31,7 +31,7 @@ class KDE_EXPORT PluginManager : public TQObject
 {
   friend class PrivatePluginManager;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     PluginManager ( void *pluginManager  );
diff --git a/kate/interfaces/toolviewmanager.h b/kate/interfaces/toolviewmanager.h
index 88a669476..fec942b2b 100644
--- a/kate/interfaces/toolviewmanager.h
+++ b/kate/interfaces/toolviewmanager.h
@@ -33,7 +33,7 @@ class KDE_EXPORT ToolViewManager : public TQObject
 {
   friend class PrivateToolViewManager;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kate/interfaces/viewmanager.h b/kate/interfaces/viewmanager.h
index 15eb61312..0ca689680 100644
--- a/kate/interfaces/viewmanager.h
+++ b/kate/interfaces/viewmanager.h
@@ -34,7 +34,7 @@ class KDE_EXPORT ViewManager : public TQObject
 {
   friend class PrivateViewManager;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kate/utils/dockviewbase.h b/kate/utils/dockviewbase.h
index 73d564e04..1a15c2598 100644
--- a/kate/utils/dockviewbase.h
+++ b/kate/utils/dockviewbase.h
@@ -51,7 +51,7 @@ namespace Kate
 
 
 class DockViewBase : public TQVBox {
-  Q_OBJECT
+  TQ_OBJECT
   public:
   /**
       Create a KateDockViewBase.
diff --git a/kate/utils/listboxview.h b/kate/utils/listboxview.h
index a9194632d..810ace187 100644
--- a/kate/utils/listboxview.h
+++ b/kate/utils/listboxview.h
@@ -27,7 +27,7 @@ namespace Kate
 {
 
 class ListboxView : public DockViewBase {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     ListboxView( TQWidget *parent=0, const char *name=0 );
     ListboxView( const TQString &titlePrefix, const TQString &title, TQWidget *parent=0, const char *name=0 );
diff --git a/kate/utils/messageview.cpp b/kate/utils/messageview.cpp
index 40155f959..a780cc063 100644
--- a/kate/utils/messageview.cpp
+++ b/kate/utils/messageview.cpp
@@ -25,9 +25,9 @@ Kate::MessageView::MessageView( TQWidget *parent, const char *name )
   : Kate::DockViewBase( parent, name )
 {
   m_view = new TQTextBrowser( this );
-  // m_view->setFormat( Qt::richText ); // should be!!
-  connect( m_view, TQT_SIGNAL( linkClicked( const TQString & ) ), 
-           TQT_SIGNAL( linkClicked( const TQString & ) ) );
+  // m_view->setFormat( TQt::richText ); // should be!!
+  connect( m_view, TQ_SIGNAL( linkClicked( const TQString & ) ), 
+           TQ_SIGNAL( linkClicked( const TQString & ) ) );
 }
 
 Kate::MessageView::~MessageView()
diff --git a/kate/utils/messageview.h b/kate/utils/messageview.h
index 1bf406d6a..d13f6b63d 100644
--- a/kate/utils/messageview.h
+++ b/kate/utils/messageview.h
@@ -50,7 +50,7 @@ namespace Kate
 {
 
 class MessageView : public DockViewBase {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     MessageView( TQWidget *parent=0, const char *name=0 );
     ~MessageView();
diff --git a/kcheckpass/CMakeLists.txt b/kcheckpass/CMakeLists.txt
index 5e83ee41e..b2091e0ce 100644
--- a/kcheckpass/CMakeLists.txt
+++ b/kcheckpass/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories(
 
 tde_add_executable( kcheckpass AUTOMOC
   SOURCES
-    kcheckpass.c checkpass_etcpasswd.c checkpass_pam.c
+    kcheckpass.c checkpass_pam.c
     checkpass_shadow.c checkpass_osfc2passwd.c checkpass_aix.c
   LINK tdefakes-shared ${CRYPT_LIBRARY} ${PAM_LIBRARY}
   DESTINATION ${BIN_INSTALL_DIR}
diff --git a/kcheckpass/ConfigureChecks.cmake b/kcheckpass/ConfigureChecks.cmake
index d6d62f55b..902e6628d 100644
--- a/kcheckpass/ConfigureChecks.cmake
+++ b/kcheckpass/ConfigureChecks.cmake
@@ -12,3 +12,7 @@
 if( WITH_PAM AND (NOT DEFINED KCHECKPASS_PAM_SERVICE) )
   set( KCHECKPASS_PAM_SERVICE "kde" CACHE INTERNAL "" )
 endif( )
+
+if( NOT WITH_PAM AND WITH_SHADOW )
+  check_function_exists( pw_encrypt HAVE_PW_ENCRYPT )
+endif( )
diff --git a/kcheckpass/checkpass_etcpasswd.c b/kcheckpass/checkpass_etcpasswd.c
deleted file mode 100644
index 1dbe06f70..000000000
--- a/kcheckpass/checkpass_etcpasswd.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1998 Christian Esken <esken@kde.org> 
- * Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *      Copyright (C) 1998, Christian Esken <esken@kde.org>
- */
-
-#include "kcheckpass.h"
-
-#ifdef HAVE_ETCPASSWD
-
-/*******************************************************************
- * This is the authentication code for /etc/passwd passwords
- *******************************************************************/
-
-#include <string.h>
-#include <stdlib.h>
-
-AuthReturn Authenticate(const char *method,
-        const char *login, char *(*conv) (ConvRequest, const char *))
-{
-  struct passwd *pw;
-  char *passwd;
-
-  if (strcmp(method, "classic"))
-    return AuthError;
-
-  /* Get the password entry for the user we want */
-  if (!(pw = getpwnam(login)))
-    return AuthBad;
-
-  if (!*pw->pw_passwd)
-    return AuthOk;
-
-  if (!(passwd = conv(ConvGetHidden, 0)))
-    return AuthAbort;
-
-  if (!strcmp(pw->pw_passwd, crypt(passwd, pw->pw_passwd))) {
-    dispose(passwd);
-    return AuthOk; /* Success */
-  }
-  dispose(passwd);
-  return AuthBad; /* Password wrong or account locked */
-}
-
-#endif
diff --git a/kcheckpass/checkpass_shadow.c b/kcheckpass/checkpass_shadow.c
index ec3a4e02a..e721582d5 100644
--- a/kcheckpass/checkpass_shadow.c
+++ b/kcheckpass/checkpass_shadow.c
@@ -27,13 +27,14 @@
 #include "kcheckpass.h"
 
 /*******************************************************************
- * This is the authentication code for Shadow-Passwords
+ * This is the authentication code for /etc/passwd and Shadow-Passwords
  *******************************************************************/
 
-#ifdef HAVE_SHADOW
+#if defined(HAVE_SHADOW) || defined(HAVE_ETCPASSWD)
 #include <string.h>
 #include <stdlib.h>
 #include <pwd.h>
+#include <crypt.h>
 
 #ifndef __hpux
 #include <shadow.h>
@@ -46,7 +47,6 @@ AuthReturn Authenticate(const char *method,
   char          *crpt_passwd;
   char          *password;
   struct passwd *pw;
-  struct spwd   *spw;
 
   if (strcmp(method, "classic"))
     return AuthError;
@@ -54,8 +54,12 @@ AuthReturn Authenticate(const char *method,
   if (!(pw = getpwnam(login)))
     return AuthAbort;
 
-  spw = getspnam(login);
+#ifdef HAVE_SHADOW
+  struct spwd *spw = getspnam(login);
   password = spw ? spw->sp_pwdp : pw->pw_passwd;
+#else
+  password = pw->pw_passwd;
+#endif
 
   if (!*password)
     return AuthOk;
@@ -69,11 +73,11 @@ AuthReturn Authenticate(const char *method,
   crpt_passwd = crypt(typed_in_password, password);
 #endif
 
-  if (!strcmp(password, crpt_passwd )) {
-    dispose(typed_in_password);
-    return AuthOk; /* Success */
-  }
   dispose(typed_in_password);
+
+  if (crpt_passwd && !strcmp(password, crpt_passwd))
+    return AuthOk; /* Success */
+
   return AuthBad; /* Password wrong or account locked */
 }
 
diff --git a/kcheckpass/kcheckpass.h b/kcheckpass/kcheckpass.h
index e1351375a..66a242856 100644
--- a/kcheckpass/kcheckpass.h
+++ b/kcheckpass/kcheckpass.h
@@ -43,17 +43,9 @@
 #include <crypt.h>
 #endif
 
-#ifdef HAVE_PATHS_H
-#include <paths.h>
-#endif
-
 #include <pwd.h>
 #include <sys/types.h>
 
-#ifndef _PATH_TMP
-#define _PATH_TMP "/tmp/"
-#endif
-
 
 #ifdef ultrix
 #include <auth.h>
diff --git a/kcminit/main.cpp b/kcminit/main.cpp
index f1fbf8987..de62c9834 100644
--- a/kcminit/main.cpp
+++ b/kcminit/main.cpp
@@ -193,7 +193,7 @@ KCMInit::KCMInit( TDECmdLineArgs* args )
      runModules( 0 );
      kapp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)",  TQString("kcminit"));
      sendReady();
-     TQTimer::singleShot( 300 * 1000, tqApp, TQT_SLOT( quit())); // just in case
+     TQTimer::singleShot( 300 * 1000, tqApp, TQ_SLOT( quit())); // just in case
      tqApp->exec(); // wait for runPhase1() and runPhase2()
   }
   else
diff --git a/kcminit/main.h b/kcminit/main.h
index 9651a8516..5d0bb958a 100644
--- a/kcminit/main.h
+++ b/kcminit/main.h
@@ -27,7 +27,7 @@ class TDECmdLineArgs;
 
 class KCMInit : public TQObject, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
     k_dcop:
         void runPhase1();
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 5e506470c..3b79f8ce7 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -96,10 +96,10 @@ KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled)
                                                  overlay(0), wm(0, KWinModule::INFO_DESKTOP)
 {
   _activeWindow = wm.activeWindow();
-  connect(&wm, TQT_SIGNAL(activeWindowChanged(WId)), this, TQT_SLOT(activeWindowChanged(WId)));
+  connect(&wm, TQ_SIGNAL(activeWindowChanged(WId)), this, TQ_SLOT(activeWindowChanged(WId)));
 
   artsBellTimer = new TQTimer( this );
-  connect( artsBellTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotArtsBellTimeout() ));
+  connect( artsBellTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotArtsBellTimeout() ));
 
   features = 0;
   requestedFeatures = 0;
@@ -132,7 +132,7 @@ void KAccessApp::readSettings()
   _artsBellFile = config->readPathEntry("ArtsBellFile");
   _visibleBell = config->readBoolEntry("VisibleBell", false);
   _visibleBellInvert = config->readBoolEntry("VisibleBellInvert", false);
-  TQColor def(Qt::red);
+  TQColor def(TQt::red);
   _visibleBellColor = config->readColorEntry("VisibleBellColor", &def);
   _visibleBellPause = config->readNumEntry("VisibleBellPause", 500);
 
@@ -364,7 +364,7 @@ bool KAccessApp::x11EventFilter(XEvent *event)
 void VisualBell::paintEvent(TQPaintEvent *event)
 {
   TQWidget::paintEvent(event);
-  TQTimer::singleShot(_pause, this, TQT_SLOT(hide()));
+  TQTimer::singleShot(_pause, this, TQ_SLOT(hide()));
 }
 
 
@@ -579,7 +579,7 @@ void KAccessApp::createDialogContents() {
          pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning);
       label1->setPixmap(pixmap);
 
-      lay->addWidget( label1, 0, Qt::AlignCenter );
+      lay->addWidget( label1, 0, TQt::AlignCenter );
       lay->addSpacing(KDialog::spacingHint());
 
       TQVBoxLayout * vlay = new TQVBoxLayout(lay);
@@ -605,9 +605,9 @@ void KAccessApp::createDialogContents() {
       dialog->setMainWidget(topcontents);
       dialog->enableButtonSeparator(false);
 
-      connect (dialog, TQT_SIGNAL(yesClicked()), this, TQT_SLOT(yesClicked()));
-      connect (dialog, TQT_SIGNAL(noClicked()), this, TQT_SLOT(noClicked()));
-      connect (dialog, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(dialogClosed()));
+      connect (dialog, TQ_SIGNAL(yesClicked()), this, TQ_SLOT(yesClicked()));
+      connect (dialog, TQ_SIGNAL(noClicked()), this, TQ_SLOT(noClicked()));
+      connect (dialog, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(dialogClosed()));
    }
 }
 
diff --git a/kcontrol/access/kaccess.h b/kcontrol/access/kaccess.h
index 95d8b2559..fbfa0d783 100644
--- a/kcontrol/access/kaccess.h
+++ b/kcontrol/access/kaccess.h
@@ -21,7 +21,7 @@ class KComboBox;
 
 class KAccessApp : public KUniqueApplication
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -88,7 +88,7 @@ private:
 
 class VisualBell : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index ccdb74f81..5c6cc68b4 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -55,10 +55,10 @@ void ExtendedIntNumInput::setRange(int min, int max, int step, bool slider) {
 	KIntNumInput::setRange (min,max,step, slider);
 
 	if (slider) {
-		disconnect(m_slider, TQT_SIGNAL(valueChanged(int)),
-					  m_spin, TQT_SLOT(setValue(int)));
-		disconnect(m_spin, TQT_SIGNAL(valueChanged(int)),
-					  this, TQT_SLOT(spinValueChanged(int)));
+		disconnect(m_slider, TQ_SIGNAL(valueChanged(int)),
+					  m_spin, TQ_SLOT(setValue(int)));
+		disconnect(m_spin, TQ_SIGNAL(valueChanged(int)),
+					  this, TQ_SLOT(spinValueChanged(int)));
 
 		this->min = min;
 		this->max = max;
@@ -72,10 +72,10 @@ void ExtendedIntNumInput::setRange(int min, int max, int step, bool slider) {
 		double logVal = alpha * (log((double)value())-log((double)min));
 		m_slider->setValue ((int)floor (0.5 + logVal));
 
-		connect(m_slider, TQT_SIGNAL(valueChanged(int)),
-				  this, TQT_SLOT(slotSliderValueChanged(int)));
-		connect(m_spin, TQT_SIGNAL(valueChanged(int)),
-				  this, TQT_SLOT(slotSpinValueChanged(int)));
+		connect(m_slider, TQ_SIGNAL(valueChanged(int)),
+				  this, TQ_SLOT(slotSliderValueChanged(int)));
+		connect(m_spin, TQ_SIGNAL(valueChanged(int)),
+				  this, TQ_SLOT(slotSpinValueChanged(int)));
 	}
 }
 
@@ -245,7 +245,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
       KDialogBase::spacingHint());
 
   TQGroupBox *grp = new TQGroupBox(i18n("Audible Bell"), bell);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(),
@@ -276,19 +276,19 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   TQWhatsThis::add( soundLabel, wtstr );
   TQWhatsThis::add( soundButton, wtstr );
 
-  connect(soundButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectSound()));
+  connect(soundButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectSound()));
 
-  connect(customBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
+  connect(customBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
 
-  connect(systemBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(customBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(soundEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
+  connect(systemBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(customBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(soundEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged()));
 
   // -----------------------------------------------------
 
   // visible bell ----------------------------------------
   grp = new TQGroupBox(i18n("Visible Bell"), bell);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -326,16 +326,16 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   hbox->addWidget(durationSlider);
   TQWhatsThis::add( durationSlider, i18n("Here you can customize the duration of the \"visible bell\" effect being shown.") );
 
-  connect(invertScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(flashScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(visibleBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(visibleBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
-  connect(colorButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeFlashScreenColor()));
+  connect(invertScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(flashScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(visibleBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(visibleBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
+  connect(colorButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeFlashScreenColor()));
 
-  connect(invertScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(invertClicked()));
-  connect(flashScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(flashClicked()));
+  connect(invertScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(invertClicked()));
+  connect(flashScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(flashClicked()));
 
-  connect(durationSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
+  connect(durationSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
 
   vbox->addStretch();
 
@@ -350,7 +350,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   vbox = new TQVBoxLayout(modifiers, KDialog::marginHint(), KDialog::spacingHint());
 
   grp = new TQGroupBox(i18n("S&ticky Keys"), modifiers);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -374,7 +374,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   hbox->addWidget(stickyKeysBeep);
 
   grp = new TQGroupBox(i18n("Locking Keys"), modifiers);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -391,16 +391,16 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
   hbox->addWidget(kNotifyModifiersButton);
 
-  connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(stickyKeysLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(stickyKeysAutoOff, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
+  connect(stickyKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(stickyKeysLock, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(stickyKeysAutoOff, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(stickyKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
 
-  connect(stickyKeysBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(toggleKeysBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(kNotifyModifiers, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(kNotifyModifiers, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
-  connect(kNotifyModifiersButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureKNotify()));
+  connect(stickyKeysBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(toggleKeysBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(kNotifyModifiers, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(kNotifyModifiers, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
+  connect(kNotifyModifiersButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(configureKNotify()));
 
   vbox->addStretch();
 
@@ -412,7 +412,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   vbox = new TQVBoxLayout(filters, KDialog::marginHint(), KDialog::spacingHint());
 
   grp = new TQGroupBox(i18n("Slo&w Keys"), filters);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -444,7 +444,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   hbox->addWidget(slowKeysRejectBeep);
 
   grp = new TQGroupBox(i18n("Bounce Keys"), filters);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -465,18 +465,18 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   bounceKeysRejectBeep = new TQCheckBox(i18n("Use the system bell whenever a key is rejected"), grp);
   hbox->addWidget(bounceKeysRejectBeep);
 
-  connect(slowKeysDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
-  connect(slowKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(slowKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
+  connect(slowKeysDelay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
+  connect(slowKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(slowKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
 
-  connect(slowKeysPressBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(slowKeysAcceptBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(slowKeysRejectBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+  connect(slowKeysPressBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(slowKeysAcceptBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(slowKeysRejectBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
 
-  connect(bounceKeysDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
-  connect(bounceKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(bounceKeysRejectBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(bounceKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
+  connect(bounceKeysDelay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
+  connect(bounceKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(bounceKeysRejectBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(bounceKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
 
   vbox->addStretch();
 
@@ -488,7 +488,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   vbox = new TQVBoxLayout(features, KDialog::marginHint(), KDialog::spacingHint());
 
   grp = new TQGroupBox(i18n("Activation Gestures"), features);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -518,7 +518,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   hbox->addWidget(timeoutDelay);
 
   grp = new TQGroupBox(i18n("Notification"), features);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -539,15 +539,15 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
   hbox->addWidget(kNotifyAccessXButton);
 
-  connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(timeout, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(timeout, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
-  connect(timeoutDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
-  connect(accessxBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(gestureConfirmation, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(kNotifyAccessX, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(kNotifyAccessX, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
-  connect(kNotifyAccessXButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureKNotify()));
+  connect(gestures, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(timeout, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(timeout, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
+  connect(timeoutDelay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
+  connect(accessxBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(gestureConfirmation, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(kNotifyAccessX, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(kNotifyAccessX, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
+  connect(kNotifyAccessXButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(configureKNotify()));
 
   vbox->addStretch();
 
@@ -614,7 +614,7 @@ void KAccessConfig::load( bool useDefaults )
   visibleBell->setChecked(config->readBoolEntry("VisibleBell", false));
   invertScreen->setChecked(config->readBoolEntry("VisibleBellInvert", true));
   flashScreen->setChecked(!invertScreen->isChecked());
-  TQColor def(Qt::red);
+  TQColor def(TQt::red);
   colorButton->setColor(config->readColorEntry("VisibleBellColor", &def));
 
   durationSlider->setValue(config->readNumEntry("VisibleBellPause", 500));
diff --git a/kcontrol/access/kcmaccess.h b/kcontrol/access/kcmaccess.h
index 4eb8af45d..1f59badbc 100644
--- a/kcontrol/access/kcmaccess.h
+++ b/kcontrol/access/kcmaccess.h
@@ -26,7 +26,7 @@ class TDEAboutData;
 
 class ExtendedIntNumInput : public KIntNumInput
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
     /**
@@ -59,7 +59,7 @@ class ExtendedIntNumInput : public KIntNumInput
 
 class KAccessConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index 388776bc1..5f78072a1 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -100,10 +100,10 @@ void KArtsModule::initAudioIOList()
 	*artsd << "artsd";
 	*artsd << "-A";
 
-	connect(artsd, TQT_SIGNAL(processExited(TDEProcess*)),
-	        this, TQT_SLOT(slotArtsdExited(TDEProcess*)));
-	connect(artsd, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
-	        this, TQT_SLOT(slotProcessArtsdOutput(TDEProcess*, char*, int)));
+	connect(artsd, TQ_SIGNAL(processExited(TDEProcess*)),
+	        this, TQ_SLOT(slotArtsdExited(TDEProcess*)));
+	connect(artsd, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+	        this, TQ_SLOT(slotProcessArtsdOutput(TDEProcess*, char*, int)));
 
 	if (!artsd->start(TDEProcess::Block, TDEProcess::Stderr)) {
 		KMessageBox::error(0, i18n("Unable to start the sound server to "
@@ -216,31 +216,31 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
 
 	suspendTime->setRange( 1, 999, 1, true );
 
-	connect(startServer,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged()));
-	connect(networkTransparent,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged()));
-	connect(startRealtime,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged()));
-	connect(fullDuplex,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged()));
-	connect(customDevice, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
-	connect(deviceName, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(customRate, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
-	connect(samplingRate, TQT_SIGNAL(valueChanged(const TQString&)), TQT_SLOT(slotChanged()));
-//	connect(general->volumeSystray, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChanged()) );
-
-	connect(hardware->audioIO,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotChanged()));
-	connect(hardware->audioIO,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChanged()));
-	connect(hardware->customOptions,TQT_SIGNAL(clicked()),TQT_SLOT(slotChanged()));
-	connect(hardware->addOptions,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotChanged()));
-	connect(hardware->soundQuality,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotChanged()));
-	connect(hardware->soundQuality,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChanged()));
-	connect(general->latencySlider,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotChanged()));
-	connect(autoSuspend,TQT_SIGNAL(clicked()),TQT_SLOT(slotChanged()));
-	connect(suspendTime,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotChanged()));
-	connect(general->testSound,TQT_SIGNAL(clicked()),TQT_SLOT(slotTestSound()));
-	connect(hardware->midiDevice, TQT_SIGNAL( highlighted(int) ), this, TQT_SLOT( slotChanged() ) );
-	connect(hardware->midiDevice, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotChanged() ) );
-	connect(hardware->midiUseMapper, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
-	connect(hardware->midiMapper, TQT_SIGNAL( textChanged( const TQString& ) ),
-			this, TQT_SLOT( slotChanged() ) );
+	connect(startServer,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged()));
+	connect(networkTransparent,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged()));
+	connect(startRealtime,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged()));
+	connect(fullDuplex,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged()));
+	connect(customDevice, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
+	connect(deviceName, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(customRate, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
+	connect(samplingRate, TQ_SIGNAL(valueChanged(const TQString&)), TQ_SLOT(slotChanged()));
+//	connect(general->volumeSystray, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChanged()) );
+
+	connect(hardware->audioIO,TQ_SIGNAL(highlighted(int)),TQ_SLOT(slotChanged()));
+	connect(hardware->audioIO,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChanged()));
+	connect(hardware->customOptions,TQ_SIGNAL(clicked()),TQ_SLOT(slotChanged()));
+	connect(hardware->addOptions,TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotChanged()));
+	connect(hardware->soundQuality,TQ_SIGNAL(highlighted(int)),TQ_SLOT(slotChanged()));
+	connect(hardware->soundQuality,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChanged()));
+	connect(general->latencySlider,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotChanged()));
+	connect(autoSuspend,TQ_SIGNAL(clicked()),TQ_SLOT(slotChanged()));
+	connect(suspendTime,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotChanged()));
+	connect(general->testSound,TQ_SIGNAL(clicked()),TQ_SLOT(slotTestSound()));
+	connect(hardware->midiDevice, TQ_SIGNAL( highlighted(int) ), this, TQ_SLOT( slotChanged() ) );
+	connect(hardware->midiDevice, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotChanged() ) );
+	connect(hardware->midiUseMapper, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) );
+	connect(hardware->midiMapper, TQ_SIGNAL( textChanged( const TQString& ) ),
+			this, TQ_SLOT( slotChanged() ) );
 
 	TDEAboutData *about =  new TDEAboutData(I18N_NOOP("kcmarts"),
                   I18N_NOOP("The Sound Server Control Module"),
@@ -553,8 +553,8 @@ bool KArtsModule::realtimeIsPossible()
 	*checkProcess << "artswrapper";
 	*checkProcess << "check";
 
-	connect(checkProcess, TQT_SIGNAL(processExited(TDEProcess*)),
-	        this, TQT_SLOT(slotArtsdExited(TDEProcess*)));
+	connect(checkProcess, TQ_SIGNAL(processExited(TDEProcess*)),
+	        this, TQ_SLOT(slotArtsdExited(TDEProcess*)));
 	if (!checkProcess->start(TDEProcess::Block))
 	{
 		delete checkProcess;
@@ -672,7 +672,7 @@ KStartArtsProgressDialog::KStartArtsProgressDialog(KArtsModule *parent, const ch
                           const TQString &caption, const TQString &text)
  : KProgressDialog(parent, name, caption, text, true), m_module(parent), m_shutdown(false)
 {
-  connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProgress()));
+  connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotProgress()));
   progressBar()->setTotalSteps(20);
   m_timeStep = 700;
   m_timer.start(m_timeStep);
@@ -718,7 +718,7 @@ KStartArtsProgressDialog::slotFinished()
 {
   progressBar()->setProgress(20);
   m_timer.stop();
-  TQTimer::singleShot(1000, this, TQT_SLOT(close()));
+  TQTimer::singleShot(1000, this, TQ_SLOT(close()));
 }
 
 
diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h
index 5eebd4ba1..97b834d47 100644
--- a/kcontrol/arts/arts.h
+++ b/kcontrol/arts/arts.h
@@ -48,7 +48,7 @@ class DeviceManager;
 
 class KArtsModule : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -118,7 +118,7 @@ private:
 
 class KStartArtsProgressDialog : public KProgressDialog
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KStartArtsProgressDialog(KArtsModule *parent, const char *name,
                           const TQString &caption, const TQString &text);
diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h
index 18cba5a32..28f15cf99 100644
--- a/kcontrol/arts/krichtextlabel.h
+++ b/kcontrol/arts/krichtextlabel.h
@@ -33,7 +33,7 @@
  * QLabel
  */
 class TDEUI_EXPORT KRichTextLabel : public TQLabel {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index 2a80db02d..03be761d7 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -77,8 +77,8 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r,
    dlg->m_listPrograms->header()->setStretchEnabled ( true, 1 );
    dlg->m_listPrograms->setAllColumnsShowFocus(true);
 
-   connect(dlg->m_listPrograms, TQT_SIGNAL(clicked(TQListViewItem *)),
-         TQT_SLOT(slotProgramItemClicked(TQListViewItem *)));
+   connect(dlg->m_listPrograms, TQ_SIGNAL(clicked(TQListViewItem *)),
+         TQ_SLOT(slotProgramItemClicked(TQListViewItem *)));
 
    // Load programs
    TQStringList lst = KBackgroundProgram::list();
@@ -100,15 +100,15 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r,
       dlg->m_spinCache->setSpecialValueText(i18n("Unlimited"));
       dlg->m_spinCache->setSuffix(i18n(" KB"));
 
-      connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()),
-         TQT_SLOT(slotAdd()));
-      connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()),
-         TQT_SLOT(slotRemove()));
-      connect(dlg->m_buttonModify, TQT_SIGNAL(clicked()),
-         TQT_SLOT(slotModify()));
+      connect(dlg->m_buttonAdd, TQ_SIGNAL(clicked()),
+         TQ_SLOT(slotAdd()));
+      connect(dlg->m_buttonRemove, TQ_SIGNAL(clicked()),
+         TQ_SLOT(slotRemove()));
+      connect(dlg->m_buttonModify, TQ_SIGNAL(clicked()),
+         TQ_SLOT(slotModify()));
 
-      connect(dlg->m_listPrograms, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
-         TQT_SLOT(slotProgramItemDoubleClicked(TQListViewItem *)));
+      connect(dlg->m_listPrograms, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+         TQ_SLOT(slotProgramItemDoubleClicked(TQListViewItem *)));
    }
    else
    {
@@ -119,8 +119,8 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r,
       dlg->m_groupCache->hide();
    }
 
-   connect( dlg->m_cbProgram, TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(slotEnableProgram(bool)));
+   connect( dlg->m_cbProgram, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(slotEnableProgram(bool)));
 
    m_backgroundMode = m_oldBackgroundMode = r->backgroundMode();
    if (m_oldBackgroundMode == KBackgroundSettings::Program)
@@ -175,7 +175,7 @@ void BGAdvancedDialog::setTextBackgroundColor(const TQColor &color)
     else
     {
         dlg->m_cbSolidTextBackground->setChecked(false);
-        dlg->m_colorTextBackground->setColor(Qt::white);
+        dlg->m_colorTextBackground->setColor(TQt::white);
         dlg->m_colorTextBackground->setEnabled(false);
     }
     dlg->m_colorTextBackground->blockSignals(false);
@@ -434,7 +434,7 @@ KProgramEditDialog::KProgramEditDialog(const TQString &program, TQWidget *parent
     m_RefreshEdit->setSuffix(i18n(" min"));
     m_RefreshEdit->setFixedSize(m_RefreshEdit->sizeHint());
     lbl->setBuddy(m_RefreshEdit);
-    grid->addWidget(m_RefreshEdit, 5, 1, Qt::AlignLeft);
+    grid->addWidget(m_RefreshEdit, 5, 1, TQt::AlignLeft);
 
     m_Program = program;
     if (m_Program.isEmpty()) {
diff --git a/kcontrol/background/bgadvanced.h b/kcontrol/background/bgadvanced.h
index 15fcae5fd..71dfa61ac 100644
--- a/kcontrol/background/bgadvanced.h
+++ b/kcontrol/background/bgadvanced.h
@@ -38,7 +38,7 @@ class KBackgroundProgram;
 
 class BGAdvancedDialog : public KDialogBase
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    BGAdvancedDialog(KBackgroundRenderer *_r, TQWidget *parent, bool m_multidesktop);
 
@@ -95,7 +95,7 @@ private:
  */
 class KProgramEditDialog: public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KProgramEditDialog(const TQString &program=TQString::null, TQWidget *parent=0L,
diff --git a/kcontrol/background/bgdefaults.h b/kcontrol/background/bgdefaults.h
index bde81071a..e6ece1cfe 100644
--- a/kcontrol/background/bgdefaults.h
+++ b/kcontrol/background/bgdefaults.h
@@ -24,12 +24,10 @@
 #define _defMinOptimizationDepth 1
 
 // Per desktop defaults
-// Before you change this get in touch with me (kb9vqf@pearsoncomputing.net)
-// Thanks!!
 #define _defColorA  TQColor("#003082")
 #define _defColorB  TQColor("#C0C0C0")
 #define _defBackgroundMode KBackgroundSettings::Flat
-#define _defWallpaperMode KBackgroundSettings::Scaled
+#define _defWallpaperMode KBackgroundSettings::ScaleAndCrop
 #define _defMultiMode KBackgroundSettings::NoMulti
 #define _defBlendMode KBackgroundSettings::NoBlending
 #define _defBlendBalance 100
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 365713a06..c5d56af0f 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -1,5 +1,4 @@
 /*
-   
    This file is part of the KDE libraries
 
    Copyright (c) 2005 David Saxton <david@bluehaze.org>
@@ -74,7 +73,7 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
    m_previewUpdates = true;
    
    KWinModule *m_twin;
-   m_twin = new KWinModule(TQT_TQOBJECT(this));
+   m_twin = new KWinModule(this);
    m_curDesk = m_twin->currentDesktop();
    TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop()));
    m_useViewports = s.width() * s.height() > 1;
@@ -123,21 +122,21 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
       m_eScreen = 0;
    }
    
-   connect(m_buttonIdentifyScreens, TQT_SIGNAL(clicked()), TQT_SLOT(slotIdentifyScreens()));
+   connect(m_buttonIdentifyScreens, TQ_SIGNAL(clicked()), TQ_SLOT(slotIdentifyScreens()));
 
    // preview monitor
    m_pMonitorArrangement = new BGMonitorArrangement(m_screenArrangement, "monitor arrangement");
-   connect(m_pMonitorArrangement, TQT_SIGNAL(imageDropped(const TQString &)), TQT_SLOT(slotImageDropped(const TQString &)));
+   connect(m_pMonitorArrangement, TQ_SIGNAL(imageDropped(const TQString &)), TQ_SLOT(slotImageDropped(const TQString &)));
    if( m_multidesktop)
    {
        // desktop
-       connect(m_comboDesktop, TQT_SIGNAL(activated(int)),
-	       TQT_SLOT(slotSelectDesk(int)));
+       connect(m_comboDesktop, TQ_SIGNAL(activated(int)),
+	       TQ_SLOT(slotSelectDesk(int)));
    }
    if (m_numScreens > 1)
    {
-       connect(m_comboScreen, TQT_SIGNAL(activated(int)),
-               TQT_SLOT(slotSelectScreen(int)));
+       connect(m_comboScreen, TQ_SIGNAL(activated(int)),
+               TQ_SLOT(slotSelectScreen(int)));
    }
 
    // background image settings
@@ -147,42 +146,42 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
    m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
    TQToolTip::add(m_urlWallpaperButton, i18n("Open file dialog"));
 
-   connect(m_buttonGroupBackground, TQT_SIGNAL(clicked(int)),
-           TQT_SLOT(slotWallpaperTypeChanged(int)));
-   connect(m_urlWallpaperBox, TQT_SIGNAL(activated(int)),
-           TQT_SLOT(slotWallpaper(int)));
-   connect(m_urlWallpaperButton, TQT_SIGNAL(clicked()),
-           TQT_SLOT(slotWallpaperSelection()));
-   connect(m_comboWallpaperPos, TQT_SIGNAL(activated(int)),
-           TQT_SLOT(slotWallpaperPos(int)));
-   connect(m_buttonSetupWallpapers, TQT_SIGNAL(clicked()),
-           TQT_SLOT(slotSetupMulti()));
+   connect(m_buttonGroupBackground, TQ_SIGNAL(clicked(int)),
+           TQ_SLOT(slotWallpaperTypeChanged(int)));
+   connect(m_urlWallpaperBox, TQ_SIGNAL(activated(int)),
+           TQ_SLOT(slotWallpaper(int)));
+   connect(m_urlWallpaperButton, TQ_SIGNAL(clicked()),
+           TQ_SLOT(slotWallpaperSelection()));
+   connect(m_comboWallpaperPos, TQ_SIGNAL(activated(int)),
+           TQ_SLOT(slotWallpaperPos(int)));
+   connect(m_buttonSetupWallpapers, TQ_SIGNAL(clicked()),
+           TQ_SLOT(slotSetupMulti()));
 
    // set up the background colour stuff
-   connect(m_colorPrimary, TQT_SIGNAL(changed(const TQColor &)),
-           TQT_SLOT(slotPrimaryColor(const TQColor &)));
-   connect(m_colorSecondary, TQT_SIGNAL(changed(const TQColor &)),
-           TQT_SLOT(slotSecondaryColor(const TQColor &)));
-   connect(m_comboPattern, TQT_SIGNAL(activated(int)),
-           TQT_SLOT(slotPattern(int)));
+   connect(m_colorPrimary, TQ_SIGNAL(changed(const TQColor &)),
+           TQ_SLOT(slotPrimaryColor(const TQColor &)));
+   connect(m_colorSecondary, TQ_SIGNAL(changed(const TQColor &)),
+           TQ_SLOT(slotSecondaryColor(const TQColor &)));
+   connect(m_comboPattern, TQ_SIGNAL(activated(int)),
+           TQ_SLOT(slotPattern(int)));
 
    // blend
-   connect(m_comboBlend, TQT_SIGNAL(activated(int)), TQT_SLOT(slotBlendMode(int)));
-   connect(m_sliderBlend, TQT_SIGNAL(valueChanged(int)),
-           TQT_SLOT(slotBlendBalance(int)));
-   connect(m_cbBlendReverse, TQT_SIGNAL(toggled(bool)),
-           TQT_SLOT(slotBlendReverse(bool)));
+   connect(m_comboBlend, TQ_SIGNAL(activated(int)), TQ_SLOT(slotBlendMode(int)));
+   connect(m_sliderBlend, TQ_SIGNAL(valueChanged(int)),
+           TQ_SLOT(slotBlendBalance(int)));
+   connect(m_cbBlendReverse, TQ_SIGNAL(toggled(bool)),
+           TQ_SLOT(slotBlendReverse(bool)));
 
    // Crossfading background
-   connect(m_cbCrossFadeBg, TQT_SIGNAL(toggled(bool)),
-           TQT_SLOT(slotCrossFadeBg(bool)));
+   connect(m_cbCrossFadeBg, TQ_SIGNAL(toggled(bool)),
+           TQ_SLOT(slotCrossFadeBg(bool)));
 
    // advanced options
-   connect(m_buttonAdvanced, TQT_SIGNAL(clicked()),
-           TQT_SLOT(slotAdvanced()));
+   connect(m_buttonAdvanced, TQ_SIGNAL(clicked()),
+           TQ_SLOT(slotAdvanced()));
 
-   connect(m_buttonGetNew, TQT_SIGNAL(clicked()),
-           TQT_SLOT(slotGetNewStuff()));
+   connect(m_buttonGetNew, TQ_SIGNAL(clicked()),
+           TQ_SLOT(slotGetNewStuff()));
 
    // renderers
    m_renderer.resize(m_numDesks+1);
@@ -199,19 +198,19 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
          // Setup the merged-screen renderer
          KBackgroundRenderer * r = new KBackgroundRenderer(eDesk, 0, false, _config);
          m_renderer[i].insert( 0, r );
-         connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
+         connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) );
          
          // Setup the common-screen renderer
          r = new KBackgroundRenderer(eDesk, 0, true, _config);
          m_renderer[i].insert( 1, r );
-         connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
+         connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) );
          
          // Setup the remaining renderers for each screen
          for (unsigned j=0; j < m_numScreens; ++j )
          {
             r = new KBackgroundRenderer(eDesk, j, true, _config);
             m_renderer[i].insert( j+2, r );
-            connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
+            connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) );
          }
       }
    }
@@ -226,14 +225,14 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
       // set up the common desktop renderer
       KBackgroundRenderer * r = new KBackgroundRenderer(0, 0, false, _config);
       m_renderer[0].insert(0, r);
-      connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)));
+      connect(r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)));
 
       // set up all the other desktop renderers
       for (unsigned i = 0; i < m_numDesks; ++i)
       {
          r = new KBackgroundRenderer(i, 0, false, _config);
          m_renderer[i+1].insert(0, r);
-         connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)));
+         connect(r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)));
       }
    }
 
@@ -245,10 +244,36 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
       m_slideShowRandom = KBackgroundSettings::InOrder;
 
    // Wallpaper Position
+   m_prevWallpaperPos = KBackgroundSettings::ScaleAndCrop;
+   m_prevTilePos      = KBackgroundSettings::Tiled;
+
    m_wallpaperPos = eRenderer()->wallpaperMode();
    if (m_wallpaperPos == KBackgroundSettings::NoWallpaper)
       m_wallpaperPos = KBackgroundSettings::Centred; // Default
 
+   const TQString path = eRenderer()->wallpaper();
+   KFileMetaInfo metaInfo(path);
+   if (metaInfo.isValid() && metaInfo.item("Dimensions").isValid())
+   {
+      // If the image is greater than 800x600 default to using the user selected mode
+      // for a normal wallpaper, otherwise default to user selection for tiles.
+      TQSize s = metaInfo.item("Dimensions").value().toSize();
+      m_isTile = (s.width() < 800 || s.height() < 600);
+      if (m_isTile)
+      {
+         m_prevTilePos = m_wallpaperPos;
+      }
+      else
+      {
+         m_prevWallpaperPos = m_wallpaperPos;
+      }
+   }
+   else if (KMimeType::findByPath(path)->is("image/svg+xml"))
+   {
+      m_prevWallpaperPos = m_wallpaperPos;
+   }
+
+   // Restrictions
    if (TDEGlobal::dirs()->isRestrictedResource("wallpaper"))
    {
       m_urlWallpaperButton->hide();
@@ -260,7 +285,7 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
    updateUI();
 
 #if (TQT_VERSION-0 >= 0x030200)
-   connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
+   connect( tqApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support
 #endif
 }
 
@@ -418,11 +443,11 @@ void BGDialog::slotIdentifyScreens()
       screenLabel->setFrameStyle(TQFrame::Panel);
       screenLabel->setFrameShadow(TQFrame::Plain);
 
-      screenLabel->setAlignment(Qt::AlignCenter);
+      screenLabel->setAlignment(TQt::AlignCenter);
       screenLabel->setNum(int(s + 1));
         // BUGLET: we should not allow the identification to be entered again
         //         until the timer fires.
-      TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close()));
+      TQTimer::singleShot(1500, screenLabel, TQ_SLOT(close()));
 
       TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center());
       TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
@@ -503,7 +528,7 @@ void BGDialog::loadWallpaperFilesList() {
    // Wallpapers
    // the following TQMap is lower cased names mapped to cased names and URLs
    // this way we get case insensitive sorting
-   TQMap<TQString, QPair<TQString, TQString> > papers;
+   TQMap<TQString, TQPair<TQString, TQString> > papers;
 
    //search for .desktop files before searching for images without .desktop files
    TQStringList lst = m_pDirs->findAllResources("wallpaper", "*desktop", false, true);
@@ -595,7 +620,7 @@ void BGDialog::loadWallpaperFilesList() {
    comboWallpaper->clear();
    m_wallpaper.clear();
    int i = 0;
-   for (TQMap<TQString, QPair<TQString, TQString> >::Iterator it = papers.begin();
+   for (TQMap<TQString, TQPair<TQString, TQString> >::Iterator it = papers.begin();
         it != papers.end();
         ++it)
    {
@@ -940,18 +965,22 @@ void BGDialog::slotWallpaperTypeChanged(int i)
       KFileMetaInfo metaInfo(path);
       if (metaInfo.isValid() && metaInfo.item("Dimensions").isValid())
       {
-         // If the image is greater than 800x600 default to using scaled mode,
-         // otherwise default to tiled.
-
+         // If the image is greater than 800x600 default to using the user selected mode
+         // for a normal wallpaper, otherwise default to user selection for tiles.
          TQSize s = metaInfo.item("Dimensions").value().toSize();
-         if (s.width() >= 800 && s.height() >= 600)
-            m_wallpaperPos = KBackgroundSettings::Scaled;
+         m_isTile = (s.width() < 800 || s.height() < 600);
+         if (m_isTile)
+         {
+            m_wallpaperPos = m_prevTilePos;
+         }
          else
-            m_wallpaperPos = KBackgroundSettings::Tiled;
+         {
+            m_wallpaperPos = m_prevWallpaperPos;
+         }
       }
       else if (KMimeType::findByPath(path)->is("image/svg+xml"))
       {
-         m_wallpaperPos = KBackgroundSettings::Scaled;         
+         m_wallpaperPos = m_prevWallpaperPos;
       }
 
       r->setWallpaperMode(m_wallpaperPos);
@@ -998,6 +1027,15 @@ void BGDialog::slotWallpaperPos(int mode)
    if (mode == r->wallpaperMode())
       return;
 
+   if (m_isTile)
+   {
+      m_prevTilePos = mode;
+   }
+   else
+   {
+      m_prevWallpaperPos = mode;
+   }
+
    r->stop();
    r->setWallpaperMode(mode);
    r->start(true);
diff --git a/kcontrol/background/bgdialog.h b/kcontrol/background/bgdialog.h
index 6b33d8999..a2e7bfea6 100644
--- a/kcontrol/background/bgdialog.h
+++ b/kcontrol/background/bgdialog.h
@@ -34,7 +34,7 @@ class TDEStandardDirs;
 
 class BGDialog : public BGDialog_UI
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop = true);
    ~BGDialog();
@@ -99,8 +99,11 @@ protected:
    TQValueVector< TQPtrVector<KBackgroundRenderer> > m_renderer; // m_renderer[desk][screen]
    TQMap<TQString,int> m_wallpaper;
    TQStringList m_patterns;
-   int m_slideShowRandom; // Remembers last Slide Show setting
-   int m_wallpaperPos; // Remembers last wallpaper pos
+   int m_slideShowRandom;  // Remembers last Slide Show setting
+   int m_wallpaperPos;     // Remembers last wallpaper pos
+   int m_prevWallpaperPos; // Previous normal wallpaper pos
+   int m_prevTilePos;      // Previous tile wallpaper pos
+   bool m_isTile;          // Whether the wallpaper is a tile (800x600 or smaller)
 
    BGMonitorArrangement * m_pMonitorArrangement;
 
diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp
index 1cf601bee..c75d42f6c 100644
--- a/kcontrol/background/bgmonitor.cpp
+++ b/kcontrol/background/bgmonitor.cpp
@@ -47,7 +47,7 @@ BGMonitorArrangement::BGMonitorArrangement(TQWidget *parent, const char *name)
         BGMonitorLabel * label = new BGMonitorLabel(this);
         m_pBGMonitor[screen] = label;
         
-        connect( label->monitor(), TQT_SIGNAL(imageDropped(const TQString &)), this, TQT_SIGNAL(imageDropped(const TQString &)) );
+        connect( label->monitor(), TQ_SIGNAL(imageDropped(const TQString &)), this, TQ_SIGNAL(imageDropped(const TQString &)) );
     }
     
     parent->setFixedSize(200, 186);
diff --git a/kcontrol/background/bgmonitor.h b/kcontrol/background/bgmonitor.h
index 5d2e1fc45..95608261b 100644
--- a/kcontrol/background/bgmonitor.h
+++ b/kcontrol/background/bgmonitor.h
@@ -38,7 +38,7 @@ class KPixmap;
  */
 class BGMonitorArrangement : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BGMonitorArrangement(TQWidget *parent, const char *name=0L);
     
@@ -94,7 +94,7 @@ protected:
  */
 class BGMonitor : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BGMonitor(TQWidget *parent, const char *name=0L);
 
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index e6c8fcccd..12455b608 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -63,7 +63,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou
     m_TilingEnabled = false;
 
     m_pTimer = new TQTimer(this);
-    connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(render()));
+    connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(render()));
 }
 
 
@@ -239,8 +239,8 @@ int KBackgroundRenderer::doBackground(bool quit)
         delete m_pProc;
         m_pProc = new KShellProcess;
         *m_pProc << file;
-        connect(m_pProc, TQT_SIGNAL(processExited(TDEProcess *)),
-                TQT_SLOT(slotBackgroundDone(TDEProcess *)));
+        connect(m_pProc, TQ_SIGNAL(processExited(TDEProcess *)),
+                TQ_SLOT(slotBackgroundDone(TDEProcess *)));
         m_pProc->start(KShellProcess::NotifyOnExit);
         retval = Wait;
         break;
@@ -384,7 +384,7 @@ wp_load:
 	    wpmode = NoWallpaper;
 	    goto wp_out;
 	}
-	m_Wallpaper = m_Wallpaper.convertDepth(32, Qt::DiffuseAlphaDither);
+	m_Wallpaper = m_Wallpaper.convertDepth(32, TQt::DiffuseAlphaDither);
 
 	// If we're previewing, scale the wallpaper down to make the preview
 	// look more like the real desktop.
@@ -628,7 +628,7 @@ void KBackgroundRenderer::fullWallpaperBlend()
 	m_Image = m_Background.copy();
 
 	if (m_Image.depth() < 32)
-	    m_Image = m_Image.convertDepth(32, Qt::DiffuseAlphaDither);
+	    m_Image = m_Image.convertDepth(32, TQt::DiffuseAlphaDither);
 
     } else {
 	m_Image.create(w, h, 32);
@@ -1160,7 +1160,7 @@ void KVirtualBGRenderer::desktopResized()
     {
         delete m_pPixmap;
         m_pPixmap = new TQPixmap(m_size);
-        m_pPixmap->fill(Qt::black);
+        m_pPixmap->fill(TQt::black);
     }
 
     initRenderers();
@@ -1228,7 +1228,7 @@ void KVirtualBGRenderer::initRenderers()
         KCrossBGRender *r = new KCrossBGRender(m_desk, eScreen, m_bDrawBackgroundPerScreen, m_pConfig);
         m_renderer.insert( i, r );
         r->setSize(renderSize(i));
-        connect( r, TQT_SIGNAL(imageDone(int,int)), this, TQT_SLOT(screenDone(int,int)) );
+        connect( r, TQ_SIGNAL(imageDone(int,int)), this, TQ_SLOT(screenDone(int,int)) );
     }
 }
 
@@ -1317,7 +1317,7 @@ void KVirtualBGRenderer::start()
         // If are screen sizes do not properly tile the overall virtual screen
         // size, then we want the untiled parts to be black for use in desktop
         // previews, etc
-        m_pPixmap->fill(Qt::black);
+        m_pPixmap->fill(TQt::black);
     }
 
     m_bFinished.fill(false);
diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h
index 56ce3076a..f9042dd56 100644
--- a/kcontrol/background/bgrender.h
+++ b/kcontrol/background/bgrender.h
@@ -39,7 +39,7 @@ class KBackgroundRenderer:
 	public TQObject,
 	public KBackgroundSettings
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config=0);
@@ -120,9 +120,9 @@ private:
  * images. Usage is similar to KBackgroundRenderer: connect to the imageDone
  * signal.
  */
-class KVirtualBGRenderer : public QObject
+class KVirtualBGRenderer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KVirtualBGRenderer(int desk, TDEConfig *config=0l);
     ~KVirtualBGRenderer();
diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp
index b10c3707b..bc7de3e63 100644
--- a/kcontrol/background/bgwallpaper.cpp
+++ b/kcontrol/background/bgwallpaper.cpp
@@ -114,11 +114,11 @@ BGMultiWallpaperDialog::BGMultiWallpaperDialog(KBackgroundSettings *settings,
    if (m_pSettings->multiWallpaperMode() == KBackgroundSettings::Random)
       dlg->m_cbRandom->setChecked(true);
 
-   connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()));
-   connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
-   connect(dlg->m_buttonMoveUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp()));
-   connect(dlg->m_buttonMoveDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown()));
-   connect(dlg->m_listImages,  TQT_SIGNAL(clicked ( TQListBoxItem * )), TQT_SLOT(slotItemSelected( TQListBoxItem *)));
+   connect(dlg->m_buttonAdd, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()));
+   connect(dlg->m_buttonRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()));
+   connect(dlg->m_buttonMoveUp, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveUp()));
+   connect(dlg->m_buttonMoveDown, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveDown()));
+   connect(dlg->m_listImages,  TQ_SIGNAL(clicked ( TQListBoxItem * )), TQ_SLOT(slotItemSelected( TQListBoxItem *)));
    dlg->m_buttonRemove->setEnabled( false );
    dlg->m_buttonMoveUp->setEnabled( false );
    dlg->m_buttonMoveDown->setEnabled( false );
diff --git a/kcontrol/background/bgwallpaper.h b/kcontrol/background/bgwallpaper.h
index 32f0784fc..6a61516ee 100644
--- a/kcontrol/background/bgwallpaper.h
+++ b/kcontrol/background/bgwallpaper.h
@@ -44,7 +44,7 @@ public:
 
 class BGMultiWallpaperDialog : public KDialogBase
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    BGMultiWallpaperDialog(KBackgroundSettings *settings, TQWidget *parent, const char *name=0);
 
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index 75ed22269..e27aa50ac 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -65,7 +65,7 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList
     // reparenting that is done.
     setAcceptDrops(true);
 
-    connect(m_base, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+    connect(m_base, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
     TDEAboutData *about =
     new TDEAboutData(I18N_NOOP("kcmbackground"), I18N_NOOP("TDE Background Control Module"),
diff --git a/kcontrol/background/main.h b/kcontrol/background/main.h
index 79e72d5a3..d4442b340 100644
--- a/kcontrol/background/main.h
+++ b/kcontrol/background/main.h
@@ -20,7 +20,7 @@ class BGDialog;
  */
 class KBackground: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KBackground(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp
index 5022ab420..8abc606db 100644
--- a/kcontrol/bell/bell.cpp
+++ b/kcontrol/bell/bell.cpp
@@ -71,7 +71,7 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
 
   int row = 0;
   TQGroupBox *box = new TQGroupBox( i18n("Bell Settings"), this );
-  box->setColumnLayout( 0, Qt::Horizontal );
+  box->setColumnLayout( 0, TQt::Horizontal );
   layout->addWidget(box);
   layout->addStretch();
   TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint());
@@ -84,7 +84,7 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
 				  "more sophisticated system notification, see the "
 				  "\"System Notifications\" control module for the "
 				  "\"Something Special Happened in the Program\" event."));
-  connect(m_useBell, TQT_SIGNAL( toggled( bool )), TQT_SLOT( useBell( bool )));
+  connect(m_useBell, TQ_SIGNAL( toggled( bool )), TQ_SLOT( useBell( bool )));
   row++;
   grid->addMultiCellWidget(m_useBell, row, row, 0, 1);
 
@@ -124,13 +124,13 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
   m_testButton = new TQPushButton(i18n("&Test"), box, "test");
   boxLayout->addWidget(m_testButton, 0, AlignRight);
   grid->addLayout( boxLayout, ++row, 1 );
-  connect( m_testButton, TQT_SIGNAL(clicked()), TQT_SLOT(ringBell()));
+  connect( m_testButton, TQ_SIGNAL(clicked()), TQ_SLOT(ringBell()));
   TQWhatsThis::add( m_testButton, i18n("Click \"Test\" to hear how the system bell will sound using your changed settings.") );
 
   // watch for changes
-  connect(m_volume, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(m_pitch, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(m_duration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+  connect(m_volume, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(m_pitch, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(m_duration, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
   
   TDEAboutData *about =
     new TDEAboutData(I18N_NOOP("kcmbell"), I18N_NOOP("TDE Bell Control Module"),
diff --git a/kcontrol/bell/bell.h b/kcontrol/bell/bell.h
index 844698e9e..ea539e528 100644
--- a/kcontrol/bell/bell.h
+++ b/kcontrol/bell/bell.h
@@ -29,7 +29,7 @@ class TQPushButton;
 
 class KBellConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  public:
   KBellConfig(TQWidget *parent, const char *name);
diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp
index a492c9deb..3e45b3b19 100644
--- a/kcontrol/clock/dtime.cpp
+++ b/kcontrol/clock/dtime.cpp
@@ -70,14 +70,14 @@ Dtime::Dtime(TQWidget * parent, const char *name)
 
   setDateTimeAuto = new TQCheckBox( privateLayoutWidget, "setDateTimeAuto" );
   setDateTimeAuto->setText(i18n("Set date and time &automatically:"));
-  connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(serverTimeCheck()));
-  connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()));
+  connect(setDateTimeAuto, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(serverTimeCheck()));
+  connect(setDateTimeAuto, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()));
   layout1->addWidget( setDateTimeAuto );
 
   timeServerList = new TQComboBox( false, privateLayoutWidget, "timeServerList" );
-  connect(timeServerList, TQT_SIGNAL(activated(int)), TQT_SLOT(configChanged()));
-  connect(timeServerList, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(configChanged()));
-  connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), timeServerList, TQT_SLOT(setEnabled(bool)));
+  connect(timeServerList, TQ_SIGNAL(activated(int)), TQ_SLOT(configChanged()));
+  connect(timeServerList, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(configChanged()));
+  connect(setDateTimeAuto, TQ_SIGNAL(toggled(bool)), timeServerList, TQ_SLOT(setEnabled(bool)));
   timeServerList->setEnabled(false);
   timeServerList->setEditable(true);
   layout1->addWidget( timeServerList );
@@ -164,12 +164,12 @@ Dtime::Dtime(TQWidget * parent, const char *name)
   // End Dialog
   // *************************************************************
 
-  connect( hour, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) );
-  connect( minute, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) );
-  connect( second, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) );
-  connect( cal, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(changeDate(TQDate)));
+  connect( hour, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(set_time()) );
+  connect( minute, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(set_time()) );
+  connect( second, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(set_time()) );
+  connect( cal, TQ_SIGNAL(dateChanged(TQDate)), TQ_SLOT(changeDate(TQDate)));
 
-  connect( &internalTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) );
+  connect( &internalTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) );
 
   load();
 
diff --git a/kcontrol/clock/dtime.h b/kcontrol/clock/dtime.h
index 74680d579..ed8819502 100644
--- a/kcontrol/clock/dtime.h
+++ b/kcontrol/clock/dtime.h
@@ -39,7 +39,7 @@ class Kclock;
 
 class HMSTimeWidget : public KIntSpinBox
 {
-  Q_OBJECT
+  TQ_OBJECT
  public:
   HMSTimeWidget(TQWidget *parent=0, const char *name=0);
  protected:
@@ -48,7 +48,7 @@ class HMSTimeWidget : public KIntSpinBox
 
 class Dtime : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
  public:
   Dtime( TQWidget *parent=0, const char* name=0 );
 
@@ -97,7 +97,7 @@ private:
 
 class Kclock : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   Kclock( TQWidget *parent=0, const char *name=0 ) 
@@ -118,7 +118,7 @@ class KStrictIntValidator : public TQIntValidator
 public:
   KStrictIntValidator(int bottom, int top, TQWidget * parent,
 		      const char * name = 0 )
-    : TQIntValidator(bottom, top, TQT_TQOBJECT(parent), name) {};
+    : TQIntValidator(bottom, top, parent, name) {};
   
   TQValidator::State validate( TQString & input, int & d ) const; 
 };
diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp
index a59599b71..7d791b9f7 100644
--- a/kcontrol/clock/main.cpp
+++ b/kcontrol/clock/main.cpp
@@ -63,11 +63,11 @@ KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringLis
 
   dtime = new Dtime(this);
   layout->addWidget(dtime);
-  connect(dtime, TQT_SIGNAL(timeChanged(bool)), this, TQT_SIGNAL(changed(bool)));
+  connect(dtime, TQ_SIGNAL(timeChanged(bool)), this, TQ_SIGNAL(changed(bool)));
 
   tzone = new Tzone(this);
   layout->addWidget(tzone);
-  connect(tzone, TQT_SIGNAL(zoneChanged(bool)), this, TQT_SIGNAL(changed(bool)));
+  connect(tzone, TQ_SIGNAL(zoneChanged(bool)), this, TQ_SIGNAL(changed(bool)));
 
   layout->addStretch();
 
diff --git a/kcontrol/clock/main.h b/kcontrol/clock/main.h
index 7754da34f..01c846f92 100644
--- a/kcontrol/clock/main.h
+++ b/kcontrol/clock/main.h
@@ -30,7 +30,7 @@ class TQTabWidget;
 
 class KclockModule : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KclockModule(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp
index 518c6663d..593b9ca1d 100644
--- a/kcontrol/clock/tzone.cpp
+++ b/kcontrol/clock/tzone.cpp
@@ -52,7 +52,7 @@ Tzone::Tzone(TQWidget * parent, const char *name)
     setTitle(i18n("To change the timezone, select your area from the list below"));
 
     tzonelist = new KTimezoneWidget(this, "ComboBox_1", &m_zoneDb);
-    connect( tzonelist, TQT_SIGNAL(selectionChanged()), TQT_SLOT(handleZoneChange()) );
+    connect( tzonelist, TQ_SIGNAL(selectionChanged()), TQ_SLOT(handleZoneChange()) );
 
     m_local = new TQLabel(this);
 
diff --git a/kcontrol/clock/tzone.h b/kcontrol/clock/tzone.h
index 1ecfc225e..8508c9ee0 100644
--- a/kcontrol/clock/tzone.h
+++ b/kcontrol/clock/tzone.h
@@ -31,7 +31,7 @@ class TQLabel;
 
 class Tzone : public TQVGroupBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   Tzone( TQWidget *parent=0, const char* name=0 );
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index b1cc2616a..aa5703fbb 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -35,7 +35,7 @@
 #include <kstandarddirs.h>
 #include <tdeaboutdata.h>
 
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_QTONLY
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #endif
@@ -136,10 +136,10 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
        " \"Widget color\" box will change to reflect the part of the preview"
        " image you clicked.") );
 
-    connect( cs, TQT_SIGNAL( widgetSelected( int ) ),
-         TQT_SLOT( slotWidgetColor( int ) ) );
-    connect( cs, TQT_SIGNAL( colorDropped( int, const TQColor&)),
-         TQT_SLOT( slotColorForWidget( int, const TQColor&)));
+    connect( cs, TQ_SIGNAL( widgetSelected( int ) ),
+         TQ_SLOT( slotWidgetColor( int ) ) );
+    connect( cs, TQ_SIGNAL( colorDropped( int, const TQColor&)),
+         TQ_SLOT( slotColorForWidget( int, const TQColor&)));
     topLayout->addMultiCellWidget( cs, 0, 0, 0, 1 );
 
     TQGroupBox *group = new TQVGroupBox( i18n("Color Scheme"), this );
@@ -149,7 +149,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
     mSchemeList = new KColorSchemeList();
     readSchemeNames();
     sList->setCurrentItem( 0 );
-    connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int)));
+    connect(sList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotPreviewScheme(int)));
 
     TQWhatsThis::add( sList, i18n("This is a list of predefined color schemes,"
        " including any that you may have created. You can preview an existing"
@@ -160,7 +160,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
        " another color scheme.") );
 
     addBt = new TQPushButton(i18n("&Save Scheme..."), group);
-    connect(addBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()));
+    connect(addBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()));
 
     TQWhatsThis::add( addBt, i18n("Press this button if you want to save"
        " the current color settings as a color scheme. You will be"
@@ -168,14 +168,14 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
 
     removeBt = new TQPushButton(i18n("R&emove Scheme"), group);
     removeBt->setEnabled(FALSE);
-    connect(removeBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
+    connect(removeBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()));
 
     TQWhatsThis::add( removeBt, i18n("Press this button to remove the selected"
        " color scheme. Note that this button is disabled if you do not have"
        " permission to delete the color scheme.") );
 
 	importBt = new TQPushButton(i18n("I&mport Scheme..."), group);
-	connect(importBt, TQT_SIGNAL(clicked()),TQT_SLOT(slotImport()));
+	connect(importBt, TQ_SIGNAL(clicked()),TQ_SLOT(slotImport()));
 
 	TQWhatsThis::add( importBt, i18n("Press this button to import a new color"
 		" scheme. Note that the color scheme will only be available for the"
@@ -221,7 +221,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
     setColorName(i18n("Alternate Background in Lists"), CSM_Alternate_background);
 
     wcCombo->adjustSize();
-    connect(wcCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWidgetColor(int)));
+    connect(wcCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWidgetColor(int)));
     groupLayout->addWidget(wcCombo);
 
     TQWhatsThis::add( wcCombo, i18n("Click here to select an element of"
@@ -230,8 +230,8 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
        " of the preview image above.") );
 
     colorButton = new KColorButton( group );
-    connect( colorButton, TQT_SIGNAL( changed(const TQColor &)),
-             TQT_SLOT(slotSelectColor(const TQColor &)));
+    connect( colorButton, TQ_SIGNAL( changed(const TQColor &)),
+             TQ_SLOT(slotSelectColor(const TQColor &)));
 
     groupLayout->addWidget( colorButton );
 
@@ -241,7 +241,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
 
     cbShadeList = new TQCheckBox(i18n("Shade sorted column in lists"), this);
     stackLayout->addWidget(cbShadeList);
-    connect(cbShadeList, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotShadeSortColumnChanged(bool)));
+    connect(cbShadeList, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotShadeSortColumnChanged(bool)));
 
     TQWhatsThis::add(cbShadeList,
        i18n("Check this box to show the sorted column in a list with a shaded background"));
@@ -254,10 +254,10 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
     groupLayout = new TQHBoxLayout;
     groupLayout2->addLayout(groupLayout);
 
-    sb = new TQSlider( Qt::Horizontal,group,"Slider" );
+    sb = new TQSlider( TQt::Horizontal,group,"Slider" );
     sb->setRange( 0, 10 );
-    sb->setFocusPolicy( TQ_StrongFocus );
-    connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int)));
+    sb->setFocusPolicy( TQWidget::StrongFocus );
+    connect(sb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(sliderValueChanged(int)));
 
     TQWhatsThis::add(sb, i18n("Use this slider to change the contrast level"
        " of the current color scheme. Contrast does not affect all of the"
@@ -272,7 +272,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
 
     cbExportColors = new TQCheckBox(i18n("Apply colors to &non-TDE applications"), this);
     topLayout->addMultiCellWidget( cbExportColors, 2, 2, 0, 1 );
-    connect(cbExportColors, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed()));
+    connect(cbExportColors, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add(cbExportColors, i18n("Check this box to apply the"
        " current color scheme to non-TDE applications."));
@@ -396,7 +396,7 @@ void KColorScheme::save()
         flags |= KRdbExportColors;
     else
     {
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_QTONLY
         // Undo the property xrdb has placed on the root window (if any),
         // i.e. remove all entries, including ours
         XDeleteProperty( tqt_xdisplay(), tqt_xrootwin(), XA_RESOURCE_MANAGER );
@@ -550,8 +550,8 @@ void KColorScheme::slotAdd()
             valid = true;
     }
 
-    disconnect(sList, TQT_SIGNAL(highlighted(int)), this,
-               TQT_SLOT(slotPreviewScheme(int)));
+    disconnect(sList, TQ_SIGNAL(highlighted(int)), this,
+               TQ_SLOT(slotPreviewScheme(int)));
 
     if (exists != -1)
     {
@@ -574,7 +574,7 @@ void KColorScheme::slotAdd()
     TQPixmap preview = mkColorPreview(cs);
     int current = sList->currentItem();
     sList->changeItem(preview, sList->text(current), current);
-    connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int)));
+    connect(sList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotPreviewScheme(int)));
     slotPreviewScheme(current);
 }
 
@@ -605,7 +605,7 @@ void KColorScheme::slotImport()
 		TQPixmap preview = mkColorPreview(cs);
 		int current = sList->currentItem();
 		sList->changeItem(preview, sList->text(current), current);
-		connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int)));
+		connect(sList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotPreviewScheme(int)));
 		slotPreviewScheme(current);
 	}
 }
diff --git a/kcontrol/colors/colorscm.h b/kcontrol/colors/colorscm.h
index ca8718f74..228204556 100644
--- a/kcontrol/colors/colorscm.h
+++ b/kcontrol/colors/colorscm.h
@@ -36,7 +36,7 @@ class KColorSchemeList;
  */
 class KColorScheme: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KColorScheme(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index b08ef6135..d83b821bd 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -315,7 +315,7 @@ void WidgetCanvas::drawSampleWidgets()
     // Create a scrollbar and redirect drawing into a temp. pixmap to save a
     // lot of fiddly drawing later.
 
-    TQScrollBar *vertScrollBar = new TQScrollBar( Qt::Vertical, this );
+    TQScrollBar *vertScrollBar = new TQScrollBar( TQt::Vertical, this );
     // TODO: vertScrollBar->setStyle( new TQMotifStyle() );
     vertScrollBar->setGeometry( 400, 400, SCROLLBAR_SIZE, height());
     vertScrollBar->setRange( 0,  0 );
@@ -435,7 +435,7 @@ void WidgetCanvas::drawSampleWidgets()
     // Menu bar
 
     //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush);
-    kapp->style().tqdrawPrimitive(TQStyle::PE_PanelMenuBar, &paint, 
+    kapp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint, 
 			TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg);
 
     paint.setFont( menuFont );
@@ -443,7 +443,7 @@ void WidgetCanvas::drawSampleWidgets()
 	TQString file = i18n("File");
     textLen = paint.fontMetrics().width( file );
     //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush);
-	kapp->style().tqdrawPrimitive(TQStyle::PE_Panel, &paint,
+	kapp->style().drawPrimitive(TQStyle::PE_Panel, &paint,
 			TQRect(30, 59, textLen + 10, 21), cg);
     paint.drawText( 35, 74, file );
 
@@ -528,7 +528,7 @@ void WidgetCanvas::drawSampleWidgets()
     cg2.setColor(TQColorGroup::Button, button);
     cg2.setColor(TQColorGroup::Background, window);
     //qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush);
-	kapp->style().tqdrawPrimitive(TQStyle::PE_ButtonCommand, &paint,
+	kapp->style().drawPrimitive(TQStyle::PE_ButtonCommand, &paint,
 			TQRect(xpos, ypos, textLen+32, 28), cg2, TQStyle::Style_Enabled | TQStyle::Style_Raised);
     paint.setPen(buttonTxt);
     paint.drawText(xpos, ypos, textLen+32, 28, AlignCenter,
diff --git a/kcontrol/colors/widgetcanvas.h b/kcontrol/colors/widgetcanvas.h
index 60898622b..220b244cc 100644
--- a/kcontrol/colors/widgetcanvas.h
+++ b/kcontrol/colors/widgetcanvas.h
@@ -61,7 +61,7 @@ public:
 
 class WidgetCanvas : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     WidgetCanvas( TQWidget *parent=0, const char *name=0 );
diff --git a/kcontrol/componentchooser/browserconfig_ui.ui b/kcontrol/componentchooser/browserconfig_ui.ui
index 1cbd35a5e..dba44f01c 100644
--- a/kcontrol/componentchooser/browserconfig_ui.ui
+++ b/kcontrol/componentchooser/browserconfig_ui.ui
@@ -166,9 +166,9 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected">selectBrowser()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index e7b807327..b469fc001 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -53,7 +53,7 @@ public:
 CfgComponent::CfgComponent(TQWidget *parent):ComponentConfig_UI(parent),CfgPlugin(){
 	m_lookupDict.setAutoDelete(true);
 	m_revLookupDict.setAutoDelete(true);
-	connect(ComponentSelector,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(slotComponentChanged(const TQString&)));
+	connect(ComponentSelector,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(slotComponentChanged(const TQString&)));
 }
 
 CfgComponent::~CfgComponent(){}
@@ -126,9 +126,9 @@ void CfgComponent::defaults()
 CfgEmailClient::CfgEmailClient(TQWidget *parent):EmailClientConfig_UI(parent),CfgPlugin(){
 	pSettings = new KEMailSettings();
 
-	connect(kmailCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()) );
-	connect(txtEMailClient, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged()) );
-	connect(chkRunTerminal, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) );
+	connect(kmailCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()) );
+	connect(txtEMailClient, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(configChanged()) );
+	connect(chkRunTerminal, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) );
 }
 
 CfgEmailClient::~CfgEmailClient() {
@@ -252,9 +252,9 @@ void CfgFileManager::selectFileAssociations()
 //BEGIN Terminal Emulator Configuration
 
 CfgTerminalEmulator::CfgTerminalEmulator(TQWidget *parent):TerminalEmulatorConfig_UI(parent),CfgPlugin(){
-	connect(terminalLE,TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(configChanged()));
-	connect(terminalCB,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged()));
-	connect(otherCB,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged()));
+	connect(terminalLE,TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(configChanged()));
+	connect(terminalCB,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged()));
+	connect(otherCB,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged()));
 }
 
 CfgTerminalEmulator::~CfgTerminalEmulator() {
@@ -323,9 +323,9 @@ void CfgTerminalEmulator::selectTerminalApp()
 //BEGIN Browser Configuration
 
 CfgBrowser::CfgBrowser(TQWidget *parent) : BrowserConfig_UI(parent),CfgPlugin(){
-        connect(lineExec,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(configChanged()));
-	connect(radioKIO,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged()));
-	connect(radioExec,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged()));
+        connect(lineExec,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(configChanged()));
+	connect(radioKIO,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged()));
+	connect(radioExec,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged()));
 }
 
 CfgBrowser::~CfgBrowser() {
@@ -431,7 +431,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name):
 	}
 	ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width());
 	ServiceChooser->sort();
-	connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*)));
+	connect(ServiceChooser,TQ_SIGNAL(highlighted(TQListBoxItem*)),this,TQ_SLOT(slotServiceSelected(TQListBoxItem*)));
 	ServiceChooser->setSelected(0,true);
 	slotServiceSelected(ServiceChooser->item(0));
 
@@ -504,7 +504,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
 		configContainer->removeWidget(configWidget);
 		delete configWidget;
 		configWidget=newConfigWidget;
-		connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool)));
+		connect(configWidget,TQ_SIGNAL(changed(bool)),this,TQ_SLOT(emitChanged(bool)));
 	        configContainer->setMinimumSize(configWidget->sizeHint());
 	}
 	
diff --git a/kcontrol/componentchooser/componentchooser.h b/kcontrol/componentchooser/componentchooser.h
index 3649ca218..7eec4d152 100644
--- a/kcontrol/componentchooser/componentchooser.h
+++ b/kcontrol/componentchooser/componentchooser.h
@@ -47,7 +47,7 @@ public:
 
 class CfgComponent: public ComponentConfig_UI,public CfgPlugin
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	CfgComponent(TQWidget *parent);
 	virtual ~CfgComponent();
@@ -67,7 +67,7 @@ signals:
 
 class CfgEmailClient: public EmailClientConfig_UI,public CfgPlugin
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	CfgEmailClient(TQWidget *parent);
 	virtual ~CfgEmailClient();
@@ -87,7 +87,7 @@ signals:
 
 class CfgFileManager: public FileManagerConfig_UI,public CfgPlugin
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	CfgFileManager(TQWidget *parent);
 	virtual ~CfgFileManager();
@@ -105,7 +105,7 @@ signals:
 
 class CfgTerminalEmulator: public TerminalEmulatorConfig_UI,public CfgPlugin
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	CfgTerminalEmulator(TQWidget *parent);
 	virtual ~CfgTerminalEmulator();
@@ -123,7 +123,7 @@ signals:
 
 class CfgBrowser: public BrowserConfig_UI,public CfgPlugin
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	CfgBrowser(TQWidget *parent);
 	virtual ~CfgBrowser();
@@ -146,7 +146,7 @@ private:
 class ComponentChooser : public ComponentChooser_UI
 {
 
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	ComponentChooser(TQWidget *parent=0, const char *name=0);
diff --git a/kcontrol/componentchooser/emailclientconfig_ui.ui b/kcontrol/componentchooser/emailclientconfig_ui.ui
index ce89822d7..b8091e9ed 100644
--- a/kcontrol/componentchooser/emailclientconfig_ui.ui
+++ b/kcontrol/componentchooser/emailclientconfig_ui.ui
@@ -228,9 +228,9 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected">selectEmailClient()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/componentchooser/filemanagerconfig_ui.ui b/kcontrol/componentchooser/filemanagerconfig_ui.ui
index fbcd23d43..ec78226c3 100644
--- a/kcontrol/componentchooser/filemanagerconfig_ui.ui
+++ b/kcontrol/componentchooser/filemanagerconfig_ui.ui
@@ -116,9 +116,9 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected">selectFileAssociations()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp
index 30750bdd5..6c71f8a42 100644
--- a/kcontrol/componentchooser/kcm_componentchooser.cpp
+++ b/kcontrol/componentchooser/kcm_componentchooser.cpp
@@ -27,7 +27,7 @@ KCMComponentChooser::KCMComponentChooser( TQWidget *parent, const char *name ):
 
 	(new TQVBoxLayout(this))->setAutoAdd(true);
 	m_chooser=new ComponentChooser(this,"ComponentChooser");
-	connect(m_chooser,TQT_SIGNAL(changed(bool)),this,TQT_SIGNAL(changed(bool)));
+	connect(m_chooser,TQ_SIGNAL(changed(bool)),this,TQ_SIGNAL(changed(bool)));
 	setButtons( Help | Apply );
 
 	TDEAboutData *about =
diff --git a/kcontrol/componentchooser/kcm_componentchooser.h b/kcontrol/componentchooser/kcm_componentchooser.h
index 001306506..5d93fbb9b 100644
--- a/kcontrol/componentchooser/kcm_componentchooser.h
+++ b/kcontrol/componentchooser/kcm_componentchooser.h
@@ -24,7 +24,7 @@ class TDEAboutData;
 
 class KCMComponentChooser : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KCMComponentChooser( TQWidget *parent = 0, const char *name = 0 );
  
diff --git a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
index cbb79cb9f..047d8e6be 100644
--- a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
+++ b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
@@ -186,9 +186,9 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected">selectTerminalApp()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/crypto/certexport.cpp b/kcontrol/crypto/certexport.cpp
index 034d69897..d289f4aed 100644
--- a/kcontrol/crypto/certexport.cpp
+++ b/kcontrol/crypto/certexport.cpp
@@ -55,21 +55,21 @@ TQGridLayout *grid = new TQGridLayout(this, 9, 6, marginHint(), spacingHint());
 
    _filename = new KLineEdit(this);
    grid->addMultiCellWidget(_filename, 6, 6, 0, 4);
-   connect(_filename, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotTextChanged(const TQString &)));
-   connect(_filename, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotExport()));
+   connect(_filename, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotTextChanged(const TQString &)));
+   connect(_filename, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotExport()));
 
    _choose = new TQPushButton("...", this);
    grid->addWidget(_choose, 6, 5);
-   connect(_choose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChoose()));
+   connect(_choose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChoose()));
    
    _export = new TQPushButton(i18n("&Export"), this);
    grid->addWidget(_export, 8, 4);
-   connect(_export, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExport()));
+   connect(_export, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExport()));
    _export->setEnabled(false);
 
    _cancel = new TQPushButton(i18n("&Cancel"), this);
    grid->addWidget(_cancel, 8, 5);
-   connect(_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
+   connect(_cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()));
 }
 
 
diff --git a/kcontrol/crypto/certexport.h b/kcontrol/crypto/certexport.h
index 54511e04c..aeca9aaa9 100644
--- a/kcontrol/crypto/certexport.h
+++ b/kcontrol/crypto/certexport.h
@@ -31,7 +31,7 @@ class KSSLCertificate;
 
 class KCertExport : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KCertExport(TQWidget *parent = 0L, const char *name = 0L);
   virtual ~KCertExport();
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index f8558c866..53a73f4a1 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -265,7 +265,7 @@ TQString whatstr;
   grid = new TQGridLayout(tabSSL, 7, 2, KDialog::marginHint(),
                                        KDialog::spacingHint() );
   mUseTLS = new TQCheckBox(i18n("Enable &TLS support if supported by the server"), tabSSL);
-  connect(mUseTLS, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mUseTLS, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addWidget(mUseTLS, 0, 0);
   whatstr = i18n("TLS is the newest revision of the SSL protocol."
                  " It integrates better with other protocols and has"
@@ -273,14 +273,14 @@ TQString whatstr;
   TQWhatsThis::add(mUseTLS, whatstr);
 
   mUseSSLv2 = new TQCheckBox(i18n("Enable SSLv&2"), tabSSL);
-  connect(mUseSSLv2, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mUseSSLv2, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addWidget(mUseSSLv2, 1, 0);
   whatstr = i18n("SSL v2 is the second revision of the SSL protocol."
                 " It is most common to enable v2 and v3.");
   TQWhatsThis::add(mUseSSLv2, whatstr);
 
   mUseSSLv3 = new TQCheckBox(i18n("Enable SSLv&3"), tabSSL);
-  connect(mUseSSLv3, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mUseSSLv3, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addWidget(mUseSSLv3, 1, 1);
   whatstr = i18n("SSL v3 is the third revision of the SSL protocol."
                 " It is most common to enable v2 and v3.");
@@ -296,8 +296,8 @@ TQString whatstr;
   SSLv2Box->setSelectionMode(TQListView::NoSelection);
 
   grid->addWidget( SSLv2Box, 2, 0 );
-  connect( mUseSSLv2, TQT_SIGNAL( toggled( bool ) ),
-	   SSLv2Box, TQT_SLOT( setEnabled( bool )));
+  connect( mUseSSLv2, TQ_SIGNAL( toggled( bool ) ),
+	   SSLv2Box, TQ_SLOT( setEnabled( bool )));
 #else
   TQLabel *nossllabel = new TQLabel(i18n("SSL ciphers cannot be configured"
                                " because this module was not linked"
@@ -321,8 +321,8 @@ TQString whatstr;
   TQWhatsThis::add(SSLv3Box, whatstr);
   SSLv3Box->setSelectionMode(TQListView::NoSelection);
   grid->addWidget(SSLv3Box, 2, 1);
-  connect( mUseSSLv3, TQT_SIGNAL( toggled( bool ) ),
-	   SSLv3Box, TQT_SLOT( setEnabled( bool )));
+  connect( mUseSSLv3, TQ_SIGNAL( toggled( bool ) ),
+	   SSLv3Box, TQ_SLOT( setEnabled( bool )));
 
   loadCiphers();
 
@@ -346,7 +346,7 @@ TQString whatstr;
 
   TQWhatsThis::add(cwcb, whatStr);
 
-  connect(cwcb, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectCipher(int)));
+  connect(cwcb, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectCipher(int)));
 
 
 
@@ -354,21 +354,21 @@ TQString whatstr;
 #endif
 
   mWarnOnEnter = new TQCheckBox(i18n("Warn on &entering SSL mode"), tabSSL);
-  connect(mWarnOnEnter, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mWarnOnEnter, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addWidget(mWarnOnEnter, 5, 0);
   whatstr = i18n("If selected, you will be notified when entering an SSL"
                 " enabled site");
   TQWhatsThis::add(mWarnOnEnter, whatstr);
 
   mWarnOnLeave = new TQCheckBox(i18n("Warn on &leaving SSL mode"), tabSSL);
-  connect(mWarnOnLeave, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mWarnOnLeave, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addWidget(mWarnOnLeave, 5, 1);
   whatstr = i18n("If selected, you will be notified when leaving an SSL"
                 " based site.");
   TQWhatsThis::add(mWarnOnLeave, whatstr);
 
   mWarnOnUnencrypted = new TQCheckBox(i18n("Warn on sending &unencrypted data"), tabSSL);
-  connect(mWarnOnUnencrypted, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mWarnOnUnencrypted, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addWidget(mWarnOnUnencrypted, 6, 0);
   whatstr = i18n("If selected, you will be notified before sending"
                 " unencrypted data via a web browser.");
@@ -376,7 +376,7 @@ TQString whatstr;
 
 #if 0  // NOT IMPLEMENTED IN KDE 3.0
   mWarnOnMixed = new TQCheckBox(i18n("Warn on &mixed SSL/non-SSL pages"), tabSSL);
-  connect(mWarnOnMixed, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mWarnOnMixed, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addWidget(mWarnOnMixed, 6, 1);
   whatstr = i18n("If selected, you will be notified if you view a page"
                 " that has both encrypted and non-encrypted parts.");
@@ -396,9 +396,9 @@ TQString whatstr;
   oPath = new KURLRequester(oInfo);
   oPath->setMode(KFile::Directory);
   oTest = new TQPushButton(i18n("&Test"), oInfo);
-  connect(oTest, TQT_SIGNAL(clicked()), TQT_SLOT(slotTestOSSL()));
+  connect(oTest, TQ_SIGNAL(clicked()), TQ_SLOT(slotTestOSSL()));
 
-  connect(oPath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged()));
+  connect(oPath, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(configChanged()));
 
   //
   //  Settings for the EGD
@@ -406,9 +406,9 @@ TQString whatstr;
   TQFrame *eFrame = new TQFrame(tabOSSL);
   TQVBoxLayout *egrid = new TQVBoxLayout(eFrame);
   mUseEGD = new TQCheckBox(i18n("Use EGD"), eFrame);
-  connect(mUseEGD, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseEGD()));
+  connect(mUseEGD, TQ_SIGNAL(clicked()), TQ_SLOT(slotUseEGD()));
   mUseEFile = new TQCheckBox(i18n("Use entropy file"), eFrame);
-  connect(mUseEFile, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseEFile()));
+  connect(mUseEFile, TQ_SIGNAL(clicked()), TQ_SLOT(slotUseEFile()));
   vbox->addWidget(eFrame);
   egrid->addWidget(mUseEGD);
   egrid->addWidget(mUseEFile);
@@ -419,7 +419,7 @@ TQString whatstr;
   grid2->addWidget(mEGDLabel, 0, 0);
   mEGDPath = new KURLRequester(egdframe);
   grid2->addWidget(mEGDPath, 0, 1);
-  connect(mEGDPath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged()));
+  connect(mEGDPath, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(configChanged()));
   vbox->addWidget(egdframe);
   whatstr = i18n("If selected, OpenSSL will be asked to use the entropy gathering"
           " daemon (EGD) for initializing the pseudo-random number generator.");
@@ -454,35 +454,35 @@ TQString whatstr;
   grid->addMultiCellWidget(yourSSLBox, 0, 5, 0, 4);
   yourSSLBox->addColumn(i18n("Common Name"));
   yourSSLBox->addColumn(i18n("Email Address"));
-  connect(yourSSLBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotYourCertSelect()));
+  connect(yourSSLBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotYourCertSelect()));
 
   yourSSLImport = new TQPushButton(i18n("I&mport..."), tabYourSSLCert);
-  connect(yourSSLImport, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourImport()));
+  connect(yourSSLImport, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourImport()));
   grid->addWidget(yourSSLImport, 0, 5);
 
   yourSSLExport = new TQPushButton(i18n("&Export..."), tabYourSSLCert);
   yourSSLExport->setEnabled(false);
-  connect(yourSSLExport, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourExport()));
+  connect(yourSSLExport, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourExport()));
   grid->addWidget(yourSSLExport, 1, 5);
 
   yourSSLRemove = new TQPushButton(i18n("Remo&ve"), tabYourSSLCert);
   yourSSLRemove->setEnabled(false);
-  connect(yourSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourRemove()));
+  connect(yourSSLRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourRemove()));
   grid->addWidget(yourSSLRemove, 2, 5);
 
   yourSSLUnlock = new TQPushButton(i18n("&Unlock"), tabYourSSLCert);
   yourSSLUnlock->setEnabled(false);
-  connect(yourSSLUnlock, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourUnlock()));
+  connect(yourSSLUnlock, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourUnlock()));
   grid->addWidget(yourSSLUnlock, 3, 5);
 
   yourSSLVerify = new TQPushButton(i18n("Verif&y"), tabYourSSLCert);
   yourSSLVerify->setEnabled(false);
-  connect(yourSSLVerify, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourVerify()));
+  connect(yourSSLVerify, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourVerify()));
   grid->addWidget(yourSSLVerify, 4, 5);
 
   yourSSLPass = new TQPushButton(i18n("Chan&ge Password..."), tabYourSSLCert);
   yourSSLPass->setEnabled(false);
-  connect(yourSSLPass, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourPass()));
+  connect(yourSSLPass, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourPass()));
   grid->addWidget(yourSSLPass, 5, 5);
 
   grid->addMultiCellWidget(new KSeparator(KSeparator::HLine, tabYourSSLCert), 6, 6, 0, 5);
@@ -579,14 +579,14 @@ TQString whatstr;
   hostCertBG->setEnabled(false);
   authRemove->setEnabled(false);
 
-  connect(defCertBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged()));
-  connect(defCertBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(configChanged()));
-  connect(hostAuthList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotAuthItemChanged()));
-  connect(authAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewHostAuth()));
-  connect(authRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveHostAuth()));
-  connect(authHost, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotAuthText(const TQString &)));
-  connect(hostCertBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotAuthButtons()));
-  connect(hostCertBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAuthCombo()));
+  connect(defCertBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged()));
+  connect(defCertBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(configChanged()));
+  connect(hostAuthList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotAuthItemChanged()));
+  connect(authAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewHostAuth()));
+  connect(authRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveHostAuth()));
+  connect(authHost, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotAuthText(const TQString &)));
+  connect(hostCertBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotAuthButtons()));
+  connect(hostCertBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotAuthCombo()));
 
 #else
   nossllabel = new TQLabel(i18n("SSL certificates cannot be managed"
@@ -607,7 +607,7 @@ TQString whatstr;
 
   otherSSLBox = new TQListView(tabOtherSSLCert);
   otherSSLBox->setAllColumnsShowFocus(true);
-  connect(otherSSLBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotOtherCertSelect()));
+  connect(otherSSLBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotOtherCertSelect()));
   whatstr = i18n("This list box shows which site and person certificates TDE"
                 " knows about. You can easily manage them from here.");
   TQWhatsThis::add(otherSSLBox, whatstr);
@@ -616,21 +616,21 @@ TQString whatstr;
   grid->addMultiCellWidget(otherSSLBox, 0, 7, 0, 4);
 
   otherSSLExport = new TQPushButton(i18n("&Export..."), tabOtherSSLCert);
-  connect(otherSSLExport, TQT_SIGNAL(clicked()), TQT_SLOT(slotExportCert()));
+  connect(otherSSLExport, TQ_SIGNAL(clicked()), TQ_SLOT(slotExportCert()));
   grid->addWidget(otherSSLExport, 0, 5);
   whatstr = i18n("This button allows you to export the selected certificate"
                 " to a file of various formats.");
   TQWhatsThis::add(otherSSLExport, whatstr);
 
   otherSSLRemove = new TQPushButton(i18n("&Remove"), tabOtherSSLCert);
-  connect(otherSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveCert()));
+  connect(otherSSLRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveCert()));
   grid->addWidget(otherSSLRemove, 1, 5);
   whatstr = i18n("This button removes the selected certificate"
                 " from the certificate cache.");
   TQWhatsThis::add(otherSSLRemove, whatstr);
 
   otherSSLVerify = new TQPushButton(i18n("&Verify"), tabOtherSSLCert);
-  connect(otherSSLVerify, TQT_SIGNAL(clicked()), TQT_SLOT(slotVerifyCert()));
+  connect(otherSSLVerify, TQ_SIGNAL(clicked()), TQ_SLOT(slotVerifyCert()));
   grid->addWidget(otherSSLVerify, 2, 5);
   whatstr = i18n("This button tests the selected certificate"
                 " for validity.");
@@ -675,9 +675,9 @@ TQString whatstr;
   cachePerm->setEnabled(false);
   cacheUntil->setEnabled(false);
   untilDate->setEnabled(false);
-  connect(cachePerm, TQT_SIGNAL(clicked()), TQT_SLOT(slotPermanent()));
-  connect(cacheUntil, TQT_SIGNAL(clicked()), TQT_SLOT(slotUntil()));
-  connect(untilDate, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotDatePick()));
+  connect(cachePerm, TQ_SIGNAL(clicked()), TQ_SLOT(slotPermanent()));
+  connect(cacheUntil, TQ_SIGNAL(clicked()), TQ_SLOT(slotUntil()));
+  connect(untilDate, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(slotDatePick()));
   whatstr = i18n("Select here to make the cache entry permanent.");
   TQWhatsThis::add(cachePerm, whatstr);
   whatstr = i18n("Select here to make the cache entry temporary.");
@@ -691,7 +691,7 @@ TQString whatstr;
   policyPrompt = new TQRadioButton(i18n("&Prompt"), policyGroup);
   policyGroup->setEnabled(false);
   grid->addMultiCellWidget(policyGroup, 16, 19, 3, 5);
-  connect(policyGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPolicyChanged(int)));
+  connect(policyGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPolicyChanged(int)));
   whatstr = i18n("Select this to always accept this certificate.");
   TQWhatsThis::add(policyAccept, whatstr);
   whatstr = i18n("Select this to always reject this certificate.");
@@ -729,19 +729,19 @@ TQString whatstr;
   caList->addColumn(i18n("Organization"));
   caList->addColumn(i18n("Organizational Unit"));
   caList->addColumn(i18n("Common Name"));
-  connect(caList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotCAItemChanged()));
+  connect(caList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotCAItemChanged()));
 
   caSSLImport = new TQPushButton(i18n("I&mport..."), tabSSLCA);
-  connect(caSSLImport, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAImport()));
+  connect(caSSLImport, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAImport()));
   grid->addWidget(caSSLImport, 0, 7);
 
   caSSLRemove = new TQPushButton(i18n("&Remove"), tabSSLCA);
-  connect(caSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotCARemove()));
+  connect(caSSLRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotCARemove()));
   grid->addWidget(caSSLRemove, 1, 7);
   caSSLRemove->setEnabled(false);
 
   caSSLRestore = new TQPushButton(i18n("Res&tore"), tabSSLCA);
-  connect(caSSLRestore, TQT_SIGNAL(clicked()), TQT_SLOT(slotCARestore()));
+  connect(caSSLRestore, TQ_SIGNAL(clicked()), TQ_SLOT(slotCARestore()));
   grid->addWidget(caSSLRestore, 2, 7);
 
   caSubject = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString()));
@@ -754,11 +754,11 @@ TQString whatstr;
   caEmail = new TQCheckBox(i18n("Accept for email signing"), tabSSLCA);
   caCode = new TQCheckBox(i18n("Accept for code signing"), tabSSLCA);
   grid->addMultiCellWidget(caSite, 7, 7, 0, 3);
-  connect(caSite, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked()));
+  connect(caSite, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAChecked()));
   grid->addMultiCellWidget(caEmail, 8, 8, 0, 3);
-  connect(caEmail, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked()));
+  connect(caEmail, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAChecked()));
   grid->addMultiCellWidget(caCode, 9, 9, 0, 3);
-  connect(caCode, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked()));
+  connect(caCode, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAChecked()));
   caSite->setEnabled(false);
   caEmail->setEnabled(false);
   caCode->setEnabled(false);
@@ -785,11 +785,11 @@ TQString whatstr;
 #ifdef HAVE_SSL
   grid = new TQGridLayout(tabSSLCOpts, 9, 4, KDialog::marginHint(), KDialog::spacingHint());
   mWarnSelfSigned = new TQCheckBox(i18n("Warn on &self-signed certificates or unknown CA's"), tabSSLCOpts);
-  connect(mWarnSelfSigned, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mWarnSelfSigned, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   mWarnExpired = new TQCheckBox(i18n("Warn on &expired certificates"), tabSSLCOpts);
-  connect(mWarnExpired, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mWarnExpired, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   mWarnRevoked = new TQCheckBox(i18n("Warn on re&voked certificates"), tabSSLCOpts);
-  connect(mWarnRevoked, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mWarnRevoked, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addMultiCellWidget(mWarnSelfSigned, 0, 0, 0, 3);
   grid->addMultiCellWidget(mWarnExpired, 1, 1, 0, 3);
   grid->addMultiCellWidget(mWarnRevoked, 2, 2, 0, 3);
@@ -807,15 +807,15 @@ TQString whatstr;
   grid->addMultiCellWidget(macBox, 5, 8, 0, 2);
 
   macAdd = new TQPushButton(i18n("&Add"), tabSSLCOpts);
-  //connect(macAdd, TQT_SIGNAL(), TQT_SLOT());
+  //connect(macAdd, TQ_SIGNAL(), TQ_SLOT());
   grid->addWidget(macAdd, 4, 3);
 
   macRemove = new TQPushButton(i18n("&Remove"), tabSSLCOpts);
-  //connect(macRemove, TQT_SIGNAL(), TQT_SLOT());
+  //connect(macRemove, TQ_SIGNAL(), TQ_SLOT());
   grid->addWidget(macRemove, 5, 3);
 
   macClear = new KPushButton(KGuiItem::clear(), tabSSLCOpts);
-  //connect(macAdd, TQT_SIGNAL(), TQT_SLOT());
+  //connect(macAdd, TQ_SIGNAL(), TQ_SLOT());
   grid->addWidget(macClear, 6, 3);
 
 #else
@@ -1540,7 +1540,7 @@ TQString iss = TQString();
          TQPalette cspl;
          iss = cert->getIssuer();
          cspl = validFrom->palette();
-         if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+         if (TQDateTime::currentDateTime(TQt::UTC) < cert->getQDTNotBefore()) {
             cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
          } else {
             cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1548,7 +1548,7 @@ TQString iss = TQString();
          validFrom->setPalette(cspl);
 
          cspl = validUntil->palette();
-         if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+         if (TQDateTime::currentDateTime(TQt::UTC) > cert->getQDTNotAfter()) {
             cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
          } else {
             cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1558,7 +1558,7 @@ TQString iss = TQString();
          validFrom->setText(cert->getNotBefore());
          validUntil->setText(cert->getNotAfter());
          untilDate->setText(x ? TDEGlobal::locale()->formatDateTime(x->getExpires())
-                              : TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC)));
+                              : TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(TQt::UTC)));
          untilDate->setEnabled(x && !x->isPermanent());
          pHash->setText(cert->getMD5DigestText());
          delete cert;
@@ -1778,7 +1778,7 @@ TQString iss;
    TQPalette cspl;
    KSSLCertificate *cert = pkcs->getCertificate();
    cspl = yValidFrom->palette();
-   if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+   if (TQDateTime::currentDateTime(TQt::UTC) < cert->getQDTNotBefore()) {
 	   cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
    } else {
 	   cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1786,7 +1786,7 @@ TQString iss;
    yValidFrom->setPalette(cspl);
 
    cspl = yValidUntil->palette();
-   if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+   if (TQDateTime::currentDateTime(TQt::UTC) > cert->getQDTNotAfter()) {
 	   cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
    } else {
 	   cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1818,7 +1818,7 @@ TQString iss;
          KSSLCertificate *cert = pkcs->getCertificate();
          iss = cert->getIssuer();
          cspl = yValidFrom->palette();
-         if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+         if (TQDateTime::currentDateTime(TQt::UTC) < cert->getQDTNotBefore()) {
             cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
          } else {
             cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1826,7 +1826,7 @@ TQString iss;
          yValidFrom->setPalette(cspl);
 
          cspl = yValidUntil->palette();
-         if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+         if (TQDateTime::currentDateTime(TQt::UTC) > cert->getQDTNotAfter()) {
             cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
          } else {
             cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
diff --git a/kcontrol/crypto/crypto.h b/kcontrol/crypto/crypto.h
index 8a353ae04..f468a473a 100644
--- a/kcontrol/crypto/crypto.h
+++ b/kcontrol/crypto/crypto.h
@@ -217,7 +217,7 @@ private:
 
 class KCryptoConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KCryptoConfig(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &list = TQStringList());
   virtual ~KCryptoConfig();
diff --git a/kcontrol/crypto/kdatetimedlg.cpp b/kcontrol/crypto/kdatetimedlg.cpp
index f7cd9d1cb..335e5e634 100644
--- a/kcontrol/crypto/kdatetimedlg.cpp
+++ b/kcontrol/crypto/kdatetimedlg.cpp
@@ -58,11 +58,11 @@ TQGridLayout *grid = new TQGridLayout(this, 9, 6, marginHint(), spacingHint());
 
    _ok = new KPushButton(KStdGuiItem::ok(), this);
    grid->addWidget(_ok, 8, 4);
-   connect(_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
+   connect(_ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()));
 
    _cancel = new KPushButton(KStdGuiItem::cancel(), this);
    grid->addWidget(_cancel, 8, 5);
-   connect(_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+   connect(_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 
 }
 
@@ -107,7 +107,7 @@ void KDateTimeDlg::setTime(const TQTime& qtime) {
 
 
 void KDateTimeDlg::setDateTime(const TQDateTime& qdatetime) {
-   _date->setDate(TQT_TQDATE_OBJECT(qdatetime.date()));
+   _date->setDate(qdatetime.date());
    _hours->setValue(qdatetime.time().hour());
    _mins->setValue(qdatetime.time().minute());
    _secs->setValue(qdatetime.time().second());
diff --git a/kcontrol/crypto/kdatetimedlg.h b/kcontrol/crypto/kdatetimedlg.h
index 92b62193b..ddc0531b8 100644
--- a/kcontrol/crypto/kdatetimedlg.h
+++ b/kcontrol/crypto/kdatetimedlg.h
@@ -34,7 +34,7 @@ class KDateTimeDlgPrivate;
 
 class KDateTimeDlg : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KDateTimeDlg(TQWidget *parent = 0L, const char *name = 0L);
   virtual ~KDateTimeDlg();
diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp
index e2e043f76..d22c90e3e 100644
--- a/kcontrol/css/kcmcss.cpp
+++ b/kcontrol/css/kcmcss.cpp
@@ -50,46 +50,46 @@ CSSConfig::CSSConfig(TQWidget *parent, const char *name, const TQStringList &)
   TDEFontChooser::getFontList(fonts, 0);
   customDialog->fontFamily->insertStringList(fonts);
 
-  connect(configDialog->useDefault, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(configDialog->useAccess, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(configDialog->useUser, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(configDialog->urlRequester, TQT_SIGNAL(textChanged(const TQString&)),
-	  TQT_SLOT(changed()));
-  connect(configDialog->customize, TQT_SIGNAL(clicked()),
-          TQT_SLOT(slotCustomize()));
-  connect(customDialog->basefontsize, TQT_SIGNAL(highlighted(int)),
-	  TQT_SLOT(changed()));
-  connect(customDialog->basefontsize, TQT_SIGNAL(textChanged(const TQString&)),
-	  TQT_SLOT(changed()));
-  connect(customDialog->dontScale, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(customDialog->blackOnWhite, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(customDialog->whiteOnBlack, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(customDialog->customColor, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(customDialog->foregroundColor, TQT_SIGNAL(changed(const TQColor &)),
-	  TQT_SLOT(changed()));
-  connect(customDialog->backgroundColor, TQT_SIGNAL(changed(const TQColor &)),
-	  TQT_SLOT(changed()));
-  connect(customDialog->fontFamily, TQT_SIGNAL(highlighted(int)),
-	  TQT_SLOT(changed()));
-  connect(customDialog->fontFamily, TQT_SIGNAL(textChanged(const TQString&)),
-	  TQT_SLOT(changed()));
-  connect(customDialog->sameFamily, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(customDialog->preview, TQT_SIGNAL(clicked()),
-          TQT_SLOT(slotPreview()));
-  connect(customDialog->sameColor, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(customDialog->hideImages, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(customDialog->hideBackground, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
+  connect(configDialog->useDefault, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(configDialog->useAccess, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(configDialog->useUser, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(configDialog->urlRequester, TQ_SIGNAL(textChanged(const TQString&)),
+	  TQ_SLOT(changed()));
+  connect(configDialog->customize, TQ_SIGNAL(clicked()),
+          TQ_SLOT(slotCustomize()));
+  connect(customDialog->basefontsize, TQ_SIGNAL(highlighted(int)),
+	  TQ_SLOT(changed()));
+  connect(customDialog->basefontsize, TQ_SIGNAL(textChanged(const TQString&)),
+	  TQ_SLOT(changed()));
+  connect(customDialog->dontScale, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(customDialog->blackOnWhite, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(customDialog->whiteOnBlack, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(customDialog->customColor, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(customDialog->foregroundColor, TQ_SIGNAL(changed(const TQColor &)),
+	  TQ_SLOT(changed()));
+  connect(customDialog->backgroundColor, TQ_SIGNAL(changed(const TQColor &)),
+	  TQ_SLOT(changed()));
+  connect(customDialog->fontFamily, TQ_SIGNAL(highlighted(int)),
+	  TQ_SLOT(changed()));
+  connect(customDialog->fontFamily, TQ_SIGNAL(textChanged(const TQString&)),
+	  TQ_SLOT(changed()));
+  connect(customDialog->sameFamily, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(customDialog->preview, TQ_SIGNAL(clicked()),
+          TQ_SLOT(slotPreview()));
+  connect(customDialog->sameColor, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(customDialog->hideImages, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(customDialog->hideBackground, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
 
   TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, 0);
   vbox->addWidget(configDialog);
@@ -342,13 +342,13 @@ void CSSConfig::slotPreview()
 
   if (customDialog->blackOnWhite->isChecked())
     {
-      back = Qt::white;
-      fore = Qt::black;
+      back = TQt::white;
+      fore = TQt::black;
     }
   else if (customDialog->whiteOnBlack->isChecked())
     {
-      back = Qt::black;
-      fore = Qt::white;
+      back = TQt::black;
+      fore = TQt::white;
     }
   else
     {
diff --git a/kcontrol/css/kcmcss.h b/kcontrol/css/kcmcss.h
index da93fcdf5..b1b944416 100644
--- a/kcontrol/css/kcmcss.h
+++ b/kcontrol/css/kcmcss.h
@@ -31,7 +31,7 @@ class KDialogBase;
 
 class CSSConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 	  
diff --git a/kcontrol/display/display.cpp b/kcontrol/display/display.cpp
index b3e15d021..30e940550 100644
--- a/kcontrol/display/display.cpp
+++ b/kcontrol/display/display.cpp
@@ -63,7 +63,7 @@ void KCMDisplay::addTab( const TQString &name, const TQString &label )
     top->addWidget( kcm );
     m_tabs->addTab( page, label );
 
-    connect( kcm, TQT_SIGNAL( changed(bool) ), TQT_SLOT( moduleChanged(bool) ) );
+    connect( kcm, TQ_SIGNAL( changed(bool) ), TQ_SLOT( moduleChanged(bool) ) );
     m_modules.insert(kcm, false);
   }
   else
@@ -85,7 +85,7 @@ void KCMDisplay::save()
 
 void KCMDisplay::moduleChanged( bool isChanged )
 {
-  TQMap<TDECModule*, bool>::Iterator currentModule = m_modules.find(static_cast<TDECModule*>(TQT_TQWIDGET(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())))));
+  TQMap<TDECModule*, bool>::Iterator currentModule = m_modules.find(static_cast<TDECModule*>(const_cast<TQObject*>(sender())));
   Q_ASSERT(currentModule != m_modules.end());
   if (currentModule.data() == isChanged)
     return;
diff --git a/kcontrol/display/display.h b/kcontrol/display/display.h
index 42373a42f..84b30c79e 100644
--- a/kcontrol/display/display.h
+++ b/kcontrol/display/display.h
@@ -26,7 +26,7 @@ class TQTabWidget;
 
 class KCMDisplay : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KCMDisplay( TQWidget *parent, const char *name, const TQStringList& );
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 4c96fabf1..af1744692 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -434,8 +434,8 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id,
 	monitors = base->monitorPhyArrange->childrenListObject();
 	if ( monitors.count() ) {
 		for ( i = 0; i < int(monitors.count()); ++i ) {
-			if (::tqqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
-				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+			if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
 				if (monitor->screen_id == monitor_id) {
 					moved_monitor = monitor;
 					screendata = m_screenInfoArray[activeProfileName].at(moved_monitor->screen_id);
@@ -475,8 +475,8 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id,
 	primary_monitor = NULL;
 	if ( monitors.count() ) {
 		for ( i = 0; i < int(monitors.count()); ++i ) {
-			if (::tqqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
-				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+			if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
 				if (monitor->screen_id == j) {
 					monitor->is_primary = true;	// Prevent dragging of the primary monitor
 					primary_monitor = monitor;
@@ -548,8 +548,8 @@ bool KDisplayConfig::applyMonitorLayoutRules(DraggableMonitor* monitor_to_move)
 	monitors = base->monitorPhyArrange->childrenListObject();
 	if ( monitors.count() ) {
 		for ( i = 0; i < int(monitors.count()); ++i ) {
-			if (::tqqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
-				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+			if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
 				if (monitor != monitor_to_move) {
 					other_monitors = other_monitors.unite(MonitorRegion(monitor->geometry()));
 				}
@@ -592,8 +592,8 @@ bool KDisplayConfig::applyMonitorLayoutRules(DraggableMonitor* monitor_to_move)
 			monitors = base->monitorPhyArrange->childrenListObject();
 			if ( monitors.count() ) {
 				for ( i = 0; i < int(monitors.count()); ++i ) {
-					if (::tqqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
-						DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+					if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+						DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
 						if (monitor != monitor_to_move) {
 							other_monitors2 = other_monitors2.unite(MonitorRegion(monitor->geometry()));
 						}
@@ -641,8 +641,8 @@ void KDisplayConfig::moveMonitor(DraggableMonitor* monitor, int realx, int realy
 	primary_monitor = NULL;
 	if ( monitors.count() ) {
 		for ( i = 0; i < int(monitors.count()); ++i ) {
-			if (::tqqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
-				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+			if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
 				if (monitor->screen_id == j) {
 					monitor->is_primary = true;	// Prevent dragging of the primary monitor
 					primary_monitor = monitor;
@@ -745,7 +745,7 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin
 {
 #ifdef WITH_TDEHWLIB
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*)));
 #endif
 
 	m_randrsimple = new KRandrSimpleAPI();
@@ -769,7 +769,7 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin
 	setAboutData( about );
 
 	m_gammaApplyTimer = new TQTimer();
-	connect(m_gammaApplyTimer, SIGNAL(timeout()), this, SLOT(applyGamma()));
+	connect(m_gammaApplyTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(applyGamma()));
 
 	base = new DisplayConfigBase(this);
 	profileRulesGrid = new TQGridLayout(base->profileRulesGridWidget, 1, 1, KDialog::marginHint());
@@ -792,54 +792,54 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin
 		base->nonRootWarningLabel->hide();
 	}
 
-	connect(base->systemEnableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-	connect(base->systemEnableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(processLockoutControls()));
-	connect(base->addProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addProfile()));
-	connect(base->renameProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(renameProfile()));
-	connect(base->deleteProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteProfile()));
-	connect(base->activateProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateProfile()));
-	connect(base->reloadProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reloadProfileFromDisk()));
-	connect(base->saveProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveProfile()));
-	connect(base->systemEnableStartupProfile, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-	connect(base->systemEnableStartupProfile, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockoutControls()));
-	connect(base->startupDisplayProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()));
-	connect(base->startupDisplayProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectDefaultProfile(int)));
-	connect(base->displayProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectProfile(int)));
-
-	connect(base->monitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-	connect(base->gammamonitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-	connect(base->gammaTargetSelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(gammaTargetChanged(int)));
-	connect(base->rotationSelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(rotationInfoChanged()));
-	connect(base->refreshRateDD, TQT_SIGNAL(activated(int)), TQT_SLOT(refreshInfoChanged()));
-	connect(base->orientationHFlip, TQT_SIGNAL(clicked()), TQT_SLOT(rotationInfoChanged()));
-	connect(base->orientationVFlip, TQT_SIGNAL(clicked()), TQT_SLOT(rotationInfoChanged()));
-	connect(base->resolutionSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resolutionSliderChanged(int)));
-	connect(base->gammaAllSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaAllSliderChanged(int)));
-	connect(base->gammaRedSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaRedSliderChanged(int)));
-	connect(base->gammaGreenSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaGreenSliderChanged(int)));
-	connect(base->gammaBlueSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaBlueSliderChanged(int)));
-	connect(base->monitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(selectScreen(int)));
-	connect(base->gammamonitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(gammaselectScreen(int)));
-	connect(base->systemEnableDPMS, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged()));
-	connect(base->systemEnableDPMSStandby, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged()));
-	connect(base->systemEnableDPMSSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged()));
-	connect(base->systemEnableDPMSPowerDown, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged()));
-	connect(base->dpmsStandbyTimeout, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dpmsChanged()));
-	connect(base->dpmsSuspendTimeout, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dpmsChanged()));
-	connect(base->dpmsPowerDownTimeout, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dpmsChanged()));
-	connect(base->monitorPhyArrange, TQT_SIGNAL(workspaceRelayoutNeeded()), this, TQT_SLOT(layoutDragDropDisplay()));
-
-	connect(base->isPrimaryMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-	connect(base->isPrimaryMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(ensurePrimaryMonitorIsAvailable()));
-	connect(base->isExtendedMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-	connect(base->isExtendedMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(updateExtendedMonitorInformation()));
-
-	connect(base->systemEnableSupport, TQT_SIGNAL(toggled(bool)), base->monitorDisplaySelectDD, TQT_SLOT(setEnabled(bool)));
-
-	connect(base->rescanHardware, TQT_SIGNAL(clicked()), TQT_SLOT(rescanHardware()));
-	connect(base->loadExistingProfile, TQT_SIGNAL(clicked()), TQT_SLOT(reloadProfile()));
-	connect(base->previewConfiguration, TQT_SIGNAL(clicked()), TQT_SLOT(activatePreview()));
-	connect(base->identifyMonitors, TQT_SIGNAL(clicked()), TQT_SLOT(identifyMonitors()));
+	connect(base->systemEnableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+	connect(base->systemEnableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(processLockoutControls()));
+	connect(base->addProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addProfile()));
+	connect(base->renameProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(renameProfile()));
+	connect(base->deleteProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteProfile()));
+	connect(base->activateProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateProfile()));
+	connect(base->reloadProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reloadProfileFromDisk()));
+	connect(base->saveProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveProfile()));
+	connect(base->systemEnableStartupProfile, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+	connect(base->systemEnableStartupProfile, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockoutControls()));
+	connect(base->startupDisplayProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
+	connect(base->startupDisplayProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectDefaultProfile(int)));
+	connect(base->displayProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectProfile(int)));
+
+	connect(base->monitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
+	connect(base->gammamonitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
+	connect(base->gammaTargetSelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(gammaTargetChanged(int)));
+	connect(base->rotationSelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(rotationInfoChanged()));
+	connect(base->refreshRateDD, TQ_SIGNAL(activated(int)), TQ_SLOT(refreshInfoChanged()));
+	connect(base->orientationHFlip, TQ_SIGNAL(clicked()), TQ_SLOT(rotationInfoChanged()));
+	connect(base->orientationVFlip, TQ_SIGNAL(clicked()), TQ_SLOT(rotationInfoChanged()));
+	connect(base->resolutionSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resolutionSliderChanged(int)));
+	connect(base->gammaAllSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaAllSliderChanged(int)));
+	connect(base->gammaRedSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaRedSliderChanged(int)));
+	connect(base->gammaGreenSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaGreenSliderChanged(int)));
+	connect(base->gammaBlueSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaBlueSliderChanged(int)));
+	connect(base->monitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(selectScreen(int)));
+	connect(base->gammamonitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(gammaselectScreen(int)));
+	connect(base->systemEnableDPMS, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged()));
+	connect(base->systemEnableDPMSStandby, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged()));
+	connect(base->systemEnableDPMSSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged()));
+	connect(base->systemEnableDPMSPowerDown, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged()));
+	connect(base->dpmsStandbyTimeout, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dpmsChanged()));
+	connect(base->dpmsSuspendTimeout, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dpmsChanged()));
+	connect(base->dpmsPowerDownTimeout, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dpmsChanged()));
+	connect(base->monitorPhyArrange, TQ_SIGNAL(workspaceRelayoutNeeded()), this, TQ_SLOT(layoutDragDropDisplay()));
+
+	connect(base->isPrimaryMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+	connect(base->isPrimaryMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(ensurePrimaryMonitorIsAvailable()));
+	connect(base->isExtendedMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+	connect(base->isExtendedMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(updateExtendedMonitorInformation()));
+
+	connect(base->systemEnableSupport, TQ_SIGNAL(toggled(bool)), base->monitorDisplaySelectDD, TQ_SLOT(setEnabled(bool)));
+
+	connect(base->rescanHardware, TQ_SIGNAL(clicked()), TQ_SLOT(rescanHardware()));
+	connect(base->loadExistingProfile, TQ_SIGNAL(clicked()), TQ_SLOT(reloadProfile()));
+	connect(base->previewConfiguration, TQ_SIGNAL(clicked()), TQ_SLOT(activatePreview()));
+	connect(base->identifyMonitors, TQ_SIGNAL(clicked()), TQ_SLOT(identifyMonitors()));
 
 	load();
 
@@ -914,19 +914,19 @@ void KDisplayConfig::identifyMonitors () {
 		if (!randr_screen_info->outputs[i]->cur_crtc) {
 			continue;
 		}
-		idWidget = new TQLabel(TQString("Screen\n%1").arg(i+1), (TQWidget*)0, "", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop | Qt::WX11BypassWM | Qt::WDestructiveClose);
+		idWidget = new TQLabel(TQString("Screen\n%1").arg(i+1), (TQWidget*)0, "", TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop | TQt::WX11BypassWM | TQt::WDestructiveClose);
 		widgetList.append(idWidget);
 		idWidget->resize(150, 100);
-		idWidget->setAlignment(Qt::AlignCenter);
+		idWidget->setAlignment(TQt::AlignCenter);
 		TQFont font = idWidget->font();
 		font.setBold( true );
 		font.setPointSize(24);
 		idWidget->setFont( font );
-		idWidget->setPaletteForegroundColor(Qt::white);
-		idWidget->setPaletteBackgroundColor(Qt::black);
+		idWidget->setPaletteForegroundColor(TQt::white);
+		idWidget->setPaletteBackgroundColor(TQt::black);
 		idWidget->show();
 		KDialog::centerOnScreen(idWidget, i);
-		TQTimer::singleShot(3000, idWidget, SLOT(close()));
+		TQTimer::singleShot(3000, idWidget, TQ_SLOT(close()));
 	}
 
 	m_randrsimple->freeScreenInfoStructure(randr_screen_info);
@@ -1329,8 +1329,8 @@ void KDisplayConfig::updateDragDropDisplay() {
 	monitors = base->monitorPhyArrange->childrenListObject();
 	if ( monitors.count() ) {
 		for ( i = 0; i < int(monitors.count()); ++i ) {
-			if (::tqqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
-				TQWidget *monitor = TQT_TQWIDGET(monitors.at( i ));
+			if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+				TQWidget *monitor = static_cast<TQWidget*>(monitors.at( i ));
 				if ( !monitor->close(TRUE) ) {
 					Q_ASSERT("zombie monitor will not go away!");
 				}
@@ -1349,9 +1349,9 @@ void KDisplayConfig::updateDragDropDisplay() {
 			if (((j==0) && (screendata->is_primary==true)) || ((j==1) && (screendata->is_primary==false))) {	// This ensures that the primary monitor is always the first one created and placed on the configuration widget
 				bool isvisiblyrotated = ((screendata->current_rotation_index == ROTATION_90_DEGREES_INDEX) || (screendata->current_rotation_index == ROTATION_270_DEGREES_INDEX));
 				DraggableMonitor *m = new DraggableMonitor( base->monitorPhyArrange, 0, WStyle_Customize | WDestructiveClose | WStyle_NoBorder | WX11BypassWM );
-				connect(m, TQT_SIGNAL(workspaceRelayoutNeeded()), this, TQT_SLOT(layoutDragDropDisplay()));
-				connect(m, TQT_SIGNAL(monitorSelected(int)), this, TQT_SLOT(selectScreen(int)));
-				connect(m, TQT_SIGNAL(monitorDragComplete(int)), this, TQT_SLOT(updateDraggableMonitorInformation(int)));
+				connect(m, TQ_SIGNAL(workspaceRelayoutNeeded()), this, TQ_SLOT(layoutDragDropDisplay()));
+				connect(m, TQ_SIGNAL(monitorSelected(int)), this, TQ_SLOT(selectScreen(int)));
+				connect(m, TQ_SIGNAL(monitorDragComplete(int)), this, TQ_SLOT(updateDraggableMonitorInformation(int)));
 				m->screen_id = i;
 				if (isvisiblyrotated)
 					m->setFixedSize(screendata->current_y_pixel_count*base->monitorPhyArrange->resize_factor, screendata->current_x_pixel_count*base->monitorPhyArrange->resize_factor);
@@ -1381,8 +1381,8 @@ void KDisplayConfig::layoutDragDropDisplay() {
 	monitors = base->monitorPhyArrange->childrenListObject();
 	if ( monitors.count() ) {
 		for ( i = 0; i < int(monitors.count()); ++i ) {
-			if (::tqqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
-				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+			if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
 				screendata = m_screenInfoArray[activeProfileName].at(monitor->screen_id);
 				moveMonitor(monitor, screendata->absolute_x_position, screendata->absolute_y_position);
 			}
@@ -1670,8 +1670,8 @@ void KDisplayConfig::createHotplugRulesGrid() {
 			int index = (*it2).outputs.findIndex(m_hardwareScreenInfoArray.at(j)->screenUniqueName);
 
 			TQCheckBox* cb = new TQCheckBox(base->profileRulesGridWidget, (TQString("%1:%2").arg(i).arg(j)).ascii());
-			connect(cb, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(profileRuleCheckBoxStateChanged(int)));
-			connect(cb, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
+			connect(cb, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(profileRuleCheckBoxStateChanged(int)));
+			connect(cb, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()));
 			cb->setTristate(true);
 			if (index < 0) {
 				cb->setNoChange();
@@ -1693,7 +1693,7 @@ void KDisplayConfig::createHotplugRulesGrid() {
 			cb->show();
 		}
 		KComboBox* combo = new KComboBox(base->profileRulesGridWidget, (TQString("%1").arg(i)).ascii());
-		connect(combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()));
+		connect(combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
 		combo->insertItem(i18n("<default>"));
 		for (TQStringList::Iterator it3 = availableProfileNames.begin(); it3 != availableProfileNames.end(); ++it3) {
 			combo->insertItem(*it3);
@@ -1703,8 +1703,8 @@ void KDisplayConfig::createHotplugRulesGrid() {
 		combo->show();
 		TQPushButton* button = new TQPushButton(base->profileRulesGridWidget, (TQString("%1").arg(i)).ascii());
 		button->setText(i18n("Delete Rule"));
-		connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteProfileRule()));
-		connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+		connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteProfileRule()));
+		connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 		profileRulesGrid->addWidget(button, i+1, j+2);
 		button->show();
 		i++;
@@ -1712,8 +1712,8 @@ void KDisplayConfig::createHotplugRulesGrid() {
 
 	TQPushButton* button = new TQPushButton(base->profileRulesGridWidget);
 	button->setText(i18n("Add New Rule"));
-	connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewProfileRule()));
-	connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+	connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewProfileRule()));
+	connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 	profileRulesGrid->addMultiCellWidget(button, i+2, i+2, 0, numberOfScreens+2);
 	button->show();
 }
@@ -1921,7 +1921,7 @@ TDECModule* KDisplayConfig::addTab( const TQString name, const TQString label )
 		top->addWidget( kcm );
 		base->mainTabContainerWidget->addTab( page, label );
 
-		connect( kcm, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( changed() ) );
+		connect( kcm, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( changed() ) );
 		//m_modules.insert(kcm, false);
 		return kcm;
 	}
@@ -2020,7 +2020,7 @@ void KDisplayConfig::save()
 	else {
 		// Signal that settings were NOT applied
 		TQTimer *t = new TQTimer( this );
-		connect(t, SIGNAL(timeout()), SLOT(changed()) );
+		connect(t, TQ_SIGNAL(timeout()), TQ_SLOT(changed()) );
 		t->start( 100, FALSE );
 	}
 }
diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h
index 8ce466daa..259c31391 100644
--- a/kcontrol/displayconfig/displayconfig.h
+++ b/kcontrol/displayconfig/displayconfig.h
@@ -50,7 +50,7 @@ typedef TQMap< TQString, TQPtrList< SingleScreenData > > ScreenConfigurationMap;
 class KDisplayConfig : public TDECModule, public DCOPObject
 {
   K_DCOP
-  Q_OBJECT
+  TQ_OBJECT
 
 
 public:
diff --git a/kcontrol/displayconfig/displayconfigbase.ui b/kcontrol/displayconfig/displayconfigbase.ui
index edd6a2328..0595d65aa 100644
--- a/kcontrol/displayconfig/displayconfigbase.ui
+++ b/kcontrol/displayconfig/displayconfigbase.ui
@@ -913,9 +913,9 @@
 <includes>
 	<include location="local" impldecl="in implementation">DisplayConfigBase.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>enableSupport_toggled(bool)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">kcombobox.h</include>
diff --git a/kcontrol/displayconfig/monitorworkspace.h b/kcontrol/displayconfig/monitorworkspace.h
index 8384d090b..10df2378a 100644
--- a/kcontrol/displayconfig/monitorworkspace.h
+++ b/kcontrol/displayconfig/monitorworkspace.h
@@ -50,7 +50,7 @@ private:
 
 class DraggableMonitor: public TQLabel
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 public:
 	DraggableMonitor( TQWidget* parent, const char* name, int wflags );
@@ -77,7 +77,7 @@ private:
 
 class MonitorWorkspace : public TQWorkspace
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 public:
 	MonitorWorkspace( TQWidget* parent, const char* name );
diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui
index 4a2ac2809..ce03182e0 100644
--- a/kcontrol/dnssd/configdialog.ui
+++ b/kcontrol/dnssd/configdialog.ui
@@ -84,9 +84,6 @@
                             <property name="text">
                                 <string>&amp;Wide area network</string>
                             </property>
-                            <property name="accel">
-                                <string>Alt+W</string>
-                            </property>
                             <property name="whatsThis" stdset="0">
                                 <string>Advertise services on Internet domain using public IP. To have this option working you need to configure wide area operation in using administrator mode</string>
                             </property>
@@ -106,9 +103,6 @@
                             <property name="text">
                                 <string>Loc&amp;al network</string>
                             </property>
-                            <property name="accel">
-                                <string>Alt+A</string>
-                            </property>
                             <property name="checked">
                                 <bool>false</bool>
                             </property>
@@ -124,9 +118,6 @@
                         <property name="text">
                             <string>Browse local networ&amp;k</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+K</string>
-                        </property>
                         <property name="whatsThis" stdset="0">
                             <string>Browse local network (domain .local) using multicast DNS.</string>
                         </property>
@@ -138,9 +129,6 @@
                         <property name="text">
                             <string>Enable &amp;Zeroconf network browsing</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+Z</string>
-                        </property>
                         <property name="whatsThis" stdset="0">
                             <string>Browse local network (domain .local) using multicast DNS.</string>
                         </property>
@@ -312,9 +300,9 @@ is configured with 'Browse local network' option above.</string>
         </widget>
     </grid>
 </widget>
-<Q_SLOTS>
+<slots>
     <slot>radioButton2_2_toggled(bool)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in declaration">tdecmodule.h</include>
     <include location="global" impldecl="in implementation">keditlistbox.h</include>
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index d1fe3269c..08ca18e95 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -68,10 +68,10 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
 	domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdednssdrc" ));
 	domain->setGroup("publishing");
 	load();
-	connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));
-	connect(secretedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));
-	connect(domainedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));
-	connect(enableZeroconf,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableZeroconfChanged(bool)));
+	connect(hostedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged()));
+	connect(secretedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged()));
+	connect(domainedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged()));
+	connect(enableZeroconf,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableZeroconfChanged(bool)));
 	m_enableZeroconfChanged=false;
 	if (DNSSD::Configuration::self()->publishDomain().isEmpty()) WANButton->setEnabled(false);
 	kcfg_PublishType->hide(); //unused with Avahi
@@ -84,7 +84,7 @@ KCMDnssd::~KCMDnssd()
 
 void KCMDnssd::save()
 {
-	setCursor(TQCursor(Qt::BusyCursor));
+	setCursor(TQCursor(TQt::BusyCursor));
 	TDECModule::save();
 	if (geteuid()==0 && m_wdchanged) saveMdnsd(); 
 	domain->setFileWriteMode(0644); // this should be readable for everyone
@@ -112,14 +112,14 @@ void KCMDnssd::save()
 	    proc->start(TDEProcess::Block);
 	  }
 	}
-	setCursor(TQCursor(Qt::ArrowCursor));
+	setCursor(TQCursor(TQt::ArrowCursor));
 }
 
 void KCMDnssd::load()
 {
 	if (geteuid()==0) loadMdnsd();
 	enableZeroconf->setChecked(false);
-	TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), TQT_TQOBJECT(this), "avahiStatus");
+	TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus");
 	avahiStatus.start();
 	while (avahiStatus.isRunning()) {
 	  kapp->processEvents();
diff --git a/kcontrol/dnssd/kcmdnssd.h b/kcontrol/dnssd/kcmdnssd.h
index b408ca3f6..03699af04 100644
--- a/kcontrol/dnssd/kcmdnssd.h
+++ b/kcontrol/dnssd/kcmdnssd.h
@@ -29,7 +29,7 @@
 class KSimpleConfig;
 class KCMDnssd: public ConfigDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KCMDnssd( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() );
diff --git a/kcontrol/ebrowsing/filteropts.h b/kcontrol/ebrowsing/filteropts.h
index 3ea140ffc..ccc26cc91 100644
--- a/kcontrol/ebrowsing/filteropts.h
+++ b/kcontrol/ebrowsing/filteropts.h
@@ -29,7 +29,7 @@ class TQListBox;
 
 class FilterOptions : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     FilterOptions(TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/ebrowsing/main.cpp b/kcontrol/ebrowsing/main.cpp
index 9eeec46e1..f6117ed17 100644
--- a/kcontrol/ebrowsing/main.cpp
+++ b/kcontrol/ebrowsing/main.cpp
@@ -61,7 +61,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS
 #if 0
     opts = new FilterOptions(this);
     tab->addTab(opts, i18n("&Filters"));
-    connect(opts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+    connect(opts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 #endif
 
     modules.setAutoDelete(true);
@@ -75,7 +75,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS
         {
             modules.append(module);
             helper.insert(it.current()->configName(), module);
-            connect(module, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+            connect(module, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
         }
     }
 
diff --git a/kcontrol/ebrowsing/main.h b/kcontrol/ebrowsing/main.h
index 4234ffe3e..3b4b83985 100644
--- a/kcontrol/ebrowsing/main.h
+++ b/kcontrol/ebrowsing/main.h
@@ -30,7 +30,7 @@
 class KURIFilter;
 
 class KURIFilterModule : public TDECModule {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KURIFilterModule(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index eb96f682a..507af5993 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -147,35 +147,35 @@ void FilterOptions::load( bool useDefaults )
       m_dlg->lvSearchProviders->setSelected(m_dlg->lvSearchProviders->firstChild(), true);
 
     // Connect all the signals/slots...
-    connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this,
-            TQT_SLOT(setWebShortcutState()));
-    connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this,
-            TQT_SLOT(configChanged()));
-
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-           this, TQT_SLOT(updateSearchProvider()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
-           this, TQT_SLOT(changeSearchProvider()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(returnPressed(TQListViewItem *)),
-           this, TQT_SLOT(changeSearchProvider()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(executed(TQListViewItem *)),
-           this, TQT_SLOT(checkFavoritesChanged()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(spacePressed(TQListViewItem *)),
-           this, TQT_SLOT(checkFavoritesChanged()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(pressed(TQListViewItem *)),
-           this, TQT_SLOT(checkFavoritesChanged()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(clicked(TQListViewItem *)),
-           this, TQT_SLOT(checkFavoritesChanged()));
-
-
-    connect(m_dlg->cmbDefaultEngine, TQT_SIGNAL(activated(const TQString &)), this,
-            TQT_SLOT(configChanged()));
-    connect(m_dlg->cmbDelimiter, TQT_SIGNAL(activated(const TQString &)), this,
-            TQT_SLOT(configChanged()));
-
-    connect(m_dlg->pbNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(addSearchProvider()));
-    connect(m_dlg->pbChange, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeSearchProvider()));
-    connect(m_dlg->pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSearchProvider()));
+    connect(m_dlg->cbEnableShortcuts, TQ_SIGNAL(clicked()), this,
+            TQ_SLOT(setWebShortcutState()));
+    connect(m_dlg->cbEnableShortcuts, TQ_SIGNAL(clicked()), this,
+            TQ_SLOT(configChanged()));
+
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+           this, TQ_SLOT(updateSearchProvider()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+           this, TQ_SLOT(changeSearchProvider()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(returnPressed(TQListViewItem *)),
+           this, TQ_SLOT(changeSearchProvider()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(executed(TQListViewItem *)),
+           this, TQ_SLOT(checkFavoritesChanged()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(spacePressed(TQListViewItem *)),
+           this, TQ_SLOT(checkFavoritesChanged()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(pressed(TQListViewItem *)),
+           this, TQ_SLOT(checkFavoritesChanged()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(clicked(TQListViewItem *)),
+           this, TQ_SLOT(checkFavoritesChanged()));
+
+
+    connect(m_dlg->cmbDefaultEngine, TQ_SIGNAL(activated(const TQString &)), this,
+            TQ_SLOT(configChanged()));
+    connect(m_dlg->cmbDelimiter, TQ_SIGNAL(activated(const TQString &)), this,
+            TQ_SLOT(configChanged()));
+
+    connect(m_dlg->pbNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(addSearchProvider()));
+    connect(m_dlg->pbChange, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeSearchProvider()));
+    connect(m_dlg->pbDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSearchProvider()));
 
     emit changed( useDefaults );
 }
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
index be82459b6..661a3abb0 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
@@ -32,7 +32,7 @@ class SearchProviderItem;
 
 class FilterOptions : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     FilterOptions(TDEInstance *instance, TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h
index abf3fe255..add958f41 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h
@@ -32,7 +32,7 @@ class TDEInstance;
 class KAutoWebSearch : public KURIFilterPlugin, public DCOPObject
 {
     K_DCOP
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KAutoWebSearch(TQObject *parent = 0, const char *name = 0,
                    const TQStringList &args = TQStringList() );
diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
index f72d38340..2f2284e5a 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
+++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
@@ -31,7 +31,7 @@ class TDEInstance;
 
 class KURISearchFilter : public KURIFilterPlugin, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 public:
     KURISearchFilter(TQObject *parent = 0, const char *name = 0, 
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
index a1f6ca619..b6029cf36 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
@@ -45,9 +45,9 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider,
 
     m_dlg->leQuery->setMinimumWidth(kapp->fontMetrics().maxWidth() * 40);
 
-    connect(m_dlg->leName, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged()));
-    connect(m_dlg->leQuery, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged()));
-    connect(m_dlg->leShortcut, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged()));
+    connect(m_dlg->leName, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged()));
+    connect(m_dlg->leQuery, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged()));
+    connect(m_dlg->leShortcut, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged()));
 
     // Data init
     TQStringList charsets = TDEGlobal::charsets()->availableEncodingNames();
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h
index 2a23cbf05..a698ee626 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h
@@ -27,7 +27,7 @@ class SearchProviderDlgUI;
 
 class SearchProviderDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SearchProviderDialog(SearchProvider *provider, TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
index c2e3af8fa..0fb8b8149 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
@@ -84,8 +84,8 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const
 
         TDEProcess proc;
         proc << helper << host;
-        connect( &proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-                 TQT_SLOT(receiveOutput(TDEProcess *, char *, int)) );
+        connect( &proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+                 TQ_SLOT(receiveOutput(TDEProcess *, char *, int)) );
         if( !proc.start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ))
             return last_result = false;
 
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
index 9d0c5f26d..04274f601 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
@@ -41,7 +41,7 @@ class TDEProcess;
 class LocalDomainURIFilter : public KURIFilterPlugin, public DCOPObject
 {
   K_DCOP
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     LocalDomainURIFilter( TQObject* parent, const char* name, const TQStringList& args );
diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
index 1d48e7c2a..be2ba2fd9 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
+++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
@@ -40,7 +40,7 @@ class TDEInstance;
 class TDEShortURIFilter : public KURIFilterPlugin , public DCOPObject
 {
     K_DCOP
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     /**
diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp
index 34a9404a4..f967387e8 100644
--- a/kcontrol/energy/energy.cpp
+++ b/kcontrol/energy/energy.cpp
@@ -176,7 +176,7 @@ KEnergy::KEnergy(TQWidget *parent, const char *name)
         TDEGlobal::locale()->insertCatalogue("kpowersave");
         // ### these i18n strings need to be synced with kpowersave !!
         m_pCBEnable= new TQCheckBox(i18n("&Enable display power management" ), this);
-        connect(m_pCBEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeEnable(bool)));
+        connect(m_pCBEnable, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChangeEnable(bool)));
         hbox->addWidget(m_pCBEnable);
 
         TQWhatsThis::add( m_pCBEnable, i18n("Check this option to enable the"
@@ -198,7 +198,7 @@ KEnergy::KEnergy(TQWidget *parent, const char *name)
     logo->setPixmap(TQPixmap(locate("data", "kcontrol/pics/energybig.png")));
     logo->setTipText(i18n("Learn more about the Energy Star program"));
     logo->setUseTips(true); 
-connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(const TQString &)));
+connect(logo, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(openURL(const TQString &)));
 
     hbox->addStretch();
     hbox->addWidget(logo);
@@ -210,7 +210,7 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons
     m_pStandbySlider->setRange(0, 120, 10);
     m_pStandbySlider->setSuffix(i18n(" min"));
     m_pStandbySlider->setSpecialValueText(i18n("Disabled"));
-    connect(m_pStandbySlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeStandby(int)));
+    connect(m_pStandbySlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChangeStandby(int)));
     top->addWidget(m_pStandbySlider);
     TQWhatsThis::add( m_pStandbySlider, i18n("Choose the period of inactivity"
        " after which the display should enter \"standby\" mode. This is the"
@@ -221,7 +221,7 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons
     m_pSuspendSlider->setRange(0, 120, 10);
     m_pSuspendSlider->setSuffix(i18n(" min"));
     m_pSuspendSlider->setSpecialValueText(i18n("Disabled"));
-    connect(m_pSuspendSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeSuspend(int)));
+    connect(m_pSuspendSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChangeSuspend(int)));
     top->addWidget(m_pSuspendSlider);
     TQWhatsThis::add( m_pSuspendSlider, i18n("Choose the period of inactivity"
        " after which the display should enter \"suspend\" mode. This is the"
@@ -233,7 +233,7 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons
     m_pOffSlider->setRange(0, 120, 10);
     m_pOffSlider->setSuffix(i18n(" min"));
     m_pOffSlider->setSpecialValueText(i18n("Disabled"));
-    connect(m_pOffSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeOff(int)));
+    connect(m_pOffSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChangeOff(int)));
     top->addWidget(m_pOffSlider);
     TQWhatsThis::add( m_pOffSlider, i18n("Choose the period of inactivity"
        " after which the display should be powered off. This is the"
@@ -247,13 +247,13 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons
         if(m_bKPowersave) {
             TQPushButton* btnKPowersave = new TQPushButton(this);
             btnKPowersave->setText(i18n("Configure KPowersave..."));
-            connect(btnKPowersave, TQT_SIGNAL(clicked()), TQT_SLOT(slotLaunchKPowersave()));
+            connect(btnKPowersave, TQ_SIGNAL(clicked()), TQ_SLOT(slotLaunchKPowersave()));
             top->addWidget(btnKPowersave);
         }
         if(m_bTDEPowersave) {
             TQPushButton* btnTDEPowersave = new TQPushButton(this);
             btnTDEPowersave->setText(i18n("Configure TDEPowersave..."));
-            connect(btnTDEPowersave, TQT_SIGNAL(clicked()), TQT_SLOT(slotLaunchTDEPowersave()));
+            connect(btnTDEPowersave, TQ_SIGNAL(clicked()), TQ_SLOT(slotLaunchTDEPowersave()));
             top->addWidget(btnTDEPowersave);
 		}
     }
diff --git a/kcontrol/energy/energy.h b/kcontrol/energy/energy.h
index d81810674..c49b12b9c 100644
--- a/kcontrol/energy/energy.h
+++ b/kcontrol/energy/energy.h
@@ -25,7 +25,7 @@ extern "C" void init_energy();
  */
 class KEnergy: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KEnergy(TQWidget *parent, const char *name);
diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp
index 7000a97e5..e9cb1fbf9 100644
--- a/kcontrol/filetypes/filegroupdetails.cpp
+++ b/kcontrol/filetypes/filegroupdetails.cpp
@@ -37,7 +37,7 @@ FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name )
   // The order of those two items is very important. If you change it, fix typeslistitem.cpp !
   new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
   new TQRadioButton( i18n("Show file in separate viewer"), m_autoEmbed );
-  connect(m_autoEmbed, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotAutoEmbedClicked( int ) ));
+  connect(m_autoEmbed, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotAutoEmbedClicked( int ) ));
 
   TQWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager"
     " will do when you click on a file belonging to this group. Konqueror can display the file in"
diff --git a/kcontrol/filetypes/filegroupdetails.h b/kcontrol/filetypes/filegroupdetails.h
index 6563c5ed1..e5eb2d225 100644
--- a/kcontrol/filetypes/filegroupdetails.h
+++ b/kcontrol/filetypes/filegroupdetails.h
@@ -28,7 +28,7 @@ class TQButtonGroup;
  */
 class FileGroupDetails : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   FileGroupDetails(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp
index c4f3ce7bb..7928cef73 100644
--- a/kcontrol/filetypes/filetypedetails.cpp
+++ b/kcontrol/filetypes/filetypedetails.cpp
@@ -30,7 +30,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
 
   iconButton = new TDEIconButton(firstWidget);
   iconButton->setIconType(TDEIcon::Desktop, TDEIcon::MimeType);
-  connect(iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(updateIcon(TQString)));
+  connect(iconButton, TQ_SIGNAL(iconChanged(TQString)), TQ_SLOT(updateIcon(TQString)));
 
   iconButton->setFixedSize(70, 70);
   hBox->addWidget(iconButton);
@@ -46,7 +46,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
   grid->addRowSpacing(0, fontMetrics().lineSpacing());
 
   extensionLB = new TQListBox(gb);
-  connect(extensionLB, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableExtButtons(int)));
+  connect(extensionLB, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableExtButtons(int)));
   grid->addMultiCellWidget(extensionLB, 1, 2, 0, 0);
   grid->setRowStretch(0, 0);
   grid->setRowStretch(1, 1);
@@ -59,16 +59,16 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
 
   addExtButton = new TQPushButton(i18n("Add..."), gb);
   addExtButton->setEnabled(false);
-  connect(addExtButton, TQT_SIGNAL(clicked()),
-          this, TQT_SLOT(addExtension()));
+  connect(addExtButton, TQ_SIGNAL(clicked()),
+          this, TQ_SLOT(addExtension()));
   grid->addWidget(addExtButton, 1, 1);
 
   TQWhatsThis::add( addExtButton, i18n("Add a new pattern for the selected file type.") );
 
   removeExtButton = new TQPushButton(i18n("Remove"), gb);
   removeExtButton->setEnabled(false);
-  connect(removeExtButton, TQT_SIGNAL(clicked()),
-          this, TQT_SLOT(removeExtension()));
+  connect(removeExtButton, TQ_SIGNAL(clicked()),
+          this, TQ_SLOT(removeExtension()));
   grid->addWidget(removeExtButton, 2, 1);
 
   TQWhatsThis::add( removeExtButton, i18n("Remove the selected filename pattern.") );
@@ -76,10 +76,10 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
   gb = new TQGroupBox(i18n("Description"), firstWidget);
   firstLayout->addWidget(gb);
 
-  gb->setColumnLayout(1, Qt::Horizontal);
+  gb->setColumnLayout(1, TQt::Horizontal);
   description = new KLineEdit(gb);
-  connect(description, TQT_SIGNAL(textChanged(const TQString &)),
-          TQT_SLOT(updateDescription(const TQString &)));
+  connect(description, TQ_SIGNAL(textChanged(const TQString &)),
+          TQ_SLOT(updateDescription(const TQString &)));
 
   wtstr = i18n("You can enter a short description for files of the selected"
     " file type (e.g. 'HTML Page'). This description will be used by applications"
@@ -88,7 +88,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
   TQWhatsThis::add( description, wtstr );
 
   serviceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_APPLICATIONS, firstWidget );
-  connect( serviceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+  connect( serviceListWidget, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
   firstLayout->addWidget(serviceListWidget, 5);
 
   // Second tab - Embedding
@@ -106,10 +106,10 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
   new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
   new TQRadioButton( i18n("Show file in separate viewer"), m_autoEmbed );
   m_rbGroupSettings = new TQRadioButton( i18n("Use settings for '%1' group"), m_autoEmbed );
-  connect(m_autoEmbed, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotAutoEmbedClicked( int ) ));
+  connect(m_autoEmbed, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotAutoEmbedClicked( int ) ));
 
   m_chkAskSave = new TQCheckBox( i18n("Ask whether to save to disk instead"), m_autoEmbed);
-  connect(m_chkAskSave, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAskSaveToggled(bool) ));
+  connect(m_chkAskSave, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotAskSaveToggled(bool) ));
 
   TQWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager"
     " will do when you click on a file of this type. Konqueror can display the file in"
@@ -121,7 +121,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
 
   embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget );
   embedServiceListWidget->setMinimumHeight( serviceListWidget->sizeHint().height() );
-  connect( embedServiceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+  connect( embedServiceListWidget, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
   secondLayout->addWidget(embedServiceListWidget, 3);
 
   addTab( firstWidget, i18n("&General") );
diff --git a/kcontrol/filetypes/filetypedetails.h b/kcontrol/filetypes/filetypedetails.h
index 936e1c535..23c8c63b6 100644
--- a/kcontrol/filetypes/filetypedetails.h
+++ b/kcontrol/filetypes/filetypedetails.h
@@ -20,7 +20,7 @@ class KServiceListWidget;
  */
 class FileTypeDetails : public TQTabWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   FileTypeDetails(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index 58bbbbd09..43b53540a 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -57,7 +57,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
   leftLayout->setSpacing( KDialog::spacingHint() );
   leftLayout->setColStretch(1, 1);
 
-  l->addLayout( TQT_TQLAYOUT(leftLayout) );
+  l->addLayout( leftLayout );
 
   TQLabel *patternFilterLBL = new TQLabel(i18n("F&ind filename pattern:"), this);
   leftLayout->addMultiCellWidget(patternFilterLBL, 0, 0, 0, 2);
@@ -66,8 +66,8 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
   patternFilterLBL->setBuddy( patternFilterLE );
   leftLayout->addMultiCellWidget(patternFilterLE, 1, 1, 0, 2);
 
-  connect(patternFilterLE, TQT_SIGNAL(textChanged(const TQString &)),
-          this, TQT_SLOT(slotFilter(const TQString &)));
+  connect(patternFilterLE, TQ_SIGNAL(textChanged(const TQString &)),
+          this, TQ_SLOT(slotFilter(const TQString &)));
 
   wtstr = i18n("Enter a part of a filename pattern. Only file types with a "
                "matching file pattern will appear in the list.");
@@ -81,10 +81,10 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
 
   typesLV->addColumn(i18n("Known Types"));
   leftLayout->addMultiCellWidget(typesLV, 2, 2, 0, 2);
-  connect(typesLV, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-          this, TQT_SLOT(updateDisplay(TQListViewItem *)));
-  connect(typesLV, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
-          this, TQT_SLOT(slotDoubleClicked(TQListViewItem *)));
+  connect(typesLV, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+          this, TQ_SLOT(updateDisplay(TQListViewItem *)));
+  connect(typesLV, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+          this, TQ_SLOT(slotDoubleClicked(TQListViewItem *)));
 
   TQWhatsThis::add( typesLV, i18n("Here you can see a hierarchical list of"
     " the file types which are known on your system. Click on the '+' sign"
@@ -93,13 +93,13 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
     " file type using the controls on the right.") );
 
   TQPushButton *addTypeB = new TQPushButton(i18n("Add..."), this);
-  connect(addTypeB, TQT_SIGNAL(clicked()), TQT_SLOT(addType()));
+  connect(addTypeB, TQ_SIGNAL(clicked()), TQ_SLOT(addType()));
   leftLayout->addWidget(addTypeB, 3, 0);
 
   TQWhatsThis::add( addTypeB, i18n("Click here to add a new file type.") );
 
   m_removeTypeB = new TQPushButton(i18n("&Remove"), this);
-  connect(m_removeTypeB, TQT_SIGNAL(clicked()), TQT_SLOT(removeType()));
+  connect(m_removeTypeB, TQ_SIGNAL(clicked()), TQ_SLOT(removeType()));
   leftLayout->addWidget(m_removeTypeB, 3, 2);
   m_removeTypeB->setEnabled(false);
 
@@ -112,16 +112,16 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
 
   // File Type Details
   m_details = new FileTypeDetails( m_widgetStack );
-  connect( m_details, TQT_SIGNAL( changed(bool) ),
-           this, TQT_SLOT( setDirty(bool) ) );
-  connect( m_details, TQT_SIGNAL( embedMajor(const TQString &, bool &) ),
-           this, TQT_SLOT( slotEmbedMajor(const TQString &, bool &)));
+  connect( m_details, TQ_SIGNAL( changed(bool) ),
+           this, TQ_SLOT( setDirty(bool) ) );
+  connect( m_details, TQ_SIGNAL( embedMajor(const TQString &, bool &) ),
+           this, TQ_SLOT( slotEmbedMajor(const TQString &, bool &)));
   m_widgetStack->addWidget( m_details, 1 /*id*/ );
 
   // File Group Details
   m_groupDetails = new FileGroupDetails( m_widgetStack );
-  connect( m_groupDetails, TQT_SIGNAL( changed(bool) ),
-           this, TQT_SLOT( setDirty(bool) ) );
+  connect( m_groupDetails, TQ_SIGNAL( changed(bool) ),
+           this, TQ_SLOT( setDirty(bool) ) );
   m_widgetStack->addWidget( m_groupDetails, 2 /*id*/ );
 
   // Widget shown on startup
@@ -132,9 +132,9 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
 
   m_widgetStack->raiseWidget( m_emptyWidget );
 
-  TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); // this takes some time
+  TQTimer::singleShot( 0, this, TQ_SLOT( init() ) ); // this takes some time
 
-  connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), TQT_SLOT( slotDatabaseChanged() ) );
+  connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ), TQ_SLOT( slotDatabaseChanged() ) );
 }
 
 FileTypesView::~FileTypesView()
diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h
index 16e7bff3e..2c684ca4c 100644
--- a/kcontrol/filetypes/filetypesview.h
+++ b/kcontrol/filetypes/filetypesview.h
@@ -23,7 +23,7 @@ class TQWidgetStack;
 
 class FileTypesView : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   FileTypesView(TQWidget *p = 0, const char *name = 0);
   ~FileTypesView();
diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp
index 19aa01a59..8c6c06931 100644
--- a/kcontrol/filetypes/keditfiletype.cpp
+++ b/kcontrol/filetypes/keditfiletype.cpp
@@ -29,7 +29,7 @@
 #include <tdesycoca.h>
 #include <kstandarddirs.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #endif
@@ -58,11 +58,11 @@ void FileTypeDialog::init( KMimeType::Ptr mime, bool newItem )
 
   // This code is very similar to kcdialog.cpp
   setMainWidget( m_details );
-  connect(m_details, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool)));
+  connect(m_details, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool)));
   // TODO setHelp()
   enableButton(Apply, false);
 
-  connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), TQT_SLOT( slotDatabaseChanged() ) );
+  connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ), TQ_SLOT( slotDatabaseChanged() ) );
 }
 
 void FileTypeDialog::save()
@@ -159,7 +159,7 @@ int main(int argc, char ** argv)
   }
 
   FileTypeDialog dlg( mime, createType );
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
   if( args->isSet( "parent" )) {
     bool ok;
     long id = args->getOption("parent").toLong(&ok);
diff --git a/kcontrol/filetypes/keditfiletype.h b/kcontrol/filetypes/keditfiletype.h
index 3ae7c0e35..f4abc8d3a 100644
--- a/kcontrol/filetypes/keditfiletype.h
+++ b/kcontrol/filetypes/keditfiletype.h
@@ -27,7 +27,7 @@ class FileTypeDetails;
 // A dialog for ONE file type to be edited.
 class FileTypeDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   FileTypeDialog( KMimeType::Ptr mime );
   FileTypeDialog( KMimeType::Ptr mime, bool newItem );
diff --git a/kcontrol/filetypes/kservicelistwidget.cpp b/kcontrol/filetypes/kservicelistwidget.cpp
index d0463d7ad..16669168a 100644
--- a/kcontrol/filetypes/kservicelistwidget.cpp
+++ b/kcontrol/filetypes/kservicelistwidget.cpp
@@ -74,9 +74,9 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
   grid->setRowStretch(6, 1);
 
   servicesLB = new TQListBox(gb);
-  connect(servicesLB, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int)));
+  connect(servicesLB, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableMoveButtons(int)));
   grid->addMultiCellWidget(servicesLB, 1, 6, 0, 0);
-  connect( servicesLB, TQT_SIGNAL( doubleClicked ( TQListBoxItem * )), this, TQT_SLOT( editService()));
+  connect( servicesLB, TQ_SIGNAL( doubleClicked ( TQListBoxItem * )), this, TQ_SLOT( editService()));
 
   TQString wtstr =
     (kind == SERVICELIST_APPLICATIONS ?
@@ -96,7 +96,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
 
   servUpButton = new TQPushButton(i18n("Move &Up"), gb);
   servUpButton->setEnabled(false);
-  connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(promoteService()));
+  connect(servUpButton, TQ_SIGNAL(clicked()), TQ_SLOT(promoteService()));
   grid->addWidget(servUpButton, 2, 1);
 
   TQWhatsThis::add( servUpButton, kind == SERVICELIST_APPLICATIONS ?
@@ -109,7 +109,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
 
   servDownButton = new TQPushButton(i18n("Move &Down"), gb);
   servDownButton->setEnabled(false);
-  connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(demoteService()));
+  connect(servDownButton, TQ_SIGNAL(clicked()), TQ_SLOT(demoteService()));
   grid->addWidget(servDownButton, 3, 1);
 
   TQWhatsThis::add( servDownButton, kind == SERVICELIST_APPLICATIONS ?
@@ -122,7 +122,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
 
   servNewButton = new TQPushButton(i18n("Add..."), gb);
   servNewButton->setEnabled(false);
-  connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addService()));
+  connect(servNewButton, TQ_SIGNAL(clicked()), TQ_SLOT(addService()));
   grid->addWidget(servNewButton, 1, 1);
 
   TQWhatsThis::add( servNewButton, i18n( "Add a new application for this file type." ) );
@@ -130,7 +130,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
 
   servEditButton = new TQPushButton(i18n("Edit..."), gb);
   servEditButton->setEnabled(false);
-  connect(servEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(editService()));
+  connect(servEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(editService()));
   grid->addWidget(servEditButton, 4, 1);
 
   TQWhatsThis::add( servEditButton, i18n( "Edit command line of the selected application." ) );
@@ -138,7 +138,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
 
   servRemoveButton = new TQPushButton(i18n("Remove"), gb);
   servRemoveButton->setEnabled(false);
-  connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeService()));
+  connect(servRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeService()));
   grid->addWidget(servRemoveButton, 5, 1);
 
   TQWhatsThis::add( servRemoveButton, i18n( "Remove the selected application from the list." ) );
diff --git a/kcontrol/filetypes/kservicelistwidget.h b/kcontrol/filetypes/kservicelistwidget.h
index 0e4a3e3a3..5c16fa07f 100644
--- a/kcontrol/filetypes/kservicelistwidget.h
+++ b/kcontrol/filetypes/kservicelistwidget.h
@@ -45,7 +45,7 @@ public:
  */
 class KServiceListWidget : public TQGroupBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   enum { SERVICELIST_APPLICATIONS, SERVICELIST_SERVICES };
   KServiceListWidget(int kind, TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/filetypes/kserviceselectdlg.cpp b/kcontrol/filetypes/kserviceselectdlg.cpp
index f8c4f0dd4..e9618683d 100644
--- a/kcontrol/filetypes/kserviceselectdlg.cpp
+++ b/kcontrol/filetypes/kserviceselectdlg.cpp
@@ -50,7 +50,7 @@ KServiceSelectDlg::KServiceSelectDlg( const TQString& /*serviceType*/, const TQS
     m_listbox->sort();
     m_listbox->setMinimumHeight(350);
     m_listbox->setMinimumWidth(300);
-    connect(m_listbox,TQT_SIGNAL(doubleClicked ( TQListBoxItem * )),TQT_SLOT(slotOk()));
+    connect(m_listbox,TQ_SIGNAL(doubleClicked ( TQListBoxItem * )),TQ_SLOT(slotOk()));
     setMainWidget(vbox);
 }
 
diff --git a/kcontrol/filetypes/kserviceselectdlg.h b/kcontrol/filetypes/kserviceselectdlg.h
index 3b3ea87e7..3365fbffe 100644
--- a/kcontrol/filetypes/kserviceselectdlg.h
+++ b/kcontrol/filetypes/kserviceselectdlg.h
@@ -23,7 +23,7 @@
 
 class KServiceSelectDlg : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Create a dialog to select a service (not application) for a given service type.
diff --git a/kcontrol/filetypes/newtypedlg.cpp b/kcontrol/filetypes/newtypedlg.cpp
index dbb37344c..e2a9b28a7 100644
--- a/kcontrol/filetypes/newtypedlg.cpp
+++ b/kcontrol/filetypes/newtypedlg.cpp
@@ -19,7 +19,7 @@ NewTypeDialog::NewTypeDialog(TQStringList groups,
 
   TQGridLayout *grid = new TQGridLayout(2, 2);
   grid->setColStretch(1, 1);
-  topl->addLayout(TQT_TQLAYOUT(grid));
+  topl->addLayout(grid);
 
   TQLabel *l = new TQLabel(i18n("Group:"), main);
   grid->addWidget(l, 0, 0);
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index 7239b62ac..5913662ce 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -270,13 +270,13 @@ FontAASettings::FontAASettings(TQWidget *parent)
   enableWidgets();
   setMainWidget(mw);
 
-  connect(excludeRange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useSubPixel, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(excludeFrom, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(changed()));
-  connect(excludeTo, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(changed()));
-  connect(subPixelType, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
+  connect(excludeRange, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useSubPixel, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(excludeFrom, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(changed()));
+  connect(excludeTo, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(changed()));
+  connect(subPixelType, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(changed()));
 #ifdef HAVE_FONTCONFIG
-  connect(hintingStyle, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
+  connect(hintingStyle, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(changed()));
 #endif
 }
 
@@ -596,7 +596,7 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &)
       );
 
     fontUseList.append(i);
-    connect(i, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(fontSelected()));
+    connect(i, TQ_SIGNAL(fontSelected(const TQFont &)), TQ_SLOT(fontSelected()));
 
     TQLabel * fontUse = new TQLabel(name+":", this);
     TQWhatsThis::add(fontUse, *quickHelpIt++);
@@ -612,7 +612,7 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &)
    TQPushButton * fontAdjustButton = new TQPushButton(i18n("Ad&just All Fonts..."), this);
    TQWhatsThis::add(fontAdjustButton, i18n("Click to change all fonts"));
    hblay->addWidget( fontAdjustButton );
-   connect(fontAdjustButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyFontDiff()));
+   connect(fontAdjustButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyFontDiff()));
 
    layout->addSpacing(KDialog::spacingHint());
 
@@ -627,11 +627,11 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &)
    TQWhatsThis::add(cbAA, i18n("If this option is selected, TDE will smooth the edges of curves in "
                               "fonts."));
    aaSettingsButton = new TQPushButton( i18n( "Configure..." ), this);
-   connect(aaSettingsButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCfgAa()));
+   connect(aaSettingsButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotCfgAa()));
    label->setBuddy( cbAA );
    lay->addWidget( cbAA, 0, 1 );
    lay->addWidget( aaSettingsButton, 0, 2 );
-   connect(cbAA, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUseAntiAliasing()));
+   connect(cbAA, TQ_SIGNAL(activated(int)), TQ_SLOT(slotUseAntiAliasing()));
 
    label = new TQLabel( i18n( "Force fonts DPI:" ), this );
    lay->addWidget( label, 1, 0 );
@@ -645,10 +645,10 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &)
        " is also often misused when poor quality fonts are used that do not"
        " look well with DPI values other than 96 or 120 DPI.</p>");
    TQWhatsThis::add(comboForceDpi, whatsthis);
-   connect(comboForceDpi, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUseFontDPI()));
+   connect(comboForceDpi, TQ_SIGNAL(activated(int)), TQ_SLOT(slotUseFontDPI()));
    sbDpiValue = new KIntSpinBox(64, 512, 1, 96, 10, this);
    TQWhatsThis::add(sbDpiValue, whatsthis);
-   connect(sbDpiValue, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+   connect(sbDpiValue, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
    lay->addWidget( comboForceDpi, 1, 1 );
    lay->addWidget( sbDpiValue, 1, 2 );
 
diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h
index 3d1e9643a..c8b3f9919 100644
--- a/kcontrol/fonts/fonts.h
+++ b/kcontrol/fonts/fonts.h
@@ -25,7 +25,7 @@ class FontAASettings;
 
 class FontUseItem : public TDEFontRequester
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
     FontUseItem(TQWidget * parent, const TQString &name, const TQString &grp, 
@@ -50,7 +50,7 @@ private:
 
 class FontAASettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -92,7 +92,7 @@ private:
  */
 class TDEFonts : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TDEFonts(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kcontrol/hwmanager/cryptpassworddlg.cpp b/kcontrol/hwmanager/cryptpassworddlg.cpp
index b0f0e1cd8..c7cd083af 100644
--- a/kcontrol/hwmanager/cryptpassworddlg.cpp
+++ b/kcontrol/hwmanager/cryptpassworddlg.cpp
@@ -73,11 +73,11 @@ CryptPasswordDialog::CryptPasswordDialog(TQWidget *parent, TQString passwordProm
 		}
 	}
 
-	connect(m_base->textPasswordButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts()));
-	connect(m_base->filePasswordButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts()));
-	connect(m_base->cardKeyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts()));
-	connect(m_base->textPasswordEntry, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(processLockouts()));
-	connect(m_base->filePasswordURL, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(processLockouts()));
+	connect(m_base->textPasswordButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts()));
+	connect(m_base->filePasswordButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts()));
+	connect(m_base->cardKeyButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts()));
+	connect(m_base->textPasswordEntry, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(processLockouts()));
+	connect(m_base->filePasswordURL, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(processLockouts()));
 
 	m_base->textPasswordEntry->setFocus();
 
diff --git a/kcontrol/hwmanager/cryptpassworddlg.h b/kcontrol/hwmanager/cryptpassworddlg.h
index d595c4a73..f155df968 100644
--- a/kcontrol/hwmanager/cryptpassworddlg.h
+++ b/kcontrol/hwmanager/cryptpassworddlg.h
@@ -35,7 +35,7 @@ class KSSLCertificate;
 
 class TDEUI_EXPORT CryptPasswordDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	* Create a dialog that allows a user to enter LUKS passwords or password files
diff --git a/kcontrol/hwmanager/cryptpassworddlgbase.ui b/kcontrol/hwmanager/cryptpassworddlgbase.ui
index f7a6a70a7..2c3a425a8 100644
--- a/kcontrol/hwmanager/cryptpassworddlgbase.ui
+++ b/kcontrol/hwmanager/cryptpassworddlgbase.ui
@@ -137,9 +137,9 @@
 	<includes>
 		<include location="local" impldecl="in implementation">CryptPasswordDialogBase.ui.h</include>
 	</includes>
-	<Q_SLOTS>
+	<slots>
 		<slot>enableSupport_toggled(bool)</slot>
-	</Q_SLOTS>
+	</slots>
 	<includes>
 		<include location="global" impldecl="in implementation">kdialog.h</include>
 		<include location="global" impldecl="in implementation">kpassdlg.h</include>
diff --git a/kcontrol/hwmanager/deviceiconview.cpp b/kcontrol/hwmanager/deviceiconview.cpp
index 44a71b3a3..a5e41ba83 100644
--- a/kcontrol/hwmanager/deviceiconview.cpp
+++ b/kcontrol/hwmanager/deviceiconview.cpp
@@ -43,8 +43,8 @@ DeviceIconView::DeviceIconView(TQWidget * parent, const char * name)
 	
 	header()->hide();
 	
-	connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
-	connect(this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*)));
+	connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotItemSelected(TQListViewItem*)));
+	connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotItemDoubleClicked(TQListViewItem*)));
 }
 
 void DeviceIconView::slotItemSelected(TQListViewItem* item)
diff --git a/kcontrol/hwmanager/deviceiconview.h b/kcontrol/hwmanager/deviceiconview.h
index 746fb2253..6460beb0a 100644
--- a/kcontrol/hwmanager/deviceiconview.h
+++ b/kcontrol/hwmanager/deviceiconview.h
@@ -55,7 +55,7 @@ private:
 
 class DeviceIconView : public TDEListView
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	DeviceIconView(TQWidget * parent = 0, const char * name = 0);
diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp
index 89a7e867f..4baabe29a 100644
--- a/kcontrol/hwmanager/devicepropsdlg.cpp
+++ b/kcontrol/hwmanager/devicepropsdlg.cpp
@@ -299,20 +299,20 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge
 		}
 
 		if (m_device->type() == TDEGenericDeviceType::CPU) {
-			connect(base->comboCPUGovernor, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setCPUGovernor(const TQString &)));
+			connect(base->comboCPUGovernor, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(setCPUGovernor(const TQString &)));
 		}
 		if (m_device->type() == TDEGenericDeviceType::Disk) {
 			TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device);
-			connect(base->buttonDiskMount, TQT_SIGNAL(clicked()), this, TQT_SLOT(mountDisk()));
-			connect(base->buttonDiskUnmount, TQT_SIGNAL(clicked()), this, TQT_SLOT(unmountDisk()));
-			connect(base->buttonDiskUnlock, TQT_SIGNAL(clicked()), this, TQT_SLOT(unlockDisk()));
-			connect(base->buttonDiskLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(lockDisk()));
-			connect(base->buttonDiskEject, TQT_SIGNAL(clicked()), this, TQT_SLOT(ejectDisk()));
-			connect(base->buttonDiskSafeRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(safeRemoveDisk()));
+			connect(base->buttonDiskMount, TQ_SIGNAL(clicked()), this, TQ_SLOT(mountDisk()));
+			connect(base->buttonDiskUnmount, TQ_SIGNAL(clicked()), this, TQ_SLOT(unmountDisk()));
+			connect(base->buttonDiskUnlock, TQ_SIGNAL(clicked()), this, TQ_SLOT(unlockDisk()));
+			connect(base->buttonDiskLock, TQ_SIGNAL(clicked()), this, TQ_SLOT(lockDisk()));
+			connect(base->buttonDiskEject, TQ_SIGNAL(clicked()), this, TQ_SLOT(ejectDisk()));
+			connect(base->buttonDiskSafeRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(safeRemoveDisk()));
 			if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) {
-				connect(base->cryptLUKSAddKey, TQT_SIGNAL(clicked()), this, TQT_SLOT(cryptLUKSAddKey()));
-				connect(base->cryptLUKSDelKey, TQT_SIGNAL(clicked()), this, TQT_SLOT(cryptLUKSDelKey()));
-				connect(base->cryptLUKSKeySlotList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(processLockouts()));
+				connect(base->cryptLUKSAddKey, TQ_SIGNAL(clicked()), this, TQ_SLOT(cryptLUKSAddKey()));
+				connect(base->cryptLUKSDelKey, TQ_SIGNAL(clicked()), this, TQ_SLOT(cryptLUKSDelKey()));
+				connect(base->cryptLUKSKeySlotList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(processLockouts()));
 				base->cryptLUKSKeySlotList->setAllColumnsShowFocus(true);
 				base->cryptLUKSKeySlotList->setFullWidth(true);
 				cryptLUKSPopulateList();
@@ -332,10 +332,10 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge
 			m_sensorDataGridWidgets.setAutoDelete(true);
 		}
 		if (m_device->type() == TDEGenericDeviceType::Backlight) {
-			connect(base->sliderBacklightBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setBacklightBrightness(int)));
+			connect(base->sliderBacklightBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setBacklightBrightness(int)));
 		}
 		if (m_device->type() == TDEGenericDeviceType::RootSystem) {
-			connect(base->comboSystemHibernationMethod, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setHibernationMethod(int)));
+			connect(base->comboSystemHibernationMethod, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setHibernationMethod(int)));
 		}
 
 		TQGridLayout *mainGrid = new TQGridLayout(plainPage(), 1, 1, 0, spacingHint());
@@ -345,8 +345,8 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge
 
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 
-	connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(processHardwareRemoved(TDEGenericDevice*)));
-	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(processHardwareUpdated(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(processHardwareRemoved(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(processHardwareUpdated(TDEGenericDevice*)));
 
 	populateDeviceInformation();
 }
@@ -493,9 +493,6 @@ void DevicePropertiesDialog::populateDeviceInformation()
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem)) {
 				status_text += i18n("Contains a filesystem") + "<br>";
 			}
-			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) {
-				status_text += i18n("Hotpluggable") + "<br>";
-			}
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hidden)) {
 				status_text += i18n("Hidden") + "<br>";
 			}
@@ -537,8 +534,7 @@ void DevicePropertiesDialog::populateDeviceInformation()
 				showGroup = true;
 			}
 			if (isMonitoredDevice(sdevice) &&
-					(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable) ||
-					 sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)))
+			    sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable))
 			{
 				base->buttonDiskEject->setEnabled(true);
 				base->buttonDiskSafeRemove->setEnabled(true);
@@ -885,8 +881,8 @@ void DevicePropertiesDialog::populateDeviceInformation()
 		if (m_device->type() == TDEGenericDeviceType::CryptographicCard) {
 			TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(m_device);
 
-			connect(cdevice, TQT_SIGNAL(cardInserted(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted()));
-			connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved()));
+			connect(cdevice, TQ_SIGNAL(cardInserted(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted()));
+			connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved()));
 
 			updateCryptographicCardStatusDisplay();
 		}
diff --git a/kcontrol/hwmanager/devicepropsdlg.h b/kcontrol/hwmanager/devicepropsdlg.h
index aabda590f..e961e689f 100644
--- a/kcontrol/hwmanager/devicepropsdlg.h
+++ b/kcontrol/hwmanager/devicepropsdlg.h
@@ -37,7 +37,7 @@ class PasswordDlg;
 
 class TDEUI_EXPORT SensorDisplayLabelsWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	* Create a simple sensor name and value display widget
@@ -65,7 +65,7 @@ private:
 
 class TDEUI_EXPORT SensorBar : public TQProgressBar
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	SensorBar(TQWidget* parent=0, const char* name=0, WFlags f=0) : TQProgressBar(parent, name, f) {}
 	SensorBar(int totalSteps, TQWidget* parent=0, const char* name=0, WFlags f=0): TQProgressBar(totalSteps, parent, name, f) {}
@@ -93,7 +93,7 @@ public:
 
 class TDEUI_EXPORT SensorDisplayWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	* Simple sensor information display widget
@@ -167,7 +167,7 @@ typedef TQMap<TDESystemHibernationMethod::TDESystemHibernationMethod, int> Hiber
 
 class TDEUI_EXPORT DevicePropertiesDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	* Create a dialog that allows a user to view and edit hardware device properties
diff --git a/kcontrol/hwmanager/devicepropsdlgbase.ui b/kcontrol/hwmanager/devicepropsdlgbase.ui
index e7d7cee22..dce403fe7 100644
--- a/kcontrol/hwmanager/devicepropsdlgbase.ui
+++ b/kcontrol/hwmanager/devicepropsdlgbase.ui
@@ -1759,9 +1759,9 @@
 <includes>
 	<include location="local" impldecl="in implementation">DevicePropertiesDialogBase.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>enableSupport_toggled(bool)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kactivelabel.h</include>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp
index 509fe2835..6c8949275 100644
--- a/kcontrol/hwmanager/hwdevicetray.cpp
+++ b/kcontrol/hwmanager/hwdevicetray.cpp
@@ -1,8 +1,8 @@
 /*
  * Copyright 2015 Timothy Pearson <kb9vqf@pearsoncomputing.net>
- * 
+ *
  * This file is part of hwdevicetray, the TDE Hardware Device Monitor System Tray Application
- * 
+ *
  * hwdevicetray is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3
@@ -21,58 +21,144 @@
 #include <config.h>
 #endif
 
-#include <tqtimer.h>
+#include <cstdlib>
+#include <unistd.h>
+
+#include <tqfileinfo.h>
 #include <tqimage.h>
+#include <tqtimer.h>
 #include <tqtooltip.h>
-#include <tqfileinfo.h>
+#include <tqvaluevector.h>
 
-#include <krun.h>
-#include <tdeaction.h>
-#include <tdeapplication.h>
 #include <kcmultidialog.h>
-#include <kdebug.h>
+#include <kglobalaccel.h>
 #include <khelpmenu.h>
-#include <kiconloader.h>
 #include "kprocess.h"
-#include <tdelocale.h>
-#include <tdepopupmenu.h>
-#include <kstdaction.h>
-#include <kstdguiitem.h>
+#include <kpropertiesdialog.h>
+#include <krun.h>
+#include <ksimpleconfig.h>
+#include <kstandarddirs.h>
+
+#include <tdeaction.h>
+#include <tdeapplication.h>
 #include <tdeglobal.h>
+#include <tdehardwaredevices.h>
+#include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kpassivepopup.h>
-#include <kstandarddirs.h>
-#include <kpropertiesdialog.h>
-#include "passworddlg.h"
+#include "tdepassivepopupstack.h"
+#include <tdepopupmenu.h>
 
 #include <dcopclient.h>
 #include <dcopref.h>
 
-#include <cstdlib>
-#include <unistd.h>
-
-#include "hwdevicetray_configdialog.h"
 #include "hwdevicetray.h"
+#include "hwdevicetray_configdialog.h"
+
+
+// Storage Device Action
+namespace SDActions
+{
+	// use 'int' as underlying type to avoid exposing a bunch of unnecessary
+	// enums/structs in the class header file private methods' signature
+	// Note: must start from 0 because the Type value is also used as index
+	// of a TQValueVector
+	enum Type : int
+	{
+		Open = 0,
+		Mount,
+		Unmount,
+		Unlock,
+		Lock,
+		Eject,
+		SafeRemove,
+		Properties
+	};
+
+	struct Details
+	{
+		const char *iconName;
+		const char *actionName;
+		const char *collectionName;
+	};
+
+	// Allows to use a for loop to iterate over all action types
+	static const Type All[] = { Open, Mount, Unmount, Unlock, Lock, Eject, SafeRemove, Properties };
+
+	static const TQMap<Type, Details> populateMap()
+	{
+		TQMap<Type, Details> map;
+		map[Open] = { "window-new", I18N_NOOP("Open"), "open_menu" };
+		map[Mount] = { "drive-harddisk-mounted", I18N_NOOP("Mount"), "mount_menu" };
+		map[Unmount] = { "drive-harddisk-unmounted", I18N_NOOP("Unmount"), "unmount_menu" };
+		map[Unlock] = { "decrypted", I18N_NOOP("Unlock"), "unlock_menu" };
+		map[Lock] = { "encrypted", I18N_NOOP("Lock"), "lock_menu" };
+		map[Eject] = { "player_eject", I18N_NOOP("Eject"), "eject_menu" };
+		map[SafeRemove] = { "player_safe_removal", I18N_NOOP("Safe remove"), "safe_remove_menu" };
+		map[Properties] = { "edit", I18N_NOOP("Properties"), "properties_menu" };
+		return map;
+	}
+
+	static const TQMap<Type, Details> Data = populateMap();
+}
+
+// Storage Device Action Menu Entry, representing an action
+// and the storage device on which to perform it
+struct SDActionMenuEntry
+{
+	SDActions::Type actionType;
+	TQString uuid;
+};
 
-HwDeviceSystemTray::HwDeviceSystemTray(TQWidget* parent, const char *name)
-	: KSystemTray(parent, name)
+struct KnownDiskDeviceInfo
+{
+	TQString deviceLabel;
+	TQString node;
+};
+
+
+class HwDeviceSystemTrayPrivate
+{
+public:
+	HwDeviceSystemTrayPrivate()
+	{
+	}
+
+	~HwDeviceSystemTrayPrivate()
+	{
+	}
+
+	// Members
+	TDEAction *m_deviceManagerAction;
+	TDEAction *m_quitAction;
+	TDEAction *m_shortcutKeysAction;
+	KHelpMenu *m_helpMenu;
+	TDEPopupMenu *m_LMBMenu;
+	TDEPopupMenu *m_RMBMenu;
+
+	TQMap<int, SDActionMenuEntry> m_actionMenuEntryMap;
+	TQMap<SDActions::Type, TDEActionMenu*> m_RMBActionMenuMap;
+
+	TQMap<TQString, KnownDiskDeviceInfo> m_knownDiskDevices;
+
+	TDEPassivePopupStackContainer *m_hardwareNotifierContainer;
+};
+
+
+HwDeviceSystemTray::HwDeviceSystemTray(TQWidget *parent, const char *name)
+	: KSystemTray(parent, name), d(new HwDeviceSystemTrayPrivate())
 {
 	// Create notifier
-	m_hardwareNotifierContainer = new TDEPassivePopupStackContainer();
-	connect(m_hardwareNotifierContainer, TQT_SIGNAL(popupClicked(KPassivePopup*, TQPoint, TQString)), this, TQT_SLOT(devicePopupClicked(KPassivePopup*, TQPoint, TQString)));
+	d->m_hardwareNotifierContainer = new TDEPassivePopupStackContainer();
+	connect(d->m_hardwareNotifierContainer, TQ_SIGNAL(popupClicked(KPassivePopup*, TQPoint, TQString)), this, TQ_SLOT(devicePopupClicked(KPassivePopup*, TQPoint, TQString)));
 
-	// Create help submenu
-	m_help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection());
-	TDEPopupMenu *help = m_help->menu();
-	help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents()));
+	initMenus();
 
 	setPixmap(KSystemTray::loadIcon("hwinfo"));
-	setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-	connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
+	setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
+	connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(quitApp()));
 	TQToolTip::add(this, i18n("Device monitor"));
-	m_parent = parent;
 
-	globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+	globalKeys = new TDEGlobalAccel(this);
 	TDEGlobalAccel* keys = globalKeys;
 	#include "hwdevicetray_bindings.cpp"
 	// the keys need to be read from tdeglobals, not kickerrc
@@ -80,42 +166,35 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget* parent, const char *name)
 	globalKeys->setEnabled(true);
 	globalKeys->updateConnections();
 
-	connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
-
-	new TDEActionMenu(i18n("Open"), SmallIcon("window-new", TQIconSet::Automatic), actionCollection(), "open_menu");
-	new TDEActionMenu(i18n("Mount"), SmallIcon("drive-harddisk-mounted", TQIconSet::Automatic), actionCollection(), "mount_menu");
-	new TDEActionMenu(i18n("Unmount"), SmallIcon("drive-harddisk-unmounted", TQIconSet::Automatic), actionCollection(), "unmount_menu");
-	new TDEActionMenu(i18n("Unlock"), SmallIcon("decrypted", TQIconSet::Automatic), actionCollection(), "unlock_menu");
-	new TDEActionMenu(i18n("Lock"), SmallIcon("encrypted", TQIconSet::Automatic), actionCollection(), "lock_menu");
-	new TDEActionMenu(i18n("Eject"), SmallIcon("player_eject", TQIconSet::Automatic), actionCollection(), "eject_menu");
-	new TDEActionMenu(i18n("Safe remove"), SmallIcon("player_safe_removal", TQIconSet::Automatic), actionCollection(), "safe_remove_menu");
-	new TDEActionMenu(i18n("Properties"), SmallIcon("edit", TQIconSet::Automatic), actionCollection(), "properties_menu");
+	connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
 
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	doDiskNotifications(true);
-	connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(deviceAdded(TDEGenericDevice*)));
-	connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(deviceRemoved(TDEGenericDevice*)));
-	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(deviceAdded(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(deviceRemoved(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*)));
 }
 
 HwDeviceSystemTray::~HwDeviceSystemTray()
 {
-	delete m_hardwareNotifierContainer;
+	delete d->m_hardwareNotifierContainer;
+	delete d;
 }
 
 /*!
- * \b TQT_SLOT which called if hwdevicetray is exited by the user. In this case the user
+ * \b TQ_SLOT which called if hwdevicetray is exited by the user. In this case the user
  * is asked through a yes/no box if "HwDeviceTray should start automatically on log in" and the
  * result is written to the KDE configfile.
  */
-void HwDeviceSystemTray::_quit () {
-	r_config = new KSimpleConfig("tdehwdevicetrayrc");
+void HwDeviceSystemTray::quitApp()
+{
+	KSimpleConfig *config = new KSimpleConfig("tdehwdevicetrayrc");
 
-	TQString tmp1 = i18n ("Start device monitor automatically when you log in?");
-	int tmp2 = KMessageBox::questionYesNo (0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start"));
-	r_config->setGroup("General");
-	r_config->writeEntry ("Autostart", tmp2 == KMessageBox::Yes);
-	r_config->sync ();
+	TQString tmp1 = i18n("Start device monitor automatically when you log in?");
+	int tmp2 = KMessageBox::questionYesNo(0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start"));
+	config->setGroup("General");
+	config->writeEntry("Autostart", tmp2 == KMessageBox::Yes);
+	config->sync();
 
 	exit(0);
 }
@@ -142,16 +221,28 @@ void HwDeviceSystemTray::showEvent (TQShowEvent *) {
 	resizeTrayIcon();
 }
 
-void HwDeviceSystemTray::mousePressEvent(TQMouseEvent* e) {
-	// Popup the context menu with left-click
-	if (e->button() == Qt::LeftButton) {
-		contextMenuAboutToShow(contextMenu());
-		contextMenu()->popup(e->globalPos());
-		e->accept();
-		return;
+void HwDeviceSystemTray::mousePressEvent(TQMouseEvent* e)
+{
+	switch (e->button())
+	{
+		case TQt::LeftButton:
+			populateLMBMenu();
+			d->m_LMBMenu->popup(e->globalPos());
+			break;
+
+		case TQt::MidButton:
+			TQTimer::singleShot(0, this, TQ_SLOT(slotHardwareConfig()));
+			break;
+
+		case TQt::RightButton:
+			contextMenuAboutToShow(d->m_RMBMenu);
+			d->m_RMBMenu->popup(e->globalPos());
+			break;
+
+		default:
+			// do nothing
+			break;
 	}
-
-	KSystemTray::mousePressEvent(e);
 }
 
 bool HwDeviceSystemTray::isMonitoredDevice(TDEStorageDevice* sdevice)
@@ -195,107 +286,128 @@ bool HwDeviceSystemTray::isMonitoredDevice(TDEStorageDevice* sdevice)
 	         sdevice->isDiskOfType(TDEDiskDeviceType::Camera)));
 }
 
-void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) {
-	menu->clear();
-	menu->setCheckable(true);
+void HwDeviceSystemTray::initMenus()
+{
+	// RMB menu
+	d->m_RMBMenu = contextMenu();
 
-	populateMenu(menu);
+	// Device actions
+	for (const SDActions::Type &actionType : SDActions::All)
+	{
+		SDActions::Details ad = SDActions::Data[actionType];
+		d->m_RMBActionMenuMap.insert(actionType, new TDEActionMenu(i18n(ad.actionName),
+	        SmallIcon(ad.iconName, TQIconSet::Automatic), actionCollection(), ad.collectionName));
+	}
 
-	menu->insertTitle(SmallIcon("configure"), i18n("Global Configuration"));
+	// Global Configuration
+	d->m_deviceManagerAction = new TDEAction(i18n("Show Device Manager..."), SmallIconSet("kcmpci"),
+	        TDEShortcut(), this, TQ_SLOT(slotHardwareConfig()), actionCollection());
+	d->m_shortcutKeysAction = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"),
+	        TDEShortcut(), this, TQ_SLOT(slotEditShortcutKeys()), actionCollection());
 
-	TDEAction *actHardwareConfig = new TDEAction(i18n("Show Device Manager..."), SmallIconSet("kcmpci"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotHardwareConfig()), actionCollection());
-	actHardwareConfig->plug(menu);
+	// Help & Quit
+	d->m_helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection());
+	d->m_helpMenu->menu()->connectItem(KHelpMenu::menuHelpContents, this, TQ_SLOT(slotHelpContents()));
+	d->m_quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit));
 
-	TDEAction *actShortcutKeys = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditShortcutKeys()), actionCollection());
-	actShortcutKeys->plug(menu);
+	// LMB menu
+	d->m_LMBMenu = new TDEPopupMenu(this);
+}
 
-	menu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), m_help->menu());
-	TDEAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit));
-	quitAction->plug(menu);
+TQString HwDeviceSystemTray::getDeviceLabel(TDEStorageDevice *sdevice)
+{
+	if (!sdevice)
+	{
+		return TQString::null;
+	}
 
-	m_menu = menu;
+	DCOPRef mediamanager("kded", "mediamanager");
+	DCOPReply reply = mediamanager.call("properties", sdevice->deviceNode());
+	TQString deviceLabel = TQString::null;
+	if (reply.isValid())
+	{
+		// TODO R14.2.0: make sure the reply is a valid Medium
+		// once the media library is part of tdelibs
+		TQStringList properties = reply;
+		if (properties.size() >= 4)
+		{
+			deviceLabel = properties[3]; // medium label
+		}
+	}
+
+	if (deviceLabel.isEmpty())
+	{
+		deviceLabel = !sdevice->diskLabel().isEmpty() ? sdevice->diskLabel() : sdevice->friendlyName();
+		deviceLabel += " (" + sdevice->deviceNode() + ")";
+	}
+
+	return deviceLabel;
 }
 
-void HwDeviceSystemTray::configChanged() {
-	//
+void HwDeviceSystemTray::addDeviceToLMBMenu(TDEStorageDevice *sdevice, const int type,
+        TDEActionMenu *actionMenu, int &actionMenuIdx)
+{
+	TQString uuid = !sdevice->diskUUID().isEmpty() ? sdevice->diskUUID() : sdevice->systemPath();
+	SDActions::Type actionType = (SDActions::Type)type;
+	SDActions::Details ad = SDActions::Data[actionType];
+	actionMenu->popupMenu()->insertItem(SmallIcon(ad.iconName), i18n(ad.actionName), actionMenuIdx);
+	actionMenu->popupMenu()->connectItem(actionMenuIdx, this,
+	        TQ_SLOT(slotExecuteDeviceAction(int)));
+	d->m_actionMenuEntryMap[actionMenuIdx++] = { actionType, uuid };
 }
 
-void HwDeviceSystemTray::populateMenu(TDEPopupMenu* menu) {
-	menu->insertTitle(SmallIcon("drive-harddisk-unmounted"), i18n("Storage Devices"));
-
-	TDEActionMenu *openDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("open_menu"));
-	TDEActionMenu *mountDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("mount_menu"));
-	TDEActionMenu *unmountDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("unmount_menu"));
-	TDEActionMenu *unlockDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("unlock_menu"));
-	TDEActionMenu *lockDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("lock_menu"));
-	TDEActionMenu *ejectDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("eject_menu"));
-	TDEActionMenu *safeRemoveDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("safe_remove_menu"));
-	TDEActionMenu *propertiesDeviceActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("properties_menu"));
-
-	openDeviceActionMenu->popupMenu()->clear();
-	mountDeviceActionMenu->popupMenu()->clear();
-	unmountDeviceActionMenu->popupMenu()->clear();
-	unlockDeviceActionMenu->popupMenu()->clear();
-	lockDeviceActionMenu->popupMenu()->clear();
-	ejectDeviceActionMenu->popupMenu()->clear();
-	safeRemoveDeviceActionMenu->popupMenu()->clear();
-	propertiesDeviceActionMenu->popupMenu()->clear();
-
-	m_openMenuIndexMap.clear();
-	m_mountMenuIndexMap.clear();
-	m_unmountMenuIndexMap.clear();
-	m_unlockMenuIndexMap.clear();
-	m_lockMenuIndexMap.clear();
-	m_ejectMenuIndexMap.clear();
-	m_safeRemoveMenuIndexMap.clear();
-	m_propertiesMenuIndexMap.clear();
+void HwDeviceSystemTray::addDeviceToRMBMenu(TDEStorageDevice *sdevice, const int type, int &actionMenuIdx)
+{
+	TQString uuid = !sdevice->diskUUID().isEmpty() ? sdevice->diskUUID() : sdevice->systemPath();
+	SDActions::Type actionType = (SDActions::Type)type;
+	TDEActionMenu *actionMenu = d->m_RMBActionMenuMap[actionType];
+	actionMenu->popupMenu()->insertItem(sdevice->icon(TDEIcon::SizeSmall),
+	        getDeviceLabel(sdevice), actionMenuIdx);
+	actionMenu->popupMenu()->connectItem(actionMenuIdx, this,
+	        TQ_SLOT(slotExecuteDeviceAction(int)));
+	actionMenu->setEnabled(true);
+	d->m_actionMenuEntryMap[actionMenuIdx++] = { actionType, uuid };
+}
 
-	// Find all storage devices and add them to the popup menus
-	int lastOpenIndex = -1;
-	int lastMountIndex = -1;
-	int lastUnmountIndex = -1;
-	int lastUnlockIndex = -1;
-	int lastLockIndex = -1;
-	int lastEjectIndex = -1;
-	int lastSafeRemoveIndex = -1;
-	int lastPropertiesIndex = -1;
+void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
+{
+	d->m_RMBMenu = menu;
+	menu->clear();
+
+	for (const SDActions::Type &actionType : SDActions::All)
+	{
+		TDEActionMenu *actionMenu = d->m_RMBActionMenuMap[actionType];
+		actionMenu->popupMenu()->clear();
+		actionMenu->setEnabled(false);
+		actionMenu->unplug(d->m_RMBMenu);
+	}
+
+	d->m_actionMenuEntryMap.clear();
 
+	// Find all storage devices, sort them by label and add them to the popup menus
+	TQValueVector<TQMap<TQString, TDEStorageDevice*>*> rmbMenuEntries(sizeof(SDActions::All) / sizeof(SDActions::Type), nullptr);
+	for (size_t idx = 0; idx < rmbMenuEntries.size(); ++idx)
+	{
+		rmbMenuEntries[idx] = new TQMap<TQString, TDEStorageDevice*>();
+	}
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
 	for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next())
 	{
-		TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice);
+		TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice);
 		if (isMonitoredDevice(sdevice))
 		{
-			TQString friendlyName = sdevice->diskLabel();
-			if (friendlyName.isEmpty())
-			{
-				friendlyName = sdevice->friendlyName();
-			}
-
-			if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted))
+			TQString deviceLabel = getDeviceLabel(sdevice);
+			if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) ||
+			    sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted))
 			{
 				if (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt))
 				{
-					lastLockIndex = lockDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
-					        i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
-					lockDeviceActionMenu->popupMenu()->connectItem(lastLockIndex, this, TQT_SLOT(slotLockDevice(int)));
-					m_lockMenuIndexMap[lastLockIndex] = sdevice->diskUUID();
-					if (m_lockMenuIndexMap[lastLockIndex] == "")
-					{
-						m_lockMenuIndexMap[lastLockIndex] = sdevice->systemPath();
-					}
+					(*rmbMenuEntries[SDActions::Lock])[deviceLabel] = sdevice;
 				}
 				else
 				{
-					lastUnlockIndex = unlockDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
-					        i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
-					unlockDeviceActionMenu->popupMenu()->connectItem(lastUnlockIndex, this, TQT_SLOT(slotUnlockDevice(int)));
-					m_unlockMenuIndexMap[lastUnlockIndex] = sdevice->diskUUID();
-					if (m_unlockMenuIndexMap[lastUnlockIndex] == "")
-					{
-						m_unlockMenuIndexMap[lastUnlockIndex] = sdevice->systemPath();
-					}
+					(*rmbMenuEntries[SDActions::Unlock])[deviceLabel] = sdevice;
 				}
 			}
 
@@ -303,245 +415,135 @@ void HwDeviceSystemTray::populateMenu(TDEPopupMenu* menu) {
 			{
 				if (sdevice->mountPath().isEmpty())
 				{
-					lastMountIndex = mountDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
-					        i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
-					mountDeviceActionMenu->popupMenu()->connectItem(lastMountIndex, this, TQT_SLOT(slotMountDevice(int)));
-					m_mountMenuIndexMap[lastMountIndex] = sdevice->diskUUID();
-					if (m_mountMenuIndexMap[lastMountIndex] == "")
-					{
-						m_mountMenuIndexMap[lastMountIndex] = sdevice->systemPath();
-					}
+					(*rmbMenuEntries[SDActions::Mount])[deviceLabel] = sdevice;
 				}
 				else
 				{
-					lastUnmountIndex = unmountDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
-					        i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
-					unmountDeviceActionMenu->popupMenu()->connectItem(lastUnmountIndex, this, TQT_SLOT(slotUnmountDevice(int)));
-					m_unmountMenuIndexMap[lastUnmountIndex] = sdevice->diskUUID();
-					if (m_unmountMenuIndexMap[lastMountIndex] == "")
-					{
-						m_unmountMenuIndexMap[lastMountIndex] = sdevice->systemPath();
-					}
+					(*rmbMenuEntries[SDActions::Unmount])[deviceLabel] = sdevice;
 				}
 
-				// Both mounted and unmounted disks can be opened
-				lastOpenIndex = openDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
-				        i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
-				openDeviceActionMenu->popupMenu()->connectItem(lastOpenIndex, this, TQT_SLOT(slotOpenDevice(int)));
-				m_openMenuIndexMap[lastOpenIndex] = sdevice->diskUUID();
-				if (m_openMenuIndexMap[lastOpenIndex] == "")
-				{
-					m_openMenuIndexMap[lastOpenIndex] = sdevice->systemPath();
-				}
+				// Mounted and unmounted disks can also be opened
+				(*rmbMenuEntries[SDActions::Open])[deviceLabel] = sdevice;
 			}
 
-			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable) ||
-					sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable))
+			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable))
 			{
-				lastEjectIndex = ejectDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
-				        i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
-				ejectDeviceActionMenu->popupMenu()->connectItem(lastEjectIndex, this, TQT_SLOT(slotEjectDevice(int)));
-				m_ejectMenuIndexMap[lastEjectIndex] = sdevice->diskUUID();
-				if (m_ejectMenuIndexMap[lastEjectIndex] == "")
-				{
-					m_ejectMenuIndexMap[lastEjectIndex] = sdevice->systemPath();
-				}
+				(*rmbMenuEntries[SDActions::Eject])[deviceLabel] = sdevice;
 
-				lastSafeRemoveIndex = safeRemoveDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
-				        i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
-				safeRemoveDeviceActionMenu->popupMenu()->connectItem(lastSafeRemoveIndex, this, TQT_SLOT(slotSafeRemoveDevice(int)));
-				m_safeRemoveMenuIndexMap[lastSafeRemoveIndex] = sdevice->diskUUID();
-				if (m_safeRemoveMenuIndexMap[lastSafeRemoveIndex] == "")
-				{
-					m_safeRemoveMenuIndexMap[lastSafeRemoveIndex] = sdevice->systemPath();
-				}
+				(*rmbMenuEntries[SDActions::SafeRemove])[deviceLabel] = sdevice;
 			}
 
-			lastPropertiesIndex = propertiesDeviceActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall),
-			        i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()));
-			propertiesDeviceActionMenu->popupMenu()->connectItem(lastPropertiesIndex, this, TQT_SLOT(slotPropertiesDevice(int)));
-			m_propertiesMenuIndexMap[lastPropertiesIndex] = sdevice->diskUUID();
-			if (m_propertiesMenuIndexMap[lastPropertiesIndex] == "")
-			{
-				m_propertiesMenuIndexMap[lastPropertiesIndex] = sdevice->systemPath();
-			}
+			(*rmbMenuEntries[SDActions::Properties])[deviceLabel] = sdevice;
 		}
 	}
 
-	openDeviceActionMenu->setEnabled(lastOpenIndex != -1);
-	mountDeviceActionMenu->setEnabled(lastMountIndex != -1);
-	unmountDeviceActionMenu->setEnabled(lastUnmountIndex != -1);
-	unlockDeviceActionMenu->setEnabled(lastUnlockIndex != -1);
-	lockDeviceActionMenu->setEnabled(lastLockIndex != -1);
-	ejectDeviceActionMenu->setEnabled(lastEjectIndex != -1);
-	safeRemoveDeviceActionMenu->setEnabled(lastSafeRemoveIndex != -1);
-	propertiesDeviceActionMenu->setEnabled(lastPropertiesIndex != -1);
-
-	if (lastOpenIndex != -1)
-	{
-		openDeviceActionMenu->plug(menu);
-	}
-	if (lastMountIndex != -1)
-	{
-		mountDeviceActionMenu->plug(menu);
-	}
-	if (lastUnmountIndex != -1)
-	{
-		unmountDeviceActionMenu->plug(menu);
-	}
-	if (lastUnlockIndex != -1)
-	{
-		unlockDeviceActionMenu->plug(menu);
-	}
-	if (lastLockIndex != -1)
-	{
-		lockDeviceActionMenu->plug(menu);
-	}
-	if (lastEjectIndex != -1)
-	{
-		ejectDeviceActionMenu->plug(menu);
-	}
-	if (lastSafeRemoveIndex != -1)
-	{
-		safeRemoveDeviceActionMenu->plug(menu);
-	}
-	if (lastPropertiesIndex != -1)
+	// Plug in meaningful action menus
+	d->m_RMBMenu->insertTitle(SmallIcon("drive-harddisk-unmounted"), i18n("Storage Device Actions"), 0);
+	int actionMenuIdx = 0;
+	for (const SDActions::Type &actionType : SDActions::All)
 	{
-		propertiesDeviceActionMenu->plug(menu);
+		TDEActionMenu *actionMenu = d->m_RMBActionMenuMap[actionType];
+		for (TDEStorageDevice *sdevice : *rmbMenuEntries[actionType])
+		{
+			addDeviceToRMBMenu(sdevice, actionType, actionMenuIdx);
+		}
+		if (actionMenu->isEnabled())
+		{
+			actionMenu->plug(d->m_RMBMenu);
+		}
+		delete rmbMenuEntries[actionType];
+		rmbMenuEntries[actionType] = nullptr;
 	}
+
+	// Global Configuration
+	menu->insertTitle(SmallIcon("configure"), i18n("Global Configuration"));
+
+	d->m_deviceManagerAction->plug(menu);
+	d->m_shortcutKeysAction->plug(menu);
+
+	// Help & Quit
+	menu->insertSeparator();
+	menu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), d->m_helpMenu->menu());
+	d->m_quitAction->plug(menu);
 }
 
-void HwDeviceSystemTray::slotOpenDevice(int parameter)
+void HwDeviceSystemTray::populateLMBMenu()
 {
-	TQString uuid = m_openMenuIndexMap[parameter];
-	if (!uuid.isEmpty())
+	d->m_LMBMenu->clear();
+	d->m_LMBMenu->insertTitle(SmallIcon("drive-harddisk-unmounted"), i18n("Storage Devices"), 0);
+
+	d->m_actionMenuEntryMap.clear();
+	int actionMenuIdx = 0;
+
+	// Find all storage devices and add them to the popup menus
+	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
+	TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
+	TQMap<TQString, TDEActionMenu*> lmbMenuEntries;
+	for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next())
 	{
-		TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-		TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
-		for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next())
+		TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice);
+		if (isMonitoredDevice(sdevice) &&
+		    (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) ||
+		     sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) ||
+		     sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable) ||
+		     sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)))
 		{
-			TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice);
-			if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid))
+			TQString deviceLabel = getDeviceLabel(sdevice);
+			TDEActionMenu *actionMenu = new TDEActionMenu(deviceLabel,
+					sdevice->icon(TDEIcon::SizeSmall));
+
+			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable))
 			{
-				if (sdevice->isDiskOfType(TDEDiskDeviceType::Camera))
+				// Mounted and unmounted disks can also be opened
+				addDeviceToLMBMenu(sdevice, SDActions::Open, actionMenu, actionMenuIdx);
+
+				if (sdevice->mountPath().isEmpty())
 				{
-					new KRun(TQString("media:/%1").arg(sdevice->friendlyName()));
+					addDeviceToLMBMenu(sdevice, SDActions::Mount, actionMenu, actionMenuIdx);
 				}
 				else
 				{
-					new KRun(TQString("system:/media/%1").arg(TQFileInfo(sdevice->deviceNode()).baseName(true)));
+					addDeviceToLMBMenu(sdevice, SDActions::Unmount, actionMenu, actionMenuIdx);
 				}
-				return;
 			}
-		}
-	}
-}
 
-void HwDeviceSystemTray::slotMountDevice(int parameter)
-{
-	TQString uuid = m_mountMenuIndexMap[parameter];
-	if (!uuid.isEmpty())
-	{
-		TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-		TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
-		for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next())
-		{
-			TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice);
-			if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid))
+			if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) ||
+					sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted))
 			{
-				if (sdevice->mountPath().isEmpty())
+				if (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt))
 				{
-					TDEProcess proc;
-					proc << "tdeio_media_mounthelper" << "-m" << sdevice->deviceNode();
-					if (!proc.start(TDEProcess::DontCare))
-					{
-						KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."),
-								i18n("Device monitor"));
-					}
+					addDeviceToLMBMenu(sdevice, SDActions::Lock, actionMenu, actionMenuIdx);
 				}
-			}
-		}
-	}
-}
-
-void HwDeviceSystemTray::slotUnmountDevice(int parameter)
-{
-	TQString uuid = m_unmountMenuIndexMap[parameter];
-	if (!uuid.isEmpty())
-	{
-		TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-		TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
-		for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next())
-		{
-			TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice);
-			if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid))
-			{
-				if (!sdevice->mountPath().isEmpty())
+				else
 				{
-					TDEProcess proc;
-					proc << "tdeio_media_mounthelper" << "-u" << sdevice->deviceNode();
-					if (!proc.start(TDEProcess::DontCare))
-					{
-						KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."),
-								i18n("Device monitor"));
-					}
+					addDeviceToLMBMenu(sdevice, SDActions::Unlock, actionMenu, actionMenuIdx);
 				}
 			}
-		}
-	}
-}
 
-void HwDeviceSystemTray::slotUnlockDevice(int parameter)
-{
-	TQString uuid = m_unlockMenuIndexMap[parameter];
-	if (!uuid.isEmpty())
-	{
-		TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-		TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
-		for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next())
-		{
-			TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice);
-			if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid))
+
+			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable))
 			{
-				TDEProcess proc;
-				proc << "tdeio_media_mounthelper" << "-k" << sdevice->deviceNode();
-				if (!proc.start(TDEProcess::DontCare))
-				{
-					KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."),
-							i18n("Device monitor"));
-				}
+				addDeviceToLMBMenu(sdevice, SDActions::Eject, actionMenu, actionMenuIdx);
+
+				addDeviceToLMBMenu(sdevice, SDActions::SafeRemove, actionMenu, actionMenuIdx);
 			}
+
+			addDeviceToLMBMenu(sdevice, SDActions::Properties, actionMenu, actionMenuIdx);
+
+			lmbMenuEntries[deviceLabel] = actionMenu;
 		}
 	}
-}
-
-void HwDeviceSystemTray::slotLockDevice(int parameter)
-{
-	TDEGenericDevice *hwdevice;
-	TQString uuid = m_lockMenuIndexMap[parameter];
-	if (!uuid.isEmpty())
+	// Insert menu entries in sorted order
+	for (TDEActionMenu *am : lmbMenuEntries)
 	{
-		TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-		TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
-		for (hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) {
-			TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice);
-			if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid))
-			{
-				TDEProcess proc;
-				proc << "tdeio_media_mounthelper" << "-l" << sdevice->deviceNode();
-				if (!proc.start(TDEProcess::DontCare))
-				{
-					KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."),
-							    i18n("Device monitor"));
-				}
-		  }
-		}
+		am->plug(d->m_LMBMenu);
 	}
 }
 
-void HwDeviceSystemTray::slotEjectDevice(int parameter)
+void HwDeviceSystemTray::slotExecuteDeviceAction(int parameter)
 {
-	TQString uuid = m_ejectMenuIndexMap[parameter];
+	TQString uuid = d->m_actionMenuEntryMap[parameter].uuid;
+	int actionType = d->m_actionMenuEntryMap[parameter].actionType;
 	if (!uuid.isEmpty())
 	{
 		TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@@ -551,56 +553,42 @@ void HwDeviceSystemTray::slotEjectDevice(int parameter)
 			TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice);
 			if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid))
 			{
-				TDEProcess proc;
-				proc << "tdeio_media_mounthelper" << "-e" << sdevice->deviceNode();
-				if (!proc.start(TDEProcess::DontCare))
+				if (actionType == SDActions::Open)
 				{
-					KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."),
-							    i18n("Device monitor"));
+					if (sdevice->isDiskOfType(TDEDiskDeviceType::Camera))
+					{
+						new KRun(TQString("media:/%1").arg(sdevice->friendlyName()));
+					}
+					else
+					{
+						new KRun(TQString("system:/media/%1").arg(TQFileInfo(sdevice->deviceNode()).baseName(true)));
+					}
 				}
-			}
-		}
-	}
-}
-
-void HwDeviceSystemTray::slotSafeRemoveDevice(int parameter)
-{
-	TQString uuid = m_safeRemoveMenuIndexMap[parameter];
-	if (!uuid.isEmpty())
-	{
-		TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-		TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
-		for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next())
-		{
-			TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice);
-			if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid))
-			{
-				TDEProcess proc;
-				proc << "tdeio_media_mounthelper" << "-s" << sdevice->deviceNode();
-				if (!proc.start(TDEProcess::DontCare))
+				else if (actionType == SDActions::Properties)
 				{
-					KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."),
-							    i18n("Device monitor"));
+					new KPropertiesDialog(KURL(TQString("media:/%1").arg(sdevice->deviceNode())));
+				}
+				else
+				{
+					TQString opType = TQString::null;
+					if (actionType == SDActions::Mount)           { opType = "-m"; }
+					else if (actionType == SDActions::Unmount)    { opType = "-u"; }
+					else if (actionType == SDActions::Unlock)     { opType = "-k"; }
+					else if (actionType == SDActions::Lock)       { opType = "-l"; }
+					else if (actionType == SDActions::Eject)      { opType = "-e"; }
+					else if (actionType == SDActions::SafeRemove) { opType = "-s"; }
+
+					if (!opType.isEmpty())
+					{
+						TDEProcess proc;
+						proc << "tdeio_media_mounthelper" << opType << sdevice->deviceNode();
+						if (!proc.start(TDEProcess::DontCare))
+						{
+							KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."),
+									i18n("Device monitor"));
+						}
+					}
 				}
-			}
-		}
-	}
-}
-
-void HwDeviceSystemTray::slotPropertiesDevice(int parameter)
-{
-	TQString uuid = m_propertiesMenuIndexMap[parameter];
-	if (!uuid.isEmpty())
-	{
-		TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-		TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
-		for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next())
-		{
-			TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice);
-			if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid))
-			{
-				new KPropertiesDialog(KURL(TQString("media:/%1").arg(sdevice->deviceNode())));
-				return;
 			}
 		}
 	}
@@ -642,8 +630,8 @@ void HwDeviceSystemTray::doDiskNotifications(bool scanOnly)
 	// Scan devices for changes and notify new devices if needed.
 	// This is necessary because the device information may not be available
 	// at the time the hardwareAdded signal is emitted
-	TQMap<TQString, KnownDiskDeviceInfo> oldKnownDevices = m_knownDiskDevices;
-	m_knownDiskDevices.clear();
+	TQMap<TQString, KnownDiskDeviceInfo> oldKnownDevices = d->m_knownDiskDevices;
+	d->m_knownDiskDevices.clear();
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
 	for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next())
@@ -654,22 +642,17 @@ void HwDeviceSystemTray::doDiskNotifications(bool scanOnly)
 			TQString sysPath = sdevice->systemPath();
 			if (oldKnownDevices.contains(sysPath))
 			{
-				m_knownDiskDevices[sysPath] = oldKnownDevices[sysPath];
+				d->m_knownDiskDevices[sysPath] = oldKnownDevices[sysPath];
 				oldKnownDevices.remove(sysPath);
 			}
 			else
 			{
-				TQString friendlyName = sdevice->diskLabel();
-				if (friendlyName.isEmpty())
-				{
-					friendlyName = sdevice->friendlyName();
-				}
-				m_knownDiskDevices[sysPath] = { friendlyName, sdevice->deviceNode() };
+				TQString deviceLabel = getDeviceLabel(sdevice);
+				d->m_knownDiskDevices[sysPath] = { deviceLabel, sdevice->deviceNode() };
 				if (!scanOnly && popupEnable)
 				{
-					m_hardwareNotifierContainer->displayMessage(
-							i18n("A disk device has been added!"),
-							i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()),
+					d->m_hardwareNotifierContainer->displayMessage(
+							i18n("A disk device has been added!"), deviceLabel,
 							SmallIcon("drive-harddisk-unmounted"), 0, 0, "ADD: " + sysPath);
 				}
 			}
@@ -681,9 +664,8 @@ void HwDeviceSystemTray::doDiskNotifications(bool scanOnly)
 		TQMap<TQString, KnownDiskDeviceInfo>::ConstIterator delIt;
 		for (delIt = oldKnownDevices.begin(); delIt != oldKnownDevices.end(); delIt++)
 		{
-			m_hardwareNotifierContainer->displayMessage(
-					i18n("A disk device has been removed!"),
-					i18n("%1 (%2)").arg(delIt.data().friendlyName, delIt.data().node),
+			d->m_hardwareNotifierContainer->displayMessage(
+					i18n("A disk device has been removed!"), delIt.data().deviceLabel,
 					SmallIcon("drive-harddisk-unmounted"), 0, 0, "REMOVE: " + delIt.key());
 		}
 	}
@@ -697,21 +679,16 @@ void HwDeviceSystemTray::deviceAdded(TDEGenericDevice* device)
 		// The device information may not be available at the time the hardwareAdded signal is emitted.
 		// In such case ignore the event and handle that at the subsequent hardwareUpdate signal emission.
 		TQString sysPath = sdevice->systemPath();
-		if (isMonitoredDevice(sdevice) && !m_knownDiskDevices.contains(sysPath))
+		if (isMonitoredDevice(sdevice) && !d->m_knownDiskDevices.contains(sysPath))
 		{
-			TQString friendlyName = sdevice->diskLabel();
-			if (friendlyName.isEmpty())
-			{
-				friendlyName = sdevice->friendlyName();
-			}
-			m_knownDiskDevices[sysPath] = { friendlyName, sdevice->deviceNode() };
+			TQString deviceLabel = getDeviceLabel(sdevice);
+			d->m_knownDiskDevices[sysPath] = { deviceLabel, sdevice->deviceNode() };
 			TDEConfig config("mediamanagerrc");
 			config.setGroup("Global");
 			if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true))
 			{
-				m_hardwareNotifierContainer->displayMessage(
-						i18n("A disk device has been added!"),
-						i18n("%1 (%2)").arg(friendlyName, sdevice->deviceNode()),
+				d->m_hardwareNotifierContainer->displayMessage(
+						i18n("A disk device has been added!"), deviceLabel,
 						SmallIcon("drive-harddisk-unmounted"), 0, 0, "ADD: " + sysPath);
 			}
 		}
@@ -724,18 +701,18 @@ void HwDeviceSystemTray::deviceRemoved(TDEGenericDevice* device)
 	{
 		TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(device);
 		TQString sysPath = sdevice->systemPath();
-		if (isMonitoredDevice(sdevice) && m_knownDiskDevices.contains(sysPath))
+		if (isMonitoredDevice(sdevice) && d->m_knownDiskDevices.contains(sysPath))
 		{
 			TDEConfig config("mediamanagerrc");
 			config.setGroup("Global");
 			if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true))
 			{
-				m_hardwareNotifierContainer->displayMessage(
-						i18n("A disk device has been removed!"),
-						i18n("%1 (%2)").arg(m_knownDiskDevices[sysPath].friendlyName, m_knownDiskDevices[sysPath].node),
+				TQString deviceLabel = getDeviceLabel(sdevice);
+				d->m_hardwareNotifierContainer->displayMessage(
+						i18n("A disk device has been removed!"), deviceLabel,
 						SmallIcon("drive-harddisk-unmounted"), 0, 0, "REMOVE: " + sysPath);
 			}
-			m_knownDiskDevices.remove(sysPath);
+			d->m_knownDiskDevices.remove(sysPath);
 		}
 	}
 }
@@ -748,6 +725,13 @@ void HwDeviceSystemTray::deviceChanged(TDEGenericDevice* device)
 void HwDeviceSystemTray::devicePopupClicked(KPassivePopup* popup, TQPoint point, TQString uuid) {
 	TDEGenericDevice *hwdevice;
 	if (uuid.startsWith("ADD: ")) {
+		TDEConfig config("mediamanagerrc");
+		config.setGroup("Global");
+		if (config.readBoolEntry("NotificationPopupsEnabled", true))
+		{
+			return;
+		}
+
 		uuid = uuid.right(uuid.length() - strlen("ADD: "));
 		if (uuid != "") {
 			TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
diff --git a/kcontrol/hwmanager/hwdevicetray.h b/kcontrol/hwmanager/hwdevicetray.h
index c0465f2bf..4f019ae58 100644
--- a/kcontrol/hwmanager/hwdevicetray.h
+++ b/kcontrol/hwmanager/hwdevicetray.h
@@ -1,8 +1,8 @@
 /*
  * Copyright 2015 Timothy Pearson <kb9vqf@pearsoncomputing.net>
- * 
+ *
  * This file is part of hwdevicetray, the TDE Hardware Device Monitor System Tray Application
- * 
+ *
  * hwdevicetray is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3
@@ -20,93 +20,58 @@
 #ifndef TDEHWDEVICETRAY_H
 #define TDEHWDEVICETRAY_H
 
-#include <tqptrlist.h>
-
 #include <ksystemtray.h>
-#include <kglobalaccel.h>
-#include <ksimpleconfig.h>
-#include <tdepassivepopupstack.h>
 
-#include <tdehardwaredevices.h>
-#include <tdestoragedevice.h>
-
-class KHelpMenu;
-class PasswordDlg;
+class HwDeviceSystemTrayPrivate;
+class KPassivePopup;
+class TDEActionMenu;
+class TDEGenericDevice;
+class TDEGlobalAccel;
 class TDEPopupMenu;
+class TDEStorageDevice;
 
-typedef TQMap<int, TQString> TQStringMap;
-
-class HwDeviceSystemTray :  public KSystemTray
+class HwDeviceSystemTray : public KSystemTray
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	HwDeviceSystemTray(TQWidget* parent = 0, const char *name = 0);
 	~HwDeviceSystemTray();
-	TDEGlobalAccel *globalKeys;
 
-	virtual void contextMenuAboutToShow(TDEPopupMenu* menu);
+	TDEGlobalAccel *globalKeys;
 
-	void configChanged();
+	virtual void contextMenuAboutToShow(TDEPopupMenu *menu);
 
 protected slots:
 	void slotHardwareConfig();
 	void slotEditShortcutKeys();
 	void slotSettingsChanged(int category);
 	void slotHelpContents();
+	void slotExecuteDeviceAction(int parameter);
 
-	void slotOpenDevice(int parameter);
-	void slotMountDevice(int parameter);
-	void slotUnmountDevice(int parameter);
-	void slotUnlockDevice(int parameter);
-	void slotLockDevice(int parameter);
-	void slotEjectDevice(int parameter);
-	void slotSafeRemoveDevice(int parameter);
-	void slotPropertiesDevice(int parameter);
-
-protected:
-	void mousePressEvent(TQMouseEvent *e);
-	void resizeEvent(TQResizeEvent *);
-	void showEvent(TQShowEvent *);
-
-private slots:
-	void _quit();
+	void quitApp();
 	void deviceAdded(TDEGenericDevice*);
 	void deviceRemoved(TDEGenericDevice*);
 	void deviceChanged(TDEGenericDevice*);
 	void devicePopupClicked(KPassivePopup*, TQPoint, TQString);
 	void doDiskNotifications(bool scanOnly);
 
-private:
-	static bool isMonitoredDevice(TDEStorageDevice *sdevice);
-
-private:
-	void populateMenu(TDEPopupMenu* menu);
+protected:
+	void initMenus();
+	void mousePressEvent(TQMouseEvent *e);
+	void populateLMBMenu();
+	void resizeEvent(TQResizeEvent *);
 	void resizeTrayIcon();
+	void showEvent(TQShowEvent *);
 
-	bool m_popupUp;
-	KHelpMenu* m_help;
-
-	TQWidget* m_parent;
-	TDEPassivePopupStackContainer* m_hardwareNotifierContainer;
+	static bool isMonitoredDevice(TDEStorageDevice *sdevice);
+	static TQString getDeviceLabel(TDEStorageDevice *sdevice);
 
-	TQStringMap m_openMenuIndexMap;
-	TQStringMap m_mountMenuIndexMap;
-	TQStringMap m_unmountMenuIndexMap;
-	TQStringMap m_unlockMenuIndexMap;
-	TQStringMap m_lockMenuIndexMap;
-	TQStringMap m_ejectMenuIndexMap;
-	TQStringMap m_safeRemoveMenuIndexMap;
-	TQStringMap m_propertiesMenuIndexMap;
-	TDEPopupMenu* m_menu;
-	KSimpleConfig *r_config;
+	void addDeviceToLMBMenu(TDEStorageDevice *sdevice, const int type, TDEActionMenu *actionMenu,
+	        int &actionMenuIdx);
+	void addDeviceToRMBMenu(TDEStorageDevice *sdevice, const int type, int &actionMenuIdx);
 
-	struct KnownDiskDeviceInfo
-	{
-		TQString friendlyName;
-		TQString node;
-	};
-	TQMap<TQString, KnownDiskDeviceInfo> m_knownDiskDevices;
+	HwDeviceSystemTrayPrivate *d;
 };
 
 #endif
diff --git a/kcontrol/hwmanager/hwdevicetray_app.h b/kcontrol/hwmanager/hwdevicetray_app.h
index fae4d6cd9..8c4a4ae06 100644
--- a/kcontrol/hwmanager/hwdevicetray_app.h
+++ b/kcontrol/hwmanager/hwdevicetray_app.h
@@ -27,7 +27,7 @@ class HwDeviceSystemTray;
 
 class HwDeviceApp : public KUniqueApplication
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 	public:
 		HwDeviceApp();
diff --git a/kcontrol/hwmanager/hwdevicetray_bindings.cpp b/kcontrol/hwmanager/hwdevicetray_bindings.cpp
index bcbbbda1b..09974ac68 100644
--- a/kcontrol/hwmanager/hwdevicetray_bindings.cpp
+++ b/kcontrol/hwmanager/hwdevicetray_bindings.cpp
@@ -18,7 +18,7 @@
 */
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
 #else
 # define DEF( name, key3, key4, fnSlot ) \
    keys->insert( name, i18n(name), TQString(), key3, key4 )
diff --git a/kcontrol/hwmanager/hwdevicetray_configdialog.h b/kcontrol/hwmanager/hwdevicetray_configdialog.h
index 657b3ee43..823931757 100644
--- a/kcontrol/hwmanager/hwdevicetray_configdialog.h
+++ b/kcontrol/hwmanager/hwdevicetray_configdialog.h
@@ -42,7 +42,7 @@ class ConfigDialog;
 
 class ConfigDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 	public:
 		ConfigDialog(TDEGlobalAccel *accel, bool isApplet );
diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp
index 265901003..97251cb89 100644
--- a/kcontrol/hwmanager/hwmanager.cpp
+++ b/kcontrol/hwmanager/hwmanager.cpp
@@ -87,18 +87,19 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis
 
 	base->deviceFilter->setListView(base->deviceTree);
 
+	deviceUpdateScheduled = false;
+
 	setRootOnlyMsg(i18n("<b>Device settings are system wide, and therefore require administrator access</b><br>To alter the system's device settings, click on the \"Administrator Mode\" button below."));
 	setUseRootOnlyMsg(true);
 
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	hwdevices->setTriggerlessHardwareUpdatesEnabled(true);
 
-	connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-	connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(populateTreeView()));
+	connect(base->showByConnection, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+	connect(base->showByConnection, TQ_SIGNAL(clicked()), TQ_SLOT(populateTreeView()));
 
-	connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(populateTreeView()));
-	connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(populateTreeView()));
-	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(scheduleDeviceUpdate()));
+	connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(scheduleDeviceUpdate()));
 
 	load();
 
@@ -132,8 +133,19 @@ void TDEHWManager::defaults()
 	load( true );
 }
 
+void TDEHWManager::scheduleDeviceUpdate()
+{
+	if (!deviceUpdateScheduled)
+	{
+		deviceUpdateScheduled = true;
+		TQTimer::singleShot(1000, this, TQ_SLOT(populateTreeView()));
+	}
+}
+
 void TDEHWManager::populateTreeView()
 {
+	deviceUpdateScheduled = false;
+
 	bool show_by_connection = base->showByConnection->isChecked();
 
 	// Figure out which device, if any, was selected
@@ -154,7 +166,7 @@ void TDEHWManager::populateTreeView()
 		for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
 			if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) {
 				TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-				connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
+				connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
 				cdevice->enableCardMonitoring(true);
 				cdevice->enablePINEntryCallbacks(true);
 			}
@@ -176,7 +188,7 @@ void TDEHWManager::populateTreeView()
 				for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
 					if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) {
 						TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-						connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
+						connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
 						cdevice->enableCardMonitoring(true);
 						cdevice->enablePINEntryCallbacks(true);
 					}
@@ -199,7 +211,7 @@ void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_con
 		for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
 			if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) {
 				TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-				connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
+				connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
 				cdevice->enableCardMonitoring(true);
 				cdevice->enablePINEntryCallbacks(true);
 			}
@@ -215,24 +227,6 @@ void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_con
 	}
 }
 
-void TDEHWManager::deviceChanged(TDEGenericDevice* device) {
-	TQListViewItemIterator it(base->deviceTree);
-	while (it.current()) {
-		DeviceIconItem* item = dynamic_cast<DeviceIconItem*>(it.current());
-		if (item) {
-			TDEGenericDevice* candidate = item->device();
-			if (candidate) {
-				if (candidate->systemPath() == device->systemPath()) {
-					if (item->text(0) != device->detailedFriendlyName()) {
-						item->setText(0, device->detailedFriendlyName());
-					}
-				}
-			}
-		}
-		++it;
-	}
-}
-
 void TDEHWManager::cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice) {
 	TQString password;
 	int result = KPasswordDialog::getPassword(password, prompt);
diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h
index abc05fa54..020a51f22 100644
--- a/kcontrol/hwmanager/hwmanager.h
+++ b/kcontrol/hwmanager/hwmanager.h
@@ -41,7 +41,7 @@ class TDEListViewItem;
 class TDEHWManager : public TDECModule, public DCOPObject
 {
 	K_DCOP
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	//TDEHWManager(TQWidget *parent = 0L, const char *name = 0L);
@@ -58,15 +58,15 @@ public:
 k_dcop:
 
 private slots:
+	void cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice);
 	void populateTreeView();
 	void populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_connection, TQString selected_syspath);
-	void deviceChanged(TDEGenericDevice*);
-	void cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice);
+	void scheduleDeviceUpdate();
 
 private:
 	TDEHWManagerBase *base;
-
 	TDEConfig *config;
+	bool deviceUpdateScheduled;
 };
 
 #endif
diff --git a/kcontrol/hwmanager/hwmanagerbase.ui b/kcontrol/hwmanager/hwmanagerbase.ui
index 6c785921d..ee84b81c3 100644
--- a/kcontrol/hwmanager/hwmanagerbase.ui
+++ b/kcontrol/hwmanager/hwmanagerbase.ui
@@ -74,9 +74,9 @@
 	<include location="local" impldecl="in implementation">TDEHWManagerBase.ui.h</include>
 	<include location="local" impldecl="in implementation">deviceiconview.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>enableSupport_toggled(bool)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include>
diff --git a/kcontrol/hwmanager/passworddlg.cpp b/kcontrol/hwmanager/passworddlg.cpp
index 07b6027ae..22b82648f 100644
--- a/kcontrol/hwmanager/passworddlg.cpp
+++ b/kcontrol/hwmanager/passworddlg.cpp
@@ -30,7 +30,7 @@ PasswordDlg::PasswordDlg() :
 	enableButton( User1, false );
 	unlockDialog->encryptedIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("drive-harddisk-locked",
 				  TDEIcon::NoGroup, TDEIcon::SizeLarge));
-	connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
+	connect(unlockDialog->passwordEdit, TQ_SIGNAL (textChanged(const TQString &)), this, TQ_SLOT (slotPasswordChanged(const TQString &)));
 
 	setMainWidget(unlockDialog);
 }
diff --git a/kcontrol/hwmanager/passworddlg.h b/kcontrol/hwmanager/passworddlg.h
index bee1431cc..091b5aa5f 100644
--- a/kcontrol/hwmanager/passworddlg.h
+++ b/kcontrol/hwmanager/passworddlg.h
@@ -39,7 +39,7 @@
 class PasswordDlg : public KDialogBase
 {
 
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	PasswordDlg();
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index 2ca108e3f..218c3e615 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -87,23 +87,23 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
   setRootOnlyMsg(i18n("<b>The global color profile is a system wide setting, and requires administrator access</b><br>To alter the system's global profile, click on the \"Administrator Mode\" button below."));
 //   setUseRootOnlyMsg(true);	// Setting this hides the Apply button!
 
-  connect(base->systemEnableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-  connect(base->systemEnableSupport, TQT_SIGNAL(toggled(bool)), base->systemIccFile, TQT_SLOT(setEnabled(bool)));
-  connect(base->enableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-  connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->iccFile, TQT_SLOT(setEnabled(bool)));
-  connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->randrScreenList, TQT_SLOT(setEnabled(bool)));
-  connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->iccProfileList, TQT_SLOT(setEnabled(bool)));
-  connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->addProfileButton, TQT_SLOT(setEnabled(bool)));
-  connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->renameProfileButton, TQT_SLOT(setEnabled(bool)));
-  connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->deleteProfileButton, TQT_SLOT(setEnabled(bool)));
-  connect(base->iccProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectProfile(int)));
-  connect(base->randrScreenList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectScreen(int)));
-  connect(base->iccFile, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateArray()));
-  connect(base->systemIccFile, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
-
-  connect(base->addProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addProfile()));
-  connect(base->renameProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(renameProfile()));
-  connect(base->deleteProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteProfile()));
+  connect(base->systemEnableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+  connect(base->systemEnableSupport, TQ_SIGNAL(toggled(bool)), base->systemIccFile, TQ_SLOT(setEnabled(bool)));
+  connect(base->enableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+  connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->iccFile, TQ_SLOT(setEnabled(bool)));
+  connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->randrScreenList, TQ_SLOT(setEnabled(bool)));
+  connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->iccProfileList, TQ_SLOT(setEnabled(bool)));
+  connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->addProfileButton, TQ_SLOT(setEnabled(bool)));
+  connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->renameProfileButton, TQ_SLOT(setEnabled(bool)));
+  connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->deleteProfileButton, TQ_SLOT(setEnabled(bool)));
+  connect(base->iccProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectProfile(int)));
+  connect(base->randrScreenList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectScreen(int)));
+  connect(base->iccFile, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(updateArray()));
+  connect(base->systemIccFile, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
+
+  connect(base->addProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addProfile()));
+  connect(base->renameProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(renameProfile()));
+  connect(base->deleteProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteProfile()));
 
   load();
 
diff --git a/kcontrol/iccconfig/iccconfig.h b/kcontrol/iccconfig/iccconfig.h
index 4fd29e4e9..d3681c5bb 100644
--- a/kcontrol/iccconfig/iccconfig.h
+++ b/kcontrol/iccconfig/iccconfig.h
@@ -38,7 +38,7 @@ class TDEListViewItem;
 class KICCConfig : public TDECModule, public DCOPObject
 {
   K_DCOP
-    Q_OBJECT
+    TQ_OBJECT
 
 
 public:
diff --git a/kcontrol/iccconfig/iccconfigbase.ui b/kcontrol/iccconfig/iccconfigbase.ui
index 499d626f0..bca12d092 100644
--- a/kcontrol/iccconfig/iccconfigbase.ui
+++ b/kcontrol/iccconfig/iccconfigbase.ui
@@ -185,9 +185,9 @@
 <includes>
 	<include location="local" impldecl="in implementation">ICCConfigBase.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>enableSupport_toggled(bool)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index 667ecaa22..57fe2669f 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -52,7 +52,7 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
                                         KDialog::spacingHint());
     g_vlay->addSpacing(fontMetrics().lineSpacing());
     mpUsageList = new TQListBox(gbox);
-    connect(mpUsageList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotUsage(int)));
+    connect(mpUsageList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotUsage(int)));
     g_vlay->addWidget(mpUsageList);
 
     KSeparator *sep = new KSeparator( KSeparator::HLine, this );
@@ -65,11 +65,11 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
     TQPushButton *push;
 
     mPreviewButton1 = addPreviewIcon(0, i18n("Default"), this, g_lay);
-    connect(mPreviewButton1, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup0()));
+    connect(mPreviewButton1, TQ_SIGNAL(clicked()), TQ_SLOT(slotEffectSetup0()));
     mPreviewButton2 = addPreviewIcon(1, i18n("Active"), this, g_lay);
-    connect(mPreviewButton2, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup1()));
+    connect(mPreviewButton2, TQ_SIGNAL(clicked()), TQ_SLOT(slotEffectSetup1()));
     mPreviewButton3 = addPreviewIcon(2, i18n("Disabled"), this, g_lay);
-    connect(mPreviewButton3, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup2()));
+    connect(mPreviewButton3, TQ_SIGNAL(clicked()), TQ_SLOT(slotEffectSetup2()));
 
     m_pTab1 = new TQWidget(this, "General Tab");
     top->addWidget(m_pTab1, 0, 1);
@@ -81,27 +81,27 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
     // Size
     TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1);
     lbl->setFixedSize(lbl->sizeHint());
-    grid->addWidget(lbl, 0, 0, Qt::AlignLeft);
+    grid->addWidget(lbl, 0, 0, TQt::AlignLeft);
     mpSizeBox = new TQComboBox(m_pTab1);
-    connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int)));
+    connect(mpSizeBox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSize(int)));
     lbl->setBuddy(mpSizeBox);
-    grid->addWidget(mpSizeBox, 0, 1, Qt::AlignLeft);
+    grid->addWidget(mpSizeBox, 0, 1, TQt::AlignLeft);
 
     mpDPCheck = new TQCheckBox(i18n("Double-sized pixels"), m_pTab1);
-    connect(mpDPCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDPCheck(bool)));
-    grid->addMultiCellWidget(mpDPCheck, 1, 1, 0, 1, Qt::AlignLeft);
+    connect(mpDPCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDPCheck(bool)));
+    grid->addMultiCellWidget(mpDPCheck, 1, 1, 0, 1, TQt::AlignLeft);
 
     mpAnimatedCheck = new TQCheckBox(i18n("Animate icons"), m_pTab1);
-    connect(mpAnimatedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnimatedCheck(bool)));
-    grid->addMultiCellWidget(mpAnimatedCheck, 2, 2, 0, 1, Qt::AlignLeft);
+    connect(mpAnimatedCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAnimatedCheck(bool)));
+    grid->addMultiCellWidget(mpAnimatedCheck, 2, 2, 0, 1, TQt::AlignLeft);
 
     mpRoundedCheck = new TQCheckBox(i18n("Rounded text selection"), m_pTab1);
-    connect(mpRoundedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRoundedCheck(bool)));
-    grid->addMultiCellWidget(mpRoundedCheck, 3, 3, 0, 1, Qt::AlignLeft);
+    connect(mpRoundedCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRoundedCheck(bool)));
+    grid->addMultiCellWidget(mpRoundedCheck, 3, 3, 0, 1, TQt::AlignLeft);
 
     mpActiveEffectCheck = new TQCheckBox(i18n("Show icon activation effect"), m_pTab1);
-    connect(mpActiveEffectCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotActiveEffect(bool)));
-    grid->addMultiCellWidget(mpActiveEffectCheck, 4, 4, 0, 1, Qt::AlignLeft);
+    connect(mpActiveEffectCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotActiveEffect(bool)));
+    grid->addMultiCellWidget(mpActiveEffectCheck, 4, 4, 0, 1, TQt::AlignLeft);
 
     top->activate();
 
@@ -123,13 +123,13 @@ TDEIconConfig::~TDEIconConfig()
 TQPushButton *TDEIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay)
 {
     TQLabel *lab = new TQLabel(str, parent);
-    lay->addWidget(lab, 1, i, Qt::AlignCenter);
+    lay->addWidget(lab, 1, i, TQt::AlignCenter);
     mpPreview[i] = new TQLabel(parent);
     mpPreview[i]->setAlignment(AlignCenter);
     mpPreview[i]->setMinimumSize(105, 105);
     lay->addWidget(mpPreview[i], 2, i);
     TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent);
-    lay->addWidget(push, 3, i, Qt::AlignCenter);
+    lay->addWidget(push, 3, i, TQt::AlignCenter);
     return push;
 }
 
@@ -689,7 +689,7 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
 
     lbl = new TQLabel(i18n("&Effect:"), page);
     lbl->setFixedSize(lbl->sizeHint());
-    top->addWidget(lbl, 0, 0, Qt::AlignLeft);
+    top->addWidget(lbl, 0, 0, TQt::AlignLeft);
     mpEffectBox = new TQListBox(page);
     mpEffectBox->insertItem(i18n("No Effect"));
     mpEffectBox->insertItem(i18n("To Gray"));
@@ -698,13 +698,13 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
     mpEffectBox->insertItem(i18n("Desaturate"));
     mpEffectBox->insertItem(i18n("To Monochrome"));
     mpEffectBox->setMinimumWidth( 100 );
-    connect(mpEffectBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotEffectType(int)));
-    top->addMultiCellWidget(mpEffectBox, 1, 2, 0, 0, Qt::AlignLeft);
+    connect(mpEffectBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotEffectType(int)));
+    top->addMultiCellWidget(mpEffectBox, 1, 2, 0, 0, TQt::AlignLeft);
     lbl->setBuddy(mpEffectBox);
 
     mpSTCheck = new TQCheckBox(i18n("&Semi-transparent"), page);
-    connect(mpSTCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSTCheck(bool)));
-    top->addWidget(mpSTCheck, 3, 0, Qt::AlignLeft);
+    connect(mpSTCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSTCheck(bool)));
+    top->addWidget(mpSTCheck, 3, 0, TQt::AlignLeft);
 
     frame = new TQGroupBox(i18n("Preview"), page);
     top->addMultiCellWidget(frame, 0, 1, 1, 1);
@@ -724,25 +724,25 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
 
     mpEffectLabel = new TQLabel(i18n("&Amount:"), mpEffectGroup);
     grid->addWidget(mpEffectLabel, 1, 0);
-    mpEffectSlider = new TQSlider(0, 100, 5, 10, Qt::Horizontal, mpEffectGroup);
+    mpEffectSlider = new TQSlider(0, 100, 5, 10, TQt::Horizontal, mpEffectGroup);
     mpEffectLabel->setBuddy( mpEffectSlider );
-    connect(mpEffectSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotEffectValue(int)));
+    connect(mpEffectSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotEffectValue(int)));
     grid->addWidget(mpEffectSlider, 1, 1);
 
     mpEffectColor = new TQLabel(i18n("Co&lor:"), mpEffectGroup);
     grid->addWidget(mpEffectColor, 2, 0);
     mpEColButton = new KColorButton(mpEffectGroup);
     mpEffectColor->setBuddy( mpEColButton );
-    connect(mpEColButton, TQT_SIGNAL(changed(const TQColor &)),
-		TQT_SLOT(slotEffectColor(const TQColor &)));
+    connect(mpEColButton, TQ_SIGNAL(changed(const TQColor &)),
+		TQ_SLOT(slotEffectColor(const TQColor &)));
     grid->addWidget(mpEColButton, 2, 1);
 
     mpEffectColor2 = new TQLabel(i18n("&Second color:"), mpEffectGroup);
     grid->addWidget(mpEffectColor2, 3, 0);
     mpECol2Button = new KColorButton(mpEffectGroup);
     mpEffectColor2->setBuddy( mpECol2Button );
-    connect(mpECol2Button, TQT_SIGNAL(changed(const TQColor &)),
-		TQT_SLOT(slotEffectColor2(const TQColor &)));
+    connect(mpECol2Button, TQ_SIGNAL(changed(const TQColor &)),
+		TQ_SLOT(slotEffectColor2(const TQColor &)));
     grid->addWidget(mpECol2Button, 3, 1);
 
     init();
diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h
index 2c00a16e5..3fe37a3a4 100644
--- a/kcontrol/icons/icons.h
+++ b/kcontrol/icons/icons.h
@@ -55,7 +55,7 @@ struct Effect
  */
 class TDEIconConfig: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TDEIconConfig(TQWidget *parent, const char *name=0);
@@ -123,7 +123,7 @@ private:
 
 class TDEIconEffectSetupDialog: public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
      
 public:
     TDEIconEffectSetupDialog(const Effect &, const Effect &,
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 826f6300d..86d782a1b 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -82,15 +82,15 @@ IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name)
   m_iconThemes->addColumn(i18n("Description"));
   m_iconThemes->setAllColumnsShowFocus( true );
   m_iconThemes->setFullWidth(true);
-  connect(m_iconThemes,TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-		TQT_SLOT(themeSelected(TQListViewItem *)));
+  connect(m_iconThemes,TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+		TQ_SLOT(themeSelected(TQListViewItem *)));
 
   TQPushButton *installButton=new TQPushButton( i18n("Install New Theme..."),
 	this, "InstallNewTheme");
-  connect(installButton,TQT_SIGNAL(clicked()),TQT_SLOT(installNewTheme()));
+  connect(installButton,TQ_SIGNAL(clicked()),TQ_SLOT(installNewTheme()));
   m_removeButton=new TQPushButton( i18n("Remove Theme"),
 	this, "RemoveTheme");
-  connect(m_removeButton,TQT_SIGNAL(clicked()),TQT_SLOT(removeSelectedTheme()));
+  connect(m_removeButton,TQ_SIGNAL(clicked()),TQ_SLOT(removeSelectedTheme()));
 
   topLayout->addWidget(
 	new TQLabel(i18n("Select the icon theme you want to use:"), this));
diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h
index ccb914846..424d58630 100644
--- a/kcontrol/icons/iconthemes.h
+++ b/kcontrol/icons/iconthemes.h
@@ -32,7 +32,7 @@ class TQStringList;
 
 class IconThemesConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   IconThemesConfig(TQWidget *parent = 0L, const char *name = 0L);
diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp
index 359bfec91..214e85a70 100644
--- a/kcontrol/icons/main.cpp
+++ b/kcontrol/icons/main.cpp
@@ -45,11 +45,11 @@ IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &)
 
   tab1 = new IconThemesConfig(this, "themes");
   tab->addTab(tab1, i18n("&Theme"));
-  connect(tab1, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(tab1, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   tab2 = new TDEIconConfig(this, "effects");
   tab->addTab(tab2, i18n("Ad&vanced"));
-  connect(tab2, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(tab2, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   TDEAboutData* about = new TDEAboutData("kcmicons", I18N_NOOP("Icons"), "3.0",
 	      I18N_NOOP("Icons Control Panel Module"),
diff --git a/kcontrol/icons/main.h b/kcontrol/icons/main.h
index 840704351..eea944b6b 100644
--- a/kcontrol/icons/main.h
+++ b/kcontrol/icons/main.h
@@ -31,7 +31,7 @@
 
 class IconModule : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   IconModule(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kcontrol/info/CMakeLists.txt b/kcontrol/info/CMakeLists.txt
index dbedbfe4d..35064b574 100644
--- a/kcontrol/info/CMakeLists.txt
+++ b/kcontrol/info/CMakeLists.txt
@@ -39,10 +39,14 @@ tde_create_translated_desktop(
 )
 
 
+##### configure checks ##########################
+
+include( ConfigureChecks.cmake )
+
 ##### kcm_info (module) #########################
 
 tde_add_kpart( kcm_info AUTOMOC
   SOURCES main.cpp memory.cpp ${OPENGL_SOURCES}
-  LINK tdeui-shared ${GL_LIBRARIES} ${GLU_LIBRARIES}
+  LINK tdeui-shared ${GL_LIBRARIES} ${GLU_LIBRARIES} ${KSTAT_LIBRARIES} ${DEVINFO_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/info/ConfigureChecks.cmake b/kcontrol/info/ConfigureChecks.cmake
new file mode 100644
index 000000000..ec881f0f2
--- /dev/null
+++ b/kcontrol/info/ConfigureChecks.cmake
@@ -0,0 +1,21 @@
+#################################################
+#
+#  (C) 2023 DilOS Team
+#  denis (AT) tambov (DOT) ru
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+# devinfo
+check_library_exists( devinfo di_init "" HAVE_DEVINFO )
+if( HAVE_DEVINFO )
+  set( DEVINFO_LIBRARIES devinfo )
+else()
+  if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+    tde_message_fatal( "libdevinfo not found on SunOS platform!" )
+  endif()
+  set( DEVINFO_LIBRARIES "" )
+endif( )
diff --git a/kcontrol/info/info_solaris.cpp b/kcontrol/info/info_solaris.cpp
index 9f2b17e1b..f6ab922ea 100644
--- a/kcontrol/info/info_solaris.cpp
+++ b/kcontrol/info/info_solaris.cpp
@@ -45,9 +45,9 @@ bool GetInfo_CPU( TQListView *lBox ) {
 	char		*ptr;
 	uint32_t	i, ncpus;
 	unsigned long	state_begin;
-	QString		state;
-	QString		mhz;
-	QString		inst;
+	TQString	state;
+	TQString	mhz;
+	TQString	inst;
 
 	/*
 	 *  get a kstat handle first and update the user's kstat chain
@@ -167,8 +167,8 @@ bool GetInfo_Partitions( TQListView *lBox ) {
 	struct mnttab	mnt;
 	struct statvfs	statbuf;
 	fsblkcnt_t	tmp;
-	QString		total;
-	QString		avail;
+	TQString	total;
+	TQString	avail;
 	time_t		mnttime;
 	char		*timetxt;
 	char		*ptr;
@@ -315,7 +315,7 @@ bool GetInfo_XServer_and_Video( TQListView *lBox ) {
  */
 TQListViewItem *mktree( TQListViewItem *top, const char *path ) {
 
-	QListViewItem	*parent,
+	TQListViewItem	*parent,
 			*previous,
 			*result;
 	char		*str = strdup( path ),
@@ -380,7 +380,7 @@ TQListViewItem *mktree( TQListViewItem *top, const char *path ) {
 /*
  *  prop_type_str()  -- return the property type as a string
  */
-char *prop_type_str( di_prop_t prop ) {
+const char *prop_type_str( di_prop_t prop ) {
 
 	switch( di_prop_type( prop )) {
 		case DI_PROP_TYPE_UNDEF_IT:
@@ -448,8 +448,8 @@ int prop_type_guess( uchar_t *data, int len ) {
  */
 int dump_minor_node( di_node_t node, di_minor_t minor, void *arg ) {
 
-	QListViewItem	*item;
-	QString		majmin;
+	TQListViewItem	*item;
+	TQString	majmin;
 	char		*type;
 	dev_t		dev;
 
@@ -466,7 +466,7 @@ int dump_minor_node( di_node_t node, di_minor_t minor, void *arg ) {
 		(type == NULL) ? "NULL" : type );
 
 	if( (dev = di_minor_devt( minor )) != DDI_DEV_T_NONE ) {
-		majmin.sprintf( "%ld/%ld", major( dev ), minor( dev ));
+		majmin.sprintf( "%u/%u", major( dev ), minor( dev ));
 		new TQListViewItem( item, i18n( "Major/Minor:" ), majmin );
 	}
 
@@ -486,7 +486,7 @@ TQString propvalue( di_prop_t prop ) {
 	char	*strp;
 	int	*intp;
 	uchar_t	*bytep;
-	QString	result;
+	TQString result;
 
 	/*
 	 *  Since a lot of printable strings seem to be tagged as 'byte',
@@ -562,14 +562,14 @@ TQString propvalue( di_prop_t prop ) {
  */
 int dump_node( di_node_t node, void *arg ) {
 
-	QListViewItem	*top = (TQListViewItem *) arg,
+	TQListViewItem	*top = (TQListViewItem *) arg,
 			*parent,
 			*previous;
-	char		*path;
-	char		*drivername;
-	char		*names;
-	QString		compatnames;
-	int		i, n;
+	char *path;
+	char *drivername;
+	char *names;
+	TQString compatnames;
+	int i, n;
 	di_prop_t	prop;
 
 	path = di_devfs_path( node );
@@ -641,7 +641,7 @@ int dump_node( di_node_t node, void *arg ) {
 			/*
 			 *  property type & value
 			 */
-			QListViewItem	*tmp,
+			TQListViewItem	*tmp,
 					*prev;
 			tmp = new TQListViewItem( previous, di_prop_name( prop ));
 			tmp->setExpandable( true );
@@ -668,7 +668,7 @@ int dump_node( di_node_t node, void *arg ) {
 
 bool GetInfo_Devices( TQListView *lBox ) {
 
-	QListViewItem		*top;
+	TQListViewItem		*top;
 	di_node_t		root_node;
 
 	/*
diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp
index 76d68d675..93da5ea20 100644
--- a/kcontrol/info/memory.cpp
+++ b/kcontrol/info/memory.cpp
@@ -252,8 +252,8 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
 
     timer = new TQTimer(this);
     timer->start(100);
-    TQObject::connect(timer, TQT_SIGNAL(timeout()), this,
-		     TQT_SLOT(update_Values()));
+    TQObject::connect(timer, TQ_SIGNAL(timeout()), this,
+		     TQ_SLOT(update_Values()));
 
     update();
 }
diff --git a/kcontrol/info/memory.h b/kcontrol/info/memory.h
index 6fd2cd093..7e6285dee 100644
--- a/kcontrol/info/memory.h
+++ b/kcontrol/info/memory.h
@@ -28,7 +28,7 @@ typedef unsigned long t_memsize;
 #define COLOR_FREE_MEMORY TQColor(127,255,212)
 
 class KMemoryWidget:public TDECModule {
-  Q_OBJECT 
+  TQ_OBJECT 
 	  
   public:
     KMemoryWidget(TQWidget * parent, const char *name = 0);
diff --git a/kcontrol/info/memory_fbsd.cpp b/kcontrol/info/memory_fbsd.cpp
index 80a28749e..f307563f3 100644
--- a/kcontrol/info/memory_fbsd.cpp
+++ b/kcontrol/info/memory_fbsd.cpp
@@ -11,9 +11,9 @@
 
 void KMemoryWidget::update()
 {
-    char blah[10], buf[80], *used_str, *total_str;
+    char buf[80], *used_str, *total_str;
     /* Stuff for sysctl */
-    int memory;
+    unsigned long memory;
     size_t len;
     /* Stuff for swap display */
     int used, total, _free;
@@ -22,7 +22,6 @@ void KMemoryWidget::update()
     len=sizeof(memory);
     sysctlbyname("hw.physmem", &memory, &len, NULL, 0);
   
-    snprintf(blah, 10, "%d", memory);
     // Numerical values
 
     // total physical memory (without swap space)
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index 48b6711d9..8e2f4ad43 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -66,8 +66,8 @@ ThemePage::ThemePage( TQWidget* parent, const char* name )
 	listview->addColumn( i18n("Name") );
 	listview->addColumn( i18n("Description") );
 
-	connect( listview, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-			TQT_SLOT(selectionChanged(TQListViewItem*)) );
+	connect( listview, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+			TQ_SLOT(selectionChanged(TQListViewItem*)) );
 
 	insertThemes();
 }
diff --git a/kcontrol/input/core/themepage.h b/kcontrol/input/core/themepage.h
index 47eb1a0f8..5442e158c 100644
--- a/kcontrol/input/core/themepage.h
+++ b/kcontrol/input/core/themepage.h
@@ -26,7 +26,7 @@ class TQListViewItem;
 
 class ThemePage : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 
 	public:
diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp
index 2798ce1de..78c37d717 100644
--- a/kcontrol/input/logitechmouse.cpp
+++ b/kcontrol/input/logitechmouse.cpp
@@ -70,8 +70,8 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag
         updateResolution();
         resolutionSelector->setEnabled( TRUE );
 
-        connect( button400cpi, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) );
-        connect( button800cpi, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) );
+        connect( button400cpi, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) );
+        connect( button800cpi, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) );
 
         if ( 4 == resolution() ) {
             button800cpi->setChecked( TRUE );
@@ -100,12 +100,12 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag
         // if the channel is changed, we need to turn off the timer, otherwise it
         // just resets the button to reflect the current status. The timer is
         // started again when we applyChanges()
-        connect( channel1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopTimerForNow() ) );
-        connect( channel1, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) );
+        connect( channel1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopTimerForNow() ) );
+        connect( channel1, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) );
         if ( isDualChannelCapable() ) {
             channel2->setEnabled( TRUE );
-            connect( channel2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopTimerForNow() ) );
-            connect( channel2, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) );
+            connect( channel2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopTimerForNow() ) );
+            connect( channel2, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) );
         }
 
         updateGUI();
@@ -124,7 +124,7 @@ void LogitechMouse::initCordlessStatusReporting()
 {
     updateCordlessStatus();
     doUpdate = new TQTimer( this ); // will be automatically deleted
-    connect( doUpdate, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateGUI() ) );
+    connect( doUpdate, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateGUI() ) );
     doUpdate->start( 20000 );
 }
 
diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h
index e50838b72..8c919a601 100644
--- a/kcontrol/input/logitechmouse.h
+++ b/kcontrol/input/logitechmouse.h
@@ -46,7 +46,7 @@
 
 class LogitechMouse : public LogitechMouseBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlags, TQWidget* parent = 0, const char* name = 0 );
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index 0d07e782e..84ec2d263 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -102,8 +102,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
 
     tabwidget->addTab(tab1, i18n("&General"));
 
-    connect(tab1->handedBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed()));
-    connect(tab1->handedBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotHandedChanged(int)));
+    connect(tab1->handedBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed()));
+    connect(tab1->handedBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotHandedChanged(int)));
 
     wtstr = i18n("If you are left-handed, you may prefer to swap the"
          " functions of the left and right buttons on your pointing device"
@@ -113,7 +113,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
          " a three-button mouse, the middle button is unaffected.");
     TQWhatsThis::add( tab1->handedBox, wtstr );
 
-    connect(tab1->doubleClick, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+    connect(tab1->doubleClick, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
 
     wtstr = i18n("The default behavior in TDE is to select and activate"
          " icons with a single click of the left button on your pointing"
@@ -127,7 +127,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     TQWhatsThis::add( tab1->singleClick, wtstr );
 
 
-    connect(tab1->cbAutoSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(tab1->cbAutoSelect, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     wtstr = i18n("If you check this option, pausing the mouse pointer"
          " over an icon on the screen will automatically select that icon."
@@ -149,16 +149,16 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     wtstr = i18n("Show feedback when clicking an icon");
     TQWhatsThis::add( tab1->cbVisualActivate, wtstr );
 
-    connect(tab1->slAutoSelect, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-    connect(tab1->cbVisualActivate, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(tab1->slAutoSelect, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+    connect(tab1->cbVisualActivate, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
-    connect(tab1->cb_pointershape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(tab1->cb_pointershape, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
-    connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-    connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClick()));
+    connect(tab1->singleClick, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+    connect(tab1->singleClick, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClick()));
 
-    connect( tab1->doubleClick, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClick() ) );
-    connect( tab1->cbAutoSelect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClick() ) );
+    connect( tab1->doubleClick, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClick() ) );
+    connect( tab1->cbAutoSelect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClick() ) );
 
     // Only allow setting reversing scroll polarity if we have scroll buttons
     unsigned char map[20];
@@ -172,12 +172,12 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
       tab1->cbScrollPolarity->setEnabled( false );
       tab1->cbScrollPolarity->hide();
     }
-    connect(tab1->cbScrollPolarity, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-    connect(tab1->cbScrollPolarity, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotScrollPolarityChanged()));
+    connect(tab1->cbScrollPolarity, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+    connect(tab1->cbScrollPolarity, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotScrollPolarityChanged()));
 
     // Cursor theme tab
     themetab = new ThemePage(this);
-    connect(themetab, TQT_SIGNAL(changed(bool)), TQT_SLOT(changed()));
+    connect(themetab, TQ_SIGNAL(changed(bool)), TQ_SLOT(changed()));
     tabwidget->addTab(themetab, i18n("&Cursor Theme"));
 
     // Advanced tab
@@ -191,7 +191,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     accel->setLabel(i18n("Pointer acceleration:"));
     accel->setSuffix("x");
     lay->addWidget(accel);
-    connect(accel, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(changed()));
+    connect(accel, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(changed()));
 
     wtstr = i18n("This option allows you to change the relationship"
          " between the distance that the mouse pointer moves on the"
@@ -210,8 +210,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     thresh->setRange(0,20,1);
     thresh->setSteps(1,1);
     lay->addWidget(thresh);
-    connect(thresh, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-    connect(thresh, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotThreshChanged(int)));
+    connect(thresh, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+    connect(thresh, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotThreshChanged(int)));
     slotThreshChanged(thresh->value());
 
     wtstr = i18n("The threshold is the smallest distance that the"
@@ -231,7 +231,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     doubleClickInterval->setSuffix(i18n(" msec"));
     doubleClickInterval->setSteps(100, 100);
     lay->addWidget(doubleClickInterval);
-    connect(doubleClickInterval, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+    connect(doubleClickInterval, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
 
     wtstr = i18n("The double click interval is the maximal time"
          " (in milliseconds) between two mouse clicks which"
@@ -245,16 +245,17 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
 
     doubleClickLabel = new TQLabel(i18n("Double-click on the image below to test your double-click interval:"), tab2);
     lay->addWidget(doubleClickLabel);
-    wtstr = i18n("The image will change when your double-click"
+    wtstr = i18n("<p>The image will change when your double-click"
          " test time is less than or equal to the interval you"
-         " configured. When changing the interval, be sure to select"
-         " the Apply button before testing. For example, the image"
-         " will not change when you configure a double-click interval"
-         " of 700 milliseconds and the time between two successive"
-         " clicks on the image is 800 milliseconds, but the image will"
-         " change when the time between clicks is 600 milliseconds."
+         " configured. For example, if you configure a double-click interval"
+         " of 700 milliseconds the image will not change when the time between"
+         " two successive clicks on the image is 800 milliseconds, but the image"
+         " will change when the time between clicks is 600 milliseconds."
          " The goal is to select a comfortable interval that you find"
-         " is not too fast or slow.");
+         " is not too fast or slow.</p>"
+         ""
+         " <p>When changing the interval it is not necessary to push"
+         " the <i>Apply</i> button before testing.</p>");
     TQWhatsThis::add( doubleClickLabel, wtstr );
     doubleClickStatus = false;  // First image will be displayed
     doubleClickButton = new TQPushButton( tab2 );
@@ -267,9 +268,9 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     lay->addWidget(doubleClickButton);
     // Use the same What's This help for the pushbutton.
     TQWhatsThis::add( doubleClickButton, wtstr );
-    connect(doubleClickButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotDoubleClickButtonPressed()));
+    connect(doubleClickButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotDoubleClickButtonPressed()));
     doubleClickTimer=new TQTimer();
-    connect(doubleClickTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDoubleClickTimerDone()) );
+    connect(doubleClickTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDoubleClickTimerDone()) );
 
     lay->addSpacing(10);
 
@@ -279,7 +280,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     dragStartTime->setSuffix(i18n(" msec"));
     dragStartTime->setSteps(100, 100);
     lay->addWidget(dragStartTime);
-    connect(dragStartTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+    connect(dragStartTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
 
     wtstr = i18n("If you click with the mouse (e.g. in a multi-line"
          " editor) and begin to move the mouse within the"
@@ -291,8 +292,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     dragStartDist->setRange(1, 20, 1);
     dragStartDist->setSteps(1,1);
     lay->addWidget(dragStartDist);
-    connect(dragStartDist, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-    connect(dragStartDist, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDragStartDistChanged(int)));
+    connect(dragStartDist, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+    connect(dragStartDist, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDragStartDistChanged(int)));
     slotDragStartDistChanged(dragStartDist->value());
 
     wtstr = i18n("If you click with the mouse and begin to move the"
@@ -305,8 +306,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     wheelScrollLines->setRange(1, 12, 1);
     wheelScrollLines->setSteps(1,1);
     lay->addWidget(wheelScrollLines);
-    connect(wheelScrollLines, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-    connect(wheelScrollLines, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWheelScrollLinesChanged(int)));
+    connect(wheelScrollLines, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+    connect(wheelScrollLines, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotWheelScrollLinesChanged(int)));
     slotWheelScrollLinesChanged(wheelScrollLines->value());
 
     wtstr = i18n("If you use the wheel of a mouse, this value determines the number of lines to scroll for each wheel movement. Note that if this number exceeds the number of visible lines, it will be ignored and the wheel movement will be handled as a page up/down movement.");
@@ -365,13 +366,13 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
   mk_curve->setRange(-1000, 1000, 100);
   hbox->addWidget(mk_curve);
 
-  connect(mouseKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
-  connect(mouseKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-  connect(mk_delay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-  connect(mk_interval, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-  connect(mk_time_to_max, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-  connect(mk_max_speed, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-  connect(mk_curve, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+  connect(mouseKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
+  connect(mouseKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+  connect(mk_delay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+  connect(mk_interval, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+  connect(mk_time_to_max, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+  connect(mk_max_speed, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+  connect(mk_curve, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
 
   vbox->addStretch();
 }
diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h
index 6d035b8d1..7db5fbf91 100644
--- a/kcontrol/input/mouse.h
+++ b/kcontrol/input/mouse.h
@@ -85,14 +85,13 @@ public:
  bool reverseScrollPolarity;
 
  #ifdef HAVE_LIBUSB
- // TODO: In Qt4, replace with a better container.
  TQPtrList <LogitechMouse> logitechMouseList;
  #endif
 };
 
 class MouseConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MouseConfig(TQWidget *parent=0, const char* name=0);
   ~MouseConfig();
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index c4c73396a..e575b6cd2 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -100,8 +100,8 @@ ThemePage::ThemePage( TQWidget* parent, const char* name )
 	listview->addColumn( i18n("Name") );
 	listview->addColumn( i18n("Description") );
 
-	connect( listview, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-			TQT_SLOT(selectionChanged(TQListViewItem*)) );
+	connect( listview, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+			TQ_SLOT(selectionChanged(TQListViewItem*)) );
 
 	themeDirs = getThemeBaseDirs();
 	insertThemes();
@@ -111,8 +111,8 @@ ThemePage::ThemePage( TQWidget* parent, const char* name )
 	installButton = new TQPushButton( i18n("Install New Theme..."), hbox );
 	removeButton = new TQPushButton( i18n("Remove Theme"), hbox );
 
-	connect( installButton, TQT_SIGNAL( clicked() ), TQT_SLOT( installClicked() ) );
-	connect( removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeClicked() ) );
+	connect( installButton, TQ_SIGNAL( clicked() ), TQ_SLOT( installClicked() ) );
+	connect( removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeClicked() ) );
 
 	// Disable the install button if ~/.icons isn't writable
 	TQString path = TQDir::homeDirPath() + "/.icons";
@@ -580,7 +580,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
 		// Calculate the image size
 		int size = kMax( iconSize, kMax( r.width(), r.height() ) );
 
-		// Create the intermediate QImage
+		// Create the intermediate TQImage
 		TQImage image( size, size, 32 );
 		image.setAlphaBuffer( true );
 
@@ -621,7 +621,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
 
 		// Scale down the image if we need to
 		if ( image.width() > iconSize || image.height() > iconSize )
-			image = image.smoothScale( iconSize, iconSize, TQ_ScaleMin );
+			image = image.smoothScale( iconSize, iconSize, TQImage::ScaleMin );
 
 		pix.convertFromImage( image );
 		XcursorImageDestroy( xcur );
diff --git a/kcontrol/input/xcursor/themepage.h b/kcontrol/input/xcursor/themepage.h
index 548ed0063..bc284aa48 100644
--- a/kcontrol/input/xcursor/themepage.h
+++ b/kcontrol/input/xcursor/themepage.h
@@ -34,7 +34,7 @@ struct ThemeInfo;
 
 class ThemePage : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ThemePage( TQWidget* parent = 0, const char* name = 0 );
diff --git a/kcontrol/joystick/caldialog.h b/kcontrol/joystick/caldialog.h
index 202296f2b..519e98526 100644
--- a/kcontrol/joystick/caldialog.h
+++ b/kcontrol/joystick/caldialog.h
@@ -31,7 +31,7 @@ class JoyDevice;
 
 class CalDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     CalDialog(TQWidget *parent, JoyDevice *joy);
diff --git a/kcontrol/joystick/joystick.h b/kcontrol/joystick/joystick.h
index 8ef9e966e..233656537 100644
--- a/kcontrol/joystick/joystick.h
+++ b/kcontrol/joystick/joystick.h
@@ -27,7 +27,7 @@ class JoyWidget;
 
 class joystick: public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     joystick(TQWidget *parent = 0, const char *name = 0, const TQStringList &list = TQStringList());
diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp
index 5d104006b..c88f6d217 100644
--- a/kcontrol/joystick/joywidget.cpp
+++ b/kcontrol/joystick/joywidget.cpp
@@ -65,7 +65,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
   new TQLabel(i18n("Device:"), devHbox);
   device = new TQComboBox(true, devHbox);
   device->setInsertionPolicy(TQComboBox::NoInsertion);
-  connect(device, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(deviceChanged(const TQString &)));
+  connect(device, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(deviceChanged(const TQString &)));
   devHbox->setStretchFactor(device, 3);
 
   TQHBox *hbox = new TQHBox(mainVbox);
@@ -77,7 +77,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
   new TQLabel(i18n("Position:"), vboxLeft);
   xyPos = new PosWidget(vboxLeft);
   trace = new TQCheckBox(i18n("Show trace"), mainVbox);
-  connect(trace, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(traceChanged(bool)));
+  connect(trace, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(traceChanged(bool)));
 
   TQVBox *vboxMid = new TQVBox(hbox);
   vboxMid->setSpacing(KDialog::spacingHint());
@@ -111,12 +111,12 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
 
   // calibrate button
   calibrate = new TQPushButton(i18n("Calibrate"), mainVbox);
-  connect(calibrate, TQT_SIGNAL(clicked()), this, TQT_SLOT(calibrateDevice()));
+  connect(calibrate, TQ_SIGNAL(clicked()), this, TQ_SLOT(calibrateDevice()));
   calibrate->setEnabled(false);
 
   // set up a timer for idle processing of joystick events
   idle = new TQTimer(this);
-  connect(idle, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkDevice()));
+  connect(idle, TQ_SIGNAL(timeout()), this, TQ_SLOT(checkDevice()));
 
   // check which devicefiles we have
   init();
diff --git a/kcontrol/joystick/joywidget.h b/kcontrol/joystick/joywidget.h
index 45291d275..057a8bd9e 100644
--- a/kcontrol/joystick/joywidget.h
+++ b/kcontrol/joystick/joywidget.h
@@ -37,7 +37,7 @@ class TQHBox;
 // the widget which displays all buttons, values, etc.
 class JoyWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     JoyWidget(TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/joystick/poswidget.cpp b/kcontrol/joystick/poswidget.cpp
index af8609070..5eb249f58 100644
--- a/kcontrol/joystick/poswidget.cpp
+++ b/kcontrol/joystick/poswidget.cpp
@@ -32,7 +32,7 @@ PosWidget::PosWidget(TQWidget *parent, const char *name)
 {
   setMinimumSize(XY_WIDTH, XY_WIDTH);
   setMaximumSize(XY_WIDTH, XY_WIDTH);
-  setPaletteBackgroundColor(Qt::white);
+  setPaletteBackgroundColor(TQt::white);
 }
 
 //-----------------------------------------------------------------
@@ -42,7 +42,7 @@ void PosWidget::paintEvent(TQPaintEvent *)
   TQPainter paint(this);
 
   paint.drawRect(0, 0, width(), height());
-  paint.setPen(Qt::gray);
+  paint.setPen(TQt::gray);
 
   // draw a center grid
   paint.drawLine(XY_WIDTH/2, 1,
@@ -52,7 +52,7 @@ void PosWidget::paintEvent(TQPaintEvent *)
                  XY_WIDTH - 2, XY_WIDTH/2);
 
   // draw the current position marker
-  paint.setPen(Qt::blue);
+  paint.setPen(TQt::blue);
 
   paint.drawLine(x - MARK_WIDTH/2, y - MARK_WIDTH/2,
                  x + MARK_WIDTH/2, y + MARK_WIDTH/2);
@@ -111,7 +111,7 @@ void PosWidget::eraseOld()
   //paint.eraseRect(x - MARK_WIDTH/2, y - MARK_WIDTH/2, MARK_WIDTH + 1, MARK_WIDTH + 1);
 
   // erase previous cross (don't use eraseRect() so that trace flags will be not destroyed so much)
-  paint.setPen(Qt::white);
+  paint.setPen(TQt::white);
 
   paint.drawLine(x - MARK_WIDTH/2, y - MARK_WIDTH/2,
                  x + MARK_WIDTH/2, y + MARK_WIDTH/2);
@@ -121,7 +121,7 @@ void PosWidget::eraseOld()
 
   if ( trace )  // show previous position with a smaller black cross
   {
-    paint.setPen(Qt::black);
+    paint.setPen(TQt::black);
 
     paint.drawLine(x - 2, y - 2,
                    x + 2, y + 2);
diff --git a/kcontrol/joystick/poswidget.h b/kcontrol/joystick/poswidget.h
index 324ee1da2..3ee85a912 100644
--- a/kcontrol/joystick/poswidget.h
+++ b/kcontrol/joystick/poswidget.h
@@ -28,7 +28,7 @@
 */
 class PosWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     PosWidget(TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp
index c1ba4fecf..485f11442 100644
--- a/kcontrol/kcontrol/aboutwidget.cpp
+++ b/kcontrol/kcontrol/aboutwidget.cpp
@@ -84,8 +84,8 @@ AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* ca
     _viewer = new TDEHTMLPart( this, "_viewer" );
     _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
     connect( _viewer->browserExtension(),
-             TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
-             this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) );
+             TQ_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
+             this, TQ_SLOT(slotModuleLinkClicked(const KURL&)) );
     updatePixmap();
 }
 
diff --git a/kcontrol/kcontrol/aboutwidget.h b/kcontrol/kcontrol/aboutwidget.h
index 97ba32ffd..5d4543b39 100644
--- a/kcontrol/kcontrol/aboutwidget.h
+++ b/kcontrol/kcontrol/aboutwidget.h
@@ -33,7 +33,7 @@ class KURL;
 
 class AboutWidget : public TQHBox
 {  
-  Q_OBJECT    
+  TQ_OBJECT    
   
 public:   
   AboutWidget(TQWidget *parent, const char *name=0, TQListViewItem* category=0, const TQString &caption=TQString::null);
diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp
index dd1835e9d..67584a74d 100644
--- a/kcontrol/kcontrol/dockcontainer.cpp
+++ b/kcontrol/kcontrol/dockcontainer.cpp
@@ -105,7 +105,7 @@ ModuleWidget::ModuleWidget( TQWidget *parent, const char *name )
   m_title = new ModuleTitle( titleLine, "m_title" );
   TQPushButton *helpButton = new TQPushButton( titleLine );
   helpButton->setIconSet( SmallIconSet("help") );
-  connect (helpButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( helpRequest() ) );
+  connect (helpButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( helpRequest() ) );
   m_body = new TQVBox( this, "m_body" );
   setStretchFactor( m_body, 10 );
 }
@@ -137,7 +137,7 @@ DockContainer::DockContainer(TQWidget *parent)
   addWidget( _busyw );
 
   _modulew = new ModuleWidget( this, "_modulew" );
-  connect (_modulew, TQT_SIGNAL( helpRequest() ), TQT_SLOT( slotHelpRequest() ) );
+  connect (_modulew, TQ_SIGNAL( helpRequest() ), TQ_SLOT( slotHelpRequest() ) );
   addWidget( _modulew );
 }
 
@@ -163,17 +163,17 @@ void DockContainer::setBaseWidget(TQWidget *widget)
 
 ProxyWidget* DockContainer::loadModule( ConfigModule *module )
 {
-  TQApplication::setOverrideCursor( tqwaitCursor );
+  TQApplication::setOverrideCursor( TQt::waitCursor );
 
   ProxyWidget *widget = _modulew->load( module );
 
   if (widget)
   {
     _module = module;
-    connect(_module, TQT_SIGNAL(childClosed()), TQT_SLOT(removeModule()));
-    connect(_module, TQT_SIGNAL(changed(ConfigModule *)),
-            TQT_SIGNAL(changedModule(ConfigModule *)));
-    connect(widget, TQT_SIGNAL(quickHelpChanged()), TQT_SLOT(quickHelpChanged()));
+    connect(_module, TQ_SIGNAL(childClosed()), TQ_SLOT(removeModule()));
+    connect(_module, TQ_SIGNAL(changed(ConfigModule *)),
+            TQ_SIGNAL(changedModule(ConfigModule *)));
+    connect(widget, TQ_SIGNAL(quickHelpChanged()), TQ_SLOT(quickHelpChanged()));
 
     raiseWidget( _modulew );
     emit newModule(widget->caption(), module->docPath(), widget->quickHelp());
diff --git a/kcontrol/kcontrol/dockcontainer.h b/kcontrol/kcontrol/dockcontainer.h
index ea62495bd..7246691e6 100644
--- a/kcontrol/kcontrol/dockcontainer.h
+++ b/kcontrol/kcontrol/dockcontainer.h
@@ -30,7 +30,7 @@ class TQLabel;
 
 class ModuleWidget : public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ModuleWidget( TQWidget *parent, const char *name );
@@ -48,7 +48,7 @@ class ModuleWidget : public TQVBox
 
 class DockContainer : public TQWidgetStack
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   DockContainer(TQWidget *parent=0);
diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp
index ca80619e5..b17581846 100644
--- a/kcontrol/kcontrol/global.cpp
+++ b/kcontrol/kcontrol/global.cpp
@@ -105,7 +105,7 @@ TQString KCGlobal::baseGroup()
 
 void KCGlobal::repairAccels( TQWidget * tw )
 {
-    TQObjectList * l = tw->queryList( TQACCEL_OBJECT_NAME_STRING );
+    TQObjectList * l = tw->queryList( "TQAccel" );
     TQObjectListIt it( *l );             // iterate over the buttons
     TQObject * obj;
     while ( (obj=it.current()) != 0 ) { // for each found object...
diff --git a/kcontrol/kcontrol/indexwidget.cpp b/kcontrol/kcontrol/indexwidget.cpp
index 92b9cf0a0..293c5e1d8 100644
--- a/kcontrol/kcontrol/indexwidget.cpp
+++ b/kcontrol/kcontrol/indexwidget.cpp
@@ -60,7 +60,7 @@ void IndexWidget::resizeEvent(TQResizeEvent *e)
 
 void IndexWidget::moduleSelected(ConfigModule *m)
 {
-  const TQObject *obj = TQT_TQOBJECT_CONST(sender());
+  const TQObject *obj = sender();
   if(!m) return;
 
   emit moduleActivated(m);
@@ -69,19 +69,19 @@ void IndexWidget::moduleSelected(ConfigModule *m)
 	{
 	  _tree->makeVisible(m);
 
-	  _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*)));
+	  _tree->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*)));
 	  _tree->makeSelected(m);
-	  connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)),
-			  this, TQT_SLOT(moduleSelected(ConfigModule*)));
+	  connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)),
+			  this, TQ_SLOT(moduleSelected(ConfigModule*)));
 	}
   else if (obj->inherits("ModuleTreeView") && _icon)
 	{
 	  _icon->makeVisible(m);
 
-	  _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*)));
+	  _icon->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*)));
 	  _icon->makeSelected(m);
-	  connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)),
-			 this, TQT_SLOT(moduleSelected(ConfigModule*)));
+	  connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)),
+			 this, TQ_SLOT(moduleSelected(ConfigModule*)));
 	}
 }
 
@@ -89,17 +89,17 @@ void IndexWidget::makeSelected(ConfigModule *module)
 {
   if (_icon)
   {
-   _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*)));
+   _icon->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*)));
    _icon->makeSelected(module);
-   connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)),
-		  this, TQT_SLOT(moduleSelected(ConfigModule*)));
+   connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)),
+		  this, TQ_SLOT(moduleSelected(ConfigModule*)));
   }
   if (_tree)
   {
-    _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*)));
+    _tree->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*)));
     _tree->makeSelected(module);
-    connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)),
-		  this, TQT_SLOT(moduleSelected(ConfigModule*)));
+    connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)),
+		  this, TQ_SLOT(moduleSelected(ConfigModule*)));
   }
 }
 
@@ -121,8 +121,8 @@ void IndexWidget::activateView(IndexViewMode mode)
     {
       _icon=new ModuleIconView(_modules, this);
       _icon->fill();
-	  connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)),
-		  this, TQT_SLOT(moduleSelected(ConfigModule*)));
+	  connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)),
+		  this, TQ_SLOT(moduleSelected(ConfigModule*)));
     }
     raiseWidget( _icon );
   }
@@ -132,10 +132,10 @@ void IndexWidget::activateView(IndexViewMode mode)
     {
       _tree=new ModuleTreeView(_modules, this);
       _tree->fill();
-      connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)),
-		  this, TQT_SLOT(moduleSelected(ConfigModule*)));
-	  connect(_tree, TQT_SIGNAL(categorySelected(TQListViewItem*)),
-		  this, TQT_SIGNAL(categorySelected(TQListViewItem*)));
+      connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)),
+		  this, TQ_SLOT(moduleSelected(ConfigModule*)));
+	  connect(_tree, TQ_SIGNAL(categorySelected(TQListViewItem*)),
+		  this, TQ_SIGNAL(categorySelected(TQListViewItem*)));
     }
     raiseWidget( _tree );
   }
diff --git a/kcontrol/kcontrol/indexwidget.h b/kcontrol/kcontrol/indexwidget.h
index 6471e0ec3..a373aafce 100644
--- a/kcontrol/kcontrol/indexwidget.h
+++ b/kcontrol/kcontrol/indexwidget.h
@@ -31,7 +31,7 @@ class ModuleIconView;
 
 class IndexWidget : public TQWidgetStack
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:   
   IndexWidget(ConfigModuleList *list, TQWidget *parent, const char *name=0);
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 25ab4fc4a..aa5227532 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -59,10 +59,10 @@ KControlApp::KControlApp()
   TDEGlobal::setActiveInstance(this);
 
   // KUniqueApplication does dcop regitration for us
-  ModuleIface *modIface = new ModuleIface(TQT_TQOBJECT(toplevel), "moduleIface");
+  ModuleIface *modIface = new ModuleIface(toplevel, "moduleIface");
 
-  connect (modIface, TQT_SIGNAL(helpClicked()), toplevel, TQT_SLOT(slotHelpRequest()));
-  connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest()));
+  connect (modIface, TQ_SIGNAL(helpClicked()), toplevel, TQ_SLOT(slotHelpRequest()));
+  connect (modIface, TQ_SIGNAL(handbookClicked()), toplevel, TQ_SLOT(slotHandbookRequest()));
 
   TQRect desk = TDEGlobalSettings::desktopGeometry(toplevel);
   TDEConfig *config = TDEGlobal::config();
@@ -90,7 +90,7 @@ KControlApp::~KControlApp()
     {
       TDEConfig *config = TDEGlobal::config();
       config->setGroup("General");
-      TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop());
+      TQWidget *desk = TQApplication::desktop();
       config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
       config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
       config->sync();
diff --git a/kcontrol/kcontrol/main.h b/kcontrol/kcontrol/main.h
index 783e10001..aaeabbe15 100644
--- a/kcontrol/kcontrol/main.h
+++ b/kcontrol/kcontrol/main.h
@@ -27,7 +27,7 @@ class TopLevel;
 
 class KControlApp : public KUniqueApplication
 {
-  Q_OBJECT 
+  TQ_OBJECT 
 
 public:
   KControlApp();
diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp
index dbaba9054..5cc43c82d 100644
--- a/kcontrol/kcontrol/moduleIface.cpp
+++ b/kcontrol/kcontrol/moduleIface.cpp
@@ -26,7 +26,7 @@
 ModuleIface::ModuleIface(TQObject *parent, const char *name) 
 	: TQObject(parent, name), DCOPObject(name) {
 
-	_parent = TQT_TQWIDGET(parent);
+	_parent = static_cast<TQWidget*>(parent);
 
 }
 
diff --git a/kcontrol/kcontrol/moduleIface.h b/kcontrol/kcontrol/moduleIface.h
index 17b4b07ad..00f2d0d39 100644
--- a/kcontrol/kcontrol/moduleIface.h
+++ b/kcontrol/kcontrol/moduleIface.h
@@ -28,7 +28,7 @@
 
 class ModuleIface : public TQObject, public DCOPObject {
 
-Q_OBJECT
+TQ_OBJECT
 K_DCOP
 
 public:
diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp
index 45be8a1ac..7c171f676 100644
--- a/kcontrol/kcontrol/moduleiconview.cpp
+++ b/kcontrol/kcontrol/moduleiconview.cpp
@@ -51,8 +51,8 @@ ModuleIconView::ModuleIconView(ConfigModuleList *list, TQWidget * parent, const
   // This is intentionally _not_ connected with executed(), since
   // honoring doubleclick doesn't make any sense here (changed by
   // large user demand)
-  connect(this, TQT_SIGNAL(clicked(TQListViewItem*)),
-          this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
+  connect(this, TQ_SIGNAL(clicked(TQListViewItem*)),
+          this, TQ_SLOT(slotItemSelected(TQListViewItem*)));
 }
 
 void ModuleIconView::makeSelected(ConfigModule *m)
diff --git a/kcontrol/kcontrol/moduleiconview.h b/kcontrol/kcontrol/moduleiconview.h
index 12cb14d73..daaeaa7ea 100644
--- a/kcontrol/kcontrol/moduleiconview.h
+++ b/kcontrol/kcontrol/moduleiconview.h
@@ -56,7 +56,7 @@ private:
 
 class ModuleIconView : public TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   ModuleIconView(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0);
diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp
index f203e6b57..2d1af0879 100644
--- a/kcontrol/kcontrol/modulemenu.cpp
+++ b/kcontrol/kcontrol/modulemenu.cpp
@@ -49,7 +49,7 @@ ModuleMenu::ModuleMenu(ConfigModuleList *list, TQWidget * parent, const char * n
 
   fill(this, KCGlobal::baseGroup());
 
-  connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int)));
+  connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleSelected(int)));
 }
 
 void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath)
@@ -65,7 +65,7 @@ void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath)
      
      // create new menu
      TDEPopupMenu *menu = new TDEPopupMenu(parentMenu);
-     connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int)));
+     connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleSelected(int)));
 
      // Item names may contain ampersands. To avoid them being converted to 
      // accelators, replace them with two ampersands.
diff --git a/kcontrol/kcontrol/modulemenu.h b/kcontrol/kcontrol/modulemenu.h
index 9ce39b584..890a2d857 100644
--- a/kcontrol/kcontrol/modulemenu.h
+++ b/kcontrol/kcontrol/modulemenu.h
@@ -40,7 +40,7 @@ class ConfigModuleList;
 
 class ModuleMenu : public TDEPopupMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   ModuleMenu(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0);
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index e40d62568..c419e0d4e 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -75,11 +75,11 @@ ProxyWidget *ConfigModule::module()
     {
 
       _module = new ProxyWidget(modWidget, moduleName(), "", run_as_root);
-      connect(_module, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool)));
-      connect(_module, TQT_SIGNAL(closed()), this, TQT_SLOT(clientClosed()));
-      connect(_module, TQT_SIGNAL(handbookRequest()), this, TQT_SIGNAL(handbookRequest()));
-      connect(_module, TQT_SIGNAL(helpRequest()), this, TQT_SIGNAL(helpRequest()));
-      connect(_module, TQT_SIGNAL(runAsRoot()), this, TQT_SLOT(runAsRoot()));
+      connect(_module, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool)));
+      connect(_module, TQ_SIGNAL(closed()), this, TQ_SLOT(clientClosed()));
+      connect(_module, TQ_SIGNAL(handbookRequest()), this, TQ_SIGNAL(handbookRequest()));
+      connect(_module, TQ_SIGNAL(helpRequest()), this, TQ_SIGNAL(helpRequest()));
+      connect(_module, TQ_SIGNAL(runAsRoot()), this, TQ_SLOT(runAsRoot()));
 
       return _module;
     }
@@ -157,7 +157,7 @@ void ConfigModule::runAsRoot()
   _busy->setGeometry(0,0, _module->width(), _module->height());
   _busy->show();
   _embedStack->raiseWidget(_busy);
-  connect(_embedWidget, TQT_SIGNAL( windowEmbedded(WId)), TQT_SLOT( embedded()));
+  connect(_embedWidget, TQ_SIGNAL( windowEmbedded(WId)), TQ_SLOT( embedded()));
 
   // prepare the process to run the tdecmshell
   TQString cmd = service()->exec().stripWhiteSpace();
@@ -198,7 +198,7 @@ void ConfigModule::runAsRoot()
          *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( TDEGlobal::locale()->language() );
       }
 
-      connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(rootExited(TDEProcess*)));
+      connect(_rootProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(rootExited(TDEProcess*)));
 
       if ( !_rootProcess->start(TDEProcess::NotifyOnExit) )
       {
diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h
index 63ddee668..16751831e 100644
--- a/kcontrol/kcontrol/modules.h
+++ b/kcontrol/kcontrol/modules.h
@@ -38,7 +38,7 @@ class TQWidgetStack;
 
 class ConfigModule : public TQObject, public TDECModuleInfo
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -124,7 +124,7 @@ protected:
 
 class KControlEmbed : public QXEmbed
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         KControlEmbed( TQWidget* w ) : QXEmbed( w ) {}
         virtual void windowChanged( WId w ) { if( w ) emit windowEmbedded( w ); }
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index fd0bda8aa..a226cbc89 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -85,8 +85,8 @@ ModuleTreeView::ModuleTreeView(ConfigModuleList *list, TQWidget * parent, const
 
   new ModuleTreeWhatsThis( this );
 
-  connect(this, TQT_SIGNAL(clicked(TQListViewItem*)),
-                  this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
+  connect(this, TQ_SIGNAL(clicked(TQListViewItem*)),
+                  this, TQ_SLOT(slotItemSelected(TQListViewItem*)));
 }
 
 void ModuleTreeView::fill()
@@ -340,7 +340,7 @@ void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int colu
     if (offset > 0)
     {
       TQPixmap pixmap(offset, offset);
-      pixmap.fill(Qt::color0);
+      pixmap.fill(TQt::color0);
       pixmap.setMask(pixmap.createHeuristicMask());
       TQBitmap mask( pixmap.size(), true );
       pixmap.setMask( mask );
diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h
index 271214c98..ad21d8715 100644
--- a/kcontrol/kcontrol/moduletreeview.h
+++ b/kcontrol/kcontrol/moduletreeview.h
@@ -66,7 +66,7 @@ private:
 
 class ModuleTreeView : public TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   ModuleTreeView(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0);
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index 893c75d7a..05040b3dd 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -200,8 +200,8 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
   view = new ProxyView(client, title, this, run_as_root, "proxyview");
   (void) new WhatsThis( this );
 
-  connect(_client, TQT_SIGNAL(changed(bool)), TQT_SLOT(clientChanged(bool)));
-  connect(_client, TQT_SIGNAL(quickHelpChanged()), TQT_SIGNAL(quickHelpChanged()));
+  connect(_client, TQ_SIGNAL(changed(bool)), TQ_SLOT(clientChanged(bool)));
+  connect(_client, TQ_SIGNAL(quickHelpChanged()), TQ_SIGNAL(quickHelpChanged()));
 
   _sep = new KSeparator(KSeparator::HLine, this);
 
@@ -225,11 +225,11 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
   _apply->setEnabled( false );
   _reset->setEnabled( false );
 
-  connect(_handbook, TQT_SIGNAL(clicked()), TQT_SLOT(handbookClicked()));
-  connect(_default, TQT_SIGNAL(clicked()), TQT_SLOT(defaultClicked()));
-  connect(_apply, TQT_SIGNAL(clicked()), TQT_SLOT(applyClicked()));
-  connect(_reset, TQT_SIGNAL(clicked()), TQT_SLOT(resetClicked()));
-  connect(_root, TQT_SIGNAL(clicked()), TQT_SLOT(rootClicked()));
+  connect(_handbook, TQ_SIGNAL(clicked()), TQ_SLOT(handbookClicked()));
+  connect(_default, TQ_SIGNAL(clicked()), TQ_SLOT(defaultClicked()));
+  connect(_apply, TQ_SIGNAL(clicked()), TQ_SLOT(applyClicked()));
+  connect(_reset, TQ_SIGNAL(clicked()), TQ_SLOT(resetClicked()));
+  connect(_root, TQ_SIGNAL(clicked()), TQ_SLOT(rootClicked()));
 
   TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), 
       KDialog::spacingHint());
@@ -256,12 +256,8 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
 
 ProxyWidget::~ProxyWidget()
 {
-#ifdef USE_QT4
-  #warning Possible memory leak in ProxyWidget::~ProxyWidget()
-#else // USE_QT4
   if (_client) delete _client;
   _client = 0;
-#endif // USE_QT4
 }
 
 TQString ProxyWidget::quickHelp() const
diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h
index 804803c51..95d8a597d 100644
--- a/kcontrol/kcontrol/proxywidget.h
+++ b/kcontrol/kcontrol/proxywidget.h
@@ -38,7 +38,7 @@ class ProxyView;
 
 class ProxyWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp
index 995d162e3..663a8744c 100644
--- a/kcontrol/kcontrol/searchwidget.cpp
+++ b/kcontrol/kcontrol/searchwidget.cpp
@@ -20,7 +20,6 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <tqsortedlist.h>
 #include <tqregexp.h>
 
 #include <klineedit.h>
@@ -88,13 +87,13 @@ SearchWidget::SearchWidget(TQWidget *parent , const char *name)
   l->addWidget(_resultList);
 
 
-  connect(_keyList, TQT_SIGNAL(highlighted(const TQString&)),
-          this, TQT_SLOT(slotKeywordSelected(const TQString&)));
+  connect(_keyList, TQ_SIGNAL(highlighted(const TQString&)),
+          this, TQ_SLOT(slotKeywordSelected(const TQString&)));
 
-  connect(_resultList, TQT_SIGNAL(selected(TQListBoxItem*)),
-          this, TQT_SLOT(slotModuleSelected(TQListBoxItem *)));
-  connect(_resultList, TQT_SIGNAL(clicked(TQListBoxItem *)),
-          this, TQT_SLOT(slotModuleClicked(TQListBoxItem *)));
+  connect(_resultList, TQ_SIGNAL(selected(TQListBoxItem*)),
+          this, TQ_SLOT(slotModuleSelected(TQListBoxItem *)));
+  connect(_resultList, TQ_SIGNAL(clicked(TQListBoxItem *)),
+          this, TQ_SLOT(slotModuleClicked(TQListBoxItem *)));
 }
 
 void SearchWidget::populateKeywordList(ConfigModuleList *list)
diff --git a/kcontrol/kcontrol/searchwidget.h b/kcontrol/kcontrol/searchwidget.h
index 2e6306bbc..d0f850218 100644
--- a/kcontrol/kcontrol/searchwidget.h
+++ b/kcontrol/kcontrol/searchwidget.h
@@ -50,7 +50,7 @@ class KeywordListEntry
 
 class SearchWidget : public TQWidget
 {  
-  Q_OBJECT    
+  TQ_OBJECT    
   
 public:   
   SearchWidget(TQWidget *parent, const char *name=0);
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index 519ec91df..d3b2a3c2f 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -81,12 +81,12 @@ TopLevel::TopLevel(const char* name)
   _modules->readDesktopEntries();
 
   for ( ConfigModule* m = _modules->first(); m; m = _modules->next() ) {
-      connect( m, TQT_SIGNAL( handbookRequest() ), this, TQT_SLOT( slotHandbookRequest() ) );
-      connect( m, TQT_SIGNAL( helpRequest() ), this, TQT_SLOT( slotHelpRequest() ) );
+      connect( m, TQ_SIGNAL( handbookRequest() ), this, TQ_SLOT( slotHandbookRequest() ) );
+      connect( m, TQ_SIGNAL( helpRequest() ), this, TQ_SLOT( slotHelpRequest() ) );
   }
 
   // create the layout box
-  _splitter = new TQSplitter( Qt::Horizontal, this );
+  _splitter = new TQSplitter( TQt::Horizontal, this );
 
   TQFrame* leftFrame = new TQFrame ( _splitter );
   TQBoxLayout *leftFrameLayout = new TQVBoxLayout( leftFrame );
@@ -109,11 +109,11 @@ TopLevel::TopLevel(const char* name)
   
   KLineEdit *searchEdit = new KLineEdit( mSearchFrame );
   clearButton->setFixedHeight( searchEdit->height() );
-  connect( clearButton, TQT_SIGNAL( clicked() ), searchEdit, TQT_SLOT( clear() ) );
+  connect( clearButton, TQ_SIGNAL( clicked() ), searchEdit, TQ_SLOT( clear() ) );
   label->setBuddy( searchEdit );
   searchLayout->addWidget( searchEdit );
-  connect( searchEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           TQT_SLOT( slotSearchChanged(const TQString &) ) );
+  connect( searchEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           TQ_SLOT( slotSearchChanged(const TQString &) ) );
 
   // create the left hand side under search
   _stack = new TQWidgetStack( leftFrame );
@@ -121,18 +121,18 @@ TopLevel::TopLevel(const char* name)
 
   // index tab
   _index = new IndexWidget(_modules, this);
-  connect(_index, TQT_SIGNAL(moduleActivated(ConfigModule*)),
-                  this, TQT_SLOT(activateModule(ConfigModule*)));
+  connect(_index, TQ_SIGNAL(moduleActivated(ConfigModule*)),
+                  this, TQ_SLOT(activateModule(ConfigModule*)));
   _stack->addWidget( _index );
 
-  connect(_index, TQT_SIGNAL(categorySelected(TQListViewItem*)),
-                  this, TQT_SLOT(categorySelected(TQListViewItem*)));
+  connect(_index, TQ_SIGNAL(categorySelected(TQListViewItem*)),
+                  this, TQ_SLOT(categorySelected(TQListViewItem*)));
 
   // search tab
   _search = new SearchWidget(this);
   _search->populateKeywordList(_modules);
-  connect(_search, TQT_SIGNAL(moduleSelected(ConfigModule *)),
-                  this, TQT_SLOT(activateModule(ConfigModule *)));
+  connect(_search, TQ_SIGNAL(moduleSelected(ConfigModule *)),
+                  this, TQ_SLOT(activateModule(ConfigModule *)));
 
   _stack->addWidget( _search );
 
@@ -153,10 +153,10 @@ TopLevel::TopLevel(const char* name)
   // That one does the trick ...
   _splitter->setResizeMode( leftFrame, TQSplitter::KeepSize );
 
-  connect(_dock, TQT_SIGNAL(newModule(const TQString&, const TQString&, const TQString&)),
-                  this, TQT_SLOT(newModule(const TQString&, const TQString&, const TQString&)));
-  connect(_dock, TQT_SIGNAL(changedModule(ConfigModule*)),
-          TQT_SLOT(changedModule(ConfigModule*)));
+  connect(_dock, TQ_SIGNAL(newModule(const TQString&, const TQString&, const TQString&)),
+                  this, TQ_SLOT(newModule(const TQString&, const TQString&, const TQString&)));
+  connect(_dock, TQ_SIGNAL(changedModule(ConfigModule*)),
+          TQ_SLOT(changedModule(ConfigModule*)));
 
   // set the main view
   setCentralWidget( _splitter );
@@ -178,8 +178,8 @@ TopLevel::TopLevel(const char* name)
   if (KCGlobal::isInfoCenter())
   {
       AboutWidget *aw = new AboutWidget( this, 0, _index->firstTreeViewItem());
-      connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ),
-               TQT_SLOT( activateModule( ConfigModule * ) ) );
+      connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ),
+               TQ_SLOT( activateModule( ConfigModule * ) ) );
       _dock->setBaseWidget( aw );
       KWin::setIcons(  winId(),
 		       TDEGlobal::iconLoader()->loadIcon("hwinfo",  TDEIcon::NoGroup,  32 ),
@@ -188,8 +188,8 @@ TopLevel::TopLevel(const char* name)
   else
   {
       AboutWidget *aw = new AboutWidget(this);
-      connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ),
-                   TQT_SLOT( activateModule( ConfigModule * ) ) );
+      connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ),
+                   TQ_SLOT( activateModule( ConfigModule * ) ) );
       _dock->setBaseWidget(aw);
   }
 }
@@ -234,40 +234,40 @@ bool TopLevel::queryClose()
 
 void TopLevel::setupActions()
 {
-  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
-  KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
+  KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
+  KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()),
 actionCollection());
   icon_view = new TDERadioAction
-    (i18n("&Icon View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateIconView()),
+    (i18n("&Icon View"), 0, this, TQ_SLOT(activateIconView()),
      actionCollection(), "activate_iconview");
   icon_view->setExclusiveGroup( "viewmode" );
 
   tree_view = new TDERadioAction
-    (i18n("&Tree View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateTreeView()),
+    (i18n("&Tree View"), 0, this, TQ_SLOT(activateTreeView()),
      actionCollection(), "activate_treeview");
   tree_view->setExclusiveGroup( "viewmode" );
 
   icon_small = new TDERadioAction
-    (i18n("&Small"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateSmallIcons()),
+    (i18n("&Small"), 0, this, TQ_SLOT(activateSmallIcons()),
      actionCollection(), "activate_smallicons");
   icon_small->setExclusiveGroup( "iconsize" );
 
   icon_medium = new TDERadioAction
-    (i18n("&Medium"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateMediumIcons()),
+    (i18n("&Medium"), 0, this, TQ_SLOT(activateMediumIcons()),
      actionCollection(), "activate_mediumicons");
   icon_medium->setExclusiveGroup( "iconsize" );
 
   icon_large = new TDERadioAction
-    (i18n("&Large"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateLargeIcons()),
+    (i18n("&Large"), 0, this, TQ_SLOT(activateLargeIcons()),
      actionCollection(), "activate_largeicons");
   icon_large->setExclusiveGroup( "iconsize" );
 
   icon_huge = new TDERadioAction
-    (i18n("&Huge"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateHugeIcons()),
+    (i18n("&Huge"), 0, this, TQ_SLOT(activateHugeIcons()),
      actionCollection(), "activate_hugeicons");
   icon_huge->setExclusiveGroup( "iconsize" );
 
-  about_module = new TDEAction(i18n("About Current Module"), 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), actionCollection(), "help_about_module");
+  about_module = new TDEAction(i18n("About Current Module"), 0, this, TQ_SLOT(aboutModule()), actionCollection(), "help_about_module");
   about_module->setEnabled(false);
 
   createGUI("kcontrolui.rc");
@@ -275,7 +275,7 @@ actionCollection());
   report_bug = actionCollection()->action("help_report_bug");
   report_bug->setText(i18n("&Report Bug..."));
   report_bug->disconnect();
-  connect(report_bug, TQT_SIGNAL(activated()), TQT_SLOT(reportBug()));
+  connect(report_bug, TQ_SIGNAL(activated()), TQ_SLOT(reportBug()));
 }
 
 void TopLevel::activateIconView()
@@ -399,8 +399,8 @@ void TopLevel::categorySelected(TQListViewItem *category)
   else
   {
     AboutWidget *aw = new AboutWidget( this, 0, firstItem, caption );
-    connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ),
-             TQT_SLOT( activateModule( ConfigModule * ) ) );
+    connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ),
+             TQ_SLOT( activateModule( ConfigModule * ) ) );
     _dock->setBaseWidget( aw );
   }
 }
@@ -495,7 +495,7 @@ void TopLevel::reportBug()
     }
     KBugReport *br = new KBugReport(this, false, dummyAbout);
     if (deleteit)
-        connect(br, TQT_SIGNAL(finished()), TQT_SLOT(deleteDummyAbout()));
+        connect(br, TQ_SIGNAL(finished()), TQ_SLOT(deleteDummyAbout()));
     else
         dummyAbout = 0;
     br->show();
diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h
index 39aa25090..8d2a84145 100644
--- a/kcontrol/kcontrol/toplevel.h
+++ b/kcontrol/kcontrol/toplevel.h
@@ -41,7 +41,7 @@ class ModuleTitle;
 
 class TopLevel : public TDEMainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TopLevel( const char* name=0 );
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index f6fcd2e5a..bbae08ad6 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -96,16 +96,16 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
 	_lvStartup->setAllColumnsShowFocus(true);
 	_lvStartup->header()->setStretchEnabled(true, 2);
 
-	KButtonBox *buttonBox = new KButtonBox( gb, Qt::Horizontal);
+	KButtonBox *buttonBox = new KButtonBox( gb, TQt::Horizontal);
 	_pbStart = buttonBox->addButton( i18n("Start"));
 	_pbStop = buttonBox->addButton( i18n("Stop"));
 
 	_pbStart->setEnabled( false );
 	_pbStop->setEnabled( false );
 
-	connect(_pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartService()));
-	connect(_pbStop,  TQT_SIGNAL(clicked()), TQT_SLOT(slotStopService()));
-	connect(_lvStartup, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotEvalItem(TQListViewItem*)) );
+	connect(_pbStart, TQ_SIGNAL(clicked()), TQ_SLOT(slotStartService()));
+	connect(_pbStop,  TQ_SIGNAL(clicked()), TQ_SLOT(slotStopService()));
+	connect(_lvStartup, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotEvalItem(TQListViewItem*)) );
 
 	load();
 }
@@ -161,7 +161,7 @@ void KDEDConfig::load( bool useDefaults ) {
 
 			if ( file.readBoolEntry("X-TDE-Kded-autoload") ) {
 				clitem = new CheckListItem(_lvStartup, TQString::null);
-				connect(clitem, TQT_SIGNAL(changed(TQCheckListItem*)), TQT_SLOT(slotItemChecked(TQCheckListItem*)));
+				connect(clitem, TQ_SIGNAL(changed(TQCheckListItem*)), TQ_SLOT(slotItemChecked(TQCheckListItem*)));
 				clitem->setOn(autoloadEnabled(&kdedrc, *it));
 				item = clitem;
 				item->setText(1, file.readName());
@@ -212,7 +212,7 @@ void KDEDConfig::save() {
 	kdedrc.sync();
 
 	DCOPRef( "kded", "kded" ).call( "reconfigure" );
-	TQTimer::singleShot(0, this, TQT_SLOT(slotServiceRunningToggled()));
+	TQTimer::singleShot(0, this, TQ_SLOT(slotServiceRunningToggled()));
 }
 
 
diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h
index 6dff072ea..eaffa3808 100644
--- a/kcontrol/kded/kcmkded.h
+++ b/kcontrol/kded/kcmkded.h
@@ -30,7 +30,7 @@ class TQPushButton;
 
 class KDEDConfig : public TDECModule
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	KDEDConfig(TQWidget* parent, const char* name= 0L, const TQStringList& foo = TQStringList());
 	~KDEDConfig() {};
@@ -64,7 +64,7 @@ private:
 
 class CheckListItem : public TQObject, public TQCheckListItem
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	CheckListItem(TQListView* parent, const TQString &text);
 	~CheckListItem() { }
diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp
index 4ae379a50..31e1b0500 100644
--- a/kcontrol/keys/commandShortcuts.cpp
+++ b/kcontrol/keys/commandShortcuts.cpp
@@ -84,8 +84,8 @@ void CommandShortcutsModule::initGUI()
                         "To edit, add or remove entries from this list use the "
                         "<a href=\"launchMenuEditor\">TDE menu editor</a>.</qt>"));
     label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
-    disconnect(label, TQT_SIGNAL(linkClicked(const TQString &)), label, TQT_SLOT(openLink(const TQString &)));
-    connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor()));
+    disconnect(label, TQ_SIGNAL(linkClicked(const TQString &)), label, TQ_SLOT(openLink(const TQString &)));
+    connect(label, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SLOT(launchMenuEditor()));
     mainLayout->addWidget(label);
 
     m_tree = new AppTreeView(this, "appTreeView");
@@ -97,10 +97,10 @@ void CommandShortcutsModule::initGUI()
                          "currently defined on this system. Click to select a command to "
                          "assign a keyboard shortcut to. Complete management of these "
                          "entries can be done via the menu editor program."));
-    connect(m_tree, TQT_SIGNAL(entrySelected(const TQString&, const TQString &, bool)),
-            this, TQT_SLOT(commandSelected(const TQString&, const TQString &, bool)));
-    connect(m_tree, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
-            this, TQT_SLOT(commandDoubleClicked(TQListViewItem *, const TQPoint &, int)));
+    connect(m_tree, TQ_SIGNAL(entrySelected(const TQString&, const TQString &, bool)),
+            this, TQ_SLOT(commandSelected(const TQString&, const TQString &, bool)));
+    connect(m_tree, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
+            this, TQ_SLOT(commandDoubleClicked(TQListViewItem *, const TQPoint &, int)));
     m_shortcutBox = new TQButtonGroup(i18n("Shortcut for Selected Command"), this);
     mainLayout->addWidget(m_shortcutBox);
     TQHBoxLayout* buttonLayout = new TQHBoxLayout(m_shortcutBox, KDialog::marginHint() * 2);
@@ -121,10 +121,10 @@ void CommandShortcutsModule::initGUI()
                          "to the currently selected command."));
     buttonLayout->addSpacing(KDialog::spacingHint() * 2);
     buttonLayout->addWidget(m_shortcutButton);
-    connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)),
-            this, TQT_SLOT(shortcutChanged(const TDEShortcut&)));
-    connect(m_customRadio, TQT_SIGNAL(toggled(bool)), m_shortcutButton, TQT_SLOT(setEnabled(bool)));
-    connect(m_noneRadio, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shortcutRadioToggled(bool)));
+    connect(m_shortcutButton, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)),
+            this, TQ_SLOT(shortcutChanged(const TDEShortcut&)));
+    connect(m_customRadio, TQ_SIGNAL(toggled(bool)), m_shortcutButton, TQ_SLOT(setEnabled(bool)));
+    connect(m_noneRadio, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(shortcutRadioToggled(bool)));
     buttonLayout->addStretch(1);
 }
 
diff --git a/kcontrol/keys/commandShortcuts.h b/kcontrol/keys/commandShortcuts.h
index 54be5345b..9cb328f15 100644
--- a/kcontrol/keys/commandShortcuts.h
+++ b/kcontrol/keys/commandShortcuts.h
@@ -37,7 +37,7 @@ typedef TQPtrListIterator<AppTreeItem> treeItemListIterator;
 
 class CommandShortcutsModule : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         CommandShortcutsModule( TQWidget *parent = 0, const char *name = 0 );
         ~CommandShortcutsModule();
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index ee39447a1..90fa59f82 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -112,8 +112,8 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
 
   //readSchemeNames();
   sList->setCurrentItem( 0 );
-  connect( sList, TQT_SIGNAL( highlighted( int ) ),
-           TQT_SLOT( slotPreviewScheme( int ) ) );
+  connect( sList, TQ_SIGNAL( highlighted( int ) ),
+           TQ_SLOT( slotPreviewScheme( int ) ) );
 
   TQLabel *label = new TQLabel( sList, i18n("&Key Scheme"), this );
 
@@ -124,12 +124,12 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
   TQWhatsThis::add( sList, wtstr );
 
   addBt = new TQPushButton(  i18n("&Save Scheme..."), this );
-  connect( addBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) );
+  connect( addBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ) );
   TQWhatsThis::add(addBt, i18n("Click here to add a new key bindings scheme. You will be prompted for a name."));
 
   removeBt = new TQPushButton(  i18n("&Remove Scheme"), this );
   removeBt->setEnabled(FALSE);
-  connect( removeBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() ) );
+  connect( removeBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() ) );
   TQWhatsThis::add( removeBt, i18n("Click here to remove the selected key bindings scheme. You can not"
     " remove the standard system wide schemes, 'Current scheme' and 'TDE default'.") );
 
@@ -143,7 +143,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
 	if( !KKeySequence::keyboardHasMetaKey() )
 		preferMetaBt->setEnabled( false );
 	preferMetaBt->setChecked( KKeySequence::useFourModifierKeys() );
-	connect( preferMetaBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotPreferMeta()) );
+	connect( preferMetaBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotPreferMeta()) );
 	TQWhatsThis::add( preferMetaBt, i18n("If your keyboard has a Meta key, but you would "
 		"like TDE to prefer the 3-modifier configuration defaults, then this option "
 		"should be unchecked.") );
@@ -153,7 +153,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
   KSeparator* line = new KSeparator( KSeparator::HLine, this );
 
   kc = new KeyChooserSpec( actions, this, isGlobal );
-  connect( kc, TQT_SIGNAL(keyChange()), this, TQT_SLOT(slotKeyChange()) );
+  connect( kc, TQ_SIGNAL(keyChange()), this, TQ_SLOT(slotKeyChange()) );
 
   readScheme();
 
@@ -356,8 +356,8 @@ void KKeyModule::readScheme( int index )
 
   } while ( nameValid == FALSE );
 
-  disconnect( sList, TQT_SIGNAL( highlighted( int ) ), this,
-              TQT_SLOT( slotPreviewScheme( int ) ) );
+  disconnect( sList, TQ_SIGNAL( highlighted( int ) ), this,
+              TQ_SLOT( slotPreviewScheme( int ) ) );
 
 
   TQString kksPath = TDEGlobal::dirs()->saveLocation("data", "kcmkeys/");
@@ -403,8 +403,8 @@ void KKeyModule::readScheme( int index )
 
   slotSave();
 
-  connect( sList, TQT_SIGNAL( highlighted( int ) ), this,
-           TQT_SLOT( slotPreviewScheme( int ) ) );
+  connect( sList, TQ_SIGNAL( highlighted( int ) ), this,
+           TQ_SLOT( slotPreviewScheme( int ) ) );
 
   slotPreviewScheme( sList->currentItem() );
 }*/
diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h
index f442a2c31..4da3f16b2 100644
--- a/kcontrol/keys/keyconfig.h
+++ b/kcontrol/keys/keyconfig.h
@@ -22,7 +22,7 @@ class KeyChooserSpec;
 
 class KKeyModule : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	TDEAccelActions actions;
         //TDEAccelActions dict;
@@ -77,7 +77,7 @@ protected:
 
 class KeyChooserSpec : public KKeyChooser
 {
-        Q_OBJECT
+        TQ_OBJECT
 public:
         KeyChooserSpec( TDEAccelActions& actions, TQWidget* parent,
                  bool bGlobal );
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index d002b667f..de0cc2dbc 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -75,16 +75,16 @@ void KeyModule::initGUI()
 
 	m_pShortcuts = new ShortcutsModule( this );
 	m_pTab->addTab( m_pShortcuts, i18n("Shortcut Schemes") );
-	connect( m_pShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
+	connect( m_pShortcuts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
 
 	m_pCommandShortcuts = new CommandShortcutsModule ( this );
 	m_pTab->addTab( m_pCommandShortcuts, i18n("Command Shortcuts") );
-	connect( m_pCommandShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
-    connect( m_pTab, TQT_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQT_SLOT(showing(TQWidget*)) );
+	connect( m_pCommandShortcuts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
+    connect( m_pTab, TQ_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQ_SLOT(showing(TQWidget*)) );
 
 	m_pModifiers = new ModifiersModule( this );
 	m_pTab->addTab( m_pModifiers, i18n("Modifier Keys") );
-	connect( m_pModifiers, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
+	connect( m_pModifiers, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
 }
 
 void KeyModule::load()
@@ -181,9 +181,9 @@ extern "C"
 	kdDebug(125) << "KeyModule::init() - Load Included Bindings\n";
 // this should match the included files above
 #define NOSLOTS
-#define SHIFT Qt::SHIFT
-#define CTRL Qt::CTRL
-#define ALT Qt::ALT
+#define SHIFT TQt::SHIFT
+#define CTRL TQt::CTRL
+#define ALT TQt::ALT
 #include "../../klipper/klipperbindings.cpp"
 #include "../../twin/twinbindings.cpp"
 #define KICKER_ALL_BINDINGS
diff --git a/kcontrol/keys/main.h b/kcontrol/keys/main.h
index 281b2d37a..1830438a9 100644
--- a/kcontrol/keys/main.h
+++ b/kcontrol/keys/main.h
@@ -33,7 +33,7 @@ class ModifiersModule;
 
 class KeyModule : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	KeyModule( TQWidget *parent, const char *name );
         ~KeyModule();
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 39dfb7010..bc182f944 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -172,7 +172,7 @@ void ModifiersModule::initGUI()
 	TQGridLayout* pLayoutTop = new TQGridLayout( this, 6, 2, KDialog::marginHint() );
 	pLayoutTop->setColStretch( 1, 1 );
 
-	TQGroupBox* pGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("TDE Modifiers"), this );
+	TQGroupBox* pGroup = new TQGroupBox( 2, TQt::Horizontal, i18n("TDE Modifiers"), this );
 	pLayoutTop->addWidget( pGroup, 0, 0 );
 
 	TQLabel* plbl = new TQLabel( i18n("Modifier"), pGroup );
@@ -183,13 +183,13 @@ void ModifiersModule::initGUI()
 	plbl = new TQLabel( i18n("X11-Mod"), pGroup );
 	plbl->setFont( font );
 
-	new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Shift"), pGroup );
+	new TQLabel( i18n("TQAccel", "Shift"), pGroup );
 	new TQLabel( "shift", pGroup );
 
-	m_plblCtrl = new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Ctrl"), pGroup );
+	m_plblCtrl = new TQLabel( i18n("TQAccel", "Ctrl"), pGroup );
 	new TQLabel( "control", pGroup );
 
-	m_plblAlt = new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Alt"), pGroup );
+	m_plblAlt = new TQLabel( i18n("TQAccel", "Alt"), pGroup );
 	new TQLabel( "mod1", pGroup );
 
 	m_plblWin = new TQLabel( i18n("Win"), pGroup );
@@ -207,7 +207,7 @@ void ModifiersModule::initGUI()
 
 	m_pchkMacKeyboard = new TQCheckBox( i18n("Macintosh keyboard"), this );
 	m_pchkMacKeyboard->setChecked( m_bMacKeyboardOrig );
-	connect( m_pchkMacKeyboard, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacKeyboardClicked()) );
+	connect( m_pchkMacKeyboard, TQ_SIGNAL(clicked()), TQ_SLOT(slotMacKeyboardClicked()) );
 	pLayoutTop->addWidget( m_pchkMacKeyboard, 1, 0 );
 
 	m_pchkMacSwap = new TQCheckBox( i18n("MacOS-style modifier usage"), this );
@@ -220,13 +220,13 @@ void ModifiersModule::initGUI()
 			"<b>Command</b> will be used for application and console commands, "
 			"<b>Option</b> as a command modifier and for navigating menus and dialogs, "
 			"and <b>Control</b> for window manager commands.") );
-	connect( m_pchkMacSwap, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacSwapClicked()) );
+	connect( m_pchkMacSwap, TQ_SIGNAL(clicked()), TQ_SLOT(slotMacSwapClicked()) );
 	pLayoutTop->addWidget( m_pchkMacSwap, 2, 0 );
 
 	//------------------
 	pLayoutTop->addRowSpacing( 3, KDialog::spacingHint() * 3 );
 
-	pGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("X Modifier Mapping"), this );
+	pGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("X Modifier Mapping"), this );
 	pLayoutTop->addWidget( pGroup, 4, 0 );
 
 	m_plstXMods = new TDEListView( pGroup );
@@ -286,8 +286,8 @@ void ModifiersModule::updateWidgets()
 		}
 		m_pchkMacSwap->setEnabled( true );
 	} else {
-		m_plblCtrl->setText( i18n(TQACCEL_OBJECT_NAME_STRING, "Ctrl") );
-		m_plblAlt->setText( i18n(TQACCEL_OBJECT_NAME_STRING, "Alt") );
+		m_plblCtrl->setText( i18n("TQAccel", "Ctrl") );
+		m_plblAlt->setText( i18n("TQAccel", "Alt") );
 		m_plblWin->setText( i18n("Win") );
 		m_pchkMacSwap->setEnabled( false );
 	}
diff --git a/kcontrol/keys/modifiers.h b/kcontrol/keys/modifiers.h
index b600bfafb..64b73fa5b 100644
--- a/kcontrol/keys/modifiers.h
+++ b/kcontrol/keys/modifiers.h
@@ -10,7 +10,7 @@ class TDEListView;
 
 class ModifiersModule : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	ModifiersModule( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index e7f599dda..18f6803ab 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -139,21 +139,21 @@ void ShortcutsModule::initGUI()
 	pGroup->hide();
 
 	m_prbPre = new TQRadioButton( "", this );
-	connect( m_prbPre, TQT_SIGNAL(clicked()), TQT_SLOT(slotSchemeCur()) );
+	connect( m_prbPre, TQ_SIGNAL(clicked()), TQ_SLOT(slotSchemeCur()) );
 	pGroup->insert( m_prbPre );
 	pHLayout->addWidget( m_prbPre );
 
 	m_pcbSchemes = new KComboBox( this );
 	m_pcbSchemes->setMinimumWidth( 100 );
 	m_pcbSchemes->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
-	connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) );
+	connect( m_pcbSchemes, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectScheme(int)) );
 	pHLayout->addWidget( m_pcbSchemes );
 
 	pHLayout->addSpacing( KDialog::marginHint() );
 
 	m_pbtnRemove = new TQPushButton( i18n("&Remove"), this );
 	m_pbtnRemove->setEnabled( false );
-	connect( m_pbtnRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveScheme()) );
+	connect( m_pbtnRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveScheme()) );
 	TQWhatsThis::add( m_pbtnRemove, i18n("Click here to remove the selected key bindings scheme. You cannot"
 		" remove the standard system-wide schemes 'Current scheme' and 'TDE default'.") );
 	pHLayout->addWidget( m_pbtnRemove );
@@ -168,7 +168,7 @@ void ShortcutsModule::initGUI()
 	m_pbtnSave = new TQPushButton( i18n("&Save..."), this );
 	m_pbtnSave->setEnabled( false );
 	TQWhatsThis::add( m_pbtnSave, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.") );
-	connect( m_pbtnSave, TQT_SIGNAL(clicked()), TQT_SLOT(slotSaveSchemeAs()) );
+	connect( m_pbtnSave, TQ_SIGNAL(clicked()), TQ_SLOT(slotSaveSchemeAs()) );
 	pHLayout->addWidget( m_pbtnSave );
 
 	pHLayout->addStretch( 1 );
@@ -196,20 +196,20 @@ void ShortcutsModule::initGUI()
 		m_useRmWinKeys->resize( m_useRmWinKeys->sizeHint() );
 		m_useRmWinKeys->setChecked( m_bUseRmWinKeys );
 		pVLayout->addWidget( m_useRmWinKeys, 1, 0 );
-		connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) );
+		connect( m_useRmWinKeys, TQ_SIGNAL(clicked()), TQ_SLOT(slotUseRmWinKeysClicked()) );
 	}
 	m_pTab->addTab( m_pkcGeneral, i18n("&Global Shortcuts") );
-	connect( m_pkcGeneral, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
+	connect( m_pkcGeneral, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) );
 
 	m_pListSequence = new TDEAccelShortcutList( m_actionsSequence, true );
 	m_pkcSequence = new KKeyChooser( m_pListSequence, this, KKeyChooser::Global, false );
 	m_pTab->addTab( m_pkcSequence, i18n("Shortcut Se&quences") );
-	connect( m_pkcSequence, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
+	connect( m_pkcSequence, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) );
 
 	m_pListApplication = new TDEStdAccel::ShortcutList;
 	m_pkcApplication = new KKeyChooser( m_pListApplication, this, KKeyChooser::Standard, false );
 	m_pTab->addTab( m_pkcApplication, i18n("App&lication Shortcuts") );
-	connect( m_pkcApplication, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
+	connect( m_pkcApplication, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) );
 
 	kdDebug(125) << "G-----------" << endl;
 	readSchemeNames();
@@ -404,7 +404,7 @@ void ShortcutsModule::slotSaveSchemeAs()
 			return;
 	} while( !bNameValid );
 
-	disconnect( m_pcbSchemes, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectScheme(int)) );
+	disconnect( m_pcbSchemes, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSelectScheme(int)) );
 
 	TQString kksPath = TDEGlobal::dirs()->saveLocation( "data", "kcmkeys/" );
 
@@ -434,7 +434,7 @@ void ShortcutsModule::slotSaveSchemeAs()
 
 	saveScheme();
 
-	connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) );
+	connect( m_pcbSchemes, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectScheme(int)) );
 	slotSelectScheme();
 }
 
diff --git a/kcontrol/keys/shortcuts.h b/kcontrol/keys/shortcuts.h
index c1f1b2822..2ffc0e68f 100644
--- a/kcontrol/keys/shortcuts.h
+++ b/kcontrol/keys/shortcuts.h
@@ -35,7 +35,7 @@
 
 class ShortcutsModule : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	ShortcutsModule( TQWidget *parent = 0, const char *name = 0 );
 	~ShortcutsModule();
diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp
index 36d0e3bf4..31879e2f2 100644
--- a/kcontrol/keys/treeview.cpp
+++ b/kcontrol/keys/treeview.cpp
@@ -109,11 +109,11 @@ AppTreeView::AppTreeView( TQWidget *parent, const char *name )
     addColumn(i18n("Shortcut"));
     addColumn(i18n("Alternate"));
 
-    connect(this, TQT_SIGNAL(clicked( TQListViewItem* )),
-            TQT_SLOT(itemSelected( TQListViewItem* )));
+    connect(this, TQ_SIGNAL(clicked( TQListViewItem* )),
+            TQ_SLOT(itemSelected( TQListViewItem* )));
 
-    connect(this,TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
-            TQT_SLOT(itemSelected( TQListViewItem* )));
+    connect(this,TQ_SIGNAL(selectionChanged ( TQListViewItem * )),
+            TQ_SLOT(itemSelected( TQListViewItem* )));
 }
 
 AppTreeView::~AppTreeView()
@@ -122,7 +122,7 @@ AppTreeView::~AppTreeView()
 
 void AppTreeView::fill()
 {
-    TQApplication::setOverrideCursor(Qt::WaitCursor);
+    TQApplication::setOverrideCursor(TQt::WaitCursor);
     clear();
     fillBranch(TQString::null, 0);
     TQApplication::restoreOverrideCursor();
diff --git a/kcontrol/keys/treeview.h b/kcontrol/keys/treeview.h
index 4da6d2351..591658ffe 100644
--- a/kcontrol/keys/treeview.h
+++ b/kcontrol/keys/treeview.h
@@ -61,7 +61,7 @@ private:
 class AppTreeView : public TDEListView
 {
     friend class AppTreeItem;
-    Q_OBJECT
+    TQ_OBJECT
 public:
     AppTreeView(TQWidget *parent=0, const char *name=0);
     ~AppTreeView();
diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp
index f2ba15680..dadb70f39 100644
--- a/kcontrol/kicker/advancedDialog.cpp
+++ b/kcontrol/kicker/advancedDialog.cpp
@@ -40,10 +40,10 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name)
                   name,
                   false, false)
 {
-    connect(this, TQT_SIGNAL(applyClicked()),
-            this, TQT_SLOT(save()));
-    connect(this, TQT_SIGNAL(okClicked()),
-            this, TQT_SLOT(save()));
+    connect(this, TQ_SIGNAL(applyClicked()),
+            this, TQ_SLOT(save()));
+    connect(this, TQ_SIGNAL(okClicked()),
+            this, TQ_SLOT(save()));
 
     TQFrame* page = plainPage();
     TQVBoxLayout* layout = new TQVBoxLayout(page);
@@ -53,22 +53,22 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name)
 
     setMinimumSize( sizeHint() );
 
-    connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)),
-            this, TQT_SLOT(changed()));
-    connect(m_advancedWidget->hideButtonSize, TQT_SIGNAL(valueChanged(int)),
-            this, TQT_SLOT(changed()));
-    connect(m_advancedWidget->tintColorB, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(changed()));
-    connect(m_advancedWidget->tintSlider, TQT_SIGNAL(valueChanged(int)),
-            this, TQT_SLOT(changed()));
-    connect(m_advancedWidget->menubarPanelTransparent, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(changed()));
-    connect(m_advancedWidget->menubarPanelBlurred, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(changed()));
-    connect(m_advancedWidget->kickerResizeHandle, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(changed()));
-    connect(m_advancedWidget->kickerDeepButtons, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(changed()));
+    connect(m_advancedWidget->handles, TQ_SIGNAL(clicked(int)),
+            this, TQ_SLOT(changed()));
+    connect(m_advancedWidget->hideButtonSize, TQ_SIGNAL(valueChanged(int)),
+            this, TQ_SLOT(changed()));
+    connect(m_advancedWidget->tintColorB, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(changed()));
+    connect(m_advancedWidget->tintSlider, TQ_SIGNAL(valueChanged(int)),
+            this, TQ_SLOT(changed()));
+    connect(m_advancedWidget->menubarPanelTransparent, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(changed()));
+    connect(m_advancedWidget->menubarPanelBlurred, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(changed()));
+    connect(m_advancedWidget->kickerResizeHandle, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(changed()));
+    connect(m_advancedWidget->kickerDeepButtons, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(changed()));
     load();
 }
 
diff --git a/kcontrol/kicker/advancedDialog.h b/kcontrol/kicker/advancedDialog.h
index 12a2ef4bd..a0ffdff6d 100644
--- a/kcontrol/kicker/advancedDialog.h
+++ b/kcontrol/kicker/advancedDialog.h
@@ -26,7 +26,7 @@ class advancedKickerOptions;
 
 class advancedDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         advancedDialog(TQWidget* parent, const char* name);
diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp
index c2f488550..7c5436b52 100644
--- a/kcontrol/kicker/applettab_impl.cpp
+++ b/kcontrol/kicker/applettab_impl.cpp
@@ -42,16 +42,16 @@ AppletTab::AppletTab( TQWidget *parent, const char* name )
   : AppletTabBase (parent, name)
 {
 
-  connect(level_group, TQT_SIGNAL(clicked(int)), TQT_SLOT(level_changed(int)));
+  connect(level_group, TQ_SIGNAL(clicked(int)), TQ_SLOT(level_changed(int)));
 
-  connect(lb_trusted, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-          TQT_SLOT(trusted_selection_changed(TQListViewItem*)));
+  connect(lb_trusted, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+          TQ_SLOT(trusted_selection_changed(TQListViewItem*)));
 
-  connect(pb_add, TQT_SIGNAL(clicked()), TQT_SLOT(add_clicked()));
-  connect(pb_remove, TQT_SIGNAL(clicked()), TQT_SLOT(remove_clicked()));
+  connect(pb_add, TQ_SIGNAL(clicked()), TQ_SLOT(add_clicked()));
+  connect(pb_remove, TQ_SIGNAL(clicked()), TQ_SLOT(remove_clicked()));
 
-  connect(lb_available, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-          TQT_SLOT(available_selection_changed(TQListViewItem*)));
+  connect(lb_available, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+          TQ_SLOT(available_selection_changed(TQListViewItem*)));
 
   pb_add->setEnabled(false);
   pb_remove->setEnabled(false);
diff --git a/kcontrol/kicker/applettab_impl.h b/kcontrol/kicker/applettab_impl.h
index a92e166d6..14a082c17 100644
--- a/kcontrol/kicker/applettab_impl.h
+++ b/kcontrol/kicker/applettab_impl.h
@@ -33,7 +33,7 @@ class TQListViewItem;
 
 class AppletTab : public AppletTabBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  public:
   AppletTab( TQWidget *parent=0, const char* name=0 );
diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp
index 506eebdfb..d94f18bfa 100644
--- a/kcontrol/kicker/hidingconfig.cpp
+++ b/kcontrol/kicker/hidingconfig.cpp
@@ -41,13 +41,13 @@ HidingConfig::HidingConfig(TQWidget *parent, const char *name)
 
     //addConfig(KickerSettings::self(), m_widget);
 
-    connect(m_widget, TQT_SIGNAL(changed()),
-            this, TQT_SLOT(changed()));
-    connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()),
-            this, TQT_SLOT(aboutToNotifyKicker()));
+    connect(m_widget, TQ_SIGNAL(changed()),
+            this, TQ_SLOT(changed()));
+    connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()),
+            this, TQ_SLOT(aboutToNotifyKicker()));
 
     load();
-    TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
+    TQTimer::singleShot(0, this, TQ_SLOT(notChanged()));
 }
 
 void HidingConfig::notChanged()
@@ -90,7 +90,7 @@ void HidingConfig::defaults()
     // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changed,
     // while we manage some of the widgets ourselves
-    TQTimer::singleShot(0, this, TQT_SLOT(changed()));
+    TQTimer::singleShot(0, this, TQ_SLOT(changed()));
 }
 
 TQString HidingConfig::handbookSection() const
diff --git a/kcontrol/kicker/hidingconfig.h b/kcontrol/kicker/hidingconfig.h
index 1a6e22472..427201c62 100644
--- a/kcontrol/kicker/hidingconfig.h
+++ b/kcontrol/kicker/hidingconfig.h
@@ -24,7 +24,7 @@ class HidingTab;
 
 class HidingConfig : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     HidingConfig(TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui
index fae21c356..b0a9088cb 100644
--- a/kcontrol/kicker/hidingtab.ui
+++ b/kcontrol/kicker/hidingtab.ui
@@ -764,9 +764,9 @@
     <include location="global" impldecl="in implementation">knuminput.h</include>
     <include location="local"  impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot specifier="pure virtual">switchPanel(int)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/kicker/hidingtab_impl.cpp b/kcontrol/kicker/hidingtab_impl.cpp
index 8c340bd5d..382c1a84e 100644
--- a/kcontrol/kicker/hidingtab_impl.cpp
+++ b/kcontrol/kicker/hidingtab_impl.cpp
@@ -38,33 +38,33 @@ HidingTab::HidingTab(TQWidget *parent, const char* name)
     m_panelInfo(0)
 {
     // connections
-    connect(m_manual,TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_automatic, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_automatic, TQT_SIGNAL(toggled(bool)), TQT_SLOT(backgroundModeClicked()));
-    connect(m_background, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_background, TQT_SIGNAL(toggled(bool)), TQT_SLOT(backgroundModeClicked()));
-    connect(m_xineramaHide, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_hideSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
-    connect(m_delaySpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
-    connect(m_animateHiding, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_delaySpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
-    connect(m_autoHideSwitch, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_backgroundRaise, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_backgroundPos, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
-    connect(m_lHB, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_rHB, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionInfoChanged()),
-            TQT_SLOT(infoUpdated()));
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionAdded(ExtensionInfo*)),
-            TQT_SLOT(extensionAdded(ExtensionInfo*)));
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionRemoved(ExtensionInfo*)),
-            TQT_SLOT(extensionRemoved(ExtensionInfo*)));
+    connect(m_manual,TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_automatic, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_automatic, TQ_SIGNAL(toggled(bool)), TQ_SLOT(backgroundModeClicked()));
+    connect(m_background, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_background, TQ_SIGNAL(toggled(bool)), TQ_SLOT(backgroundModeClicked()));
+    connect(m_xineramaHide, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_hideSlider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()));
+    connect(m_delaySpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()));
+    connect(m_animateHiding, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_delaySpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()));
+    connect(m_autoHideSwitch, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_backgroundRaise, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_backgroundPos, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
+    connect(m_lHB, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_rHB, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionInfoChanged()),
+            TQ_SLOT(infoUpdated()));
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionAdded(ExtensionInfo*)),
+            TQ_SLOT(extensionAdded(ExtensionInfo*)));
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionRemoved(ExtensionInfo*)),
+            TQ_SLOT(extensionRemoved(ExtensionInfo*)));
     // position tab tells hiding tab about extension selections and vice versa
-    connect(KickerConfig::the(), TQT_SIGNAL(positionPanelChanged(int)),
-            TQT_SLOT(switchPanel(int)));
-    connect(m_panelList, TQT_SIGNAL(activated(int)),
-            KickerConfig::the(), TQT_SIGNAL(hidingPanelChanged(int)));
+    connect(KickerConfig::the(), TQ_SIGNAL(positionPanelChanged(int)),
+            TQ_SLOT(switchPanel(int)));
+    connect(m_panelList, TQ_SIGNAL(activated(int)),
+            KickerConfig::the(), TQ_SIGNAL(hidingPanelChanged(int)));
 }
 
 void HidingTab::load()
diff --git a/kcontrol/kicker/hidingtab_impl.h b/kcontrol/kicker/hidingtab_impl.h
index 34bc6a372..f5cd67ed1 100644
--- a/kcontrol/kicker/hidingtab_impl.h
+++ b/kcontrol/kicker/hidingtab_impl.h
@@ -26,7 +26,7 @@ class ExtensionInfo;
 
 class HidingTab : public HidingTabBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     HidingTab(TQWidget *parent = 0, const char* name = 0);
diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp
index d7cbadf28..082753cb9 100644
--- a/kcontrol/kicker/lookandfeelconfig.cpp
+++ b/kcontrol/kicker/lookandfeelconfig.cpp
@@ -41,13 +41,13 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
 
     addConfig(KickerSettings::self(), m_widget);
 
-    connect(m_widget, TQT_SIGNAL(changed()),
-            this, TQT_SLOT(changed()));
-    connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()),
-            this, TQT_SLOT(aboutToNotifyKicker()));
+    connect(m_widget, TQ_SIGNAL(changed()),
+            this, TQ_SLOT(changed()));
+    connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()),
+            this, TQ_SLOT(aboutToNotifyKicker()));
 
     load();
-    TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
+    TQTimer::singleShot(0, this, TQ_SLOT(notChanged()));
 }
 
 void LookAndFeelConfig::notChanged()
@@ -90,7 +90,7 @@ void LookAndFeelConfig::defaults()
     // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changed,
     // while we manage some of the widgets ourselves
-    TQTimer::singleShot(0, this, TQT_SLOT(changed()));
+    TQTimer::singleShot(0, this, TQ_SLOT(changed()));
 }
 
 TQString LookAndFeelConfig::handbookSection() const
diff --git a/kcontrol/kicker/lookandfeelconfig.h b/kcontrol/kicker/lookandfeelconfig.h
index ff8a55b38..f35a33f45 100644
--- a/kcontrol/kicker/lookandfeelconfig.h
+++ b/kcontrol/kicker/lookandfeelconfig.h
@@ -24,7 +24,7 @@ class LookAndFeelTab;
 
 class LookAndFeelConfig : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     LookAndFeelConfig(TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui
index 803393e66..fcc746f57 100644
--- a/kcontrol/kicker/lookandfeeltab.ui
+++ b/kcontrol/kicker/lookandfeeltab.ui
@@ -624,11 +624,11 @@ This option is only active if 'Enable background image' is selected.</string>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">launchAdvancedDialog()</slot>
     <slot access="protected" specifier="pure virtual">browseTheme(const TQString&amp;)</slot>
     <slot access="protected" specifier="pure virtual">enableTransparency(bool)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp
index 674b1cd04..858cc2cb3 100644
--- a/kcontrol/kicker/lookandfeeltab_impl.cpp
+++ b/kcontrol/kicker/lookandfeeltab_impl.cpp
@@ -48,21 +48,21 @@ LookAndFeelTab::LookAndFeelTab( TQWidget *parent, const char* name )
   : LookAndFeelTabBase(parent, name),
     m_advDialog(0)
 {
-    connect(m_kmenuTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
-    connect(m_desktopTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
-    connect(m_browserTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
-    connect(m_urlTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
-    connect(m_windowListTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
+    connect(m_kmenuTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
+    connect(m_desktopTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
+    connect(m_browserTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
+    connect(m_urlTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
+    connect(m_windowListTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
 
-    connect(m_kmenuTile, TQT_SIGNAL(activated(int)), TQT_SLOT(kmenuTileChanged(int)));
-    connect(m_desktopTile, TQT_SIGNAL(activated(int)), TQT_SLOT(desktopTileChanged(int)));
-    connect(m_browserTile, TQT_SIGNAL(activated(int)), TQT_SLOT(browserTileChanged(int)));
-    connect(m_urlTile, TQT_SIGNAL(activated(int)), TQT_SLOT(urlTileChanged(int)));
-    connect(m_windowListTile, TQT_SIGNAL(activated(int)), TQT_SLOT(wlTileChanged(int)));
+    connect(m_kmenuTile, TQ_SIGNAL(activated(int)), TQ_SLOT(kmenuTileChanged(int)));
+    connect(m_desktopTile, TQ_SIGNAL(activated(int)), TQ_SLOT(desktopTileChanged(int)));
+    connect(m_browserTile, TQ_SIGNAL(activated(int)), TQ_SLOT(browserTileChanged(int)));
+    connect(m_urlTile, TQ_SIGNAL(activated(int)), TQ_SLOT(urlTileChanged(int)));
+    connect(m_windowListTile, TQ_SIGNAL(activated(int)), TQ_SLOT(wlTileChanged(int)));
 
-    connect(kcfg_ColorizeBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(browseTheme()));
+    connect(kcfg_ColorizeBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(browseTheme()));
 
-    connect(kcfg_BackgroundTheme->lineEdit(), TQT_SIGNAL(lostFocus()), TQT_SLOT(browseTheme()));
+    connect(kcfg_BackgroundTheme->lineEdit(), TQ_SIGNAL(lostFocus()), TQ_SLOT(browseTheme()));
     kcfg_BackgroundTheme->setFilter(KImageIO::pattern(KImageIO::Reading));
     kcfg_BackgroundTheme->setCaption(i18n("Select Image File"));
 
@@ -92,7 +92,7 @@ void LookAndFeelTab::launchAdvancedDialog()
     if (!m_advDialog)
     {
         m_advDialog = new advancedDialog(this, "advancedDialog");
-        connect(m_advDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(finishAdvancedDialog()));
+        connect(m_advDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(finishAdvancedDialog()));
         m_advDialog->show();
     }
     m_advDialog->setActiveWindow();
diff --git a/kcontrol/kicker/lookandfeeltab_impl.h b/kcontrol/kicker/lookandfeeltab_impl.h
index 704a359db..49c366dfe 100644
--- a/kcontrol/kicker/lookandfeeltab_impl.h
+++ b/kcontrol/kicker/lookandfeeltab_impl.h
@@ -28,7 +28,7 @@ class advancedDialog;
 
 class LookAndFeelTab : public LookAndFeelTabBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     LookAndFeelTab(TQWidget *parent = 0, const char* name = 0);
diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp
index 5695e3869..a703ea966 100644
--- a/kcontrol/kicker/lookandfeeltab_kcm.cpp
+++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp
@@ -48,7 +48,7 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
     layout->addWidget(lookandfeeltab);
     layout->addStretch();
 
-    connect(lookandfeeltab, TQT_SIGNAL(changed()), TQT_SLOT(configChanged()));
+    connect(lookandfeeltab, TQ_SIGNAL(changed()), TQ_SLOT(configChanged()));
 
     load();
 }
diff --git a/kcontrol/kicker/lookandfeeltab_kcm.h b/kcontrol/kicker/lookandfeeltab_kcm.h
index 32a89b4f8..54df41784 100644
--- a/kcontrol/kicker/lookandfeeltab_kcm.h
+++ b/kcontrol/kicker/lookandfeeltab_kcm.h
@@ -24,7 +24,7 @@ class LookAndFeelTab;
 
 class LookAndFeelConfig : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     LookAndFeelConfig(TQWidget *parent = 0L, const char *name = 0L);
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index da73da7c3..a0e14ba17 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -68,10 +68,10 @@ KickerConfig::KickerConfig(TQWidget *parent, const char *name)
                       "jumpToPanel(TQString)", false);
     kapp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray());
 
-    connect(this, TQT_SIGNAL(hidingPanelChanged(int)),
-            this, TQT_SLOT(setCurrentPanelIndex(int)));
-    connect(this, TQT_SIGNAL(positionPanelChanged(int)),
-            this, TQT_SLOT(setCurrentPanelIndex(int)));
+    connect(this, TQ_SIGNAL(hidingPanelChanged(int)),
+            this, TQ_SLOT(setCurrentPanelIndex(int)));
+    connect(this, TQ_SIGNAL(positionPanelChanged(int)),
+            this, TQ_SLOT(setCurrentPanelIndex(int)));
 }
 
 KickerConfig::~KickerConfig()
@@ -90,7 +90,7 @@ KickerConfig::~KickerConfig()
 // this method may get called multiple times during the life of the control panel!
 void KickerConfig::init()
 {
-    disconnect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&)));
+    disconnect(configFileWatch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(configChanged(const TQString&)));
     configFileWatch->stopScan();
     for (ExtensionInfoList::iterator it = m_extensionInfo.begin();
          it != m_extensionInfo.end();
@@ -128,7 +128,7 @@ void KickerConfig::init()
 
     setupExtensionInfo(*config, true, true);
 
-    connect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&)));
+    connect(configFileWatch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(configChanged(const TQString&)));
     configFileWatch->startScan();
 }
 
diff --git a/kcontrol/kicker/main.h b/kcontrol/kicker/main.h
index 06bf2ec03..9b832ab38 100644
--- a/kcontrol/kicker/main.h
+++ b/kcontrol/kicker/main.h
@@ -29,7 +29,7 @@ class KDirWatch;
 
 class KickerConfig : public TQObject, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 public:
diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp
index 4f8a68605..6773105c6 100644
--- a/kcontrol/kicker/menuconfig.cpp
+++ b/kcontrol/kicker/menuconfig.cpp
@@ -41,13 +41,13 @@ MenuConfig::MenuConfig(TQWidget *parent, const char *name)
 
     addConfig(KickerSettings::self(), m_widget);
 
-    connect(m_widget, TQT_SIGNAL(changed()),
-            this, TQT_SLOT(changed()));
-    connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()),
-            this, TQT_SLOT(aboutToNotifyKicker()));
+    connect(m_widget, TQ_SIGNAL(changed()),
+            this, TQ_SLOT(changed()));
+    connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()),
+            this, TQ_SLOT(aboutToNotifyKicker()));
 
     load();
-    TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
+    TQTimer::singleShot(0, this, TQ_SLOT(notChanged()));
 }
 
 void MenuConfig::notChanged()
@@ -90,7 +90,7 @@ void MenuConfig::defaults()
     // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changedm,
     // while we manage some of the widgets ourselves
-    TQTimer::singleShot(0, this, TQT_SLOT(changed()));
+    TQTimer::singleShot(0, this, TQ_SLOT(changed()));
 }
 
 TQString MenuConfig::handbookSection() const
diff --git a/kcontrol/kicker/menuconfig.h b/kcontrol/kicker/menuconfig.h
index a5fa29daf..373e1cbf8 100644
--- a/kcontrol/kicker/menuconfig.h
+++ b/kcontrol/kicker/menuconfig.h
@@ -24,7 +24,7 @@ class MenuTab;
 
 class MenuConfig : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     MenuConfig(TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index fbd15cd8d..259027a0b 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -79,12 +79,12 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
     m_kmenu_button_changed(false)
 {
     // connections
-    connect(m_editKMenuButton, TQT_SIGNAL(clicked()), TQT_SLOT(launchMenuEditor()));
-    connect(btnCustomKMenuIcon, TQT_SIGNAL(clicked()), TQT_SLOT(launchIconEditor()));
-    connect(kcfg_KMenuText, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(kmenuChanged()));
-    connect(kcfg_ShowKMenuText, TQT_SIGNAL(toggled(bool)), TQT_SLOT(kmenuChanged()));
-    //connect(kcfg_ButtonFont, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(kmenuChanged()));
-    connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(kmenuChanged()));
+    connect(m_editKMenuButton, TQ_SIGNAL(clicked()), TQ_SLOT(launchMenuEditor()));
+    connect(btnCustomKMenuIcon, TQ_SIGNAL(clicked()), TQ_SLOT(launchIconEditor()));
+    connect(kcfg_KMenuText, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(kmenuChanged()));
+    connect(kcfg_ShowKMenuText, TQ_SIGNAL(toggled(bool)), TQ_SLOT(kmenuChanged()));
+    //connect(kcfg_ButtonFont, TQ_SIGNAL(fontSelected(const TQFont &)), TQ_SLOT(kmenuChanged()));
+    connect(maxrecentdocs, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(kmenuChanged()));
 
     // FIXME
     // When top pixmap support is ready for end-user visibility, replace
@@ -129,7 +129,7 @@ void MenuTab::load( bool useDefaults )
                                       TQString::null,
                                       SmallIcon("bookmark"),
                                       c->readBoolEntry("UseBookmarks", false));
-    connect(m_bookmarkMenu, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
+    connect(m_bookmarkMenu, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
 
     // show the quick menus menu?
     m_quickBrowserMenu = new kSubMenuItem(m_subMenus,
@@ -137,7 +137,7 @@ void MenuTab::load( bool useDefaults )
                                           TQString::null,
                                           SmallIcon("kdisknav"),
                                           c->readBoolEntry("UseBrowser", false));
-    connect(m_quickBrowserMenu, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
+    connect(m_quickBrowserMenu, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
 
     TQStringList ext_default;
     ext_default << "prefmenu.desktop" << "systemmenu.desktop";
@@ -156,7 +156,7 @@ void MenuTab::load( bool useDefaults )
                                         *it,
                                         SmallIcon(df.readIcon()),
                                         tqFind(ext.begin(), ext.end(), *it) != ext.end());
-            connect(menuItem, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
+            connect(menuItem, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
         }
     }
 
@@ -165,16 +165,16 @@ void MenuTab::load( bool useDefaults )
     m_openOnHover->setChecked( c->readBoolEntry("OpenOnHover", true) );
     menuStyleChanged();
 
-    connect(m_comboMenuStyle, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
-    connect(m_comboMenuStyle, TQT_SIGNAL(activated(int)), TQT_SLOT(menuStyleChanged()));
-    connect(m_openOnHover, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()));
+    connect(m_comboMenuStyle, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
+    connect(m_comboMenuStyle, TQ_SIGNAL(activated(int)), TQ_SLOT(menuStyleChanged()));
+    connect(m_openOnHover, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()));
 
     m_showFrequent->setChecked(true);
     
     c->setGroup("KMenu");
     m_searchShortcut->setShortcut(TDEShortcut(c->readEntry("SearchShortcut", "/")), false);
-    connect(m_searchShortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), TQT_SIGNAL(changed()));
-    connect(m_searchShortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), TQT_SLOT(setSearchShortcut(const TDEShortcut&)));
+    connect(m_searchShortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SIGNAL(changed()));
+    connect(m_searchShortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SLOT(setSearchShortcut(const TDEShortcut&)));
     
     if ( useDefaults )
        emit changed();
diff --git a/kcontrol/kicker/menutab_impl.h b/kcontrol/kicker/menutab_impl.h
index 509623d61..1344f2950 100644
--- a/kcontrol/kicker/menutab_impl.h
+++ b/kcontrol/kicker/menutab_impl.h
@@ -28,7 +28,7 @@
 
 class kSubMenuItem : public TQObject, public TQCheckListItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         kSubMenuItem(TQListView* parent, 
@@ -51,7 +51,7 @@ class kSubMenuItem : public TQObject, public TQCheckListItem
 
 class MenuTab : public MenuTabBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     MenuTab( TQWidget *parent=0, const char* name=0 );
diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp
index 00b571d13..cd871ae22 100644
--- a/kcontrol/kicker/positionconfig.cpp
+++ b/kcontrol/kicker/positionconfig.cpp
@@ -41,13 +41,13 @@ PositionConfig::PositionConfig(TQWidget *parent, const char *name)
 
     //addConfig(KickerSettings::self(), m_widget);
 
-    connect(m_widget, TQT_SIGNAL(changed()),
-            this, TQT_SLOT(changed()));
-    connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()),
-            this, TQT_SLOT(aboutToNotifyKicker()));
+    connect(m_widget, TQ_SIGNAL(changed()),
+            this, TQ_SLOT(changed()));
+    connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()),
+            this, TQ_SLOT(aboutToNotifyKicker()));
 
     load();
-    TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
+    TQTimer::singleShot(0, this, TQ_SLOT(notChanged()));
 }
 
 void PositionConfig::notChanged()
@@ -90,7 +90,7 @@ void PositionConfig::defaults()
     // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changed,
     // while we manage some of the widgets ourselves
-    TQTimer::singleShot(0, this, TQT_SLOT(changed()));
+    TQTimer::singleShot(0, this, TQ_SLOT(changed()));
 }
 
 TQString PositionConfig::handbookSection() const
diff --git a/kcontrol/kicker/positionconfig.h b/kcontrol/kicker/positionconfig.h
index 93d7cb533..264533e7e 100644
--- a/kcontrol/kicker/positionconfig.h
+++ b/kcontrol/kicker/positionconfig.h
@@ -24,7 +24,7 @@ class PositionTab;
 
 class PositionConfig : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PositionConfig(TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui
index 6729d0cf2..2786cedf5 100644
--- a/kcontrol/kicker/positiontab.ui
+++ b/kcontrol/kicker/positiontab.ui
@@ -1112,12 +1112,12 @@ how it is positioned on the screen and how much of the screen it should use.</st
     <include location="global" impldecl="in implementation">knuminput.h</include>
     <include location="local"  impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">lengthenPanel( int )</slot>
     <slot access="protected" specifier="pure virtual">movePanel( int )</slot>
     <slot access="protected" specifier="pure virtual">panelDimensionsChanged()</slot>
     <slot specifier="pure virtual">switchPanel( int )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index 63cdb35a9..b8a2d7ea9 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -104,10 +104,10 @@ PositionTab::PositionTab(TQWidget *parent, const char* name)
     }
 
     // connections
-    connect(m_locationGroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed()));
-    connect(m_xineramaScreenComboBox, TQT_SIGNAL(highlighted(int)), TQT_SIGNAL(changed()));
+    connect(m_locationGroup, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(changed()));
+    connect(m_xineramaScreenComboBox, TQ_SIGNAL(highlighted(int)), TQ_SIGNAL(changed()));
 
-    connect(m_identifyButton,TQT_SIGNAL(clicked()),TQT_SLOT(showIdentify()));
+    connect(m_identifyButton,TQ_SIGNAL(clicked()),TQ_SLOT(showIdentify()));
 
     for(int s=0; s < TQApplication::desktop()->numScreens(); s++)
     {   /* populate the combobox for the available screens */
@@ -123,38 +123,38 @@ PositionTab::PositionTab(TQWidget *parent, const char* name)
         m_xineramaScreenLabel->hide();
     }
 
-    connect(m_percentSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
-    connect(m_percentSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
-    connect(m_expandCheckBox, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()));
+    connect(m_percentSlider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()));
+    connect(m_percentSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()));
+    connect(m_expandCheckBox, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()));
 
-    connect(m_sizeGroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed()));
-    connect(m_customSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
-    connect(m_customSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
+    connect(m_sizeGroup, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(changed()));
+    connect(m_customSlider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()));
+    connect(m_customSpinbox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()));
 
     m_desktopPreview = new KVirtualBGRenderer(0);
-    connect(m_desktopPreview, TQT_SIGNAL(imageDone(int)),
-            TQT_SLOT(slotBGPreviewReady(int)));
-
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionInfoChanged()),
-            TQT_SLOT(infoUpdated()));
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionAdded(ExtensionInfo*)),
-            TQT_SLOT(extensionAdded(ExtensionInfo*)));
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionRemoved(ExtensionInfo*)),
-            TQT_SLOT(extensionRemoved(ExtensionInfo*)));
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionChanged(const TQString&)),
-            TQT_SLOT(extensionChanged(const TQString&)));
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionAboutToChange(const TQString&)),
-            TQT_SLOT(extensionAboutToChange(const TQString&)));
+    connect(m_desktopPreview, TQ_SIGNAL(imageDone(int)),
+            TQ_SLOT(slotBGPreviewReady(int)));
+
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionInfoChanged()),
+            TQ_SLOT(infoUpdated()));
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionAdded(ExtensionInfo*)),
+            TQ_SLOT(extensionAdded(ExtensionInfo*)));
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionRemoved(ExtensionInfo*)),
+            TQ_SLOT(extensionRemoved(ExtensionInfo*)));
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionChanged(const TQString&)),
+            TQ_SLOT(extensionChanged(const TQString&)));
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionAboutToChange(const TQString&)),
+            TQ_SLOT(extensionAboutToChange(const TQString&)));
     // position tab tells hiding tab about extension selections and vice versa
-    connect(KickerConfig::the(), TQT_SIGNAL(hidingPanelChanged(int)),
-            TQT_SLOT(jumpToPanel(int)));
-    connect(m_panelList, TQT_SIGNAL(activated(int)),
-            KickerConfig::the(), TQT_SIGNAL(positionPanelChanged(int)));
-
-    connect(m_panelSize, TQT_SIGNAL(activated(int)),
-            TQT_SLOT(sizeChanged(int)));
-    connect(m_panelSize, TQT_SIGNAL(activated(int)),
-            TQT_SIGNAL(changed()));
+    connect(KickerConfig::the(), TQ_SIGNAL(hidingPanelChanged(int)),
+            TQ_SLOT(jumpToPanel(int)));
+    connect(m_panelList, TQ_SIGNAL(activated(int)),
+            KickerConfig::the(), TQ_SIGNAL(positionPanelChanged(int)));
+
+    connect(m_panelSize, TQ_SIGNAL(activated(int)),
+            TQ_SLOT(sizeChanged(int)));
+    connect(m_panelSize, TQ_SIGNAL(activated(int)),
+            TQ_SIGNAL(changed()));
 }
 
 PositionTab::~PositionTab()
@@ -696,11 +696,11 @@ void PositionTab::showIdentify()
         screenLabel->setFrameStyle(TQFrame::Panel);
         screenLabel->setFrameShadow(TQFrame::Plain);
 
-        screenLabel->setAlignment(Qt::AlignCenter);
+        screenLabel->setAlignment(TQt::AlignCenter);
         screenLabel->setNum(s + 1);
         // BUGLET: we should not allow the identification to be entered again
         //         until the timer fires.
-        TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close()));
+        TQTimer::singleShot(1500, screenLabel, TQ_SLOT(close()));
 
         TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center());
         TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
diff --git a/kcontrol/kicker/positiontab_impl.h b/kcontrol/kicker/positiontab_impl.h
index 4740a8a61..31868fef9 100644
--- a/kcontrol/kicker/positiontab_impl.h
+++ b/kcontrol/kicker/positiontab_impl.h
@@ -29,7 +29,7 @@ class ExtensionInfo;
 
 class PositionTab : public PositionTabBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PositionTab(TQWidget *parent, const char* name = 0);
diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp
index b703b9b35..6e198659a 100644
--- a/kcontrol/knotify/knotify.cpp
+++ b/kcontrol/knotify/knotify.cpp
@@ -74,15 +74,15 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList &
     hbox->addWidget( m_appCombo, 10 );
 
     m_notifyWidget = new KNotifyWidget( this, "knotify widget", true );
-    connect( m_notifyWidget, TQT_SIGNAL( changed( bool )), TQT_SIGNAL( changed(bool)));
+    connect( m_notifyWidget, TQ_SIGNAL( changed( bool )), TQ_SIGNAL( changed(bool)));
 
     layout->addWidget( m_notifyWidget );
 
-    connect( m_appCombo, TQT_SIGNAL( activated( const TQString& ) ),
-             TQT_SLOT( slotAppActivated( const TQString& )) );
+    connect( m_appCombo, TQ_SIGNAL( activated( const TQString& ) ),
+             TQ_SLOT( slotAppActivated( const TQString& )) );
 
-    connect( m_notifyWidget->m_playerButton, TQT_SIGNAL( clicked() ),
-             TQT_SLOT( slotPlayerSettings()));
+    connect( m_notifyWidget->m_playerButton, TQ_SIGNAL( clicked() ),
+             TQ_SLOT( slotPlayerSettings()));
 
     TDEAboutData* ab = new TDEAboutData(
         "kcmknotify", I18N_NOOP("KNotify"), "3.0",
@@ -231,10 +231,10 @@ PlayerSettingsDialog::PlayerSettingsDialog( TQWidget *parent, bool modal )
     dataChanged = false;
     enableButton(Apply, false);
 
-    connect( m_ui->cbExternal, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( externalToggled( bool ) ) );
-    connect( m_ui->grpPlayers, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChanged() ) );
-    connect( m_ui->volumeSlider, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
-    connect( m_ui->reqExternal, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotChanged() ) );
+    connect( m_ui->cbExternal, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( externalToggled( bool ) ) );
+    connect( m_ui->grpPlayers, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotChanged() ) );
+    connect( m_ui->volumeSlider, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) );
+    connect( m_ui->reqExternal, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotChanged() ) );
 }
 
 void PlayerSettingsDialog::load( bool useDefaults )
diff --git a/kcontrol/knotify/knotify.h b/kcontrol/knotify/knotify.h
index 12aa35333..eb77bbf48 100644
--- a/kcontrol/knotify/knotify.h
+++ b/kcontrol/knotify/knotify.h
@@ -46,7 +46,7 @@ namespace KNotify
 
 class KCMKNotify : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KCMKNotify(TQWidget *parent, const char *name, const TQStringList &);
@@ -74,7 +74,7 @@ private:
 
 class PlayerSettingsDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PlayerSettingsDialog( TQWidget *parent, bool modal );
diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index d662d6af7..55eb642fe 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -66,13 +66,13 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
     cbNewWin = new TQCheckBox(i18n("Open folders in separate &windows"), vbox);
     TQWhatsThis::add( cbNewWin, i18n("If this option is checked, Konqueror will open a new window when "
                                     "you open a folder, rather than showing that folder's contents in the current window."));
-    connect(cbNewWin, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-    connect(cbNewWin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateWinPixmap(bool)));
+    connect(cbNewWin, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+    connect(cbNewWin, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateWinPixmap(bool)));
 
     // ----
 
     cbListProgress = new TQCheckBox( i18n( "&Show network operations in a single window" ), vbox );
-    connect(cbListProgress, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbListProgress, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbListProgress, i18n("Checking this option will group the"
                                           " progress information for all network file transfers into a single window"
@@ -83,7 +83,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
     // ----
 
     cbShowArchivesAsFolders = new TQCheckBox( i18n( "Show archived &files as folders" ), vbox );
-    connect(cbShowArchivesAsFolders, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbShowArchivesAsFolders, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbShowArchivesAsFolders, i18n("Checking this option will list archived"
                                           " files as folders when using tree view.") );
@@ -92,16 +92,16 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
     // --
 
     cbShowTips = new TQCheckBox( i18n( "Show file &tips" ), vbox );
-    connect(cbShowTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbShowTips, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbShowTips, i18n("Here you can control if, when moving the mouse over a file, you want to see a "
                                     "small popup window with additional information about that file."
                                     "This feature requires 'Enable tooltips' in KControl, Appearance & Themes, Style."));
 
-    connect(cbShowTips, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotShowTips(bool)));
+    connect(cbShowTips, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotShowTips(bool)));
 /*
-    //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), sbToolTip, TQT_SLOT(setEnabled(bool)));
-    //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), fileTips, TQT_SLOT(setEnabled(bool)));
+    //connect(cbShowTips, TQ_SIGNAL(toggled(bool)), sbToolTip, TQ_SLOT(setEnabled(bool)));
+    //connect(cbShowTips, TQ_SIGNAL(toggled(bool)), fileTips, TQ_SLOT(setEnabled(bool)));
     fileTips->setBuddy(sbToolTip);
     TQString tipstr = i18n("If you move the mouse over a file, you usually see a small popup window that shows some "
                           "additional information about that file. Here, you can set how many items of information "
@@ -116,7 +116,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
     spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
 
     cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview );
-    connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbShowPreviewsInTips, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbShowPreviewsInTips, i18n("Here you can control if you want the "
                           "popup window to contain a larger preview for the file, when moving the mouse over it."));
@@ -124,7 +124,12 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
     cbRenameDirectlyIcon = new TQCheckBox(i18n("Rename icons in&line"), vbox);
     TQWhatsThis::add(cbRenameDirectlyIcon, i18n("Checking this option will allow files to be "
                                                "renamed by clicking directly on the icon name. "));
-    connect(cbRenameDirectlyIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbRenameDirectlyIcon, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+
+    cbDoubleClickMoveToParent = new TQCheckBox(i18n("Double click on empty area to move to parent folder"), vbox);
+    TQWhatsThis::add(cbDoubleClickMoveToParent, i18n("When this option is enabled, double clicking an "
+                                                "empty area will navigate to the parent folder."));
+    connect(cbDoubleClickMoveToParent, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
 	TQHBoxLayout *hlay = new TQHBoxLayout( lay );
 
@@ -135,7 +140,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
 	homeURL->setMode(KFile::Directory);
 	homeURL->setCaption(i18n("Select Home Folder"));
 	hlay->addWidget( homeURL );
-    connect(homeURL, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+    connect(homeURL, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
     label->setBuddy(homeURL);
 
     TQString homestr = i18n("This is the URL (e.g. a folder or a web page) where "
@@ -148,7 +153,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
 
     cbShowDeleteCommand = new TQCheckBox( i18n( "Show 'Delete' context me&nu entries which bypass the trashcan" ), this );
     lay->addWidget( cbShowDeleteCommand );
-    connect(cbShowDeleteCommand, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbShowDeleteCommand, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbShowDeleteCommand, i18n("Check this if you want 'Delete' menu commands to be displayed "
                                                 "on the desktop and in the file manager's context menus. "
@@ -164,7 +169,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
        " <li><em>Delete:</em> simply deletes the file.</li>"
        " </li></ul>") );
 
-    connect(bg, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( changed() ));
+    connect(bg, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( changed() ));
 
     cbMoveToTrash = new TQCheckBox( i18n("&Move to trash"), bg );
 
@@ -213,6 +218,8 @@ void KBehaviourOptions::load( bool useDefaults )
 
     cbRenameDirectlyIcon->setChecked( g_pConfig->readBoolEntry("RenameIconDirectly",  DEFAULT_RENAMEICONDIRECTLY ) );
 
+    cbDoubleClickMoveToParent->setChecked(g_pConfig->readBoolEntry("DoubleClickMoveToParent", true));
+
     TDEConfig globalconfig("kdeglobals", true, false);
     globalconfig.setGroup( "KDE" );
     cbShowDeleteCommand->setChecked( globalconfig.readBoolEntry("ShowDeleteCommand", false) );
@@ -254,6 +261,7 @@ void KBehaviourOptions::save()
 //    g_pConfig->writeEntry( "FileTipsItems", sbToolTip->value() );
 
     g_pConfig->writeEntry( "RenameIconDirectly", cbRenameDirectlyIcon->isChecked());
+    g_pConfig->writeEntry( "DoubleClickMoveToParent", cbDoubleClickMoveToParent->isChecked());
 
     TDEConfig sidebarconfig("konqsidebartng.rc");
     sidebarconfig.setGroup( "" );
diff --git a/kcontrol/konq/behaviour.h b/kcontrol/konq/behaviour.h
index bb6421be3..ebb7d8511 100644
--- a/kcontrol/konq/behaviour.h
+++ b/kcontrol/konq/behaviour.h
@@ -35,7 +35,7 @@ class KURLRequester;
 
 class KBehaviourOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KBehaviourOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
     ~KBehaviourOptions();
@@ -68,6 +68,7 @@ private:
   TQCheckBox *cbShowTips;
   TQCheckBox *cbShowPreviewsInTips;
   TQCheckBox *cbRenameDirectlyIcon;
+  TQCheckBox *cbDoubleClickMoveToParent;
 
   TQCheckBox *cbMoveToTrash;
   TQCheckBox *cbDelete;
diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp
index 49587f2dc..4a8496eac 100644
--- a/kcontrol/konq/browser.cpp
+++ b/kcontrol/konq/browser.cpp
@@ -57,14 +57,14 @@ KBrowserOptions::KBrowserOptions(TDEConfig *config, TQString group, TQWidget *pa
     tab->addTab(kuick, i18n("&Quick Copy && Move"));
   }
 
-  connect(appearance, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
-  connect(behavior, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
-  connect(previews, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+  connect(appearance, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
+  connect(behavior, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
+  connect(previews, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
   if (kuick)
-     connect(kuick, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+     connect(kuick, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
 
-  connect(tab, TQT_SIGNAL(currentChanged(TQWidget *)), 
-          this, TQT_SIGNAL(quickHelpChanged()));
+  connect(tab, TQ_SIGNAL(currentChanged(TQWidget *)), 
+          this, TQ_SIGNAL(quickHelpChanged()));
   m_tab = tab;
 }
 
diff --git a/kcontrol/konq/browser.h b/kcontrol/konq/browser.h
index 0e0cee35c..1cb49eb02 100644
--- a/kcontrol/konq/browser.h
+++ b/kcontrol/konq/browser.h
@@ -29,7 +29,7 @@ class TQTabWidget;
 
 class KBrowserOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KBrowserOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
 
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index 5d5305b09..5125a03f1 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -70,8 +70,8 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
   TQLabel *label = new TQLabel(i18n("N&umber of desktops: "), number_group);
   _numInput = new KIntNumInput(4, number_group);
   _numInput->setRange(1, maxDesktops, 1, true);
-  connect(_numInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
-  connect(_numInput, TQT_SIGNAL(valueChanged(int)),  TQT_SLOT( changed() ));
+  connect(_numInput, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
+  connect(_numInput, TQ_SIGNAL(valueChanged(int)),  TQ_SLOT( changed() ));
   label->setBuddy( _numInput );
   TQString wtstr = i18n( "Here you can set how many virtual desktops you want on your TDE desktop. Move the slider to change the value." );
   TQWhatsThis::add( label, wtstr );
@@ -86,7 +86,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
   // name group
   TQGroupBox *name_group = new TQGroupBox(i18n("Desktop &Names"), this);
 
-  name_group->setColumnLayout(4, Qt::Horizontal);
+  name_group->setColumnLayout(4, TQt::Horizontal);
 
   for(int i = 0; i < (maxDesktops/2); i++)
     {
@@ -99,10 +99,10 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
       TQWhatsThis::add( _nameLabel[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) );
       TQWhatsThis::add( _nameInput[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) );
 
-      connect(_nameInput[i], TQT_SIGNAL(textChanged(const TQString&)),
-           TQT_SLOT( changed() ));
-      connect(_nameInput[i+(maxDesktops/2)], TQT_SIGNAL(textChanged(const TQString&)),
-           TQT_SLOT( changed() ));
+      connect(_nameInput[i], TQ_SIGNAL(textChanged(const TQString&)),
+           TQ_SLOT( changed() ));
+      connect(_nameInput[i+(maxDesktops/2)], TQ_SIGNAL(textChanged(const TQString&)),
+           TQ_SLOT( changed() ));
     }
 
   for(int i = 1; i < maxDesktops; i++)
@@ -111,7 +111,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
   layout->addWidget(name_group);
 
   _wheelOption = new TQCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this);
-  connect(_wheelOption,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+  connect(_wheelOption,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
 
   layout->addWidget(_wheelOption);
   layout->addStretch(1);
diff --git a/kcontrol/konq/desktop.h b/kcontrol/konq/desktop.h
index b7a05c3bc..9bdb8cb59 100644
--- a/kcontrol/konq/desktop.h
+++ b/kcontrol/konq/desktop.h
@@ -32,7 +32,7 @@ static const int maxDesktops = 20;
 
 class KDesktopConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  public:
   KDesktopConfig(TQWidget *parent = 0L, const char *name = 0L);
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 5c5fe2b95..3d149ef39 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -53,7 +53,7 @@ DesktopBehaviorModule::DesktopBehaviorModule(TDEConfig *config, TQWidget *parent
     TQVBoxLayout* layout = new TQVBoxLayout(this);
     m_behavior = new DesktopBehavior(config, this);
     layout->addWidget(m_behavior);
-    connect(m_behavior, TQT_SIGNAL(changed()), this, TQT_SLOT(changed()));
+    connect(m_behavior, TQ_SIGNAL(changed()), this, TQ_SLOT(changed()));
 }
 
 void DesktopBehaviorModule::changed()
@@ -127,16 +127,16 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
 
   m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media"));
 
-  connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed()));
-  connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
-  connect(showHiddenBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
-  connect(vrootBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
-  connect(lockInPlaceBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableGridChanged()));
-  connect(autoLineupIconsBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableGridChanged()));
-  connect(toolTipBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
-  connect(mediaListView, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(mediaListViewChanged(TQListViewItem *)));
-  connect(spacingValue, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(spacingChanged(int)));
-  connect(spacingCtrlScroll, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
+  connect(desktopMenuGroup, TQ_SIGNAL(clicked(int)), this, TQ_SIGNAL(changed()));
+  connect(iconsEnabledBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged()));
+  connect(showHiddenBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
+  connect(vrootBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
+  connect(lockInPlaceBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableGridChanged()));
+  connect(autoLineupIconsBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableGridChanged()));
+  connect(toolTipBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
+  connect(mediaListView, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(mediaListViewChanged(TQListViewItem *)));
+  connect(spacingValue, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(spacingChanged(int)));
+  connect(spacingCtrlScroll, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
 
   strMouseButton1 = i18n("&Left button:");
   strButtonTxt1 = i18n( "You can choose what happens when"
@@ -155,9 +155,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
   leftLabel->setText( strMouseButton1 );
   leftLabel->setBuddy( leftComboBox );
   fillMenuCombo( leftComboBox );
-  connect(leftEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed()));
-  connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()));
-  connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged()));
+  connect(leftEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed()));
+  connect(leftComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed()));
+  connect(leftComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged()));
   TQString wtstr = strButtonTxt1 +
                   i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>"
                        " <li><em>Window list menu:</em> a menu showing all windows on all"
@@ -177,9 +177,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
 
   middleLabel->setBuddy( middleComboBox );
   fillMenuCombo( middleComboBox );
-  connect(middleEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed()));
-  connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()));
-  connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged()));
+  connect(middleEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed()));
+  connect(middleComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed()));
+  connect(middleComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged()));
   wtstr = i18n("You can choose what happens when"
                " you click the middle button of your pointing device on the desktop:"
                " <ul><li><em>No action:</em> as you might guess, nothing happens!</li>"
@@ -201,9 +201,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
   rightLabel->setText( strMouseButton3 );
   rightLabel->setBuddy( rightComboBox );
   fillMenuCombo( rightComboBox );
-  connect(rightEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed()));
-  connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()));
-  connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged()));
+  connect(rightEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed()));
+  connect(rightComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed()));
+  connect(rightComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged()));
   wtstr = strButtonTxt3 +
           i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>"
                " <li><em>Window list menu:</em> a menu showing all windows on all"
@@ -223,8 +223,8 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
 
   if (m_bHasMedia)
   {
-     connect(enableMediaBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
-     connect(enableMediaFreeSpaceOverlayBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
+     connect(enableMediaBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged()));
+     connect(enableMediaFreeSpaceOverlayBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged()));
   }
   else
   {
diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h
index 8a1a5c247..bc8aad2d2 100644
--- a/kcontrol/konq/desktopbehavior_impl.h
+++ b/kcontrol/konq/desktopbehavior_impl.h
@@ -28,7 +28,7 @@
 
 class DesktopBehavior : public DesktopBehaviorBase
 {
-        Q_OBJECT
+        TQ_OBJECT
 public:
         DesktopBehavior(TDEConfig *config, TQWidget *parent = 0L, const char *name = 0L );
         virtual void load();
@@ -69,7 +69,7 @@ private:
 
 class DesktopBehaviorModule : public TDECModule
 {
-        Q_OBJECT
+        TQ_OBJECT
 
 public:
         DesktopBehaviorModule(TDEConfig *config, TQWidget *parent = 0L, const char *name = 0L );
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index a12b02069..e8a99297d 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -66,22 +66,22 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
     TQWhatsThis::add( m_pStandard, wtstr );
 
     row++;
-    connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ),
-             TQT_SLOT( slotStandardFont(const TQString&) ) );
-    connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ),
-             TQT_SLOT(changed() ) );
-    connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ),
-             TQT_SLOT( slotStandardFont(const TQString&) ) );
-    connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ),
-             TQT_SLOT(changed() ) );
+    connect( m_pStandard, TQ_SIGNAL( activated(const TQString&) ),
+             TQ_SLOT( slotStandardFont(const TQString&) ) );
+    connect( m_pStandard, TQ_SIGNAL( activated(const TQString&) ),
+             TQ_SLOT(changed() ) );
+    connect( m_pStandard, TQ_SIGNAL( textChanged(const TQString&) ),
+             TQ_SLOT( slotStandardFont(const TQString&) ) );
+    connect( m_pStandard, TQ_SIGNAL( textChanged(const TQString&) ),
+             TQ_SLOT(changed() ) );
 
     m_pSize = new TQSpinBox( 4,18,1,this );
     label = new TQLabel( m_pSize, i18n("Font si&ze:"), this );
     lay->addWidget(label,row,0);
     lay->addMultiCellWidget(m_pSize,row,row,1,1);
 
-    connect( m_pSize, TQT_SIGNAL( valueChanged(int) ),
-             this, TQT_SLOT( slotFontSize(int) ) );
+    connect( m_pSize, TQ_SIGNAL( valueChanged(int) ),
+             this, TQ_SLOT( slotFontSize(int) ) );
     row+=2;
 
     wtstr = i18n("This is the font size used to display text in Konqueror windows.");
@@ -94,14 +94,14 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
     m_pNormalText = new KColorButton( normalTextColor, this );
     label = new TQLabel( m_pNormalText, i18n("Normal te&xt color:"), this );
     lay->addWidget(label,row,0);
-    lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,(TQ_Alignment)hAlign);
+    lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,(TQt::AlignmentFlags)hAlign);
 
     wtstr = i18n("This is the color used to display text in Konqueror windows.");
     TQWhatsThis::add( label, wtstr );
     TQWhatsThis::add( m_pNormalText, wtstr );
 
-    connect( m_pNormalText, TQT_SIGNAL( changed( const TQColor & ) ),
-             TQT_SLOT( slotNormalTextColorChanged( const TQColor & ) ) );
+    connect( m_pNormalText, TQ_SIGNAL( changed( const TQColor & ) ),
+             TQ_SLOT( slotNormalTextColorChanged( const TQColor & ) ) );
 
     /*
     row++;
@@ -115,8 +115,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
     TQWhatsThis::add( label, wtstr );
     TQWhatsThis::add( m_pHighlightedText, wtstr );
 
-    connect( m_pHighlightedText, TQT_SIGNAL( changed( const TQColor & ) ),
-             TQT_SLOT( slotHighlightedTextColorChanged( const TQColor & ) ) );
+    connect( m_pHighlightedText, TQ_SIGNAL( changed( const TQColor & ) ),
+             TQ_SLOT( slotHighlightedTextColorChanged( const TQColor & ) ) );
     */
 
     row++;
@@ -125,18 +125,18 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
     {
         m_cbTextBackground = new TQCheckBox( i18n("&Text background color:"), this );
         lay->addWidget(m_cbTextBackground,row,0);
-        connect( m_cbTextBackground, TQT_SIGNAL( clicked() ),
-                 TQT_SLOT( slotTextBackgroundClicked() ) );
+        connect( m_cbTextBackground, TQ_SIGNAL( clicked() ),
+                 TQ_SLOT( slotTextBackgroundClicked() ) );
 
         m_pTextBackground = new KColorButton( textBackgroundColor, this );
-        lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(TQ_Alignment)hAlign);
+        lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(TQt::AlignmentFlags)hAlign);
 
         wtstr = i18n("This is the color used behind the text for the icons on the desktop.");
         TQWhatsThis::add( label, wtstr );
         TQWhatsThis::add( m_pTextBackground, wtstr );
 
-        connect( m_pTextBackground, TQT_SIGNAL( changed( const TQColor & ) ),
-                 TQT_SLOT( slotTextBackgroundColorChanged( const TQColor & ) ) );
+        connect( m_pTextBackground, TQ_SIGNAL( changed( const TQColor & ) ),
+                 TQ_SLOT( slotTextBackgroundColorChanged( const TQColor & ) ) );
 
         row++;
     }
@@ -146,10 +146,10 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
         TQLabel* label = new TQLabel( m_pNbLines, i18n("H&eight for icon text:"), this );
         lay->addWidget( label, row, 0 );
         lay->addWidget( m_pNbLines, row, 1 );
-        connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ),
-                 this, TQT_SLOT( changed() ) );
-        connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ),
-                 TQT_SLOT( slotPNbLinesChanged(int)) );
+        connect( m_pNbLines, TQ_SIGNAL( valueChanged(int) ),
+                 this, TQ_SLOT( changed() ) );
+        connect( m_pNbLines, TQ_SIGNAL( valueChanged(int) ),
+                 TQ_SLOT( slotPNbLinesChanged(int)) );
 
         TQString thwt = i18n("This is the maximum number of lines that can be"
                             " used to draw icon text. Long file names are"
@@ -165,10 +165,10 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
         label = new TQLabel( m_pNbWidth, i18n("&Width for icon text:"), this );
         lay->addWidget( label, row, 0 );
         lay->addWidget( m_pNbWidth, row, 1 );
-        connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ),
-                 this, TQT_SLOT( changed() ) );
-        connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ),
-                 TQT_SLOT( slotPNbWidthChanged(int)) );
+        connect( m_pNbWidth, TQ_SIGNAL( valueChanged(int) ),
+                 this, TQ_SLOT( changed() ) );
+        connect( m_pNbWidth, TQ_SIGNAL( valueChanged(int) ),
+                 TQ_SLOT( slotPNbWidthChanged(int)) );
 
         thwt = i18n( "This is the maximum width for the icon text when konqueror "
                      "is used in multi column view mode." );
@@ -179,8 +179,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
     }
 
     cbUnderline = new TQCheckBox(i18n("&Underline filenames"), this);
-    lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign);
-    connect(cbUnderline, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign);
+    connect(cbUnderline, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames"
                                        " being underlined, so that they look like links on a web page. Note:"
@@ -192,8 +192,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
         row++;
 
         m_pSizeInBytes = new TQCheckBox(i18n("Display file sizes in b&ytes"), this);
-        lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign );
-        connect( m_pSizeInBytes, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()) );
+        lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign );
+        connect( m_pSizeInBytes, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()) );
 
         TQWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes"
                                               " being displayed in bytes. Otherwise file sizes are"
@@ -263,7 +263,7 @@ void KonqFontOptions::load( bool useDefaults )
         m_pTextBackground->setColor( textBackgroundColor );
 	// Don't keep an invalid color around, otherwise checking the checkbox still gives invalid.
 	if ( !textBackgroundColor.isValid() )
-            textBackgroundColor = Qt::black;
+            textBackgroundColor = TQt::black;
     }
     else
     {
diff --git a/kcontrol/konq/fontopts.h b/kcontrol/konq/fontopts.h
index 69ffa4af5..10e6837bd 100644
--- a/kcontrol/konq/fontopts.h
+++ b/kcontrol/konq/fontopts.h
@@ -51,7 +51,7 @@ class TDEFontCombo;
 
 class KonqFontOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KonqFontOptions(TDEConfig *config, TQString group, bool desktop, TQWidget *parent=0, const char *name=0);
   TQString quickHelp() const;
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 3b2349fc7..309651dbb 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -130,14 +130,14 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ )
     m_maxSize->setRange( 0.2, 100, 0.2, true );
     label->setBuddy( m_maxSize );
     lay->addWidget( m_maxSize );
-    connect( m_maxSize, TQT_SIGNAL( valueChanged(double) ), TQT_SLOT( changed() ) );
+    connect( m_maxSize, TQ_SIGNAL( valueChanged(double) ), TQ_SLOT( changed() ) );
 
     m_boostSize = new TQCheckBox(i18n("&Increase size of previews relative to icons"), this);
-    connect( m_boostSize, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) );
+    connect( m_boostSize, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( changed() ) );
     lay->addWidget(m_boostSize);
 
     m_useFileThumbnails = new TQCheckBox(i18n("&Use thumbnails embedded in files"), this);
-    connect( m_useFileThumbnails, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) );
+    connect( m_useFileThumbnails, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( changed() ) );
 
     lay->addWidget(m_useFileThumbnails);
 
diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h
index d76b28560..4b9da1270 100644
--- a/kcontrol/konq/previews.h
+++ b/kcontrol/konq/previews.h
@@ -42,7 +42,7 @@ class KDoubleNumInput;
 
 class KPreviewOptions : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KPreviewOptions( TQWidget *parent = 0L, const char *name = 0L );
     virtual void load();
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index 5da14f2f5..be73dcb7a 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -78,7 +78,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urDesktop->setMode( KFile::Directory );
   tmpLabel->setBuddy( urDesktop );
   lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL);
-  connect(urDesktop, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urDesktop, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   TQString wtstr = i18n("This folder contains all the files"
                        " which you see on your desktop. You can change the location of this"
                        " folder if you want to, and the contents will move automatically"
@@ -93,7 +93,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urAutostart->setMode( KFile::Directory );
   tmpLabel->setBuddy( urAutostart );
   lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL);
-  connect(urAutostart, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urAutostart, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder contains applications or"
                " links to applications (shortcuts) that you want to have started"
                " automatically whenever TDE starts. You can change the location of this"
@@ -109,7 +109,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urDocument->setMode( KFile::Directory );
   tmpLabel->setBuddy( urDocument );
   lay->addMultiCellWidget(urDocument, row, row, 1, RO_LASTCOL);
-  connect(urDocument, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urDocument, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save documents from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urDocument, wtstr );
@@ -121,7 +121,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urDownload->setMode( KFile::Directory );
   tmpLabel->setBuddy( urDownload );
   lay->addMultiCellWidget(urDownload, row, row, 1, RO_LASTCOL);
-  connect(urDownload, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urDownload, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save downloads from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urDownload, wtstr );
@@ -133,7 +133,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urMusic->setMode( KFile::Directory );
   tmpLabel->setBuddy( urMusic );
   lay->addMultiCellWidget(urMusic, row, row, 1, RO_LASTCOL);
-  connect(urMusic, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urMusic, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save music from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urMusic, wtstr );
@@ -145,7 +145,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urPictures->setMode( KFile::Directory );
   tmpLabel->setBuddy( urPictures );
   lay->addMultiCellWidget(urPictures, row, row, 1, RO_LASTCOL);
-  connect(urPictures, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urPictures, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save pictures from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urPictures, wtstr );
@@ -157,7 +157,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urPublicShare->setMode( KFile::Directory );
   tmpLabel->setBuddy( urPublicShare );
   lay->addMultiCellWidget(urPublicShare, row, row, 1, RO_LASTCOL);
-  connect(urPublicShare, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urPublicShare, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save public shared files from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urPublicShare, wtstr );
@@ -169,7 +169,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urTemplates->setMode( KFile::Directory );
   tmpLabel->setBuddy( urTemplates );
   lay->addMultiCellWidget(urTemplates, row, row, 1, RO_LASTCOL);
-  connect(urTemplates, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urTemplates, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save templates from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urTemplates, wtstr );
@@ -181,7 +181,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urVideos->setMode( KFile::Directory );
   tmpLabel->setBuddy( urVideos );
   lay->addMultiCellWidget(urVideos, row, row, 1, RO_LASTCOL);
-  connect(urVideos, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urVideos, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save videos from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urVideos, wtstr );
@@ -190,7 +190,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   Q_ASSERT( row == RO_LASTROW-1 ); // if it fails here, check the row++ and RO_LASTROW above
 
   loadTmr = new TQTimer(this);
-  connect(loadTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(loadTimerDone()));
+  connect(loadTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(loadTimerDone()));
 
   load();
 }
@@ -543,8 +543,8 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
             m_copyToDest = dest;
             m_copyFromSrc = src;
             TDEIO::ListJob* job = TDEIO::listDir( src );
-            connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
-                     this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ) );
+            connect( job, TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
+                     this, TQ_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ) );
             tqApp->enter_loop();
 
             if (m_ok)
@@ -555,7 +555,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
         else
         {
             TDEIO::Job * job = TDEIO::move( src, dest );
-            connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+            connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
             // wait for job
             tqApp->enter_loop();
         }
@@ -583,7 +583,7 @@ void DesktopPathConfig::slotEntries( TDEIO::Job * job, const TDEIO::UDSEntryList
         }
 
         TDEIO::Job * moveJob = TDEIO::move( file.url(), m_copyToDest );
-        connect( moveJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+        connect( moveJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
         tqApp->enter_loop();
     }
     tqApp->exit_loop();
diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h
index 1f38faabd..c6645bdb8 100644
--- a/kcontrol/konq/rootopts.h
+++ b/kcontrol/konq/rootopts.h
@@ -35,7 +35,7 @@ namespace TDEIO { class Job; }
 
 class DesktopPathConfig : public TDECModule
 {
-        Q_OBJECT
+        TQ_OBJECT
 public:
         DesktopPathConfig(TQWidget *parent = 0L, const char *name = 0L );
         virtual void load();
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index 30272c3f6..6e92d8ffe 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -18,7 +18,7 @@
 #include <tdelocale.h>
 #include <knuminput.h>
 
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_QTONLY
 #include <X11/Xlib.h>
 #endif
 
@@ -40,7 +40,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   int r = 0;
   int E = 0, M = 1, W = 3; //CT 3 (instead 2) allows smaller color buttons
 
-  TQGroupBox* gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Font Si&ze"), this );
+  TQGroupBox* gb = new TQGroupBox( 1, TQt::Horizontal, i18n("Font Si&ze"), this );
   lay->addMultiCellWidget(gb, r, r, E, W);
 
   TQWhatsThis::add( gb, i18n("This is the relative font size Konqueror uses to display web sites.") );
@@ -48,16 +48,16 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   m_minSize = new KIntNumInput( fMinSize, gb );
   m_minSize->setLabel( i18n( "M&inimum font size:" ) );
   m_minSize->setRange( 2, 30 );
-  connect( m_minSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotMinimumFontSize( int ) ) );
-  connect( m_minSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changed() ) );
+  connect( m_minSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotMinimumFontSize( int ) ) );
+  connect( m_minSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changed() ) );
   TQWhatsThis::add( m_minSize, i18n( "Konqueror will never display text smaller than "
                                     "this size,<br>overriding any other settings" ) );
 
   m_MedSize = new KIntNumInput( m_minSize, fSize, gb );
   m_MedSize->setLabel( i18n( "&Medium font size:" ) );
   m_MedSize->setRange( 2, 30 );
-  connect( m_MedSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotFontSize( int ) ) );
-  connect( m_MedSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changed() ) );
+  connect( m_MedSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotFontSize( int ) ) );
+  connect( m_MedSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changed() ) );
   TQWhatsThis::add( m_MedSize,
                    i18n("This is the relative font size Konqueror uses "
                         "to display web sites.") );
@@ -76,14 +76,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[0], wtstr );
 
-  connect( m_pFonts[0], TQT_SIGNAL( activated(const TQString&) ),
-	   TQT_SLOT( slotStandardFont(const TQString&) ) );
-  connect( m_pFonts[0], TQT_SIGNAL( activated(const TQString&) ),
-	   TQT_SLOT(changed() ) );
-  connect( m_pFonts[0]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotStandardFont(const TQString&) ) );
-  connect( m_pFonts[0], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[0], TQ_SIGNAL( activated(const TQString&) ),
+	   TQ_SLOT( slotStandardFont(const TQString&) ) );
+  connect( m_pFonts[0], TQ_SIGNAL( activated(const TQString&) ),
+	   TQ_SLOT(changed() ) );
+  connect( m_pFonts[0]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotStandardFont(const TQString&) ) );
+  connect( m_pFonts[0], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
   label = new TQLabel( i18n( "&Fixed font:"), this );
   lay->addWidget( label, ++r, E );
@@ -97,14 +97,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[1], wtstr );
 
-  connect( m_pFonts[1], TQT_SIGNAL( activated(const TQString&) ),
-	   TQT_SLOT( slotFixedFont(const TQString&) ) );
-  connect( m_pFonts[1], TQT_SIGNAL( activated(const TQString&) ),
-	   TQT_SLOT(changed() ) );
-  connect( m_pFonts[1]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotFixedFont(const TQString&) ) );
-  connect( m_pFonts[1], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[1], TQ_SIGNAL( activated(const TQString&) ),
+	   TQ_SLOT( slotFixedFont(const TQString&) ) );
+  connect( m_pFonts[1], TQ_SIGNAL( activated(const TQString&) ),
+	   TQ_SLOT(changed() ) );
+  connect( m_pFonts[1]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotFixedFont(const TQString&) ) );
+  connect( m_pFonts[1], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
   label = new TQLabel( i18n( "S&erif font:" ), this );
   lay->addWidget( label, ++r, E );
@@ -118,14 +118,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[2], wtstr );
 
-  connect( m_pFonts[2], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( slotSerifFont( const TQString& ) ) );
-  connect( m_pFonts[2], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( changed() ) );
-  connect( m_pFonts[2]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotSerifFont(const TQString&) ) );
-  connect( m_pFonts[2], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[2], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( slotSerifFont( const TQString& ) ) );
+  connect( m_pFonts[2], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( changed() ) );
+  connect( m_pFonts[2]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotSerifFont(const TQString&) ) );
+  connect( m_pFonts[2], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
   label = new TQLabel( i18n( "Sa&ns serif font:" ), this );
   lay->addWidget( label, ++r, E );
@@ -139,14 +139,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[3], wtstr );
 
-  connect( m_pFonts[3], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( slotSansSerifFont( const TQString& ) ) );
-  connect( m_pFonts[3], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( changed() ) );
-  connect( m_pFonts[3]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotSansSerifFont(const TQString&) ) );
-  connect( m_pFonts[3], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[3], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( slotSansSerifFont( const TQString& ) ) );
+  connect( m_pFonts[3], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( changed() ) );
+  connect( m_pFonts[3]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotSansSerifFont(const TQString&) ) );
+  connect( m_pFonts[3], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
 
   label = new TQLabel( i18n( "C&ursive font:" ), this );
@@ -161,14 +161,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[4], wtstr );
 
-  connect( m_pFonts[4], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( slotCursiveFont( const TQString& ) ) );
-  connect( m_pFonts[4], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( changed() ) );
-  connect( m_pFonts[4]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotCursiveFont(const TQString&) ) );
-  connect( m_pFonts[4], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[4], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( slotCursiveFont( const TQString& ) ) );
+  connect( m_pFonts[4], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( changed() ) );
+  connect( m_pFonts[4]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotCursiveFont(const TQString&) ) );
+  connect( m_pFonts[4], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
 
   label = new TQLabel( i18n( "Fantas&y font:" ), this );
@@ -183,14 +183,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[5], wtstr );
 
-  connect( m_pFonts[5], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( slotFantasyFont( const TQString& ) ) );
-  connect( m_pFonts[5], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( changed() ) );
-  connect( m_pFonts[5]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotFantasyFont(const TQString&) ) );
-  connect( m_pFonts[5], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[5], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( slotFantasyFont( const TQString& ) ) );
+  connect( m_pFonts[5], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( changed() ) );
+  connect( m_pFonts[5]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotFantasyFont(const TQString&) ) );
+  connect( m_pFonts[5], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
 
   label = new TQLabel( i18n( "Font &size adjustment for this encoding:" ), this );
@@ -200,10 +200,10 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   label->setBuddy( m_pFontSizeAdjust );
   lay->addMultiCellWidget( m_pFontSizeAdjust, r, r, M+1, W );
 
-  connect( m_pFontSizeAdjust, TQT_SIGNAL( valueChanged( int ) ),
-	   TQT_SLOT( slotFontSizeAdjust( int ) ) );
-  connect( m_pFontSizeAdjust, TQT_SIGNAL( valueChanged( int ) ),
-	   TQT_SLOT( changed() ) );
+  connect( m_pFontSizeAdjust, TQ_SIGNAL( valueChanged( int ) ),
+	   TQ_SLOT( slotFontSizeAdjust( int ) ) );
+  connect( m_pFontSizeAdjust, TQ_SIGNAL( valueChanged( int ) ),
+	   TQ_SLOT( changed() ) );
 
   label = new TQLabel( i18n( "Default encoding:"), this );
   //++r;
@@ -222,10 +222,10 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pEncoding, wtstr );
 
-  connect( m_pEncoding, TQT_SIGNAL( activated(const TQString& ) ),
-	   TQT_SLOT( slotEncoding(const TQString&) ) );
-  connect( m_pEncoding, TQT_SIGNAL( activated(const TQString& ) ),
-	   TQT_SLOT( changed() ) );
+  connect( m_pEncoding, TQ_SIGNAL( activated(const TQString& ) ),
+	   TQ_SLOT( slotEncoding(const TQString&) ) );
+  connect( m_pEncoding, TQ_SIGNAL( activated(const TQString& ) ),
+	   TQ_SLOT( changed() ) );
 
   ++r; lay->setRowStretch(r, 8);
 
diff --git a/kcontrol/konqhtml/appearance.h b/kcontrol/konqhtml/appearance.h
index 46045479e..82f020bda 100644
--- a/kcontrol/konqhtml/appearance.h
+++ b/kcontrol/konqhtml/appearance.h
@@ -20,7 +20,7 @@ class TDEFontCombo;
 
 class KAppearanceOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KAppearanceOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
   ~KAppearanceOptions();
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index fcddac791..53433264f 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -35,44 +35,44 @@
 DomainListView::DomainListView(TDEConfig *config,const TQString &title,
 		TQWidget *parent,const char *name) :
 	TQGroupBox(title, parent, name), config(config) {
-  setColumnLayout(0, Qt::Vertical);
+  setColumnLayout(0, TQt::Vertical);
   layout()->setSpacing(0);
   layout()->setMargin(0);
   TQGridLayout* thisLayout = new TQGridLayout(layout());
-  thisLayout->setAlignment(Qt::AlignTop);
+  thisLayout->setAlignment(TQt::AlignTop);
   thisLayout->setSpacing(KDialog::spacingHint());
   thisLayout->setMargin(KDialog::marginHint());
 
   domainSpecificLV = new TDEListView(this);
   domainSpecificLV->addColumn(i18n("Host/Domain"));
   domainSpecificLV->addColumn(i18n("Policy"), 100);
-  connect(domainSpecificLV,TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(changePressed()));
-  connect(domainSpecificLV,TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(changePressed()));
-  connect(domainSpecificLV, TQT_SIGNAL( executed( TQListViewItem *)), TQT_SLOT( updateButton()));
-  connect(domainSpecificLV, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButton()));
+  connect(domainSpecificLV,TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(changePressed()));
+  connect(domainSpecificLV,TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(changePressed()));
+  connect(domainSpecificLV, TQ_SIGNAL( executed( TQListViewItem *)), TQ_SLOT( updateButton()));
+  connect(domainSpecificLV, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButton()));
   thisLayout->addMultiCellWidget(domainSpecificLV, 0, 5, 0, 0);
 
   addDomainPB = new TQPushButton(i18n("&New..."), this);
   thisLayout->addWidget(addDomainPB, 0, 1);
-  connect(addDomainPB, TQT_SIGNAL(clicked()), TQT_SLOT(addPressed()));
+  connect(addDomainPB, TQ_SIGNAL(clicked()), TQ_SLOT(addPressed()));
 
   changeDomainPB = new TQPushButton( i18n("Chan&ge..."), this);
   thisLayout->addWidget(changeDomainPB, 1, 1);
-  connect(changeDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(changePressed()));
+  connect(changeDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(changePressed()));
 
   deleteDomainPB = new TQPushButton(i18n("De&lete"), this);
   thisLayout->addWidget(deleteDomainPB, 2, 1);
-  connect(deleteDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(deletePressed()));
+  connect(deleteDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(deletePressed()));
 
   importDomainPB = new TQPushButton(i18n("&Import..."), this);
   thisLayout->addWidget(importDomainPB, 3, 1);
-  connect(importDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(importPressed()));
+  connect(importDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(importPressed()));
   importDomainPB->setEnabled(false);
   importDomainPB->hide();
 
   exportDomainPB = new TQPushButton(i18n("&Export..."), this);
   thisLayout->addWidget(exportDomainPB, 4, 1);
-  connect(exportDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(exportPressed()));
+  connect(exportDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(exportPressed()));
   exportDomainPB->setEnabled(false);
   exportDomainPB->hide();
 
diff --git a/kcontrol/konqhtml/domainlistview.h b/kcontrol/konqhtml/domainlistview.h
index f5844071e..2cf3da3d8 100644
--- a/kcontrol/konqhtml/domainlistview.h
+++ b/kcontrol/konqhtml/domainlistview.h
@@ -52,7 +52,7 @@ class PolicyDialog;
  * @author Leo Savernik
  */
 class DomainListView : public TQGroupBox {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /** Enumerates the available buttons.
     */
diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp
index 9a2ae9efe..9b7f520ec 100644
--- a/kcontrol/konqhtml/filteropts.cpp
+++ b/kcontrol/konqhtml/filteropts.cpp
@@ -55,7 +55,7 @@ KCMFilter::KCMFilter(TDEConfig *config, TQString group,
     mKillCheck = new TQCheckBox(i18n("Hide filtered images"), this);
     topLayout->addWidget( mKillCheck );
 
-    TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("URL Expressions to Filter"), this );
+    TQGroupBox *topBox = new TQGroupBox( 1, TQt::Horizontal, i18n("URL Expressions to Filter"), this );
     topLayout->addWidget( topBox );
 
     mListBox = new TQListBox( topBox );
@@ -67,20 +67,20 @@ KCMFilter::KCMFilter(TDEConfig *config, TQString group,
     buttonBox->setSpacing( KDialog::spacingHint() );
 
     mInsertButton = new TQPushButton( i18n("Insert"), buttonBox );
-    connect( mInsertButton, TQT_SIGNAL( clicked() ), TQT_SLOT( insertFilter() ) );
+    connect( mInsertButton, TQ_SIGNAL( clicked() ), TQ_SLOT( insertFilter() ) );
     mUpdateButton = new TQPushButton( i18n("Update"), buttonBox );
-    connect( mUpdateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateFilter() ) );
+    connect( mUpdateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateFilter() ) );
     mRemoveButton = new TQPushButton( i18n("Remove"), buttonBox );
-    connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeFilter() ) );
+    connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeFilter() ) );
 
     mImportButton = new TQPushButton(i18n("Import..."),buttonBox);
-    connect( mImportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( importFilters() ) );
+    connect( mImportButton, TQ_SIGNAL( clicked() ), TQ_SLOT( importFilters() ) );
     mExportButton = new TQPushButton(i18n("Export..."),buttonBox);
-    connect( mExportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( exportFilters() ) );
+    connect( mExportButton, TQ_SIGNAL( clicked() ), TQ_SLOT( exportFilters() ) );
 
-    connect( mEnableCheck, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotEnableChecked()));
-    connect( mKillCheck, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotKillChecked()));
-    connect( mListBox, TQT_SIGNAL( selectionChanged ()),this, TQT_SLOT( slotItemSelected()));
+    connect( mEnableCheck, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotEnableChecked()));
+    connect( mKillCheck, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotKillChecked()));
+    connect( mListBox, TQ_SIGNAL( selectionChanged ()),this, TQ_SLOT( slotItemSelected()));
 
 /*
  * Whats this items
diff --git a/kcontrol/konqhtml/filteropts.h b/kcontrol/konqhtml/filteropts.h
index eba3dad7d..3ca2b863b 100644
--- a/kcontrol/konqhtml/filteropts.h
+++ b/kcontrol/konqhtml/filteropts.h
@@ -30,7 +30,7 @@ class TDEConfig;
 
 class KCMFilter : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KCMFilter( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
     ~KCMFilter();
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index ed87ea349..14cf39a36 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -51,12 +51,12 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
     m_pAdvancedAddBookmarkCheckBox = new TQCheckBox(i18n( "Ask for name and folder when adding bookmarks" ), bgBookmarks);
     TQWhatsThis::add( m_pAdvancedAddBookmarkCheckBox, i18n( "If this box is checked, Konqueror will allow you to"
                                                         " change the title of the bookmark and choose a folder in which to store it when you add a new bookmark." ) );
-    connect(m_pAdvancedAddBookmarkCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pAdvancedAddBookmarkCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     m_pOnlyMarkedBookmarksCheckBox = new TQCheckBox(i18n( "Show only marked bookmarks in bookmark toolbar" ), bgBookmarks);
     TQWhatsThis::add( m_pOnlyMarkedBookmarksCheckBox, i18n( "If this box is checked, Konqueror will show only those"
                                                          " bookmarks in the bookmark toolbar which you have marked to do so in the bookmark editor." ) );
-    connect(m_pOnlyMarkedBookmarksCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pOnlyMarkedBookmarksCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     lay->addMultiCellWidget( bgBookmarks, row, row, 0, 1 );
     row++;
@@ -67,14 +67,14 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
     m_pFormCompletionCheckBox = new TQCheckBox(i18n( "Enable com&pletion of forms" ), bgForm);
     TQWhatsThis::add( m_pFormCompletionCheckBox, i18n( "If this box is checked, Konqueror will remember"
                                                         " the data you enter in web forms and suggest it in similar fields for all forms." ) );
-    connect(m_pFormCompletionCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pFormCompletionCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     m_pMaxFormCompletionItems = new KIntNumInput( bgForm );
     m_pMaxFormCompletionItems->setLabel( i18n( "&Maximum completions:" ) );
     m_pMaxFormCompletionItems->setRange( 0, 100 );
     TQWhatsThis::add( m_pMaxFormCompletionItems,
         i18n( "Here you can select how many values Konqueror will remember for a form field." ) );
-    connect(m_pMaxFormCompletionItems, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()));
+    connect(m_pMaxFormCompletionItems, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()));
 
     lay->addMultiCellWidget( bgForm, row, row, 0, 1 );
     row++;
@@ -86,19 +86,19 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
     m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse );
     TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change "
        "(usually to a hand) if it is moved over a hyperlink.") );
-    connect(m_cbCursor, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_cbCursor, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     m_pOpenMiddleClick = new TQCheckBox( i18n ("M&iddle click opens URL in selection" ), bgMouse );
     TQWhatsThis::add( m_pOpenMiddleClick, i18n (
       "If this box is checked, you can open the URL in the selection by middle clicking on a "
       "Konqueror view." ) );
-    connect(m_pOpenMiddleClick, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pOpenMiddleClick, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     m_pBackRightClick = new TQCheckBox( i18n( "Right click goes &back in history" ), bgMouse );
     TQWhatsThis::add( m_pBackRightClick, i18n(
       "If this box is checked, you can go back in history by right clicking on a Konqueror view. "
       "To access the context menu, press the right mouse button and move." ) );
-    connect(m_pBackRightClick, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pBackRightClick, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     lay->addMultiCellWidget( bgMouse, row, row, 0, 1 );
     row++;
@@ -107,26 +107,26 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
 
     m_pAutoLoadImagesCheckBox = new TQCheckBox( i18n( "A&utomatically load images"), this );
     TQWhatsThis::add( m_pAutoLoadImagesCheckBox, i18n( "If this box is checked, Konqueror will automatically load any images that are embedded in a web page. Otherwise, it will display placeholders for the images, and you can then manually load the images by clicking on the image button.<br>Unless you have a very slow network connection, you will probably want to check this box to enhance your browsing experience." ) );
-    connect(m_pAutoLoadImagesCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pAutoLoadImagesCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
     lay->addMultiCellWidget( m_pAutoLoadImagesCheckBox, row, row, 0, 1 );
     row++;
 
     m_pEnableFavIconCheckBox = new TQCheckBox( i18n( "Enable &favicons"), this );
     TQWhatsThis::add( m_pEnableFavIconCheckBox, i18n( "If this box is checked, Konqueror will automatically load and display favicon images that are associated with a web page. These images appear in the Location bar. Otherwise a generic image will appear." ) );
-    connect(m_pEnableFavIconCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pEnableFavIconCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
     lay->addMultiCellWidget( m_pEnableFavIconCheckBox, row, row, 0, 1 );
     row++;
 
     m_pUnfinishedImageFrameCheckBox = new TQCheckBox( i18n( "Dra&w frame around not completely loaded images"), this );
     TQWhatsThis::add( m_pUnfinishedImageFrameCheckBox, i18n( "If this box is checked, Konqueror will draw a frame as placeholder around not yet fully loaded images that are embedded in a web page.<br>Especially if you have a slow network connection, you will probably want to check this box to enhance your browsing experience." ) );
-    connect(m_pUnfinishedImageFrameCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pUnfinishedImageFrameCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
     lay->addMultiCellWidget( m_pUnfinishedImageFrameCheckBox, row, row, 0, 1 );
     row++;
 
     m_pAutoRedirectCheckBox = new TQCheckBox( i18n( "Allow automatic delayed &reloading/redirecting"), this );
     TQWhatsThis::add( m_pAutoRedirectCheckBox,
     i18n( "Some web pages request an automatic reload or redirection after a certain period of time. By unchecking this box Konqueror will ignore these requests." ) );
-    connect(m_pAutoRedirectCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pAutoRedirectCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
     lay->addMultiCellWidget( m_pAutoRedirectCheckBox, row, row, 0, 1 );
     row++;
 
@@ -153,7 +153,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
 	    "</ul><br><i>Note: The site's CSS definitions can override this value</i>");
     TQWhatsThis::add( label, whatsThis);
     TQWhatsThis::add( m_pUnderlineCombo, whatsThis);
-    connect(m_pUnderlineCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
+    connect(m_pUnderlineCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()));
 
 
 
@@ -172,7 +172,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
 	    "<li><b>Show only once</b>: Show all animations completely but do not repeat them.</li></ul>");
     TQWhatsThis::add( label, whatsThis);
     TQWhatsThis::add( m_pAnimationsCombo, whatsThis);
-    connect(m_pAnimationsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
+    connect(m_pAnimationsCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()));
 
     label = new TQLabel( i18n("Sm&ooth scrolling"), this);
     m_pSmoothScrollingCombo = new TQComboBox( false, this );
@@ -190,7 +190,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
 	    "</ul>");
     TQWhatsThis::add( label, whatsThis);
     TQWhatsThis::add( m_pSmoothScrollingCombo, whatsThis);
-    connect(m_pSmoothScrollingCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
+    connect(m_pSmoothScrollingCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()));
 
 
     lay->setRowStretch(row, 1);
diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h
index b04690b51..52c5a7e33 100644
--- a/kcontrol/konqhtml/htmlopts.h
+++ b/kcontrol/konqhtml/htmlopts.h
@@ -33,7 +33,7 @@ class KIntNumInput;
 
 class KMiscHTMLOptions : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L );
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp
index 6a702559e..2a0c15069 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -62,15 +62,15 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group,
     TQVGroupBox* globalGB = new TQVGroupBox( i18n( "Global Settings" ), this );
     toplevel->addWidget( globalGB );
     enableJavaGloballyCB = new TQCheckBox( i18n( "Enable Ja&va globally" ), globalGB );
-    connect( enableJavaGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
-    connect( enableJavaGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( toggleJavaControls() ) );
+    connect( enableJavaGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) );
+    connect( enableJavaGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( toggleJavaControls() ) );
 
 
     /***************************************************************************
      ***************** Domain Specific Settings ********************************
      **************************************************************************/
     domainSpecific = new JavaDomainListView(m_pConfig,m_groupname,this,this);
-    connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(slotChanged()));
+    connect(domainSpecific,TQ_SIGNAL(changed(bool)),TQ_SLOT(slotChanged()));
     toplevel->addWidget( domainSpecific, 2 );
 
     /***************************************************************************
@@ -84,37 +84,37 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group,
 
     javaSecurityManagerCB = new TQCheckBox( i18n("&Use security manager" ), checkboxes );
     grid->addWidget( javaSecurityManagerCB, 0, 0 );
-    connect( javaSecurityManagerCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
+    connect( javaSecurityManagerCB, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(slotChanged()) );
 
     useKioCB = new TQCheckBox( i18n("Use &TDEIO"), checkboxes );
     grid->addWidget( useKioCB, 0, 1 );
-    connect( useKioCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
+    connect( useKioCB, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(slotChanged()) );
 
     enableShutdownCB = new TQCheckBox( i18n("Shu&tdown applet server when inactive"), checkboxes );
     grid->addWidget( enableShutdownCB, 1, 0 );
-    connect( enableShutdownCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
-    connect( enableShutdownCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleJavaControls()) );
+    connect( enableShutdownCB, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(slotChanged()) );
+    connect( enableShutdownCB, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleJavaControls()) );
 
     TQHBox* secondsHB = new TQHBox( javartGB );
     serverTimeoutSB = new KIntNumInput( secondsHB );
     serverTimeoutSB->setRange( 0, 1000, 5 );
     serverTimeoutSB->setLabel( i18n("App&let server timeout:"), AlignLeft );
     serverTimeoutSB->setSuffix(i18n(" sec"));
-    connect(serverTimeoutSB, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChanged()));
+    connect(serverTimeoutSB, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotChanged()));
 
     TQHBox* pathHB = new TQHBox( javartGB );
     pathHB->setSpacing( 10 );
     TQLabel* pathLA = new TQLabel( i18n( "&Path to Java executable, or 'java':" ),
                                  pathHB );
     pathED = new  KURLRequester( pathHB );
-    connect( pathED, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotChanged()) );
+    connect( pathED, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotChanged()) );
     pathLA->setBuddy( pathED );
 
     TQHBox* addArgHB = new TQHBox( javartGB );
     addArgHB->setSpacing( 10 );
     TQLabel* addArgLA = new TQLabel( i18n( "Additional Java a&rguments:" ), addArgHB  );
     addArgED = new TQLineEdit( addArgHB );
-    connect( addArgED, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotChanged()) );
+    connect( addArgED, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotChanged()) );
     addArgLA->setBuddy( addArgED );
 
     /***************************************************************************
diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h
index ea854aed3..38039188f 100644
--- a/kcontrol/konqhtml/javaopts.h
+++ b/kcontrol/konqhtml/javaopts.h
@@ -63,7 +63,7 @@ public:
 /** Java-specific enhancements to the domain list view
   */
 class JavaDomainListView : public DomainListView {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   JavaDomainListView(TDEConfig *config,const TQString &group,KJavaOptions *opt,
   		TQWidget *parent,const char *name = 0);
@@ -86,7 +86,7 @@ private:
 
 class KJavaOptions : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KJavaOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index da5af132d..8b3b40f4f 100644
--- a/kcontrol/konqhtml/jsopts.cpp
+++ b/kcontrol/konqhtml/jsopts.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <kurlrequester.h>
 
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_QTONLY
 #include <X11/Xlib.h>
 #endif
 
@@ -45,28 +45,28 @@ KJavaScriptOptions::KJavaScriptOptions( TDEConfig* config, TQString group, TQWid
   TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10, 5 );
 
   // the global checkbox
-  TQGroupBox* globalGB = new TQGroupBox( 2, Qt::Vertical, i18n( "Global Settings" ), this );
+  TQGroupBox* globalGB = new TQGroupBox( 2, TQt::Vertical, i18n( "Global Settings" ), this );
   toplevel->addWidget( globalGB );
 
   enableJavaScriptGloballyCB = new TQCheckBox( i18n( "Ena&ble JavaScript globally" ), globalGB );
   TQWhatsThis::add( enableJavaScriptGloballyCB, i18n("Enables the execution of scripts written in ECMA-Script "
         "(also known as JavaScript) that can be contained in HTML pages. "
         "Note that, as with any browser, enabling scripting languages can be a security problem.") );
-  connect( enableJavaScriptGloballyCB, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) );
-  connect( enableJavaScriptGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChangeJSEnabled() ) );
+  connect( enableJavaScriptGloballyCB, TQ_SIGNAL( clicked() ), TQ_SLOT( changed() ) );
+  connect( enableJavaScriptGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChangeJSEnabled() ) );
 
   reportErrorsCB = new TQCheckBox( i18n( "Report &errors" ), globalGB );
   TQWhatsThis::add( reportErrorsCB, i18n("Enables the reporting of errors that occur when JavaScript "
 	"code is executed.") );
-  connect( reportErrorsCB, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) );
+  connect( reportErrorsCB, TQ_SIGNAL( clicked() ), TQ_SLOT( changed() ) );
 
   jsDebugWindow = new TQCheckBox( i18n( "Enable debu&gger" ), globalGB );
   TQWhatsThis::add( jsDebugWindow, i18n( "Enables builtin JavaScript debugger." ) );
-  connect( jsDebugWindow, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) );
+  connect( jsDebugWindow, TQ_SIGNAL( clicked() ), TQ_SLOT( changed() ) );
 
   // the domain-specific listview
   domainSpecific = new JSDomainListView(m_pConfig,m_groupname,this,this);
-  connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(changed()));
+  connect(domainSpecific,TQ_SIGNAL(changed(bool)),TQ_SLOT(changed()));
   toplevel->addWidget( domainSpecific, 2 );
 
   TQWhatsThis::add( domainSpecific, i18n("Here you can set specific JavaScript policies for any particular "
@@ -97,7 +97,7 @@ KJavaScriptOptions::KJavaScriptOptions( TDEConfig* config, TQString group, TQWid
   js_policies_frame = new JSPoliciesFrame(&js_global_policies,
   		i18n("Global JavaScript Policies"),this);
   toplevel->addWidget(js_policies_frame);
-  connect(js_policies_frame, TQT_SIGNAL(changed()), TQT_SLOT(changed()));
+  connect(js_policies_frame, TQ_SIGNAL(changed()), TQ_SLOT(changed()));
 
   // Finally do the loading
   load();
diff --git a/kcontrol/konqhtml/jsopts.h b/kcontrol/konqhtml/jsopts.h
index 000f7f770..361808f39 100644
--- a/kcontrol/konqhtml/jsopts.h
+++ b/kcontrol/konqhtml/jsopts.h
@@ -33,7 +33,7 @@ class KJavaScriptOptions;
 /** JavaScript-specific enhancements to the domain list view
   */
 class JSDomainListView : public DomainListView {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   JSDomainListView(TDEConfig *config,const TQString &group,KJavaScriptOptions *opt,
   		TQWidget *parent,const char *name = 0);
@@ -56,7 +56,7 @@ private:
 
 class KJavaScriptOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KJavaScriptOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
 
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index 1debc0ace..c24cd356e 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -132,11 +132,11 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 
   bool is_per_domain = !policies->isGlobal();
 
-  setColumnLayout(0, Qt::Vertical);
+  setColumnLayout(0, TQt::Vertical);
   layout()->setSpacing(0);
   layout()->setMargin(0);
   TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2);
-  this_layout->setAlignment(Qt::AlignTop);
+  this_layout->setAlignment(TQt::AlignTop);
   this_layout->setSpacing(3);
   this_layout->setMargin(11);
 
@@ -197,7 +197,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
                "window.open()</i> for proper operation. Use "
                "this feature carefully.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_popup, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowOpenPolicy(int)));
+  connect(js_popup, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowOpenPolicy(int)));
 
   // === window.resizeBy/resizeTo ================================
   colIdx = 0;
@@ -235,7 +235,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 		"This option specifies the treatment of such "
 		"attempts.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_resize, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowResizePolicy(int)));
+  connect(js_resize, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowResizePolicy(int)));
 
   // === window.moveBy/moveTo ================================
   colIdx = 0;
@@ -273,7 +273,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 		"This option specifies the treatment of such "
 		"attempts.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_move, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowMovePolicy(int)));
+  connect(js_move, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowMovePolicy(int)));
 
   // === window.focus ================================
   colIdx = 0;
@@ -314,7 +314,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 		"This option specifies the treatment of such "
 		"attempts.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_focus, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowFocusPolicy(int)));
+  connect(js_focus, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowFocusPolicy(int)));
 
   // === window.status ================================
   colIdx = 0;
@@ -354,7 +354,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 		"This option specifies the treatment of such "
 		"attempts.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_statusbar, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowStatusPolicy(int)));
+  connect(js_statusbar, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowStatusPolicy(int)));
 }
 
 JSPoliciesFrame::~JSPoliciesFrame() {
diff --git a/kcontrol/konqhtml/jspolicies.h b/kcontrol/konqhtml/jspolicies.h
index 3291dedab..48160bf92 100644
--- a/kcontrol/konqhtml/jspolicies.h
+++ b/kcontrol/konqhtml/jspolicies.h
@@ -202,7 +202,7 @@ private:
  * @author Leo Savernik
  */
 class JSPoliciesFrame : public TQGroupBox {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * constructor
diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp
index 7272e6e93..68bbcab92 100644
--- a/kcontrol/konqhtml/khttpoptdlg.cpp
+++ b/kcontrol/konqhtml/khttpoptdlg.cpp
@@ -17,16 +17,16 @@ KHTTPOptions::KHTTPOptions(TDEConfig *config, TQString group, TQWidget *parent,
 
   le_languages = new TQLineEdit(this);
   lay->addWidget( le_languages );
-  connect(le_languages, TQT_SIGNAL(textChanged(const TQString&)),
-	  this, TQT_SLOT(slotChanged()));
+  connect(le_languages, TQ_SIGNAL(textChanged(const TQString&)),
+	  this, TQ_SLOT(slotChanged()));
 
   lay->addSpacing(10);
   lay->addWidget( new TQLabel(i18n("Accept character sets:"), this) );
 
   le_charsets = new TQLineEdit(this);
   lay->addWidget( le_charsets );
-  connect(le_charsets, TQT_SIGNAL(textChanged(const TQString&)),
-	  this, TQT_SLOT(slotChanged()));
+  connect(le_charsets, TQ_SIGNAL(textChanged(const TQString&)),
+	  this, TQ_SLOT(slotChanged()));
 
   lay->addStretch(10);
 
diff --git a/kcontrol/konqhtml/khttpoptdlg.h b/kcontrol/konqhtml/khttpoptdlg.h
index d4e17af56..39d1a4b82 100644
--- a/kcontrol/konqhtml/khttpoptdlg.h
+++ b/kcontrol/konqhtml/khttpoptdlg.h
@@ -17,7 +17,7 @@
 */
 class KHTTPOptions : public TDECModule
 {
-Q_OBJECT
+TQ_OBJECT
   public:
     KHTTPOptions(TDEConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L);
 
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp
index a752a3a88..0794b390b 100644
--- a/kcontrol/konqhtml/main.cpp
+++ b/kcontrol/konqhtml/main.cpp
@@ -111,11 +111,11 @@ KJSParts::KJSParts(TDEConfig *config, TQWidget *parent, const char *name)
   // ### the groupname is duplicated in KJSParts::save
   java = new KJavaOptions( config, "Java/JavaScript Settings", this, name );
   tab->addTab( java, i18n( "&Java" ) );
-  connect( java, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
+  connect( java, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) );
 
   javascript = new KJavaScriptOptions( config, "Java/JavaScript Settings", this, name );
   tab->addTab( javascript, i18n( "Java&Script" ) );
-  connect( javascript, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
+  connect( javascript, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) );
 }
 
 KJSParts::~KJSParts()
diff --git a/kcontrol/konqhtml/main.h b/kcontrol/konqhtml/main.h
index 69a324be8..c84c0e81d 100644
--- a/kcontrol/konqhtml/main.h
+++ b/kcontrol/konqhtml/main.h
@@ -35,7 +35,7 @@ class TQTabWidget;
 
 class KJSParts : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index f8e1ad10a..b36f7f1a7 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -62,13 +62,13 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par
     enableHTTPOnly = new TQCheckBox( i18n( "Only allow &HTTP and HTTPS URLs for plugins" ), globalGB );
     enableUserDemand = new TQCheckBox( i18n( "&Load plugins on demand only" ), globalGB );
     priorityLabel = new TQLabel(i18n("CPU priority for plugins: %1").arg(TQString()), globalGB);
-    priority = new TQSlider(5, 100, 5, 100, Qt::Horizontal, globalGB);
-    connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
-    connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTogglePluginsEnabled() ) );
-    connect( enableHTTPOnly, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
-    connect( enableUserDemand, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
-    connect( priority, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) );
-    connect( priority, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( updatePLabel(int) ) );
+    priority = new TQSlider(5, 100, 5, 100, TQt::Horizontal, globalGB);
+    connect( enablePluginsGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) );
+    connect( enablePluginsGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTogglePluginsEnabled() ) );
+    connect( enableHTTPOnly, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) );
+    connect( enableUserDemand, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) );
+    connect( priority, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) );
+    connect( priority, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( updatePLabel(int) ) );
 
     TQFrame *hrule = new TQFrame(globalGB);
     hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
@@ -80,7 +80,7 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par
     TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"),
     						globalGB);
     domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
-    connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg()));
+    connect(domainSpecPB,TQ_SIGNAL(clicked()),TQ_SLOT(slotShowDomainDlg()));
 
     domainSpecificDlg = new KDialogBase(KDialogBase::Swallow,
     			i18n("Domain-Specific Policies"),KDialogBase::Close,
@@ -88,7 +88,7 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par
 
     domainSpecific = new PluginDomainListView(config,group,this,domainSpecificDlg);
     domainSpecific->setMinimumSize(320,200);
-    connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(slotChanged()));
+    connect(domainSpecific,TQ_SIGNAL(changed(bool)),TQ_SLOT(slotChanged()));
 
     domainSpecificDlg->setMainWidget(domainSpecific);
 
@@ -134,8 +134,8 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par
 	m_widget->dirEdit->setMode(KFile::ExistingOnly | KFile::LocalOnly | KFile::Directory);
 
     // setup widgets
-    connect( m_widget->scanAtStartup, TQT_SIGNAL(clicked()), TQT_SLOT(change()) );
-    connect( m_widget->scanButton, TQT_SIGNAL(clicked()), TQT_SLOT(scan()) );
+    connect( m_widget->scanAtStartup, TQ_SIGNAL(clicked()), TQ_SLOT(change()) );
+    connect( m_widget->scanButton, TQ_SIGNAL(clicked()), TQ_SLOT(scan()) );
 
     m_changed = false;
 
@@ -312,11 +312,11 @@ void KPluginOptions::scan()
     // start nspluginscan
     *m_nspluginscan << scanExe << "--verbose";
     kdDebug() << "Running nspluginscan" << endl;
-    connect(m_nspluginscan, TQT_SIGNAL(readReady(KProcIO*)),
-            this, TQT_SLOT(progress(KProcIO*)));
-    connect(m_nspluginscan, TQT_SIGNAL(processExited(TDEProcess *)),
-            this, TQT_SLOT(scanDone()));
-    connect(m_progress, TQT_SIGNAL(cancelled()), this, TQT_SLOT(scanDone()));
+    connect(m_nspluginscan, TQ_SIGNAL(readReady(KProcIO*)),
+            this, TQ_SLOT(progress(KProcIO*)));
+    connect(m_nspluginscan, TQ_SIGNAL(processExited(TDEProcess *)),
+            this, TQ_SLOT(scanDone()));
+    connect(m_progress, TQ_SIGNAL(cancelled()), this, TQ_SLOT(scanDone()));
 
     m_nspluginscan->start();
 }
@@ -345,22 +345,22 @@ void KPluginOptions::scanDone()
 void KPluginOptions::dirInit()
 {
     m_widget->dirEdit->setCaption(i18n("Select Plugin Scan Folder"));
-    connect( m_widget->dirNew, TQT_SIGNAL(clicked()), TQT_SLOT(dirNew()));
-    connect( m_widget->dirRemove, TQT_SIGNAL(clicked()), TQT_SLOT(dirRemove()));
-    connect( m_widget->dirUp, TQT_SIGNAL(clicked()), TQT_SLOT(dirUp()));
-    connect( m_widget->dirDown, TQT_SIGNAL(clicked()), TQT_SLOT(dirDown()) );
-    connect( m_widget->useArtsdsp, TQT_SIGNAL(clicked()),TQT_SLOT(change()));
+    connect( m_widget->dirNew, TQ_SIGNAL(clicked()), TQ_SLOT(dirNew()));
+    connect( m_widget->dirRemove, TQ_SIGNAL(clicked()), TQ_SLOT(dirRemove()));
+    connect( m_widget->dirUp, TQ_SIGNAL(clicked()), TQ_SLOT(dirUp()));
+    connect( m_widget->dirDown, TQ_SIGNAL(clicked()), TQ_SLOT(dirDown()) );
+    connect( m_widget->useArtsdsp, TQ_SIGNAL(clicked()),TQ_SLOT(change()));
     connect( m_widget->dirEdit,
-             TQT_SIGNAL(textChanged(const TQString&)),
-             TQT_SLOT(dirEdited(const TQString &)) );
+             TQ_SIGNAL(textChanged(const TQString&)),
+             TQ_SLOT(dirEdited(const TQString &)) );
 
     connect( m_widget->dirList,
-             TQT_SIGNAL(executed(TQListBoxItem*)),
-             TQT_SLOT(dirSelect(TQListBoxItem*)) );
+             TQ_SIGNAL(executed(TQListBoxItem*)),
+             TQ_SLOT(dirSelect(TQListBoxItem*)) );
 
     connect( m_widget->dirList,
-             TQT_SIGNAL(selectionChanged(TQListBoxItem*)),
-             TQT_SLOT(dirSelect(TQListBoxItem*)) );
+             TQ_SIGNAL(selectionChanged(TQListBoxItem*)),
+             TQ_SLOT(dirSelect(TQListBoxItem*)) );
 }
 
 
@@ -605,7 +605,7 @@ PluginDomainDialog::PluginDomainDialog(TQWidget *parent) :
   hl->addStretch(10);
 
   TQPushButton *closePB = new KPushButton(KStdGuiItem::close(),this);
-  connect(closePB,TQT_SIGNAL(clicked()),TQT_SLOT(slotClose()));
+  connect(closePB,TQ_SIGNAL(clicked()),TQ_SLOT(slotClose()));
   hl->addWidget(closePB);
   thisLayout->addLayout(hl);
 }
diff --git a/kcontrol/konqhtml/pluginopts.h b/kcontrol/konqhtml/pluginopts.h
index efd3e0157..aa060f311 100644
--- a/kcontrol/konqhtml/pluginopts.h
+++ b/kcontrol/konqhtml/pluginopts.h
@@ -53,7 +53,7 @@ public:
 /** Plugin-specific enhancements to the domain list view
   */
 class PluginDomainListView : public DomainListView {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   PluginDomainListView(TDEConfig *config,const TQString &group,KPluginOptions *opt,
   		TQWidget *parent,const char *name = 0);
@@ -74,7 +74,7 @@ private:
  * dialog for embedding a PluginDomainListView widget
  */
 class PluginDomainDialog : public TQWidget {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   PluginDomainDialog(TQWidget *parent);
@@ -92,7 +92,7 @@ private:
 
 class KPluginOptions : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KPluginOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
diff --git a/kcontrol/konqhtml/policydlg.cpp b/kcontrol/konqhtml/policydlg.cpp
index 9409023c1..03720f140 100644
--- a/kcontrol/konqhtml/policydlg.cpp
+++ b/kcontrol/konqhtml/policydlg.cpp
@@ -34,8 +34,8 @@ PolicyDialog::PolicyDialog( Policies *policies, TQWidget *parent, const char *na
   le_domain = new TQLineEdit(main);
   l->setBuddy( le_domain );
   grid->addWidget(le_domain, 0, 1);
-  connect( le_domain,TQT_SIGNAL(textChanged( const TQString & )),
-      TQT_SLOT(slotTextChanged( const TQString &)));
+  connect( le_domain,TQ_SIGNAL(textChanged( const TQString & )),
+      TQ_SLOT(slotTextChanged( const TQString &)));
 
   TQWhatsThis::add(le_domain, i18n("Enter the name of a host (like www.trinitydesktop.org) "
                                   "or a domain, starting with a dot (like .trinitydesktop.org or .org)") );
diff --git a/kcontrol/konqhtml/policydlg.h b/kcontrol/konqhtml/policydlg.h
index e4a176fb3..0ae66a56e 100644
--- a/kcontrol/konqhtml/policydlg.h
+++ b/kcontrol/konqhtml/policydlg.h
@@ -31,7 +31,7 @@ class Policies;
  */
 class PolicyDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/kcontrol/konqhtml/userInterConfig.cpp b/kcontrol/konqhtml/userInterConfig.cpp
index 4e18c6d38..d63512590 100644
--- a/kcontrol/konqhtml/userInterConfig.cpp
+++ b/kcontrol/konqhtml/userInterConfig.cpp
@@ -36,11 +36,11 @@ userInterConfig::userInterConfig(TDEConfig *config, TQString groupName,
     layout->addWidget(m_widget);
     layout->addStretch();
 
-    connect(m_widget, TQT_SIGNAL(changed()),
-            this, TQT_SLOT(changed()));
+    connect(m_widget, TQ_SIGNAL(changed()),
+            this, TQ_SLOT(changed()));
 
     load();
-    TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
+    TQTimer::singleShot(0, this, TQ_SLOT(notChanged()));
 }
 
 void userInterConfig::notChanged()
@@ -68,5 +68,5 @@ void userInterConfig::defaults()
     // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changed,
     // while we manage some of the widgets ourselves
-    TQTimer::singleShot(0, this, TQT_SLOT(changed()));
+    TQTimer::singleShot(0, this, TQ_SLOT(changed()));
 }
diff --git a/kcontrol/konqhtml/userInterConfig.h b/kcontrol/konqhtml/userInterConfig.h
index b87879e45..a019eb7c5 100644
--- a/kcontrol/konqhtml/userInterConfig.h
+++ b/kcontrol/konqhtml/userInterConfig.h
@@ -24,7 +24,7 @@ class userInterOpts;
 
 class userInterConfig : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     userInterConfig(TDEConfig *config, TQString group,
diff --git a/kcontrol/konqhtml/userInterOpts_impl.cpp b/kcontrol/konqhtml/userInterOpts_impl.cpp
index efe3c7343..26eac0f60 100644
--- a/kcontrol/konqhtml/userInterOpts_impl.cpp
+++ b/kcontrol/konqhtml/userInterOpts_impl.cpp
@@ -39,17 +39,17 @@ userInterOpts::userInterOpts(TDEConfig *config, TQString groupName,
     : userInterOptsBase(parent, name), m_pConfig(config), m_groupName(groupName)
 {
     // connections
-    connect(m_pShowMMBInTabs, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pDynamicTabbarHide, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pDynamicTabbarCycle, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pNewTabsInBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pOpenAfterCurrentPage, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pTabConfirm, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pPermanentCloseButton, TQT_SIGNAL(toggled(bool)),  TQT_SLOT(slotChanged()));
-    connect(m_pHoverCloseButton, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pKonquerorTabforExternalURL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pPopupsWithinTabs, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pTabCloseActivatePrevious, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+    connect(m_pShowMMBInTabs, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pDynamicTabbarHide, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pDynamicTabbarCycle, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pNewTabsInBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pOpenAfterCurrentPage, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pTabConfirm, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pPermanentCloseButton, TQ_SIGNAL(toggled(bool)),  TQ_SLOT(slotChanged()));
+    connect(m_pHoverCloseButton, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pKonquerorTabforExternalURL, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pPopupsWithinTabs, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pTabCloseActivatePrevious, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 }
 
 void userInterOpts::load()
diff --git a/kcontrol/konqhtml/userInterOpts_impl.h b/kcontrol/konqhtml/userInterOpts_impl.h
index 763b640b9..bfd845abd 100644
--- a/kcontrol/konqhtml/userInterOpts_impl.h
+++ b/kcontrol/konqhtml/userInterOpts_impl.h
@@ -24,7 +24,7 @@
       
 class userInterOpts : public userInterOptsBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     userInterOpts(TDEConfig *config, TQString groupName,
diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 7dfb77dae..87487fbe0 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -60,28 +60,28 @@ KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&)
     ab->addAuthor("Andrea Rizzi",0, "rizzi@kde.org");
     setAboutData( ab );
 
-    connect(dialog->terminalSizeHintCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->warnCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->ctrldragCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->cutToBeginningOfLineCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->allowResizeCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->bidiCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->xonXoffCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->blinkingCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->frameCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->line_spacingSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
-    connect(dialog->matchTabWinTitleCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->tabsCycleWheelCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->menuAcceleratorsCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->metaAsAltModeCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->realTransparency,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->silence_secondsSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
-    connect(dialog->word_connectorLE,TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT( changed() ));
-    connect(dialog->SchemaEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
-    connect(dialog->SessionEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
-    connect(dialog->SchemaEditor1, TQT_SIGNAL(schemaListChanged(const TQStringList &,const TQStringList &)),
-            dialog->SessionEditor1, TQT_SLOT(schemaListChanged(const TQStringList &,const TQStringList &)));
-    connect(dialog->SessionEditor1, TQT_SIGNAL(getList()), dialog->SchemaEditor1, TQT_SLOT(getList()));
+    connect(dialog->terminalSizeHintCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->warnCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->ctrldragCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->cutToBeginningOfLineCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->allowResizeCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->bidiCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->xonXoffCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->blinkingCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->frameCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->line_spacingSB,TQ_SIGNAL(valueChanged(int)), TQ_SLOT( changed() ));
+    connect(dialog->matchTabWinTitleCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->tabsCycleWheelCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->menuAcceleratorsCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->metaAsAltModeCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->realTransparency,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->silence_secondsSB,TQ_SIGNAL(valueChanged(int)), TQ_SLOT( changed() ));
+    connect(dialog->word_connectorLE,TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT( changed() ));
+    connect(dialog->SchemaEditor1, TQ_SIGNAL(changed()), TQ_SLOT( changed() ));
+    connect(dialog->SessionEditor1, TQ_SIGNAL(changed()), TQ_SLOT( changed() ));
+    connect(dialog->SchemaEditor1, TQ_SIGNAL(schemaListChanged(const TQStringList &,const TQStringList &)),
+            dialog->SessionEditor1, TQ_SLOT(schemaListChanged(const TQStringList &,const TQStringList &)));
+    connect(dialog->SessionEditor1, TQ_SIGNAL(getList()), dialog->SchemaEditor1, TQ_SLOT(getList()));
 }
 
 void KCMKonsole::load()
diff --git a/kcontrol/konsole/kcmkonsole.h b/kcontrol/konsole/kcmkonsole.h
index abdd4cc76..32eb58141 100644
--- a/kcontrol/konsole/kcmkonsole.h
+++ b/kcontrol/konsole/kcmkonsole.h
@@ -28,7 +28,7 @@ class TQStringList;
 class KCMKonsole
 	: public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KCMKonsole (TQWidget *parent = 0, const char *name = 0, const TQStringList& = 0);
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index dfa4dbefe..801880b8b 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -75,7 +75,7 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name)
     defaultSchema = "";
     spix = new TDESharedPixmap;
 
-    connect(spix, TQT_SIGNAL(done(bool)), TQT_SLOT(previewLoaded(bool)));
+    connect(spix, TQ_SIGNAL(done(bool)), TQ_SLOT(previewLoaded(bool)));
 
     DCOPClient *client = kapp->dcopClient();
     if (!client->isAttached())
@@ -94,29 +94,29 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name)
 
 
     TDEGlobal::locale()->insertCatalogue("konsole"); // For schema translations
-    connect(imageBrowse, TQT_SIGNAL(clicked()), this, TQT_SLOT(imageSelect()));
-    connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent()));
-    connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent()));
-    connect(colorCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotColorChanged(int)));
-    connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTypeChanged(int)));
-    connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
-    connect(shadeColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updatePreview()));
-    connect(shadeSlide, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updatePreview()));
-    connect(transparencyCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updatePreview()));
-    connect(backgndLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(updatePreview()));
-
-    connect(titleLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(schemaModified()));
-    connect(shadeColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(schemaModified()));
-    connect(shadeSlide, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(schemaModified()));
-    connect(transparencyCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified()));
-    connect(modeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(schemaModified()));
-    connect(backgndLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(schemaModified()));
-    connect(transparentCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified()));
-    connect(boldCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified()));
-    connect(colorButton, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(schemaModified()));
-    connect(backgndLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(schemaModified()));
-
-    connect(defaultSchemaCB, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()));
+    connect(imageBrowse, TQ_SIGNAL(clicked()), this, TQ_SLOT(imageSelect()));
+    connect(saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveCurrent()));
+    connect(removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeCurrent()));
+    connect(colorCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotColorChanged(int)));
+    connect(typeCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTypeChanged(int)));
+    connect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int)));
+    connect(shadeColor, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updatePreview()));
+    connect(shadeSlide, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updatePreview()));
+    connect(transparencyCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updatePreview()));
+    connect(backgndLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(updatePreview()));
+
+    connect(titleLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(schemaModified()));
+    connect(shadeColor, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(schemaModified()));
+    connect(shadeSlide, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(schemaModified()));
+    connect(transparencyCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(schemaModified()));
+    connect(modeCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(schemaModified()));
+    connect(backgndLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(schemaModified()));
+    connect(transparentCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(schemaModified()));
+    connect(boldCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(schemaModified()));
+    connect(colorButton, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(schemaModified()));
+    connect(backgndLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(schemaModified()));
+
+    connect(defaultSchemaCB, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()));
     removeButton->setEnabled( schemaList->currentItem() );
 }
 
@@ -230,7 +230,7 @@ void SchemaEditor::loadAllSchema(TQString currentFile)
 {
     TQStringList list = TDEGlobal::dirs()->findAllResources("data", "konsole/*.schema");
     TQStringList::ConstIterator it;
-    disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
+    disconnect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int)));
     schemaList->clear();
 
     TQListBoxItem* currentItem = 0;
@@ -253,7 +253,7 @@ void SchemaEditor::loadAllSchema(TQString currentFile)
     schemaList->sort();
     schemaList->setCurrentItem(0);   // select the first added item correctly too
     schemaList->setCurrentItem(currentItem);
-    connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
+    connect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int)));
     schemaListChanged();
 }
 
@@ -528,11 +528,11 @@ void SchemaEditor::readSchema(int num)
 	}
 
 	if(schMod) {
-	    disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
+	    disconnect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int)));
 	    schemaList->setCurrentItem(oldSchema);
 	    querySave();
 	    schemaList->setCurrentItem(num);
-	    connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
+	    connect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int)));
 	    schMod=false;
 	}
 
diff --git a/kcontrol/konsole/schemaeditor.h b/kcontrol/konsole/schemaeditor.h
index 903cc1436..1dd990795 100644
--- a/kcontrol/konsole/schemaeditor.h
+++ b/kcontrol/konsole/schemaeditor.h
@@ -32,7 +32,7 @@ class TDESharedPixmap;
 /** SchemaEditor is the base class of the porject */
 class SchemaEditor : public SchemaDialog
 {
-  Q_OBJECT 
+  TQ_OBJECT 
   public:
     /** constructor */
     SchemaEditor(TQWidget* parent=0, const char *name=0);
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index 290541d12..e6ed3ee4c 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -60,20 +60,20 @@ SessionEditor::SessionEditor(TQWidget * parent, const char *name)
   TDEGlobal::iconLoader()->addAppDir( "konsole" );
 
   directoryLine->setMode(KFile::Directory);
-  connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int)));
-  connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent()));
-  connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent()));
+  connect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int)));
+  connect(saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveCurrent()));
+  connect(removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeCurrent()));
 
-  connect(nameLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
-  connect(directoryLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
-  connect(executeLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
-  connect(termLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
+  connect(nameLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified()));
+  connect(directoryLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified()));
+  connect(executeLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified()));
+  connect(termLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified()));
 
-  connect(previewIcon, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(sessionModified()));
+  connect(previewIcon, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(sessionModified()));
 
-  connect(fontCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified()));
-  connect(keytabCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified()));
-  connect(schemaCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified()));
+  connect(fontCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sessionModified()));
+  connect(keytabCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sessionModified()));
+  connect(schemaCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sessionModified()));
 }
 
 SessionEditor::~SessionEditor()
@@ -190,12 +190,12 @@ void SessionEditor::readSession(int num)
     KSimpleConfig* co;
 
     if(sesMod) {
-        disconnect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int)));
+        disconnect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int)));
 
         sessionList->setCurrentItem(oldSession);
         querySave();
         sessionList->setCurrentItem(num);
-        connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int)));
+        connect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int)));
         sesMod=false;
     }
     if( sessionList->item(num) )
diff --git a/kcontrol/konsole/sessioneditor.h b/kcontrol/konsole/sessioneditor.h
index be85f8505..04b60b3f7 100644
--- a/kcontrol/konsole/sessioneditor.h
+++ b/kcontrol/konsole/sessioneditor.h
@@ -31,7 +31,7 @@
 
 class SessionEditor : public SessionDialog
 {
-  Q_OBJECT 
+  TQ_OBJECT 
   public:
     SessionEditor(TQWidget* parent=0, const char *name=0);
     ~SessionEditor();
diff --git a/kcontrol/krdb/kcs/CMakeLists.txt b/kcontrol/krdb/kcs/CMakeLists.txt
index 3065d1c6e..b93dc018a 100644
--- a/kcontrol/krdb/kcs/CMakeLists.txt
+++ b/kcontrol/krdb/kcs/CMakeLists.txt
@@ -18,6 +18,7 @@ tde_create_translated_desktop(
     KDEOne.kcsrc KDETwo.kcsrc MediaPeach.kcsrc Windows95.kcsrc EveX.kcsrc
     WindowsXP.kcsrc Keramik.kcsrc KeramikEmerald.kcsrc KeramikWhite.kcsrc
     BlackOnWhite.kcsrc WhiteOnBlack.kcsrc YellowOnBlue.kcsrc Plastik.kcsrc
+    Human.kcsrc Last.fm.kcsrc Lizard.kcsrc Sienna.kcsrc Platinum.kcsrc WedgieWeb.kcsrc
   DESTINATION ${DATA_INSTALL_DIR}/tdedisplay/color-schemes
   PO_DIR kcontrol-color-schemes
 )
diff --git a/kcontrol/krdb/kcs/Human.kcsrc b/kcontrol/krdb/kcs/Human.kcsrc
new file mode 100644
index 000000000..a4200f73a
--- /dev/null
+++ b/kcontrol/krdb/kcs/Human.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Human
+activeBackground=204,134,62
+activeBlend=204,134,62
+activeForeground=255,255,255
+activeTitleBtnBg=245,243,240
+alternateBackground=245,242,237
+background=239,235,231
+buttonBackground=225,217,209
+buttonForeground=0,0,0
+contrast=7
+foreground=16,16,16
+frame=239,239,239
+handle=239,239,239
+inactiveBackground=235,231,227
+inactiveBlend=235,231,227
+inactiveForeground=179,175,171
+inactiveFrame=239,239,239
+inactiveHandle=239,239,239
+inactiveTitleBtnBg=179,175,171
+linkColor=0,0,238
+selectBackground=214,114,45
+selectForeground=255,255,255
+shadeSortColumn=true
+visitedLinkColor=82,24,139
+windowBackground=255,255,255
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Last.fm.kcsrc b/kcontrol/krdb/kcs/Last.fm.kcsrc
new file mode 100644
index 000000000..e1659fd83
--- /dev/null
+++ b/kcontrol/krdb/kcs/Last.fm.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Last.fm
+activeBackground=210,0,57
+activeBlend=183,0,29
+activeForeground=255,255,255
+activeTitleBtnBg=186,7,38
+alternateBackground=252,250,251
+background=227,230,216
+buttonBackground=219,222,210
+buttonForeground=0,0,0
+contrast=7
+foreground=0,0,0
+frame=239,239,239
+handle=239,239,239
+inactiveBackground=145,153,142
+inactiveBlend=136,143,133
+inactiveForeground=255,255,255
+inactiveFrame=239,239,239
+inactiveHandle=239,239,239
+inactiveTitleBtnBg=145,153,142
+linkColor=0,0,238
+selectBackground=210,0,57
+selectForeground=255,255,255
+shadeSortColumn=true
+visitedLinkColor=82,24,139
+windowBackground=255,255,255
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Lizard.kcsrc b/kcontrol/krdb/kcs/Lizard.kcsrc
new file mode 100644
index 000000000..aa77312db
--- /dev/null
+++ b/kcontrol/krdb/kcs/Lizard.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Lizard
+activeBackground=130,209,34
+activeBlend=97,176,0
+activeForeground=255,255,255
+activeTitleBtnBg=156,250,41
+alternateBackground=241,249,237
+background=239,239,239
+buttonBackground=221,223,228
+buttonForeground=0,0,0
+contrast=7
+foreground=0,0,0
+frame=239,239,239
+handle=239,239,239
+inactiveBackground=170,209,122
+inactiveBlend=131,169,84
+inactiveForeground=0,0,0
+inactiveFrame=239,239,239
+inactiveHandle=239,239,239
+inactiveTitleBtnBg=167,181,199
+linkColor=0,0,238
+selectBackground=180,250,95
+selectForeground=0,0,0
+shadeSortColumn=true
+visitedLinkColor=82,24,139
+windowBackground=255,255,255
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Platinum.kcsrc b/kcontrol/krdb/kcs/Platinum.kcsrc
new file mode 100644
index 000000000..a2e059535
--- /dev/null
+++ b/kcontrol/krdb/kcs/Platinum.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Platinum
+activeBackground=212,212,212
+activeBlend=136,136,136
+activeForeground=0,0,0
+activeTitleBtnBg=212,212,212
+alternateBackground=242,242,255
+background=241,241,241
+buttonBackground=212,212,212
+buttonForeground=0,0,0
+contrast=7
+foreground=0,0,0
+frame=239,239,239
+handle=239,239,239
+inactiveBackground=136,136,136
+inactiveBlend=212,212,212
+inactiveForeground=0,0,0
+inactiveFrame=239,239,239
+inactiveHandle=239,239,239
+inactiveTitleBtnBg=212,212,212
+linkColor=0,0,238
+selectBackground=170,170,214
+selectForeground=0,0,0
+shadeSortColumn=true
+visitedLinkColor=82,24,139
+windowBackground=255,255,255
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Sienna.kcsrc b/kcontrol/krdb/kcs/Sienna.kcsrc
new file mode 100644
index 000000000..2839500e0
--- /dev/null
+++ b/kcontrol/krdb/kcs/Sienna.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Sienna
+activeBackground=209,136,34
+activeBlend=176,103,0
+activeForeground=255,255,255
+activeTitleBtnBg=250,163,41
+alternateBackground=249,244,237
+background=239,239,239
+buttonBackground=221,223,228
+buttonForeground=0,0,0
+contrast=7
+foreground=0,0,0
+frame=239,239,239
+handle=239,239,239
+inactiveBackground=209,173,122
+inactiveBlend=169,134,84
+inactiveForeground=0,0,0
+inactiveFrame=239,239,239
+inactiveHandle=239,239,239
+inactiveTitleBtnBg=167,181,199
+linkColor=0,0,238
+selectBackground=250,185,95
+selectForeground=0,0,0
+shadeSortColumn=true
+visitedLinkColor=82,24,139
+windowBackground=255,255,255
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/WedgieWeb.kcsrc b/kcontrol/krdb/kcs/WedgieWeb.kcsrc
new file mode 100644
index 000000000..c0fc98663
--- /dev/null
+++ b/kcontrol/krdb/kcs/WedgieWeb.kcsrc
@@ -0,0 +1,22 @@
+[Color Scheme]
+Name=WedgieWeb
+activeBackground=68,68,119
+activeBlend=68,68,119
+activeForeground=204,119,34
+activeTitleBtnBg=116,132,115
+alternateBackground=226,234,226
+background=65,68,115
+buttonBackground=49,48,98
+buttonForeground=156,161,164
+contrast=0
+foreground=153,119,0
+inactiveBackground=68,68,119
+inactiveBlend=68,68,119
+inactiveForeground=120,70,20
+inactiveTitleBtnBg=162,184,160
+linkColor=156,161,164
+selectBackground=65,48,49
+selectForeground=204,119,34
+visitedLinkColor=156,161,164
+windowBackground=0,16,32
+windowForeground=153,119,0
diff --git a/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml b/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml
index 3d534f9b6..cdeba332c 100644
--- a/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml
+++ b/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml
@@ -135,7 +135,7 @@
     <inactiveHandle rgb="#1e1e1e" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_plastik" >
+  <wm type="builtin" name="twin_plastik" >
     <border size="3" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml b/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml
index 2b648eac4..ea1938388 100644
--- a/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml
+++ b/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml
@@ -135,7 +135,7 @@
     <inactiveHandle rgb="#1e1e1e" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_plastik" >
+  <wm type="builtin" name="twin_plastik" >
     <border size="3" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml b/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml
index a93aba33a..c16988a4c 100644
--- a/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml
+++ b/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml
@@ -135,7 +135,7 @@
     <inactiveHandle rgb="#e1e1e1" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_plastik" >
+  <wm type="builtin" name="twin_plastik" >
     <border size="3" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml b/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml
index 602f21613..d52955aaa 100644
--- a/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml
+++ b/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml
@@ -135,7 +135,7 @@
     <inactiveHandle rgb="#e1e1e1" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_plastik" >
+  <wm type="builtin" name="twin_plastik" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml b/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml
index 5236e586d..a3b3a524f 100644
--- a/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml
+++ b/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml
@@ -100,7 +100,7 @@
     <inactiveTitleBtnBg rgb="#a7b5c7" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_default" >
+  <wm type="builtin" name="twin_default" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/Keramik/Keramik.xml b/kcontrol/krdb/themes/Keramik/Keramik.xml
index bbc117ed6..2553d8a69 100644
--- a/kcontrol/krdb/themes/Keramik/Keramik.xml
+++ b/kcontrol/krdb/themes/Keramik/Keramik.xml
@@ -100,7 +100,7 @@
     <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_keramik" >
+  <wm type="builtin" name="twin_keramik" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/Plastik/Plastik.xml b/kcontrol/krdb/themes/Plastik/Plastik.xml
index 6de5bee12..7ae86cd7d 100644
--- a/kcontrol/krdb/themes/Plastik/Plastik.xml
+++ b/kcontrol/krdb/themes/Plastik/Plastik.xml
@@ -100,7 +100,7 @@
     <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_plastik" >
+  <wm type="builtin" name="twin_plastik" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/Platinum/Platinum.xml b/kcontrol/krdb/themes/Platinum/Platinum.xml
index 6a439e46d..6b7a843c1 100644
--- a/kcontrol/krdb/themes/Platinum/Platinum.xml
+++ b/kcontrol/krdb/themes/Platinum/Platinum.xml
@@ -100,7 +100,7 @@
     <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_system" >
+  <wm type="builtin" name="twin_system" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/Redmond/Redmond.xml b/kcontrol/krdb/themes/Redmond/Redmond.xml
index 1371f60e6..097c0001d 100644
--- a/kcontrol/krdb/themes/Redmond/Redmond.xml
+++ b/kcontrol/krdb/themes/Redmond/Redmond.xml
@@ -100,7 +100,7 @@
     <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_redmond" >
+  <wm type="builtin" name="twin_redmond" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/Sunshine/Sunshine.xml b/kcontrol/krdb/themes/Sunshine/Sunshine.xml
index dfd65fe3f..0f5d20285 100644
--- a/kcontrol/krdb/themes/Sunshine/Sunshine.xml
+++ b/kcontrol/krdb/themes/Sunshine/Sunshine.xml
@@ -100,7 +100,7 @@
     <inactiveTitleBtnBg rgb="#aeb2c3" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_cde" >
+  <wm type="builtin" name="twin_cde" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml b/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml
index 3a7332628..e98edd00a 100644
--- a/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml
+++ b/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml
@@ -135,7 +135,7 @@
     <inactiveHandle rgb="#1e1ee1" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_quartz" >
+  <wm type="builtin" name="twin_quartz" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml b/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml
index c624bbb6e..264971d9d 100644
--- a/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml
+++ b/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml
@@ -135,7 +135,7 @@
     <inactiveHandle rgb="#1e1ee1" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_quartz" >
+  <wm type="builtin" name="twin_quartz" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/kthememanager/knewthemedlg.cpp b/kcontrol/kthememanager/knewthemedlg.cpp
index 76af5490a..220408ab9 100644
--- a/kcontrol/kthememanager/knewthemedlg.cpp
+++ b/kcontrol/kthememanager/knewthemedlg.cpp
@@ -28,7 +28,7 @@ KNewThemeDlg::KNewThemeDlg( TQWidget * parent, const char * name )
 {
     m_base = new NewThemeWidget( this, "new_theme_base" );
     setMainWidget( m_base );
-    connect( m_base->leName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotThemeNameChanged( const TQString & ) ) );
+    connect( m_base->leName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotThemeNameChanged( const TQString & ) ) );
     slotThemeNameChanged( m_base->leName->text() );
 }
 
diff --git a/kcontrol/kthememanager/knewthemedlg.h b/kcontrol/kthememanager/knewthemedlg.h
index 5580c4d01..39b7d554c 100644
--- a/kcontrol/kthememanager/knewthemedlg.h
+++ b/kcontrol/kthememanager/knewthemedlg.h
@@ -31,7 +31,7 @@ class NewThemeWidget;
  */
 class KNewThemeDlg: public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KNewThemeDlg( TQWidget * parent = 0, const char * name = 0);
     ~KNewThemeDlg();
diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui
index 717f68e32..8f7fade9d 100644
--- a/kcontrol/kthememanager/kthemedlg.ui
+++ b/kcontrol/kthememanager/kthemedlg.ui
@@ -503,7 +503,7 @@
     <include location="local" impldecl="in implementation">kthemedlg.ui.h</include>
     <include location="global" impldecl="in implementation">kurllabel.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot specifier="non virtual">startKonqui( const TQString &amp; url )</slot>
     <slot specifier="non virtual">startBackground()</slot>
     <slot specifier="non virtual">startColors()</slot>
@@ -511,6 +511,6 @@
     <slot specifier="non virtual">startIcons()</slot>
     <slot specifier="non virtual">startFonts()</slot>
     <slot specifier="non virtual">startSaver()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 5972efa2b..4d3791511 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -66,26 +66,26 @@ kthememanager::kthememanager( TQWidget *parent, const char *name )
 
     dlg->lvThemes->setColumnWidthMode( 0, TQListView::Maximum );
 
-    connect( ( TQObject * )dlg->btnInstall, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( slotInstallTheme() ) );
+    connect( ( TQObject * )dlg->btnInstall, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( slotInstallTheme() ) );
 
-    connect( ( TQObject * )dlg->btnRemove, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( slotRemoveTheme() ) );
+    connect( ( TQObject * )dlg->btnRemove, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( slotRemoveTheme() ) );
 
-    connect( ( TQObject * )dlg->btnCreate, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( slotCreateTheme() ) );
+    connect( ( TQObject * )dlg->btnCreate, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( slotCreateTheme() ) );
 
-    connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-             this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) );
+    connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+             this, TQ_SLOT( slotThemeChanged( TQListViewItem * ) ) );
 
-    connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( currentChanged( TQListViewItem * ) ),
-             this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) );
+    connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( currentChanged( TQListViewItem * ) ),
+             this, TQ_SLOT( slotThemeChanged( TQListViewItem * ) ) );
 
-    connect( this, TQT_SIGNAL( filesDropped( const KURL::List& ) ),
-             this, TQT_SLOT( updateButton() ) );
+    connect( this, TQ_SIGNAL( filesDropped( const KURL::List& ) ),
+             this, TQ_SLOT( updateButton() ) );
 
-    connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-             this, TQT_SLOT( updateButton() ) );
+    connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+             this, TQ_SLOT( updateButton() ) );
 
     m_origTheme = new KTheme( this, true ); // stores the defaults to get back to
     m_origTheme->setName( ORIGINAL_THEME );
@@ -405,7 +405,7 @@ void kthememanager::updatePreview( const TQString & pixFile )
      TQImage preview( pixFile, "PNG" );
      if (preview.width()>dlg->lbPreview->contentsRect().width() ||
          preview.height()>dlg->lbPreview->contentsRect().height() )
-         preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQ_ScaleMin );
+         preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQImage::ScaleMin );
      TQPixmap pix;
      pix.convertFromImage( preview );
      dlg->lbPreview->setPixmap( pix );
diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h
index ac9fa5dc7..2415bd02e 100644
--- a/kcontrol/kthememanager/kthememanager.h
+++ b/kcontrol/kthememanager/kthememanager.h
@@ -60,7 +60,7 @@ private:
  */
 class kthememanager: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     kthememanager( TQWidget *parent=0, const char *name=0 );
     virtual ~kthememanager();
diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp
index 1b7875e7f..06c41eaba 100644
--- a/kcontrol/launch/kcmlaunch.cpp
+++ b/kcontrol/launch/kcmlaunch.cpp
@@ -56,7 +56,7 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
      "notification. In this case, the cursor stops blinking after the time\n"
      "given in the section 'Startup indication timeout'"));
 
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
+    GroupBox1->setColumnLayout(0, TQt::Vertical );
     GroupBox1->layout()->setSpacing( 0 );
     GroupBox1->layout()->setMargin( 0 );
     Form1Layout->addWidget( GroupBox1 );
@@ -71,9 +71,9 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
     cb_busyCursor->insertItem( i18n( "Blinking Cursor" ), 2 );
     cb_busyCursor->insertItem( i18n( "Bouncing Cursor" ), 3 );
     GroupBox1Layout->addWidget( cb_busyCursor, 0, 0 );
-    connect( cb_busyCursor, TQT_SIGNAL( activated(int) ),
-            TQT_SLOT ( slotBusyCursor(int)));
-    connect( cb_busyCursor, TQT_SIGNAL( activated(int) ), TQT_SLOT( checkChanged() ) );
+    connect( cb_busyCursor, TQ_SIGNAL( activated(int) ),
+            TQ_SLOT ( slotBusyCursor(int)));
+    connect( cb_busyCursor, TQ_SIGNAL( activated(int) ), TQ_SLOT( checkChanged() ) );
 
     lbl_cursorTimeout = new TQLabel( GroupBox1, "TextLabel1" );
     lbl_cursorTimeout->setText( i18n( "&Startup indication timeout:" ) );
@@ -83,8 +83,8 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
     sb_cursorTimeout->setSuffix( i18n(" sec") );
     GroupBox1Layout->addWidget( sb_cursorTimeout, 2, 1 );
     lbl_cursorTimeout->setBuddy( sb_cursorTimeout );
-    connect( sb_cursorTimeout, TQT_SIGNAL( valueChanged(int) ), 
-            TQT_SLOT( checkChanged() ) );
+    connect( sb_cursorTimeout, TQ_SIGNAL( valueChanged(int) ), 
+            TQ_SLOT( checkChanged() ) );
 
     TQGroupBox* GroupBox2 = new TQGroupBox( this, "GroupBox2" );
     GroupBox2->setTitle( i18n( "Taskbar &Notification" ) );
@@ -96,7 +96,7 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
      "notification. In this case, the button disappears after the time\n"
      "given in the section 'Startup indication timeout'"));
 
-    GroupBox2->setColumnLayout( 0, Qt::Vertical );
+    GroupBox2->setColumnLayout( 0, TQt::Vertical );
     GroupBox2->layout()->setSpacing( 0 );
     GroupBox2->layout()->setMargin( 0 );
     Form1Layout->addWidget( GroupBox2 );
@@ -108,9 +108,9 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
     cb_taskbarButton = new TQCheckBox( GroupBox2, "cb_taskbarButton" );
     cb_taskbarButton->setText( i18n( "Enable &taskbar notification" ) );
     GroupBox2Layout->addMultiCellWidget( cb_taskbarButton, 0, 0, 0, 1 );
-    connect( cb_taskbarButton, TQT_SIGNAL( toggled(bool) ), 
-            TQT_SLOT( slotTaskbarButton(bool)));
-    connect( cb_taskbarButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( checkChanged()));
+    connect( cb_taskbarButton, TQ_SIGNAL( toggled(bool) ), 
+            TQ_SLOT( slotTaskbarButton(bool)));
+    connect( cb_taskbarButton, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( checkChanged()));
 
     lbl_taskbarTimeout = new TQLabel( GroupBox2, "TextLabel2" );
     lbl_taskbarTimeout->setText( i18n( "Start&up indication timeout:" ) );
@@ -120,8 +120,8 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
     sb_taskbarTimeout->setSuffix( i18n(" sec") );
     GroupBox2Layout->addWidget( sb_taskbarTimeout, 1, 1 );
     lbl_taskbarTimeout->setBuddy( sb_taskbarTimeout );
-    connect( sb_taskbarTimeout, TQT_SIGNAL( valueChanged(int) ), 
-            TQT_SLOT( checkChanged() ) );
+    connect( sb_taskbarTimeout, TQ_SIGNAL( valueChanged(int) ), 
+            TQ_SLOT( checkChanged() ) );
 
     Form1Layout->addStretch();
 
diff --git a/kcontrol/launch/kcmlaunch.h b/kcontrol/launch/kcmlaunch.h
index e0219ffd3..3781cdd58 100644
--- a/kcontrol/launch/kcmlaunch.h
+++ b/kcontrol/launch/kcmlaunch.h
@@ -28,7 +28,7 @@ class KIntNumInput;
 
 class LaunchConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/kcontrol/locale/Makefile.am b/kcontrol/locale/Makefile.am
index df5b46511..260d2ba94 100644
--- a/kcontrol/locale/Makefile.am
+++ b/kcontrol/locale/Makefile.am
@@ -1,5 +1,3 @@
-#AM_CPPFLAGS = -DTQT_NO_CAST_ASCII -DTQT_NO_COMPAT
-
 AM_CPPFLAGS = $(all_includes)
 
 SUBDIRS = default pics
diff --git a/kcontrol/locale/TIMEZONES b/kcontrol/locale/TIMEZONES
index a47b45ea6..c599b0177 100644
--- a/kcontrol/locale/TIMEZONES
+++ b/kcontrol/locale/TIMEZONES
@@ -87,6 +87,7 @@ i18n("America/Cayenne");
 i18n("America/Cayman");
 i18n("America/Chicago");
 i18n("America/Chihuahua");
+i18n("America/Ciudad_Juarez");
 i18n("America/Costa_Rica");
 i18n("America/Creston");
 i18n("America/Cuiaba");
@@ -150,7 +151,6 @@ i18n("America/Montevideo");
 i18n("America/Montserrat");
 i18n("America/Nassau");
 i18n("America/New_York");
-i18n("America/Nipigon");
 i18n("America/Nome");
 i18n("America/Noronha");
 i18n("America/North_Dakota/Beulah");
@@ -159,7 +159,6 @@ i18n("America/North_Dakota/New_Salem");
 i18n("America/Nuuk");
 i18n("America/Ojinaga");
 i18n("America/Panama");
-i18n("America/Pangnirtung");
 i18n("America/Paramaribo");
 i18n("America/Phoenix");
 i18n("America/Port-au-Prince");
@@ -167,7 +166,6 @@ i18n("America/Port_of_Spain");
 i18n("America/Porto_Velho");
 i18n("America/Puerto_Rico");
 i18n("America/Punta_Arenas");
-i18n("America/Rainy_River");
 i18n("America/Rankin_Inlet");
 i18n("America/Recife");
 i18n("America/Regina");
@@ -188,7 +186,6 @@ i18n("America/St_Vincent");
 i18n("America/Swift_Current");
 i18n("America/Tegucigalpa");
 i18n("America/Thule");
-i18n("America/Thunder_Bay");
 i18n("America/Tijuana");
 i18n("America/Toronto");
 i18n("America/Tortola");
@@ -196,7 +193,6 @@ i18n("America/Vancouver");
 i18n("America/Whitehorse");
 i18n("America/Winnipeg");
 i18n("America/Yakutat");
-i18n("America/Yellowknife");
 i18n("Antarctica/Casey");
 i18n("Antarctica/Davis");
 i18n("Antarctica/DumontDUrville");
@@ -334,8 +330,8 @@ i18n("Europe/Isle_of_Man");
 i18n("Europe/Istanbul");
 i18n("Europe/Jersey");
 i18n("Europe/Kaliningrad");
-i18n("Europe/Kiev");
 i18n("Europe/Kirov");
+i18n("Europe/Kyiv");
 i18n("Europe/Lisbon");
 i18n("Europe/Ljubljana");
 i18n("Europe/London");
@@ -363,7 +359,6 @@ i18n("Europe/Stockholm");
 i18n("Europe/Tallinn");
 i18n("Europe/Tirane");
 i18n("Europe/Ulyanovsk");
-i18n("Europe/Uzhgorod");
 i18n("Europe/Vaduz");
 i18n("Europe/Vatican");
 i18n("Europe/Vienna");
@@ -371,7 +366,6 @@ i18n("Europe/Vilnius");
 i18n("Europe/Volgograd");
 i18n("Europe/Warsaw");
 i18n("Europe/Zagreb");
-i18n("Europe/Zaporozhye");
 i18n("Europe/Zurich");
 i18n("Indian/Antananarivo");
 i18n("Indian/Chagos");
@@ -391,7 +385,6 @@ i18n("Pacific/Chatham");
 i18n("Pacific/Chuuk");
 i18n("Pacific/Easter");
 i18n("Pacific/Efate");
-i18n("Pacific/Enderbury");
 i18n("Pacific/Fakaofo");
 i18n("Pacific/Fiji");
 i18n("Pacific/Funafuti");
@@ -400,6 +393,7 @@ i18n("Pacific/Gambier");
 i18n("Pacific/Guadalcanal");
 i18n("Pacific/Guam");
 i18n("Pacific/Honolulu");
+i18n("Pacific/Kanton");
 i18n("Pacific/Kiritimati");
 i18n("Pacific/Kosrae");
 i18n("Pacific/Kwajalein");
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index 3d1736676..be2b1d16f 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -55,34 +55,34 @@ TDELocaleConfig::TDELocaleConfig(TDELocale *locale,
   m_labCountry = new TQLabel(this, I18N_NOOP("Country or region:"));
   m_comboCountry = new KLanguageButton( this );
   m_labCountry->setBuddy(m_comboCountry);
-  connect( m_comboCountry, TQT_SIGNAL(activated(const TQString &)),
-           this, TQT_SLOT(changedCountry(const TQString &)) );
+  connect( m_comboCountry, TQ_SIGNAL(activated(const TQString &)),
+           this, TQ_SLOT(changedCountry(const TQString &)) );
 
   m_labLang = new TQLabel(this, I18N_NOOP("Languages:"));
   m_labLang->setAlignment( AlignTop );
 
   m_languages = new TQListBox(this);
-  connect(m_languages, TQT_SIGNAL(selectionChanged()),
-          TQT_SLOT(slotCheckButtons()));
+  connect(m_languages, TQ_SIGNAL(selectionChanged()),
+          TQ_SLOT(slotCheckButtons()));
 
   TQWidget * vb = new TQWidget(this);
   TQVBoxLayout * boxlay = new TQVBoxLayout(vb, 0, KDialog::spacingHint());
   m_addLanguage = new KLanguageButton(TQString::null, vb, I18N_NOOP("Add Language"));
   boxlay->add(m_addLanguage);
-  connect(m_addLanguage, TQT_SIGNAL(activated(const TQString &)),
-          TQT_SLOT(slotAddLanguage(const TQString &)));
+  connect(m_addLanguage, TQ_SIGNAL(activated(const TQString &)),
+          TQ_SLOT(slotAddLanguage(const TQString &)));
   m_removeLanguage = new TQPushButton(vb, I18N_NOOP("Remove Language"));
   m_upButton = new TQPushButton(vb, I18N_NOOP("Move Up"));
   m_downButton = new TQPushButton(vb, I18N_NOOP("Move Down"));
   boxlay->add(m_removeLanguage);
   boxlay->add(m_upButton);
   boxlay->add(m_downButton);
-  connect(m_removeLanguage, TQT_SIGNAL(clicked()),
-          TQT_SLOT(slotRemoveLanguage()));
-  connect(m_upButton, TQT_SIGNAL(clicked()),
-          TQT_SLOT(slotLanguageUp()));
-  connect(m_downButton, TQT_SIGNAL(clicked()),
-          TQT_SLOT(slotLanguageDown()));
+  connect(m_removeLanguage, TQ_SIGNAL(clicked()),
+          TQ_SLOT(slotRemoveLanguage()));
+  connect(m_upButton, TQ_SIGNAL(clicked()),
+          TQ_SLOT(slotLanguageUp()));
+  connect(m_downButton, TQ_SIGNAL(clicked()),
+          TQ_SLOT(slotLanguageDown()));
   boxlay->insertStretch(-1);
 
   // #### HPB: This should be implemented for KDE 3
@@ -113,9 +113,9 @@ TDELocaleConfig::TDELocaleConfig(TDELocale *locale,
   languageSelectorLayout->addStretch();
   lay->addMultiCellLayout(languageSelectorLayout, 3, 3, 0, 2);
 
-  connect( installLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallLanguage()) );
-  connect( uninstallLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallLanguage()) );
-  connect( selectLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectLanguage()) );
+  connect( installLanguage, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallLanguage()) );
+  connect( uninstallLanguage, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallLanguage()) );
+  connect( selectLanguage, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectLanguage()) );
 #endif
 
 }
@@ -126,8 +126,8 @@ void TDELocaleConfig::slotInstallLanguage()
 
   *proc << "tdesu";
   *proc << "qt-language-selector --mode install";
-  TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
-			this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *)));
+  TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),
+			this, TQ_SLOT(slotLanguageSelectorExited(TDEProcess *)));
   setEnabled(false);
   proc->start();
 }
@@ -138,8 +138,8 @@ void TDELocaleConfig::slotUninstallLanguage()
 
   *proc << "tdesu";
   *proc << "qt-language-selector --mode uninstall";
-  TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
-			this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *)));
+  TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),
+			this, TQ_SLOT(slotLanguageSelectorExited(TDEProcess *)));
   setEnabled(false);
   proc->start();
 }
@@ -150,8 +150,8 @@ void TDELocaleConfig::slotSelectLanguage()
 
   *proc << "tdesu";
   *proc << "qt-language-selector --mode select";
-  TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
-			this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *)));
+  TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),
+			this, TQ_SLOT(slotLanguageSelectorExited(TDEProcess *)));
   setEnabled(false);
   proc->start();
 }
diff --git a/kcontrol/locale/kcmlocale.h b/kcontrol/locale/kcmlocale.h
index c8b126919..e4b7e24cd 100644
--- a/kcontrol/locale/kcmlocale.h
+++ b/kcontrol/locale/kcmlocale.h
@@ -40,7 +40,7 @@ class TQPushButton;
 
 class TDELocaleConfig : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDELocaleConfig( TDELocale *_locale,
diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp
index 9903965e8..aac454061 100644
--- a/kcontrol/locale/klocalesample.cpp
+++ b/kcontrol/locale/klocalesample.cpp
@@ -46,7 +46,7 @@ TDELocaleSample::TDELocaleSample(TDELocale *locale,
 
   // Whatever the color scheme is, we want black text
   TQColorGroup a = palette().active();
-  a.setColor(TQColorGroup::Foreground, Qt::black);
+  a.setColor(TQColorGroup::Foreground, TQt::black);
   TQPalette pal(a, a, a);
 
   m_labNumber = new TQLabel(this, I18N_NOOP("Numbers:"));
@@ -78,7 +78,7 @@ TDELocaleSample::TDELocaleSample(TDELocale *locale,
   lay->setColStretch(1, 3);
 
   TQTimer *timer = new TQTimer(this, "clock_timer");
-  connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateTime()));
+  connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateTime()));
   timer->start(1000);
 }
 
@@ -90,9 +90,9 @@ void TDELocaleSample::slotUpdateTime()
 {
   TQDateTime dt = TQDateTime::currentDateTime();
 
-  m_dateSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), false));
-  m_dateShortSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), true));
-  m_timeSample->setText(m_locale->formatTime(TQT_TQTIME_OBJECT(dt.time()), true));
+  m_dateSample->setText(m_locale->formatDate(dt.date(), false));
+  m_dateShortSample->setText(m_locale->formatDate(dt.date(), true));
+  m_timeSample->setText(m_locale->formatTime(dt.time(), true));
 }
 
 void TDELocaleSample::slotLocaleChanged()
diff --git a/kcontrol/locale/klocalesample.h b/kcontrol/locale/klocalesample.h
index f4233c3cf..751f9f8f2 100644
--- a/kcontrol/locale/klocalesample.h
+++ b/kcontrol/locale/klocalesample.h
@@ -34,7 +34,7 @@ class TDELocale;
 
 class TDELocaleSample : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   TDELocaleSample(TDELocale *_locale,
                 TQWidget *parent = 0, const char*name = 0);
diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp
index 609e0c9ad..85bb44195 100644
--- a/kcontrol/locale/localemon.cpp
+++ b/kcontrol/locale/localemon.cpp
@@ -55,22 +55,22 @@ TDELocaleConfigMoney::TDELocaleConfigMoney(TDELocale *locale,
   lay->addWidget(m_labMonCurSym, 0, 0);
   m_edMonCurSym = new TQLineEdit(this);
   lay->addWidget(m_edMonCurSym, 0, 1);
-  connect( m_edMonCurSym, TQT_SIGNAL( textChanged(const TQString &) ),
-           TQT_SLOT( slotMonCurSymChanged(const TQString &) ) );
+  connect( m_edMonCurSym, TQ_SIGNAL( textChanged(const TQString &) ),
+           TQ_SLOT( slotMonCurSymChanged(const TQString &) ) );
 
   m_labMonDecSym = new TQLabel(this, I18N_NOOP("Decimal symbol:"));
   lay->addWidget(m_labMonDecSym, 1, 0);
   m_edMonDecSym = new TQLineEdit(this);
   lay->addWidget(m_edMonDecSym, 1, 1);
-  connect( m_edMonDecSym, TQT_SIGNAL( textChanged(const TQString &) ),
-           TQT_SLOT( slotMonDecSymChanged(const TQString &) ) );
+  connect( m_edMonDecSym, TQ_SIGNAL( textChanged(const TQString &) ),
+           TQ_SLOT( slotMonDecSymChanged(const TQString &) ) );
 
   m_labMonThoSep = new TQLabel(this, I18N_NOOP("Thousands separator:"));
   lay->addWidget(m_labMonThoSep, 2, 0);
   m_edMonThoSep = new TQLineEdit(this);
   lay->addWidget(m_edMonThoSep, 2, 1);
-  connect( m_edMonThoSep, TQT_SIGNAL( textChanged(const TQString &) ),
-           TQT_SLOT( slotMonThoSepChanged(const TQString &) ) );
+  connect( m_edMonThoSep, TQ_SIGNAL( textChanged(const TQString &) ),
+           TQ_SLOT( slotMonThoSepChanged(const TQString &) ) );
 
   m_labMonFraDig = new TQLabel(this, I18N_NOOP("Fract digits:"));
   lay->addWidget(m_labMonFraDig, 3, 0);
@@ -78,34 +78,34 @@ TDELocaleConfigMoney::TDELocaleConfigMoney(TDELocale *locale,
   m_inMonFraDig->setRange(0, 10, 1, false);
   lay->addWidget(m_inMonFraDig, 3, 1);
 
-  connect( m_inMonFraDig, TQT_SIGNAL( valueChanged(int) ),
-           TQT_SLOT( slotMonFraDigChanged(int) ) );
+  connect( m_inMonFraDig, TQ_SIGNAL( valueChanged(int) ),
+           TQ_SLOT( slotMonFraDigChanged(int) ) );
 
   TQWidget *vbox = new TQVBox(this);
   lay->addMultiCellWidget(vbox, 4, 4, 0, 1);
   TQVGroupBox *vgrp;
   vgrp = new TQVGroupBox( vbox, I18N_NOOP("Positive") );
   m_chMonPosPreCurSym = new TQCheckBox(vgrp, I18N_NOOP("Prefix currency symbol"));
-  connect( m_chMonPosPreCurSym, TQT_SIGNAL( clicked() ),
-           TQT_SLOT( slotMonPosPreCurSymChanged() ) );
+  connect( m_chMonPosPreCurSym, TQ_SIGNAL( clicked() ),
+           TQ_SLOT( slotMonPosPreCurSymChanged() ) );
 
   TQHBox *hbox;
   hbox = new TQHBox( vgrp );
   m_labMonPosMonSignPos = new TQLabel(hbox, I18N_NOOP("Sign position:"));
   m_cmbMonPosMonSignPos = new TQComboBox(hbox, "signpos");
-  connect( m_cmbMonPosMonSignPos, TQT_SIGNAL( activated(int) ),
-           TQT_SLOT( slotMonPosMonSignPosChanged(int) ) );
+  connect( m_cmbMonPosMonSignPos, TQ_SIGNAL( activated(int) ),
+           TQ_SLOT( slotMonPosMonSignPosChanged(int) ) );
 
   vgrp = new TQVGroupBox( vbox, I18N_NOOP("Negative") );
   m_chMonNegPreCurSym = new TQCheckBox(vgrp, I18N_NOOP("Prefix currency symbol"));
-  connect( m_chMonNegPreCurSym, TQT_SIGNAL( clicked() ),
-           TQT_SLOT( slotMonNegPreCurSymChanged() ) );
+  connect( m_chMonNegPreCurSym, TQ_SIGNAL( clicked() ),
+           TQ_SLOT( slotMonNegPreCurSymChanged() ) );
 
   hbox = new TQHBox( vgrp );
   m_labMonNegMonSignPos = new TQLabel(hbox, I18N_NOOP("Sign position:"));
   m_cmbMonNegMonSignPos = new TQComboBox(hbox, "signpos");
-  connect( m_cmbMonNegMonSignPos, TQT_SIGNAL( activated(int) ),
-           TQT_SLOT( slotMonNegMonSignPosChanged(int) ) );
+  connect( m_cmbMonNegMonSignPos, TQ_SIGNAL( activated(int) ),
+           TQ_SLOT( slotMonNegMonSignPosChanged(int) ) );
 
   // insert some items
   int i = 5;
@@ -260,8 +260,8 @@ void TDELocaleConfigMoney::slotMonNegMonSignPosChanged(int i)
 void TDELocaleConfigMoney::slotTranslate()
 {
   TQObjectList list;
-  list.append(TQT_TQOBJECT(m_cmbMonPosMonSignPos));
-  list.append(TQT_TQOBJECT(m_cmbMonNegMonSignPos));
+  list.append(m_cmbMonPosMonSignPos);
+  list.append(m_cmbMonNegMonSignPos);
 
   TQComboBox *wc;
   for (TQObjectListIt li(list) ; (wc = (TQComboBox *)li.current()) != 0; ++li)
diff --git a/kcontrol/locale/localemon.h b/kcontrol/locale/localemon.h
index d84db0e37..28d1f8f91 100644
--- a/kcontrol/locale/localemon.h
+++ b/kcontrol/locale/localemon.h
@@ -37,7 +37,7 @@ class KLanguageCombo;
 
 class TDELocaleConfigMoney : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDELocaleConfigMoney(TDELocale *locale, TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp
index ca523d2e9..dcec347b1 100644
--- a/kcontrol/locale/localenum.cpp
+++ b/kcontrol/locale/localenum.cpp
@@ -47,32 +47,32 @@ TDELocaleConfigNumber::TDELocaleConfigNumber(TDELocale *locale,
 
   m_labDecSym = new TQLabel(this, I18N_NOOP("&Decimal symbol:"));
   m_edDecSym = new TQLineEdit(this);
-  connect( m_edDecSym, TQT_SIGNAL( textChanged(const TQString &) ),
-	   this, TQT_SLOT( slotDecSymChanged(const TQString &) ) );
+  connect( m_edDecSym, TQ_SIGNAL( textChanged(const TQString &) ),
+	   this, TQ_SLOT( slotDecSymChanged(const TQString &) ) );
   m_labDecSym->setBuddy(m_edDecSym);
 
   m_labThoSep = new TQLabel(this, I18N_NOOP("Tho&usands separator:"));
   m_edThoSep = new TQLineEdit(this);
-  connect( m_edThoSep, TQT_SIGNAL( textChanged(const TQString &) ),
-	   this, TQT_SLOT( slotThoSepChanged(const TQString &) ) );
+  connect( m_edThoSep, TQ_SIGNAL( textChanged(const TQString &) ),
+	   this, TQ_SLOT( slotThoSepChanged(const TQString &) ) );
   m_labThoSep->setBuddy(m_edThoSep);
 
   m_labMonPosSign = new TQLabel(this, I18N_NOOP("Positive si&gn:"));
   m_edMonPosSign = new TQLineEdit(this);
-  connect( m_edMonPosSign, TQT_SIGNAL( textChanged(const TQString &) ),
-	   this, TQT_SLOT( slotMonPosSignChanged(const TQString &) ) );
+  connect( m_edMonPosSign, TQ_SIGNAL( textChanged(const TQString &) ),
+	   this, TQ_SLOT( slotMonPosSignChanged(const TQString &) ) );
   m_labMonPosSign->setBuddy(m_edMonPosSign);
 
   m_labMonNegSign = new TQLabel(this, I18N_NOOP("&Negative sign:"));
   m_edMonNegSign = new TQLineEdit(this);
-  connect( m_edMonNegSign, TQT_SIGNAL( textChanged(const TQString &) ),
-	   this, TQT_SLOT( slotMonNegSignChanged(const TQString &) ) );
+  connect( m_edMonNegSign, TQ_SIGNAL( textChanged(const TQString &) ),
+	   this, TQ_SLOT( slotMonNegSignChanged(const TQString &) ) );
   m_labMonNegSign->setBuddy(m_edMonNegSign);
 
   lay->setColStretch(1, 1);
 
-  connect(this, TQT_SIGNAL(localeChanged()),
-	  TQT_SLOT(slotLocaleChanged()));
+  connect(this, TQ_SIGNAL(localeChanged()),
+	  TQ_SLOT(slotLocaleChanged()));
 }
 
 TDELocaleConfigNumber::~TDELocaleConfigNumber()
diff --git a/kcontrol/locale/localenum.h b/kcontrol/locale/localenum.h
index 1e19b687f..6441821ce 100644
--- a/kcontrol/locale/localenum.h
+++ b/kcontrol/locale/localenum.h
@@ -36,7 +36,7 @@ class KLanguageCombo;
 
 class TDELocaleConfigNumber : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDELocaleConfigNumber( TDELocale *_locale,
diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp
index 6cb8e9a8d..e2fdd910e 100644
--- a/kcontrol/locale/localeother.cpp
+++ b/kcontrol/locale/localeother.cpp
@@ -49,15 +49,15 @@ TDELocaleConfigOther::TDELocaleConfigOther(TDELocale *locale,
   lay->addWidget(m_labPageSize, 0, 0);
   m_combPageSize = new TQComboBox(this);
   lay->addWidget(m_combPageSize, 0, 1);
-  connect( m_combPageSize, TQT_SIGNAL( activated(int) ),
-           TQT_SLOT( slotPageSizeChanged(int) ) );
+  connect( m_combPageSize, TQ_SIGNAL( activated(int) ),
+           TQ_SLOT( slotPageSizeChanged(int) ) );
 
   m_labMeasureSystem = new TQLabel(this, I18N_NOOP("Measure system:"));
   lay->addWidget(m_labMeasureSystem, 1, 0);
   m_combMeasureSystem = new TQComboBox(this);
   lay->addWidget(m_combMeasureSystem, 1, 1);
-  connect( m_combMeasureSystem, TQT_SIGNAL( activated(int) ),
-           TQT_SLOT( slotMeasureSystemChanged(int) ) );
+  connect( m_combMeasureSystem, TQ_SIGNAL( activated(int) ),
+           TQ_SLOT( slotMeasureSystemChanged(int) ) );
 
   m_combPageSize->insertItem(TQString::null);
   m_combPageSize->insertItem(TQString::null);
diff --git a/kcontrol/locale/localeother.h b/kcontrol/locale/localeother.h
index 1ccad292d..68b8964b3 100644
--- a/kcontrol/locale/localeother.h
+++ b/kcontrol/locale/localeother.h
@@ -33,7 +33,7 @@ class TDELocale;
 
 class TDELocaleConfigOther : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDELocaleConfigOther(TDELocale *locale, TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp
index 1e31f14f7..f9622dde5 100644
--- a/kcontrol/locale/localetime.cpp
+++ b/kcontrol/locale/localetime.cpp
@@ -202,8 +202,8 @@ TDELocaleConfigTime::TDELocaleConfigTime(TDELocale *_locale,
 
   m_labCalendarSystem = new TQLabel(this, I18N_NOOP("Calendar system:"));
   m_comboCalendarSystem = new TQComboBox(false, this);
-  connect(m_comboCalendarSystem, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(slotCalendarSystemChanged(int)));
+  connect(m_comboCalendarSystem, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(slotCalendarSystemChanged(int)));
   TQStringList tmpCalendars;
   tmpCalendars << TQString::null << TQString::null;
   m_comboCalendarSystem->insertStringList(tmpCalendars);
@@ -212,29 +212,29 @@ TDELocaleConfigTime::TDELocaleConfigTime(TDELocale *_locale,
   m_comboTimeFmt = new TQComboBox(true, this);
   //m_edTimeFmt = m_comboTimeFmt->lineEdit();
   //m_edTimeFmt = new TQLineEdit(this);
-  connect( m_comboTimeFmt, TQT_SIGNAL( textChanged(const TQString &) ),
-	   this, TQT_SLOT( slotTimeFmtChanged(const TQString &) ) );
+  connect( m_comboTimeFmt, TQ_SIGNAL( textChanged(const TQString &) ),
+	   this, TQ_SLOT( slotTimeFmtChanged(const TQString &) ) );
 
   m_labDateFmt = new TQLabel(this, I18N_NOOP("Date format:"));
   m_comboDateFmt = new TQComboBox(true, this);
-  connect( m_comboDateFmt, TQT_SIGNAL( textChanged(const TQString &) ),
-	   this, TQT_SLOT( slotDateFmtChanged(const TQString &) ) );
+  connect( m_comboDateFmt, TQ_SIGNAL( textChanged(const TQString &) ),
+	   this, TQ_SLOT( slotDateFmtChanged(const TQString &) ) );
 
   m_labDateFmtShort = new TQLabel(this, I18N_NOOP("Short date format:"));
   m_comboDateFmtShort = new TQComboBox(true, this);
-  connect( m_comboDateFmtShort, TQT_SIGNAL( textChanged(const TQString &) ),
-	   this, TQT_SLOT( slotDateFmtShortChanged(const TQString &) ) );
+  connect( m_comboDateFmtShort, TQ_SIGNAL( textChanged(const TQString &) ),
+	   this, TQ_SLOT( slotDateFmtShortChanged(const TQString &) ) );
 
   m_labWeekStartDay = new TQLabel(this, I18N_NOOP("First day of the week:"));
   m_comboWeekStartDay = new TQComboBox(false, this);
-  connect (m_comboWeekStartDay, TQT_SIGNAL(activated(int)),
-           this, TQT_SLOT(slotWeekStartDayChanged(int)));
+  connect (m_comboWeekStartDay, TQ_SIGNAL(activated(int)),
+           this, TQ_SLOT(slotWeekStartDayChanged(int)));
 
   updateWeekDayNames();
 
   m_chDateMonthNamePossessive = new TQCheckBox(this, I18N_NOOP("Use declined form of month name"));
-  connect( m_chDateMonthNamePossessive, TQT_SIGNAL( clicked() ),
-	     TQT_SLOT( slotDateMonthNamePossChanged() ) );
+  connect( m_chDateMonthNamePossessive, TQ_SIGNAL( clicked() ),
+	     TQ_SLOT( slotDateMonthNamePossChanged() ) );
 
   lay->setColStretch(1, 1);
 }
diff --git a/kcontrol/locale/localetime.h b/kcontrol/locale/localetime.h
index 0c34380f7..e44621357 100644
--- a/kcontrol/locale/localetime.h
+++ b/kcontrol/locale/localetime.h
@@ -38,7 +38,7 @@ class StringPair;
 
 class TDELocaleConfigTime : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDELocaleConfigTime( TDELocale *_locale, TQWidget *parent=0, const char *name=0);
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index d2a17ca74..a0562c5fa 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -84,64 +84,64 @@ TDELocaleApplication::TDELocaleApplication(TQWidget *parent, const char* /*name*
   m_sample = new TDELocaleSample(m_locale, m_gbox);
 
   // getting signals from childs
-  connect(m_localemain, TQT_SIGNAL(localeChanged()),
-          this, TQT_SIGNAL(localeChanged()));
-  connect(m_localemain, TQT_SIGNAL(languageChanged()),
-          this, TQT_SIGNAL(languageChanged()));
+  connect(m_localemain, TQ_SIGNAL(localeChanged()),
+          this, TQ_SIGNAL(localeChanged()));
+  connect(m_localemain, TQ_SIGNAL(languageChanged()),
+          this, TQ_SIGNAL(languageChanged()));
 
   // run the slots on the childs
-  connect(this, TQT_SIGNAL(localeChanged()),
-          m_localemain, TQT_SLOT(slotLocaleChanged()));
-  connect(this, TQT_SIGNAL(localeChanged()),
-          m_localenum, TQT_SLOT(slotLocaleChanged()));
-  connect(this, TQT_SIGNAL(localeChanged()),
-          m_localemon, TQT_SLOT(slotLocaleChanged()));
-  connect(this, TQT_SIGNAL(localeChanged()),
-          m_localetime, TQT_SLOT(slotLocaleChanged()));
-  connect(this, TQT_SIGNAL(localeChanged()),
-          m_localeother, TQT_SLOT(slotLocaleChanged()));
+  connect(this, TQ_SIGNAL(localeChanged()),
+          m_localemain, TQ_SLOT(slotLocaleChanged()));
+  connect(this, TQ_SIGNAL(localeChanged()),
+          m_localenum, TQ_SLOT(slotLocaleChanged()));
+  connect(this, TQ_SIGNAL(localeChanged()),
+          m_localemon, TQ_SLOT(slotLocaleChanged()));
+  connect(this, TQ_SIGNAL(localeChanged()),
+          m_localetime, TQ_SLOT(slotLocaleChanged()));
+  connect(this, TQ_SIGNAL(localeChanged()),
+          m_localeother, TQ_SLOT(slotLocaleChanged()));
 
   // keep the example up to date
   // NOTE: this will make the sample be updated 6 times the first time
   // because combo boxes++ emits the change signal not only when the user changes
   // it, but also when it's changed by the program.
-  connect(m_localenum, TQT_SIGNAL(localeChanged()),
-          m_sample, TQT_SLOT(slotLocaleChanged()));
-  connect(m_localemon, TQT_SIGNAL(localeChanged()),
-          m_sample, TQT_SLOT(slotLocaleChanged()));
-  connect(m_localetime, TQT_SIGNAL(localeChanged()),
-          m_sample, TQT_SLOT(slotLocaleChanged()));
+  connect(m_localenum, TQ_SIGNAL(localeChanged()),
+          m_sample, TQ_SLOT(slotLocaleChanged()));
+  connect(m_localemon, TQ_SIGNAL(localeChanged()),
+          m_sample, TQ_SLOT(slotLocaleChanged()));
+  connect(m_localetime, TQ_SIGNAL(localeChanged()),
+          m_sample, TQ_SLOT(slotLocaleChanged()));
   // No examples for this yet
-  //connect(m_localeother, TQT_SIGNAL(slotLocaleChanged()),
-  //m_sample, TQT_SLOT(slotLocaleChanged()));
-  connect(this, TQT_SIGNAL(localeChanged()),
-          m_sample, TQT_SLOT(slotLocaleChanged()));
+  //connect(m_localeother, TQ_SIGNAL(slotLocaleChanged()),
+  //m_sample, TQ_SLOT(slotLocaleChanged()));
+  connect(this, TQ_SIGNAL(localeChanged()),
+          m_sample, TQ_SLOT(slotLocaleChanged()));
 
   // make sure we always have translated interface
-  connect(this, TQT_SIGNAL(languageChanged()),
-          this, TQT_SLOT(slotTranslate()));
-  connect(this, TQT_SIGNAL(languageChanged()),
-          m_localemain, TQT_SLOT(slotTranslate()));
-  connect(this, TQT_SIGNAL(languageChanged()),
-          m_localenum, TQT_SLOT(slotTranslate()));
-  connect(this, TQT_SIGNAL(languageChanged()),
-          m_localemon, TQT_SLOT(slotTranslate()));
-  connect(this, TQT_SIGNAL(languageChanged()),
-          m_localetime, TQT_SLOT(slotTranslate()));
-  connect(this, TQT_SIGNAL(languageChanged()),
-          m_localeother, TQT_SLOT(slotTranslate()));
+  connect(this, TQ_SIGNAL(languageChanged()),
+          this, TQ_SLOT(slotTranslate()));
+  connect(this, TQ_SIGNAL(languageChanged()),
+          m_localemain, TQ_SLOT(slotTranslate()));
+  connect(this, TQ_SIGNAL(languageChanged()),
+          m_localenum, TQ_SLOT(slotTranslate()));
+  connect(this, TQ_SIGNAL(languageChanged()),
+          m_localemon, TQ_SLOT(slotTranslate()));
+  connect(this, TQ_SIGNAL(languageChanged()),
+          m_localetime, TQ_SLOT(slotTranslate()));
+  connect(this, TQ_SIGNAL(languageChanged()),
+          m_localeother, TQ_SLOT(slotTranslate()));
 
   // mark it as changed when we change it.
-  connect(m_localemain, TQT_SIGNAL(localeChanged()),
-          TQT_SLOT(slotChanged()));
-  connect(m_localenum, TQT_SIGNAL(localeChanged()),
-          TQT_SLOT(slotChanged()));
-  connect(m_localemon, TQT_SIGNAL(localeChanged()),
-          TQT_SLOT(slotChanged()));
-  connect(m_localetime, TQT_SIGNAL(localeChanged()),
-          TQT_SLOT(slotChanged()));
-  connect(m_localeother, TQT_SIGNAL(localeChanged()),
-          TQT_SLOT(slotChanged()));
+  connect(m_localemain, TQ_SIGNAL(localeChanged()),
+          TQ_SLOT(slotChanged()));
+  connect(m_localenum, TQ_SIGNAL(localeChanged()),
+          TQ_SLOT(slotChanged()));
+  connect(m_localemon, TQ_SIGNAL(localeChanged()),
+          TQ_SLOT(slotChanged()));
+  connect(m_localetime, TQ_SIGNAL(localeChanged()),
+          TQ_SLOT(slotChanged()));
+  connect(m_localeother, TQ_SIGNAL(localeChanged()),
+          TQ_SLOT(slotChanged()));
 
   load();
 }
@@ -244,7 +244,7 @@ void TDELocaleApplication::slotTranslate()
   // The untranslated string for TQLabel are stored in
   // the name() so we use that when retranslating
   TQObject *wc;
-  TQObjectList *list = queryList(TQWIDGET_OBJECT_NAME_STRING);
+  TQObjectList *list = queryList("TQWidget");
   TQObjectListIt it(*list);
   while ( (wc = it.current()) != 0 )
   {
@@ -260,15 +260,15 @@ void TDELocaleApplication::slotTranslate()
     if (::qstrcmp(wc->name(), "unnamed") == 0)
       continue;
 
-    if (::qstrcmp(wc->className(), TQLABEL_OBJECT_NAME_STRING) == 0)
+    if (::qstrcmp(wc->className(), "TQLabel") == 0)
       ((TQLabel *)wc)->setText( m_locale->translate( wc->name() ) );
-    else if (::qstrcmp(wc->className(), TQGROUPBOX_OBJECT_NAME_STRING) == 0 ||
-             ::qstrcmp(wc->className(), TQVGROUPBOX_OBJECT_NAME_STRING) == 0)
+    else if (::qstrcmp(wc->className(), "TQGroupBox") == 0 ||
+             ::qstrcmp(wc->className(), "TQVGroupBox") == 0)
       ((TQGroupBox *)wc)->setTitle( m_locale->translate( wc->name() ) );
-    else if (::qstrcmp(wc->className(), TQPUSHBUTTON_OBJECT_NAME_STRING) == 0 ||
+    else if (::qstrcmp(wc->className(), "TQPushButton") == 0 ||
              ::qstrcmp(wc->className(), "KMenuButton") == 0)
       ((TQPushButton *)wc)->setText( m_locale->translate( wc->name() ) );
-    else if (::qstrcmp(wc->className(), TQCHECKBOX_OBJECT_NAME_STRING) == 0)
+    else if (::qstrcmp(wc->className(), "TQCheckBox") == 0)
       ((TQCheckBox *)wc)->setText( m_locale->translate( wc->name() ) );
   }
   delete list;
diff --git a/kcontrol/locale/toplevel.h b/kcontrol/locale/toplevel.h
index abc1a47f9..33c0ce5a5 100644
--- a/kcontrol/locale/toplevel.h
+++ b/kcontrol/locale/toplevel.h
@@ -42,7 +42,7 @@ class TDELocaleSample;
 
 class TDELocaleApplication : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDELocaleApplication(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp
index 2ff9d2c3c..41512a183 100644
--- a/kcontrol/nics/nic.cpp
+++ b/kcontrol/nics/nic.cpp
@@ -103,8 +103,8 @@ KCMNic::KCMNic(TQWidget *parent, const char * name, const TQStringList &)
    hbox->addStretch(1);
    TQTimer* timer=new TQTimer(this);
    timer->start(60000);
-   connect(m_updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(update()));
-   connect(timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update()));
+   connect(m_updateButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(update()));
+   connect(timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update()));
    update();
    TDEAboutData *about =
    new TDEAboutData(I18N_NOOP("kcminfo"),
diff --git a/kcontrol/nics/nic.h b/kcontrol/nics/nic.h
index f9bc2e082..aab4abb00 100644
--- a/kcontrol/nics/nic.h
+++ b/kcontrol/nics/nic.h
@@ -29,7 +29,7 @@ class TQListView;
 
 class KCMNic:public TDECModule
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       KCMNic(TQWidget *parent=0, const char * name=0, const TQStringList &list = TQStringList( ));
 
diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp
index 84959e34d..c6d1d9068 100644
--- a/kcontrol/performance/kcmperformance.cpp
+++ b/kcontrol/performance/kcmperformance.cpp
@@ -52,11 +52,11 @@ Config::Config( TQWidget* parent_P, const char* )
     tabs = new TQTabWidget( this );
     konqueror_widget = new Konqueror( tabs );
     konqueror_widget->layout()->setMargin( KDialog::marginHint() );
-    connect( konqueror_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed()));
+    connect( konqueror_widget, TQ_SIGNAL( changed()), TQ_SLOT( changed()));
     tabs->addTab( konqueror_widget, i18n( "Konqueror" ));
     system_widget = new SystemWidget( tabs );
     system_widget->layout()->setMargin( KDialog::marginHint() );
-    connect( system_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed()));
+    connect( system_widget, TQ_SIGNAL( changed()), TQ_SLOT( changed()));
     tabs->addTab( system_widget, i18n( "System" ));
     topLayout->add( tabs );
     load();
@@ -110,7 +110,7 @@ KonquerorConfig::KonquerorConfig( TQWidget* parent_P, const char* )
 
     TQVBoxLayout *topLayout = new TQVBoxLayout( this );
     widget = new Konqueror( this );
-    connect( widget, TQT_SIGNAL( changed()), TQT_SLOT( changed()));
+    connect( widget, TQ_SIGNAL( changed()), TQ_SLOT( changed()));
     topLayout->add( widget );
     load();
     }
diff --git a/kcontrol/performance/kcmperformance.h b/kcontrol/performance/kcmperformance.h
index 7e0660c60..fff281472 100644
--- a/kcontrol/performance/kcmperformance.h
+++ b/kcontrol/performance/kcmperformance.h
@@ -30,7 +30,7 @@ class SystemWidget;
 class Config
     : public TDECModule
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Config( TQWidget* parent_P, const char* name_P );
         virtual void load();
@@ -47,7 +47,7 @@ class Config
 class KonquerorConfig
     : public TDECModule
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         KonquerorConfig( TQWidget* parent_P, const char* name_P );
         virtual void load();
diff --git a/kcontrol/performance/konqueror.cpp b/kcontrol/performance/konqueror.cpp
index 8cd82699b..199522729 100644
--- a/kcontrol/performance/konqueror.cpp
+++ b/kcontrol/performance/konqueror.cpp
@@ -51,9 +51,9 @@ Konqueror::Konqueror( TQWidget* parent_P )
               "thus reducing resource requirements."
               "<p>Be aware that this also means that, if something goes wrong, "
               "all your browsing windows will be closed simultaneously." ));
-    connect( rb_never_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
-    connect( rb_file_browsing_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
-    connect( rb_always_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
+    connect( rb_never_reuse, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed()));
+    connect( rb_file_browsing_reuse, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed()));
+    connect( rb_always_reuse, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed()));
     rb_file_browsing_reuse->setChecked( true );
 
     TQString tmp =
@@ -77,10 +77,10 @@ Konqueror::Konqueror( TQWidget* parent_P )
               "so that windows will always open quickly."
               "<p><b>Warning:</b> In some cases, it is actually possible that this will "
               "reduce perceived performance." ));
-    connect( sb_preload_count, TQT_SIGNAL( valueChanged( int )), TQT_SLOT( preload_count_changed( int )));
-    connect( sb_preload_count, TQT_SIGNAL( valueChanged( int )), TQT_SIGNAL( changed()));
-    connect( cb_preload_on_startup, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
-    connect( cb_always_have_preloaded, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
+    connect( sb_preload_count, TQ_SIGNAL( valueChanged( int )), TQ_SLOT( preload_count_changed( int )));
+    connect( sb_preload_count, TQ_SIGNAL( valueChanged( int )), TQ_SIGNAL( changed()));
+    connect( cb_preload_on_startup, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed()));
+    connect( cb_always_have_preloaded, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed()));
     defaults();
     }
 
diff --git a/kcontrol/performance/konqueror.h b/kcontrol/performance/konqueror.h
index e948f6b7a..bb6fb86c3 100644
--- a/kcontrol/performance/konqueror.h
+++ b/kcontrol/performance/konqueror.h
@@ -27,7 +27,7 @@ namespace KCMPerformance
 class Konqueror
     : public Konqueror_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Konqueror( TQWidget* parent_P = NULL );
         void load(bool useDefaults);
diff --git a/kcontrol/performance/system.cpp b/kcontrol/performance/system.cpp
index 056e78193..43e8c4c43 100644
--- a/kcontrol/performance/system.cpp
+++ b/kcontrol/performance/system.cpp
@@ -51,7 +51,7 @@ SystemWidget::SystemWidget( TQWidget* parent_P )
               " or turn on the developer mode for the crash handler).</p>" );
     TQWhatsThis::add( cb_disable_tdebuildsycoca, tmp );
     TQWhatsThis::add( label_tdebuildsycoca, tmp );
-    connect( cb_disable_tdebuildsycoca, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
+    connect( cb_disable_tdebuildsycoca, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed()));
     defaults();
     }
 
diff --git a/kcontrol/performance/system.h b/kcontrol/performance/system.h
index cb570b506..50120aedf 100644
--- a/kcontrol/performance/system.h
+++ b/kcontrol/performance/system.h
@@ -29,7 +29,7 @@ namespace KCMPerformance
 class SystemWidget
     : public System_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         SystemWidget( TQWidget* parent_P = NULL );
         void load( bool useDefaults );
diff --git a/kcontrol/privacy/kprivacymanager.h b/kcontrol/privacy/kprivacymanager.h
index 70d7b77cf..b0649c7c2 100644
--- a/kcontrol/privacy/kprivacymanager.h
+++ b/kcontrol/privacy/kprivacymanager.h
@@ -29,7 +29,7 @@
 
 class KPrivacyManager : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     KPrivacyManager();
 
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index 71fc3313b..0aa05a90e 100644
--- a/kcontrol/privacy/privacy.cpp
+++ b/kcontrol/privacy/privacy.cpp
@@ -126,7 +126,7 @@ Privacy::Privacy(TQWidget *parent, const char *name)
   clearFavIcons->setText(1, i18n("Clears the FavIcons cached from visited websites"));
   clearKPDFDocData->setText(1, i18n("Clears all KPDF document data files"));
 
-  connect(sw, TQT_SIGNAL(selectionChanged()), TQT_SLOT(changed()));
+  connect(sw, TQ_SIGNAL(selectionChanged()), TQ_SLOT(changed()));
 
   // store all entries in a list for easy access later on
   checklist.append(clearThumbnails);
@@ -141,9 +141,9 @@ Privacy::Privacy(TQWidget *parent, const char *name)
   checklist.append(clearFavIcons);
   checklist.append(clearKPDFDocData);
 
-  connect(cleaningDialog->cleanupButton, TQT_SIGNAL(clicked()), TQT_SLOT(cleanup()));
-  connect(cleaningDialog->selectAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectAll()));
-  connect(cleaningDialog->selectNoneButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectNone()));
+  connect(cleaningDialog->cleanupButton, TQ_SIGNAL(clicked()), TQ_SLOT(cleanup()));
+  connect(cleaningDialog->selectAllButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectAll()));
+  connect(cleaningDialog->selectNoneButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectNone()));
 
   load();
 }
diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h
index 74d199dcf..808bf3f98 100644
--- a/kcontrol/privacy/privacy.h
+++ b/kcontrol/privacy/privacy.h
@@ -30,7 +30,7 @@
 
 class Privacy: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Privacy( TQWidget *parent=0, const char *name=0 );
diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h
index 662817303..1b6a5faac 100644
--- a/kcontrol/randr/configdialog.h
+++ b/kcontrol/randr/configdialog.h
@@ -41,7 +41,7 @@ class ConfigDialog;
 
 class ConfigDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ConfigDialog(TDEGlobalAccel *accel, bool isApplet );
diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp
index 1aa0f58df..140234a90 100644
--- a/kcontrol/randr/ktimerdialog.cpp
+++ b/kcontrol/randr/ktimerdialog.cpp
@@ -35,9 +35,9 @@
 #include "ktimerdialog.h"
 #include "ktimerdialog.moc"
 
-KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent,
+KTimerDialog::KTimerDialog( int msec, TimerStyle style, TQWidget *parent,
                  const char *name, bool modal,
-                 const QString &caption,
+                 const TQString &caption,
                  int buttonMask, ButtonCode defaultButton,
                  bool separator,
                  const KGuiItem &user1,
@@ -56,8 +56,8 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent,
     if ( buttonMask & Cancel )
         buttonOnTimeout = Cancel;
 
-    connect( totalTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotInternalTimeout() ) );
-    connect( updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateTime() ) );
+    connect( totalTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotInternalTimeout() ) );
+    connect( updateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotUpdateTime() ) );
 
     // create the widgets
     mainWidget = new QVBox( this, "mainWidget" );
@@ -90,7 +90,7 @@ int KTimerDialog::exec()
     return KDialogBase::exec();
 }
 
-void KTimerDialog::setMainWidget( QWidget *widget )
+void KTimerDialog::setMainWidget( TQWidget *widget )
 {
     // yuck, here goes.
     QVBox *newWidget = new QVBox( this );
diff --git a/kcontrol/randr/ktimerdialog.h b/kcontrol/randr/ktimerdialog.h
index 23b4a92b0..74891d048 100644
--- a/kcontrol/randr/ktimerdialog.h
+++ b/kcontrol/randr/ktimerdialog.h
@@ -44,7 +44,7 @@ class QLabel;
  */
 class KTimerDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -67,9 +67,9 @@ class KTimerDialog : public KDialogBase
      *
      * For the rest of the arguments, See @see KDialogBase .
      */
-    KTimerDialog( int msec, TimerStyle style=CountDown, QWidget *parent=0,
+    KTimerDialog( int msec, TimerStyle style=CountDown, TQWidget *parent=0,
                  const char *name=0, bool modal=true,
-                 const QString &caption=QString::null,
+                 const TQString &caption=TQString::null,
                  int buttonMask=Ok|Apply|Cancel, ButtonCode defaultButton=Ok,
                  bool separator=false,
                  const KGuiItem &user1=KGuiItem(),
@@ -117,7 +117,7 @@ class KTimerDialog : public KDialogBase
      * Overridden function which is used to set the main widget of the dialog.
      * @see KDialogBase::setMainWidget.
      */
-    void setMainWidget( QWidget *widget );
+    void setMainWidget( TQWidget *widget );
 
   signals:
     /**
diff --git a/kcontrol/randr/tderandrapp.cpp b/kcontrol/randr/tderandrapp.cpp
index e2a4b46f2..97e602496 100644
--- a/kcontrol/randr/tderandrapp.cpp
+++ b/kcontrol/randr/tderandrapp.cpp
@@ -28,7 +28,7 @@
 KRandRApp::KRandRApp()
 	: m_tray(new KRandRSystemTray(0L, "RANDRTray"))
 {
-	connect(&m_eventMergingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(handleX11ConfigChangeEvent()));
+	connect(&m_eventMergingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(handleX11ConfigChangeEvent()));
 	m_tray->show();
 }
 
diff --git a/kcontrol/randr/tderandrapp.h b/kcontrol/randr/tderandrapp.h
index 004da6294..422c0f568 100644
--- a/kcontrol/randr/tderandrapp.h
+++ b/kcontrol/randr/tderandrapp.h
@@ -26,7 +26,7 @@ class KRandRSystemTray;
 
 class KRandRApp : public KUniqueApplication
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KRandRApp();
diff --git a/kcontrol/randr/tderandrbindings.cpp b/kcontrol/randr/tderandrbindings.cpp
index b95441f08..a5ad3fe6d 100644
--- a/kcontrol/randr/tderandrbindings.cpp
+++ b/kcontrol/randr/tderandrbindings.cpp
@@ -18,7 +18,7 @@
 */
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
 #else
 # define DEF( name, key3, key4, fnSlot ) \
    keys->insert( name, i18n(name), TQString(), key3, key4 )
diff --git a/kcontrol/randr/tderandrmodule.cpp b/kcontrol/randr/tderandrmodule.cpp
index 11263bbf4..f13a863b9 100644
--- a/kcontrol/randr/tderandrmodule.cpp
+++ b/kcontrol/randr/tderandrmodule.cpp
@@ -100,7 +100,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis
         screenLabel->setBuddy( m_screenSelector );
 	TQWhatsThis::add(m_screenSelector, i18n("The screen whose settings you would like to change can be selected using this drop-down list."));
 
-	connect(m_screenSelector, TQT_SIGNAL(activated(int)), TQT_SLOT(slotScreenChanged(int)));
+	connect(m_screenSelector, TQ_SIGNAL(activated(int)), TQ_SLOT(slotScreenChanged(int)));
 
 	if (numScreens() <= 1)
 		m_screenSelector->setEnabled(false);
@@ -110,7 +110,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis
 	TQLabel *sizeLabel = new TQLabel(i18n("Screen size:"), sizeBox);
 	m_sizeCombo = new KComboBox(sizeBox);
 	TQWhatsThis::add(m_sizeCombo, i18n("The size, otherwise known as the resolution, of your screen can be selected from this drop-down list."));
-	connect(m_sizeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSizeChanged(int)));
+	connect(m_sizeCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSizeChanged(int)));
         sizeLabel->setBuddy( m_sizeCombo );
 
 	TQHBox* refreshBox = new TQHBox(this);
@@ -118,10 +118,10 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis
 	TQLabel *rateLabel = new TQLabel(i18n("Refresh rate:"), refreshBox);
 	m_refreshRates = new KComboBox(refreshBox);
 	TQWhatsThis::add(m_refreshRates, i18n("The refresh rate of your screen can be selected from this drop-down list."));
-	connect(m_refreshRates, TQT_SIGNAL(activated(int)), TQT_SLOT(slotRefreshChanged(int)));
+	connect(m_refreshRates, TQ_SIGNAL(activated(int)), TQ_SLOT(slotRefreshChanged(int)));
         rateLabel->setBuddy( m_refreshRates );
 
-	m_rotationGroup = new TQButtonGroup(2, Qt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this);
+	m_rotationGroup = new TQButtonGroup(2, TQt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this);
 	topLayout->addWidget(m_rotationGroup);
 	m_rotationGroup->setRadioButtonExclusive(true);
 	TQWhatsThis::add(m_rotationGroup, i18n("The options in this section allow you to change the rotation of your screen."));
@@ -129,14 +129,14 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis
 	m_applyOnStartup = new TQCheckBox(i18n("Apply settings on TDE startup"), this);
 	topLayout->addWidget(m_applyOnStartup);
 	TQWhatsThis::add(m_applyOnStartup, i18n("If this option is enabled the size and orientation settings will be used when TDE starts."));
-	connect(m_applyOnStartup, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged()));
+	connect(m_applyOnStartup, TQ_SIGNAL(clicked()), TQ_SLOT(setChanged()));
 
 	TQHBox* syncBox = new TQHBox(this);
 	syncBox->layout()->addItem(new TQSpacerItem(20, 1, TQSizePolicy::Maximum));
 	m_syncTrayApp = new TQCheckBox(i18n("Allow tray application to change startup settings"), syncBox);
 	topLayout->addWidget(syncBox);
 	TQWhatsThis::add(m_syncTrayApp, i18n("If this option is enabled, options set by the system tray applet will be saved and loaded when TDE starts instead of being temporary."));
-	connect(m_syncTrayApp, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged()));
+	connect(m_syncTrayApp, TQ_SIGNAL(clicked()), TQ_SLOT(setChanged()));
 
 	topLayout->addStretch(1);
 
@@ -155,11 +155,11 @@ void KRandRModule::addRotationButton(int thisRotation, bool checkbox)
 	if (!checkbox) {
 		TQRadioButton* thisButton = new TQRadioButton(RandRScreen::rotationName(thisRotation), m_rotationGroup);
 		thisButton->setEnabled(thisRotation & currentScreen()->rotations());
-		connect(thisButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRotationChanged()));
+		connect(thisButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRotationChanged()));
 	} else {
 		TQCheckBox* thisButton = new TQCheckBox(RandRScreen::rotationName(thisRotation), m_rotationGroup);
 		thisButton->setEnabled(thisRotation & currentScreen()->rotations());
-		connect(thisButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRotationChanged()));
+		connect(thisButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRotationChanged()));
 	}
 }
 
diff --git a/kcontrol/randr/tderandrmodule.h b/kcontrol/randr/tderandrmodule.h
index 65131ee26..73a13b623 100644
--- a/kcontrol/randr/tderandrmodule.h
+++ b/kcontrol/randr/tderandrmodule.h
@@ -27,7 +27,7 @@ class TQCheckBox;
 
 class KRandRModule : public TDECModule, public KRandrSimpleAPI
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KRandRModule(TQWidget *parent, const char *name, const TQStringList& _args);
diff --git a/kcontrol/randr/tderandrpassivepopup.cpp b/kcontrol/randr/tderandrpassivepopup.cpp
index 5d2010f94..b0e78087c 100644
--- a/kcontrol/randr/tderandrpassivepopup.cpp
+++ b/kcontrol/randr/tderandrpassivepopup.cpp
@@ -28,7 +28,7 @@
 KRandrPassivePopup::KRandrPassivePopup( TQWidget *parent, const char *name, WFlags f )
     : KPassivePopup( parent, name, f )
     {
-    connect( &update_timer, TQT_SIGNAL( timeout()), TQT_SLOT( slotPositionSelf()));
+    connect( &update_timer, TQ_SIGNAL( timeout()), TQ_SLOT( slotPositionSelf()));
     }
     
 KRandrPassivePopup* KRandrPassivePopup::message( const TQString &caption, const TQString &text,
@@ -94,8 +94,8 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P )
 bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e )
     {
     if( e->type() == TQEvent::Move && o->isWidgetType()
-	&& watched_widgets.contains( TQT_TQWIDGET( o )))
-        TQTimer::singleShot( 0, this, TQT_SLOT( slotPositionSelf()));
+	&& watched_widgets.contains( static_cast<TQWidget*>( o )))
+        TQTimer::singleShot( 0, this, TQ_SLOT( slotPositionSelf()));
     return false;
     }
 
diff --git a/kcontrol/randr/tderandrpassivepopup.h b/kcontrol/randr/tderandrpassivepopup.h
index 3b1d4b4f6..87dac8c0d 100644
--- a/kcontrol/randr/tderandrpassivepopup.h
+++ b/kcontrol/randr/tderandrpassivepopup.h
@@ -27,7 +27,7 @@
 class KRandrPassivePopup
     : public KPassivePopup
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
 	static KRandrPassivePopup *message( const TQString &caption, const TQString &text,
 	    const TQPixmap &icon, TQWidget *parent, const char *name=0, int timeout = -1 );
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index 647f0eca7..a5613eb2e 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -59,15 +59,15 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 	, m_help(new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection()))
 {
 	TDEPopupMenu *help = m_help->menu();
-	help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents()));
+	help->connectItem(KHelpMenu::menuHelpContents, this, TQ_SLOT(slotHelpContents()));
 	setPixmap(KSystemTray::loadIcon("randr"));
-	setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-	connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
+	setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
+	connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(_quit()));
 	TQToolTip::add(this, i18n("Screen resize & rotate"));
 	my_parent = parent;
 
 	//printf("Reading configuration...\n");
-	globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+	globalKeys = new TDEGlobalAccel(this);
 	TDEGlobalAccel* keys = globalKeys;
 #include "tderandrbindings.cpp"
 	// the keys need to be read from kdeglobals, not kickerrc
@@ -75,10 +75,10 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 	globalKeys->setEnabled(true);
 	globalKeys->updateConnections();
 
-	connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
+	connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
 
 #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
-//	connect(this, TQT_SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), TQT_SLOT( desktopResized()));
+//	connect(this, TQ_SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), TQ_SLOT( desktopResized()));
 #endif
 
 	randr_display = XOpenDisplay(NULL);
@@ -98,12 +98,12 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 
 #ifdef WITH_TDEHWLIB
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*)));
 #endif
 }
 
 /*!
- * \b TQT_SLOT which called if tderandrtray is exited by the user. In this case the user
+ * \b TQ_SLOT which called if tderandrtray is exited by the user. In this case the user
  * is asked through a yes/no box if "KRandRTray should start automatically on log in" and the
  * result is written to the KDE configfile.
  */
@@ -147,7 +147,7 @@ void KRandRSystemTray::showEvent ( TQShowEvent * )
 void KRandRSystemTray::mousePressEvent(TQMouseEvent* e)
 {
 	// Popup the context menu with left-click
-	if (e->button() == Qt::LeftButton) {
+	if (e->button() == TQt::LeftButton) {
 		contextMenuAboutToShow(contextMenu());
 		contextMenu()->popup(e->globalPos());
 		e->accept();
@@ -271,7 +271,7 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu)
 				m_screenPopups.append(subMenu);
 				populateMenu(subMenu);
 				lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu);
-				connect(subMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotScreenActivated()));
+				connect(subMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotScreenActivated()));
 			}
 		}
 
@@ -293,7 +293,7 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu)
 			menu->setItemChecked(lastIndex, true);
 		}
 		menu->setItemEnabled(lastIndex, t_config->readBoolEntry("EnableICC", false));
-		menu->connectItem(lastIndex, this, TQT_SLOT(slotColorProfileChanged(int)));
+		menu->connectItem(lastIndex, this, TQ_SLOT(slotColorProfileChanged(int)));
 	}
 
 	if (valid) {
@@ -303,10 +303,10 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu)
 		if (!displayProfiles.isEmpty()) {
 			menu->insertTitle(SmallIcon("background"), i18n("Display Profiles"));
 			lastIndex = menu->insertItem(SmallIcon("bookmark"), "<default>");
-			menu->connectItem(lastIndex, this, TQT_SLOT(slotDisplayProfileChanged(int)));
+			menu->connectItem(lastIndex, this, TQ_SLOT(slotDisplayProfileChanged(int)));
 			for (TQStringList::Iterator t(displayProfiles.begin()); t != displayProfiles.end(); ++t) {
 				lastIndex = menu->insertItem(SmallIcon("bookmark"), *t);
-				menu->connectItem(lastIndex, this, TQT_SLOT(slotDisplayProfileChanged(int)));
+				menu->connectItem(lastIndex, this, TQ_SLOT(slotDisplayProfileChanged(int)));
 			}
 		}
 	}
@@ -314,17 +314,17 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu)
 	menu->insertTitle(SmallIcon("randr"), i18n("Global Configuration"));
 
 	TDEAction *actColors = new TDEAction( i18n( "Configure Displays..." ),
-		SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDisplayConfig() ),
+		SmallIconSet( "configure" ), TDEShortcut(), this, TQ_SLOT( slotDisplayConfig() ),
 		actionCollection() );
 	actColors->plug( menu );
 
 // 	TDEAction *actPrefs = new TDEAction( i18n( "Configure Display..." ),
-// 		SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotPrefs() ),
+// 		SmallIconSet( "configure" ), TDEShortcut(), this, TQ_SLOT( slotPrefs() ),
 // 		actionCollection() );
 // 	actPrefs->plug( menu );
 
 	TDEAction *actSKeys = new TDEAction( i18n( "Configure Shortcut Keys..." ),
-		SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ),
+		SmallIconSet( "configure" ), TDEShortcut(), this, TQ_SLOT( slotSKeys() ),
 		actionCollection() );
 	actSKeys->plug( menu );
 
@@ -442,7 +442,7 @@ void KRandRSystemTray::populateMenu(TDEPopupMenu* menu)
 			menu->setItemChecked(lastIndex, true);
 
 		menu->setItemParameter(lastIndex, highestIndex);
-		menu->connectItem(lastIndex, this, TQT_SLOT(slotResolutionChanged(int)));
+		menu->connectItem(lastIndex, this, TQ_SLOT(slotResolutionChanged(int)));
 	}
 	delete [] sizeSort;
 	sizeSort = 0L;
@@ -460,7 +460,7 @@ void KRandRSystemTray::populateMenu(TDEPopupMenu* menu)
 					menu->setItemChecked(lastIndex, true);
 
 				menu->setItemParameter(lastIndex, 1 << i);
-				menu->connectItem(lastIndex, this, TQT_SLOT(slotOrientationChanged(int)));
+				menu->connectItem(lastIndex, this, TQ_SLOT(slotOrientationChanged(int)));
 			}
 		}
 	}
@@ -478,7 +478,7 @@ void KRandRSystemTray::populateMenu(TDEPopupMenu* menu)
 			menu->setItemChecked(lastIndex, true);
 
 		menu->setItemParameter(lastIndex, i);
-		menu->connectItem(lastIndex, this, TQT_SLOT(slotRefreshRateChanged(int)));
+		menu->connectItem(lastIndex, this, TQ_SLOT(slotRefreshRateChanged(int)));
 	}
 }
 
@@ -764,7 +764,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
 
 			lastIndex = menu->insertItem(i18n("%1 (Active)").arg(output_name));
 			menu->setItemChecked(lastIndex, true);
-			menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int)));
+			menu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int)));
 			menu->setItemParameter(lastIndex, i);
 
 			connected_displays++;
@@ -786,7 +786,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
 
 			lastIndex = menu->insertItem(i18n("%1 (Connected, Inactive)").arg(output_name));
 			menu->setItemChecked(lastIndex, false);
-			menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int)));
+			menu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int)));
 			menu->setItemParameter(lastIndex, i);
 
 			connected_displays++;
@@ -809,7 +809,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
 			lastIndex = menu->insertItem(i18n("%1 (Disconnected, Inactive)").arg(output_name));
 			menu->setItemChecked(lastIndex, false);
 			menu->setItemEnabled(lastIndex, false);
-			menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int)));
+			menu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int)));
 			menu->setItemParameter(lastIndex, i);
 		}
 
@@ -817,7 +817,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
 		if (connected_displays < 2) {
 			menu->setItemEnabled(lastIndex, false);
 		}
-		menu->connectItem(lastIndex, this, TQT_SLOT(slotCycleDisplays()));
+		menu->connectItem(lastIndex, this, TQ_SLOT(slotCycleDisplays()));
 	}
 }
 
diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h
index ef6fd7bd0..af0d3b1f8 100644
--- a/kcontrol/randr/tderandrtray.h
+++ b/kcontrol/randr/tderandrtray.h
@@ -37,7 +37,7 @@ class TDEPopupMenu;
 
 class KRandRSystemTray :  public KSystemTray, public KRandrSimpleAPI
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KRandRSystemTray(TQWidget* parent = 0, const char *name = 0);
diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp
index c25867fa5..b4553c6a8 100644
--- a/kcontrol/samba/kcmsambaimports.cpp
+++ b/kcontrol/samba/kcmsambaimports.cpp
@@ -56,7 +56,7 @@ ImportsView::ImportsView(TQWidget * parent, TDEConfig *config, const char * name
       " resource is mounted.") );
  
     timer.start(10000);
-    TQObject::connect(&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateList()));
+    TQObject::connect(&timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateList()));
     updateList();
 }
 
diff --git a/kcontrol/samba/kcmsambaimports.h b/kcontrol/samba/kcmsambaimports.h
index 0897af021..7b8732c9f 100644
--- a/kcontrol/samba/kcmsambaimports.h
+++ b/kcontrol/samba/kcmsambaimports.h
@@ -30,7 +30,7 @@
 
 class ImportsView: public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       ImportsView(TQWidget *parent, TDEConfig *config=0, const char * name=0);
       virtual ~ImportsView() {};
diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp
index c25a01113..a2a03fed3 100644
--- a/kcontrol/samba/kcmsambalog.cpp
+++ b/kcontrol/samba/kcmsambalog.cpp
@@ -59,7 +59,7 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name)
    subLayout->addWidget(&showConnClose,1,0);
    subLayout->addWidget(&showFileOpen,0,1);
    subLayout->addWidget(&showFileClose,1,1);
-   mainLayout->addWidget(&updateButton,0,Qt::AlignLeft);
+   mainLayout->addWidget(&updateButton,0,TQt::AlignLeft);
 
    TQWhatsThis::add( &logFileName, i18n("This page presents the contents of"
      " your samba log file in a friendly layout. Check that the correct log"
@@ -91,7 +91,7 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name)
    logFileName.setURL("/var/log/samba.log");
 
    viewHistory.setAllColumnsShowFocus(TRUE);
-   viewHistory.setFocusPolicy(TQ_ClickFocus);
+   viewHistory.setFocusPolicy(TQWidget::ClickFocus);
    viewHistory.setShowSortIndicator(true);
 
    viewHistory.addColumn(i18n("Date & Time"),130);
@@ -113,7 +113,7 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name)
    showFileOpen.setChecked(FALSE);
    showFileClose.setChecked(FALSE);
 
-   connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList()));
+   connect(&updateButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(updateList()));
    emit contentsChanged(&viewHistory,0,0);
 
    label.setMinimumSize(label.sizeHint());
@@ -161,7 +161,7 @@ void LogView::updateList()
    TQFile logFile(logFileName.url());
    if (logFile.open(IO_ReadOnly))
    {
-      TQApplication::setOverrideCursor(tqwaitCursor);
+      TQApplication::setOverrideCursor(TQt::waitCursor);
       viewHistory.clear();
       filesCount=0;
       connectionsCount=0;
diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h
index c3c8c07ea..99a259ddf 100644
--- a/kcontrol/samba/kcmsambalog.h
+++ b/kcontrol/samba/kcmsambalog.h
@@ -38,7 +38,7 @@
 
 class LogView: public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       LogView(TQWidget *parent=0, TDEConfig *config=0, const char *name=0);
       virtual ~LogView() {};
diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp
index 3b77dbc9f..faeb54702 100644
--- a/kcontrol/samba/kcmsambastatistics.cpp
+++ b/kcontrol/samba/kcmsambastatistics.cpp
@@ -60,7 +60,7 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n
   expandedUserCb = new TQCheckBox( i18n( "Show expanded host info" ), this );
 
    viewStatistics->setAllColumnsShowFocus(TRUE);
-   viewStatistics->setFocusPolicy(TQ_ClickFocus);
+   viewStatistics->setFocusPolicy(TQWidget::ClickFocus);
    viewStatistics->setShowSortIndicator(true);
    
    viewStatistics->addColumn(i18n("Nr"),30);
@@ -116,8 +116,8 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n
    subLayout->addWidget(expandedInfoCb,3,1);
    subLayout->addWidget(expandedUserCb,3,2);
 
-   connect(clearButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearStatistics()));
-   connect(calcButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(calculate()));
+   connect(clearButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(clearStatistics()));
+   connect(calcButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(calculate()));
    setListInfo(0,0,0);
 }
 
@@ -134,7 +134,7 @@ void StatisticsView::setListInfo(TQListView *list, int nrOfFiles, int nrOfConnec
 void StatisticsView::calculate()
 {
    if (dataList==0) return;
-   TQApplication::setOverrideCursor(tqwaitCursor);
+   TQApplication::setOverrideCursor(TQt::waitCursor);
    int connCount(0);
    if (eventCb->currentText()==i18n("Connection"))
       connCount=1;
diff --git a/kcontrol/samba/kcmsambastatistics.h b/kcontrol/samba/kcmsambastatistics.h
index 4b6ad6211..157fc62b3 100644
--- a/kcontrol/samba/kcmsambastatistics.h
+++ b/kcontrol/samba/kcmsambastatistics.h
@@ -77,7 +77,7 @@ class SambaLog
 
 class StatisticsView: public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   StatisticsView(TQWidget *parent=0, TDEConfig *config=0, const char *name=0);
   virtual ~StatisticsView() {};
diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp
index abd423d13..e51a3c137 100644
--- a/kcontrol/samba/ksmbstatus.cpp
+++ b/kcontrol/samba/ksmbstatus.cpp
@@ -70,7 +70,7 @@ NetMon::NetMon( TQWidget * parent, TDEConfig *config, const char * name )
 
     timer = new TQTimer(this);
     timer->start(15000);
-    TQObject::connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(update()));
+    TQObject::connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(update()));
     update();
 }
 
@@ -175,8 +175,8 @@ void NetMon::update()
    nrpid=0;
    process->setEnvironment("PATH", path);
    connect(process,
-           TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-           TQT_SLOT(slotReceivedData(TDEProcess *, char *, int)));
+           TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+           TQ_SLOT(slotReceivedData(TDEProcess *, char *, int)));
    *process << "smbstatus";
    if (!process->start(TDEProcess::Block,TDEProcess::Stdout))
       version->setText(i18n("Error: Unable to run smbstatus"));
@@ -200,12 +200,12 @@ void NetMon::update()
    showmountProc=new TDEProcess();
    showmountProc->setEnvironment("PATH", path);
    *showmountProc<<"showmount"<<"-a"<<"localhost";
-   connect(showmountProc,TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),TQT_SLOT(slotReceivedData(TDEProcess *, char *, int)));
+   connect(showmountProc,TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),TQ_SLOT(slotReceivedData(TDEProcess *, char *, int)));
    //without this timer showmount hangs up to 5 minutes
    //if the portmapper daemon isn't running
-   TQTimer::singleShot(5000,this,TQT_SLOT(killShowmount()));
+   TQTimer::singleShot(5000,this,TQ_SLOT(killShowmount()));
    //kdDebug()<<"starting kill timer with 5 seconds"<<endl;
-   connect(showmountProc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(killShowmount()));
+   connect(showmountProc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(killShowmount()));
    if (!showmountProc->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) // run showmount
    {
       delete showmountProc;
diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h
index f787293ae..4f9b076b1 100644
--- a/kcontrol/samba/ksmbstatus.h
+++ b/kcontrol/samba/ksmbstatus.h
@@ -34,7 +34,7 @@ class TDEProcess;
 
 class NetMon : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
 public:
    NetMon(TQWidget *parent, TDEConfig * config=0, const char * name=0);
    void saveSettings() {};
diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp
index d5af28c1a..4bb099fae 100644
--- a/kcontrol/samba/main.cpp
+++ b/kcontrol/samba/main.cpp
@@ -66,7 +66,7 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin
    tabs.addTab(&imports,i18n("&Imports"));
    tabs.addTab(&logView,i18n("&Log"));
    tabs.addTab(&statisticsView,i18n("&Statistics"));
-   connect(&logView,TQT_SIGNAL(contentsChanged(TQListView* , int, int)),&statisticsView,TQT_SLOT(setListInfo(TQListView *, int, int)));
+   connect(&logView,TQ_SIGNAL(contentsChanged(TQListView* , int, int)),&statisticsView,TQ_SLOT(setListInfo(TQListView *, int, int)));
    setButtons(Help);
    load();
 
diff --git a/kcontrol/screensaver/advanceddialog.cpp b/kcontrol/screensaver/advanceddialog.cpp
index 7a28178d5..e277a8853 100644
--- a/kcontrol/screensaver/advanceddialog.cpp
+++ b/kcontrol/screensaver/advanceddialog.cpp
@@ -24,17 +24,17 @@ KScreenSaverAdvancedDialog::KScreenSaverAdvancedDialog(TQWidget *parent, const c
 
 	readSettings();
 
-	connect(dialog->qcbPriority, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotPriorityChanged(int)));
-
-	connect(dialog->qcbTopLeft, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotChangeTopLeftCorner(int)));
-	connect(dialog->qcbTopRight, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotChangeTopLeftCorner(int)));
-	connect(dialog->qcbBottomLeft, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotChangeTopLeftCorner(int)));
-	connect(dialog->qcbBottomRight, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotChangeTopLeftCorner(int)));
+	connect(dialog->qcbPriority, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(slotPriorityChanged(int)));
+
+	connect(dialog->qcbTopLeft, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(slotChangeTopLeftCorner(int)));
+	connect(dialog->qcbTopRight, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(slotChangeTopLeftCorner(int)));
+	connect(dialog->qcbBottomLeft, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(slotChangeTopLeftCorner(int)));
+	connect(dialog->qcbBottomRight, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(slotChangeTopLeftCorner(int)));
 
 #ifndef HAVE_SETPRIORITY
     dialog->qgbPriority->setEnabled(false);
diff --git a/kcontrol/screensaver/advanceddialog.h b/kcontrol/screensaver/advanceddialog.h
index 87ee03a31..4ddb9abc7 100644
--- a/kcontrol/screensaver/advanceddialog.h
+++ b/kcontrol/screensaver/advanceddialog.h
@@ -27,7 +27,7 @@ public:
 
 class KScreenSaverAdvancedDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KScreenSaverAdvancedDialog(TQWidget *parent, const char* name = 0);
       
diff --git a/kcontrol/screensaver/kswidget.h b/kcontrol/screensaver/kswidget.h
index 11ec33a74..4c96daf41 100644
--- a/kcontrol/screensaver/kswidget.h
+++ b/kcontrol/screensaver/kswidget.h
@@ -6,7 +6,7 @@
 
 class KSWidget : public QXEmbed
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KSWidget( TQWidget *parent = NULL, const char* name = NULL, int flags = 0 );
     virtual ~KSWidget();
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index cd30fa1a1..70cf3f469 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -124,12 +124,12 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     readSettings( false );
 
     mSetupProc = new TDEProcess;
-    connect(mSetupProc, TQT_SIGNAL(processExited(TDEProcess *)),
-            this, TQT_SLOT(slotSetupDone(TDEProcess *)));
+    connect(mSetupProc, TQ_SIGNAL(processExited(TDEProcess *)),
+            this, TQ_SLOT(slotSetupDone(TDEProcess *)));
 
     mPreviewProc = new TDEProcess;
-    connect(mPreviewProc, TQT_SIGNAL(processExited(TDEProcess *)),
-            this, TQT_SLOT(slotPreviewExited(TDEProcess *)));
+    connect(mPreviewProc, TQ_SIGNAL(processExited(TDEProcess *)),
+            this, TQ_SLOT(slotPreviewExited(TDEProcess *)));
 
     TQBoxLayout *topLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
 
@@ -140,7 +140,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
         new TQVBoxLayout(leftColumnLayout, KDialog::spacingHint());
 
     mSaverGroup = new TQGroupBox(i18n("Screen Saver"), this );
-    mSaverGroup->setColumnLayout( 0, Qt::Horizontal );
+    mSaverGroup->setColumnLayout( 0, TQt::Horizontal );
     vLayout->addWidget(mSaverGroup);
     vLayout->setStretchFactor( mSaverGroup, 10 );
     TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(),
@@ -153,31 +153,31 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mSaverListView->header()->hide();
     mSelected = -1;
     groupLayout->addWidget( mSaverListView, 10 );
-    connect( mSaverListView, TQT_SIGNAL(doubleClicked ( TQListViewItem *)), this, TQT_SLOT( slotSetup()));
+    connect( mSaverListView, TQ_SIGNAL(doubleClicked ( TQListViewItem *)), this, TQ_SLOT( slotSetup()));
     TQWhatsThis::add( mSaverListView, i18n("Select the screen saver to use.") );
 
     TQBoxLayout* hlay = new TQHBoxLayout(groupLayout, KDialog::spacingHint());
     mSetupBt = new TQPushButton( i18n("&Setup..."), mSaverGroup );
-    connect( mSetupBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSetup() ) );
+    connect( mSetupBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSetup() ) );
     mSetupBt->setEnabled(false);
     hlay->addWidget( mSetupBt );
     TQWhatsThis::add( mSetupBt, i18n("Configure the screen saver's options, if any.") );
 
     mTestBt = new TQPushButton( i18n("&Test"), mSaverGroup );
-    connect( mTestBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotTest() ) );
+    connect( mTestBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotTest() ) );
     mTestBt->setEnabled(false);
     hlay->addWidget( mTestBt );
     TQWhatsThis::add( mTestBt, i18n("Show a full screen preview of the screen saver.") );
 
     mSettingsGroup = new TQGroupBox( i18n("Settings"), this );
-    mSettingsGroup->setColumnLayout( 0, Qt::Vertical );
+    mSettingsGroup->setColumnLayout( 0, TQt::Vertical );
     leftColumnLayout->addWidget( mSettingsGroup );
     TQGridLayout *settingsGroupLayout = new TQGridLayout( mSettingsGroup->layout(), 5, 2, KDialog::spacingHint() );
 
     mEnabledCheckBox = new TQCheckBox(i18n("Start a&utomatically"), mSettingsGroup);
     mEnabledCheckBox->setChecked(mEnabled);
     TQWhatsThis::add( mEnabledCheckBox, i18n("Automatically start the screen saver after a period of inactivity.") );
-    connect(mEnabledCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnable(bool)));
+    connect(mEnabledCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnable(bool)));
     settingsGroupLayout->addWidget(mEnabledCheckBox, 0, 0);
 
     TQBoxLayout *hbox = new TQHBoxLayout();
@@ -192,8 +192,8 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mWaitEdit->setSuffix(i18n(" min"));
     mWaitEdit->setValue(mTimeout/60);
     mWaitEdit->setEnabled(mEnabled);
-    connect(mWaitEdit, TQT_SIGNAL(valueChanged(int)),
-            this, TQT_SLOT(slotTimeoutChanged(int)));
+    connect(mWaitEdit, TQ_SIGNAL(valueChanged(int)),
+            this, TQ_SLOT(slotTimeoutChanged(int)));
     mActivateLbl->setBuddy(mWaitEdit);
     hbox->addWidget(mWaitEdit);
     hbox->addStretch(1);
@@ -204,7 +204,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mLockCheckBox = new TQCheckBox( i18n("&Require password to stop"), mSettingsGroup );
     mLockCheckBox->setEnabled( mEnabled );
     mLockCheckBox->setChecked( mLock );
-    connect( mLockCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotLock( bool ) ) );
+    connect( mLockCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotLock( bool ) ) );
     settingsGroupLayout->addWidget(mLockCheckBox, 2, 0);
     TQWhatsThis::add( mLockCheckBox, i18n("Prevent potential unauthorized use by requiring a password to stop the screen saver.") );
 
@@ -230,7 +230,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
         mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
         mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
     }
-    connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLockTimeoutChanged(int)));
+    connect(mWaitLockEdit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotLockTimeoutChanged(int)));
     mLockLbl->setBuddy(mWaitLockEdit);
     hbox->addWidget(mWaitLockEdit);
     hbox->addStretch(1);
@@ -241,35 +241,35 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mDelaySaverStartCheckBox = new TQCheckBox( i18n("&Delay saver start after lock"), mSettingsGroup );
     mDelaySaverStartCheckBox->setEnabled( true );
     mDelaySaverStartCheckBox->setChecked( mDelaySaverStart );
-    connect( mDelaySaverStartCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotDelaySaverStart( bool ) ) );
+    connect( mDelaySaverStartCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotDelaySaverStart( bool ) ) );
     settingsGroupLayout->addWidget(mDelaySaverStartCheckBox, 0, 1);
     TQWhatsThis::add( mDelaySaverStartCheckBox, i18n("When manually locking the screen, wait to start the screen saver until the configured start delay has elapsed.") );
 
     mUseTSAKCheckBox = new TQCheckBox( i18n("&Use Secure Attention Key"), mSettingsGroup );
     mUseTSAKCheckBox->setEnabled( true );
     mUseTSAKCheckBox->setChecked( mUseTSAK );
-    connect( mUseTSAKCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotUseTSAK( bool ) ) );
+    connect( mUseTSAKCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotUseTSAK( bool ) ) );
     settingsGroupLayout->addWidget(mUseTSAKCheckBox, 1, 1);
     TQWhatsThis::add( mUseTSAKCheckBox, i18n("Require Secure Attention Key prior to displaying the unlock dialog.") );
 
     mUseUnmanagedLockWindowsCheckBox = new TQCheckBox( i18n("Use &legacy lock windows"), mSettingsGroup );
     mUseUnmanagedLockWindowsCheckBox->setEnabled( true );
     mUseUnmanagedLockWindowsCheckBox->setChecked( mUseUnmanagedLockWindows );
-    connect( mUseUnmanagedLockWindowsCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotUseUnmanagedLockWindows( bool ) ) );
+    connect( mUseUnmanagedLockWindowsCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotUseUnmanagedLockWindows( bool ) ) );
     settingsGroupLayout->addWidget(mUseUnmanagedLockWindowsCheckBox, 2, 1);
     TQWhatsThis::add( mUseUnmanagedLockWindowsCheckBox, i18n("Use old-style unmanaged X11 lock windows.") );
 
     mHideActiveWindowsFromSaverCheckBox = new TQCheckBox( i18n("Hide active &windows from saver"), mSettingsGroup );
     mHideActiveWindowsFromSaverCheckBox->setEnabled( true );
     mHideActiveWindowsFromSaverCheckBox->setChecked( mHideActiveWindowsFromSaver );
-    connect( mHideActiveWindowsFromSaverCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotHideActiveWindowsFromSaver( bool ) ) );
+    connect( mHideActiveWindowsFromSaverCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotHideActiveWindowsFromSaver( bool ) ) );
     settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1);
     TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") );
 
     mHideCancelButtonCheckBox = new TQCheckBox( i18n("Hide &cancel button"), mSettingsGroup );
     mHideCancelButtonCheckBox->setEnabled( true );
     mHideCancelButtonCheckBox->setChecked( mHideCancelButton );
-    connect( mHideCancelButtonCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotHideCancelButton(bool)) );
+    connect( mHideCancelButtonCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotHideCancelButton(bool)) );
     settingsGroupLayout->addWidget(mHideCancelButtonCheckBox, 4, 1);
     TQWhatsThis::add(mHideCancelButtonCheckBox, i18n("Hide Cancel button from the \"Desktop Session Locked\" dialog."));
 
@@ -288,8 +288,8 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
         i18n( "Advanced &Options" ), this, "advancedBtn" );
     advancedBt->setSizePolicy( TQSizePolicy(
         TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
-    connect( advancedBt, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( slotAdvanced() ) );
+    connect( advancedBt, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( slotAdvanced() ) );
     advancedLayout->addWidget( advancedBt );
     advancedLayout->addWidget( new TQWidget( this ) );
 
@@ -306,7 +306,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     // we've started up.
     mNumLoaded = 0;
     mLoadTimer = new TQTimer( this );
-    connect( mLoadTimer, TQT_SIGNAL(timeout()), TQT_SLOT(findSavers()) );
+    connect( mLoadTimer, TQ_SIGNAL(timeout()), TQ_SLOT(findSavers()) );
     mLoadTimer->start( 100 );
     mChanged = false;
     emit changed(false);
@@ -615,8 +615,8 @@ void KScreenSaver::findSavers()
             mTestBt->setEnabled(true);
         }
 
-        connect( mSaverListView, TQT_SIGNAL( currentChanged( TQListViewItem * ) ),
-                 this, TQT_SLOT( slotScreenSaver( TQListViewItem * ) ) );
+        connect( mSaverListView, TQ_SIGNAL( currentChanged( TQListViewItem * ) ),
+                 this, TQ_SLOT( slotScreenSaver( TQListViewItem * ) ) );
 
         setMonitor();
     }
diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h
index d52c81227..f5c32adee 100644
--- a/kcontrol/screensaver/scrnsave.h
+++ b/kcontrol/screensaver/scrnsave.h
@@ -33,7 +33,7 @@ class TDEProcess;
 //===========================================================================
 class KScreenSaver : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KScreenSaver(TQWidget *parent, const char *name, const TQStringList &);
     ~KScreenSaver();
diff --git a/kcontrol/screensaver/testwin.cpp b/kcontrol/screensaver/testwin.cpp
index dd250e084..1055701f1 100644
--- a/kcontrol/screensaver/testwin.cpp
+++ b/kcontrol/screensaver/testwin.cpp
@@ -6,7 +6,7 @@ class QXEmbed;
 TestWin::TestWin()
     : KSWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM )
 {
-    setFocusPolicy(TQ_StrongFocus);
+    setFocusPolicy(TQWidget::StrongFocus);
     KWin::setState( winId(), NET::StaysOnTop );
 }
 
diff --git a/kcontrol/screensaver/testwin.h b/kcontrol/screensaver/testwin.h
index ff77b6b4d..a59dcd7e7 100644
--- a/kcontrol/screensaver/testwin.h
+++ b/kcontrol/screensaver/testwin.h
@@ -5,7 +5,7 @@
 
 class TestWin : public KSWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TestWin();
 };
diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui
index 3b32d63b7..d4ad3e1b7 100644
--- a/kcontrol/smartcard/nosmartcardbase.ui
+++ b/kcontrol/smartcard/nosmartcardbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>NoSmartcardBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>NoSmartcardBase</cstring>
     </property>
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index f0891db16..1e53bc3d9 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -72,19 +72,19 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
      _popUpKardChooser = new TDEPopupMenu(this,"KpopupKardChooser");
      _popUpKardChooser->insertItem(i18n("Change Module..."),
 				   this,
-				   TQT_SLOT(slotLaunchChooser()));
+				   TQ_SLOT(slotLaunchChooser()));
      // The config backend
 
-     connect(base->launchManager, TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
-     connect(base->beepOnInsert,  TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
-     connect(base->enableSupport, TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
+     connect(base->launchManager, TQ_SIGNAL(clicked()), TQ_SLOT( changed() ));
+     connect(base->beepOnInsert,  TQ_SIGNAL(clicked()), TQ_SLOT( changed() ));
+     connect(base->enableSupport, TQ_SIGNAL(clicked()), TQ_SLOT( changed() ));
 
 
-     connect(base->enablePolling, TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
+     connect(base->enablePolling, TQ_SIGNAL(clicked()), TQ_SLOT( changed() ));
      connect(base->_readerHostsListView,
-	     TQT_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)),
+	     TQ_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)),
 	     this,
-	     TQT_SLOT(slotShowPopup(TQListViewItem *,const TQPoint &,int)));
+	     TQ_SLOT(slotShowPopup(TQListViewItem *,const TQPoint &,int)));
 
 
 
diff --git a/kcontrol/smartcard/smartcard.h b/kcontrol/smartcard/smartcard.h
index 7cb90478e..51cd7eddb 100644
--- a/kcontrol/smartcard/smartcard.h
+++ b/kcontrol/smartcard/smartcard.h
@@ -40,7 +40,7 @@ class TDEListViewItem;
 class KSmartcardConfig : public TDECModule, public DCOPObject
 {
   K_DCOP
-    Q_OBJECT
+    TQ_OBJECT
 
 
 public:
diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui
index e7a3344ce..dd138d5b3 100644
--- a/kcontrol/smartcard/smartcardbase.ui
+++ b/kcontrol/smartcard/smartcardbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>SmartcardBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SmartcardBase</cstring>
     </property>
@@ -23,7 +23,7 @@
             <property name="enabled">
                 <bool>true</bool>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -127,7 +127,7 @@
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -297,11 +297,11 @@
 <includes>
     <include location="local" impldecl="in implementation">smartcardbase.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>slotTestReader()</slot>
     <slot>enableSupport_toggled(bool)</slot>
     <slot>enablePolling_toggled(bool)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp
index 99f1b729a..3d165a577 100644
--- a/kcontrol/smserver/kcmsmserver.cpp
+++ b/kcontrol/smserver/kcmsmserver.cpp
@@ -48,7 +48,7 @@ SMServerConfig::SMServerConfig( TQWidget *parent, const char* name, const TQStri
 
     TQVBoxLayout *topLayout = new TQVBoxLayout(this);
     dialog = new SMServerConfigImpl(this);
-    connect(dialog, TQT_SIGNAL(changed()), TQT_SLOT(changed()));
+    connect(dialog, TQ_SIGNAL(changed()), TQ_SLOT(changed()));
 
     dialog->show();
     topLayout->add(dialog);
@@ -94,6 +94,7 @@ void SMServerConfig::load(bool useDefaults )
 
   c->setGroup("Logout");
   dialog->showLogoutStatusDialog->setChecked(c->readBoolEntry("showLogoutStatusDlg", true));
+  dialog->showUbuntuStyleDialog->setChecked(c->readBoolEntry("doUbuntuLogout", false));
   dialog->showFadeAway->setChecked(c->readBoolEntry("doFadeaway", true));
   dialog->showFancyFadeAway->setChecked(c->readBoolEntry("doFancyLogout", true));
   dialog->showFancyFadeAway->setEnabled(dialog->confirmLogoutCheck->isChecked() && dialog->showFadeAway->isChecked()),
@@ -126,6 +127,7 @@ void SMServerConfig::save()
   c->writeEntry("excludeApps", dialog->excludeLineedit->text());
   c->setGroup("Logout");
   c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked());
+  c->writeEntry( "doUbuntuLogout", dialog->showUbuntuStyleDialog->isChecked());
   c->writeEntry( "doFadeaway", dialog->showFadeAway->isChecked());
   c->writeEntry( "doFancyLogout", dialog->showFancyFadeAway->isChecked());
   c->sync();
diff --git a/kcontrol/smserver/kcmsmserver.h b/kcontrol/smserver/kcmsmserver.h
index c346033c6..31ea4d360 100644
--- a/kcontrol/smserver/kcmsmserver.h
+++ b/kcontrol/smserver/kcmsmserver.h
@@ -28,7 +28,7 @@ class SMServerConfigImpl;
 
 class SMServerConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   SMServerConfig( TQWidget *parent=0, const char* name=0, const TQStringList &list=TQStringList() );
diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui
index 1449e9d6f..9179722c7 100644
--- a/kcontrol/smserver/smserverconfigdlg.ui
+++ b/kcontrol/smserver/smserverconfigdlg.ui
@@ -62,10 +62,10 @@
                     <bool>false</bool>
                   </property>
                   <property name="text">
-                    <string>Show &amp;logout fadeaway</string>
+                    <string>Fadeaway screen during &amp;logout</string>
                   </property>
                   <property name="whatsThis" stdset="0">
-                    <string>Check this option if you want to see a fadeaway when displaying a logout confirmation dialog box.</string>
+                    <string>Check this option if you want screen to be faded when displaying a logout confirmation dialog box.</string>
                   </property>
                 </widget>
                 <widget class="TQCheckBox">
@@ -76,10 +76,10 @@
                     <bool>false</bool>
                   </property>
                   <property name="text">
-                    <string>Sho&amp;w fancy logout fadeaway</string>
+                    <string>Use effects for logout fadea&amp;way</string>
                   </property>
                   <property name="whatsThis" stdset="0">
-                    <string>Check this option if you want to see a fancy fadeaway when displaying a logout confirmation dialog box.</string>
+                    <string>Check this option if you want to enable additional graphical effects for fadeaway during logout process. Namely the fadeaway will be smoothly animated and semitransparent.</string>
                   </property>
                 </widget>
                 <widget class="TQCheckBox">
@@ -104,6 +104,17 @@
                         <string>Check this option if you want to see a dialog box showing the logout status.</string>
                     </property>
                 </widget>
+                <widget class="TQCheckBox">
+                    <property name="name">
+                        <cstring>showUbuntuStyleDialog</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Use &amp;alternative shutdown dialog layout</string>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>Check this option if you want to use an alternative shutdown dialog, where buttons are arranged in rows rathen then columns. This layout is popular in Ubuntu and therefore it is also known as 'Ubuntu style' shutdown dialog.</string>
+                    </property>
+                </widget>
             </vbox>
         </widget>
         <widget class="TQButtonGroup">
@@ -243,40 +254,22 @@
 </widget>
 <connections>
     <connection>
-        <sender>confirmLogoutCheck</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>SMServerConfigDlg</receiver>
-        <slot>configChanged()</slot>
-    </connection>
-    <connection>
       <sender>confirmLogoutCheck</sender>
       <signal>toggled(bool)</signal>
-      <receiver>showFadeAway</receiver>
-      <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-      <sender>confirmLogoutCheck</sender>
-      <signal>toggled(bool)</signal>
-      <receiver>showFancyFadeAway</receiver>
-      <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-      <sender>showFadeAway</sender>
-      <signal>toggled(bool)</signal>
-      <receiver>showFancyFadeAway</receiver>
-      <slot>setEnabled(bool)</slot>
+      <receiver>SMServerConfigDlg</receiver>
+      <slot>fadeAwayConfigChanged()</slot>
     </connection>
     <connection>
       <sender>showFadeAway</sender>
       <signal>toggled(bool)</signal>
       <receiver>SMServerConfigDlg</receiver>
-      <slot>configChanged()</slot>
+      <slot>fadeAwayConfigChanged()</slot>
     </connection>
     <connection>
       <sender>showFancyFadeAway</sender>
       <signal>toggled(bool)</signal>
       <receiver>SMServerConfigDlg</receiver>
-      <slot>configChanged()</slot>
+      <slot>fadeAwayConfigChanged()</slot>
     </connection>
     <connection>
         <sender>showLogoutStatusDialog</sender>
@@ -285,6 +278,12 @@
         <slot>configChanged()</slot>
     </connection>
     <connection>
+        <sender>showUbuntuStyleDialog</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>SMServerConfigDlg</receiver>
+        <slot>configChanged()</slot>
+    </connection>
+    <connection>
         <sender>loginGroup</sender>
         <signal>clicked(int)</signal>
         <receiver>SMServerConfigDlg</receiver>
@@ -316,12 +315,14 @@
     </connection>
 </connections>
 <includes>
+    <include location="global" impldecl="in declaration">tqcheckbox.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>configChanged()</slot>
-</Q_SLOTS>
+    <slot>fadeAwayConfigChanged()</slot>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/smserver/smserverconfigimpl.cpp b/kcontrol/smserver/smserverconfigimpl.cpp
index d9507a9d8..af04d774a 100644
--- a/kcontrol/smserver/smserverconfigimpl.cpp
+++ b/kcontrol/smserver/smserverconfigimpl.cpp
@@ -18,14 +18,20 @@
 #include "smserverconfigimpl.h"
 #include "smserverconfigimpl.moc"
 
-SMServerConfigImpl::SMServerConfigImpl(TQWidget *parent, const char *name ) : SMServerConfigDlg(parent,name) {
+SMServerConfigImpl::SMServerConfigImpl(TQWidget *parent, const char *name ) : SMServerConfigDlg(parent,name) {}
 
+SMServerConfigImpl::~SMServerConfigImpl() {}
+
+void SMServerConfigImpl::configChanged()
+{
+  emit changed();
 }
-SMServerConfigImpl::~SMServerConfigImpl(){
-}
-/** No descriptions */
-void SMServerConfigImpl::configChanged(){
 
- emit changed();
+void SMServerConfigImpl::fadeAwayConfigChanged()
+{
+  // Update showFadeAway and showFancyFadeAway status correctly
+  showFadeAway->setEnabled(confirmLogoutCheck->isChecked());
+  showFancyFadeAway->setEnabled(confirmLogoutCheck->isChecked() && showFadeAway->isChecked());
 
+  configChanged();
 }
diff --git a/kcontrol/smserver/smserverconfigimpl.h b/kcontrol/smserver/smserverconfigimpl.h
index b516617cf..2e1186936 100644
--- a/kcontrol/smserver/smserverconfigimpl.h
+++ b/kcontrol/smserver/smserverconfigimpl.h
@@ -26,13 +26,14 @@
   */
 
 class SMServerConfigImpl : public SMServerConfigDlg  {
-   Q_OBJECT
+   TQ_OBJECT
 public:
 	SMServerConfigImpl(TQWidget *parent=0, const char *name=0);
 	~SMServerConfigImpl();
 public slots: // Public slots
   /** No descriptions */
   void configChanged();
+  void fadeAwayConfigChanged();
 signals: // Signals
   /** No descriptions */
   void changed();
diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp
index 805a98d6b..0b9611575 100644
--- a/kcontrol/spellchecking/spellchecking.cpp
+++ b/kcontrol/spellchecking/spellchecking.cpp
@@ -41,7 +41,7 @@ KSpellCheckingConfig::KSpellCheckingConfig(TQWidget *parent, const char *name, c
 
   spellConfig = new KSpellConfig(box, 0L ,0L, false );
   layout->addStretch(1);
-  connect(spellConfig,TQT_SIGNAL(configChanged()), TQT_SLOT( changed() ));
+  connect(spellConfig,TQ_SIGNAL(configChanged()), TQ_SLOT( changed() ));
 
   setQuickHelp( i18n("<h1>Spell Checker</h1><p>This control module allows you to configure the TDE spell checking system. You can configure:<ul><li> which spell checking program to use<li> which types of spelling errors are identified<li> which dictionary is used by default.</ul><br>The TDE spell checking system (KSpell) provides support for two common spell checking utilities: ASpell and ISpell. This allows you to share dictionaries between TDE applications and non-TDE applications.</p>"));
 
diff --git a/kcontrol/spellchecking/spellchecking.h b/kcontrol/spellchecking/spellchecking.h
index 10db546fd..dc94470cb 100644
--- a/kcontrol/spellchecking/spellchecking.h
+++ b/kcontrol/spellchecking/spellchecking.h
@@ -25,7 +25,7 @@ class KSpellConfig;
 
 class KSpellCheckingConfig  : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  public:
   KSpellCheckingConfig(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 49ca332dd..27a599b09 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -156,12 +156,12 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	// Add Page1 (Style)
 	// -----------------
 	gbWidgetStyle = new TQGroupBox( i18n("Widget Style"), page1, "gbWidgetStyle" );
-	gbWidgetStyle->setColumnLayout( 0, Qt::Vertical );
+	gbWidgetStyle->setColumnLayout( 0, TQt::Vertical );
 	gbWidgetStyle->layout()->setMargin( KDialog::marginHint() );
 	gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() );
 
 	gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() );
-	gbWidgetStyleLayout->setAlignment( Qt::AlignTop );
+	gbWidgetStyleLayout->setAlignment( TQt::AlignTop );
 	hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" );
 
 	cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" );
@@ -205,7 +205,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	gbWidgetStyleLayout->addSpacing(10);
 
 	TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 );
-	gbPreview->setColumnLayout( 0, Qt::Vertical );
+	gbPreview->setColumnLayout( 0, TQt::Vertical );
 	gbPreview->layout()->setMargin( 0 );
 	gbPreview->layout()->setSpacing( KDialog::spacingHint() );
 	gbPreview->setFlat( true );
@@ -216,9 +216,9 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	page1Layout->addWidget( gbPreview );
 
 	// Connect all required stuff
-	connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(styleChanged()) );
-	connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateConfigButton()));
-	connect( pbConfigStyle, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleSpecificConfig()));
+	connect( cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(styleChanged()) );
+	connect( cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateConfigButton()));
+	connect( pbConfigStyle, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleSpecificConfig()));
 
 	// Add Page2 (Effects)
 	// -------------------
@@ -304,7 +304,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	sliderBox = new TQVBox( menuContainer );
 	sliderBox->setSpacing( KDialog::spacingHint() );
 	sliderBox->setMargin( 0 );
-	slOpacity = new TQSlider( 0, 100, 5, /*opacity*/ 90, Qt::Horizontal, sliderBox );
+	slOpacity = new TQSlider( 0, 100, 5, /*opacity*/ 90, TQt::Horizontal, sliderBox );
 	slOpacity->setTickmarks( TQSlider::Below );
 	slOpacity->setTickInterval( 10 );
 	TQHBox* box1 = new TQHBox( sliderBox );
@@ -338,13 +338,13 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	page2Layout->addItem( sp1 );
 
 	// Data flow stuff.
-	connect( cbEnableEffects,     TQT_SIGNAL(toggled(bool)), containerFrame, TQT_SLOT(setEnabled(bool)) );
-	connect( cbEnableEffects,     TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(menuEffectChanged(bool)) );
-	connect( slOpacity,           TQT_SIGNAL(valueChanged(int)),menuPreview, TQT_SLOT(setOpacity(int)) );
-	connect( comboMenuEffect,     TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectChanged()) );
-	connect( comboMenuEffect,     TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectChanged()) );
-	connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectTypeChanged()) );
-	connect( comboMenuEffectType, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectTypeChanged()) );
+	connect( cbEnableEffects,     TQ_SIGNAL(toggled(bool)), containerFrame, TQ_SLOT(setEnabled(bool)) );
+	connect( cbEnableEffects,     TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(menuEffectChanged(bool)) );
+	connect( slOpacity,           TQ_SIGNAL(valueChanged(int)),menuPreview, TQ_SLOT(setOpacity(int)) );
+	connect( comboMenuEffect,     TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuEffectChanged()) );
+	connect( comboMenuEffect,     TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuEffectChanged()) );
+	connect( comboMenuEffectType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuEffectTypeChanged()) );
+	connect( comboMenuEffectType, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuEffectTypeChanged()) );
 
 	// Add Page3 (Miscellaneous)
 	// -------------------------
@@ -379,29 +379,29 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	load();
 
 	// Do all the setDirty connections.
-	connect(cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
+	connect(cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty()));
 	// Page2
-	connect( cbEnableEffects,     TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setEffectsDirty()));
-	connect( cbEnableEffects,     TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setStyleDirty()));
-	connect( comboTooltipEffect,  TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty()));
-	connect( comboRubberbandEffect, TQT_SIGNAL(activated(int)),   this, TQT_SLOT(setStyleDirty()));
-	connect( comboComboEffect,    TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty()));
-	connect( comboMenuEffect,     TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
-	connect( comboMenuHandle,     TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
-	connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
-	connect( slOpacity,           TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty()));
-	connect( cbMenuShadow,        TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setStyleDirty()));
+	connect( cbEnableEffects,     TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setEffectsDirty()));
+	connect( cbEnableEffects,     TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setStyleDirty()));
+	connect( comboTooltipEffect,  TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEffectsDirty()));
+	connect( comboRubberbandEffect, TQ_SIGNAL(activated(int)),   this, TQ_SLOT(setStyleDirty()));
+	connect( comboComboEffect,    TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEffectsDirty()));
+	connect( comboMenuEffect,     TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty()));
+	connect( comboMenuHandle,     TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty()));
+	connect( comboMenuEffectType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty()));
+	connect( slOpacity,           TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setStyleDirty()));
+	connect( cbMenuShadow,        TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setStyleDirty()));
 	// Page1 & Page3
-	connect( cbHoverButtons,        TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setToolbarsDirty()));
-	connect( cbTransparentToolbars, TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setToolbarsDirty()));
-	connect( cbEnableTooltips,      TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setEffectsDirty()));
-	connect( cbIconsOnButtons,      TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setEffectsDirty()));
-	connect( cbScrollablePopupMenus,TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setEffectsDirty()));
-	connect( cbAutoHideAccelerators,TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setEffectsDirty()));
-	connect( cbMenuAltKeyNavigation,TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setEffectsDirty()));
-	connect( cbTearOffHandles,      TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setEffectsDirty()));
-	connect( comboToolbarIcons,     TQT_SIGNAL(activated(int)), this, TQT_SLOT(setToolbarsDirty()));
-	connect( m_popupMenuDelay,      TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty()));
+	connect( cbHoverButtons,        TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setToolbarsDirty()));
+	connect( cbTransparentToolbars, TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setToolbarsDirty()));
+	connect( cbEnableTooltips,      TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setEffectsDirty()));
+	connect( cbIconsOnButtons,      TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setEffectsDirty()));
+	connect( cbScrollablePopupMenus,TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setEffectsDirty()));
+	connect( cbAutoHideAccelerators,TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setEffectsDirty()));
+	connect( cbMenuAltKeyNavigation,TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setEffectsDirty()));
+	connect( cbTearOffHandles,      TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setEffectsDirty()));
+	connect( comboToolbarIcons,     TQ_SIGNAL(activated(int)), this, TQ_SLOT(setToolbarsDirty()));
+	connect( m_popupMenuDelay,      TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setStyleDirty()));
 
 	addWhatsThis();
 
@@ -479,9 +479,9 @@ void KCMStyle::styleSpecificConfig()
 	dial->setMainWidget( pluginConfig );
 
 	//..and connect it to the wrapper
-	connect(pluginConfig, TQT_SIGNAL(changed(bool)), dial, TQT_SLOT(setDirty(bool)));
-	connect(dial, TQT_SIGNAL(defaults()), pluginConfig, TQT_SLOT(defaults()));
-	connect(dial, TQT_SIGNAL(save()), pluginConfig, TQT_SLOT(save()));
+	connect(pluginConfig, TQ_SIGNAL(changed(bool)), dial, TQ_SLOT(setDirty(bool)));
+	connect(dial, TQ_SIGNAL(defaults()), pluginConfig, TQ_SLOT(defaults()));
+	connect(dial, TQ_SIGNAL(save()), pluginConfig, TQ_SLOT(save()));
 
 	if (dial->exec() == TQDialog::Accepted  && dial->isDirty() ) {
 		// Force re-rendering of the preview, to apply settings
@@ -813,7 +813,7 @@ void KCMStyle::loadStyle( TDEConfig& config )
 	// they use QPopupMenus for the drop-down list!
 
 	// ##### Since Trolltech likes to seemingly copy & paste code,
-	// TQStringList::findItem() doesn't have a Qt::StringComparisonMode field.
+	// TQStringList::findItem() doesn't have a TQt::StringComparisonMode field.
 	// We roll our own (yuck)
 	cfgStyle = cfgStyle.lower();
 	int item = 0;
@@ -851,7 +851,7 @@ void KCMStyle::styleChanged()
 void KCMStyle::switchStyle(const TQString& styleName, bool force)
 {
 	// Don't flicker the preview if the same style is chosen in the cb
-	if (!force && appliedStyle && TQT_TQOBJECT(appliedStyle)->name() == styleName) 
+	if (!force && appliedStyle && appliedStyle->name() == styleName) 
 		return;
          
 	// Create an instance of the new style...
diff --git a/kcontrol/style/kcmstyle.h b/kcontrol/style/kcmstyle.h
index ecb8d4c7c..c9ff560f7 100644
--- a/kcontrol/style/kcmstyle.h
+++ b/kcontrol/style/kcmstyle.h
@@ -62,7 +62,7 @@ struct StyleEntry {
 
 class KCMStyle : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KCMStyle( TQWidget* parent = 0, const char* name = 0 );
diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp
index 7fa6ef698..6ac4e6d4c 100644
--- a/kcontrol/style/keramik/keramikconf.cpp
+++ b/kcontrol/style/keramik/keramikconf.cpp
@@ -63,9 +63,9 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
 	origAnimProgressBar = s.readBoolEntry("/keramik/Settings/animateProgressBar", false);
 	animateProgressBar->setChecked(origAnimProgressBar);
 	
-	//connect(highlightLineEdits, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
-	connect(highlightScrollBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
-	connect(animateProgressBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
+	//connect(highlightLineEdits, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(highlightScrollBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(animateProgressBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
 }
 
 KeramikStyleConfig::~KeramikStyleConfig()
diff --git a/kcontrol/style/keramik/keramikconf.h b/kcontrol/style/keramik/keramikconf.h
index 6de7edb10..d129b78f7 100644
--- a/kcontrol/style/keramik/keramikconf.h
+++ b/kcontrol/style/keramik/keramikconf.h
@@ -28,7 +28,7 @@ class TQCheckBox;
 
 class KeramikStyleConfig: public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KeramikStyleConfig(TQWidget* parent);
 	~KeramikStyleConfig();
diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp
index 145ec465f..6d8514fc1 100644
--- a/kcontrol/style/menupreview.cpp
+++ b/kcontrol/style/menupreview.cpp
@@ -34,7 +34,7 @@ MenuPreview::MenuPreview( TQWidget* parent, int opacity, PreviewMode pvm )
 	pixBackground(NULL), pixOverlay(NULL), pixBlended(NULL)
 {
 	setFixedSize(150, 150);
-	setFocusPolicy( TQ_NoFocus );
+	setFocusPolicy( TQWidget::NoFocus );
 
 	mode = pvm;
 	if (opacity < 0)   opacity = 0;
diff --git a/kcontrol/style/menupreview.h b/kcontrol/style/menupreview.h
index 6e1ad8b4c..1f496d15a 100644
--- a/kcontrol/style/menupreview.h
+++ b/kcontrol/style/menupreview.h
@@ -26,7 +26,7 @@ class KPixmap;
 
 class MenuPreview : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	enum PreviewMode {
diff --git a/kcontrol/style/styleconfdialog.cpp b/kcontrol/style/styleconfdialog.cpp
index 8cb426b3f..feb5deba7 100644
--- a/kcontrol/style/styleconfdialog.cpp
+++ b/kcontrol/style/styleconfdialog.cpp
@@ -29,8 +29,8 @@ StyleConfigDialog::StyleConfigDialog(TQWidget* parent, TQString styleName):
            KDialogBase::Cancel)
 {
   m_dirty = false;
-  connect( this, TQT_SIGNAL( defaultClicked() ), this, TQT_SIGNAL( defaults() ));
-  connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SIGNAL( save() ));
+  connect( this, TQ_SIGNAL( defaultClicked() ), this, TQ_SIGNAL( defaults() ));
+  connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SIGNAL( save() ));
 }
 
 bool StyleConfigDialog::isDirty() const
diff --git a/kcontrol/style/styleconfdialog.h b/kcontrol/style/styleconfdialog.h
index 6555adee6..a9c5d26ef 100644
--- a/kcontrol/style/styleconfdialog.h
+++ b/kcontrol/style/styleconfdialog.h
@@ -26,7 +26,7 @@
 
 class StyleConfigDialog: public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   StyleConfigDialog(TQWidget* parent, TQString styleName);
 
diff --git a/kcontrol/style/stylepreview.ui b/kcontrol/style/stylepreview.ui
index ed6d2e43a..6b2f2a51c 100644
--- a/kcontrol/style/stylepreview.ui
+++ b/kcontrol/style/stylepreview.ui
@@ -276,10 +276,10 @@
     <include location="local" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">stylepreview.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>init()</slot>
     <slot returnType="bool">eventFilter( TQObject *, TQEvent * ev )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="10"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/style/stylepreview.ui.h b/kcontrol/style/stylepreview.ui.h
index 6ea29b376..38f47ecee 100644
--- a/kcontrol/style/stylepreview.ui.h
+++ b/kcontrol/style/stylepreview.ui.h
@@ -33,14 +33,14 @@ void StylePreview::init()
 {
     // Ensure that the user can't toy with the child widgets.
     // Method borrowed from Qt's qtconfig.
-    TQObjectList* l = queryList(TQWIDGET_OBJECT_NAME_STRING);
+    TQObjectList* l = queryList("TQWidget");
     TQObjectListIt it(*l);
     TQObject* obj;
     while ((obj = it.current()) != 0)
     {
         ++it;
         obj->installEventFilter(this);
-        ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus);
+        ((TQWidget*)obj)->setFocusPolicy(TQWidget::NoFocus);
     }
     delete l;
 }
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index 941c8b986..2eb7cf376 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -24,6 +24,7 @@
 #include <tqfile.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
+#include <tqtabwidget.h>
 
 #include <dcopclient.h>
 
@@ -35,6 +36,7 @@
 #include <twin.h>
 #include <kcolorbutton.h>
 #include <kstandarddirs.h>
+#include <kiconloader.h>
 
 #define protected public
 #include "kcmtaskbarui.h"
@@ -190,10 +192,10 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     {
         m_isGlobalConfig = true;
     }
-    connect(m_widget->globalConfigReload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReloadConfigurationFromGlobals()));
-    connect(m_widget->globalConfigEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditGlobalConfiguration()));
-    connect(m_widget->kcfg_UseGlobalSettings, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts()));
-    connect(m_widget->kcfg_SortByApp, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts()));
+    connect(m_widget->globalConfigReload, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotReloadConfigurationFromGlobals()));
+    connect(m_widget->globalConfigEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditGlobalConfiguration()));
+    connect(m_widget->kcfg_UseGlobalSettings, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts()));
+    connect(m_widget->kcfg_SortByApp, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts()));
 
     TQFile configFile(locateLocal("config", m_configFileName));
     if (!configFile.exists())
@@ -218,9 +220,12 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     {
         m_widget->appearance->insertItem((*it).name());
     }
+    m_widget->appearance->insertItem(i18n("Custom"));
 
-    connect(m_widget->appearance, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(appearanceChanged(int)));
+    connect(m_widget->appearance, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(appearanceChanged(int)));
+    connect(m_widget->kcfg_DisplayIconsNText, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(displayIconsNTextChanged(int)));
     addConfig(m_settingsObject, m_widget);
 
     setQuickHelp(i18n("<h1>Taskbar</h1> You can configure the taskbar here."
@@ -236,9 +241,9 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     m_widget->kcfg_GroupTasks->insertStringList(i18nGroupModeList());
     m_widget->kcfg_ShowTaskStates->insertStringList(i18nShowTaskStatesList());
 
-    connect(m_widget->kcfg_GroupTasks, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(slotUpdateComboBox()));
-    connect(m_widget->kcfg_UseCustomColors, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotUpdateCustomColors()));
+    connect(m_widget->kcfg_GroupTasks, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(slotUpdateComboBox()));
+    connect(m_widget->kcfg_UseCustomColors, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotUpdateCustomColors()));
 
     slotUpdateCustomColors();
     updateAppearanceCombo();
@@ -247,7 +252,6 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     {
         m_widget->kcfg_ShowAllWindows->hide();
         m_widget->kcfg_SortByDesktop->hide();
-        m_widget->spacer2->changeSize(0, 0);
     }
 
     if (!TQApplication::desktop()->isVirtualDesktop() ||
@@ -259,7 +263,8 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     {
         m_widget->showAllScreens->show();
     }
-    connect( m_widget->showAllScreens, TQT_SIGNAL( stateChanged( int )), TQT_SLOT( changed()));
+    connect( m_widget->showAllScreens, TQ_SIGNAL( stateChanged( int )), TQ_SLOT( changed()));
+    connect( m_widget->smallIcons, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) );
 
     TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmtaskbar"),
                                        I18N_NOOP("TDE Taskbar Control Module"),
@@ -274,7 +279,7 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     load();
     processLockouts();
 
-    TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
+    TQTimer::singleShot(0, this, TQ_SLOT(notChanged()));
 }
 
 TaskbarConfig::~TaskbarConfig()
@@ -286,43 +291,44 @@ TaskbarConfig::~TaskbarConfig()
 }
 
 void TaskbarConfig::slotEditGlobalConfiguration() {
-	TQByteArray data;
-	kapp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data);
+    TQByteArray data;
+    kapp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data);
 }
 
 void TaskbarConfig::processLockouts()
 {
-	m_configFileName = GLOBAL_TASKBAR_CONFIG_FILE_NAME;
-	if (m_isGlobalConfig)
-	{
-		m_widget->globalConfigWarning->show();
-		m_widget->localConfigWarning->hide();
-		m_widget->globalConfigReload->hide();
-		m_widget->globalConfigEdit->hide();
-		m_widget->kcfg_UseGlobalSettings->hide();
-	}
-	else {
-		m_widget->globalConfigWarning->hide();
-		m_widget->localConfigWarning->show();
-		m_widget->kcfg_UseGlobalSettings->show();
-		if (m_widget->kcfg_UseGlobalSettings->isChecked()) {
-			m_widget->taskbarGroup->hide();
-			m_widget->actionsGroup->hide();
-			m_widget->globalConfigReload->hide();
-			m_widget->globalConfigEdit->show();
-		}
-		else {
-			m_widget->taskbarGroup->show();
-			m_widget->actionsGroup->show();
-			// FIXME
-			// Disable this feature until a method can be found to force the TDECModule to reload its settings from disk after the global settings have been copied!
-			//m_widget->globalConfigReload->show();
-			m_widget->globalConfigReload->hide();
-			m_widget->globalConfigEdit->hide();
-		}
-	}
-
-	m_widget->kcfg_AllowDragAndDropReArrange->setEnabled(!m_widget->kcfg_SortByApp->isChecked());
+    m_configFileName = GLOBAL_TASKBAR_CONFIG_FILE_NAME;
+    if (m_isGlobalConfig)
+    {
+        m_widget->globalConfigWarning->show();
+        m_widget->localConfigWarning->hide();
+        m_widget->globalConfigReload->hide();
+        m_widget->globalConfigEdit->hide();
+        m_widget->kcfg_UseGlobalSettings->hide();
+        m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Maximum);
+    }
+    else {
+        m_widget->globalConfigWarning->hide();
+        m_widget->localConfigWarning->show();
+        m_widget->kcfg_UseGlobalSettings->show();
+        if (m_widget->kcfg_UseGlobalSettings->isChecked()) {
+            m_widget->tabs->hide();
+            m_widget->globalConfigReload->hide();
+            m_widget->globalConfigEdit->show();
+            m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::MinimumExpanding);
+        }
+        else {
+            m_widget->tabs->show();
+            // FIXME
+            // Disable this feature until a method can be found to force the TDECModule to reload its settings from disk after the global settings have been copied!
+            //m_widget->globalConfigReload->show();
+            m_widget->globalConfigReload->hide();
+            m_widget->globalConfigEdit->hide();
+            m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Maximum);
+        }
+    }
+
+    m_widget->kcfg_AllowDragAndDropReArrange->setEnabled(!m_widget->kcfg_SortByApp->isChecked());
 }
 
 void TaskbarConfig::slotReloadConfigurationFromGlobals()
@@ -384,23 +390,50 @@ void TaskbarConfig::updateAppearanceCombo()
     if (i < m_appearances.count())
     {
         m_widget->appearance->setCurrentItem(i);
+        m_widget->customAppearance->setEnabled(false);
         return;
     }
 
-    if (m_widget->appearance->count() == (int)m_appearances.count())
+    m_widget->appearance->setCurrentItem(m_appearances.count());
+    m_widget->customAppearance->setEnabled(true);
+}
+
+void TaskbarConfig::updateCustomAppearance()
+{
+    m_widget->kcfg_DrawButtons      ->setChecked(m_settingsObject->drawButtons());
+    m_widget->kcfg_HaloText         ->setChecked(m_settingsObject->haloText());
+    m_widget->kcfg_ShowButtonOnHover->setChecked(m_settingsObject->showButtonOnHover());
+}
+
+void TaskbarConfig::updateIconsTextCombo()
+{
+    if (m_widget->kcfg_DisplayIconsNText->currentText() == "Text only")
     {
-        m_widget->appearance->insertItem(i18n("Custom"));
+        m_widget->useIconsFrame->setEnabled(false);
+    }
+    else
+    {
+        m_widget->useIconsFrame->setEnabled(true);
     }
-
-    m_widget->appearance->setCurrentItem(m_appearances.count());
 }
 
 void TaskbarConfig::appearanceChanged(int selected)
 {
-    if (selected < (int)m_appearances.count())
+    if (selected < m_appearances.count())
+    {
+        m_widget->customAppearance->setEnabled(false);
+    }
+    else if(selected == m_appearances.count())
     {
-        unmanagedWidgetChangeState(!m_appearances[selected].matchesSettings());
+        m_widget->customAppearance->setEnabled(true);
+        updateCustomAppearance();
     }
+    unmanagedWidgetChangeState(true);
+}
+
+void TaskbarConfig::displayIconsNTextChanged(int selected)
+{
+    m_widget->useIconsFrame->setEnabled(selected != 1);  // 1 == Text only
 }
 
 void TaskbarConfig::load()
@@ -408,20 +441,37 @@ void TaskbarConfig::load()
     TDECModule::load();
     slotUpdateComboBox();
     updateAppearanceCombo();
+    updateIconsTextCombo();
     m_widget->showAllScreens->setChecked(!m_settingsObject->showCurrentScreenOnly());
+
+    int iconSize = m_settingsObject->iconSize();
+    if(kapp->iconLoader()->currentSize(TDEIcon::Small) != iconSize)
+    {
+        m_widget->smallIcons->setChecked(false);
+    }
 }
 
 void TaskbarConfig::save()
 {
+    TDECModule::save();
+
+    if(m_widget->smallIcons->isChecked())
+    {
+        m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Small));
+    }
+    else
+    {
+        m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Panel));
+    }
+
     m_settingsObject->setShowCurrentScreenOnly(!m_widget->showAllScreens->isChecked());
     int selectedAppearance = m_widget->appearance->currentItem();
     if (selectedAppearance < (int)m_appearances.count())
     {
         m_appearances[selectedAppearance].alterSettings();
-        m_settingsObject->writeConfig();
     }
 
-    TDECModule::save();
+    m_settingsObject->writeConfig();
 
     TQByteArray data;
     kapp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data);
@@ -432,6 +482,7 @@ void TaskbarConfig::defaults()
     TDECModule::defaults();
     slotUpdateComboBox();
     updateAppearanceCombo();
+    updateIconsTextCombo();
 }
 
 void TaskbarConfig::notChanged()
diff --git a/kcontrol/taskbar/kcmtaskbar.h b/kcontrol/taskbar/kcmtaskbar.h
index 4d644bd0f..a67386abf 100644
--- a/kcontrol/taskbar/kcmtaskbar.h
+++ b/kcontrol/taskbar/kcmtaskbar.h
@@ -52,7 +52,7 @@ class TaskbarAppearance
 
 class TaskbarConfig : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TaskbarConfig(TQWidget *parent = 0, const char* name = 0,
@@ -67,6 +67,7 @@ public slots:
 protected slots:
     void slotUpdateComboBox();
     void appearanceChanged(int);
+    void displayIconsNTextChanged(int);
     void notChanged();
     void slotUpdateCustomColors();
 
@@ -78,6 +79,8 @@ private slots:
 private:
     TaskbarAppearance::List m_appearances;
     void updateAppearanceCombo();
+    void updateIconsTextCombo();
+    void updateCustomAppearance();
     static const TQStringList& actionList();
     static TQStringList i18nActionList();
     static const TQStringList& groupModeList();
diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui
index f5c36e2b2..385991e55 100644
--- a/kcontrol/taskbar/kcmtaskbarui.ui
+++ b/kcontrol/taskbar/kcmtaskbarui.ui
@@ -8,8 +8,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>358</width>
-            <height>351</height>
+            <width>817</width>
+            <height>828</height>
         </rect>
     </property>
     <property name="caption">
@@ -22,581 +22,1139 @@
             <cstring>unnamed</cstring>
         </property>
         <property name="margin">
-            <number>0</number>
+            <number>5</number>
         </property>
-	<widget class="TQGroupBox">
-		<property name="name">
-			<cstring>GroupBox2</cstring>
-		</property>
-		<property name="title">
-			<string>Settings</string>
-		</property>
-		<grid>
-			<property name="name">
-				<cstring>unnamed</cstring>
-			</property>
-			<widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
-				<property name="name">
-					<cstring>globalConfigWarning</cstring>
-				</property>
-				<property name="text">
-					<string>&lt;b&gt;NOTE: Currently you are editing the global taskbar configuration.&lt;/b&gt;&lt;br&gt;To change the configuration of a specific taskbar (when using multiple taskbars), use the corresponding Configure Taskbar menu option, located in the taskbar handle popup menu.</string>
-				</property>
-			</widget>
-			<widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
-				<property name="name">
-					<cstring>localConfigWarning</cstring>
-				</property>
-				<property name="text">
-					<string>&lt;b&gt;NOTE:&lt;/b&gt; Currently you are editing the taskbar configuration for &lt;b&gt;only&lt;/b&gt; this taskbar.</string>
-				</property>
-			</widget>
-			<widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
-				<property name="name">
-					<cstring>kcfg_UseGlobalSettings</cstring>
-				</property>
-				<property name="text">
-					<string>Use global floating taskbar configuration</string>
-				</property>
-				<property name="checked">
-					<bool>true</bool>
-				</property>
-				<property name="whatsThis" stdset="0">
-					<string>Selecting this option causes the taskbar to use the global taskbar configuration.</string>
-				</property>
-			</widget>
-			<widget class="TQPushButton" row="2" column="0" rowspan="1" colspan="2">
-				<property name="name">
-					<cstring>globalConfigReload</cstring>
-				</property>
-				<property name="text">
-					<string>Overwrite current configuration with the current global floating taskbar configuration</string>
-				</property>
-			</widget>
-			<widget class="TQPushButton" row="3" column="0" rowspan="1" colspan="2">
-				<property name="name">
-					<cstring>globalConfigEdit</cstring>
-				</property>
-				<property name="text">
-					<string>Edit global floating taskbar configuration</string>
-				</property>
-			</widget>
-		</grid>
-	</widget>
-        <widget class="TQButtonGroup">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>taskbarGroup</cstring>
+                <cstring>layout3</cstring>
             </property>
-            <property name="title">
-                <string>Taskbar</string>
-            </property>
-            <property name="layoutMargin" stdset="0">
-            </property>
-            <property name="layoutSpacing" stdset="0">
-            </property>
-            <grid>
+            <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
-                    <property name="name">
-                        <cstring>kcfg_ShowAllWindows</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Show windows from all desktops</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; the windows on the current desktop. 
-
-By default, this option is selected and all windows are shown.</string>
-                    </property>
-                </widget>
-                <widget class="TQCheckBox" row="1" column="1" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>kcfg_SortByDesktop</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Sort windows by desk&amp;top</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Selecting this option causes the taskbar to show windows in order of the desktop they appear on.
-
-By default this option is selected.</string>
-                    </property>
-                </widget>
-                <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
+                <widget class="TQLabel">
                     <property name="name">
-                        <cstring>showAllScreens</cstring>
+                        <cstring>localConfigWarning</cstring>
                     </property>
                     <property name="text">
-                        <string>Show windows from all sc&amp;reens</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; windows which are on the same Xinerama screen as the taskbar.
-
-By default, this option is selected and all windows are shown.</string>
+                        <string>&lt;b&gt;NOTE:&lt;/b&gt; Currently you are editing the taskbar configuration for &lt;b&gt;only&lt;/b&gt; this taskbar.</string>
                     </property>
                 </widget>
-                <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3">
+                <widget class="TQLabel">
                     <property name="name">
-                        <cstring>kcfg_SortByApp</cstring>
+                        <cstring>globalConfigWarning</cstring>
                     </property>
                     <property name="text">
-                        <string>Sort alphabeticall&amp;y by application name</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
+                        <string>&lt;b&gt;NOTE: Currently you are editing the global taskbar configuration.&lt;/b&gt;&lt;br&gt;To change the configuration of a specific taskbar (when using multiple taskbars), use the corresponding Configure Taskbar menu option, located in the taskbar handle popup menu.</string>
                     </property>
                 </widget>
-                <widget class="TQCheckBox" row="4" column="1" rowspan="1" colspan="2">
+                <widget class="TQCheckBox">
                     <property name="name">
-                        <cstring>kcfg_AllowDragAndDropReArrange</cstring>
+                        <cstring>kcfg_UseGlobalSettings</cstring>
                     </property>
                     <property name="text">
-                        <string>&amp;Allow taskbar items to be rearranged using drag and drop</string>
+                        <string>Use global floating taskbar configuration</string>
                     </property>
                     <property name="checked">
                         <bool>true</bool>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>Turning this option on will allow tasks on the taskbar to be manually rearranged using drag and drop.</string>
-                    </property>
-                </widget>
-                <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3">
-                  <property name="name">
-                    <cstring>kcfg_CycleWheel</cstring>
-                  </property>
-                  <property name="text">
-                    <string>Cycle through windows with mouse wheel</string>
-                  </property>
-                  <property name="checked">
-                    <bool>true</bool>
-                  </property>
-                </widget>
-                <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3">
-                    <property name="name">
-                        <cstring>kcfg_ShowOnlyIconified</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Show o&amp;nly minimized windows</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Select this option if you want the taskbar to display &lt;b&gt;only&lt;/b&gt; minimized windows. 
-
-By default, this option is not selected and the taskbar will show all windows.</string>
-                    </property>
-                </widget>
-                <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="3">
-                    <property name="name">
-                        <cstring>kcfg_ShowWindowListBtn</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Show window list &amp;button</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Selecting this option causes the taskbar to display a button that, when clicked, shows a list of all windows in a popup menu.</string>
-                    </property>
-                </widget>
-                <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>displayIconsNText</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Dis&amp;play:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>kcfg_DisplayIconsNText</cstring>
-                    </property>
-                </widget>
-                <widget class="TQComboBox" row="8" column="2">
-                    <property name="name">
-                        <cstring>kcfg_DisplayIconsNText</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Choose taskbar display mode among &lt;strong&gt;Icons and text&lt;/strong&gt;, &lt;strong&gt;Text only&lt;/strong&gt; and &lt;strong&gt;Icons only&lt;/strong&gt;.</string>
-                    </property>
-                </widget>
-                <widget class="TQComboBox" row="9" column="2">
-                    <property name="name">
-                        <cstring>kcfg_GroupTasks</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>The taskbar can group similar windows into single buttons. When one of these window group buttons are clicked on a menu appears showing all the windows in that group. This can be especially useful with the &lt;em&gt;Show all windows&lt;/em&gt; option.
-
-You can set the taskbar to &lt;strong&gt;Never&lt;/strong&gt; group windows, to &lt;strong&gt;Always&lt;/strong&gt; group windows or to group windows only &lt;strong&gt;When the Taskbar is Full&lt;/strong&gt;.
-
-By default the taskbar groups windows when it is full.</string>
-                    </property>
-                </widget>
-                <widget class="TQLabel" row="9" column="0" rowspan="1" colspan="2">
-                    <property name="name">
-			                  <cstring>groupTasksLabel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Group similar tasks:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>kcfg_GroupTasks</cstring>
-                    </property>
-                </widget>
-                <widget class="TQComboBox" row="10" column="2">
-                    <property name="name">
-                        <cstring>kcfg_ShowTaskStates</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-			                  <string>The taskbar can show and/or hide tasks based on their current process state.  Select &lt;em&gt;Any&lt;/em&gt; to show all tasks regardless of current state.</string>
+                        <string>Selecting this option causes the taskbar to use the global taskbar configuration.</string>
                     </property>
                 </widget>
-                <widget class="TQLabel" row="10" column="0" rowspan="1" colspan="2">
+                <widget class="TQPushButton">
                     <property name="name">
-                        <cstring>showTaskStatesLabel</cstring>
+                        <cstring>globalConfigReload</cstring>
                     </property>
                     <property name="text">
-			                  <string>&amp;Show tasks with state:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>kcfg_ShowTaskStates</cstring>
-                    </property>
-                </widget>
-                <widget class="TQComboBox" row="11" column="2">
-                    <property name="name">
-                        <cstring>appearance</cstring>
+                        <string>Overwrite current configuration with the current global floating taskbar configuration</string>
                     </property>
                 </widget>
-                <widget class="TQLabel" row="11" column="0" rowspan="1" colspan="2">
+                <widget class="TQPushButton">
                     <property name="name">
-                        <cstring>textLabel1</cstring>
+                        <cstring>globalConfigEdit</cstring>
                     </property>
                     <property name="text">
-                        <string>A&amp;ppearance:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>appearance</cstring>
+                        <string>Edit global floating taskbar configuration</string>
                     </property>
                 </widget>
-                <widget class="TQCheckBox" row="12" column="0" rowspan="1" colspan="2">
+                <spacer>
                     <property name="name">
-                        <cstring>kcfg_UseCustomColors</cstring>
+                        <cstring>localLikeGlobalSpacer</cstring>
                     </property>
-                    <property name="enabled">
-                        <bool>true</bool>
+                    <property name="orientation">
+                        <enum>Vertical</enum>
                     </property>
-                    <property name="text">
-                        <string>Use &amp;custom colors</string>
+                    <property name="sizeType">
+                        <enum>Maximum</enum>
                     </property>
-                    <property name="checked">
-                        <bool>true</bool>
+                    <property name="sizeHint">
+                        <size>
+                            <width>20</width>
+                            <height>1</height>
+                        </size>
                     </property>
-                </widget>
-                <widget class="TQLayoutWidget" row="13" column="0" rowspan="1" colspan="3">
+                </spacer>
+            </vbox>
+        </widget>
+        <widget class="TQTabWidget">
+            <property name="name">
+                <cstring>tabs</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>3</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <widget class="TQWidget">
+                <property name="name">
+                    <cstring>tab</cstring>
+                </property>
+                <attribute name="title">
+                    <string>&amp;Tasks</string>
+                </attribute>
+                <vbox>
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>unnamed</cstring>
                     </property>
-                    <grid>
+                    <widget class="TQButtonGroup">
                         <property name="name">
-                            <cstring>unnamed</cstring>
+                            <cstring>grpDisplay</cstring>
                         </property>
-                        <widget class="TQLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>inactiveTaskTextColorLabel</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Inacti&amp;ve task text color:</string>
-                            </property>
-                            <property name="buddy" stdset="0">
-                                <cstring>kcfg_InactiveTaskTextColor</cstring>
-                            </property>
-                        </widget>
-                        <widget class="KColorButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>kcfg_InactiveTaskTextColor</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <spacer row="0" column="2">
-                            <property name="name">
-                                <cstring>spacer11</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Horizontal</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>191</width>
-                                    <height>20</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="TQLabel" row="0" column="3">
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>5</hsizetype>
+                                <vsizetype>4</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="title">
+                            <string>Display</string>
+                        </property>
+                        <grid>
                             <property name="name">
-                                <cstring>activeTaskTextColorLabel</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Active task te&amp;xt color:</string>
+                                <cstring>unnamed</cstring>
                             </property>
-                            <property name="buddy" stdset="0">
-                                <cstring>kcfg_ActiveTaskTextColor</cstring>
-                            </property>
-                        </widget>
-                        <widget class="KColorButton" row="0" column="4">
+                            <widget class="TQCheckBox" row="0" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>kcfg_ShowAllWindows</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Show windows from all desktops</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; the windows on the current desktop. By default, this option is selected and all windows are shown.</string>
+                                </property>
+                            </widget>
+                            <spacer row="1" column="0">
+                                <property name="name">
+                                    <cstring>spacer2_2_3</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Fixed</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                            <widget class="TQCheckBox" row="1" column="1" colspan="3">
+                                <property name="name">
+                                    <cstring>kcfg_SortByDesktop</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Sort windows by desk&amp;top</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Selecting this option causes the taskbar to show windows in order of the desktop they appear on. By default this option is selected.</string>
+                                </property>
+                            </widget>
+                            <widget class="TQCheckBox" row="2" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>showAllScreens</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Show windows from all sc&amp;reens</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; windows which are on the same Xinerama screen as the taskbar. By default, this option is selected and all windows are shown.</string>
+                                </property>
+                            </widget>
+                            <widget class="TQCheckBox" row="3" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>kcfg_ShowOnlyIconified</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Show o&amp;nly minimized windows</string>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Select this option if you want the taskbar to display &lt;b&gt;only&lt;/b&gt; minimized windows. By default, this option is not selected and the taskbar will show all windows.</string>
+                                </property>
+                            </widget>
+                            <widget class="KSeparator" row="4" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>kSeparator5</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQLabel" row="5" column="0" rowspan="2" colspan="2">
+                                <property name="name">
+                                    <cstring>showTaskStatesLabel</cstring>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>250</width>
+                                        <height>0</height>
+                                    </size>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Show tasks with state:</string>
+                                </property>
+                                <property name="buddy" stdset="0">
+                                    <cstring>kcfg_ShowTaskStates</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQComboBox" row="5" column="2" rowspan="2">
+                                <property name="name">
+                                    <cstring>kcfg_ShowTaskStates</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>7</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>250</width>
+                                        <height>0</height>
+                                    </size>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>The taskbar can show and/or hide tasks based on their current process state. Select &lt;em&gt;Any&lt;/em&gt; to show all tasks regardless of current state.</string>
+                                </property>
+                            </widget>
+                            <spacer row="6" column="3">
+                                <property name="name">
+                                    <cstring>spacer23</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>31</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                        </grid>
+                    </widget>
+                    <widget class="TQButtonGroup">
+                        <property name="name">
+                            <cstring>grpSortGroup</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>5</hsizetype>
+                                <vsizetype>4</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="title">
+                            <string>Sorting and grouping</string>
+                        </property>
+                        <grid>
                             <property name="name">
-                                <cstring>kcfg_ActiveTaskTextColor</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
+                                <cstring>unnamed</cstring>
                             </property>
-                        </widget>
-                        <spacer row="0" column="5">
+                            <spacer row="1" column="0">
+                                <property name="name">
+                                    <cstring>spacer2_2</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Fixed</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                            <widget class="TQCheckBox" row="1" column="1" colspan="3">
+                                <property name="name">
+                                    <cstring>kcfg_AllowDragAndDropReArrange</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Allow taskbar items to be rearranged using drag and drop</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Turning this option on will allow tasks on the taskbar to be manually rearranged using drag and drop.</string>
+                                </property>
+                            </widget>
+                            <widget class="TQCheckBox" row="0" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>kcfg_SortByApp</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Sort alphabeticall&amp;y by application name</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                            </widget>
+                            <widget class="KSeparator" row="3" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>kSeparator6</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQLabel" row="4" column="0" colspan="2">
+                                <property name="name">
+                                    <cstring>groupTasksLabel</cstring>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>250</width>
+                                        <height>0</height>
+                                    </size>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Group similar tasks:</string>
+                                </property>
+                                <property name="buddy" stdset="0">
+                                    <cstring>kcfg_GroupTasks</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQComboBox" row="4" column="2">
+                                <property name="name">
+                                    <cstring>kcfg_GroupTasks</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>7</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>300</width>
+                                        <height>0</height>
+                                    </size>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>The taskbar can group similar windows into single buttons. When one of these window group buttons are clicked on a menu appears showing all the windows in that group. This can be especially useful with the &lt;em&gt;Show all windows&lt;/em&gt; option. You can set the taskbar to &lt;strong&gt;Never&lt;/strong&gt; group windows, to &lt;strong&gt;Always&lt;/strong&gt; group windows or to group windows only &lt;strong&gt;When the Taskbar is Full&lt;/strong&gt;. By default the taskbar groups windows when it is full.</string>
+                                </property>
+                            </widget>
+                            <spacer row="4" column="3">
+                                <property name="name">
+                                    <cstring>spacer23_2</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>31</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                        </grid>
+                    </widget>
+                    <spacer>
+                        <property name="name">
+                            <cstring>spacer16</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Minimum</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                </vbox>
+            </widget>
+            <widget class="TQWidget">
+                <property name="name">
+                    <cstring>TabPage</cstring>
+                </property>
+                <attribute name="title">
+                    <string>&amp;Appearance</string>
+                </attribute>
+                <grid>
+                    <property name="name">
+                        <cstring>unnamed</cstring>
+                    </property>
+                    <spacer row="2" column="1">
+                        <property name="name">
+                            <cstring>spacer21</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Minimum</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget class="TQButtonGroup" row="0" column="1">
+                        <property name="name">
+                            <cstring>grpTaskbarColors</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>3</hsizetype>
+                                <vsizetype>5</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="title">
+                            <string>Colors</string>
+                        </property>
+                        <grid>
                             <property name="name">
-                                <cstring>spacer11_2</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Horizontal</enum>
+                                <cstring>unnamed</cstring>
                             </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>191</width>
-                                    <height>20</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="TQLabel" row="0" column="6">
+                            <spacer row="2" column="0">
+                                <property name="name">
+                                    <cstring>spacer2_2_2</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Fixed</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                            <widget class="TQCheckBox" row="1" column="0" colspan="3">
+                                <property name="name">
+                                    <cstring>kcfg_UseCustomColors</cstring>
+                                </property>
+                                <property name="enabled">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="text">
+                                    <string>Use &amp;custom colors</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                            </widget>
+                            <widget class="TQLayoutWidget" row="2" column="1" colspan="2">
+                                <property name="name">
+                                    <cstring>layout19</cstring>
+                                </property>
+                                <grid>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <widget class="TQLabel" row="1" column="0">
+                                        <property name="name">
+                                            <cstring>activeTaskTextColorLabel</cstring>
+                                        </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>1</hsizetype>
+                                                <vsizetype>5</vsizetype>
+                                                <horstretch>0</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
+                                        </property>
+                                        <property name="text">
+                                            <string>Active task te&amp;xt color:</string>
+                                        </property>
+                                        <property name="buddy" stdset="0">
+                                            <cstring>kcfg_ActiveTaskTextColor</cstring>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQLabel" row="2" column="0">
+                                        <property name="name">
+                                            <cstring>taskBackgroundColorLabel</cstring>
+                                        </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>1</hsizetype>
+                                                <vsizetype>5</vsizetype>
+                                                <horstretch>0</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
+                                        </property>
+                                        <property name="text">
+                                            <string>&amp;Background color:</string>
+                                        </property>
+                                        <property name="buddy" stdset="0">
+                                            <cstring>kcfg_TaskBackgroundColor</cstring>
+                                        </property>
+                                    </widget>
+                                    <widget class="KColorButton" row="0" column="1">
+                                        <property name="name">
+                                            <cstring>kcfg_InactiveTaskTextColor</cstring>
+                                        </property>
+                                    </widget>
+                                    <widget class="KColorButton" row="1" column="1">
+                                        <property name="name">
+                                            <cstring>kcfg_ActiveTaskTextColor</cstring>
+                                        </property>
+                                    </widget>
+                                    <widget class="KColorButton" row="2" column="1">
+                                        <property name="name">
+                                            <cstring>kcfg_TaskBackgroundColor</cstring>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQLabel" row="0" column="0">
+                                        <property name="name">
+                                            <cstring>inactiveTaskTextColorLabel</cstring>
+                                        </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>1</hsizetype>
+                                                <vsizetype>5</vsizetype>
+                                                <horstretch>0</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
+                                        </property>
+                                        <property name="text">
+                                            <string>Inacti&amp;ve task text color:</string>
+                                        </property>
+                                        <property name="buddy" stdset="0">
+                                            <cstring>kcfg_InactiveTaskTextColor</cstring>
+                                        </property>
+                                    </widget>
+                                </grid>
+                            </widget>
+                        </grid>
+                    </widget>
+                    <widget class="TQButtonGroup" row="1" column="1">
+                        <property name="name">
+                            <cstring>grpAppearanceMisc</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>1</hsizetype>
+                                <vsizetype>5</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="title">
+                            <string>Miscellaneous</string>
+                        </property>
+                        <grid>
                             <property name="name">
-                                <cstring>taskBackgroundColorLabel</cstring>
-                            </property>
-                            <property name="text">
-                                <string>&amp;Background color:</string>
-                            </property>
-                            <property name="buddy" stdset="0">
-                                <cstring>kcfg_TaskBackgroundColor</cstring>
+                                <cstring>unnamed</cstring>
                             </property>
-                        </widget>
-                        <widget class="KColorButton" row="0" column="7">
+                            <widget class="TQCheckBox" row="0" column="0" colspan="2">
+                                <property name="name">
+                                    <cstring>kcfg_ShowWindowListBtn</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Show window list &amp;button</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Selecting this option causes the taskbar to display a button that, when clicked, shows a list of all windows in a popup menu.</string>
+                                </property>
+                            </widget>
+                            <widget class="KSeparator" row="1" column="0" colspan="2">
+                                <property name="name">
+                                    <cstring>kSeparator7</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQLabel" row="2" column="0">
+                                <property name="name">
+                                    <cstring>maxButtonWidthLabel</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Max width for buttons:</string>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>This option allows to set the maximum width for taskbar buttons.</string>
+                                </property>
+                            </widget>
+                            <widget class="TQSpinBox" row="2" column="1">
+                                <property name="name">
+                                    <cstring>kcfg_MaximumButtonWidth</cstring>
+                                </property>
+                                <property name="suffix">
+                                    <string> px</string>
+                                </property>
+                                <property name="maxValue">
+                                    <number>500</number>
+                                </property>
+                                <property name="minValue">
+                                    <number>10</number>
+                                </property>
+                                <property name="value">
+                                    <number>200</number>
+                                </property>
+                            </widget>
+                        </grid>
+                    </widget>
+                    <widget class="TQButtonGroup" row="1" column="0">
+                        <property name="name">
+                            <cstring>grpIconsNText</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>7</hsizetype>
+                                <vsizetype>5</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="title">
+                            <string>Icons</string>
+                        </property>
+                        <grid>
                             <property name="name">
-                                <cstring>kcfg_TaskBackgroundColor</cstring>
+                                <cstring>unnamed</cstring>
                             </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <spacer row="0" column="8">
+                            <widget class="TQLabel" row="0" column="0">
+                                <property name="name">
+                                    <cstring>displayIconsNTextLabel</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Dis&amp;play:</string>
+                                </property>
+                                <property name="buddy" stdset="0">
+                                    <cstring>kcfg_DisplayIconsNText</cstring>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>130</width>
+                                        <height>0</height>
+                                    </size>
+                                </property>
+                            </widget>
+                            <spacer row="0" column="1">
+                                <property name="name">
+                                    <cstring>spacer2_2_2_3_3</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Fixed</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                            <widget class="TQComboBox" row="0" column="2" colspan="2">
+                                <property name="name">
+                                    <cstring>kcfg_DisplayIconsNText</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>5</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Choose taskbar display mode among &lt;strong&gt;Icons and text&lt;/strong&gt;, &lt;strong&gt;Text only&lt;/strong&gt; and &lt;strong&gt;Icons only&lt;/strong&gt;.</string>
+                                </property>
+                            </widget>
+                            <widget class="TQFrame" row="1" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>useIconsFrame</cstring>
+                                </property>
+                                <property name="enabled">
+                                    <bool>false</bool>
+                                </property>
+                                <property name="frameShape">
+                                    <enum>StyledPanel</enum>
+                                </property>
+                                <property name="frameShadow">
+                                    <enum>Raised</enum>
+                                </property>
+                                <grid>
+                                    <widget class="TQCheckBox" row="0" column="0" colspan="3">
+                                        <property name="name">
+                                            <cstring>smallIcons</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Small icons</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>Selecting this option makes the taskbar use small icons.</string>
+                                        </property>
+                                        <property name="checked">
+                                            <bool>true</bool>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQCheckBox" row="1" column="0" colspan="3">
+                                        <property name="name">
+                                            <cstring>kcfg_ShowThumbnails</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Show thumbnails on hover</string>
+                                        </property>
+                                    </widget>
+                                    <spacer row="2" column="0">
+                                        <property name="name">
+                                            <cstring>spacer2_2_2_3</cstring>
+                                        </property>
+                                        <property name="orientation">
+                                            <enum>Horizontal</enum>
+                                        </property>
+                                        <property name="sizeType">
+                                            <enum>Fixed</enum>
+                                        </property>
+                                        <property name="sizeHint">
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                    <widget class="TQLabel" row="2" column="1">
+                                        <property name="name">
+                                            <cstring>thumbMaxDimensionLabel</cstring>
+                                        </property>
+                                        <property name="enabled">
+                                            <bool>false</bool>
+                                        </property>
+                                        <property name="text">
+                                            <string>Maximum dimension:</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQSpinBox" row="2" column="2">
+                                        <property name="name">
+                                            <cstring>kcfg_ThumbnailMaxDimension</cstring>
+                                        </property>
+                                        <property name="enabled">
+                                            <bool>false</bool>
+                                        </property>
+                                        <property name="suffix">
+                                            <string> px</string>
+                                        </property>
+                                        <property name="maxValue">
+                                            <number>500</number>
+                                        </property>
+                                        <property name="minValue">
+                                            <number>50</number>
+                                        </property>
+                                        <property name="value">
+                                            <number>100</number>
+                                        </property>
+                                    </widget>
+                                </grid>
+                            </widget>
+                        </grid>
+                    </widget>
+                    <widget class="TQButtonGroup" row="0" column="0">
+                        <property name="name">
+                            <cstring>grpTaskbarStyle</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>7</hsizetype>
+                                <vsizetype>4</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="title">
+                            <string>Button style</string>
+                        </property>
+                        <grid>
                             <property name="name">
-                                <cstring>spacer12</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Horizontal</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>191</width>
-                                    <height>20</height>
-                                </size>
+                                <cstring>unnamed</cstring>
                             </property>
-                        </spacer>
-                    </grid>
-                </widget>
-                <spacer row="1" column="0">
-                    <property name="name">
-                        <cstring>spacer2</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Fixed</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-            </grid>
-        </widget>
-        <widget class="TQGroupBox">
-            <property name="name">
-                <cstring>actionsGroup</cstring>
-            </property>
-            <property name="title">
-                <string>Actions</string>
-            </property>
-            <grid>
+                            <widget class="TQLabel" row="0" column="0">
+                                <property name="name">
+                                    <cstring>textLabel1</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Taskbar style:</string>
+                                </property>
+                                <property name="buddy" stdset="0">
+                                    <cstring>appearance</cstring>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>130</width>
+                                        <height>0</height>
+                                    </size>
+                                </property>
+                            </widget>
+                            <spacer row="0" column="1">
+                                <property name="name">
+                                    <cstring>spacer2_2_2_3_3</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Fixed</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                            <widget class="TQComboBox" row="0" column="2" colspan="2">
+                                <property name="name">
+                                    <cstring>appearance</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>5</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                            </widget>
+                            <widget class="TQFrame" row="1" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>customAppearance</cstring>
+                                </property>
+                                <property name="enabled">
+                                    <bool>false</bool>
+                                </property>
+                                <property name="frameShape">
+                                    <enum>StyledPanel</enum>
+                                </property>
+                                <property name="frameShadow">
+                                    <enum>Raised</enum>
+                                </property>
+                                <grid>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <widget class="TQCheckBox" row="0" column="0" colspan="3">
+                                        <property name="name">
+                                            <cstring>kcfg_DrawButtons</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Always draw items as buttons</string>
+                                        </property>
+                                    </widget>
+                                    <spacer row="1" column="0">
+                                        <property name="name">
+                                            <cstring>spacer2_2_2_3_3</cstring>
+                                        </property>
+                                        <property name="orientation">
+                                            <enum>Horizontal</enum>
+                                        </property>
+                                        <property name="sizeType">
+                                            <enum>Fixed</enum>
+                                        </property>
+                                        <property name="sizeHint">
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                    <widget class="TQCheckBox" row="1" column="1" colspan="2">
+                                        <property name="name">
+                                            <cstring>kcfg_ShowButtonOnHover</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Draw items as buttons on hover</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQCheckBox" row="2" column="0" colspan="3">
+                                        <property name="name">
+                                            <cstring>kcfg_HaloText</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Draw halo around text</string>
+                                        </property>
+                                        <property name="checked">
+                                            <bool>true</bool>
+                                        </property>
+                                    </widget>
+                                </grid>
+                            </widget>
+                        </grid>
+                    </widget>
+                </grid>
+            </widget>
+            <widget class="TQWidget">
                 <property name="name">
-                    <cstring>unnamed</cstring>
+                    <cstring>tab</cstring>
                 </property>
-                <widget class="TQLabel" row="0" column="0">
-                    <property name="name">
-                        <cstring>leftButtonLabel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Left button:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>kcfg_LeftButtonAction</cstring>
-                    </property>
-                </widget>
-                <widget class="TQLabel" row="1" column="0">
-                    <property name="name">
-                        <cstring>middleButtonLabel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Middle button:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>kcfg_MiddleButtonAction</cstring>
-                    </property>
-                </widget>
-                <widget class="TQLabel" row="2" column="0">
-                    <property name="name">
-                        <cstring>rightButtonLabel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Right b&amp;utton:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>kcfg_RightButtonAction</cstring>
-                    </property>
-                </widget>
-                <widget class="TQComboBox" row="0" column="1">
-                    <property name="name">
-                        <cstring>kcfg_LeftButtonAction</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                </widget>
-                <widget class="TQComboBox" row="1" column="1">
-                    <property name="name">
-                        <cstring>kcfg_MiddleButtonAction</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                </widget>
-                <widget class="TQComboBox" row="2" column="1">
+                <attribute name="title">
+                    <string>A&amp;ctions</string>
+                </attribute>
+                <vbox>
                     <property name="name">
-                        <cstring>kcfg_RightButtonAction</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
+                        <cstring>unnamed</cstring>
                     </property>
-                </widget>
-            </grid>
+                    <widget class="TQGroupBox">
+                        <property name="name">
+                            <cstring>actionsGroup</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>5</hsizetype>
+                                <vsizetype>1</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="title">
+                            <string>Mouse Actions</string>
+                        </property>
+                        <grid>
+                            <property name="name">
+                                <cstring>unnamed</cstring>
+                            </property>
+                            <widget class="TQLabel" row="0" column="0">
+                                <property name="name">
+                                    <cstring>leftButtonLabel</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Left button:</string>
+                                </property>
+                                <property name="buddy" stdset="0">
+                                    <cstring>kcfg_LeftButtonAction</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQComboBox" row="0" column="1">
+                                <property name="name">
+                                    <cstring>kcfg_LeftButtonAction</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>7</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                            </widget>
+                            <widget class="TQLabel" row="1" column="0">
+                                <property name="name">
+                                    <cstring>middleButtonLabel</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Middle button:</string>
+                                </property>
+                                <property name="buddy" stdset="0">
+                                    <cstring>kcfg_MiddleButtonAction</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQComboBox" row="1" column="1">
+                                <property name="name">
+                                    <cstring>kcfg_MiddleButtonAction</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>7</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                            </widget>
+                            <widget class="TQComboBox" row="2" column="1">
+                                <property name="name">
+                                    <cstring>kcfg_RightButtonAction</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>7</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                            </widget>
+                            <widget class="TQLabel" row="2" column="0">
+                                <property name="name">
+                                    <cstring>rightButtonLabel</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Right b&amp;utton:</string>
+                                </property>
+                                <property name="buddy" stdset="0">
+                                    <cstring>kcfg_RightButtonAction</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQCheckBox" row="4" column="0" colspan="2">
+                                <property name="name">
+                                    <cstring>kcfg_CycleWheel</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Cycle through windows with mouse wheel</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                            </widget>
+                            <spacer row="3" column="0">
+                                <property name="name">
+                                    <cstring>spacer11</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Vertical</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Fixed</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>20</width>
+                                        <height>21</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                        </grid>
+                    </widget>
+                    <spacer>
+                        <property name="name">
+                            <cstring>spacer35</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Minimum</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                </vbox>
+            </widget>
         </widget>
-        <spacer>
-            <property name="name">
-                <cstring>Spacer1</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
     </vbox>
 </widget>
+<customwidgets>
+</customwidgets>
 <connections>
     <connection>
+        <sender>kcfg_ShowThumbnails</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>kcfg_ThumbnailMaxDimension</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>kcfg_UseCustomColors</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>kcfg_InactiveTaskTextColor</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>kcfg_UseCustomColors</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>kcfg_ActiveTaskTextColor</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>kcfg_UseCustomColors</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>kcfg_TaskBackgroundColor</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>kcfg_ShowThumbnails</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>thumbMaxDimensionLabel</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>kcfg_SortByApp</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>kcfg_AllowDragAndDropReArrange</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>kcfg_DrawButtons</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>kcfg_ShowButtonOnHover</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+      <sender>kcfg_HaloText</sender>
+      <signal>toggled(bool)</signal>
+      <receiver>kcfg_ShowButtonOnHover</receiver>
+      <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
         <sender>kcfg_ShowAllWindows</sender>
         <signal>toggled(bool)</signal>
         <receiver>kcfg_SortByDesktop</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tabstops>
-    <tabstop>kcfg_ShowAllWindows</tabstop>
-    <tabstop>kcfg_SortByDesktop</tabstop>
-    <tabstop>showAllScreens</tabstop>
-    <tabstop>kcfg_SortByApp</tabstop>
-    <tabstop>kcfg_AllowDragAndDropReArrange</tabstop>
-    <tabstop>kcfg_CycleWheel</tabstop>
-    <tabstop>kcfg_ShowOnlyIconified</tabstop>
-    <tabstop>kcfg_ShowWindowListBtn</tabstop>
-    <tabstop>kcfg_DisplayIconsNText</tabstop>
-    <tabstop>kcfg_GroupTasks</tabstop>
-    <tabstop>kcfg_ShowTaskStates</tabstop>
-    <tabstop>appearance</tabstop>
-    <tabstop>kcfg_UseCustomColors</tabstop>
-    <tabstop>kcfg_InactiveTaskTextColor</tabstop>
-    <tabstop>kcfg_ActiveTaskTextColor</tabstop>
-    <tabstop>kcfg_TaskBackgroundColor</tabstop>
-    <tabstop>kcfg_LeftButtonAction</tabstop>
-    <tabstop>kcfg_MiddleButtonAction</tabstop>
-    <tabstop>kcfg_RightButtonAction</tabstop>
-</tabstops>
 <includes>
     <include location="global" impldecl="in implementation">kcolorbutton.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">kseparator.h</include>
+    <include location="global" impldecl="in implementation">tdefontcombo.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+    <include location="global" impldecl="in implementation">tqtabwidget.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
index 920326f0a..1298677b6 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
@@ -113,7 +113,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
     {
         itsSplitter=new TQSplitter(this);
         fontsFrame=new TQFrame(itsSplitter),
-        itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(itsSplitter), "kcmfontinst", "KParts::ReadOnlyPart");
+        itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart");
         itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 
         TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES));
@@ -156,10 +156,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
     fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1);
 
     KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame);
-    connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts()));
+    connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(addFonts()));
     button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
     fontsLayout->addWidget(button, 1, 0);
-    TQT_TQLAYOUT(fontsLayout)->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+    fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
 
     layout->addWidget(toolbar);
 #ifdef HAVE_XFT
@@ -182,15 +182,15 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
 
     itsViewMenuAct=dynamic_cast<TDEActionMenu *>(itsDirOp->actionCollection()->action("view menu"));
     topMnu->popupMenu()->clear();
-    connect(topMnu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupMenu()));
+    connect(topMnu->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(setupMenu()));
     if((act=itsDirOp->actionCollection()->action("up")))
-        act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(cdUp()));
+        act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(cdUp()));
     if((act=itsDirOp->actionCollection()->action("home")))
-        act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(home()));
+        act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(home()));
     if((act=itsDirOp->actionCollection()->action("back")))
-        act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(back()));
+        act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(back()));
     if((act=itsDirOp->actionCollection()->action("forward")))
-        act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(forward()));
+        act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(forward()));
 
     if((act=itsDirOp->actionCollection()->action("reload")))
         act->plug(toolbar);
@@ -199,26 +199,26 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
 
     if((itsIconAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("short view"))))
     {
-        disconnect(itsIconAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotSimpleView()));
-        connect(itsIconAct, TQT_SIGNAL(activated()), TQT_SLOT(iconView()));
+        disconnect(itsIconAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(slotSimpleView()));
+        connect(itsIconAct, TQ_SIGNAL(activated()), TQ_SLOT(iconView()));
         itsIconAct->plug(toolbar);
     }
 
     if((itsListAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("detailed view"))))
     {
-        disconnect(itsListAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotDetailedView()));
-        connect(itsListAct, TQT_SIGNAL(activated()), TQT_SLOT(listView()));
+        disconnect(itsListAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(slotDetailedView()));
+        connect(itsListAct, TQ_SIGNAL(activated()), TQ_SLOT(listView()));
         itsListAct->plug(toolbar);
     }
 
-    itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()), 
+    itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, this, TQ_SLOT(filterFonts()), 
                                        itsDirOp->actionCollection(), "showbitmap");
     itsShowBitmapAct->setChecked(showBitmap);
     itsShowBitmapAct->plug(toolbar);
 
     toolbar->insertLineSeparator();
 
-    act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, TQT_TQOBJECT(this), TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
+    act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, this, TQ_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
     act->plug(toolbar);
     topMnu->insert(act);
 
@@ -227,24 +227,24 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
         itsDeleteAct->plug(toolbar);
         itsDeleteAct->setEnabled(false);
         topMnu->insert(itsDeleteAct);
-        disconnect(itsDeleteAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(deleteSelected()));
-        connect(itsDeleteAct, TQT_SIGNAL(activated()), this, TQT_SLOT(removeFonts()));
+        disconnect(itsDeleteAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(deleteSelected()));
+        connect(itsDeleteAct, TQ_SIGNAL(activated()), this, TQ_SLOT(removeFonts()));
     }
 
     toolbar->insertLineSeparator();
-    act=new TDEAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure");
+    act=new TDEAction(i18n("Configure..."), "configure", 0, this, TQ_SLOT(configure()), itsDirOp->actionCollection(), "configure");
     act->plug(toolbar);
 #ifdef HAVE_XFT
     toolbar->insertLineSeparator();
-    act=new TDEAction(i18n("Print..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
+    act=new TDEAction(i18n("Print..."), "document-print", 0, this, TQ_SLOT(print()), itsDirOp->actionCollection(), "print");
     act->plug(toolbar);
 #endif
 
     if( (itsSepDirsAct=itsDirOp->actionCollection()->action("separate dirs")) &&
         (itsShowHiddenAct=itsDirOp->actionCollection()->action("show hidden")))
     {
-        //disconnect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), itsDirOp, TQT_SLOT(insertViewDependentActions()));
-        connect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupViewMenu()));
+        //disconnect(itsViewMenuAct->popupMenu(), TQ_SIGNAL(aboutToShow()), itsDirOp, TQ_SLOT(insertViewDependentActions()));
+        connect(itsViewMenuAct->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(setupViewMenu()));
         setupViewMenu();
     }
 
@@ -267,12 +267,12 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
 
     itsDirOp->dirLister()->setShowingDotFiles(true);
 
-    connect(itsDirOp, TQT_SIGNAL(fileHighlighted(const KFileItem *)), TQT_SLOT(fileHighlighted(const KFileItem *)));
-    connect(itsDirOp, TQT_SIGNAL(finishedLoading()), TQT_SLOT(loadingFinished()));
-    connect(itsDirOp, TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)),
-                      TQT_SLOT(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)));
-    connect(itsDirOp->dirLister(), TQT_SIGNAL(infoMessage(const TQString &)), TQT_SLOT(infoMessage(const TQString &)));
-    connect(itsDirOp, TQT_SIGNAL(updateInformation(int, int)), TQT_SLOT(updateInformation(int, int)));
+    connect(itsDirOp, TQ_SIGNAL(fileHighlighted(const KFileItem *)), TQ_SLOT(fileHighlighted(const KFileItem *)));
+    connect(itsDirOp, TQ_SIGNAL(finishedLoading()), TQ_SLOT(loadingFinished()));
+    connect(itsDirOp, TQ_SIGNAL(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)),
+                      TQ_SLOT(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)));
+    connect(itsDirOp->dirLister(), TQ_SIGNAL(infoMessage(const TQString &)), TQ_SLOT(infoMessage(const TQString &)));
+    connect(itsDirOp, TQ_SIGNAL(updateInformation(int, int)), TQ_SLOT(updateInformation(int, int)));
 }
 
 CKCmFontInst::~CKCmFontInst()
@@ -465,7 +465,7 @@ void CKCmFontInst::removeFonts()
         if(doIt)
         {
             TDEIO::DeleteJob *job = TDEIO::del(urls, false, true);
-            connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(delResult(TDEIO::Job *)));
+            connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(delResult(TDEIO::Job *)));
             job->setWindow(this);
             job->setAutoErrorHandlingEnabled(true, this);
         }
@@ -637,7 +637,7 @@ void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest)
         }
 
         TDEIO::CopyJob *job=TDEIO::copy(copy, dest, true);
-        connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(jobResult(TDEIO::Job *)));
+        connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(jobResult(TDEIO::Job *)));
         job->setWindow(this);
         job->setAutoErrorHandlingEnabled(true, this);
     }
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h
index a5dccb161..8708ef1c0 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h
+++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h
@@ -58,7 +58,7 @@ namespace KFI
 
 class CKCmFontInst : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
index 559c8c4c5..e9f5b7dae 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
@@ -79,15 +79,15 @@ CKFileFontView::CKFileFontView(TQWidget *parent, const char *name)
     setAllColumnsShowFocus(true);
     setDragEnabled(false);
 
-    connect(header(), TQT_SIGNAL(sectionClicked(int)), TQT_SLOT(slotSortingChanged(int)));
-    connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(slotActivate(TQListViewItem *)));
-    connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), TQT_SLOT(selected( TQListViewItem *)));
-    connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), TQT_SLOT(slotActivate(TQListViewItem *)));
-    connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
-	    this, TQT_SLOT(slotActivateMenu(TQListViewItem *, const TQPoint &)));
+    connect(header(), TQ_SIGNAL(sectionClicked(int)), TQ_SLOT(slotSortingChanged(int)));
+    connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(slotActivate(TQListViewItem *)));
+    connect(this, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), TQ_SLOT(selected( TQListViewItem *)));
+    connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), TQ_SLOT(slotActivate(TQListViewItem *)));
+    connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
+	    this, TQ_SLOT(slotActivateMenu(TQListViewItem *, const TQPoint &)));
 
     // DND
-    connect(&(d->itsAutoOpenTimer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoOpen()));
+    connect(&(d->itsAutoOpenTimer), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoOpen()));
     setSelectionMode(KFileView::selectionMode());
     itsResolver = new KMimeTypeResolver<CFontListViewItem, CKFileFontView>(this);
 }
@@ -211,8 +211,8 @@ void CKFileFontView::highlighted( TQListViewItem *item )
 
 void CKFileFontView::setSelectionMode(KFile::SelectionMode sm)
 {
-    disconnect(TQT_SIGNAL(selectionChanged()), this);
-    disconnect(TQT_SIGNAL(selectionChanged(TQListViewItem *)), this);
+    disconnect(TQ_SIGNAL(selectionChanged()), this);
+    disconnect(TQ_SIGNAL(selectionChanged(TQListViewItem *)), this);
 
     switch (sm)
     {
@@ -233,9 +233,9 @@ void CKFileFontView::setSelectionMode(KFile::SelectionMode sm)
 
     // for highlighting
     if (KFile::Multi==sm || KFile::Extended==sm)
-        connect(this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
+        connect(this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged()));
     else
-        connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), TQT_SLOT(highlighted(TQListViewItem * )));
+        connect(this, TQ_SIGNAL(selectionChanged(TQListViewItem *)), TQ_SLOT(highlighted(TQListViewItem * )));
 }
 
 bool CKFileFontView::isSelected(const KFileItem *i) const
diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
index 646359280..a741fead8 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
+++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
@@ -115,7 +115,7 @@ class CFontListViewItem : public TDEListViewItem
  */
 class CKFileFontView : public TDEListView, public KFileView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp
index 1956a34a6..987a44174 100644
--- a/kcontrol/tdefontinst/lib/FcEngine.cpp
+++ b/kcontrol/tdefontinst/lib/FcEngine.cpp
@@ -491,7 +491,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b
             x=offset, y=offset;
 
         pix.resize(w, h);
-        pix.fill(Qt::white);
+        pix.fill(TQt::white);
 
         TQPainter painter(&pix);
 
@@ -580,7 +580,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b
                         title=i18n("%1 [1 pixel]", "%1 [%n pixels]", itsSizes[0]).arg(title);
 
                     painter.setFont(TDEGlobalSettings::generalFont());
-                    painter.setPen(Qt::black);
+                    painter.setPen(TQt::black);
                     y=painter.fontMetrics().height();
                     drawText(painter, x, y, w-offset, title);
                     y+=4;
diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
index 41367d586..ff2eaae77 100644
--- a/kcontrol/tdefontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
@@ -65,7 +65,7 @@ void CFontPreview::showFont()
     if(!itsCurrentUrl.isEmpty() &&
        itsEngine.draw(itsCurrentUrl, itsLastWidth, itsLastHeight, itsPixmap, itsCurrentFace-1, false))
     {
-        setEraseColor(Qt::white);
+        setEraseColor(TQt::white);
         update();
         emit status(true);
     }
diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.h b/kcontrol/tdefontinst/viewpart/FontPreview.h
index 71916479e..f6ebd8dbd 100644
--- a/kcontrol/tdefontinst/viewpart/FontPreview.h
+++ b/kcontrol/tdefontinst/viewpart/FontPreview.h
@@ -42,7 +42,7 @@ namespace KFI
 
 class CFontPreview : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
index e31510ad3..c2437ef1a 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
@@ -81,7 +81,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint());
 
     itsFrame->setFrameShape(TQFrame::NoFrame);
-    itsFrame->setFocusPolicy(TQ_ClickFocus);
+    itsFrame->setFocusPolicy(TQWidget::ClickFocus);
     itsToolsFrame->setFrameShape(TQFrame::NoFrame);
     previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised);
     previewFrame->setFrameShape(TQFrame::Panel);
@@ -103,14 +103,14 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     toolsLayout->addItem(new TQSpacerItem(5, 5, TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
     toolsLayout->addWidget(itsInstallButton);
     itsToolsFrame->hide();
-    connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewStatus(bool)));
-    connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install()));
-    connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int)));
+    connect(itsPreview, TQ_SIGNAL(status(bool)), TQ_SLOT(previewStatus(bool)));
+    connect(itsInstallButton, TQ_SIGNAL(clicked()), TQ_SLOT(install()));
+    connect(itsFaceSelector, TQ_SIGNAL(valueChanged(int)), itsPreview, TQ_SLOT(showFace(int)));
 
     itsChangeTextAction=new TDEAction(i18n("Change Text..."), "text", TDEShortcut(),
-                                    this, TQT_SLOT(changeText()), actionCollection(), "changeText");
+                                    this, TQ_SLOT(changeText()), actionCollection(), "changeText");
     itsChangeTextAction->setEnabled(false);
-    itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print");
+    itsPrintAction=KStdAction::print(this, TQ_SLOT(print()), actionCollection(), "print");
     itsPrintAction->setEnabled(false);
 
     setXMLFile("tdefontviewpart.rc");
@@ -143,7 +143,7 @@ bool CFontViewPart::openFile()
 {
     // NOTE: Cant do the real open here, as dont seem to be able to use TDEIO::NetAccess functions during initial start-up.
     // Bug report 111535 indicates that calling "konqueror <font>" crashes.
-    TQTimer::singleShot(0, this, TQT_SLOT(timeout()));
+    TQTimer::singleShot(0, this, TQ_SLOT(timeout()));
     return true;
 }
 
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.h b/kcontrol/tdefontinst/viewpart/FontViewPart.h
index 24f6d8d8b..62a380f85 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.h
@@ -45,7 +45,7 @@ class CFontPreview;
 
 class CFontViewPart : public KParts::ReadOnlyPart
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
index 7ac96e9c8..a584d0888 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
@@ -39,13 +39,13 @@ namespace KFI
 
 class CFontViewPartFactory : public KLibFactory
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
     CFontViewPartFactory();
     virtual ~CFontViewPartFactory();
-    virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+    virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList());
 
     static TDEInstance * instance();
 
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
index df1fa92d2..d5ca2eba5 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
@@ -49,10 +49,10 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
 
     if(factory)
     {
-        KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
-        KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+        KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+        KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 
-        itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(this), "fontvier", "KParts::ReadOnlyPart");
+        itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart");
 
         TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         KURL         openURL;
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.h b/kcontrol/tdefontinst/viewpart/FontViewerApp.h
index cc9a5981b..3b297a197 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.h
@@ -38,7 +38,7 @@ namespace KFI
 
 class CFontViewerAppMainWindow : public KParts::MainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
diff --git a/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO b/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO
index a592d4b57..b96168964 100644
--- a/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO
+++ b/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO
@@ -29,7 +29,7 @@ NEW PROPERTIES:
 ===============
 X-TDE-UA-TAG
 FIELD:        REQUIRED
-TYPE:         QString
+TYPE:         TQString
 TRANSLATE:    NO
 DESCRIPTION:
 An abbreviation of the actual browser-brand and is used
@@ -42,7 +42,7 @@ actual user-agent name (X-TDE-UA-NAME).
 
 X-TDE-UA-FULL
 FIELD:        REQUIRED
-TYPE:         QString
+TYPE:         TQString
 TRANSLATE:    NO
 DESCRIPTION:
 The full user-agent description that will be sent to the remote
@@ -62,21 +62,21 @@ and set its value to 1 (for true).
 
 X-TDE-UA-NAME
 FIELD:        REQUIRED
-TYPE:         QString
+TYPE:         TQString
 TRANSLATE:    YES
 DESCRIPTION:
 The actual name of the browser or user-agent.
 
 X-TDE-UA-VERSION
 FIELD:        REQUIRED
-TYPE:         QString
+TYPE:         TQString
 TRANSLATE:    YES
 DESCRIPTION:
 The actual version of the browser or user-agent.
 
 X-TDE-UA-SYSNAME
 FIELD:        OPTIONAL
-TYPE:         QString
+TYPE:         TQString
 TRANSLATE:    YES
 DESCRIPTION:
 The system name (for example Linux) where the browser
@@ -84,7 +84,7 @@ identification was obtained from.
 
 X-TDE-UA-SYSRELEASE
 FIELD:        OPTIONAL
-TYPE:         QString
+TYPE:         TQString
 TRANSLATE:    YES
 DESCRIPTION:
 The system version (for example 2.4.1) where the browser
diff --git a/kcontrol/tdeio/cache.cpp b/kcontrol/tdeio/cache.cpp
index 42c0fc28f..1f7a57a85 100644
--- a/kcontrol/tdeio/cache.cpp
+++ b/kcontrol/tdeio/cache.cpp
@@ -66,10 +66,10 @@ void KCacheConfigDialog::load()
       m_dlg->rbCacheIfPossible->setChecked( true );
 
   // Config changed notifications...
-  connect ( m_dlg->cbUseCache, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()) );
-  connect ( m_dlg->bgCachePolicy, TQT_SIGNAL(clicked (int)), TQT_SLOT(configChanged()) );
-  connect ( m_dlg->sbMaxCacheSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(configChanged()) );
-  connect ( m_dlg->pbClearCache, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearCache()) );
+  connect ( m_dlg->cbUseCache, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()) );
+  connect ( m_dlg->bgCachePolicy, TQ_SIGNAL(clicked (int)), TQ_SLOT(configChanged()) );
+  connect ( m_dlg->sbMaxCacheSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(configChanged()) );
+  connect ( m_dlg->pbClearCache, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearCache()) );
   emit changed( false );
 } 
 
diff --git a/kcontrol/tdeio/cache.h b/kcontrol/tdeio/cache.h
index 03a4d0581..7adb3c0b8 100644
--- a/kcontrol/tdeio/cache.h
+++ b/kcontrol/tdeio/cache.h
@@ -28,7 +28,7 @@ class CacheDlgUI;
 
 class KCacheConfigDialog : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   KCacheConfigDialog( TQWidget* parent = 0 );
diff --git a/kcontrol/tdeio/kcookiesmain.cpp b/kcontrol/tdeio/kcookiesmain.cpp
index 9869c6c92..10ed75d26 100644
--- a/kcontrol/tdeio/kcookiesmain.cpp
+++ b/kcontrol/tdeio/kcookiesmain.cpp
@@ -46,7 +46,7 @@ KCookiesMain::KCookiesMain(TQWidget *parent)
     tab->addTab(policies, i18n("&Policy"));
     policiesTabNumber = currentTabNumber;
     currentTabNumber++;
-    connect(policies, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+    connect(policies, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
     if( managerOK )
     {
@@ -54,7 +54,7 @@ KCookiesMain::KCookiesMain(TQWidget *parent)
         tab->addTab(management, i18n("&Management"));
         managementTabNumber = currentTabNumber;
         currentTabNumber++;
-        connect(management, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+        connect(management, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
     }
 }
 
diff --git a/kcontrol/tdeio/kcookiesmain.h b/kcontrol/tdeio/kcookiesmain.h
index 99591c8ad..42a74c2ee 100644
--- a/kcontrol/tdeio/kcookiesmain.h
+++ b/kcontrol/tdeio/kcookiesmain.h
@@ -15,7 +15,7 @@ class KCookiesManagement;
 
 class KCookiesMain : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KCookiesMain(TQWidget *parent = 0L);
     ~KCookiesMain();
diff --git a/kcontrol/tdeio/kcookiesmanagement.cpp b/kcontrol/tdeio/kcookiesmanagement.cpp
index 1a9314d91..e3737ff6b 100644
--- a/kcontrol/tdeio/kcookiesmanagement.cpp
+++ b/kcontrol/tdeio/kcookiesmanagement.cpp
@@ -114,15 +114,15 @@ KCookiesManagement::KCookiesManagement(TQWidget *parent)
   mainLayout->addWidget(dlg);
   dlg->lvCookies->setSorting(0);
 
-  connect(dlg->lvCookies, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(getCookies(TQListViewItem*)) );
-  connect(dlg->lvCookies, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(showCookieDetails(TQListViewItem*)) );
+  connect(dlg->lvCookies, TQ_SIGNAL(expanded(TQListViewItem*)), TQ_SLOT(getCookies(TQListViewItem*)) );
+  connect(dlg->lvCookies, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(showCookieDetails(TQListViewItem*)) );
 
-  connect(dlg->pbDelete, TQT_SIGNAL(clicked()), TQT_SLOT(deleteCookie()));
-  connect(dlg->pbDeleteAll, TQT_SIGNAL(clicked()), TQT_SLOT(deleteAllCookies()));
-  connect(dlg->pbReload, TQT_SIGNAL(clicked()), TQT_SLOT(getDomains()));
-  connect(dlg->pbPolicy, TQT_SIGNAL(clicked()), TQT_SLOT(doPolicy()));
+  connect(dlg->pbDelete, TQ_SIGNAL(clicked()), TQ_SLOT(deleteCookie()));
+  connect(dlg->pbDeleteAll, TQ_SIGNAL(clicked()), TQ_SLOT(deleteAllCookies()));
+  connect(dlg->pbReload, TQ_SIGNAL(clicked()), TQ_SLOT(getDomains()));
+  connect(dlg->pbPolicy, TQ_SIGNAL(clicked()), TQ_SLOT(doPolicy()));
 
-  connect(dlg->lvCookies, TQT_SIGNAL(doubleClicked (TQListViewItem *)), TQT_SLOT(doPolicy()));
+  connect(dlg->lvCookies, TQ_SIGNAL(doubleClicked (TQListViewItem *)), TQ_SLOT(doPolicy()));
   deletedCookies.setAutoDelete(true);
   m_bDeleteAll = false;
   mainWidget = parent;
diff --git a/kcontrol/tdeio/kcookiesmanagement.h b/kcontrol/tdeio/kcookiesmanagement.h
index 51e31fbee..ffd5c034d 100644
--- a/kcontrol/tdeio/kcookiesmanagement.h
+++ b/kcontrol/tdeio/kcookiesmanagement.h
@@ -61,7 +61,7 @@ private:
 
 class KCookiesManagement : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KCookiesManagement(TQWidget *parent = 0 );
diff --git a/kcontrol/tdeio/kcookiespolicies.cpp b/kcontrol/tdeio/kcookiespolicies.cpp
index a39773cf1..6febd106e 100644
--- a/kcontrol/tdeio/kcookiespolicies.cpp
+++ b/kcontrol/tdeio/kcookiespolicies.cpp
@@ -323,40 +323,40 @@ void KCookiesPolicies::load()
   }
 
   // Connect the main swicth :) Enable/disable cookie support
-  connect( dlg->cbEnableCookies, TQT_SIGNAL( toggled(bool) ),
-           TQT_SLOT( cookiesEnabled(bool) ) );
-  connect( dlg->cbEnableCookies, TQT_SIGNAL( toggled(bool) ),
-           TQT_SLOT( configChanged() ) );
+  connect( dlg->cbEnableCookies, TQ_SIGNAL( toggled(bool) ),
+           TQ_SLOT( cookiesEnabled(bool) ) );
+  connect( dlg->cbEnableCookies, TQ_SIGNAL( toggled(bool) ),
+           TQ_SLOT( configChanged() ) );
 
   // Connect the preference check boxes...
-  connect ( dlg->cbRejectCrossDomainCookies, TQT_SIGNAL(clicked()),
-            TQT_SLOT(configChanged()));
-  connect ( dlg->cbAutoAcceptSessionCookies, TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(configChanged()));
-  connect ( dlg->cbIgnoreCookieExpirationDate, TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(configChanged()));
-
-  connect ( dlg->cbAutoAcceptSessionCookies, TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(autoAcceptSessionCookies(bool)));
-  connect ( dlg->cbIgnoreCookieExpirationDate, TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(ignoreCookieExpirationDate(bool)));
+  connect ( dlg->cbRejectCrossDomainCookies, TQ_SIGNAL(clicked()),
+            TQ_SLOT(configChanged()));
+  connect ( dlg->cbAutoAcceptSessionCookies, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(configChanged()));
+  connect ( dlg->cbIgnoreCookieExpirationDate, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(configChanged()));
+
+  connect ( dlg->cbAutoAcceptSessionCookies, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(autoAcceptSessionCookies(bool)));
+  connect ( dlg->cbIgnoreCookieExpirationDate, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(ignoreCookieExpirationDate(bool)));
 
   // Connect the default cookie policy radio buttons...
-  connect(dlg->bgDefault, TQT_SIGNAL(clicked(int)), TQT_SLOT(configChanged()));
+  connect(dlg->bgDefault, TQ_SIGNAL(clicked(int)), TQ_SLOT(configChanged()));
 
   // Connect signals from the domain specific policy listview.
-  connect( dlg->lvDomainPolicy, TQT_SIGNAL(selectionChanged()),
-           TQT_SLOT(selectionChanged()) );
-  connect( dlg->lvDomainPolicy, TQT_SIGNAL(doubleClicked (TQListViewItem *)),
-           TQT_SLOT(changePressed() ) );
-  connect( dlg->lvDomainPolicy, TQT_SIGNAL(returnPressed ( TQListViewItem * )),
-           TQT_SLOT(changePressed() ) );
+  connect( dlg->lvDomainPolicy, TQ_SIGNAL(selectionChanged()),
+           TQ_SLOT(selectionChanged()) );
+  connect( dlg->lvDomainPolicy, TQ_SIGNAL(doubleClicked (TQListViewItem *)),
+           TQ_SLOT(changePressed() ) );
+  connect( dlg->lvDomainPolicy, TQ_SIGNAL(returnPressed ( TQListViewItem * )),
+           TQ_SLOT(changePressed() ) );
 
   // Connect the buttons...
-  connect( dlg->pbNew, TQT_SIGNAL(clicked()), TQT_SLOT( addPressed() ) );
-  connect( dlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) );
-  connect( dlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) );
-  connect( dlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) );
+  connect( dlg->pbNew, TQ_SIGNAL(clicked()), TQ_SLOT( addPressed() ) );
+  connect( dlg->pbChange, TQ_SIGNAL( clicked() ), TQ_SLOT( changePressed() ) );
+  connect( dlg->pbDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deletePressed() ) );
+  connect( dlg->pbDeleteAll, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteAllPressed() ) );
 }
 
 void KCookiesPolicies::save()
diff --git a/kcontrol/tdeio/kcookiespolicies.h b/kcontrol/tdeio/kcookiespolicies.h
index 50ce7a62b..e0af0fc43 100644
--- a/kcontrol/tdeio/kcookiespolicies.h
+++ b/kcontrol/tdeio/kcookiespolicies.h
@@ -38,7 +38,7 @@ class KCookiesPolicyDlgUI;
 
 class KCookiesPolicies : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KCookiesPolicies(TQWidget *parent = 0);
diff --git a/kcontrol/tdeio/kenvvarproxydlg.cpp b/kcontrol/tdeio/kenvvarproxydlg.cpp
index e8d1c0e47..2a8b348c7 100644
--- a/kcontrol/tdeio/kenvvarproxydlg.cpp
+++ b/kcontrol/tdeio/kenvvarproxydlg.cpp
@@ -83,9 +83,9 @@ void KEnvVarProxyDlg::init()
 {
   m_bHasValidData = false;
 
-  connect( mDlg->cbShowValue, TQT_SIGNAL( clicked() ), TQT_SLOT( showValuePressed() ) );
-  connect( mDlg->pbVerify, TQT_SIGNAL( clicked() ), TQT_SLOT( verifyPressed() ) );
-  connect( mDlg->pbDetect, TQT_SIGNAL( clicked() ), TQT_SLOT( autoDetectPressed() ) );
+  connect( mDlg->cbShowValue, TQ_SIGNAL( clicked() ), TQ_SLOT( showValuePressed() ) );
+  connect( mDlg->pbVerify, TQ_SIGNAL( clicked() ), TQ_SLOT( verifyPressed() ) );
+  connect( mDlg->pbDetect, TQ_SIGNAL( clicked() ), TQ_SLOT( autoDetectPressed() ) );
 }
 
 void KEnvVarProxyDlg::setProxyData( const KProxyData& data )
diff --git a/kcontrol/tdeio/kenvvarproxydlg.h b/kcontrol/tdeio/kenvvarproxydlg.h
index 3ddbc989f..092ae4526 100644
--- a/kcontrol/tdeio/kenvvarproxydlg.h
+++ b/kcontrol/tdeio/kenvvarproxydlg.h
@@ -29,7 +29,7 @@ class EnvVarProxyDlgUI;
 
 class KEnvVarProxyDlg : public KProxyDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KEnvVarProxyDlg( TQWidget* parent = 0, const char* name = 0 );
diff --git a/kcontrol/tdeio/kmanualproxydlg.cpp b/kcontrol/tdeio/kmanualproxydlg.cpp
index 01d2b584c..0d785025d 100644
--- a/kcontrol/tdeio/kmanualproxydlg.cpp
+++ b/kcontrol/tdeio/kmanualproxydlg.cpp
@@ -63,19 +63,19 @@ void KManualProxyDlg::init()
     mDlg->sbHttps->setRange( 0, MAX_PORT_VALUE );
     mDlg->sbFtp->setRange( 0, MAX_PORT_VALUE );
 
-    connect( mDlg->pbNew, TQT_SIGNAL( clicked() ), TQT_SLOT( newPressed() ) );
-    connect( mDlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) );
-    connect( mDlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) );
-    connect( mDlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) );
+    connect( mDlg->pbNew, TQ_SIGNAL( clicked() ), TQ_SLOT( newPressed() ) );
+    connect( mDlg->pbChange, TQ_SIGNAL( clicked() ), TQ_SLOT( changePressed() ) );
+    connect( mDlg->pbDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deletePressed() ) );
+    connect( mDlg->pbDeleteAll, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteAllPressed() ) );
 
-    connect( mDlg->lbExceptions, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButtons()) );
-    connect( mDlg->lbExceptions, TQT_SIGNAL(doubleClicked (TQListBoxItem *)), TQT_SLOT(changePressed()));
+    connect( mDlg->lbExceptions, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButtons()) );
+    connect( mDlg->lbExceptions, TQ_SIGNAL(doubleClicked (TQListBoxItem *)), TQ_SLOT(changePressed()));
 
-    connect( mDlg->cbSameProxy, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( sameProxy(bool) ) );
-    connect( mDlg->pbCopyDown, TQT_SIGNAL( clicked() ), TQT_SLOT( copyDown() ) );
+    connect( mDlg->cbSameProxy, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( sameProxy(bool) ) );
+    connect( mDlg->pbCopyDown, TQ_SIGNAL( clicked() ), TQ_SLOT( copyDown() ) );
 
-    connect( mDlg->leHttp, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textChanged(const TQString&)) );
-    connect( mDlg->sbHttp, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(valueChanged (int)) );
+    connect( mDlg->leHttp, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textChanged(const TQString&)) );
+    connect( mDlg->sbHttp, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(valueChanged (int)) );
 }
 
 void KManualProxyDlg::setProxyData( const KProxyData &data )
diff --git a/kcontrol/tdeio/kmanualproxydlg.h b/kcontrol/tdeio/kmanualproxydlg.h
index 18cbd6f0a..0c59f53ff 100644
--- a/kcontrol/tdeio/kmanualproxydlg.h
+++ b/kcontrol/tdeio/kmanualproxydlg.h
@@ -30,7 +30,7 @@ class ManualProxyDlgUI;
 
 class KManualProxyDlg : public KProxyDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   KManualProxyDlg( TQWidget* parent = 0, const char* name = 0 );
diff --git a/kcontrol/tdeio/kproxydlg.cpp b/kcontrol/tdeio/kproxydlg.cpp
index 9253916d7..344392b91 100644
--- a/kcontrol/tdeio/kproxydlg.cpp
+++ b/kcontrol/tdeio/kproxydlg.cpp
@@ -54,9 +54,9 @@ KProxyOptions::KProxyOptions (TQWidget* parent )
   mTab->addTab(mProxy, i18n("&Proxy"));
   mTab->addTab(mSocks, i18n("&SOCKS"));
 
-  connect(mProxy, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
-  connect(mSocks, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
-  connect(mTab, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SIGNAL(quickHelpChanged()));
+  connect(mProxy, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
+  connect(mSocks, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
+  connect(mTab, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SIGNAL(quickHelpChanged()));
 }
 
 KProxyOptions::~KProxyOptions()
@@ -121,27 +121,27 @@ KProxyDialog::KProxyDialog( TQWidget* parent)
   mainLayout->addStretch();
   
   // signals and slots connections
-  connect( mDlg->rbNoProxy, TQT_SIGNAL( toggled(bool) ),
-            TQT_SLOT( slotUseProxyChanged() ) );
+  connect( mDlg->rbNoProxy, TQ_SIGNAL( toggled(bool) ),
+            TQ_SLOT( slotUseProxyChanged() ) );
   
-  connect( mDlg->rbAutoDiscover, TQT_SIGNAL( toggled(bool) ),
-            TQT_SLOT( slotChanged() ) );
-  connect( mDlg->rbAutoScript, TQT_SIGNAL( toggled(bool) ),
-            TQT_SLOT( slotChanged() ) );
+  connect( mDlg->rbAutoDiscover, TQ_SIGNAL( toggled(bool) ),
+            TQ_SLOT( slotChanged() ) );
+  connect( mDlg->rbAutoScript, TQ_SIGNAL( toggled(bool) ),
+            TQ_SLOT( slotChanged() ) );
   
-  connect( mDlg->rbPrompt, TQT_SIGNAL( toggled(bool) ),
-            TQT_SLOT( slotChanged() ) );
-  connect( mDlg->rbPresetLogin, TQT_SIGNAL( toggled(bool) ),
-            TQT_SLOT( slotChanged() ) );
+  connect( mDlg->rbPrompt, TQ_SIGNAL( toggled(bool) ),
+            TQ_SLOT( slotChanged() ) );
+  connect( mDlg->rbPresetLogin, TQ_SIGNAL( toggled(bool) ),
+            TQ_SLOT( slotChanged() ) );
   
-  connect( mDlg->cbPersConn, TQT_SIGNAL( toggled(bool) ),
-            TQT_SLOT( slotChanged() ) );
+  connect( mDlg->cbPersConn, TQ_SIGNAL( toggled(bool) ),
+            TQ_SLOT( slotChanged() ) );
   
-  connect( mDlg->location, TQT_SIGNAL( textChanged(const TQString&) ),
-            TQT_SLOT( slotChanged() ) );
+  connect( mDlg->location, TQ_SIGNAL( textChanged(const TQString&) ),
+            TQ_SLOT( slotChanged() ) );
   
-  connect( mDlg->pbEnvSetup, TQT_SIGNAL( clicked() ), TQT_SLOT( setupEnvProxy() ) );
-  connect( mDlg->pbManSetup, TQT_SIGNAL( clicked() ), TQT_SLOT( setupManProxy() ) );
+  connect( mDlg->pbEnvSetup, TQ_SIGNAL( clicked() ), TQ_SLOT( setupEnvProxy() ) );
+  connect( mDlg->pbManSetup, TQ_SIGNAL( clicked() ), TQ_SLOT( setupManProxy() ) );
   
   load();
 }
diff --git a/kcontrol/tdeio/kproxydlg.h b/kcontrol/tdeio/kproxydlg.h
index d70921ef9..b6718584e 100644
--- a/kcontrol/tdeio/kproxydlg.h
+++ b/kcontrol/tdeio/kproxydlg.h
@@ -33,7 +33,7 @@ class KProxyDialogUI;
 
 class KProxyOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KProxyOptions( TQWidget* parent = 0 );
@@ -54,7 +54,7 @@ private:
 
 class KProxyDialog : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KProxyDialog( TQWidget* parent = 0 );
diff --git a/kcontrol/tdeio/main.cpp b/kcontrol/tdeio/main.cpp
index c0770af9e..0116764c8 100644
--- a/kcontrol/tdeio/main.cpp
+++ b/kcontrol/tdeio/main.cpp
@@ -110,7 +110,7 @@ LanBrowser::LanBrowser(TQWidget *parent)
    tabs.addTab(smbPage, i18n("&Windows Shares"));
    smbPageTabNumber = currentTabNumber;
    currentTabNumber++;
-   connect(smbPage,TQT_SIGNAL(changed(bool)), TQT_SLOT( changed() ));
+   connect(smbPage,TQ_SIGNAL(changed(bool)), TQ_SLOT( changed() ));
 
    lisaPage = TDECModuleLoader::loadModule("kcmlisa", TDECModuleLoader::None, &tabs);
    if (lisaPage)
@@ -118,14 +118,14 @@ LanBrowser::LanBrowser(TQWidget *parent)
      tabs.addTab(lisaPage,i18n("&LISa Daemon"));
      lisaPageTabNumber = currentTabNumber;
      currentTabNumber++;
-     connect(lisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
+     connect(lisaPage,TQ_SIGNAL(changed()), TQ_SLOT( changed() ));
    }
 
 //   resLisaPage = TDECModuleLoader::loadModule("kcmreslisa", &tabs);
 //   if (resLisaPage)
 //   {
 //     tabs.addTab(resLisaPage,i18n("R&esLISa Daemon"));
-//     connect(resLisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
+//     connect(resLisaPage,TQ_SIGNAL(changed()), TQ_SLOT( changed() ));
 //   }
 
    tdeioLanPage = TDECModuleLoader::loadModule("kcmtdeiolan",  TDECModuleLoader::None, &tabs);
@@ -134,7 +134,7 @@ LanBrowser::LanBrowser(TQWidget *parent)
      tabs.addTab(tdeioLanPage,i18n("lan:/ Iosla&ve"));
      tdeioLanPageTabNumber = currentTabNumber;
      currentTabNumber++;
-     connect(tdeioLanPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
+     connect(tdeioLanPage,TQ_SIGNAL(changed()), TQ_SLOT( changed() ));
    }
 
    setButtons(Apply|Help);
diff --git a/kcontrol/tdeio/main.h b/kcontrol/tdeio/main.h
index 2fed35123..7963c1321 100644
--- a/kcontrol/tdeio/main.h
+++ b/kcontrol/tdeio/main.h
@@ -28,7 +28,7 @@ class TQTabWidget;
 
 class LanBrowser : public TDECModule
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       LanBrowser(TQWidget *parent=0);
       virtual void load();
diff --git a/kcontrol/tdeio/netpref.cpp b/kcontrol/tdeio/netpref.cpp
index acde5635e..2cf465977 100644
--- a/kcontrol/tdeio/netpref.cpp
+++ b/kcontrol/tdeio/netpref.cpp
@@ -29,29 +29,29 @@ KIOPreferences::KIOPreferences( TQWidget* parent )
     sb_socketRead = new KIntNumInput( gb_Timeout, "sb_socketRead" );
     sb_socketRead->setSuffix( i18n( " sec" ) );
     sb_socketRead->setLabel( i18n( "Soc&ket read:" ), AlignVCenter);
-    connect(sb_socketRead, TQT_SIGNAL(valueChanged ( int )),
-            this, TQT_SLOT(configChanged()));
+    connect(sb_socketRead, TQ_SIGNAL(valueChanged ( int )),
+            this, TQ_SLOT(configChanged()));
 
     sb_proxyConnect = new KIntNumInput( sb_socketRead, 0, gb_Timeout,
             10, "sb_proxyConnect" );
     sb_proxyConnect->setSuffix( i18n( " sec" ) );
     sb_proxyConnect->setLabel( i18n( "Pro&xy connect:" ), AlignVCenter);
-    connect(sb_proxyConnect, TQT_SIGNAL(valueChanged ( int )),
-            this, TQT_SLOT(configChanged()));
+    connect(sb_proxyConnect, TQ_SIGNAL(valueChanged ( int )),
+            this, TQ_SLOT(configChanged()));
 
     sb_serverConnect = new KIntNumInput( sb_proxyConnect, 0, gb_Timeout,
             10, "sb_serverConnect" );
     sb_serverConnect->setSuffix( i18n( " sec" ) );
     sb_serverConnect->setLabel( i18n("Server co&nnect:"), AlignVCenter);
-    connect(sb_serverConnect, TQT_SIGNAL(valueChanged ( int )),
-            this, TQT_SLOT(configChanged()));
+    connect(sb_serverConnect, TQ_SIGNAL(valueChanged ( int )),
+            this, TQ_SLOT(configChanged()));
 
     sb_serverResponse = new KIntNumInput( sb_serverConnect, 0, gb_Timeout,
             10, "sb_serverResponse" );
     sb_serverResponse->setSuffix( i18n( " sec" ) );
     sb_serverResponse->setLabel( i18n("&Server response:"), AlignVCenter);
-    connect(sb_serverResponse, TQT_SIGNAL(valueChanged ( int )),
-            this, TQT_SLOT(configChanged()));
+    connect(sb_serverResponse, TQ_SIGNAL(valueChanged ( int )),
+            this, TQ_SLOT(configChanged()));
 
     gb_Ftp = new TQVGroupBox( i18n( "FTP Options" ), this, "gb_Ftp" );
     cb_ftpEnablePasv = new TQCheckBox( i18n( "Enable passive &mode (PASV)" ), gb_Ftp );
@@ -64,8 +64,8 @@ KIOPreferences::KIOPreferences( TQWidget* parent )
 
     mainLayout->addWidget( gb_Ftp );
 
-    connect(cb_ftpEnablePasv, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()));
-    connect(cb_ftpMarkPartial, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()));
+    connect(cb_ftpEnablePasv, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()));
+    connect(cb_ftpMarkPartial, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()));
 
     mainLayout->addStretch();
 
diff --git a/kcontrol/tdeio/netpref.h b/kcontrol/tdeio/netpref.h
index 30584a598..fd423df5b 100644
--- a/kcontrol/tdeio/netpref.h
+++ b/kcontrol/tdeio/netpref.h
@@ -14,7 +14,7 @@ class KIntNumInput;
 
 class KIOPreferences : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KIOPreferences( TQWidget* parent = 0);
diff --git a/kcontrol/tdeio/policydlg.cpp b/kcontrol/tdeio/policydlg.cpp
index c45dd837e..77c818cf2 100644
--- a/kcontrol/tdeio/policydlg.cpp
+++ b/kcontrol/tdeio/policydlg.cpp
@@ -63,12 +63,12 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent,
   m_dlgUI = new PolicyDlgUI (this);
   setMainWidget(m_dlgUI);
 
-  m_dlgUI->leDomain->setValidator(new DomainLineValidator(TQT_TQOBJECT(m_dlgUI->leDomain)));
+  m_dlgUI->leDomain->setValidator(new DomainLineValidator(m_dlgUI->leDomain));
   m_dlgUI->cbPolicy->setMinimumWidth( m_dlgUI->cbPolicy->fontMetrics().maxWidth() * 25 );
   
   enableButtonOK( false );
-  connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)),
-    TQT_SLOT(slotTextChanged(const TQString&)));
+  connect(m_dlgUI->leDomain, TQ_SIGNAL(textChanged(const TQString&)),
+    TQ_SLOT(slotTextChanged(const TQString&)));
 
   setFixedSize (sizeHint());
   m_dlgUI->leDomain->setFocus ();
diff --git a/kcontrol/tdeio/policydlg.h b/kcontrol/tdeio/policydlg.h
index 2bf7a4c99..cd291998e 100644
--- a/kcontrol/tdeio/policydlg.h
+++ b/kcontrol/tdeio/policydlg.h
@@ -65,7 +65,7 @@ public:
 
 class PolicyDlg : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   PolicyDlg (const TQString& caption, TQWidget *parent = 0,
diff --git a/kcontrol/tdeio/smbrodlg.cpp b/kcontrol/tdeio/smbrodlg.cpp
index ccb070e33..4df8ff396 100644
--- a/kcontrol/tdeio/smbrodlg.cpp
+++ b/kcontrol/tdeio/smbrodlg.cpp
@@ -73,11 +73,11 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent)
 
    layout->addWidget(new TQWidget(this),4,0);
 
-//   connect(m_showHiddenShares, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed()));
-   connect(m_userLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed()));
-   connect(m_passwordLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed()));
-//   connect(m_workgroupLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed()));
-//   connect( m_encodingList, TQT_SIGNAL( activated( const TQString & ) ), this , TQT_SLOT( changed() ) );
+//   connect(m_showHiddenShares, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+   connect(m_userLe, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changed()));
+   connect(m_passwordLe, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changed()));
+//   connect(m_workgroupLe, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changed()));
+//   connect( m_encodingList, TQ_SIGNAL( activated( const TQString & ) ), this , TQ_SLOT( changed() ) );
 
    layout->setRowStretch(4, 1);
 
diff --git a/kcontrol/tdeio/smbrodlg.h b/kcontrol/tdeio/smbrodlg.h
index 1c9d0347d..73c513efa 100644
--- a/kcontrol/tdeio/smbrodlg.h
+++ b/kcontrol/tdeio/smbrodlg.h
@@ -31,7 +31,7 @@ class KComboBox;
 
 class SMBRoOptions : public TDECModule
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       SMBRoOptions(TQWidget *parent = 0);
       ~SMBRoOptions();
diff --git a/kcontrol/tdeio/socks.cpp b/kcontrol/tdeio/socks.cpp
index 91d8cfd5c..8ac02dcfd 100644
--- a/kcontrol/tdeio/socks.cpp
+++ b/kcontrol/tdeio/socks.cpp
@@ -52,26 +52,26 @@ KSocksConfig::KSocksConfig(TQWidget *parent)
   base = new SocksBase(this);
   layout->add(base);
 
-  connect(base->_c_enableSocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
-  connect(base->bg, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(methodChanged(int)));
+  connect(base->_c_enableSocks, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged()));
+  connect(base->bg, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(methodChanged(int)));
 
   // The custom library
-  connect(base->_c_customPath, TQT_SIGNAL(openFileDialog(KURLRequester *)), this, TQT_SLOT(chooseCustomLib(KURLRequester *)));
-  connect(base->_c_customPath, TQT_SIGNAL(textChanged(const TQString&)),
-                     this, TQT_SLOT(customPathChanged(const TQString&)));
+  connect(base->_c_customPath, TQ_SIGNAL(openFileDialog(KURLRequester *)), this, TQ_SLOT(chooseCustomLib(KURLRequester *)));
+  connect(base->_c_customPath, TQ_SIGNAL(textChanged(const TQString&)),
+                     this, TQ_SLOT(customPathChanged(const TQString&)));
 
   // Additional libpaths
-  connect(base->_c_newPath, TQT_SIGNAL(openFileDialog(KURLRequester *)), this, TQT_SLOT(chooseCustomLib(KURLRequester *)));
-  connect(base->_c_newPath, TQT_SIGNAL(returnPressed(const TQString&)),
-          this, TQT_SLOT(addThisLibrary(const TQString&)));
-  connect(base->_c_newPath, TQT_SIGNAL(textChanged(const TQString&)),
-          this, TQT_SLOT(libTextChanged(const TQString&)));
-  connect(base->_c_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(addLibrary()));
-  connect(base->_c_remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeLibrary()));
-  connect(base->_c_libs, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(libSelection()));
+  connect(base->_c_newPath, TQ_SIGNAL(openFileDialog(KURLRequester *)), this, TQ_SLOT(chooseCustomLib(KURLRequester *)));
+  connect(base->_c_newPath, TQ_SIGNAL(returnPressed(const TQString&)),
+          this, TQ_SLOT(addThisLibrary(const TQString&)));
+  connect(base->_c_newPath, TQ_SIGNAL(textChanged(const TQString&)),
+          this, TQ_SLOT(libTextChanged(const TQString&)));
+  connect(base->_c_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(addLibrary()));
+  connect(base->_c_remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeLibrary()));
+  connect(base->_c_libs, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(libSelection()));
 
   // The "Test" button
-  connect(base->_c_test, TQT_SIGNAL(clicked()), this, TQT_SLOT(testClicked()));
+  connect(base->_c_test, TQ_SIGNAL(clicked()), this, TQ_SLOT(testClicked()));
 
   // The config backend
   load();
diff --git a/kcontrol/tdeio/socks.h b/kcontrol/tdeio/socks.h
index f5c5cb2a4..eac39becc 100644
--- a/kcontrol/tdeio/socks.h
+++ b/kcontrol/tdeio/socks.h
@@ -35,7 +35,7 @@ class TQVButtonGroup;
 
 class KSocksConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KSocksConfig(TQWidget *parent);
   virtual ~KSocksConfig();
diff --git a/kcontrol/tdeio/uagentproviderdlg.cpp b/kcontrol/tdeio/uagentproviderdlg.cpp
index 5e5cbd233..430261a45 100644
--- a/kcontrol/tdeio/uagentproviderdlg.cpp
+++ b/kcontrol/tdeio/uagentproviderdlg.cpp
@@ -45,8 +45,8 @@ void UALineEdit::keyPressEvent( TQKeyEvent* e )
 {
   int key = e->key();
   TQString keycode = e->text();
-  if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period ||
-       (cursorPosition() > 0 && key == Qt::Key_Minus) ||
+  if ( (key >= TQt::Key_Escape && key <= TQt::Key_Help) || key == TQt::Key_Period ||
+       (cursorPosition() > 0 && key == TQt::Key_Minus) ||
        (!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) )
   {
     KLineEdit::keyPressEvent(e);
@@ -82,14 +82,14 @@ UAProviderDlg::~UAProviderDlg()
 
 void UAProviderDlg::init()
 {
-  connect( dlg->pbOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
-  connect( dlg->pbCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
+  connect( dlg->pbOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
+  connect( dlg->pbCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
 
-  connect( dlg->leSite, TQT_SIGNAL(textChanged(const TQString&)),
-                TQT_SLOT(slotTextChanged( const TQString&)) );
+  connect( dlg->leSite, TQ_SIGNAL(textChanged(const TQString&)),
+                TQ_SLOT(slotTextChanged( const TQString&)) );
 
-  connect( dlg->cbAlias, TQT_SIGNAL(activated(const TQString&)),
-                TQT_SLOT(slotActivated(const TQString&)) );
+  connect( dlg->cbAlias, TQ_SIGNAL(activated(const TQString&)),
+                TQ_SLOT(slotActivated(const TQString&)) );
 
   dlg->cbAlias->clear();
   dlg->cbAlias->insertStringList( m_provider->userAgentAliasList() );
diff --git a/kcontrol/tdeio/uagentproviderdlg.h b/kcontrol/tdeio/uagentproviderdlg.h
index 3e60edb54..acab34674 100644
--- a/kcontrol/tdeio/uagentproviderdlg.h
+++ b/kcontrol/tdeio/uagentproviderdlg.h
@@ -29,7 +29,7 @@ class UAProviderDlgUI;
 
 class UALineEdit : public KLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   UALineEdit( TQWidget *parent, const char *name=0 );
@@ -40,7 +40,7 @@ protected:
 
 class UAProviderDlg : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   UAProviderDlg( const TQString& caption, TQWidget *parent = 0,
diff --git a/kcontrol/tdeio/useragentdlg.cpp b/kcontrol/tdeio/useragentdlg.cpp
index 7b1f4b3d7..9ee0b58c6 100644
--- a/kcontrol/tdeio/useragentdlg.cpp
+++ b/kcontrol/tdeio/useragentdlg.cpp
@@ -56,22 +56,22 @@ UserAgentDlg::UserAgentDlg( TQWidget * parent )
 
   dlg->lvDomainPolicyList->setSorting(0);
 
-  connect( dlg->cbSendUAString, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) );
-
-  connect( dlg->gbDefaultId, TQT_SIGNAL(clicked(int)),
-           TQT_SLOT(changeDefaultUAModifiers(int)));
-
-  connect( dlg->lvDomainPolicyList, TQT_SIGNAL(selectionChanged()),
-           TQT_SLOT(selectionChanged()) );
-  connect( dlg->lvDomainPolicyList, TQT_SIGNAL(doubleClicked (TQListViewItem *)),
-           TQT_SLOT(changePressed()) );
-  connect( dlg->lvDomainPolicyList, TQT_SIGNAL( returnPressed ( TQListViewItem * ) ),
-           TQT_SLOT( changePressed() ));
-
-  connect( dlg->pbNew, TQT_SIGNAL(clicked()), TQT_SLOT( addPressed() ) );
-  connect( dlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) );
-  connect( dlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) );
-  connect( dlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) );
+  connect( dlg->cbSendUAString, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) );
+
+  connect( dlg->gbDefaultId, TQ_SIGNAL(clicked(int)),
+           TQ_SLOT(changeDefaultUAModifiers(int)));
+
+  connect( dlg->lvDomainPolicyList, TQ_SIGNAL(selectionChanged()),
+           TQ_SLOT(selectionChanged()) );
+  connect( dlg->lvDomainPolicyList, TQ_SIGNAL(doubleClicked (TQListViewItem *)),
+           TQ_SLOT(changePressed()) );
+  connect( dlg->lvDomainPolicyList, TQ_SIGNAL( returnPressed ( TQListViewItem * ) ),
+           TQ_SLOT( changePressed() ));
+
+  connect( dlg->pbNew, TQ_SIGNAL(clicked()), TQ_SLOT( addPressed() ) );
+  connect( dlg->pbChange, TQ_SIGNAL( clicked() ), TQ_SLOT( changePressed() ) );
+  connect( dlg->pbDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deletePressed() ) );
+  connect( dlg->pbDeleteAll, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteAllPressed() ) );
 
   load();
 }
diff --git a/kcontrol/tdeio/useragentdlg.h b/kcontrol/tdeio/useragentdlg.h
index 746a8524a..ca65b2df3 100644
--- a/kcontrol/tdeio/useragentdlg.h
+++ b/kcontrol/tdeio/useragentdlg.h
@@ -33,7 +33,7 @@ class UserAgentDlgUI;
 
 class UserAgentDlg : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   UserAgentDlg ( TQWidget * parent = 0) ;
diff --git a/kcontrol/tdm/background.cpp b/kcontrol/tdm/background.cpp
index 832940d7d..c1f459924 100644
--- a/kcontrol/tdm/background.cpp
+++ b/kcontrol/tdm/background.cpp
@@ -54,14 +54,14 @@ KBackground::KBackground(TQWidget *parent, const char *name)
     m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/tdm/backgroundrc" ) );
     m_background = new BGDialog( this, m_simpleConf, false );
 
-    connect(m_background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+    connect(m_background, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
     // Top layout
     TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint() );
     top->addWidget(m_pCBEnable);
     top->addWidget(m_background);
     top->addStretch();
-    connect( m_pCBEnable, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotEnableChanged()) );
+    connect( m_pCBEnable, TQ_SIGNAL(toggled( bool )), TQ_SLOT(slotEnableChanged()) );
 }
 
 KBackground::~KBackground()
diff --git a/kcontrol/tdm/background.h b/kcontrol/tdm/background.h
index ad708d485..74f1b09ec 100644
--- a/kcontrol/tdm/background.h
+++ b/kcontrol/tdm/background.h
@@ -22,7 +22,7 @@ class TQLabel;
 
 class KBackground: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KBackground(TQWidget *parent=0, const char *name=0);
     ~KBackground();
diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp
index 2a5f72895..71e09cb0d 100644
--- a/kcontrol/tdm/main.cpp
+++ b/kcontrol/tdm/main.cpp
@@ -127,13 +127,13 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
   TQMap<gid_t,TQStringList> tgmap;
   TQMap<gid_t,TQStringList>::Iterator tgmapi;
   TQMap<gid_t,TQStringList>::ConstIterator tgmapci;
-  TQMap<TQString, QPair<int,TQStringList> >::Iterator umapi;
+  TQMap<TQString, TQPair<int,TQStringList> >::Iterator umapi;
 
   struct passwd *ps;
   for (setpwent(); (ps = getpwent()); ) {
     TQString un( TQFile::decodeName( ps->pw_name ) );
     if (usermap.find( un ) == usermap.end()) {
-      usermap.insert( un, QPair<int,TQStringList>( ps->pw_uid, sl ) );
+      usermap.insert( un, TQPair<int,TQStringList>( ps->pw_uid, sl ) );
       if ((tgmapi = tgmap.find( ps->pw_gid )) != tgmap.end())
         (*tgmapi).append( un );
       else
@@ -190,34 +190,34 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
 
   appearance = new TDMAppearanceWidget(this);
   tab->addTab(appearance, i18n("A&ppearance"));
-  connect(appearance, TQT_SIGNAL(changed(bool)), TQT_SIGNAL( changed(bool)));
+  connect(appearance, TQ_SIGNAL(changed(bool)), TQ_SIGNAL( changed(bool)));
 
   font = new TDMFontWidget(this);
   tab->addTab(font, i18n("&Font"));
-  connect(font, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+  connect(font, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
   background = new KBackground(this);
   tab->addTab(background, i18n("&Background"));
-  connect(background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+  connect(background, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
   sessions = new TDMSessionsWidget(this);
   tab->addTab(sessions, i18n("&Shutdown"));
-  connect(sessions, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+  connect(sessions, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
   users = new TDMUsersWidget(this, 0);
   tab->addTab(users, i18n("&Users"));
-  connect(users, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
-  connect(users, TQT_SIGNAL(setMinMaxUID(int,int)), TQT_SLOT(slotMinMaxUID(int,int)));
-  connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &)));
-  connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &)));
-  connect(this, TQT_SIGNAL(clearUsers()), users, TQT_SLOT(slotClearUsers()));
+  connect(users, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
+  connect(users, TQ_SIGNAL(setMinMaxUID(int,int)), TQ_SLOT(slotMinMaxUID(int,int)));
+  connect(this, TQ_SIGNAL(addUsers(const TQMap<TQString,int> &)), users, TQ_SLOT(slotAddUsers(const TQMap<TQString,int> &)));
+  connect(this, TQ_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQ_SLOT(slotDelUsers(const TQMap<TQString,int> &)));
+  connect(this, TQ_SIGNAL(clearUsers()), users, TQ_SLOT(slotClearUsers()));
 
   convenience = new TDMConvenienceWidget(this, 0);
   tab->addTab(convenience, i18n("Con&venience"));
-  connect(convenience, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
-  connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &)));
-  connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &)));
-  connect(this, TQT_SIGNAL(clearUsers()), convenience, TQT_SLOT(slotClearUsers()));
+  connect(convenience, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
+  connect(this, TQ_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQ_SLOT(slotAddUsers(const TQMap<TQString,int> &)));
+  connect(this, TQ_SIGNAL(delUsers(const TQMap<TQString,int> &)), convenience, TQ_SLOT(slotDelUsers(const TQMap<TQString,int> &)));
+  connect(this, TQ_SIGNAL(clearUsers()), convenience, TQ_SLOT(slotClearUsers()));
 
   load();
   if (getuid() != 0 || !config->checkConfigFilesWritable( true )) {
@@ -298,7 +298,7 @@ void TDModule::propagateUsers()
   groupmap.clear();
   emit clearUsers();
   TQMap<TQString,int> lusers;
-  TQMapConstIterator<TQString, QPair<int,TQStringList> > it;
+  TQMapConstIterator<TQString, TQPair<int,TQStringList> > it;
   TQStringList::ConstIterator jt;
   TQMap<TQString,int>::Iterator gmapi;
   for (it = usermap.begin(); it != usermap.end(); ++it) {
@@ -321,7 +321,7 @@ void TDModule::slotMinMaxUID(int min, int max)
 {
   if (updateOK) {
     TQMap<TQString,int> alusers, dlusers;
-    TQMapConstIterator<TQString, QPair<int,TQStringList> > it;
+    TQMapConstIterator<TQString, TQPair<int,TQStringList> > it;
     TQStringList::ConstIterator jt;
     TQMap<TQString,int>::Iterator gmapi;
     for (it = usermap.begin(); it != usermap.end(); ++it) {
diff --git a/kcontrol/tdm/main.h b/kcontrol/tdm/main.h
index 48cfa5b22..4274e8323 100644
--- a/kcontrol/tdm/main.h
+++ b/kcontrol/tdm/main.h
@@ -38,7 +38,7 @@ class KBackground;
 
 class TDModule : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -71,7 +71,7 @@ private:
   TDMUsersWidget	*users;
   TDMConvenienceWidget	*convenience;
 
-  TQMap<TQString, QPair<int,TQStringList> >	usermap;
+  TQMap<TQString, TQPair<int,TQStringList> >	usermap;
   TQMap<TQString,int>	groupmap;
   int			minshowuid, maxshowuid;
   bool			updateOK;
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index 8e49087d1..973d1dc35 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -76,8 +76,8 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   greetstr_lined = new KLineEdit(group);
   TQLabel *label = new TQLabel(greetstr_lined, i18n("&Greeting:"), group);
   hlay->addWidget(label);
-  connect(greetstr_lined, TQT_SIGNAL(textChanged(const TQString&)),
-      TQT_SLOT(changed()));
+  connect(greetstr_lined, TQ_SIGNAL(textChanged(const TQString&)),
+      TQ_SLOT(changed()));
   hlay->addWidget(greetstr_lined);
   wtstr = i18n("This is the \"headline\" for TDM's login window. You may want to "
            "put some nice greeting or information about the operating system here.<p>"
@@ -107,8 +107,8 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   logoRadio = new TQRadioButton( i18n("Sho&w logo"), group );
   TQButtonGroup *buttonGroup = new TQButtonGroup( group );
   label->setBuddy( buttonGroup );
-  connect( buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotAreaRadioClicked(int)) );
-  connect( buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed()) );
+  connect( buttonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotAreaRadioClicked(int)) );
+  connect( buttonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(changed()) );
   buttonGroup->hide();
   buttonGroup->insert(noneRadio, KdmNone);
   buttonGroup->insert(clockRadio, KdmClock);
@@ -128,9 +128,9 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   logobutton->setAutoDefault(false);
   logobutton->setAcceptDrops(true);
   logobutton->installEventFilter(this); // for drag and drop
-  connect(logobutton, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogoButtonClicked()));
+  connect(logobutton, TQ_SIGNAL(clicked()), TQ_SLOT(slotLogoButtonClicked()));
   hglay->addWidget(logoLabel, 1, 0);
-  hglay->addWidget(logobutton, 1, 1, Qt::AlignCenter);
+  hglay->addWidget(logobutton, 1, 1, TQt::AlignCenter);
   hglay->addRowSpacing(1, 110);
   wtstr = i18n("Click here to choose an image that TDM will display. "
 	       "You can also drag and drop an image onto this button "
@@ -145,19 +145,19 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   grid->addLayout(hglay, 2, 1);
 
   label = new TQLabel(i18n("Position:"), group);
-  hglay->addMultiCellWidget(label, 0,1, 0,0, Qt::AlignVCenter);
-  TQValidator *posValidator = new TQIntValidator(0, 100, TQT_TQOBJECT(group));
+  hglay->addMultiCellWidget(label, 0,1, 0,0, TQt::AlignVCenter);
+  TQValidator *posValidator = new TQIntValidator(0, 100, group);
   TQLabel *xLineLabel = new TQLabel(i18n("&X:"), group);
   hglay->addWidget(xLineLabel, 0, 1);
   xLineEdit = new TQLineEdit (group);
-  connect( xLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( changed() ));
+  connect( xLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( changed() ));
   hglay->addWidget(xLineEdit, 0, 2);
   xLineLabel->setBuddy(xLineEdit);
   xLineEdit->setValidator(posValidator);
   TQLabel *yLineLabel = new TQLabel(i18n("&Y:"), group);
   hglay->addWidget(yLineLabel, 1, 1);
   yLineEdit = new TQLineEdit (group);
-  connect( yLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( changed() ));
+  connect( yLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( changed() ));
   hglay->addWidget(yLineEdit, 1, 2);
   yLineLabel->setBuddy(yLineEdit);
   yLineEdit->setValidator(posValidator);
@@ -179,7 +179,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   compositorcombo->insertItem( "", i18n("None") );
   compositorcombo->insertItem( TDE_COMPOSITOR_BINARY, i18n("Trinity compositor") );
   label = new TQLabel(compositorcombo, i18n("Compositor:"), group);
-  connect(compositorcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(compositorcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   hglay->addWidget(label, 0, 0);
   hglay->addWidget(compositorcombo, 0, 1);
   wtstr = i18n("Choose a compositor to be used in TDM.  Note that the chosen compositor will continue to run after login.");
@@ -191,7 +191,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   loadGuiStyles(guicombo);
   guicombo->listBox()->sort();
   label = new TQLabel(guicombo, i18n("GUI s&tyle:"), group);
-  connect(guicombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(guicombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   hglay->addWidget(label, 1, 0);
   hglay->addWidget(guicombo, 1, 1);
   wtstr = i18n("You can choose a basic GUI style here that will be "
@@ -204,7 +204,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   loadColorSchemes(colcombo);
   colcombo->listBox()->sort();
   label = new TQLabel(colcombo, i18n("&Color scheme:"), group);
-  connect(colcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(colcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   hglay->addWidget(label, 2, 0);
   hglay->addWidget(colcombo, 2, 1);
   wtstr = i18n("You can choose a basic Color Scheme here that will be "
@@ -217,7 +217,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   echocombo->insertItem("OneStar", i18n("One Star"));
   echocombo->insertItem("ThreeStars", i18n("Three Stars"));
   label = new TQLabel(echocombo, i18n("Echo &mode:"), group);
-  connect(echocombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(echocombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   hglay->addWidget(label, 3, 0);
   hglay->addWidget(echocombo, 3, 1);
   wtstr = i18n("You can choose whether and how TDM shows your password when you type it.");
@@ -226,12 +226,12 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
 
 
   // The Language group box
-  group = new TQGroupBox(0, Qt::Vertical, i18n("Locale"), this);
+  group = new TQGroupBox(0, TQt::Vertical, i18n("Locale"), this);
   vbox->addWidget(group);
 
   langcombo = new KLanguageButton(group);
   loadLanguageList(langcombo);
-  connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
+  connect(langcombo, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(changed()));
   label = new TQLabel(langcombo, i18n("Languag&e:"), group);
   TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
   hbox->setColStretch(1, 1);
@@ -243,11 +243,11 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   TQWhatsThis::add( langcombo, wtstr );
 
   // The SAK group box
-  group = new TQGroupBox(0, Qt::Vertical, i18n("Secure Attention Key"), this);
+  group = new TQGroupBox(0, TQt::Vertical, i18n("Secure Attention Key"), this);
   vbox->addWidget(group);
 
   sakbox = new TQCheckBox( i18n("Enable Secure Attention Key"), group );
-  connect( sakbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) );
+  connect( sakbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) );
   TQGridLayout *hbox2 = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
   hbox2->setColStretch(1, 1);
   hbox2->addWidget(sakbox, 1, 0);
@@ -262,11 +262,11 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   TQWhatsThis::add( sakbox, wtstr );
 
   // Keyboard group box
-  group = new TQGroupBox(0, Qt::Vertical, i18n("Keyboard"), this);
+  group = new TQGroupBox(0, TQt::Vertical, i18n("Keyboard"), this);
   vbox->addWidget(group);
 
   kbdledbox = new TQCheckBox(i18n("Sync keyboard led status"), group);
-  connect(kbdledbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+  connect(kbdledbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
   TQGridLayout *hbox3 = new TQGridLayout(group->layout(), 2, 2, KDialog::spacingHint());
   hbox3->setColStretch(1, 1);
   hbox3->addWidget(kbdledbox, 1, 0);
@@ -277,8 +277,8 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
 
 void TDMAppearanceWidget::makeReadOnly()
 {
-    disconnect( logobutton, TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(slotLogoButtonClicked()) );
+    disconnect( logobutton, TQ_SIGNAL(clicked()),
+		this, TQ_SLOT(slotLogoButtonClicked()) );
     logobutton->setAcceptDrops(false);
     greetstr_lined->setReadOnly(true);
     noneRadio->setEnabled(false);
@@ -370,7 +370,7 @@ bool TDMAppearanceWidget::setLogo(TQString logo)
     if (p.isNull())
         return false;
     if (p.width() > 100 || p.height() > 100)
-        p = p.smoothScale(100, 100, TQ_ScaleMin);
+        p = p.smoothScale(100, 100, TQImage::ScaleMin);
     logobutton->setPixmap(p);
     uint bd = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
     logobutton->setFixedSize(p.width() + bd, p.height() + bd);
diff --git a/kcontrol/tdm/tdm-appear.h b/kcontrol/tdm/tdm-appear.h
index 69c2b241b..d79ac0524 100644
--- a/kcontrol/tdm/tdm-appear.h
+++ b/kcontrol/tdm/tdm-appear.h
@@ -44,7 +44,7 @@ class KLineEdit;
 
 class TDMAppearanceWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDMAppearanceWidget(TQWidget *parent, const char *name=0);
diff --git a/kcontrol/tdm/tdm-conv.cpp b/kcontrol/tdm/tdm-conv.cpp
index 487e8adbb..a324e866a 100644
--- a/kcontrol/tdm/tdm-conv.cpp
+++ b/kcontrol/tdm/tdm-conv.cpp
@@ -55,7 +55,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature."
 	" This applies only to TDM's graphical login."
 	" Think twice before enabling this!") );
-    connect(alGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+    connect(alGroup, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 
     TQWidget *hlpw1 = new TQWidget( alGroup );
     userlb = new KComboBox( hlpw1 );
@@ -64,7 +64,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     hlpl1->setColStretch(2, 1);
     hlpl1->addWidget(u_label, 0, 0);
     hlpl1->addWidget(userlb, 0, 1);
-    connect(userlb, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotChanged()));
+    connect(userlb, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotChanged()));
     wtstr = i18n("Select the user to be logged in automatically.");
     TQWhatsThis::add( u_label, wtstr );
     TQWhatsThis::add( userlb, wtstr );
@@ -74,18 +74,18 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     d_label = new TQLabel( delaysb, i18n("D&elay:"), hlpw1 );
     hlpl1->addWidget(d_label, 1, 0);
     hlpl1->addWidget(delaysb, 1, 1);
-    connect(delaysb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()));
+    connect(delaysb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()));
     wtstr = i18n("The delay (in seconds) before the automatic login kicks in. "
                  "This feature is also known as \"timed login\".");
     TQWhatsThis::add( d_label, wtstr );
     TQWhatsThis::add( delaysb, wtstr );
     againcb = new TQCheckBox( i18n("P&ersistent"), alGroup );
-    connect( againcb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) );
+    connect( againcb, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()) );
     TQWhatsThis::add( againcb, i18n("Normally, automatic login is performed only "
 	"when TDM starts up. If this is checked, automatic login will kick in "
 	"after finishing a session as well.") );
     autoLockCheck = new TQCheckBox( i18n("Loc&k session"), alGroup );
-    connect( autoLockCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) );
+    connect( autoLockCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()) );
     TQWhatsThis::add( autoLockCheck, i18n("If checked, the automatically started session "
 	"will be locked immediately (provided it is a TDE session). This can "
 	"be used to obtain a super-fast login restricted to one user.") );
@@ -94,8 +94,8 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     puGroup = new TQVButtonGroup(i18n("Preselect User"), this );
     puGroup->setSizePolicy( vpref );
 
-    connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPresChanged()));
-    connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged()));
+    connect(puGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPresChanged()));
+    connect(puGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotChanged()));
     npRadio = new TQRadioButton(i18n("preselected user", "&None"), puGroup);
     ppRadio = new TQRadioButton(i18n("Prev&ious"), puGroup);
     TQWhatsThis::add( ppRadio, i18n("Preselect the user that logged in previously. "
@@ -106,7 +106,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     TQWidget *hlpw = new TQWidget(puGroup);
     puserlb = new KComboBox(true, hlpw);
     pu_label = new TQLabel(puserlb, i18n("Us&er:"), hlpw);
-    connect(puserlb, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged()));
+    connect(puserlb, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged()));
     wtstr = i18n("Select the user to be preselected for login. "
 	"This box is editable, so you can specify an arbitrary non-existent "
 	"user to mislead possible attackers.");
@@ -121,7 +121,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
 	"in the password field instead of the user field after preselecting a user. "
 	"Use this to save one key press per login, if the preselection usually does not need to "
 	"be changed.") );
-    connect(cbjumppw, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+    connect(cbjumppw, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 
     npGroup = new TQVGroupBox(i18n("Enable Password-&Less Logins"), this );
     npGroup->setCheckable( true );
@@ -131,7 +131,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
 	" password. This applies only to TDM's graphical login."
 	" Think twice before enabling this!") );
 
-    connect(npGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+    connect(npGroup, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 
     pl_label = new TQLabel(i18n("No password re&quired for:"), npGroup);
     npuserlv = new TDEListView(npGroup);
@@ -141,8 +141,8 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     npuserlv->setResizeMode(TQListView::LastColumn);
     TQWhatsThis::add(npuserlv, i18n("Check all users you want to allow a password-less login for."
 	" Entries denoted with '@' are user groups. Checking a group is like checking all users in that group."));
-    connect( npuserlv, TQT_SIGNAL(clicked( TQListViewItem * )),
-	     TQT_SLOT(slotChanged()) );
+    connect( npuserlv, TQ_SIGNAL(clicked( TQListViewItem * )),
+	     TQ_SLOT(slotChanged()) );
 
     btGroup = new TQVGroupBox( i18n("Miscellaneous"), this );
 
@@ -152,12 +152,12 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
 	" X server crash; note that this can open a security hole: if you use"
 	" a screen locker than TDE's integrated one, this will make"
 	" circumventing a password-secured screen lock possible.") );
-    connect(cbarlen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+    connect(cbarlen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 
     allowRootLogin = new TQCheckBox(i18n("Allow &Root Login"), btGroup);
     TQWhatsThis::add( allowRootLogin, i18n("When set this allows root logins directly in TDM. "
     "This is discouraged by some people. Use with caution.") );
-    connect(allowRootLogin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+    connect(allowRootLogin, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 
     TQGridLayout *main = new TQGridLayout(this, 5, 2, 10);
     main->addWidget(paranoia, 0, 0);
@@ -169,12 +169,12 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     main->setColStretch(1, 2);
     main->setRowStretch(3, 1);
 
-    connect( userlb, TQT_SIGNAL(activated( const TQString & )),
-	     TQT_SLOT(slotSetAutoUser( const TQString & )) );
-    connect( puserlb, TQT_SIGNAL(textChanged( const TQString & )),
-	     TQT_SLOT(slotSetPreselUser( const TQString & )) );
-    connect( npuserlv, TQT_SIGNAL(clicked( TQListViewItem * )),
-	     TQT_SLOT(slotUpdateNoPassUser( TQListViewItem * )) );
+    connect( userlb, TQ_SIGNAL(activated( const TQString & )),
+	     TQ_SLOT(slotSetAutoUser( const TQString & )) );
+    connect( puserlb, TQ_SIGNAL(textChanged( const TQString & )),
+	     TQ_SLOT(slotSetPreselUser( const TQString & )) );
+    connect( npuserlv, TQ_SIGNAL(clicked( TQListViewItem * )),
+	     TQ_SLOT(slotUpdateNoPassUser( TQListViewItem * )) );
 
 }
 
diff --git a/kcontrol/tdm/tdm-conv.h b/kcontrol/tdm/tdm-conv.h
index 39e0e30f9..f6d9346b6 100644
--- a/kcontrol/tdm/tdm-conv.h
+++ b/kcontrol/tdm/tdm-conv.h
@@ -41,7 +41,7 @@
 
 class TDMConvenienceWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDMConvenienceWidget(TQWidget *parent=0, const char *name=0);
diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp
index 65dbea179..0aa2e4a70 100644
--- a/kcontrol/tdm/tdm-font.cpp
+++ b/kcontrol/tdm/tdm-font.cpp
@@ -47,7 +47,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
   stdFontChooser = new TDEFontRequester(this);
   label->setBuddy(stdFontChooser);
   TQWhatsThis::add( stdFontChooser, i18n("This changes the font which is used for all the text in the login manager except for the greeting and failure messages.") );
-  connect(stdFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
+  connect(stdFontChooser, TQ_SIGNAL(fontSelected(const TQFont&)),this,TQ_SLOT(configChanged()));
   ml->addWidget(label, 1, 0);
   ml->addWidget(stdFontChooser, 1, 1);
 
@@ -55,7 +55,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
   failFontChooser = new TDEFontRequester(this);
   label->setBuddy(failFontChooser);
   TQWhatsThis::add( failFontChooser, i18n("This changes the font which is used for failure messages in the login manager.") );
-  connect(failFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
+  connect(failFontChooser, TQ_SIGNAL(fontSelected(const TQFont&)),this,TQ_SLOT(configChanged()));
   ml->addWidget(label, 2, 0);
   ml->addWidget(failFontChooser, 2, 1);
 
@@ -63,14 +63,14 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
   greetingFontChooser = new TDEFontRequester(this);
   label->setBuddy(greetingFontChooser);
   TQWhatsThis::add( greetingFontChooser, i18n("This changes the font which is used for the login manager's greeting.") );
-  connect(greetingFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
+  connect(greetingFontChooser, TQ_SIGNAL(fontSelected(const TQFont&)),this,TQ_SLOT(configChanged()));
   ml->addWidget(label, 3, 0);
   ml->addWidget(greetingFontChooser, 3, 1);
 
   aacb = new TQCheckBox (i18n("Use anti-aliasing for fonts"), this);
   TQWhatsThis::add( aacb, i18n("If you check this box and your X-Server has the Xft extension, "
 	"fonts will be antialiased (smoothed) in the login dialog.") );
-  connect(aacb, TQT_SIGNAL(toggled ( bool )),this,TQT_SLOT(configChanged()));
+  connect(aacb, TQ_SIGNAL(toggled ( bool )),this,TQ_SLOT(configChanged()));
   ml->addMultiCellWidget(aacb, 4, 4, 0, 1);
   ml->setRowStretch(5, 10);
 }
diff --git a/kcontrol/tdm/tdm-font.h b/kcontrol/tdm/tdm-font.h
index fbbbc5028..2d4cb4e62 100644
--- a/kcontrol/tdm/tdm-font.h
+++ b/kcontrol/tdm/tdm-font.h
@@ -27,7 +27,7 @@ class TQCheckBox;
 
 class TDMFontWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDMFontWidget(TQWidget *parent=0, const char *name=0);
diff --git a/kcontrol/tdm/tdm-shut.cpp b/kcontrol/tdm/tdm-shut.cpp
index 14e681d18..6d6ed8cd7 100644
--- a/kcontrol/tdm/tdm-shut.cpp
+++ b/kcontrol/tdm/tdm-shut.cpp
@@ -17,6 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
+#include "config.h"
+
 #include <unistd.h>
 #include <sys/types.h>
 
@@ -52,13 +54,13 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name)
       sdlcombo->insertItem(i18n("Everybody"), SdAll);
       sdlcombo->insertItem(i18n("Only Root"), SdRoot);
       sdlcombo->insertItem(i18n("Nobody"), SdNone);
-      connect(sdlcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+      connect(sdlcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
       sdrcombo = new TQComboBox( FALSE, group0 );
       sdrlabel = new TQLabel (sdrcombo, i18n ("&Remote:"), group0);
       sdrcombo->insertItem(i18n("Everybody"), SdAll);
       sdrcombo->insertItem(i18n("Only Root"), SdRoot);
       sdrcombo->insertItem(i18n("Nobody"), SdNone);
-      connect(sdrcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+      connect(sdrcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
       TQWhatsThis::add( group0, i18n("Here you can select who is allowed to shutdown"
         " the computer using TDM. You can specify different values for local (console) and remote displays. "
 	"Possible values are:<ul>"
@@ -71,16 +73,16 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name)
 
       shutdown_lined = new KURLRequester(group1);
       TQLabel *shutdown_label = new TQLabel(shutdown_lined, i18n("H&alt:"), group1);
-      connect(shutdown_lined, TQT_SIGNAL(textChanged(const TQString&)),
-	      TQT_SLOT(changed()));
+      connect(shutdown_lined, TQ_SIGNAL(textChanged(const TQString&)),
+	      TQ_SLOT(changed()));
       wtstr = i18n("Command to initiate the system halt. Typical value: /sbin/halt");
       TQWhatsThis::add( shutdown_label, wtstr );
       TQWhatsThis::add( shutdown_lined, wtstr );
 
       restart_lined = new KURLRequester(group1);
       TQLabel *restart_label = new TQLabel(restart_lined, i18n("Reb&oot:"), group1);
-      connect(restart_lined, TQT_SIGNAL(textChanged(const TQString&)),
-	      TQT_SLOT(changed()));
+      connect(restart_lined, TQ_SIGNAL(textChanged(const TQString&)),
+	      TQ_SLOT(changed()));
       wtstr = i18n("Command to initiate the system reboot. Typical value: /sbin/reboot");
       TQWhatsThis::add( restart_label, wtstr );
       TQWhatsThis::add( restart_lined, wtstr );
@@ -91,17 +93,17 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name)
       bm_combo = new KBackedComboBox( group4 );
       bm_combo->insertItem("None", i18n("boot manager", "None"));
       bm_combo->insertItem("Grub", i18n("Grub"));
-#if defined(__linux__) && ( defined(__i386__) || defined(__amd64__) )
+#if defined(Q_OS_LINUX) && ( defined(__i386__) || defined(__amd64__) )
       bm_combo->insertItem("Lilo", i18n("Lilo"));
 #endif
       TQLabel *bm_label = new TQLabel( bm_combo, i18n("Boot manager:"), group4 );
-      connect(bm_combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+      connect(bm_combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
       wtstr = i18n("Enable boot options in the \"Shutdown...\" dialog.");
       TQWhatsThis::add( bm_label, wtstr );
       TQWhatsThis::add( bm_combo, wtstr );
 
       tsbox = new TQCheckBox( i18n("Restart X-Server with session exit"), this );
-      connect( tsbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) );
+      connect( tsbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) );
       wtstr = i18n("Whether the login manager should restart the local X-Server after a session exit instead of resetting. Use this option when the X-Server leaks memory, crashes the system on reset attempts, or otherwise exhibits display issues or artifacts.");
       TQWhatsThis::add( tsbox, wtstr );
 
@@ -208,12 +210,8 @@ void TDMSessionsWidget::load()
   readSD(sdrcombo, "Root");
 
   config->setGroup("Shutdown");
-  restart_lined->setURL(config->readEntry("RebootCmd", "/sbin/reboot"));
-#if defined(__OpenBSD__)
-  shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/halt -p"));
-#else
-  shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/poweroff"));
-#endif
+  restart_lined->setURL(config->readEntry("RebootCmd", REBOOT_BINARY));
+  shutdown_lined->setURL(config->readEntry("HaltCmd", POWEROFF_BINARY));
 
   bm_combo->setCurrentId(config->readEntry("BootManager", "None"));
 }
@@ -222,8 +220,8 @@ void TDMSessionsWidget::load()
 
 void TDMSessionsWidget::defaults()
 {
-  restart_lined->setURL("/sbin/reboot");
-  shutdown_lined->setURL("/sbin/poweroff");
+  restart_lined->setURL(REBOOT_BINARY);
+  shutdown_lined->setURL(POWEROFF_BINARY);
 
   sdlcombo->setCurrentItem(SdAll);
   sdrcombo->setCurrentItem(SdRoot);
diff --git a/kcontrol/tdm/tdm-shut.h b/kcontrol/tdm/tdm-shut.h
index a8d22adc2..73e1f716f 100644
--- a/kcontrol/tdm/tdm-shut.h
+++ b/kcontrol/tdm/tdm-shut.h
@@ -30,7 +30,7 @@ class KBackedComboBox;
 
 class TDMSessionsWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDMSessionsWidget(TQWidget *parent=0, const char *name=0);
diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp
index fe2f31c65..5195c3bfd 100644
--- a/kcontrol/tdm/tdm-users.cpp
+++ b/kcontrol/tdm/tdm-users.cpp
@@ -48,7 +48,7 @@ extern KSimpleConfig *config;
 TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
 {
-#ifdef __linux__
+#ifdef Q_OS_LINUX
     struct stat st;
     if (!stat( "/etc/debian_version", &st )) {	/* debian */
 	defminuid = "1000";
@@ -66,10 +66,18 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
 	defminuid = "500";
 	defmaxuid = "65000";
     }
-#else
+#elif defined(Q_OS_SOLARIS)
+    struct stat st;
+    if (stat( "/etc/dilos_version_build", &st ) == 0) { /* DilOS */
+	defminuid = "1000";
+    } else { /* other illumos distro */
+	defminuid = "100";
+    }
+    defmaxuid = "60000";
+#else /* default */
     defminuid = "1000";
     defmaxuid = "65000";
-#endif
+#endif /* default */
 
     // We assume that $kde_datadir/tdm exists, but better check for pics/ and pics/users,
     // and create them if necessary.
@@ -85,30 +93,30 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
 
     TQString wtstr;
 
-    minGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("System U&IDs"), this );
+    minGroup = new TQGroupBox( 2, TQt::Horizontal, i18n("System U&IDs"), this );
     TQWhatsThis::add( minGroup, i18n("Users with a UID (numerical user identification) outside this range will not be listed by TDM and this setup dialog."
       " Note that users with the UID 0 (typically root) are not affected by this and must be"
       " explicitly hidden in \"Not hidden\" mode."));
     TQSizePolicy sp_ign_fix( TQSizePolicy::Ignored, TQSizePolicy::Fixed );
-    TQValidator *valid = new TQIntValidator( 0, 999999, TQT_TQOBJECT(minGroup) );
+    TQValidator *valid = new TQIntValidator( 0, 999999, minGroup );
     TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup );
     leminuid = new KLineEdit( minGroup );
     minlab->setBuddy( leminuid );
     leminuid->setSizePolicy( sp_ign_fix );
     leminuid->setValidator( valid );
-    connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) );
-    connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) );
+    connect( leminuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotChanged()) );
+    connect( leminuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotMinMaxChanged()) );
     TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup );
     lemaxuid = new KLineEdit( minGroup );
     maxlab->setBuddy( lemaxuid );
     lemaxuid->setSizePolicy( sp_ign_fix );
     lemaxuid->setValidator( valid );
-    connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) );
-    connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) );
+    connect(lemaxuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotChanged()) );
+    connect(lemaxuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotMinMaxChanged()) );
 
-    usrGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("Users"), this );
-    connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotShowOpts()) );
-    connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) );
+    usrGroup = new TQButtonGroup( 5, TQt::Vertical, i18n("Users"), this );
+    connect( usrGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotShowOpts()) );
+    connect( usrGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotChanged()) );
     cbshowlist = new TQCheckBox( i18n("Show list"), usrGroup );
     TQWhatsThis::add( cbshowlist, i18n("If this option is checked, TDM will show a list of users,"
       " so users can click on their name or image rather than typing in their login.") );
@@ -121,7 +129,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
       "If not checked, select only the checked users. "
       "If checked, select all non-system users, except the checked ones."));
     cbusrsrt = new TQCheckBox( i18n("Sor&t users"), usrGroup );
-    connect( cbusrsrt, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotChanged()) );
+    connect( cbusrsrt, TQ_SIGNAL(toggled( bool )), TQ_SLOT(slotChanged()) );
     TQWhatsThis::add( cbusrsrt, i18n("If this is checked, TDM will alphabetically sort the user list."
       " Otherwise users are listed in the order they appear in the password file.") );
 
@@ -132,27 +140,27 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
     optinlv->setResizeMode( TQListView::LastColumn );
     TQWhatsThis::add( optinlv, i18n("TDM will show all checked users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );
     wstack->addWidget( optinlv );
-    connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )),
-	     TQT_SLOT(slotUpdateOptIn( TQListViewItem * )) );
-    connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )),
-	     TQT_SLOT(slotChanged()) );
+    connect( optinlv, TQ_SIGNAL(clicked( TQListViewItem * )),
+	     TQ_SLOT(slotUpdateOptIn( TQListViewItem * )) );
+    connect( optinlv, TQ_SIGNAL(clicked( TQListViewItem * )),
+	     TQ_SLOT(slotChanged()) );
     optoutlv = new TDEListView( this );
     optoutlv->addColumn( i18n("Hidden Users") );
     optoutlv->setResizeMode( TQListView::LastColumn );
     TQWhatsThis::add( optoutlv, i18n("TDM will show all non-checked non-system users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );
     wstack->addWidget( optoutlv );
-    connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )),
-	     TQT_SLOT(slotUpdateOptOut( TQListViewItem * )) );
-    connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )),
-	     TQT_SLOT(slotChanged()) );
+    connect( optoutlv, TQ_SIGNAL(clicked( TQListViewItem * )),
+	     TQ_SLOT(slotUpdateOptOut( TQListViewItem * )) );
+    connect( optoutlv, TQ_SIGNAL(clicked( TQListViewItem * )),
+	     TQ_SLOT(slotChanged()) );
 
-    faceGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("User Image Source"), this );
+    faceGroup = new TQButtonGroup( 5, TQt::Vertical, i18n("User Image Source"), this );
     TQWhatsThis::add( faceGroup, i18n("Here you can specify where TDM will obtain the images that represent users."
       " \"Admin\" represents the global folder; these are the pictures you can set below."
       " \"User\" means that TDM should read the user's $HOME/.face.icon file."
       " The two selections in the middle define the order of preference if both sources are available.") );
-    connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotFaceOpts()) );
-    connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) );
+    connect( faceGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotFaceOpts()) );
+    connect( faceGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotChanged()) );
     rbadmonly = new TQRadioButton( i18n("Admin"), faceGroup );
     rbprefadm = new TQRadioButton( i18n("Admin, user"), faceGroup );
     rbprefusr = new TQRadioButton( i18n("User, admin"), faceGroup );
@@ -162,29 +170,29 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
     TQWidget *hlpw = new TQWidget( picGroup );
     usercombo = new KComboBox( hlpw );
     TQWhatsThis::add( usercombo, i18n("The user the image below belongs to.") );
-    connect( usercombo, TQT_SIGNAL(activated( int )),
-	     TQT_SLOT(slotUserSelected()) );
+    connect( usercombo, TQ_SIGNAL(activated( int )),
+	     TQ_SLOT(slotUserSelected()) );
     TQLabel *userlabel = new TQLabel( usercombo, i18n("User:"), hlpw );
     userbutton = new TQPushButton( hlpw );
     userbutton->setAcceptDrops( true );
     userbutton->installEventFilter( this ); // for drag and drop
     uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48;
     userbutton->setFixedSize( sz, sz );
-    connect( userbutton, TQT_SIGNAL(clicked()),
-	     TQT_SLOT(slotUserButtonClicked()) );
+    connect( userbutton, TQ_SIGNAL(clicked()),
+	     TQ_SLOT(slotUserButtonClicked()) );
     TQToolTip::add( userbutton, i18n("Click or drop an image here") );
     TQWhatsThis::add( userbutton, i18n("Here you can see the image assigned to the user selected in the combo box above. Click on the image button to select from a list"
       " of images or drag and drop your own image on to the button (e.g. from Konqueror).") );
     rstuserbutton = new TQPushButton( i18n("Unset"), hlpw );
     TQWhatsThis::add( rstuserbutton, i18n("Click this button to make TDM use the default image for the selected user.") );
-    connect( rstuserbutton, TQT_SIGNAL(clicked()),
-	     TQT_SLOT(slotUnsetUserPix()) );
+    connect( rstuserbutton, TQ_SIGNAL(clicked()),
+	     TQ_SLOT(slotUnsetUserPix()) );
     TQGridLayout *hlpl = new TQGridLayout( hlpw, 3, 2, 0, KDialog::spacingHint() );
     hlpl->addWidget( userlabel, 0, 0 );
 //    hlpl->addSpacing( KDialog::spacingHint() );
     hlpl->addWidget( usercombo, 0, 1 );
-    hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, Qt::AlignHCenter );
-    hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, Qt::AlignHCenter );
+    hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, TQt::AlignHCenter );
+    hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, TQt::AlignHCenter );
 
     TQHBoxLayout *main = new TQHBoxLayout( this, 10 );
 
@@ -219,7 +227,7 @@ void TDMUsersWidget::makeReadOnly()
     rbprefusr->setEnabled(false);
     rbusronly->setEnabled(false);
     wstack->setEnabled(false);
-    disconnect( userbutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUserButtonClicked()) );
+    disconnect( userbutton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUserButtonClicked()) );
     userbutton->setAcceptDrops(false);
     rstuserbutton->setEnabled(false);
 }
@@ -264,7 +272,7 @@ void TDMUsersWidget::slotUserSelected()
 	rstuserbutton->setEnabled( false );
     }
     if (!p.isNull()) {
-	    userbutton->setPixmap( p.smoothScale( 48, 48, TQ_ScaleMin ) );
+	    userbutton->setPixmap( p.smoothScale( 48, 48, TQImage::ScaleMin ) );
     }
 }
 
@@ -288,7 +296,7 @@ void TDMUsersWidget::changeUserPix(const TQString &pix)
 	return;
     }
 
-    p = p.smoothScale( 48, 48, TQ_ScaleMin );
+    p = p.smoothScale( 48, 48, TQImage::ScaleMin );
     TQString userpix = m_userPixDir + user + ".face.icon";
     if (!p.save( userpix, "PNG" ))
         KMessageBox::sorry(this,
diff --git a/kcontrol/tdm/tdm-users.h b/kcontrol/tdm/tdm-users.h
index 08c66c6f8..157f29551 100644
--- a/kcontrol/tdm/tdm-users.h
+++ b/kcontrol/tdm/tdm-users.h
@@ -39,7 +39,7 @@
 
 class TDMUsersWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDMUsersWidget( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp
index b58647a9e..de61a61b2 100644
--- a/kcontrol/usbview/kcmusb.cpp
+++ b/kcontrol/usbview/kcmusb.cpp
@@ -36,7 +36,7 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &)
 
   TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, KDialog::spacingHint());
   TQGroupBox *gbox = new TQGroupBox(i18n("USB Devices"), this);
-  gbox->setColumnLayout( 0, Qt::Horizontal );
+  gbox->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(gbox);
 
   TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint());
@@ -63,9 +63,9 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &)
   // 1 sec seems to be a good compromise between latency and polling load.
   refreshTimer->start(1000);
 
-  connect(refreshTimer, TQT_SIGNAL(timeout()), TQT_SLOT(refresh()));
-  connect(_devices, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-	  this, TQT_SLOT(selectionChanged(TQListViewItem*)));
+  connect(refreshTimer, TQ_SIGNAL(timeout()), TQ_SLOT(refresh()));
+  connect(_devices, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+	  this, TQ_SLOT(selectionChanged(TQListViewItem*)));
 
   TDEAboutData *about =
   new TDEAboutData(I18N_NOOP("kcmusb"), I18N_NOOP("TDE USB Viewer"),
diff --git a/kcontrol/usbview/kcmusb.h b/kcontrol/usbview/kcmusb.h
index eb33a475c..421129c30 100644
--- a/kcontrol/usbview/kcmusb.h
+++ b/kcontrol/usbview/kcmusb.h
@@ -23,7 +23,7 @@ class TQTextView;
 
 class USBViewer : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp
index d6f879fd4..a3815b90f 100644
--- a/kcontrol/view1394/view1394.cpp
+++ b/kcontrol/view1394/view1394.cpp
@@ -85,8 +85,8 @@ View1394::View1394(TQWidget *parent, const char *name)
    m_view->m_listview->setColumnAlignment(8, AlignRight);
    m_view->m_listview->setColumnAlignment(9, AlignRight);
    box->addWidget(m_view);
-   connect(m_view->m_busResetPb, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateBusReset()));
-   connect(&m_rescanTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(rescanBus()));
+   connect(m_view->m_busResetPb, TQ_SIGNAL(clicked()), this, TQ_SLOT(generateBusReset()));
+   connect(&m_rescanTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(rescanBus()));
    m_notifiers.setAutoDelete(true);
    rescanBus();
 }
@@ -188,7 +188,7 @@ void View1394::rescanBus()
       raw1394_set_userdata(handle, this);
       raw1394_set_bus_reset_handler(handle, my_reset_handler);
       TQSocketNotifier *notif=new TQSocketNotifier(raw1394_get_fd(handle),TQSocketNotifier::Read);
-      connect(notif, TQT_SIGNAL(activated(int)), this, TQT_SLOT(callRaw1394EventLoop(int)));
+      connect(notif, TQ_SIGNAL(activated(int)), this, TQ_SLOT(callRaw1394EventLoop(int)));
       m_notifiers.append(notif);
       m_handles.append(handle);
       
diff --git a/kcontrol/view1394/view1394.h b/kcontrol/view1394/view1394.h
index 6d015bce8..1a3da9735 100644
--- a/kcontrol/view1394/view1394.h
+++ b/kcontrol/view1394/view1394.h
@@ -45,7 +45,7 @@ class OuiDb
 
 class View1394: public TDECModule
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       View1394(TQWidget *parent = 0L, const char *name = 0L);
       virtual ~View1394();
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp
index d32adc1b8..2c0fd2bba 100644
--- a/kcontrol/xinerama/kcmxinerama.cpp
+++ b/kcontrol/xinerama/kcmxinerama.cpp
@@ -59,7 +59,7 @@ KCMXinerama::KCMXinerama(TQWidget *parent, const char *name)
 	config = new TDEConfig("kdeglobals", false, false);
 	ksplashrc = new TDEConfig("ksplashrc", false, false);
 
-	connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearIndicator()));
+	connect(&_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(clearIndicator()));
 
 	TQGridLayout *grid = new TQGridLayout(this, 1, 1, KDialog::marginHint(),
 							KDialog::spacingHint());
@@ -91,14 +91,14 @@ KCMXinerama::KCMXinerama(TQWidget *parent, const char *name)
 
 		xw->headTable->setRowLabels(dpyList);
 
-		connect(xw->_ksplashDisplay, TQT_SIGNAL(activated(int)),
-			this, TQT_SLOT(windowIndicator(int)));
-		connect(xw->_unmanagedDisplay, TQT_SIGNAL(activated(int)),
-			this, TQT_SLOT(windowIndicator(int)));
-		connect(xw->_identify, TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(indicateWindows()));
+		connect(xw->_ksplashDisplay, TQ_SIGNAL(activated(int)),
+			this, TQ_SLOT(windowIndicator(int)));
+		connect(xw->_unmanagedDisplay, TQ_SIGNAL(activated(int)),
+			this, TQ_SLOT(windowIndicator(int)));
+		connect(xw->_identify, TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(indicateWindows()));
 
-		connect(xw, TQT_SIGNAL(configChanged()), this, TQT_SLOT(changed()));
+		connect(xw, TQ_SIGNAL(configChanged()), this, TQ_SLOT(changed()));
 	} else { // no Xinerama
 		TQLabel *ql = new TQLabel(i18n("<qt><p>This module is only for configuring systems with a single desktop spread across multiple monitors. You do not appear to have this configuration.</p></qt>"), this);
 		grid->addWidget(ql, 0, 0);
@@ -223,7 +223,7 @@ TQWidget *KCMXinerama::indicator(int dpy) {
 	si->setFont(fnt);
 	si->setFrameStyle(TQFrame::Panel);
 	si->setFrameShadow(TQFrame::Plain);
-	si->setAlignment(Qt::AlignCenter);
+	si->setAlignment(TQt::AlignCenter);
 
 	TQPoint screenCenter(TQApplication::desktop()->screenGeometry(dpy).center());
 	TQRect targetGeometry(TQPoint(0,0), si->sizeHint());
diff --git a/kcontrol/xinerama/kcmxinerama.h b/kcontrol/xinerama/kcmxinerama.h
index 83fdf6de9..940fdaa32 100644
--- a/kcontrol/xinerama/kcmxinerama.h
+++ b/kcontrol/xinerama/kcmxinerama.h
@@ -31,7 +31,7 @@ class TDEConfig;
 class TQWidget;
 
 class KCMXinerama : public TDECModule {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KCMXinerama(TQWidget *parent = 0L, const char *name = 0L);
 	virtual ~KCMXinerama();
diff --git a/kcontrol/xinerama/xineramawidget.ui b/kcontrol/xinerama/xineramawidget.ui
index a5e3664de..a999d68a3 100644
--- a/kcontrol/xinerama/xineramawidget.ui
+++ b/kcontrol/xinerama/xineramawidget.ui
@@ -315,12 +315,12 @@
     <include location="local" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">xineramawidget.ui.h</include>
 </includes>
-<Q_SIGNALS>
+<signals>
     <signal>configChanged()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
     <slot access="private">emitConfigChanged()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kdcop/kdcoplistview.h b/kdcop/kdcoplistview.h
index 8b537a152..e1bdef793 100644
--- a/kdcop/kdcoplistview.h
+++ b/kdcop/kdcoplistview.h
@@ -13,7 +13,7 @@ class TQDragObject;
 
 class KDCOPListView : public TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
   	KDCOPListView ( TQWidget * parent = 0, const char * name = 0 );
@@ -48,7 +48,7 @@ class DCOPBrowserItem : public TQListViewItem
 
 class DCOPBrowserApplicationItem : public TQObject, public DCOPBrowserItem
 {
- Q_OBJECT
+ TQ_OBJECT
   public:
 
     DCOPBrowserApplicationItem(TQListView * parent, const TQCString & app);
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index e1c047a8c..0870432fc 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -71,7 +71,7 @@ public:
 		new TQLabel(caption + ": ", l);
 		KLineEdit* e = new KLineEdit( l );
 		m_widgets.insert(key, e ) ;
-        	e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+        	e->setValidator( new TQIntValidator( e ) );
 	}
 	int field(int key)
 	{
@@ -133,7 +133,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
 	TQString mainWindowName= rx.cap(1) + "-mainwindow#1" ;
 
 	TQByteArray data;
-	int callId=kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data, this, TQT_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
+	int callId=kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data, this, TQ_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
 
 	if(!callId)
 	{
@@ -142,7 +142,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
 		TQDataStream arg(data, IO_WriteOnly);
 		arg << TQCString( "MainWindow" );
 
-		kapp->dcopClient()->callAsync( app_, "qt", "find(TQCString)", data, this, TQT_SLOT(slotGotWindowName(int, const TQCString&, const TQByteArray& )));
+		kapp->dcopClient()->callAsync( app_, "qt", "find(TQCString)", data, this, TQ_SLOT(slotGotWindowName(int, const TQCString&, const TQByteArray& )));
 	}
 }
 
@@ -158,7 +158,7 @@ DCOPBrowserApplicationItem::setOpen(bool o)
   void
 DCOPBrowserApplicationItem::populate()
 {
-  TDEApplication::setOverrideCursor(tqwaitCursor);
+  TDEApplication::setOverrideCursor(TQt::waitCursor);
 
   bool ok = false;
   bool isDefault = false;
@@ -192,7 +192,7 @@ void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const TQCStri
 		{
 			TQByteArray data;
 			kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data,
-				this, TQT_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
+				this, TQ_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
 		}
 	}
 }
@@ -241,7 +241,7 @@ DCOPBrowserInterfaceItem::setOpen(bool o)
   void
 DCOPBrowserInterfaceItem::populate()
 {
-  TDEApplication::setOverrideCursor(tqwaitCursor);
+  TDEApplication::setOverrideCursor(TQt::waitCursor);
 
   bool ok = false;
 
@@ -297,18 +297,18 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
 //	mainView->lv->addColumn(i18n("Function"));
 	mainView->lv->setDragAutoScroll( FALSE );
 	mainView->lv->setRootIsDecorated( TRUE );
-  connect(mainView->lv, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotCallFunction(TQListViewItem *)));
-  connect(mainView->lv, TQT_SIGNAL(currentChanged(TQListViewItem *)), TQT_SLOT(slotCurrentChanged(TQListViewItem *)));
-  connect(mainView->lb_replyData, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
-          TQT_SLOT(slotResultListContextMenu(TQListBoxItem*, const TQPoint&)));
+  connect(mainView->lv, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotCallFunction(TQListViewItem *)));
+  connect(mainView->lv, TQ_SIGNAL(currentChanged(TQListViewItem *)), TQ_SLOT(slotCurrentChanged(TQListViewItem *)));
+  connect(mainView->lb_replyData, TQ_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
+          TQ_SLOT(slotResultListContextMenu(TQListBoxItem*, const TQPoint&)));
 
   // set up the actions
-  KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
-  KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy()), actionCollection() );
-  KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
+  KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() );
+  KStdAction::copy( this, TQ_SLOT( slotCopy()), actionCollection() );
+  KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() );
 
 
-  (void) new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
+  (void) new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), this, TQ_SLOT( slotReload() ), actionCollection(), "reload" );
 
   exeaction =
     new TDEAction
@@ -316,8 +316,8 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
      i18n("&Execute"),
       "application-x-executable",
      CTRL + Key_E,
-     TQT_TQOBJECT(this),
-     TQT_SLOT(slotItemExecuted()),
+     this,
+     TQ_SLOT(slotItemExecuted()),
      actionCollection(),
      "execute"
     );
@@ -327,8 +327,8 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
 
   langmode = new TDESelectAction ( i18n("Language Mode"),
   		CTRL + Key_M,
-		TQT_TQOBJECT(this),
-		TQT_SLOT(slotMode()),
+		this,
+		TQ_SLOT(slotMode()),
 		actionCollection(),
 		"langmode");
   langmode->setEditable(false);
@@ -339,22 +339,22 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
   connect
     (
      dcopClient,
-     TQT_SIGNAL(applicationRegistered(const TQCString &)),
-     TQT_SLOT(slotApplicationRegistered(const TQCString &))
+     TQ_SIGNAL(applicationRegistered(const TQCString &)),
+     TQ_SLOT(slotApplicationRegistered(const TQCString &))
     );
 
   connect
     (
      dcopClient,
-     TQT_SIGNAL(applicationRemoved(const TQCString &)),
-     TQT_SLOT(slotApplicationUnregistered(const TQCString &))
+     TQ_SIGNAL(applicationRemoved(const TQCString &)),
+     TQ_SLOT(slotApplicationUnregistered(const TQCString &))
     );
 
   dcopClient->setNotifications(true);
   createGUI();
   setCaption(i18n("DCOP Browser"));
 	mainView->lb_replyData->hide();
-  TQTimer::singleShot(0, this, TQT_SLOT(slotFillApplications()));
+  TQTimer::singleShot(0, this, TQ_SLOT(slotFillApplications()));
 }
 
 
@@ -458,7 +458,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         KLineEdit* e = new KLineEdit( frame );
         grid->addWidget( e, i, 2 );
         wl.append( e );
-        e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+        e->setValidator( new TQIntValidator( e ) );
       }
       else if ( type == "unsigned"  || type == "uint" || type == "unsigned int"
              || type == "TQ_UINT32" )
@@ -471,7 +471,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         grid->addWidget( e, i, 2 );
         wl.append( e );
 
-        TQIntValidator* iv = new TQIntValidator( TQT_TQOBJECT(e) );
+        TQIntValidator* iv = new TQIntValidator( e );
         iv->setBottom( 0 );
         e->setValidator( iv );
       }
@@ -484,7 +484,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         KLineEdit* e = new KLineEdit( frame );
         grid->addWidget( e, i, 2 );
         wl.append( e );
-        e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+        e->setValidator( new TQIntValidator( e ) );
       }
       else if ( type == "ulong" || type == "unsigned long" || type == "unsigned long int"
              || type == "TQ_UINT64" )
@@ -496,7 +496,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         KLineEdit* e = new KLineEdit( frame );
         grid->addWidget( e, i, 2 );
         wl.append( e );
-        e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+        e->setValidator( new TQIntValidator( e ) );
       }
       else if ( type == "short" || type == "short int" )
       {
@@ -507,7 +507,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         KLineEdit* e = new KLineEdit( frame );
         grid->addWidget( e, i, 2 );
         wl.append( e );
-        e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+        e->setValidator( new TQIntValidator( e ) );
       }
       else if ( type == "ushort" || type == "unsigned short" || type == "unsigned short int"  )
       {
@@ -518,7 +518,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         KLineEdit* e = new KLineEdit( frame );
         grid->addWidget( e, i, 2 );
         wl.append( e );
-        e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+        e->setValidator( new TQIntValidator( e ) );
       }
       else if ( type == "float" )
       {
@@ -529,7 +529,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         KLineEdit* e = new KLineEdit( frame );
         grid->addWidget( e, i, 2 );
         wl.append( e );
-        e->setValidator( new TQDoubleValidator( TQT_TQOBJECT(e) ) );
+        e->setValidator( new TQDoubleValidator( e ) );
       }
       else if ( type == "double" )
       {
@@ -540,7 +540,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         KLineEdit* e = new KLineEdit( frame );
         grid->addWidget( e, i, 2 );
         wl.append( e );
-        e->setValidator( new TQDoubleValidator( TQT_TQOBJECT(e) ) );
+        e->setValidator( new TQDoubleValidator( e ) );
       }
       else if ( type == "bool" )
       {
@@ -892,7 +892,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
 
 void KDCOPWindow::slotFillApplications()
 {
-  TDEApplication::setOverrideCursor(tqwaitCursor);
+  TDEApplication::setOverrideCursor(TQt::waitCursor);
 
   QCStringList apps = dcopClient->registeredApplications();
   TQCString appId = dcopClient->appId();
@@ -1233,7 +1233,7 @@ void KDCOPWindow::slotMode()
 void KDCOPWindow::slotResultListContextMenu(TQListBoxItem *item, const TQPoint &point)
 {
 	TQPopupMenu* contextMenu = new TQPopupMenu(this);
-	contextMenu->insertItem(i18n("&Copy"), this, TQT_SLOT(slotCopy()));
+	contextMenu->insertItem(i18n("&Copy"), this, TQ_SLOT(slotCopy()));
 	contextMenu->exec(point);
 }
 
diff --git a/kdcop/kdcopwindow.h b/kdcop/kdcopwindow.h
index ddc5c2bb5..70ac865a5 100644
--- a/kdcop/kdcopwindow.h
+++ b/kdcop/kdcopwindow.h
@@ -22,7 +22,7 @@ class KDCOPListView;
 
 class KDCOPWindow : public TDEMainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/kdesktop/bgmanager.cpp b/kdesktop/bgmanager.cpp
index 7e90e8fca..a7078f12e 100644
--- a/kdesktop/bgmanager.cpp
+++ b/kdesktop/bgmanager.cpp
@@ -78,7 +78,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
 
     m_pDesktop = desktop;
     if (desktop == 0L)
-        desktop = TQT_TQWIDGET(TDEApplication::desktop()->screen());
+        desktop = TDEApplication::desktop()->screen();
 
     m_Renderer.resize( 1 );
     m_Cache.resize( 1 );
@@ -97,40 +97,40 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
         m_Cache[i]->hash = 0;
         m_Cache[i]->exp_from = -1;
         m_Renderer.insert (i, new KVirtualBGRenderer(i,m_pConfig));
-        connect(m_Renderer[i], TQT_SIGNAL(imageDone(int)), TQT_SLOT(slotImageDone(int)));
+        connect(m_Renderer[i], TQ_SIGNAL(imageDone(int)), TQ_SLOT(slotImageDone(int)));
         m_Renderer[i]->enableTiling( true ); // optimize
     }
 
 #ifdef COMPOSITE
     m_tPixmap = new KPixmap(kapp->desktop()->size());
     m_tPixmap->fill(TQColor(0, 0x0));
-    connect(myApp, TQT_SIGNAL(cmBackgroundChanged( bool )),
-            TQT_SLOT(slotCmBackgroundChanged( bool )));
+    connect(myApp, TQ_SIGNAL(cmBackgroundChanged( bool )),
+            TQ_SLOT(slotCmBackgroundChanged( bool )));
 #endif
 
     configure();
 
     m_pTimer = new TQTimer(this);
-    connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+    connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
     m_pTimer->start( 60000 );
 
     /*CrossFade's config*/
     m_crossTimer = new TQTimer(this);
-    connect(m_crossTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCrossFadeTimeout()));
+    connect(m_crossTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCrossFadeTimeout()));
     resizingDesktop = true;
     /*Ends here*/
 
 
-    connect(m_pKwinmodule, TQT_SIGNAL(currentDesktopChanged(int)),
-	    TQT_SLOT(slotChangeDesktop(int)));
-    connect(m_pKwinmodule, TQT_SIGNAL(numberOfDesktopsChanged(int)),
-	    TQT_SLOT(slotChangeNumberOfDesktops(int)));
-    connect(m_pKwinmodule, TQT_SIGNAL(currentDesktopViewportChanged(int, const TQPoint&)),
-            TQT_SLOT(slotChangeViewport(int, const TQPoint&)));
+    connect(m_pKwinmodule, TQ_SIGNAL(currentDesktopChanged(int)),
+	    TQ_SLOT(slotChangeDesktop(int)));
+    connect(m_pKwinmodule, TQ_SIGNAL(numberOfDesktopsChanged(int)),
+	    TQ_SLOT(slotChangeNumberOfDesktops(int)));
+    connect(m_pKwinmodule, TQ_SIGNAL(currentDesktopViewportChanged(int, const TQPoint&)),
+            TQ_SLOT(slotChangeViewport(int, const TQPoint&)));
 
 
 #if (TQT_VERSION-0 >= 0x030200)
-    connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
+    connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support
 #endif
 
     TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
@@ -338,7 +338,7 @@ void KBackgroundManager::slotChangeNumberOfDesktops(int num)
 	    m_Cache[i]->hash = 0;
 	    m_Cache[i]->exp_from = -1;
             m_Renderer.insert(i, new KVirtualBGRenderer(i,m_pConfig));
-	    connect(m_Renderer[i], TQT_SIGNAL(imageDone(int)), TQT_SLOT(slotImageDone(int)));
+	    connect(m_Renderer[i], TQ_SIGNAL(imageDone(int)), TQ_SLOT(slotImageDone(int)));
             m_Renderer[i]->enableTiling( true ); // optimize
 	}
     }
@@ -542,16 +542,16 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
        if( !root_cleared )
        { // clear the root window pixmap set by tdm
           root_cleared = true;
-	  TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot()));
+	  TQTimer::singleShot( 0, this, TQ_SLOT( clearRoot()));
           // but make the pixmap visible until m_pDesktop is visible
-          TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
-          TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+          TDEApplication::desktop()->screen()->setErasePixmap(*ep);
+          TDEApplication::desktop()->screen()->erase();
        }
     }
     else
     {
-        TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
-        TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+        TDEApplication::desktop()->screen()->setErasePixmap(*ep);
+        TDEApplication::desktop()->screen()->erase();
     }
 
      // and export it via Esetroot-style for gnome/GTK apps to share in the pretties
@@ -571,8 +571,8 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
 
 void KBackgroundManager::clearRoot()
 {
-    TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap( TQPixmap());
-    TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+    TDEApplication::desktop()->screen()->setErasePixmap( TQPixmap());
+    TDEApplication::desktop()->screen()->erase();
 }
 
 /*
@@ -681,7 +681,7 @@ void KBackgroundManager::slotImageDone(int desk)
         {
             m_bBgInitDone = true;
             emit initDone();
-            TQTimer::singleShot( 30000, this, TQT_SLOT( saveImages()));
+            TQTimer::singleShot( 30000, this, TQ_SLOT( saveImages()));
             do_cleanup = false;
         }
     }
@@ -1004,7 +1004,7 @@ void KBackgroundManager::repaintBackground()
     if (m_pDesktop)
        m_pDesktop->repaint();
     else
-        TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+        TDEApplication::desktop()->screen()->erase();
 }
 
 void KBackgroundManager::desktopResized()
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h
index b852a4adb..d78ebebc3 100644
--- a/kdesktop/bgmanager.h
+++ b/kdesktop/bgmanager.h
@@ -16,7 +16,7 @@
 #include <tqdatetime.h>
 #include <KBackgroundIface.h>
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
@@ -54,7 +54,7 @@ class KBackgroundManager
     : public TQObject,
       public KBackgroundIface
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
 public:
diff --git a/kdesktop/desktop.cpp b/kdesktop/desktop.cpp
index 2732bff08..e7681b1f2 100644
--- a/kdesktop/desktop.cpp
+++ b/kdesktop/desktop.cpp
@@ -79,13 +79,13 @@ bool KRootWidget::eventFilter ( TQObject *, TQEvent * e )
 {
      if (e->type() == TQEvent::MouseButtonPress)
      {
-       TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
+       TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
        KRootWm::self()->mousePressed( me->globalPos(), me->button() );
        return true;
      }
      else if (e->type() == TQEvent::Wheel)
      {
-       TQWheelEvent *we = TQT_TQWHEELEVENT(e);
+       TQWheelEvent *we = static_cast<TQWheelEvent*>(e);
        emit wheelRolled(we->delta());
        return true;
      }
@@ -155,7 +155,7 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
   setCaption( "KDE Desktop");
 
   setAcceptDrops(true); // WStyle_Customize seems to disable that
-  m_pKwinmodule = new KWinModule( TQT_TQOBJECT(this) );
+  m_pKwinmodule = new KWinModule( this );
 
   kapp->dcopClient()->setNotifications(true);
   kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)",
@@ -165,7 +165,7 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
   m_bInit = true;
 
   // It's the child widget that gets the focus, not us
-  setFocusPolicy( TQ_NoFocus );
+  setFocusPolicy( TQWidget::NoFocus );
 
   if ( x_root_hack )
   {
@@ -184,28 +184,28 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
   setGeometry( TQApplication::desktop()->geometry() );
   lower();
 
-  connect( kapp, TQT_SIGNAL( shutDown() ),
-           this, TQT_SLOT( slotShutdown() ) );
+  connect( kapp, TQ_SIGNAL( shutDown() ),
+           this, TQ_SLOT( slotShutdown() ) );
 
-  connect(kapp, TQT_SIGNAL(settingsChanged(int)),
-          this, TQT_SLOT(slotSettingsChanged(int)));
+  connect(kapp, TQ_SIGNAL(settingsChanged(int)),
+          this, TQ_SLOT(slotSettingsChanged(int)));
   kapp->addKipcEventMask(KIPC::SettingsChanged);
 
   kapp->addKipcEventMask(KIPC::IconChanged);
-  connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(slotIconChanged(int)));
+  connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int)));
 
-  connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()),
-          this, TQT_SLOT(slotDatabaseChanged()));
+  connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()),
+          this, TQ_SLOT(slotDatabaseChanged()));
 
   m_pIconView = 0;
   m_pRootWidget = 0;
   bgMgr = 0;
   initRoot();
 
-  TQTimer::singleShot(0, this, TQT_SLOT( slotStart() ));
+  TQTimer::singleShot(0, this, TQ_SLOT( slotStart() ));
 
 #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
-  connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
+  connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
 #endif
 }
 
@@ -238,21 +238,21 @@ KDesktop::initRoot()
      XSelectInput(dpy, root, attrs.your_event_mask | ButtonPressMask);
 
      m_pRootWidget = new KRootWidget;
-     connect(m_pRootWidget, TQT_SIGNAL(wheelRolled(int)), this, TQT_SLOT(slotSwitchDesktops(int)));
-     connect(m_pRootWidget, TQT_SIGNAL(colorDropEvent(TQDropEvent*)), this, TQT_SLOT(handleColorDropEvent(TQDropEvent*)) );
-     connect(m_pRootWidget, TQT_SIGNAL(imageDropEvent(TQDropEvent*)), this, TQT_SLOT(handleImageDropEvent(TQDropEvent*)) );
-     connect(m_pRootWidget, TQT_SIGNAL(newWallpaper(const KURL&)), this, TQT_SLOT(slotNewWallpaper(const KURL&)) );
+     connect(m_pRootWidget, TQ_SIGNAL(wheelRolled(int)), this, TQ_SLOT(slotSwitchDesktops(int)));
+     connect(m_pRootWidget, TQ_SIGNAL(colorDropEvent(TQDropEvent*)), this, TQ_SLOT(handleColorDropEvent(TQDropEvent*)) );
+     connect(m_pRootWidget, TQ_SIGNAL(imageDropEvent(TQDropEvent*)), this, TQ_SLOT(handleImageDropEvent(TQDropEvent*)) );
+     connect(m_pRootWidget, TQ_SIGNAL(newWallpaper(const KURL&)), this, TQ_SLOT(slotNewWallpaper(const KURL&)) );
 
      // Geert Jansen: backgroundmanager belongs here
      // TODO tell KBackgroundManager if we change widget()
      bgMgr = new KBackgroundManager( m_pIconView, m_pKwinmodule );
      bgMgr->setExport(1);
-     connect( bgMgr, TQT_SIGNAL( initDone()), TQT_SLOT( backgroundInitDone()));
+     connect( bgMgr, TQ_SIGNAL( initDone()), TQ_SLOT( backgroundInitDone()));
      if (!m_bInit)
      {
         delete KRootWm::self();
         KRootWm* krootwm = new KRootWm( m_pSaver, this ); // handler for root menu (used by kdesktop on RMB click)
-        keys->setSlot("Lock Session", krootwm, TQT_SLOT(slotLock()));
+        keys->setSlot("Lock Session", krootwm, TQ_SLOT(slotLock()));
         keys->updateConnections();
      }
   }
@@ -263,24 +263,24 @@ KDesktop::initRoot()
      delete m_pRootWidget;
      m_pRootWidget = 0;
      m_pIconView = new KDIconView( this, 0 );
-     connect( m_pIconView, TQT_SIGNAL( imageDropEvent( TQDropEvent * ) ),
-              this, TQT_SLOT( handleImageDropEvent( TQDropEvent * ) ) );
-     connect( m_pIconView, TQT_SIGNAL( colorDropEvent( TQDropEvent * ) ),
-              this, TQT_SLOT( handleColorDropEvent( TQDropEvent * ) ) );
-     connect( m_pIconView, TQT_SIGNAL( newWallpaper( const KURL & ) ),
-              this, TQT_SLOT( slotNewWallpaper( const KURL & ) ) );
-     connect( m_pIconView, TQT_SIGNAL( wheelRolled( int ) ),
-              this, TQT_SLOT( slotSwitchDesktops( int ) ) );
-
-     // All the QScrollView/QWidget-specific stuff should go here, so that we can use
+     connect( m_pIconView, TQ_SIGNAL( imageDropEvent( TQDropEvent * ) ),
+              this, TQ_SLOT( handleImageDropEvent( TQDropEvent * ) ) );
+     connect( m_pIconView, TQ_SIGNAL( colorDropEvent( TQDropEvent * ) ),
+              this, TQ_SLOT( handleColorDropEvent( TQDropEvent * ) ) );
+     connect( m_pIconView, TQ_SIGNAL( newWallpaper( const KURL & ) ),
+              this, TQ_SLOT( slotNewWallpaper( const KURL & ) ) );
+     connect( m_pIconView, TQ_SIGNAL( wheelRolled( int ) ),
+              this, TQ_SLOT( slotSwitchDesktops( int ) ) );
+
+     // All the QScrollView/TQWidget-specific stuff should go here, so that we can use
      // another qscrollview/widget instead of the iconview and use the same code
      m_pIconView->setVScrollBarMode( TQScrollView::AlwaysOff );
      m_pIconView->setHScrollBarMode( TQScrollView::AlwaysOff );
      m_pIconView->setDragAutoScroll( false );
      m_pIconView->setFrameStyle( TQFrame::NoFrame );
      m_pIconView->viewport()->setBackgroundMode( X11ParentRelative );
-     m_pIconView->setFocusPolicy( TQ_StrongFocus );
-     m_pIconView->viewport()->setFocusPolicy( TQ_StrongFocus );
+     m_pIconView->setFocusPolicy( TQWidget::StrongFocus );
+     m_pIconView->viewport()->setFocusPolicy( TQWidget::StrongFocus );
      m_pIconView->setGeometry( geometry() );
      m_pIconView->show();
 
@@ -288,7 +288,7 @@ KDesktop::initRoot()
      // TODO tell KBackgroundManager if we change widget()
      bgMgr = new KBackgroundManager( m_pIconView, m_pKwinmodule );
      bgMgr->setExport(1);
-     connect( bgMgr, TQT_SIGNAL( initDone()), TQT_SLOT( backgroundInitDone()));
+     connect( bgMgr, TQ_SIGNAL( initDone()), TQ_SLOT( backgroundInitDone()));
 
      // make sure it is initialized before we first call updateWorkArea()
      m_pIconView->initConfig( m_bInit );
@@ -315,7 +315,7 @@ KDesktop::initRoot()
             // if we failed to get the information from kicker wait a little - probably
             // this is the KDE startup and kicker is simply not running yet
             m_waitForKicker = new TQTimer(this);
-            connect(m_waitForKicker, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotNoKicker()));
+            connect(m_waitForKicker, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotNoKicker()));
             m_waitForKicker->start(15000, true);
           }
           else  // we are not called from the ctor, so kicker should already run
@@ -330,7 +330,7 @@ KDesktop::initRoot()
         m_pIconView->start();
         delete KRootWm::self();
         KRootWm* krootwm = new KRootWm( m_pSaver, this ); // handler for root menu (used by kdesktop on RMB click)
-        keys->setSlot("Lock Session", krootwm, TQT_SLOT(slotLock()));
+        keys->setSlot("Lock Session", krootwm, TQ_SLOT(slotLock()));
         keys->updateConnections();
      }
    } else {
@@ -359,7 +359,7 @@ KDesktop::backgroundInitDone()
     // avoid flicker
     if (m_bDesktopEnabled)
     {
-       const TQPixmap *bg = TQT_TQWIDGET(TQApplication::desktop()->screen())->backgroundPixmap();
+       const TQPixmap *bg = TQApplication::desktop()->screen()->backgroundPixmap();
        if ( bg )
           m_pIconView->setErasePixmap( *bg );
 
@@ -396,7 +396,7 @@ KDesktop::slotStart()
      m_pIconView->start();
 
   // Global keys
-  keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+  keys = new TDEGlobalAccel( this );
   (void) new KRootWm( m_pSaver, this );
 
 #include "kdesktopbindings.cpp"
@@ -404,9 +404,9 @@ KDesktop::slotStart()
   keys->readSettings();
   keys->updateConnections();
 
-  connect(kapp, TQT_SIGNAL(appearanceChanged()), TQT_SLOT(slotConfigure()));
+  connect(kapp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotConfigure()));
 
-  TQTimer::singleShot(300, this, TQT_SLOT( slotUpAndRunning() ));
+  TQTimer::singleShot(300, this, TQ_SLOT( slotUpAndRunning() ));
 }
 
 void
@@ -648,21 +648,21 @@ void KDesktop::setShowDesktop( bool b )
         }
 
         // on desktop changes or when a window is deiconified, we abort the show desktop mode
-        connect(twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
-                TQT_SLOT(slotCurrentDesktopChanged(int)));
-        connect(twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
-                TQT_SLOT(slotWindowChanged(WId,unsigned int)));
-        connect(twinModule(), TQT_SIGNAL(windowAdded(WId)),
-                TQT_SLOT(slotWindowAdded(WId)));
+        connect(twinModule(), TQ_SIGNAL(currentDesktopChanged(int)),
+                TQ_SLOT(slotCurrentDesktopChanged(int)));
+        connect(twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)),
+                TQ_SLOT(slotWindowChanged(WId,unsigned int)));
+        connect(twinModule(), TQ_SIGNAL(windowAdded(WId)),
+                TQ_SLOT(slotWindowAdded(WId)));
     }
     else
     {
-        disconnect(twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
-                   this, TQT_SLOT(slotCurrentDesktopChanged(int)));
-        disconnect(twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
-                   this, TQT_SLOT(slotWindowChanged(WId,unsigned int)));
-        disconnect(twinModule(), TQT_SIGNAL(windowAdded(WId)),
-                   this, TQT_SLOT(slotWindowAdded(WId)));
+        disconnect(twinModule(), TQ_SIGNAL(currentDesktopChanged(int)),
+                   this, TQ_SLOT(slotCurrentDesktopChanged(int)));
+        disconnect(twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)),
+                   this, TQ_SLOT(slotWindowChanged(WId,unsigned int)));
+        disconnect(twinModule(), TQ_SIGNAL(windowAdded(WId)),
+                   this, TQ_SLOT(slotWindowAdded(WId)));
 
         for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin();
              it != m_iconifiedList.end();
@@ -851,7 +851,7 @@ void KDesktop::slotSetVRoot()
         return;
 
     if (KWin::windowInfo(winId()).mappingState() == NET::Withdrawn) {
-        TQTimer::singleShot(100, this, TQT_SLOT(slotSetVRoot()));
+        TQTimer::singleShot(100, this, TQ_SLOT(slotSetVRoot()));
         return;
     }
 
diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h
index c6a208f07..c85e8b577 100644
--- a/kdesktop/desktop.h
+++ b/kdesktop/desktop.h
@@ -44,7 +44,7 @@ class SaverEngine;
 
 class KRootWidget : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
    KRootWidget();
    bool eventFilter( TQObject *, TQEvent * e );
@@ -63,7 +63,7 @@ signals:
 class KDesktop : public TQWidget,
                  public KDesktopIface
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kdesktop/kcustommenu.cpp b/kdesktop/kcustommenu.cpp
index 2e825c0d9..cd1287d3d 100644
--- a/kdesktop/kcustommenu.cpp
+++ b/kdesktop/kcustommenu.cpp
@@ -57,7 +57,7 @@ KCustomMenu::KCustomMenu(const TQString &configfile, TQWidget *parent)
  
      insertMenuItem( menuItem, -1 );
   }
-  connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
+  connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)));
 }
 
 KCustomMenu::~KCustomMenu()
diff --git a/kdesktop/kcustommenu.h b/kdesktop/kcustommenu.h
index 93b8d671f..a8f2cf5c4 100644
--- a/kdesktop/kcustommenu.h
+++ b/kdesktop/kcustommenu.h
@@ -29,7 +29,7 @@
  */
 class KCustomMenu : public TQPopupMenu
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    /**
     * Create a custome menu described by @p configfile.
diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index 71e008562..183fcc417 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -123,7 +123,7 @@
   </group>
   <group name="FMSettings"> 
     <entry key="NormalTextColor" type="Color"> <!--SHARED-->
-      <default>Qt::white</default>
+      <default>TQt::white</default>
       <label>Normal text color used for icon labels</label>
       <whatsthis></whatsthis>
     </entry>
diff --git a/kdesktop/kdesktopSetAsBackground.desktop b/kdesktop/kdesktopSetAsBackground.desktop
index a7ba4f14a..3bc655803 100644
--- a/kdesktop/kdesktopSetAsBackground.desktop
+++ b/kdesktop/kdesktopSetAsBackground.desktop
@@ -1,14 +1,44 @@
 [Desktop Entry]
 X-TDE-ServiceTypes=image/*
-Actions=setAsBackground;tileAsBackground;
+Actions=centeredAsBackground;tiledAsBackground;centeredTiledAsBackground;centeredMaxpectAsBackground;tiledMaxpectAsBackground;scaledAsBackground;centeredAutoFitAsBackground;scaleAndCropAsBackground
 X-TDE-Submenu=Set as Background
 
-[Desktop Action setAsBackground]
+[Desktop Action centeredAsBackground]
 Name=Centered
 Icon=background
-Exec=dcop kdesktop KBackgroundIface setWallpaper %u 6
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 1
 
-[Desktop Action tileAsBackground]
+[Desktop Action tiledAsBackground]
 Name=Tiled
 Icon=background
 Exec=dcop kdesktop KBackgroundIface setWallpaper %u 2
+
+[Desktop Action centeredTiledAsBackground]
+Name=Center Tiled
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 3
+
+[Desktop Action centeredMaxpectAsBackground]
+Name=Centered Maxpect
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 4
+
+[Desktop Action tiledMaxpectAsBackground]
+Name=Tiled Maxpect
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 5
+
+[Desktop Action scaledAsBackground]
+Name=Scaled
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 6
+
+[Desktop Action centeredAutoFitAsBackground]
+Name=Centered Auto Fit
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 7
+
+[Desktop Action scaleAndCropAsBackground]
+Name=Scale & Crop
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 8
diff --git a/kdesktop/kdesktopapp.cpp b/kdesktop/kdesktopapp.cpp
index ba05dc655..35f763f9c 100644
--- a/kdesktop/kdesktopapp.cpp
+++ b/kdesktop/kdesktopapp.cpp
@@ -27,7 +27,7 @@ KUniqueApplication()
 #endif
 }
 
-KDesktopApp::KDesktopApp(Display * dpy, Qt::HANDLE visual, Qt::HANDLE colormap):
+KDesktopApp::KDesktopApp(Display * dpy, TQt::HANDLE visual, TQt::HANDLE colormap):
 KUniqueApplication(dpy, visual, colormap)
 {
 #ifdef COMPOSITE
diff --git a/kdesktop/kdesktopapp.h b/kdesktop/kdesktopapp.h
index 94cdd1d33..1f45ec0a3 100644
--- a/kdesktop/kdesktopapp.h
+++ b/kdesktop/kdesktopapp.h
@@ -23,7 +23,7 @@
 #include <config.h>
 #include <kuniqueapplication.h>
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
@@ -35,11 +35,11 @@
 
 class KDesktopApp : public KUniqueApplication
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         KDesktopApp();
-        KDesktopApp(Display * dpy, Qt::HANDLE visual = 0,
-                    Qt::HANDLE colormap = 0);
+        KDesktopApp(Display * dpy, TQt::HANDLE visual = 0,
+                    TQt::HANDLE colormap = 0);
 
 #ifdef COMPOSITE
         bool x11EventFilter (XEvent *);
diff --git a/kdesktop/kdesktopbindings.cpp b/kdesktop/kdesktopbindings.cpp
index 91bddb5b3..17b27fc65 100644
--- a/kdesktop/kdesktopbindings.cpp
+++ b/kdesktop/kdesktopbindings.cpp
@@ -1,6 +1,6 @@
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
 # define DEF2( name, key3, key4, receiver, slot ) \
    keys->insert( name, i18n(name), TQString(), key3, key4, receiver, slot );
 #else
@@ -17,34 +17,34 @@
 	if (kapp->authorize("run_command"))
 	{
 #endif
-		DEF( I18N_NOOP("Run Command"), ALT+Qt::Key_F2, WIN+Qt::Key_Return, slotExecuteCommand() );
+		DEF( I18N_NOOP("Run Command"), ALT+TQt::Key_F2, WIN+TQt::Key_Return, slotExecuteCommand() );
 #ifndef NOSLOTS
 	}
 #endif
-	DEF( I18N_NOOP("Show Taskmanager"), CTRL+Qt::Key_Escape, WIN+CTRL+Qt::Key_Pause, slotShowTaskManager() );
-	DEF( I18N_NOOP("Show Window List"), ALT+Qt::Key_F5, WIN+Qt::Key_0, slotShowWindowList() );
-	DEF( I18N_NOOP("Switch User"), ALT+CTRL+Qt::Key_Insert, WIN+Qt::Key_Insert, slotSwitchUser() );
+	DEF( I18N_NOOP("Show Taskmanager"), CTRL+TQt::Key_Escape, WIN+CTRL+TQt::Key_Pause, slotShowTaskManager() );
+	DEF( I18N_NOOP("Show Window List"), ALT+TQt::Key_F5, WIN+TQt::Key_0, slotShowWindowList() );
+	DEF( I18N_NOOP("Switch User"), ALT+CTRL+TQt::Key_Insert, WIN+TQt::Key_Insert, slotSwitchUser() );
 #ifndef NOSLOTS
 	if (kapp->authorize("lock_screen"))
 	{
 #endif
-		DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+Qt::Key_L, WIN+Qt::Key_ScrollLock, KRootWm::self(), TQT_SLOT(slotLock()) );
-		DEF2( I18N_NOOP("Lock Session (Hotkey)"), TDEShortcut(TQString("XF86ScreenSaver")), TDEShortcut(TQString("XF86ScreenSaver")), KRootWm::self(), TQT_SLOT(slotLock()) );
+		DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+TQt::Key_L, WIN+TQt::Key_ScrollLock, KRootWm::self(), TQ_SLOT(slotLock()) );
+		DEF2( I18N_NOOP("Lock Session (Hotkey)"), TDEShortcut(TQString("XF86ScreenSaver")), TDEShortcut(TQString("XF86ScreenSaver")), KRootWm::self(), TQ_SLOT(slotLock()) );
 #ifndef NOSLOTS
 	}
 	if (kapp->authorize("start_screensaver"))
 	{
 #endif
-		DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+Qt::Key_S, WIN+Qt::Key_S, KRootWm::self(), TQT_SLOT(slotSave()) );
+		DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+TQt::Key_S, WIN+TQt::Key_S, KRootWm::self(), TQ_SLOT(slotSave()) );
 #ifndef NOSLOTS
 	}
 	if (kapp->authorize("logout"))
 	{
 #endif
-		DEF( I18N_NOOP("Log Out"), ALT+CTRL+Qt::Key_Delete, WIN+Qt::Key_Escape, slotLogout() );
-		DEF( I18N_NOOP("Log Out Without Confirmation"), ALT+CTRL+SHIFT+Qt::Key_Delete, WIN+SHIFT+Qt::Key_Escape, slotLogoutNoCnf() );
-		DEF( I18N_NOOP("Halt without Confirmation"), ALT+CTRL+SHIFT+Qt::Key_PageDown, WIN+CTRL+SHIFT+Qt::Key_PageDown, slotHaltNoCnf() );
-		DEF( I18N_NOOP("Reboot without Confirmation"), ALT+CTRL+SHIFT+Qt::Key_PageUp, WIN+CTRL+SHIFT+Qt::Key_PageUp, slotRebootNoCnf() );
+		DEF( I18N_NOOP("Log Out"), ALT+CTRL+TQt::Key_Delete, WIN+TQt::Key_Escape, slotLogout() );
+		DEF( I18N_NOOP("Log Out Without Confirmation"), ALT+CTRL+SHIFT+TQt::Key_Delete, WIN+SHIFT+TQt::Key_Escape, slotLogoutNoCnf() );
+		DEF( I18N_NOOP("Halt without Confirmation"), ALT+CTRL+SHIFT+TQt::Key_PageDown, WIN+CTRL+SHIFT+TQt::Key_PageDown, slotHaltNoCnf() );
+		DEF( I18N_NOOP("Reboot without Confirmation"), ALT+CTRL+SHIFT+TQt::Key_PageUp, WIN+CTRL+SHIFT+TQt::Key_PageUp, slotRebootNoCnf() );
 #ifndef NOSLOTS
 	}
 #endif
diff --git a/kdesktop/kdiconview.cpp b/kdesktop/kdiconview.cpp
index 409887784..7d79d12cf 100644
--- a/kdesktop/kdiconview.cpp
+++ b/kdesktop/kdiconview.cpp
@@ -162,32 +162,32 @@ KDIconView::KDIconView( TQWidget *parent, const char* name )
     // Initialize media handler
     mMediaListView = new TQListView();
 
-    connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
+    connect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) );
 
     setURL( desktopURL() ); // sets m_url
 
     m_desktopDirs = TDEGlobal::dirs()->findDirs( "appdata", "Desktop" );
     initDotDirectories();
 
-    connect( this, TQT_SIGNAL( executed( TQIconViewItem * ) ),
-             TQT_SLOT( slotExecuted( TQIconViewItem * ) ) );
-    connect( this, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ),
-             TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
-    connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)),
-             TQT_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) );
-    connect( this, TQT_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)),
-             TQT_SLOT( slotMouseButtonClickedKDesktop(int, TQIconViewItem*, const TQPoint&)) );
-    connect( this, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)),
-             TQT_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) );
+    connect( this, TQ_SIGNAL( executed( TQIconViewItem * ) ),
+             TQ_SLOT( slotExecuted( TQIconViewItem * ) ) );
+    connect( this, TQ_SIGNAL( returnPressed( TQIconViewItem * ) ),
+             TQ_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
+    connect( this, TQ_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)),
+             TQ_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) );
+    connect( this, TQ_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)),
+             TQ_SLOT( slotMouseButtonClickedKDesktop(int, TQIconViewItem*, const TQPoint&)) );
+    connect( this, TQ_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)),
+             TQ_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) );
 
-    connect( this, TQT_SIGNAL( enableAction( const char * , bool ) ),
-             TQT_SLOT( slotEnableAction( const char * , bool ) ) );
+    connect( this, TQ_SIGNAL( enableAction( const char * , bool ) ),
+             TQ_SLOT( slotEnableAction( const char * , bool ) ) );
 
     // Hack: KonqIconViewWidget::slotItemRenamed is not virtual :-(
-    disconnect( this, TQT_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)),
-             this, TQT_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
-    connect( this, TQT_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)),
-             this, TQT_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
+    disconnect( this, TQ_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)),
+             this, TQ_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
+    connect( this, TQ_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)),
+             this, TQ_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
 
     if (!m_bEditableDesktopIcons)
     {
@@ -370,12 +370,12 @@ void KDIconView::start()
 
     m_bNeedSave = false;
 
-    connect( m_dirLister, TQT_SIGNAL( clear() ),                               this, TQT_SLOT( slotClear() ) );
-    connect( m_dirLister, TQT_SIGNAL( started(const KURL&) ),                  this, TQT_SLOT( slotStarted(const KURL&) ) );
-    connect( m_dirLister, TQT_SIGNAL( completed() ),                           this, TQT_SLOT( slotCompleted() ) );
-    connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ),     this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
-    connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),             this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
-    connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) );
+    connect( m_dirLister, TQ_SIGNAL( clear() ),                               this, TQ_SLOT( slotClear() ) );
+    connect( m_dirLister, TQ_SIGNAL( started(const KURL&) ),                  this, TQ_SLOT( slotStarted(const KURL&) ) );
+    connect( m_dirLister, TQ_SIGNAL( completed() ),                           this, TQ_SLOT( slotCompleted() ) );
+    connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ),     this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) );
+    connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ),             this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) );
+    connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) );
 
     // Start the directory lister !
     m_dirLister->setShowingDotFiles( m_bShowDot );
@@ -420,35 +420,35 @@ void KDIconView::createActions()
 {
     if (m_bEditableDesktopIcons)
     {
-        TDEAction *undo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), &m_actionCollection, "undo" );
-        connect( KonqUndoManager::self(), TQT_SIGNAL( undoAvailable( bool ) ),
-             undo, TQT_SLOT( setEnabled( bool ) ) );
-        connect( KonqUndoManager::self(), TQT_SIGNAL( undoTextChanged( const TQString & ) ),
-             undo, TQT_SLOT( setText( const TQString & ) ) );
+        TDEAction *undo = KStdAction::undo( KonqUndoManager::self(), TQ_SLOT( undo() ), &m_actionCollection, "undo" );
+        connect( KonqUndoManager::self(), TQ_SIGNAL( undoAvailable( bool ) ),
+             undo, TQ_SLOT( setEnabled( bool ) ) );
+        connect( KonqUndoManager::self(), TQ_SIGNAL( undoTextChanged( const TQString & ) ),
+             undo, TQ_SLOT( setText( const TQString & ) ) );
         undo->setEnabled( KonqUndoManager::self()->undoAvailable() );
 
-        TDEAction* paCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), &m_actionCollection, "cut" );
+        TDEAction* paCut = KStdAction::cut( this, TQ_SLOT( slotCut() ), &m_actionCollection, "cut" );
         TDEShortcut cutShortCut = paCut->shortcut();
         cutShortCut.remove( KKey( SHIFT + Key_Delete ) ); // used for deleting files
         paCut->setShortcut( cutShortCut );
 
-        KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), &m_actionCollection, "copy" );
-        KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), &m_actionCollection, "paste" );
-        TDEAction *pasteTo = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
+        KStdAction::copy( this, TQ_SLOT( slotCopy() ), &m_actionCollection, "copy" );
+        KStdAction::paste( this, TQ_SLOT( slotPaste() ), &m_actionCollection, "paste" );
+        TDEAction *pasteTo = KStdAction::paste( this, TQ_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
         pasteTo->setEnabled( false ); // only enabled during popupMenu()
 
         TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload);
-        new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" );
+        new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQ_SLOT( refreshIcons() ), &m_actionCollection, "reload" );
 
-        (void) new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
-        (void) new TDEAction( i18n( "&Properties" ), ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" );
+        (void) new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, this, TQ_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
+        (void) new TDEAction( i18n( "&Properties" ), ALT+Key_Return, this, TQ_SLOT( slotProperties() ), &m_actionCollection, "properties" );
         TDEAction* trash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" );
-        connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
-                 this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+        connect( trash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
+                 this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
 
         TDEConfig config("kdeglobals", true, false);
         config.setGroup( "KDE" );
-        (void) new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
+        (void) new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, this, TQ_SLOT( slotDelete() ), &m_actionCollection, "del" );
 
         // Initial state of the actions (cut/copy/paste/...)
         slotSelectionChanged();
@@ -526,8 +526,8 @@ void KDIconView::setAutoAlign( bool b )
         else {
             KRootWm::self()->startup = false;
         }
-        connect( this, TQT_SIGNAL( iconMoved() ),
-                 this, TQT_SLOT( lineupIcons() ) );
+        connect( this, TQ_SIGNAL( iconMoved() ),
+                 this, TQ_SLOT( lineupIcons() ) );
     }
     else {
         // change maxItemWidth, because when grid-align was active, it changed this for the grid
@@ -535,8 +535,8 @@ void KDIconView::setAutoAlign( bool b )
         setMaxItemWidth( TQMAX( TQMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
         setFont( font() );  // Force calcRect()
 
-        disconnect( this, TQT_SIGNAL( iconMoved() ),
-                    this, TQT_SLOT( lineupIcons() ) );
+        disconnect( this, TQ_SIGNAL( iconMoved() ),
+                    this, TQ_SLOT( lineupIcons() ) );
     }
 }
 
@@ -650,7 +650,7 @@ void KDIconView::contentsMousePressEvent( TQMouseEvent *e )
     if (!m_dirLister) return;
     //kdDebug(1204) << "KDIconView::contentsMousePressEvent" << endl;
     // TQIconView, as of Qt 2.2, doesn't emit mouseButtonPressed for LMB on background
-    if ( e->button() == Qt::LeftButton && KRootWm::self()->hasLeftButtonMenu() )
+    if ( e->button() == TQt::LeftButton && KRootWm::self()->hasLeftButtonMenu() )
     {
         TQIconViewItem *item = findItem( e->pos() );
         if ( !item )
@@ -676,7 +676,7 @@ void KDIconView::wheelEvent( TQWheelEvent* e )
     TQIconViewItem *item = findItem( e->pos() );
     if ( !item )
     {
-      TQWheelEvent *we = TQT_TQWHEELEVENT(e);
+      TQWheelEvent *we = static_cast<TQWheelEvent*>(e);
 
       if ( we->state() == ControlButton )
       {
@@ -731,7 +731,7 @@ void KDIconView::slotMouseButtonClickedKDesktop(int _button, TQIconViewItem* _it
 {
     if (!m_dirLister) return;
     //kdDebug(1204) << "KDIconView::slotMouseButtonClickedKDesktop" << endl;
-    if ( _item && _button == Qt::MidButton ) {
+    if ( _item && _button == TQt::MidButton ) {
         slotExecuted(_item);
     }
 }
@@ -1446,7 +1446,7 @@ void KDIconView::showFreeSpaceOverlay(KFileIVI* item)
            if (!m_paOutstandingFreeSpaceOverlaysTimer)
            {
               m_paOutstandingFreeSpaceOverlaysTimer = new TQTimer(this);
-              connect(m_paOutstandingFreeSpaceOverlaysTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFreeSpaceOverlayStart()));
+              connect(m_paOutstandingFreeSpaceOverlaysTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFreeSpaceOverlayStart()));
            }
            m_paOutstandingFreeSpaceOverlaysTimer->start(20, true);
         }
@@ -1466,7 +1466,7 @@ void KDIconView::slotFreeSpaceOverlayStart()
 
        if (overlay)
        {
-          connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFreeSpaceOverlayFinished() ) );
+          connect( overlay, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFreeSpaceOverlayFinished() ) );
           overlay->start(); // Watch out, may emit finished() immediately!!
           return; // Let it run....
        }
@@ -1667,7 +1667,7 @@ void KDIconView::slotAboutToCreate(const TQPoint &pos, const TQValueList<TDEIO::
            saveIconPosition(m_dotDirectory, m_lastDropPos.x(), m_lastDropPos.y());
            int dX = m_lastDropPos.x() - m_dropPos.x();
            int dY = m_lastDropPos.y() - m_dropPos.y();
-           if ((QABS(dX) > QABS(dY)) || (m_lastDropPos.x() + 2*gridX > width()))
+           if ((TQABS(dX) > TQABS(dY)) || (m_lastDropPos.x() + 2*gridX > width()))
               m_lastDropPos = TQPoint(m_dropPos.x(), m_lastDropPos.y() + gridY);
            else
               m_lastDropPos = TQPoint(m_lastDropPos.x() + gridX, m_lastDropPos.y());
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index f3ebe6718..61d35560a 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -48,7 +48,7 @@ class KDesktopShadowSettings;
  */
 class KDIconView : public KonqIconViewWidget, public KDirNotify
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KDIconView( TQWidget *parent, const char* name = 0L );
diff --git a/kdesktop/krootwm.cpp b/kdesktop/krootwm.cpp
index 62ee673e0..b33ef60d4 100644
--- a/kdesktop/krootwm.cpp
+++ b/kdesktop/krootwm.cpp
@@ -89,10 +89,10 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
   if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
   {
      menuNew = new KNewMenu( m_actionCollection, "new_menu" );
-     connect(menuNew->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-             this, TQT_SLOT( slotFileNewAboutToShow() ) );
-     connect( menuNew, TQT_SIGNAL( activated() ),
-              m_pDesktop->iconView(), TQT_SLOT( slotNewMenuActivated() ) );
+     connect(menuNew->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+             this, TQ_SLOT( slotFileNewAboutToShow() ) );
+     connect( menuNew, TQ_SIGNAL( activated() ),
+              m_pDesktop->iconView(), TQ_SLOT( slotNewMenuActivated() ) );
   }
 
   if (kapp->authorizeTDEAction("bookmarks"))
@@ -114,8 +114,8 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
   // so we create them here
   desktopMenu = new TQPopupMenu;
   windowListMenu = new KWindowListMenu;
-  connect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
-           this, TQT_SLOT( slotWindowListAboutToShow() ) );
+  connect( windowListMenu, TQ_SIGNAL( aboutToShow() ),
+           this, TQ_SLOT( slotWindowListAboutToShow() ) );
 
   // Create the actions
 #if 0
@@ -134,80 +134,80 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
 
   if (kapp->authorize("run_command"))
   {
-     new TDEAction(i18n("Run Command..."), "system-run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
-     new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
+     new TDEAction(i18n("Run Command..."), "system-run", 0, m_pDesktop, TQ_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
+     new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQ_SLOT( slotOpenTerminal() ),
 	m_actionCollection, "open_terminal" );
   }
 
   if (!TDEGlobal::config()->isImmutable())
   {
-     new TDEAction(i18n("Configure Desktop..."), "configure", 0, this, TQT_SLOT( slotConfigureDesktop() ),
+     new TDEAction(i18n("Configure Desktop..."), "configure", 0, this, TQ_SLOT( slotConfigureDesktop() ),
                  m_actionCollection, "configdesktop" );
-     new TDEAction(i18n("Disable Desktop Menu"), 0, this, TQT_SLOT( slotToggleDesktopMenu() ),
+     new TDEAction(i18n("Disable Desktop Menu"), 0, this, TQ_SLOT( slotToggleDesktopMenu() ),
                  m_actionCollection, "togglemenubar" );
   }
 
-  new TDEAction(i18n("Unclutter Windows"), 0, this, TQT_SLOT( slotUnclutterWindows() ),
+  new TDEAction(i18n("Unclutter Windows"), 0, this, TQ_SLOT( slotUnclutterWindows() ),
               m_actionCollection, "unclutter" );
-  new TDEAction(i18n("Cascade Windows"), 0, this, TQT_SLOT( slotCascadeWindows() ),
+  new TDEAction(i18n("Cascade Windows"), 0, this, TQ_SLOT( slotCascadeWindows() ),
               m_actionCollection, "cascade" );
 
   // arrange menu actions
   if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
   {
-     new TDEAction(i18n("By Name (Case Sensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCS() ),
+     new TDEAction(i18n("By Name (Case Sensitive)"), 0, this, TQ_SLOT( slotArrangeByNameCS() ),
                  m_actionCollection, "sort_ncs");
-     new TDEAction(i18n("By Name (Case Insensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCI() ),
+     new TDEAction(i18n("By Name (Case Insensitive)"), 0, this, TQ_SLOT( slotArrangeByNameCI() ),
                  m_actionCollection, "sort_nci");
-     new TDEAction(i18n("By Size"), 0, this, TQT_SLOT( slotArrangeBySize() ),
+     new TDEAction(i18n("By Size"), 0, this, TQ_SLOT( slotArrangeBySize() ),
                  m_actionCollection, "sort_size");
-     new TDEAction(i18n("By Type"), 0, this, TQT_SLOT( slotArrangeByType() ),
+     new TDEAction(i18n("By Type"), 0, this, TQ_SLOT( slotArrangeByType() ),
                  m_actionCollection, "sort_type");
-     new TDEAction(i18n("By Date"), 0, this, TQT_SLOT( slotArrangeByDate() ),
+     new TDEAction(i18n("By Date"), 0, this, TQ_SLOT( slotArrangeByDate() ),
                  m_actionCollection, "sort_date");
 
      TDEToggleAction *aSortDirsFirst = new TDEToggleAction( i18n("Directories First"), 0, m_actionCollection, "sort_directoriesfirst" );
-     connect( aSortDirsFirst, TQT_SIGNAL( toggled( bool ) ),
-              this, TQT_SLOT( slotToggleDirFirst( bool ) ) );
+     connect( aSortDirsFirst, TQ_SIGNAL( toggled( bool ) ),
+              this, TQ_SLOT( slotToggleDirFirst( bool ) ) );
      new TDEAction(i18n("Line Up Horizontally"), 0,
-                 this, TQT_SLOT( slotLineupIconsHoriz() ),
+                 this, TQ_SLOT( slotLineupIconsHoriz() ),
                  m_actionCollection, "lineupHoriz" );
      new TDEAction(i18n("Line Up Vertically"), 0,
-                 this, TQT_SLOT( slotLineupIconsVert() ),
+                 this, TQ_SLOT( slotLineupIconsVert() ),
                  m_actionCollection, "lineupVert" );
      TDEToggleAction *aAutoAlign = new TDEToggleAction(i18n("Align to Grid"), 0,
                  m_actionCollection, "realign" );
-     connect( aAutoAlign, TQT_SIGNAL( toggled( bool ) ),
-              this, TQT_SLOT( slotToggleAutoAlign( bool ) ) );
+     connect( aAutoAlign, TQ_SIGNAL( toggled( bool ) ),
+              this, TQ_SLOT( slotToggleAutoAlign( bool ) ) );
      TDEToggleAction *aLockIcons = new TDEToggleAction(i18n("Lock in Place"), 0, m_actionCollection, "lock_icons");
-     connect( aLockIcons, TQT_SIGNAL( toggled( bool ) ),
-              this, TQT_SLOT( slotToggleLockIcons( bool ) ) );
+     connect( aLockIcons, TQ_SIGNAL( toggled( bool ) ),
+              this, TQ_SLOT( slotToggleLockIcons( bool ) ) );
   }
   if (m_bDesktopEnabled)
   {
-     new TDEAction(i18n("Refresh Desktop"), "desktop", 0, this, TQT_SLOT( slotRefreshDesktop() ),
+     new TDEAction(i18n("Refresh Desktop"), "desktop", 0, this, TQ_SLOT( slotRefreshDesktop() ),
                  m_actionCollection, "refresh" );
   }
   // Icons in sync with kicker
   if (kapp->authorize("lock_screen"))
   {
-      new TDEAction(i18n("Lock Session"), "system-lock-screen", 0, this, TQT_SLOT( slotLock() ),
+      new TDEAction(i18n("Lock Session"), "system-lock-screen", 0, this, TQ_SLOT( slotLock() ),
                   m_actionCollection, "lock" );
   }
   if (kapp->authorize("logout"))
   {
       new TDEAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "system-log-out", 0,
-                  this, TQT_SLOT( slotLogout() ), m_actionCollection, "logout" );
+                  this, TQ_SLOT( slotLogout() ), m_actionCollection, "logout" );
   }
 
   if (kapp->authorize("start_new_session") && DM().isSwitchable())
   {
       new TDEAction(i18n("Start New Session"), "fork", 0, this,
-                  TQT_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
+                  TQ_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
       if (kapp->authorize("lock_screen"))
       {
           new TDEAction(i18n("Lock Current && Start New Session"), "system-lock-screen", 0, this,
-                      TQT_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
+                      TQ_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
       }
   }
 
@@ -314,8 +314,8 @@ void KRootWm::buildMenus()
     if (m_actionCollection->action("newsession"))
     {
         sessionsMenu = new TQPopupMenu;
-        connect( sessionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotPopulateSessions()) );
-        connect( sessionsMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSessionActivated(int)) );
+        connect( sessionsMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotPopulateSessions()) );
+        connect( sessionsMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSessionActivated(int)) );
     }
 
     if (menuBar) {
@@ -489,7 +489,7 @@ void KRootWm::buildMenus()
         desktopMenu->removeItem(lastSep);
     }
 
-    connect( desktopMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotFileNewAboutToShow() ) );
+    connect( desktopMenu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotFileNewAboutToShow() ) );
 
     if (menuBar) {
         menuBar->insertItem(i18n("File"), file);
@@ -609,15 +609,15 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button )
 {
     if (!desktopMenu) return; // initialisation not yet done
     switch ( _button ) {
-    case Qt::LeftButton:
+    case TQt::LeftButton:
         if ( m_bShowMenuBar && menuBar )
             menuBar->raise();
         activateMenu( leftButtonChoice, _global );
         break;
-    case Qt::MidButton:
+    case TQt::MidButton:
         activateMenu( middleButtonChoice, _global );
         break;
-    case Qt::RightButton:
+    case TQt::RightButton:
         if (!kapp->authorize("action/kdesktop_rmb")) return;
         activateMenu( rightButtonChoice, _global );
         break;
@@ -637,13 +637,13 @@ void KRootWm::slotWindowList() {
   else
       r = desktop->screenGeometry( desktop->screenNumber(TQCursor::pos()));
   windowListMenu->init();
-  disconnect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
-           this, TQT_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice
+  disconnect( windowListMenu, TQ_SIGNAL( aboutToShow() ),
+           this, TQ_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice
   // windowListMenu->rect() is not valid before showing, use sizeHint()
   windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->sizeHint()).center());
   windowListMenu->selectActiveWindow(); // make the popup more useful
-  connect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
-           this, TQT_SLOT( slotWindowListAboutToShow() ) );
+  connect( windowListMenu, TQ_SIGNAL( aboutToShow() ),
+           this, TQ_SLOT( slotWindowListAboutToShow() ) );
 }
 
 void KRootWm::slotSwitchUser() {
@@ -657,11 +657,11 @@ void KRootWm::slotSwitchUser() {
   else
       r = desktop->screenGeometry( desktop->screenNumber(TQCursor::pos()));
   slotPopulateSessions();
-  disconnect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
-           this, TQT_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice
+  disconnect( sessionsMenu, TQ_SIGNAL( aboutToShow() ),
+           this, TQ_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice
   sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->sizeHint()).center());
-  connect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
-           TQT_SLOT( slotPopulateSessions() ) );
+  connect( sessionsMenu, TQ_SIGNAL( aboutToShow() ),
+           TQ_SLOT( slotPopulateSessions() ) );
 }
 
 void KRootWm::slotArrangeByNameCS()
@@ -786,7 +786,7 @@ void KRootWm::slotConfigureDesktop() {
   if (!m_configDialog)
   {
     m_configDialog = new KCMultiDialog( (TQWidget*)0, "configureDialog" );
-    connect(m_configDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotConfigClosed()));
+    connect(m_configDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotConfigClosed()));
 
     TQStringList modules = configModules();
     for (TQStringList::const_iterator it = modules.constBegin(); it != modules.constEnd(); ++it)
diff --git a/kdesktop/krootwm.h b/kdesktop/krootwm.h
index 264f3eadb..efdd64c3e 100644
--- a/kdesktop/krootwm.h
+++ b/kdesktop/krootwm.h
@@ -64,7 +64,7 @@ class KRootWmThreadHelperObject;
  * This class is the handler for the menus (root popup menu and desktop menubar)
  */
 class KRootWm: public TQObject {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KRootWm(SaverEngine*, KDesktop*);
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index 1e2499ea2..67a55192f 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -52,10 +52,10 @@ KWebDesktopRun::KWebDesktopRun( KWebDesktop* webDesktop, const KURL & url )
 {
     kdDebug() << "KWebDesktopRun::KWebDesktopRun starting get" << endl;
     TDEIO::Job * job = TDEIO::get(m_url, false, false);
-    connect( job, TQT_SIGNAL( result( TDEIO::Job *)),
-             this, TQT_SLOT( slotFinished(TDEIO::Job *)));
-    connect( job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &)),
-             this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &)));
+    connect( job, TQ_SIGNAL( result( TDEIO::Job *)),
+             this, TQ_SLOT( slotFinished(TDEIO::Job *)));
+    connect( job, TQ_SIGNAL( mimetype( TDEIO::Job *, const TQString &)),
+             this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &)));
 }
 
 void KWebDesktopRun::slotMimetype( TDEIO::Job *job, const TQString &_type )
@@ -166,7 +166,7 @@ KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType )
         ((TQScrollView *)htmlPart->widget())->setHScrollBarMode( TQScrollView::AlwaysOff );
         ((TQScrollView *)htmlPart->widget())->setVScrollBarMode( TQScrollView::AlwaysOff );
 
-        connect( htmlPart, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) );
+        connect( htmlPart, TQ_SIGNAL( completed() ), this, TQ_SLOT( slotCompleted() ) );
         m_part = htmlPart;
     } else {
         // Try to find an appropriate viewer component
@@ -176,13 +176,13 @@ KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType )
             kdWarning() << "No handler found for " << mimeType << endl;
         else {
             kdDebug() << "Loaded " << m_part->className() << endl;
-            connect( m_part, TQT_SIGNAL( completed() ),
-                     this, TQT_SLOT( slotCompleted() ) );
+            connect( m_part, TQ_SIGNAL( completed() ),
+                     this, TQ_SLOT( slotCompleted() ) );
         }
     }
     if ( m_part ) {
-        connect( m_part, TQT_SIGNAL( canceled(const TQString &) ),
-                 this, TQT_SLOT( slotCompleted() ) );
+        connect( m_part, TQ_SIGNAL( canceled(const TQString &) ),
+                 this, TQ_SLOT( slotCompleted() ) );
     }
     return m_part;
 }
diff --git a/kdesktop/kwebdesktop/kwebdesktop.h b/kdesktop/kwebdesktop/kwebdesktop.h
index 2641378cf..686e40297 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.h
+++ b/kdesktop/kwebdesktop/kwebdesktop.h
@@ -28,7 +28,7 @@ namespace TDEIO { class Job; }
 
 class KWebDesktop : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KWebDesktop( TQObject* parent, const TQCString & imageFile, int width, int height )
         : TQObject( parent ),
@@ -51,9 +51,9 @@ private:
 };
 
 
-class KWebDesktopRun : public QObject
+class KWebDesktopRun : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KWebDesktopRun( KWebDesktop* webDesktop, const KURL & url );
     ~KWebDesktopRun() {}
diff --git a/kdesktop/lock/autologout.cpp b/kdesktop/lock/autologout.cpp
index 6e05c439d..ee1d8e1db 100644
--- a/kdesktop/lock/autologout.cpp
+++ b/kdesktop/lock/autologout.cpp
@@ -67,7 +67,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
 	unlockDialogLayout->addWidget( frame );
 	
 	frameLayout = new TQGridLayout(frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint());
-	frameLayout->addMultiCellWidget(pixLabel, 0, 2, 0, 0, Qt::AlignCenter | Qt::AlignTop);
+	frameLayout->addMultiCellWidget(pixLabel, 0, 2, 0, 0, TQt::AlignCenter | TQt::AlignTop);
 	frameLayout->addWidget(greetLabel, 0, 1);
 	frameLayout->addWidget(mStatusLabel, 1, 1);
 	frameLayout->addWidget(infoLabel, 2, 1);
@@ -83,7 +83,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
 	
 	mCountdownTimerId = startTimer(1000/25);
 	
-	connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()));
+	connect(tqApp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()));
 	
 	setFixedSize( sizeHint() );
 }
@@ -119,7 +119,7 @@ void AutoLogout::slotActivity()
 
 void AutoLogout::logout()
 {
-	TQT_TQOBJECT(this)->killTimers();
+	this->killTimers();
 	DCOPRef("ksmserver","ksmserver").send("logout", 0, 0, 0);
 }
 
diff --git a/kdesktop/lock/autologout.h b/kdesktop/lock/autologout.h
index 89cbb880e..834f4fd0e 100644
--- a/kdesktop/lock/autologout.h
+++ b/kdesktop/lock/autologout.h
@@ -22,7 +22,7 @@ class TQProgressBar;
 
 class AutoLogout : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		AutoLogout(LockProcess *parent);
diff --git a/kdesktop/lock/infodlg.cpp b/kdesktop/lock/infodlg.cpp
index 3efaf060d..6fc604b43 100644
--- a/kdesktop/lock/infodlg.cpp
+++ b/kdesktop/lock/infodlg.cpp
@@ -97,7 +97,7 @@ InfoDlg::InfoDlg(LockProcess *parent)
 	layStatus->addWidget( mStatusLabel );
 
 	frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
-	frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop );
+	frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, TQt::AlignTop );
 	frameLayout->addLayout( layStatus, 1, 1 );
 
 	installEventFilter(this);
@@ -111,7 +111,7 @@ InfoDlg::~InfoDlg()
 
 void InfoDlg::updateLabel(TQString &txt)
 {
-	mStatusLabel->setPaletteForegroundColor(Qt::black);
+	mStatusLabel->setPaletteForegroundColor(TQt::black);
 	mStatusLabel->setText("<b>" + txt + "</b>");
 }
 
diff --git a/kdesktop/lock/infodlg.h b/kdesktop/lock/infodlg.h
index 3daf4d2ce..ec5569748 100644
--- a/kdesktop/lock/infodlg.h
+++ b/kdesktop/lock/infodlg.h
@@ -26,7 +26,7 @@ class TQListView;
 //
 class InfoDlg : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		InfoDlg(LockProcess *parent);
diff --git a/kdesktop/lock/lockdlg.cpp b/kdesktop/lock/lockdlg.cpp
index 890aa7c53..c8d82e8d9 100644
--- a/kdesktop/lock/lockdlg.cpp
+++ b/kdesktop/lock/lockdlg.cpp
@@ -200,7 +200,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
 
 		if (!m_lockStartDT.isNull()) {
 			frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
-			frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, Qt::AlignTop );
+			frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, TQt::AlignTop );
 			frameLayout->addWidget( greetLabel, 1, 1 );
 			frameLayout->addWidget( lockDTLabel, 2, 1 );
 			frameLayout->addItem( greet->getLayoutItem(), 3, 1 );
@@ -210,7 +210,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
 		}
 		else {
 			frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
-			frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, Qt::AlignTop );
+			frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, TQt::AlignTop );
 			frameLayout->addWidget( greetLabel, 1, 1 );
 			frameLayout->addItem( greet->getLayoutItem(), 2, 1 );
 			frameLayout->addLayout( layStatus, 3, 1 );
@@ -220,7 +220,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
 	}
 	else {
 		frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
-		frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, Qt::AlignTop );
+		frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, TQt::AlignTop );
 		frameLayout->addWidget( greetLabel, 0, 1 );
 		frameLayout->addItem( greet->getLayoutItem(), 1, 1 );
 		frameLayout->addLayout( layStatus, 2, 1 );
@@ -237,12 +237,12 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
 	}
 	setTabOrder( mNewSessButton, mLayoutButton );
 
-	connect(mLayoutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(layoutClicked()));
+	connect(mLayoutButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(layoutClicked()));
 	if (show_cancel_button) {
-		connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+		connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 	}
-	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK()));
-	connect(mNewSessButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSwitchUser()));
+	connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotOK()));
+	connect(mNewSessButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSwitchUser()));
 
 	if (!DM().isSwitchable() || !kapp->authorize("switch_user")) {
 		mNewSessButton->hide();
@@ -253,7 +253,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
 
 	mFailedTimerId = 0;
 	mTimeoutTimerId = startTimer(PASSDLG_HIDE_TIMEOUT);
-	connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
+	connect(tqApp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()) );
 
 	greet->setInfoMessageDisplay(showInfoMessages);
 	greet->start();
@@ -329,12 +329,12 @@ void PasswordDlg::setLayoutText( const TQString &txt )
 void PasswordDlg::updateLabel()
 {
 	if (mUnlockingFailed) {
-		mStatusLabel->setPaletteForegroundColor(Qt::black);
+		mStatusLabel->setPaletteForegroundColor(TQt::black);
 		mStatusLabel->setText(i18n("<b>Unlocking failed</b>"));
 // 		mStatusLabel->show();
 	}
 	else if (mCapsLocked) {
-		mStatusLabel->setPaletteForegroundColor(Qt::red);
+		mStatusLabel->setPaletteForegroundColor(TQt::red);
 		mStatusLabel->setText(i18n("<b>Warning: Caps Lock on</b>"));
 // 		mStatusLabel->show();
 	}
@@ -568,7 +568,7 @@ void PasswordDlg::handleVerify()
 						TQString autoPIN = cdevice->autoPIN();
 						if (autoPIN != TQString::null) {
 							greet->setPassword(autoPIN);
-							TQTimer::singleShot(0, this, SLOT(slotOK()));
+							TQTimer::singleShot(0, this, TQ_SLOT(slotOK()));
 						}
 					}
 					mCardLoginInProgress = false;
@@ -712,12 +712,12 @@ void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
 	KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
 	button->setDefault( true );
 	button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
-	connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) );
+	connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( accept() ) );
 
 	TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 );
-	grid->addWidget( label1, 0, 0, Qt::AlignCenter );
-	grid->addWidget( label2, 0, 1, Qt::AlignCenter );
-	grid->addMultiCellWidget( button, 1,1, 0,1, Qt::AlignCenter );
+	grid->addWidget( label1, 0, 0, TQt::AlignCenter );
+	grid->addWidget( label2, 0, 1, TQt::AlignCenter );
+	grid->addMultiCellWidget( button, 1,1, 0,1, TQt::AlignCenter );
 
 	static_cast< LockProcess* >(parent())->execDialog( &dialog );
 }
@@ -783,16 +783,16 @@ void PasswordDlg::slotStartNewSession()
 	TQLabel *label2 = new TQLabel( qt_text, winFrame );
 	KPushButton *okbutton = new KPushButton( KGuiItem(i18n("&Start New Session"), "fork"), winFrame );
 	okbutton->setDefault( true );
-	connect( okbutton, TQT_SIGNAL( clicked() ), dialog, TQT_SLOT( accept() ) );
+	connect( okbutton, TQ_SIGNAL( clicked() ), dialog, TQ_SLOT( accept() ) );
 	KPushButton *cbutton = new KPushButton( KStdGuiItem::cancel(), winFrame );
-	connect( cbutton, TQT_SIGNAL( clicked() ), dialog, TQT_SLOT( reject() ) );
+	connect( cbutton, TQ_SIGNAL( clicked() ), dialog, TQ_SLOT( reject() ) );
 
 	TQBoxLayout *mbox = new TQVBoxLayout( winFrame, KDialog::marginHint(), KDialog::spacingHint() );
 
 	TQGridLayout *grid = new TQGridLayout( mbox, 2, 2, 2 * KDialog::spacingHint() );
 	grid->setMargin( KDialog::marginHint() );
-	grid->addWidget( label1, 0, 0, Qt::AlignCenter );
-	grid->addWidget( label2, 0, 1, Qt::AlignCenter );
+	grid->addWidget( label1, 0, 0, TQt::AlignCenter );
+	grid->addWidget( label2, 0, 1, TQt::AlignCenter );
 	TQCheckBox *cb = new TQCheckBox( i18n("&Do not ask again"), winFrame );
 	grid->addMultiCellWidget( cb, 1,1, 0,1 );
 
@@ -901,8 +901,8 @@ void PasswordDlg::slotSwitchUser()
 	SessList sess;
 	if (dm.localSessions( sess )) {
 		lv = new TQListView( winFrame );
-		connect( lv, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), TQT_SLOT(slotSessionActivated()) );
-		connect( lv, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), &dialog, TQT_SLOT(accept()) );
+		connect( lv, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), TQ_SLOT(slotSessionActivated()) );
+		connect( lv, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), &dialog, TQ_SLOT(accept()) );
 		lv->setAllColumnsShowFocus( true );
 		lv->addColumn( i18n("Session") );
 		lv->addColumn( i18n("Location") );
@@ -933,16 +933,16 @@ void PasswordDlg::slotSwitchUser()
 		vbox1->addWidget( lv );
 
 		btn = new KPushButton( KGuiItem(i18n("session", "&Activate"), "fork"), winFrame );
-		connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSessionActivated()) );
-		connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(accept()) );
+		connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotSessionActivated()) );
+		connect( btn, TQ_SIGNAL(clicked()), &dialog, TQ_SLOT(accept()) );
 		vbox2->addWidget( btn );
 		vbox2->addStretch( 2 );
 	}
 
 	if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) {
 		btn = new KPushButton( KGuiItem(i18n("Start &New Session"), "fork"), winFrame );
-		connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartNewSession()) );
-		connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(accept()) );
+		connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotStartNewSession()) );
+		connect( btn, TQ_SIGNAL(clicked()), &dialog, TQ_SLOT(accept()) );
 		if (!p)
 		btn->setEnabled( false );
 		vbox2->addWidget( btn );
@@ -950,7 +950,7 @@ void PasswordDlg::slotSwitchUser()
 	}
 
 	btn = new KPushButton( KStdGuiItem::cancel(), winFrame );
-	connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(reject()) );
+	connect( btn, TQ_SIGNAL(clicked()), &dialog, TQ_SLOT(reject()) );
 	vbox2->addWidget( btn );
 
 	dialog.setFixedSize( dialog.sizeHint() );
@@ -1015,7 +1015,7 @@ void PasswordDlg::attemptCardLogin() {
 	// Bypass initial password prompt
 	greet->start();
 	greet->setPassword("");
-	TQTimer::singleShot(0, this, SLOT(slotOK()));
+	TQTimer::singleShot(0, this, TQ_SLOT(slotOK()));
 #endif
 }
 
diff --git a/kdesktop/lock/lockdlg.h b/kdesktop/lock/lockdlg.h
index 571d825fa..3f8500a42 100644
--- a/kdesktop/lock/lockdlg.h
+++ b/kdesktop/lock/lockdlg.h
@@ -33,7 +33,7 @@ class TQListView;
 //
 class PasswordDlg : public TQDialog, public KGreeterPluginHandler
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin);
diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp
index 96955b6de..0a343d88e 100644
--- a/kdesktop/lock/lockprocess.cpp
+++ b/kdesktop/lock/lockprocess.cpp
@@ -256,7 +256,7 @@ LockProcess::LockProcess()
 	if (!argb_visual) {
 		// Try to get the root pixmap
 		if (!m_rootPixmap) m_rootPixmap = new KRootPixmap(this);
-		connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotPaintBackground(const TQPixmap &)));
+		connect(m_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQ_SLOT(slotPaintBackground(const TQPixmap &)));
 		m_rootPixmap->setCustomPainting(true);
 		m_rootPixmap->start();
 	}
@@ -305,9 +305,9 @@ LockProcess::LockProcess()
 	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);
 	for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) {
 		TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-		// connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
-		connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
-		connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
+		// connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
+		connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
+		connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
 		cdevice->enableCardMonitoring(true);
 		// cdevice->enablePINEntryCallbacks(true);
 	}
@@ -388,12 +388,12 @@ void LockProcess::init(bool child, bool useBlankOnly)
 	generateBackingImages();
 
 	// Connect all signals
-	connect( mForceContinualLockDisplayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(displayLockDialogIfNeeded()) );
-	connect( mHackDelayStartupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(closeDialogAndStartHack()) );
-	connect( mEnsureVRootWindowSecurityTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repaintRootWindowIfNeeded()) );
-	connect(tqApp, TQT_SIGNAL(mouseInteraction(XEvent *)), TQT_SLOT(slotMouseActivity(XEvent *)));
-	connect(&mHackProc, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(hackExited(TDEProcess *)));
-	connect(&mSuspendTimer, TQT_SIGNAL(timeout()), TQT_SLOT(suspend()));
+	connect( mForceContinualLockDisplayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(displayLockDialogIfNeeded()) );
+	connect( mHackDelayStartupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(closeDialogAndStartHack()) );
+	connect( mEnsureVRootWindowSecurityTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(repaintRootWindowIfNeeded()) );
+	connect(tqApp, TQ_SIGNAL(mouseInteraction(XEvent *)), TQ_SLOT(slotMouseActivity(XEvent *)));
+	connect(&mHackProc, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(hackExited(TDEProcess *)));
+	connect(&mSuspendTimer, TQ_SIGNAL(timeout()), TQ_SLOT(suspend()));
 
 #ifdef HAVE_DPMS
 	//if the user decided that the screensaver should run independent from
@@ -403,7 +403,7 @@ void LockProcess::init(bool child, bool useBlankOnly)
 		CARD16 state;
 		if (DPMSInfo(tqt_xdisplay(), &state, &on)) {
 			if (on) {
-				connect(&mCheckDPMS, TQT_SIGNAL(timeout()), TQT_SLOT(checkDPMSActive()));
+				connect(&mCheckDPMS, TQ_SIGNAL(timeout()), TQ_SLOT(checkDPMSActive()));
 				// we can save CPU if we stop it as quickly as possible
 				// but we waste CPU if we check too often -> so take 10s
 				mCheckDPMS.start(10000);
@@ -413,7 +413,7 @@ void LockProcess::init(bool child, bool useBlankOnly)
 #endif
 
 #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
-	connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
+	connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
 #endif
 
 	if (!trinity_desktop_lock_use_system_modal_dialogs) {
@@ -435,8 +435,8 @@ void LockProcess::init(bool child, bool useBlankOnly)
 	mControlPipeHandler = new ControlPipeHandlerObject();
 	mControlPipeHandler->mParent = this;
 	mControlPipeHandler->moveToThread(mControlPipeHandlerThread);
-	TQObject::connect(mControlPipeHandler, SIGNAL(processCommand(TQString)), this, SLOT(processInputPipeCommand(TQString)));
-	TQTimer::singleShot(0, mControlPipeHandler, SLOT(run()));
+	TQObject::connect(mControlPipeHandler, TQ_SIGNAL(processCommand(TQString)), this, TQ_SLOT(processInputPipeCommand(TQString)));
+	TQTimer::singleShot(0, mControlPipeHandler, TQ_SLOT(run()));
 	mControlPipeHandlerThread->start();
 }
 
@@ -533,8 +533,8 @@ void LockProcess::setupSignals()
 	if (pipe(signal_pipe) == -1) {
 		// Error handler to shut up gcc warnings
 	}
-	TQSocketNotifier* notif = new TQSocketNotifier(signal_pipe[0], TQSocketNotifier::Read, TQT_TQOBJECT(this) );
-	connect( notif, TQT_SIGNAL(activated(int)), TQT_SLOT(signalPipeSignal()));
+	TQSocketNotifier* notif = new TQSocketNotifier(signal_pipe[0], TQSocketNotifier::Read, this );
+	connect( notif, TQ_SIGNAL(activated(int)), TQ_SLOT(signalPipeSignal()));
 }
 
 
@@ -577,7 +577,7 @@ bool LockProcess::lock()
 		// selecting "lock screen", that looks really untidy.
 		mBusy = true;
 		if (startLock()) {
-			TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
+			TQTimer::singleShot(1000, this, TQ_SLOT(slotDeadTimePassed()));
 			return true;
 		}
 		stopSaver();
@@ -598,7 +598,7 @@ bool LockProcess::defaultSave()
 	mOverrideHackStartupEnabled = true;
 	if (startSaver()) {
 		if (mLockGrace >= 0) {
-			TQTimer::singleShot(mLockGrace, this, TQT_SLOT(startLock()));
+			TQTimer::singleShot(mLockGrace, this, TQ_SLOT(startLock()));
 		}
 		return true;
 	}
@@ -618,7 +618,7 @@ void LockProcess::quitSaver()
 {
 	DISABLE_CONTINUOUS_LOCKDLG_DISPLAY
 	if (closeCurrentWindow()) {
-		TQTimer::singleShot( 0, this, SLOT(quitSaver()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(quitSaver()) );
 		return;
 	}
 	stopSaver();
@@ -629,7 +629,7 @@ void LockProcess::quitSaver()
 void LockProcess::startSecureDialog()
 {
 	if ((backingPixmap.isNull()) && (mBackingStartupDelayTimer < 100)) {
-		TQTimer::singleShot(10, this, TQT_SLOT(startSecureDialog()));
+		TQTimer::singleShot(10, this, TQ_SLOT(startSecureDialog()));
 		mBackingStartupDelayTimer++;
 		return;
 	}
@@ -661,14 +661,14 @@ void LockProcess::startSecureDialog()
 		mBusy = true;
 		trinity_desktop_lock_forced = true;
 		// Make sure the cursor is not showing busy status
-		setCursor( tqarrowCursor );
+		setCursor( TQt::arrowCursor );
 		if (startLock())
 		{
 			if (trinity_desktop_lock_delay_screensaver_start) {
 				mBusy = false;
 			}
 			else {
-				TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
+				TQTimer::singleShot(1000, this, TQ_SLOT(slotDeadTimePassed()));
 			}
 			if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced && trinity_desktop_lock_use_system_modal_dialogs) {
 				ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
@@ -728,7 +728,7 @@ bool LockProcess::runSecureDialog()
 	mInSecureDialog = true;
 	if (startSaver()) {
 		mBackingStartupDelayTimer = 0;
-		TQTimer::singleShot(0, this, TQT_SLOT(startSecureDialog()));
+		TQTimer::singleShot(0, this, TQ_SLOT(startSecureDialog()));
 		return true;
 	}
 	else {
@@ -1040,7 +1040,7 @@ void LockProcess::desktopResized()
 		}
 		else {
 			mEnsureScreenHiddenTimer = new TQTimer( this );
-			connect( mEnsureScreenHiddenTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForcePaintBackground()) );
+			connect( mEnsureScreenHiddenTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotForcePaintBackground()) );
 		}
 		mEnsureScreenHiddenTimer->start(DESKTOP_WALLPAPER_OBTAIN_TIMEOUT_MS, true);
 	}
@@ -1063,7 +1063,7 @@ void LockProcess::desktopResized()
 	// being displayed, so we finish the hack restarting/display prettying operations in a separate timed slot
 	if (resizeTimer == NULL) {
 		resizeTimer = new TQTimer( this );
-		connect( resizeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doDesktopResizeFinish()) );
+		connect( resizeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doDesktopResizeFinish()) );
 	}
 	resizeTimer->start( 100, TRUE ); // 100 millisecond single shot timer; should allow display switching operations to finish before hack is started
 }
@@ -1075,7 +1075,7 @@ void LockProcess::doDesktopResizeFinish()
 	}
 	mDialogControlLock = true;
 	if (closeCurrentWindow()) {
-		TQTimer::singleShot( 0, this, SLOT(doDesktopResizeFinish()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(doDesktopResizeFinish()) );
 		mDialogControlLock = false;
 		return;
 	}
@@ -1243,10 +1243,10 @@ bool LockProcess::grabMouse()
 {
 	HANDLE cursorHandle;
 	if (mHackActive) {
-		cursorHandle = TQCursor(tqblankCursor).handle();
+		cursorHandle = TQCursor(TQt::blankCursor).handle();
 	}
 	else {
-		cursorHandle = TQCursor(tqbusyCursor).handle();
+		cursorHandle = TQCursor(TQt::busyCursor).handle();
 	}
 	int rv = XGrabPointer( tqt_xdisplay(), TQApplication::desktop()->winId(),
 		True, GRABEVENTS, GrabModeAsync, GrabModeAsync, None,
@@ -1353,8 +1353,8 @@ bool LockProcess::startSaver(bool notify_ready)
 	saveVRoot();
 
 	if (mParent) {
-		TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, TQT_TQOBJECT(this), "notifier");
-		connect(notifier, TQT_SIGNAL( activated (int)), TQT_SLOT( quitSaver()));
+		TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, this, "notifier");
+		connect(notifier, TQ_SIGNAL( activated (int)), TQ_SLOT( quitSaver()));
 	}
 	createSaverWindow();
 	move(0, 0);
@@ -1542,7 +1542,7 @@ void LockProcess::closeDialogAndStartHack()
 	DISABLE_CONTINUOUS_LOCKDLG_DISPLAY
 	mSuspended = true;
 	if (closeCurrentWindow()) {
-		TQTimer::singleShot( 0, this, SLOT(closeDialogAndStartHack()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(closeDialogAndStartHack()) );
 	}
 	else {
 		resume(true);
@@ -1602,8 +1602,8 @@ bool LockProcess::startHack()
 		return false;
 	}
 
-	setCursor( tqblankCursor );
-	XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqblankCursor).handle(), CurrentTime);
+	setCursor( TQt::blankCursor );
+	XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::blankCursor).handle(), CurrentTime);
 
 	if (mSaverExec.isEmpty()) {
 		return false;
@@ -1659,7 +1659,7 @@ bool LockProcess::startHack()
 				mSuspended = false;
 			}
 
-			XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqblankCursor).handle(), CurrentTime);
+			XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::blankCursor).handle(), CurrentTime);
 			if (mHackProc.start() == true) {
 #ifdef HAVE_SETPRIORITY
 				setpriority(PRIO_PROCESS, mHackProc.pid(), mPriority);
@@ -1669,7 +1669,7 @@ bool LockProcess::startHack()
 				if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced) {
 					// Close any active dialogs
 					if (closeCurrentWindow()) {
-						TQTimer::singleShot( 0, this, SLOT(closeCurrentWindow()) );
+						TQTimer::singleShot( 0, this, TQ_SLOT(closeCurrentWindow()) );
 					}
 				}
 				if (m_startupStatusDialog) { m_startupStatusDialog->closeSMDialog(); m_startupStatusDialog=NULL; }
@@ -1733,7 +1733,7 @@ void LockProcess::stopHack()
 			mHackProc.kill(SIGKILL);
 		}
 	}
-	setCursor( tqarrowCursor );
+	setCursor( TQt::arrowCursor );
 
 	mHackActive = FALSE;
 }
@@ -1989,7 +1989,7 @@ int LockProcess::execDialog( TQDialog *dlg )
 
 	if (mDialogs.isEmpty()) {
 		suspend();
-		XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqarrowCursor).handle(), CurrentTime);
+		XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::arrowCursor).handle(), CurrentTime);
 	}
 	mDialogs.prepend( dlg );
 	fakeFocusIn( dlg->winId());
@@ -2016,17 +2016,17 @@ int LockProcess::execDialog( TQDialog *dlg )
 	if( mDialogs.isEmpty() ) {
 		HANDLE cursorHandle;
 		if (mHackActive) {
-			cursorHandle = TQCursor(tqblankCursor).handle();
+			cursorHandle = TQCursor(TQt::blankCursor).handle();
 		}
 		else {
-			cursorHandle = TQCursor(tqbusyCursor).handle();
+			cursorHandle = TQCursor(TQt::busyCursor).handle();
 		}
 		XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, cursorHandle, CurrentTime);
 		if (trinity_desktop_lock_use_system_modal_dialogs) {
 			// Slight delay before screensaver resume to allow the dialog window to fully disappear
 			if (hackResumeTimer == NULL) {
 				hackResumeTimer = new TQTimer( this );
-				connect( hackResumeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(resumeUnforced()) );
+				connect( hackResumeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(resumeUnforced()) );
 			}
 			if (mResizingDesktopLock == false) {
 				hackResumeTimer->start( 10, TRUE );
@@ -2046,7 +2046,7 @@ int LockProcess::execDialog( TQDialog *dlg )
 void LockProcess::slotForcePaintBackground()
 {
 	TQPixmap blankPixmap(mRootWidth, mRootHeight);
-	blankPixmap.fill(Qt::black);
+	blankPixmap.fill(TQt::black);
 	slotPaintBackground(blankPixmap);
 	printf("[WARNING] Unable to obtain desktop wallpaper in a timely manner.  High system load or possibly a TDE bug!\n"); fflush(stdout);
 }
@@ -2065,7 +2065,7 @@ void LockProcess::slotPaintBackground(const TQPixmap &rpm)
 	}
 	else {
 		mEnsureScreenHiddenTimer = new TQTimer( this );
-		connect( mEnsureScreenHiddenTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForcePaintBackground()) );
+		connect( mEnsureScreenHiddenTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotForcePaintBackground()) );
 	}
 
 	// Only remove the mask widget once the resize is 100% complete!
@@ -2127,7 +2127,7 @@ void LockProcess::doFunctionKeyBroadcast() {
 	// This does NOT work with the SAK or system modal dialogs!
 	if ((!trinity_desktop_lock_use_system_modal_dialogs) && (!trinity_desktop_lock_use_sak)) {
 		mBusy=true;
-		TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
+		TQTimer::singleShot(1000, this, TQ_SLOT(slotDeadTimePassed()));
 		if (mkeyCode == XKeysymToKeycode(tqt_xdisplay(), XF86XK_Display)) {
 			while (mDialogControlLock == true) {
 				usleep(100000);
@@ -2167,7 +2167,7 @@ bool LockProcess::x11Event(XEvent *event)
 			(event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_AudioRaiseVolume)) || \
 			(event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_AudioLowerVolume))) {
 			mkeyCode = event->xkey.keycode;
-			TQTimer::singleShot( 100, this, TQT_SLOT(doFunctionKeyBroadcast()) );
+			TQTimer::singleShot( 100, this, TQ_SLOT(doFunctionKeyBroadcast()) );
 			return true;
 		}
 		// ACPI power keys
@@ -2176,7 +2176,7 @@ bool LockProcess::x11Event(XEvent *event)
 			(event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_Suspend)) || \
 			(event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_Hibernate))) {
 			mkeyCode = event->xkey.keycode;
-			TQTimer::singleShot( 100, this, TQT_SLOT(doFunctionKeyBroadcast()) );
+			TQTimer::singleShot( 100, this, TQ_SLOT(doFunctionKeyBroadcast()) );
 			return true;
 		}
 	}
@@ -2442,14 +2442,14 @@ void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
 	KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
 	button->setDefault( true );
 	button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
-	connect( button, TQT_SIGNAL( clicked() ), &box, TQT_SLOT( accept() ) );
+	connect( button, TQ_SIGNAL( clicked() ), &box, TQ_SLOT( accept() ) );
 
 	TQVBoxLayout *vbox = new TQVBoxLayout( &box );
 	vbox->addWidget( winFrame );
 	TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 );
-	grid->addWidget( label1, 0, 0, Qt::AlignCenter );
-	grid->addWidget( label2, 0, 1, Qt::AlignCenter );
-	grid->addMultiCellWidget( button, 1,1, 0,1, Qt::AlignCenter );
+	grid->addWidget( label1, 0, 0, TQt::AlignCenter );
+	grid->addWidget( label2, 0, 1, TQt::AlignCenter );
+	grid->addMultiCellWidget( button, 1,1, 0,1, TQt::AlignCenter );
 
 	execDialog( &box );
 }
@@ -2464,7 +2464,7 @@ void LockProcess::showVkbd()
 		mVkbdWindows.clear();
 		mVkbdLastEventWindow = None;
 		mKWinModule = new KWinModule( NULL, KWinModule::INFO_WINDOWS );
-		connect( mKWinModule, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId )));
+		connect( mKWinModule, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( windowAdded( WId )));
 		mVkbdProcess = new TDEProcess;
 		*mVkbdProcess << "xvkbd" << "-compact" << "-geometry" << "-0-0" << "-xdm";
 		mVkbdProcess->start();
@@ -2570,7 +2570,7 @@ bool LockProcess::forwardVkbdEvent( XEvent* event )
 	}
 	// vkbd windows are kept topmost, so just find the first one in the position
 	for( TQValueList< VkbdWindow >::ConstIterator it = mVkbdWindows.begin(); it != mVkbdWindows.end(); ++it ) {
-		if( TQT_TQRECT_OBJECT((*it).rect).contains( pos )) {
+		if( (*it).rect.contains( pos )) {
 			// Find the subwindow where the event should actually go.
 			// Not exactly cheap in the number of X roundtrips but oh well.
 			Window window = (*it).id;
@@ -2695,7 +2695,7 @@ void LockProcess::slotMouseActivity(XEvent *event)
 			m_dialogPrevY = oldPoint.y();
 			m_mousePrevX = be->x_root;
 			m_mousePrevY = be->y_root;
-			XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqsizeAllCursor).handle(), CurrentTime);
+			XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::sizeAllCursor).handle(), CurrentTime);
 		}
 	}
 
@@ -2715,7 +2715,7 @@ void LockProcess::slotMouseActivity(XEvent *event)
 
 	if (event->type == ButtonRelease) {
 		m_mouseDown = 0;
-		XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqarrowCursor).handle(), CurrentTime);
+		XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::arrowCursor).handle(), CurrentTime);
 	}
 }
 
@@ -2849,11 +2849,11 @@ void LockProcess::cryptographicCardInserted(TDECryptographicCardDevice* cdevice)
 			m_loginCardDevice = cdevice;
 			if (dynamic_cast<SAKDlg*>(currentDialog)) {
 				dynamic_cast<SAKDlg*>(currentDialog)->closeDialogForced();
-				TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardLogin()));
+				TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardLogin()));
 			}
 			else if (dynamic_cast<SecureDlg*>(currentDialog)) {
 				dynamic_cast<SecureDlg*>(currentDialog)->closeDialogForced();
-				TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardLogin()));
+				TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardLogin()));
 			}
 			else if (dynamic_cast<PasswordDlg*>(currentDialog)) {
 				signalPassDlgToAttemptCardLogin();
@@ -2871,7 +2871,7 @@ void LockProcess::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice)
 	}
 	else {
 		m_loginCardDevice = NULL;
-		TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardAbort()));
+		TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardAbort()));
 	}
 #endif
 }
@@ -2886,7 +2886,7 @@ void LockProcess::signalPassDlgToAttemptCardLogin()
 	else {
 		if (currentDialog && m_loginCardDevice) {
 			// Try again later
-			TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardLogin()));
+			TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardLogin()));
 		}
 	}
 #endif
@@ -2902,7 +2902,7 @@ void LockProcess::signalPassDlgToAttemptCardAbort()
 	else {
 		if (currentDialog) {
 			// Try again later
-			TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardAbort()));
+			TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardAbort()));
 		}
 	}
 #endif
diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
index 51cef069f..bfe1fe420 100644
--- a/kdesktop/lock/lockprocess.h
+++ b/kdesktop/lock/lockprocess.h
@@ -52,7 +52,7 @@ typedef TQValueList<Window> TQXLibWindowList;
 //
 class ControlPipeHandlerObject : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ControlPipeHandlerObject();
@@ -81,7 +81,7 @@ class ControlPipeHandlerObject : public TQObject
 //
 class LockProcess : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		LockProcess();
diff --git a/kdesktop/lock/main.cpp b/kdesktop/lock/main.cpp
index f1407070c..f80f406a1 100644
--- a/kdesktop/lock/main.cpp
+++ b/kdesktop/lock/main.cpp
@@ -40,7 +40,7 @@
 
 #include <stdlib.h>
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
diff --git a/kdesktop/lock/main.h b/kdesktop/lock/main.h
index fd19c6183..162542555 100644
--- a/kdesktop/lock/main.h
+++ b/kdesktop/lock/main.h
@@ -25,10 +25,10 @@
 #include <time.h>
 
 class MyApp : public TDEApplication {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		MyApp() : TDEApplication(), lastTick( 0 ) {}
-		MyApp(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0, bool allowStyles=true) : TDEApplication(display, visual, colormap, allowStyles), lastTick( 0 ) {}
+		MyApp(Display *display, TQt::HANDLE visual = 0, TQt::HANDLE colormap = 0, bool allowStyles=true) : TDEApplication(display, visual, colormap, allowStyles), lastTick( 0 ) {}
 
 	protected:
 		bool x11EventFilter( XEvent * );
diff --git a/kdesktop/lock/querydlg.cpp b/kdesktop/lock/querydlg.cpp
index 1fc5d260c..edab1fd97 100644
--- a/kdesktop/lock/querydlg.cpp
+++ b/kdesktop/lock/querydlg.cpp
@@ -111,13 +111,13 @@ QueryDlg::QueryDlg(LockProcess *parent)
 	layButtons->addWidget( ok );
 
 	frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
-	frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop );
+	frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, TQt::AlignTop );
 	frameLayout->addLayout( layStatus, 0, 1 );
 	frameLayout->addLayout( layPin, 2, 1 );
 	frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 );
 	frameLayout->addMultiCellLayout( layButtons, 4, 4, 0, 1 );
 
-	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK()));
+	connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotOK()));
 
 	installEventFilter(this);
 	setFixedSize( sizeHint() );
@@ -140,7 +140,7 @@ TQString QueryDlg::getEntry()
 
 void QueryDlg::updateLabel(TQString &txt)
 {
-	mStatusLabel->setPaletteForegroundColor(Qt::black);
+	mStatusLabel->setPaletteForegroundColor(TQt::black);
 	mStatusLabel->setText("<b>" + txt + "</b>");
 }
 
diff --git a/kdesktop/lock/querydlg.h b/kdesktop/lock/querydlg.h
index d5c4f7f33..0b3e55aa8 100644
--- a/kdesktop/lock/querydlg.h
+++ b/kdesktop/lock/querydlg.h
@@ -28,7 +28,7 @@ class TQListView;
 //
 class QueryDlg : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		QueryDlg(LockProcess *parent);
diff --git a/kdesktop/lock/sakdlg.cpp b/kdesktop/lock/sakdlg.cpp
index 803c77919..a9bb25f40 100644
--- a/kdesktop/lock/sakdlg.cpp
+++ b/kdesktop/lock/sakdlg.cpp
@@ -108,7 +108,7 @@ SAKDlg::SAKDlg(LockProcess *parent)
 
 	mSAKProcess = new TDEProcess;
 	*mSAKProcess << "tdmtsak";
-	connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
+	connect(mSAKProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotSAKProcessExited()));
 	mSAKProcess->start();
 }
 
@@ -142,7 +142,7 @@ void SAKDlg::reject()
 
 void SAKDlg::updateLabel(TQString &txt)
 {
-	mStatusLabel->setPaletteForegroundColor(Qt::black);
+	mStatusLabel->setPaletteForegroundColor(TQt::black);
 	mStatusLabel->setText("<b>" + txt + "</b>");
 }
 
diff --git a/kdesktop/lock/sakdlg.h b/kdesktop/lock/sakdlg.h
index faded4b6e..12d80b8cb 100644
--- a/kdesktop/lock/sakdlg.h
+++ b/kdesktop/lock/sakdlg.h
@@ -26,7 +26,7 @@ class TQListView;
 //
 class SAKDlg : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		SAKDlg(LockProcess *parent);
diff --git a/kdesktop/lock/securedlg.cpp b/kdesktop/lock/securedlg.cpp
index fca79a707..5be274660 100644
--- a/kdesktop/lock/securedlg.cpp
+++ b/kdesktop/lock/securedlg.cpp
@@ -137,11 +137,11 @@ SecureDlg::SecureDlg(LockProcess *parent)
 	frameLayout->addMultiCellWidget( sep, 2, 2, 0, 1 );
 	frameLayout->addMultiCellLayout( layPBGrid, 3, 3, 0, 1, AlignLeft | AlignVCenter);
 
-	connect(mCancelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnCancel()));
-	connect(mLockButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnLock()));
-	connect(mTaskButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnTask()));
-	connect(mShutdownButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnShutdown()));
-	connect(mSwitchButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnSwitchUser()));
+	connect(mCancelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnCancel()));
+	connect(mLockButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnLock()));
+	connect(mTaskButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnTask()));
+	connect(mShutdownButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnShutdown()));
+	connect(mSwitchButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnSwitchUser()));
 
 	TQSize dlgSz = sizeHint();
 	int btnSize = dlgSz.width();
diff --git a/kdesktop/lock/securedlg.h b/kdesktop/lock/securedlg.h
index 9ad0ac1da..c6c9fa7fe 100644
--- a/kdesktop/lock/securedlg.h
+++ b/kdesktop/lock/securedlg.h
@@ -27,7 +27,7 @@ class TQListView;
 //
 class SecureDlg : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		SecureDlg(LockProcess *parent);
diff --git a/kdesktop/lockeng.cpp b/kdesktop/lockeng.cpp
index 5e32fd0f6..e121daaa1 100644
--- a/kdesktop/lockeng.cpp
+++ b/kdesktop/lockeng.cpp
@@ -134,12 +134,12 @@ SaverEngine::SaverEngine()
 	m_helperThread->start();
 	m_threadHelperObject = new SaverEngineThreadHelperObject;
 	m_threadHelperObject->moveToThread(m_helperThread);
-	connect(this, TQT_SIGNAL(terminateHelperThread()), m_threadHelperObject, TQT_SLOT(terminateThread()));
-	connect(m_threadHelperObject, TQT_SIGNAL(lockProcessWaiting()), this, TQT_SLOT(lockProcessWaiting()));
-	connect(m_threadHelperObject, TQT_SIGNAL(lockProcessFullyActivated()), this, TQT_SLOT(lockProcessFullyActivated()));
+	connect(this, TQ_SIGNAL(terminateHelperThread()), m_threadHelperObject, TQ_SLOT(terminateThread()));
+	connect(m_threadHelperObject, TQ_SIGNAL(lockProcessWaiting()), this, TQ_SLOT(lockProcessWaiting()));
+	connect(m_threadHelperObject, TQ_SIGNAL(lockProcessFullyActivated()), this, TQ_SLOT(lockProcessFullyActivated()));
 
-	connect(&mLockProcess, TQT_SIGNAL(processExited(TDEProcess *)),
-						TQT_SLOT(lockProcessExited()));
+	connect(&mLockProcess, TQ_SIGNAL(processExited(TDEProcess *)),
+						TQ_SLOT(lockProcessExited()));
 
 	configure();
 
@@ -160,8 +160,8 @@ SaverEngine::SaverEngine()
 	if (useSAKProcess) {
 		mSAKProcess = new TDEProcess;
 		*mSAKProcess << "tdmtsak";
-		connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
-		TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) );
+		connect(mSAKProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotSAKProcessExited()));
+		TQTimer::singleShot( 0, this, TQ_SLOT(handleSecureDialog()) );
 	}
 
 	mLockProcess.clearArguments();
@@ -207,8 +207,8 @@ SaverEngine::SaverEngine()
 	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);
 	for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) {
 		TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-		connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
-		connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
+		connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
+		connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
 		cdevice->enableCardMonitoring(true);
 	}
 
@@ -220,7 +220,7 @@ SaverEngine::SaverEngine()
 		TQTextStream stream(&flagFile);
 		if (stream.readLine().startsWith("1")) {
 			// Card was likely used to log in
-			TQTimer::singleShot(5000, this, SLOT(cardStartupTimeout()));
+			TQTimer::singleShot(5000, this, TQ_SLOT(cardStartupTimeout()));
 		}
 		flagFile.close();
 	}
@@ -409,7 +409,7 @@ bool SaverEngine::enable( bool e )
 	if (mEnabled) {
 		if ( !mXAutoLock ) {
 			mXAutoLock = new XAutoLock();
-			connect(mXAutoLock, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout()));
+			connect(mXAutoLock, TQ_SIGNAL(timeout()), TQ_SLOT(idleTimeout()));
 		}
 		mXAutoLock->setTimeout(mTimeout);
 		mXAutoLock->setDPMS(true);
@@ -445,7 +445,7 @@ bool SaverEngine::isBlanked()
 
 void SaverEngine::enableExports()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	kdDebug(270) << k_lineinfo << "activating background exports.\n";
 	DCOPClient *client = kapp->dcopClient();
 	if (!client->isAttached()) {
@@ -702,7 +702,7 @@ void SaverEngine::lockProcessExited()
 		// PROBABLE HACKING ATTEMPT DETECTED
 		restartDesktopLockProcess();
 		mState = Waiting;
-		TQTimer::singleShot( 100, this, SLOT(recoverFromHackingAttempt()) );
+		TQTimer::singleShot( 100, this, TQ_SLOT(recoverFromHackingAttempt()) );
 	}
 	else {
 		// Restart the lock process
@@ -849,19 +849,19 @@ bool SaverEngine::dBusConnect() {
 	dBusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus, DBUS_CONN_NAME);
 	if( !dBusConn.isConnected() ) {
 		kdError() << "Failed to open connection to system message bus: " << dBusConn.lastError().message() << endl;
-		TQTimer::singleShot(4000, this, TQT_SLOT(dBusReconnect()));
+		TQTimer::singleShot(4000, this, TQ_SLOT(dBusReconnect()));
 		return false;
 	}
 
 	// watcher for Disconnect signal
 	dBusLocal = new TQT_DBusProxy(DBUS_SERVICE_DBUS, DBUS_PATH_LOCAL, DBUS_INTERFACE_LOCAL, dBusConn);
-	TQObject::connect(dBusLocal, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
-			  this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
+	TQObject::connect(dBusLocal, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
+			  this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
 
 	// watcher for NameOwnerChanged signals
 	dBusWatch = new TQT_DBusProxy(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, dBusConn);
-	TQObject::connect(dBusWatch, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
-			  this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
+	TQObject::connect(dBusWatch, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
+			  this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
 
 	// find already running SystemD
 	TQT_DBusProxy checkSystemD(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, dBusConn);
@@ -895,8 +895,8 @@ void SaverEngine::onDBusServiceRegistered(const TQString& service) {
 		// wather for systemd session signals
 		if( systemdSessionPath.isValid() ) {
 			systemdSession = new TQT_DBusProxy(SYSTEMD_LOGIN1_SERVICE, systemdSessionPath, SYSTEMD_LOGIN1_SESSION_IFACE, dBusConn);
-			TQObject::connect(systemdSession, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
-					  this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
+			TQObject::connect(systemdSession, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
+					  this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
 		}
 		return;
 	}
@@ -924,7 +924,7 @@ void SaverEngine::handleDBusSignal(const TQT_DBusMessage& msg) {
 	 && msg.interface() == DBUS_INTERFACE_LOCAL
 	 && msg.member() == "Disconnected" ) {
 		dBusClose();
-		TQTimer::singleShot(1000, this, TQT_SLOT(dBusReconnect()));
+		TQTimer::singleShot(1000, this, TQ_SLOT(dBusReconnect()));
 		return;
 	}
 
diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h
index f8b461547..c50361bc0 100644
--- a/kdesktop/lockeng.h
+++ b/kdesktop/lockeng.h
@@ -29,7 +29,7 @@ class TQT_DBusProxy;
 
 class SaverEngineThreadHelperObject : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 public slots:
 	void terminateThread();
@@ -48,7 +48,7 @@ signals:
  */
 class SaverEngine : public TQWidget, public KScreensaverIface
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	SaverEngine();
 	~SaverEngine();
diff --git a/kdesktop/main.cpp b/kdesktop/main.cpp
index b54c03cb7..7435acd62 100644
--- a/kdesktop/main.cpp
+++ b/kdesktop/main.cpp
@@ -43,7 +43,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
@@ -247,7 +247,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
             *qt_no_foreign_hack = true;
         // else argb_visual = false ... ? *shrug*
         if( argb_visual )
-            myApp = new KDesktopApp( dpy, Qt::HANDLE( visual ), 0 );
+            myApp = new KDesktopApp( dpy, TQt::HANDLE( visual ), 0 );
         else
             XCloseDisplay( dpy );
     }
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 0f49229a6..1192a0292 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -131,34 +131,34 @@ Minicli::Minicli( TQWidget *parent, const char *name)
   m_pURLCompletion = new KURLCompletion(KURLCompletion::FileCompletion);
   m_pEXECompletion = new KURLCompletion(KURLCompletion::SystemExeCompletion);
   //m_pURLCompletion->setCompletionMode( TDEGlobalSettings::completionMode() );
-  connect( m_pURLCompletion, TQT_SIGNAL( match(const TQString&) ), TQT_SLOT( slotMatch(const TQString&) ));
-  connect( m_pEXECompletion, TQT_SIGNAL( match(const TQString&) ), TQT_SLOT( slotEXEMatch(const TQString&) ));
+  connect( m_pURLCompletion, TQ_SIGNAL( match(const TQString&) ), TQ_SLOT( slotMatch(const TQString&) ));
+  connect( m_pEXECompletion, TQ_SIGNAL( match(const TQString&) ), TQ_SLOT( slotEXEMatch(const TQString&) ));
 
   // Main widget buttons...
-  connect( m_dlg->pbRun, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
-  connect( m_dlg->pbCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
-  connect( m_dlg->pbOptions, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdvanced()) );
-  connect( m_parseTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotParseTimer()) );
+  connect( m_dlg->pbRun, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) );
+  connect( m_dlg->pbCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) );
+  connect( m_dlg->pbOptions, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdvanced()) );
+  connect( m_parseTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotParseTimer()) );
 
-  connect( m_dlg->cbCommand, TQT_SIGNAL( textChanged( const TQString& ) ),
-           TQT_SLOT( slotCmdChanged(const TQString&) ) );
+  connect( m_dlg->cbCommand, TQ_SIGNAL( textChanged( const TQString& ) ),
+           TQ_SLOT( slotCmdChanged(const TQString&) ) );
 
-  connect( m_dlg->cbCommand, TQT_SIGNAL( returnPressed() ),
-           m_dlg->pbRun, TQT_SLOT( animateClick() ) );
+  connect( m_dlg->cbCommand, TQ_SIGNAL( returnPressed() ),
+           m_dlg->pbRun, TQ_SLOT( animateClick() ) );
 
   m_dlg->cbCommand->setHistoryEditorEnabled( true );
-  connect( m_dlg->cbCommand, TQT_SIGNAL(removed( const TQString&) ), TQT_SLOT(saveConfig()) );
+  connect( m_dlg->cbCommand, TQ_SIGNAL(removed( const TQString&) ), TQ_SLOT(saveConfig()) );
 
   // Advanced group box...
-  connect(m_dlg->cbPriority, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeScheduler(bool)));
-  connect(m_dlg->slPriority, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotPriority(int)));
-  connect(m_dlg->cbRealtime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRealtime(bool)));
-  connect(m_dlg->cbAppcomplete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAppcompleteToggled(bool)));
-  connect(m_dlg->cbAutocomplete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutocompleteToggled(bool)));
-  connect(m_dlg->cbAutohistory, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutohistoryToggled(bool)));
-  connect(m_dlg->cbRunAsOther, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeUid(bool)));
-  connect(m_dlg->leUsername, TQT_SIGNAL(lostFocus()), TQT_SLOT(updateAuthLabel()));
-  connect(m_dlg->cbRunInTerminal, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTerminal(bool)));
+  connect(m_dlg->cbPriority, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChangeScheduler(bool)));
+  connect(m_dlg->slPriority, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotPriority(int)));
+  connect(m_dlg->cbRealtime, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRealtime(bool)));
+  connect(m_dlg->cbAppcomplete, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAppcompleteToggled(bool)));
+  connect(m_dlg->cbAutocomplete, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAutocompleteToggled(bool)));
+  connect(m_dlg->cbAutohistory, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAutohistoryToggled(bool)));
+  connect(m_dlg->cbRunAsOther, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChangeUid(bool)));
+  connect(m_dlg->leUsername, TQ_SIGNAL(lostFocus()), TQ_SLOT(updateAuthLabel()));
+  connect(m_dlg->cbRunInTerminal, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTerminal(bool)));
 
   m_dlg->slPriority->setValue(50);
 
@@ -375,7 +375,7 @@ void Minicli::reset()
 
 void Minicli::keyPressEvent( TQKeyEvent* e )
 {
-  if ( e->key() == Qt::Key_Escape )
+  if ( e->key() == TQt::Key_Escape )
   {
     e->accept();
     m_dlg->pbCancel->animateClick();
@@ -877,7 +877,7 @@ void Minicli::setIcon ()
       {
         TQBitmap mask = *icon.mask();
         bitBlt( &mask, x, y,
-                overlay.mask() ? TQT_TQPIXMAP(const_cast<TQBitmap *>(overlay.mask())) : &overlay,
+                overlay.mask() ? const_cast<TQBitmap *>(overlay.mask()) : &overlay,
                 0, 0, overlay.width(), overlay.height(),
                 overlay.mask() ? OrROP : SetROP );
         icon.setMask(mask);
diff --git a/kdesktop/minicli.h b/kdesktop/minicli.h
index 9d92825c7..c3974a13b 100644
--- a/kdesktop/minicli.h
+++ b/kdesktop/minicli.h
@@ -46,7 +46,7 @@ class KURIFilterData;
 
 class Minicli : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   Minicli( TQWidget *parent=0, const char *name=0 );
diff --git a/kdesktop/pixmapserver.h b/kdesktop/pixmapserver.h
index a0eadcdd6..661d531ad 100644
--- a/kdesktop/pixmapserver.h
+++ b/kdesktop/pixmapserver.h
@@ -24,7 +24,7 @@
 
 struct KPixmapInode 
 {
-    Qt::HANDLE handle;
+    TQt::HANDLE handle;
     Atom selection;
 };
 
@@ -37,7 +37,7 @@ struct KPixmapData
 
 struct TDESelectionInode
 {
-    Qt::HANDLE handle;
+    TQt::HANDLE handle;
     TQString name;
 };
 
@@ -50,7 +50,7 @@ struct TDESelectionInode
  */
 class KPixmapServer: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KPixmapServer();
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 4027b7e9a..7d448c089 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -56,16 +56,16 @@ StartupId::StartupId( TQWidget* parent, const char* name )
         XSelectInput( tqt_xdisplay(), tqt_xrootwin(), attrs.your_event_mask | SubstructureNotifyMask);
         kapp->installX11EventFilter( this );
         }
-    connect( &update_timer, TQT_SIGNAL( timeout()), TQT_SLOT( update_startupid()));
+    connect( &update_timer, TQ_SIGNAL( timeout()), TQ_SLOT( update_startupid()));
     connect( &startup_info,
-        TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
-        TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
+        TQ_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( &startup_info,
-        TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
-        TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
+        TQ_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( &startup_info,
-        TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
-        TQT_SLOT( gotRemoveStartup( const TDEStartupInfoId& )));
+        TQ_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( gotRemoveStartup( const TDEStartupInfoId& )));
     }
 
 StartupId::~StartupId()
@@ -129,10 +129,10 @@ bool StartupId::x11Event( XEvent* e )
             if( startups.count() == 0 )
                 start_startupid( KDE_STARTUP_ICON );
             // 60(?) sec timeout - shouldn't be hopefully needed anyway, ksmserver should have it too
-            TQTimer::singleShot( 60000, this, TQT_SLOT( finishKDEStartup()));
+            TQTimer::singleShot( 60000, this, TQ_SLOT( finishKDEStartup()));
             }
         else if( strcmp( s, "session ready" ) == 0 && kde_startup_status < StartupDone )
-            TQTimer::singleShot( 2000, this, TQT_SLOT( finishKDEStartup()));
+            TQTimer::singleShot( 2000, this, TQ_SLOT( finishKDEStartup()));
         }
     return false;
     }
@@ -176,7 +176,7 @@ void StartupId::start_startupid( const TQString& icon_P )
     {
 
     const TQColor startup_colors[ StartupId::NUM_BLINKING_PIXMAPS ]
-    = { Qt::black, Qt::darkGray, Qt::lightGray, Qt::white, Qt::white };
+    = { TQt::black, TQt::darkGray, TQt::lightGray, TQt::white, TQt::white };
 
 
     TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, TDEIcon::Small, 0,
diff --git a/kdesktop/startupid.h b/kdesktop/startupid.h
index 893d0b8db..27345d598 100644
--- a/kdesktop/startupid.h
+++ b/kdesktop/startupid.h
@@ -34,7 +34,7 @@ class TQStyle;
 class StartupId
     : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         StartupId( TQWidget* parent = 0, const char* name = 0 );
         virtual ~StartupId();
diff --git a/kdesktop/tdefileividesktop.h b/kdesktop/tdefileividesktop.h
index 46f77f636..0434a706e 100644
--- a/kdesktop/tdefileividesktop.h
+++ b/kdesktop/tdefileividesktop.h
@@ -33,7 +33,7 @@
 /*
  * The dither flags used to display the shadow image
  */
-#define DITHER_FLAGS (Qt::DiffuseAlphaDither | Qt::ColorOnly | Qt::AvoidDither)
+#define DITHER_FLAGS (TQt::DiffuseAlphaDither | TQt::ColorOnly | TQt::AvoidDither)
 
 
 class TQFont;
diff --git a/kdesktop/xautolock.h b/kdesktop/xautolock.h
index 5684ce6ef..a30405339 100644
--- a/kdesktop/xautolock.h
+++ b/kdesktop/xautolock.h
@@ -19,7 +19,7 @@
 //
 class XAutoLock : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     XAutoLock();
     ~XAutoLock();
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index fa2512077..47320d0b0 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -48,7 +48,7 @@
 #include <kicondialog.h>
 #include <kdirselectdialog.h>
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <netwm.h>
 #endif
 
@@ -56,9 +56,9 @@
 
 using namespace std;
 
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
 extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 static TDECmdLineOptions options[] =
 {
@@ -125,10 +125,10 @@ bool WinIdEmbedder::eventFilter(TQObject *o, TQEvent *e)
     if (e->type() == TQEvent::Show && o->isWidgetType()
         && o->inherits("KDialog"))
     {
-        TQWidget *w = TQT_TQWIDGET(o);
+        TQWidget *w = static_cast<TQWidget*>(o);
         if (print)
             cout << "winId: " << w->winId() << endl;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         if (id)
             XSetTransientForHint(w->x11Display(), w->winId(), id);
 #endif
@@ -301,11 +301,11 @@ static int directCommand(TDECmdLineArgs *args)
 						       0, // name
 						       duration );
 	TQTimer *timer = new TQTimer();
-	TQObject::connect( timer, TQT_SIGNAL( timeout() ), kapp, TQT_SLOT( quit() ) );
-	TQObject::connect( popup, TQT_SIGNAL( clicked() ), kapp, TQT_SLOT( quit() ) );
+	TQObject::connect( timer, TQ_SIGNAL( timeout() ), kapp, TQ_SLOT( quit() ) );
+	TQObject::connect( popup, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) );
 	timer->start( duration, TRUE );
 
-#ifdef Q_WS_X11	
+#ifdef TQ_WS_X11	
 	if ( ! kapp->geometryArgument().isEmpty()) {
 	    int x, y;
 	    int w, h;
@@ -525,7 +525,7 @@ static int directCommand(TDECmdLineArgs *args)
         TQString startDir;
         startDir = TQString::fromLocal8Bit(args->getOption("getexistingdirectory"));
 	TQString result;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 	result = TQFileDialog::getExistingDirectory(startDir, 0, "getExistingDirectory",
 							   title, true, true);
 #else
diff --git a/kdialog/progressdialog.h b/kdialog/progressdialog.h
index cdfca1ccb..1cf090081 100644
--- a/kdialog/progressdialog.h
+++ b/kdialog/progressdialog.h
@@ -24,7 +24,7 @@
 
 class ProgressDialog : public KProgressDialog, virtual public ProgressDialogIface
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
       ProgressDialog(TQWidget* parent = 0, const TQString& caption = TQString::null, const TQString& text = TQString::null, int totalSteps = 100);
diff --git a/kdialog/tdelistboxdialog.h b/kdialog/tdelistboxdialog.h
index a93e7d002..3ade107f0 100644
--- a/kdialog/tdelistboxdialog.h
+++ b/kdialog/tdelistboxdialog.h
@@ -25,7 +25,7 @@
 
 class TDEListBoxDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp
index f68acfe4f..126eeec22 100644
--- a/kdialog/widgets.cpp
+++ b/kdialog/widgets.cpp
@@ -35,13 +35,13 @@
 #include <tqvbox.h>
 #include <tqfile.h>
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <netwm.h>
 #endif
 
 void Widgets::handleXGeometry(TQWidget * dlg)
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if ( ! kapp->geometryArgument().isEmpty()) {
 	int x, y;
 	int w, h;
diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp
index 869753c5b..4e44f6c91 100644
--- a/kfind/kdatecombo.cpp
+++ b/kfind/kdatecombo.cpp
@@ -38,7 +38,7 @@ void KDateCombo::initObject(const TQDate & date, TQWidget *, const char *)
   popupFrame->setMainWidget(datePicker);
   setDate(date);
 
-  connect(datePicker, TQT_SIGNAL(dateSelected(TQDate)), this, TQT_SLOT(dateEnteredEvent(TQDate)));
+  connect(datePicker, TQ_SIGNAL(dateSelected(TQDate)), this, TQ_SLOT(dateEnteredEvent(TQDate)));
 }
 
 KDateCombo::~KDateCombo()
@@ -84,9 +84,9 @@ void KDateCombo::dateEnteredEvent(TQDate newDate)
 
 void KDateCombo::mousePressEvent (TQMouseEvent * e)
 {
-  if (e->button() & Qt::LeftButton)
+  if (e->button() & TQt::LeftButton)
   {
-    if  (TQT_TQRECT_OBJECT(rect()).contains( e->pos()))
+    if  (rect().contains( e->pos()))
     {
       TQDate tempDate;
       getDate(& tempDate);
@@ -103,9 +103,9 @@ bool KDateCombo::eventFilter (TQObject*, TQEvent* e)
   {
       TQMouseEvent *me = (TQMouseEvent *)e;
       TQPoint p = mapFromGlobal( me->globalPos() );
-      if (TQT_TQRECT_OBJECT(rect()).contains( p ) )
+      if (rect().contains( p ) )
       {
-        TQTimer::singleShot(10, this, TQT_SLOT(dateEnteredEvent()));
+        TQTimer::singleShot(10, this, TQ_SLOT(dateEnteredEvent()));
         return true;
       }
   }
@@ -113,12 +113,12 @@ bool KDateCombo::eventFilter (TQObject*, TQEvent* e)
   {
       TQKeyEvent *k = (TQKeyEvent *)e;
       //Press return == pick selected date and close the combo
-      if((k->key()==Qt::Key_Return)||(k->key()==Qt::Key_Enter))
+      if((k->key()==TQt::Key_Return)||(k->key()==TQt::Key_Enter))
       {
         dateEnteredEvent(datePicker->date());
         return true;
       }
-      else if (k->key()==Qt::Key_Escape)
+      else if (k->key()==TQt::Key_Escape)
       {
         popupFrame->hide();
         return true;
diff --git a/kfind/kdatecombo.h b/kfind/kdatecombo.h
index d1aa3ecdc..3a3f8d194 100644
--- a/kfind/kdatecombo.h
+++ b/kfind/kdatecombo.h
@@ -19,7 +19,7 @@ class KDatePicker;
 class TDEPopupFrame;
 
 class KDateCombo : public TQComboBox  {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
 	KDateCombo(TQWidget *parent=0, const char *name=0);
diff --git a/kfind/kfind.cpp b/kfind/kfind.cpp
index 1675d9d71..bcf1e3cd8 100644
--- a/kfind/kfind.cpp
+++ b/kfind/kfind.cpp
@@ -71,17 +71,17 @@ Kfind::Kfind(TQWidget *parent, const char *name)
 
   mSearch = new KPushButton( KGuiItem(i18n("&Find"), "edit-find"), mButtonBox );
   mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4);
-  connect( mSearch, TQT_SIGNAL(clicked()), this, TQT_SLOT( startSearch() ) );
+  connect( mSearch, TQ_SIGNAL(clicked()), this, TQ_SLOT( startSearch() ) );
   mStop = new KPushButton( KGuiItem(i18n("Stop"), "process-stop"), mButtonBox );
-  connect( mStop, TQT_SIGNAL(clicked()), this, TQT_SLOT( stopSearch() ) );
+  connect( mStop, TQ_SIGNAL(clicked()), this, TQ_SLOT( stopSearch() ) );
   mSave = new KPushButton( KStdGuiItem::saveAs(), mButtonBox );
-  connect( mSave, TQT_SIGNAL(clicked()), this, TQT_SLOT( saveResults() ) );
+  connect( mSave, TQ_SIGNAL(clicked()), this, TQ_SLOT( saveResults() ) );
 
   KPushButton * mClose = new KPushButton( KStdGuiItem::close(), mButtonBox );
-  connect( mClose, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( destroyMe() ) );
+  connect( mClose, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( destroyMe() ) );
 
   // react to search requests from widget
-  connect( tabWidget, TQT_SIGNAL(startSearch()), this, TQT_SLOT( startSearch() ) );
+  connect( tabWidget, TQ_SIGNAL(startSearch()), this, TQ_SLOT( startSearch() ) );
 
   mSearch->setEnabled(true); // Enable "Search"
   mStop->setEnabled(false);  // Disable "Stop"
diff --git a/kfind/kfind.h b/kfind/kfind.h
index fda0028ca..ec2b84542 100644
--- a/kfind/kfind.h
+++ b/kfind/kfind.h
@@ -20,7 +20,7 @@ class KfindTabWidget;
 
 class Kfind: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Kfind(TQWidget * parent = 0, const char * name = 0);
diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp
index 29e3010b4..f26710ce2 100644
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@@ -31,7 +31,7 @@ KfindDlg::KfindDlg(const KURL & url, TQWidget *parent, const char *name)
 	KStdGuiItem::saveAs())
 {
   TQWidget::setCaption( i18n("Find Files/Folders" ) );
-  setButtonBoxOrientation(Qt::Vertical);
+  setButtonBoxOrientation(TQt::Vertical);
 
   enableButton(Apply, true); // Enable "Find"
   enableButton(User1, false); // Disable "Stop"
@@ -62,20 +62,20 @@ KfindDlg::KfindDlg(const KURL & url, TQWidget *parent, const char *name)
   vBox->addWidget(win, 1);
   vBox->addWidget(mStatusBar, 0);
 
-  connect(this, TQT_SIGNAL(applyClicked()),
-	  this, TQT_SLOT(startSearch()));
-  connect(this, TQT_SIGNAL(user1Clicked()),
-	  this, TQT_SLOT(stopSearch()));
-  connect(this, TQT_SIGNAL(user2Clicked()),
-	  win, TQT_SLOT(saveResults()));
+  connect(this, TQ_SIGNAL(applyClicked()),
+	  this, TQ_SLOT(startSearch()));
+  connect(this, TQ_SIGNAL(user1Clicked()),
+	  this, TQ_SLOT(stopSearch()));
+  connect(this, TQ_SIGNAL(user2Clicked()),
+	  win, TQ_SLOT(saveResults()));
 
-  connect(win ,TQT_SIGNAL(resultSelected(bool)),
-	  this,TQT_SIGNAL(resultSelected(bool)));
+  connect(win ,TQ_SIGNAL(resultSelected(bool)),
+	  this,TQ_SIGNAL(resultSelected(bool)));
 
-  query = new KQuery(TQT_TQOBJECT(frame));
-  connect(query, TQT_SIGNAL(addFile(const KFileItem*,const TQString&)),
-	  TQT_SLOT(addFile(const KFileItem*,const TQString&)));
-  connect(query, TQT_SIGNAL(result(int)), TQT_SLOT(slotResult(int)));
+  query = new KQuery(frame);
+  connect(query, TQ_SIGNAL(addFile(const KFileItem*,const TQString&)),
+	  TQ_SLOT(addFile(const KFileItem*,const TQString&)));
+  connect(query, TQ_SIGNAL(result(int)), TQ_SLOT(slotResult(int)));
 
   dirwatch=NULL;
 }
@@ -121,8 +121,8 @@ void KfindDlg::startSearch()
   if(dirwatch!=NULL)
     delete dirwatch;
   dirwatch=new KDirWatch();
-  connect(dirwatch, TQT_SIGNAL(created(const TQString&)), this, TQT_SLOT(slotNewItems(const TQString&)));
-  connect(dirwatch, TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(slotDeleteItem(const TQString&)));
+  connect(dirwatch, TQ_SIGNAL(created(const TQString&)), this, TQ_SLOT(slotNewItems(const TQString&)));
+  connect(dirwatch, TQ_SIGNAL(deleted(const TQString&)), this, TQ_SLOT(slotDeleteItem(const TQString&)));
   dirwatch->addDir(query->url().path(),true);
 
 #if 0
diff --git a/kfind/kfinddlg.h b/kfind/kfinddlg.h
index d8080ec46..829a3da8f 100644
--- a/kfind/kfinddlg.h
+++ b/kfind/kfinddlg.h
@@ -22,7 +22,7 @@ class KStatusBar;
 
 class KfindDlg: public KDialogBase
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
   KfindDlg(const KURL & url, TQWidget * parent = 0, const char * name = 0);
diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp
index 54de01e9b..8fb99fdac 100644
--- a/kfind/kfindpart.cpp
+++ b/kfind/kfindpart.cpp
@@ -53,18 +53,18 @@ KFindPart::KFindPart( TQWidget * parentWidget, const char *widgetName,
 
     setWidget( m_kfindWidget );
 
-    connect( m_kfindWidget, TQT_SIGNAL(started()),
-             this, TQT_SLOT(slotStarted()) );
-    connect( m_kfindWidget, TQT_SIGNAL(destroyMe()),
-             this, TQT_SLOT(slotDestroyMe()) );
-    connect(m_kfindWidget->dirlister,TQT_SIGNAL(deleteItem(KFileItem*)), this, TQT_SLOT(removeFile(KFileItem*)));
-    connect(m_kfindWidget->dirlister,TQT_SIGNAL(newItems(const KFileItemList&)), this, TQT_SLOT(newFiles(const KFileItemList&)));
+    connect( m_kfindWidget, TQ_SIGNAL(started()),
+             this, TQ_SLOT(slotStarted()) );
+    connect( m_kfindWidget, TQ_SIGNAL(destroyMe()),
+             this, TQ_SLOT(slotDestroyMe()) );
+    connect(m_kfindWidget->dirlister,TQ_SIGNAL(deleteItem(KFileItem*)), this, TQ_SLOT(removeFile(KFileItem*)));
+    connect(m_kfindWidget->dirlister,TQ_SIGNAL(newItems(const KFileItemList&)), this, TQ_SLOT(newFiles(const KFileItemList&)));
     //setXMLFile( "kfind.rc" );
     query = new KQuery(this);
-    connect(query, TQT_SIGNAL(addFile(const KFileItem *, const TQString&)),
-            TQT_SLOT(addFile(const KFileItem *, const TQString&)));
-    connect(query, TQT_SIGNAL(result(int)),
-            TQT_SLOT(slotResult(int)));
+    connect(query, TQ_SIGNAL(addFile(const KFileItem *, const TQString&)),
+            TQ_SLOT(addFile(const KFileItem *, const TQString&)));
+    connect(query, TQ_SIGNAL(result(int)),
+            TQ_SLOT(slotResult(int)));
 
     m_kfindWidget->setQuery(query);
     m_bShowsResult = false;
diff --git a/kfind/kfindpart.h b/kfind/kfindpart.h
index 3ec83970a..b07705645 100644
--- a/kfind/kfindpart.h
+++ b/kfind/kfindpart.h
@@ -41,7 +41,7 @@ class IconViewBrowserExtension;
 class KFindPart : public KonqDirPart//KParts::ReadOnlyPart
 {
   friend class KFindPartBrowserExtension;
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool showsResult READ showsResult )
 public:
     KFindPart( TQWidget * parentWidget, const char *widgetName, 
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index c2df7aa67..3820eaead 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -134,11 +134,11 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
 
     // Signals
 
-    connect( browseB, TQT_SIGNAL(clicked()),
-             this, TQT_SLOT(getDirectory()) );
+    connect( browseB, TQ_SIGNAL(clicked()),
+             this, TQ_SLOT(getDirectory()) );
 
-    connect( nameBox, TQT_SIGNAL(activated(int)),
-             this, TQT_SIGNAL(startSearch()));
+    connect( nameBox, TQ_SIGNAL(activated(int)),
+             this, TQ_SIGNAL(startSearch()));
 
     // ************ Page Two
 
@@ -212,7 +212,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
 
     grid1->addWidget(rb[0], 1, 1 );
     grid1->addWidget(fromDate, 1, 2 );
-    grid1->addWidget(andL, 1, 3, Qt::AlignHCenter );
+    grid1->addWidget(andL, 1, 3, TQt::AlignHCenter );
     grid1->addWidget(toDate, 1, 4 );
 
     grid1->addWidget(rb[1], 2, 1 );
@@ -235,9 +235,9 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
     grid1->setRowStretch(6,1);
 
     // Connect
-    connect( findCreated,  TQT_SIGNAL(toggled(bool)),   TQT_SLOT(fixLayout()) );
-    connect( bg,  TQT_SIGNAL(clicked(int)), this,   TQT_SLOT(fixLayout()) );
-    connect( sizeBox, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotSizeBoxChanged(int)));
+    connect( findCreated,  TQ_SIGNAL(toggled(bool)),   TQ_SLOT(fixLayout()) );
+    connect( bg,  TQ_SIGNAL(clicked(int)), this,   TQ_SLOT(fixLayout()) );
+    connect( sizeBox, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotSizeBoxChanged(int)));
 
 
     // ************ Page Three
@@ -250,7 +250,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
     textEdit=new KLineEdit(pages[2], "textEdit" );
     TQLabel * textL   =new TQLabel(textEdit, i18n("C&ontaining text:"), pages[2], "text");
 
-    connect( textEdit, TQT_SIGNAL(returnPressed(const TQString &)), TQT_SIGNAL( startSearch()));
+    connect( textEdit, TQ_SIGNAL(returnPressed(const TQString &)), TQ_SIGNAL( startSearch()));
 
     const TQString containingtext
       = i18n("<qt>If specified, only files that contain this text"
@@ -306,9 +306,9 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
 
     if ( editRegExp ) {
       // The editor was available, so lets use it.
-      connect( regexpContentCb, TQT_SIGNAL(toggled(bool) ), editRegExp, TQT_SLOT(setEnabled(bool)) );
+      connect( regexpContentCb, TQ_SIGNAL(toggled(bool) ), editRegExp, TQ_SLOT(setEnabled(bool)) );
       editRegExp->setEnabled(false);
-      connect( editRegExp, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotEditRegExp() ) );
+      connect( editRegExp, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotEditRegExp() ) );
     }
     else
         regexpContentCb->hide();
@@ -330,7 +330,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
 
     grid2->addWidget( textMetaKey, 4, 0 );
     grid2->addWidget( metainfokeyEdit, 4, 1 );
-    grid2->addWidget( textMetaInfo, 4, 2, Qt::AlignHCenter  );
+    grid2->addWidget( textMetaInfo, 4, 2, TQt::AlignHCenter  );
     grid2->addWidget( metainfoEdit, 4, 3 );
 
     metainfokeyEdit->setText("*");
@@ -496,7 +496,7 @@ void KfindTabWidget::loadHistory()
 void KfindTabWidget::slotEditRegExp()
 {
   if ( ! regExpDialog )
-    regExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+    regExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
 
   KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( regExpDialog->tqt_cast( "KRegExpEditorInterface" ) );
   if ( !iface )
@@ -807,7 +807,7 @@ bool KfindTabWidget::isSearchRecursive()
    Digit validator. Allows only digits to be typed.
 **/
 KDigitValidator::KDigitValidator( TQWidget * parent, const char *name )
-  : TQValidator( TQT_TQOBJECT(parent), name )
+  : TQValidator( parent, name )
 {
   r = new TQRegExp("^[0-9]*$");
 }
diff --git a/kfind/kftabdlg.h b/kfind/kftabdlg.h
index c080c44d4..6cb1455b2 100644
--- a/kfind/kftabdlg.h
+++ b/kfind/kftabdlg.h
@@ -31,7 +31,7 @@ class KfDirDialog;
 
 class KfindTabWidget: public TQTabWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KfindTabWidget(TQWidget * parent = 0, const char *name=0);
@@ -121,7 +121,7 @@ private:
 
 class KDigitValidator : public TQValidator
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KDigitValidator(TQWidget * parent, const char *name = 0 );
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index f068d031e..c4a19cf94 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -131,14 +131,14 @@ KfindWindow::KfindWindow( TQWidget *parent, const char *name )
 
   resetColumns(true);
 
-  connect( this, TQT_SIGNAL(selectionChanged()),
-	   this, TQT_SLOT( selectionHasChanged() ));
+  connect( this, TQ_SIGNAL(selectionChanged()),
+	   this, TQ_SLOT( selectionHasChanged() ));
 
-  connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem*,const TQPoint&)),
-	  this, TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem*,const TQPoint&)));
+  connect(this, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem*,const TQPoint&)),
+	  this, TQ_SLOT(slotContextMenu(TDEListView *,TQListViewItem*,const TQPoint&)));
 
-  connect(this, TQT_SIGNAL(executed(TQListViewItem*)),
-	  this, TQT_SLOT(slotExecute(TQListViewItem*)));
+  connect(this, TQ_SIGNAL(executed(TQListViewItem*)),
+	  this, TQ_SLOT(slotExecute(TQListViewItem*)));
   setDragEnabled(true);
 
 }
@@ -409,21 +409,21 @@ void KfindWindow::slotContextMenu(TDEListView *,TQListViewItem *item,const TQPoi
   {
      //menu = new TDEPopupMenu(item->text(0), this);
      m_menu->insertTitle(item->text(0));
-     m_menu->insertItem(SmallIcon("document-open"),i18n("Menu item", "Open"), this, TQT_SLOT(openBinding()));
-     m_menu->insertItem(SmallIcon("window-new"),i18n("Open Folder"), this, TQT_SLOT(openFolder()));
+     m_menu->insertItem(SmallIcon("document-open"),i18n("Menu item", "Open"), this, TQ_SLOT(openBinding()));
+     m_menu->insertItem(SmallIcon("window-new"),i18n("Open Folder"), this, TQ_SLOT(openFolder()));
      m_menu->insertSeparator();
-     m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQT_SLOT(copySelection()));
-     m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQT_SLOT(deleteFiles()));
+     m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQ_SLOT(copySelection()));
+     m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQ_SLOT(deleteFiles()));
      m_menu->insertSeparator();
-     m_menu->insertItem(i18n("Open With..."), this, TQT_SLOT(slotOpenWith()));
+     m_menu->insertItem(i18n("Open With..."), this, TQ_SLOT(slotOpenWith()));
      m_menu->insertSeparator();
-     m_menu->insertItem(i18n("Properties"), this, TQT_SLOT(fileProperties()));
+     m_menu->insertItem(i18n("Properties"), this, TQ_SLOT(fileProperties()));
   }
   else
   {
      m_menu->insertTitle(i18n("Selected Files"));
-     m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQT_SLOT(copySelection()));
-     m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQT_SLOT(deleteFiles()));
+     m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQ_SLOT(copySelection()));
+     m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQ_SLOT(deleteFiles()));
   }
   m_menu->popup(p, 1);
 }
diff --git a/kfind/kfwin.h b/kfind/kfwin.h
index 5a019a382..76837c4a0 100644
--- a/kfind/kfwin.h
+++ b/kfind/kfwin.h
@@ -31,7 +31,7 @@ class KfFileLVI : public TQListViewItem
 
 class KfindWindow: public   TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KfindWindow( TQWidget * parent = 0, const char * name = 0 );
 
diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp
index 1e3617c70..44fc2a97d 100644
--- a/kfind/kquery.cpp
+++ b/kfind/kquery.cpp
@@ -21,9 +21,9 @@ KQuery::KQuery(TQObject *parent, const char * name)
   m_regexps.setAutoDelete(true);
   m_fileItems.setAutoDelete(true);
   processLocate = new TDEProcess(this);
-  connect(processLocate,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdtout(TDEProcess*,char*,int)));
-  connect(processLocate,TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdterr(TDEProcess*,char*,int)));
-  connect(processLocate,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(slotendProcessLocate(TDEProcess*)));
+  connect(processLocate,TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),this,TQ_SLOT(slotreceivedSdtout(TDEProcess*,char*,int)));
+  connect(processLocate,TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),this,TQ_SLOT(slotreceivedSdterr(TDEProcess*,char*,int)));
+  connect(processLocate,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(slotendProcessLocate(TDEProcess*)));
 
   // Files with these mime types can be ignored, even if
   // findFormatByFileContent() in some cases may claim that
@@ -87,10 +87,10 @@ void KQuery::start()
   else
     job = TDEIO::listDir( m_url, false );
 
-  connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
-	  TQT_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
-  connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
-  connect(job, TQT_SIGNAL(canceled(TDEIO::Job *)), TQT_SLOT(slotCanceled(TDEIO::Job *)));
+  connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
+	  TQ_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
+  connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *)));
+  connect(job, TQ_SIGNAL(canceled(TDEIO::Job *)), TQ_SLOT(slotCanceled(TDEIO::Job *)));
 }
 
 void KQuery::slotResult( TDEIO::Job * _job )
diff --git a/kfind/kquery.h b/kfind/kquery.h
index 8f12e782c..34ed16457 100644
--- a/kfind/kquery.h
+++ b/kfind/kquery.h
@@ -17,7 +17,7 @@ class KFileItem;
 
 class KQuery : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  public:
   KQuery(TQObject *parent = 0, const char * name = 0);
diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN
index 39498732d..f2e11d0cf 100644
--- a/khelpcenter/DESIGN
+++ b/khelpcenter/DESIGN
@@ -384,7 +384,7 @@ protocol == "help") by itself and otherwise use the plain URL.
 ## mode.
 
 # Hmm yes, that should be possible. Take the toplevel widget, use
-# QObject::children() and iterate over all children, use QToolTip::textFor() to
+# TQObject::children() and iterate over all children, use QToolTip::textFor() to
 # check whether the given qwidget has a tooltip and if so, use QToolTip::tip()
 # to show the tooltip.
 # One could probably add a standard dcop call to TDEMainWindow, like
diff --git a/khelpcenter/fontdialog.h b/khelpcenter/fontdialog.h
index c38a54e2f..c95004540 100644
--- a/khelpcenter/fontdialog.h
+++ b/khelpcenter/fontdialog.h
@@ -33,7 +33,7 @@ namespace KHC {
 
 class FontDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		FontDialog( TQWidget *parent, const char *name = 0 );
 
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index 093fcb8d4..8675466a6 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -73,10 +73,10 @@ Glossary::Glossary( TQWidget *parent ) : TDEListView( parent )
 {
 	m_initialized = false;
 
-	connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-	         this, TQT_SLOT( treeItemSelected( TQListViewItem * ) ) );
-	connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
-	         this, TQT_SLOT( treeItemSelected( TQListViewItem * ) ) );
+	connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+	         this, TQ_SLOT( treeItemSelected( TQListViewItem * ) ) );
+	connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ),
+	         this, TQ_SLOT( treeItemSelected( TQListViewItem * ) ) );
 	
 	setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 	addColumn( TQString::null );
@@ -147,8 +147,8 @@ void Glossary::rebuildGlossaryCache()
 	mainWindow->statusBar()->message( i18n( "Rebuilding cache..." ) );
 
 	TDEProcess *meinproc = new TDEProcess;
-	connect( meinproc, TQT_SIGNAL( processExited( TDEProcess * ) ),
-	         this, TQT_SLOT( meinprocExited( TDEProcess * ) ) );
+	connect( meinproc, TQ_SIGNAL( processExited( TDEProcess * ) ),
+	         this, TQ_SLOT( meinprocExited( TDEProcess * ) ) );
 
 	*meinproc << locate( "exe", TQString::fromLatin1( "meinproc" ) );
 	*meinproc << TQString::fromLatin1( "--output" ) << m_cacheFile;
diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h
index 1adf64e0e..d9893abbf 100644
--- a/khelpcenter/glossary.h
+++ b/khelpcenter/glossary.h
@@ -99,7 +99,7 @@ inline TQDataStream &operator>>( TQDataStream &stream, GlossaryEntry &e )
 
 class Glossary : public TDEListView
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		Glossary( TQWidget *parent );
 		virtual ~Glossary();
diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp
index 429fa48a0..69e6521ae 100644
--- a/khelpcenter/history.cpp
+++ b/khelpcenter/history.cpp
@@ -56,20 +56,20 @@ void History::setupActions( TDEActionCollection *coll )
   TQPair<KGuiItem, KGuiItem> backForward = KStdGuiItem::backAndForward();
 
   m_backAction = new TDEToolBarPopupAction( backForward.first, ALT+Key_Left,
-      this, TQT_SLOT( back() ), coll, "back" );
-  connect( m_backAction->popupMenu(), TQT_SIGNAL( activated( int ) ),
-           TQT_SLOT( backActivated( int ) ) );
-  connect( m_backAction->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-           TQT_SLOT( fillBackMenu() ) );
+      this, TQ_SLOT( back() ), coll, "back" );
+  connect( m_backAction->popupMenu(), TQ_SIGNAL( activated( int ) ),
+           TQ_SLOT( backActivated( int ) ) );
+  connect( m_backAction->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+           TQ_SLOT( fillBackMenu() ) );
   m_backAction->setEnabled( false );
 
   m_forwardAction = new TDEToolBarPopupAction( backForward.second, ALT+Key_Right,
-      this, TQT_SLOT( forward() ), coll,
+      this, TQ_SLOT( forward() ), coll,
       "forward" );
-  connect( m_forwardAction->popupMenu(), TQT_SIGNAL( activated( int ) ),
-           TQT_SLOT( forwardActivated( int ) ) );
-  connect( m_forwardAction->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-           TQT_SLOT( fillForwardMenu() ) );
+  connect( m_forwardAction->popupMenu(), TQ_SIGNAL( activated( int ) ),
+           TQ_SLOT( forwardActivated( int ) ) );
+  connect( m_forwardAction->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+           TQ_SLOT( fillForwardMenu() ) );
   m_forwardAction->setEnabled( false );
 }
 
@@ -78,9 +78,9 @@ void History::installMenuBarHook( TDEMainWindow *mainWindow )
   TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>(
       mainWindow->guiFactory()->container( "go_web", mainWindow ) );
   if ( goMenu ) {
-    connect( goMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( fillGoMenu() ) );
-    connect( goMenu, TQT_SIGNAL( activated( int ) ),
-             TQT_SLOT( goMenuActivated( int ) ) );
+    connect( goMenu, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( fillGoMenu() ) );
+    connect( goMenu, TQ_SIGNAL( activated( int ) ),
+             TQ_SLOT( goMenuActivated( int ) ) );
     m_goMenuIndex = goMenu->count();
   }
 }
@@ -178,7 +178,7 @@ void History::goHistoryActivated( int steps )
   if ( m_goBuffer )
     return;
   m_goBuffer = steps;
-  TQTimer::singleShot( 0, this, TQT_SLOT( goHistoryDelayed() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( goHistoryDelayed() ) );
 }
 
 void History::goHistoryDelayed()
diff --git a/khelpcenter/history.h b/khelpcenter/history.h
index 3afa21049..21f41fa09 100644
--- a/khelpcenter/history.h
+++ b/khelpcenter/history.h
@@ -36,7 +36,7 @@ class View;
 
 class History : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     friend class foo; // to make gcc shut up
     struct Entry
diff --git a/khelpcenter/htmlsearch.h b/khelpcenter/htmlsearch.h
index a6c6c718e..355e8932f 100644
--- a/khelpcenter/htmlsearch.h
+++ b/khelpcenter/htmlsearch.h
@@ -10,9 +10,9 @@ namespace KHC {
 
 class DocEntry;
 
-class HTMLSearch : public QObject
+class HTMLSearch : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     HTMLSearch();
     ~HTMLSearch();
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index 5fd0f4640..ee8cb5bd4 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -276,11 +276,11 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
 
         kdDebug() << "Running htdig" << endl;
 
-        connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
-                this, TQT_SLOT(htdigStdout(TDEProcess *,char*,int)));
+        connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
+                this, TQ_SLOT(htdigStdout(TDEProcess *,char*,int)));
 
-        connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
-                this, TQT_SLOT(htdigExited(TDEProcess *)));
+        connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)),
+                this, TQ_SLOT(htdigExited(TDEProcess *)));
 
         _htdigRunning = true;
 
@@ -340,8 +340,8 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
 
     kdDebug() << "Running htmerge" << endl;
 
-    connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
-            this, TQT_SLOT(htmergeExited(TDEProcess *)));
+    connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)),
+            this, TQ_SLOT(htmergeExited(TDEProcess *)));
 
     _htmergeRunning = true;
 
@@ -444,10 +444,10 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
 
   kdDebug() << "Running htsearch" << endl;
 
-  connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
-	  this, TQT_SLOT(htsearchStdout(TDEProcess *,char*,int)));
-  connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
-	  this, TQT_SLOT(htsearchExited(TDEProcess *)));
+  connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
+	  this, TQ_SLOT(htsearchStdout(TDEProcess *,char*,int)));
+  connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)),
+	  this, TQ_SLOT(htsearchExited(TDEProcess *)));
 
   _htsearchRunning = true;
   _searchResult = "";
diff --git a/khelpcenter/htmlsearch/htmlsearch.h b/khelpcenter/htmlsearch/htmlsearch.h
index 37d9bf39f..e0c533f81 100644
--- a/khelpcenter/htmlsearch/htmlsearch.h
+++ b/khelpcenter/htmlsearch/htmlsearch.h
@@ -16,9 +16,9 @@ class TDEProcess;
 class ProgressDialog;
 
 
-class HTMLSearch : public QObject
+class HTMLSearch : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 3db9c9895..cd4e56021 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -60,8 +60,8 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
   url->setText(i18n("ht://dig home page"));
   url->setAlignment(TQLabel::AlignHCenter);
   grid->addMultiCellWidget(url, 2,2, 0, 1);
-  connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
-      this, TQT_SLOT(urlClicked(const TQString&)));
+  connect(url, TQ_SIGNAL(leftClickedURL(const TQString&)),
+      this, TQ_SLOT(urlClicked(const TQString&)));
 
   gb = new TQGroupBox(i18n("Program Locations"), this);
 
@@ -74,7 +74,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
   l->setBuddy( htdigBin );
   grid->addWidget(l, 1,0);
   grid->addWidget(htdigBin, 1,1);
-  connect(htdigBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
+  connect(htdigBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged()));
   TQString wtstr = i18n( "Enter the path to your htdig program here, e.g. /usr/local/bin/htdig" );
   TQWhatsThis::add( htdigBin, wtstr );
   TQWhatsThis::add( l, wtstr );
@@ -84,7 +84,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
   l->setBuddy( htsearchBin );
   grid->addWidget(l, 2,0);
   grid->addWidget(htsearchBin, 2,1);
-  connect(htsearchBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
+  connect(htsearchBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged()));
   wtstr = i18n( "Enter the path to your htsearch program here, e.g. /usr/local/bin/htsearch" );
   TQWhatsThis::add( htsearchBin, wtstr );
   TQWhatsThis::add( l, wtstr );
@@ -94,7 +94,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
   l->setBuddy( htmergeBin );
   grid->addWidget(l, 3,0);
   grid->addWidget(htmergeBin, 3,1);
-  connect(htmergeBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
+  connect(htmergeBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged()));
   wtstr = i18n( "Enter the path to your htmerge program here, e.g. /usr/local/bin/htmerge" );
   TQWhatsThis::add( htmergeBin, wtstr );
   TQWhatsThis::add( l, wtstr );
@@ -110,17 +110,17 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
 
   indexKDE = new TQCheckBox(i18n("&TDE help"), gb);
   vvbox->addWidget(indexKDE);
-  connect(indexKDE, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+  connect(indexKDE, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
 
   indexMan = new TQCheckBox(i18n("&Man pages"), gb);
   vvbox->addWidget(indexMan);
   indexMan->setEnabled(false),
-  connect(indexMan, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+  connect(indexMan, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
 
   indexInfo = new TQCheckBox(i18n("&Info pages"), gb);
   vvbox->addWidget(indexInfo);
   indexInfo->setEnabled(false);
-  connect(indexInfo, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+  connect(indexInfo, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
 
   gb = new TQGroupBox(i18n("Additional Search Paths"), this);
   hbox->addWidget(gb);
@@ -159,12 +159,12 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
   TQWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) );
   runButton->setFixedSize(runButton->sizeHint());
   vbox->addWidget(runButton, AlignRight);
-  connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex()));
+  connect(runButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(generateIndex()));
 
-  connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addClicked()));
-  connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delClicked()));
-  connect(searchPaths, TQT_SIGNAL(highlighted(const TQString &)),
-      this, TQT_SLOT(pathSelected(const TQString &)));
+  connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addClicked()));
+  connect(delButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(delClicked()));
+  connect(searchPaths, TQ_SIGNAL(highlighted(const TQString &)),
+      this, TQ_SLOT(pathSelected(const TQString &)));
 
   checkButtons();
 
@@ -345,8 +345,8 @@ void TDEHTMLSearchConfig::generateIndex()
   indexProc = new TDEProcess;
   *indexProc << exe << "--lang" << language->currentTag();
 
-  connect(indexProc, TQT_SIGNAL(processExited(TDEProcess *)),
-      this, TQT_SLOT(indexTerminated(TDEProcess *)));
+  connect(indexProc, TQ_SIGNAL(processExited(TDEProcess *)),
+      this, TQ_SLOT(indexTerminated(TDEProcess *)));
 
   runButton->setEnabled(false);
 
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h
index 28445437a..72ae1c396 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.h
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h
@@ -35,7 +35,7 @@ class KURLRequester;
 
 class TDEHTMLSearchConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/khelpcenter/htmlsearch/klangcombo.h b/khelpcenter/htmlsearch/klangcombo.h
index 4ca6e2f3b..7b07fee03 100644
--- a/khelpcenter/htmlsearch/klangcombo.h
+++ b/khelpcenter/htmlsearch/klangcombo.h
@@ -34,7 +34,7 @@
  */
 class KLanguageCombo : public KTagComboBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KLanguageCombo(TQWidget *parent=0, const char *name=0);
diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp
index b3c70915c..be9975d7a 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.cpp
+++ b/khelpcenter/htmlsearch/ktagcombobox.cpp
@@ -98,10 +98,10 @@ void KTagComboBox::clear()
   delete old_popup;
   old_popup = popup;
   popup = new TQPopupMenu(this);
-  connect( popup, TQT_SIGNAL(activated(int)),
-                        TQT_SLOT(internalActivate(int)) );
-  connect( popup, TQT_SIGNAL(highlighted(int)),
-                        TQT_SLOT(internalHighlight(int)) );
+  connect( popup, TQ_SIGNAL(activated(int)),
+                        TQ_SLOT(internalActivate(int)) );
+  connect( popup, TQ_SIGNAL(highlighted(int)),
+                        TQ_SLOT(internalHighlight(int)) );
 }
 
 int KTagComboBox::count() const
@@ -176,10 +176,10 @@ void KTagComboBox::insertSubmenu(const TQString &text, const TQString &tag, cons
   checkInsertPos(pi, text, index);
   pi->insertItem(text, p, count(), index);
   tags->append(tag);
-  connect( p, TQT_SIGNAL(activated(int)),
-                        TQT_SLOT(internalActivate(int)) );
-  connect( p, TQT_SIGNAL(highlighted(int)),
-                        TQT_SLOT(internalHighlight(int)) );
+  connect( p, TQ_SIGNAL(activated(int)),
+                        TQ_SLOT(internalActivate(int)) );
+  connect( p, TQ_SIGNAL(highlighted(int)),
+                        TQ_SLOT(internalHighlight(int)) );
 }
 
 void KTagComboBox::paintEvent( TQPaintEvent * ev)
diff --git a/khelpcenter/htmlsearch/ktagcombobox.h b/khelpcenter/htmlsearch/ktagcombobox.h
index df58120ce..c28336f21 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.h
+++ b/khelpcenter/htmlsearch/ktagcombobox.h
@@ -37,7 +37,7 @@ class TQPopupMenu;
  */
 class KTagComboBox : public QComboBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KTagComboBox(TQWidget *parent=0, const char *name=0);
diff --git a/khelpcenter/htmlsearch/progressdialog.h b/khelpcenter/htmlsearch/progressdialog.h
index 9ab5660d9..f39a0d83e 100644
--- a/khelpcenter/htmlsearch/progressdialog.h
+++ b/khelpcenter/htmlsearch/progressdialog.h
@@ -12,7 +12,7 @@ class KProgress;
 class ProgressDialog : public KDialogBase
 {
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp
index 230a7eb69..d7af38c07 100644
--- a/khelpcenter/htmlsearchconfig.cpp
+++ b/khelpcenter/htmlsearchconfig.cpp
@@ -61,8 +61,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name)
   url->setText(i18n("ht://dig home page"));
   url->setAlignment(TQLabel::AlignHCenter);
   grid->addMultiCellWidget(url, 2,2, 0, 1);
-  connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
-      this, TQT_SLOT(urlClicked(const TQString&)));
+  connect(url, TQ_SIGNAL(leftClickedURL(const TQString&)),
+      this, TQ_SLOT(urlClicked(const TQString&)));
 
   gb = new TQGroupBox(i18n("Program Locations"), this);
 
@@ -75,8 +75,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name)
   l->setBuddy( mHtsearchUrl );
   grid->addWidget(l, 1,0);
   grid->addWidget(mHtsearchUrl, 1,1);
-  connect( mHtsearchUrl->lineEdit(), TQT_SIGNAL( textChanged( const TQString & ) ),
-           TQT_SIGNAL( changed() ) );
+  connect( mHtsearchUrl->lineEdit(), TQ_SIGNAL( textChanged( const TQString & ) ),
+           TQ_SIGNAL( changed() ) );
   TQString wtstr = i18n( "Enter the URL of the htsearch CGI program." );
   TQWhatsThis::add( mHtsearchUrl, wtstr );
   TQWhatsThis::add( l, wtstr );
@@ -86,8 +86,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name)
   l->setBuddy( mIndexerBin );
   grid->addWidget(l, 2,0);
   grid->addWidget(mIndexerBin, 2,1);
-  connect( mIndexerBin->lineEdit(), TQT_SIGNAL( textChanged( const TQString & ) ),
-           TQT_SIGNAL( changed() ) );
+  connect( mIndexerBin->lineEdit(), TQ_SIGNAL( textChanged( const TQString & ) ),
+           TQ_SIGNAL( changed() ) );
   wtstr = i18n( "Enter the path to your htdig indexer program here." );
   TQWhatsThis::add( mIndexerBin, wtstr );
   TQWhatsThis::add( l, wtstr );
@@ -98,8 +98,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name)
   l->setBuddy( mDbDir );
   grid->addWidget(l, 3,0);
   grid->addWidget(mDbDir, 3,1);
-  connect( mDbDir->lineEdit(), TQT_SIGNAL( textChanged( const TQString & ) ),
-           TQT_SIGNAL( changed() ) );
+  connect( mDbDir->lineEdit(), TQ_SIGNAL( textChanged( const TQString & ) ),
+           TQ_SIGNAL( changed() ) );
   wtstr = i18n( "Enter the path to the htdig database folder." );
   TQWhatsThis::add( mDbDir, wtstr );
   TQWhatsThis::add( l, wtstr );
diff --git a/khelpcenter/htmlsearchconfig.h b/khelpcenter/htmlsearchconfig.h
index 27cff3d91..7cb5fc00a 100644
--- a/khelpcenter/htmlsearchconfig.h
+++ b/khelpcenter/htmlsearchconfig.h
@@ -30,7 +30,7 @@ namespace KHC {
 
 class HtmlSearchConfig : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     HtmlSearchConfig(TQWidget *parent = 0L, const char *name = 0L);
     virtual ~HtmlSearchConfig();
diff --git a/khelpcenter/infotree.h b/khelpcenter/infotree.h
index 71be683d6..e4fc4fd44 100644
--- a/khelpcenter/infotree.h
+++ b/khelpcenter/infotree.h
@@ -29,7 +29,7 @@ namespace KHC
   class NavigatorItem;
   class InfoTree : public TreeBuilder
   {
-    Q_OBJECT
+    TQ_OBJECT
     public:
       InfoTree( TQObject *parent, const char *name = 0 );
 
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index bb3c69db6..e5b2d0937 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -73,7 +73,7 @@ IndexDirDialog::IndexDirDialog( TQWidget *parent )
   urlLayout->addWidget( mIndexUrlRequester );
 
   mIndexUrlRequester->setURL( Prefs::indexDirectory() );
-  connect(mIndexUrlRequester->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(slotUrlChanged( const TQString &)));
+  connect(mIndexUrlRequester->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(slotUrlChanged( const TQString &)));
   slotUrlChanged( mIndexUrlRequester->lineEdit()->text() );
 }
 
@@ -120,13 +120,13 @@ IndexProgressDialog::IndexProgressDialog( TQWidget *parent )
   buttonLayout->addStretch( 1 );
 
   mDetailsButton = new TQPushButton( this );
-  connect( mDetailsButton, TQT_SIGNAL( clicked() ), TQT_SLOT( toggleDetails() ) );
+  connect( mDetailsButton, TQ_SIGNAL( clicked() ), TQ_SLOT( toggleDetails() ) );
   buttonLayout->addWidget( mDetailsButton );
 
   hideDetails();
 
   mEndButton = new TQPushButton( this );
-  connect( mEndButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEnd() ) );
+  connect( mEndButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEnd() ) );
   buttonLayout->addWidget( mEndButton );
 
   setFinished( false );
@@ -279,8 +279,8 @@ void KCMHelpCenter::setupMainWidget( TQWidget *parent )
   mListView->addColumn( i18n("Status") );
   mListView->setColumnAlignment( 1, AlignCenter );
   topLayout->addWidget( mListView );
-  connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-    TQT_SLOT( checkSelection() ) );
+  connect( mListView, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+    TQ_SLOT( checkSelection() ) );
 
   TQBoxLayout *urlLayout = new TQHBoxLayout( topLayout );
 
@@ -291,7 +291,7 @@ void KCMHelpCenter::setupMainWidget( TQWidget *parent )
   urlLayout->addWidget( mIndexDirLabel, 1 );
 
   TQPushButton *button = new TQPushButton( i18n("Change..."), parent );
-  connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showIndexDirDialog() ) );
+  connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showIndexDirDialog() ) );
   urlLayout->addWidget( button );
 
   TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout );
@@ -446,10 +446,10 @@ bool KCMHelpCenter::buildIndex()
 
   if ( !mProgressDialog ) {
     mProgressDialog = new IndexProgressDialog( this );
-    connect( mProgressDialog, TQT_SIGNAL( cancelled() ),
-             TQT_SLOT( cancelBuildIndex() ) );
-    connect( mProgressDialog, TQT_SIGNAL( closed() ),
-             TQT_SLOT( slotProgressClosed() ) );
+    connect( mProgressDialog, TQ_SIGNAL( cancelled() ),
+             TQ_SLOT( cancelBuildIndex() ) );
+    connect( mProgressDialog, TQ_SIGNAL( closed() ),
+             TQ_SLOT( slotProgressClosed() ) );
   }
   mProgressDialog->setLabelText( name );
   mProgressDialog->setTotalSteps( mIndexQueue.count() );
@@ -476,12 +476,12 @@ void KCMHelpCenter::startIndexProcess()
   *mProcess << mCmdFile->name();
   *mProcess << Prefs::indexDirectory();
 
-  connect( mProcess, TQT_SIGNAL( processExited( TDEProcess * ) ),
-           TQT_SLOT( slotIndexFinished( TDEProcess * ) ) );
-  connect( mProcess, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
-           TQT_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) );
-  connect( mProcess, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
-           TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
+  connect( mProcess, TQ_SIGNAL( processExited( TDEProcess * ) ),
+           TQ_SLOT( slotIndexFinished( TDEProcess * ) ) );
+  connect( mProcess, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+           TQ_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) );
+  connect( mProcess, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+           TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
 
   if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
     kdError() << "KCMHelpcenter::startIndexProcess(): Failed to start process."
diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h
index b3205ad77..0a28f5f98 100644
--- a/khelpcenter/kcmhelpcenter.h
+++ b/khelpcenter/kcmhelpcenter.h
@@ -47,7 +47,7 @@ class SearchEngine;
 
 class IndexDirDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     IndexDirDialog( TQWidget *parent );
 
@@ -60,7 +60,7 @@ class IndexDirDialog : public KDialogBase
 
 class IndexProgressDialog : public KDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     IndexProgressDialog( TQWidget *parent );
     ~IndexProgressDialog();
@@ -105,7 +105,7 @@ class KCMHelpCenterIface : virtual public DCOPObject
 
 class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     KCMHelpCenter( KHC::SearchEngine *, TQWidget *parent = 0,
       const char *name = 0 );
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index 6fac581c2..dd0ee5811 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -91,12 +91,12 @@ void IndexBuilder::processCmdQueue()
   *proc << args;
 
 
-  connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
-           TQT_SLOT( slotProcessExited( TDEProcess * ) ) );
-  connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ),
-           TQT_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) );
-  connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int ) ),
-           TQT_SLOT( slotReceivedStderr(TDEProcess *, char *, int ) ) );
+  connect( proc, TQ_SIGNAL( processExited( TDEProcess * ) ),
+           TQ_SLOT( slotProcessExited( TDEProcess * ) ) );
+  connect( proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ),
+           TQ_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) );
+  connect( proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int ) ),
+           TQ_SLOT( slotReceivedStderr(TDEProcess *, char *, int ) ) );
 
   mCmdQueue.remove( it );
 
@@ -211,7 +211,7 @@ int main( int argc, char **argv )
 
   IndexBuilder builder(cmdFile);
 
-  TQTimer::singleShot(0, &builder, TQT_SLOT(buildIndices()));
+  TQTimer::singleShot(0, &builder, TQ_SLOT(buildIndices()));
 
   return app.exec();
 }
diff --git a/khelpcenter/khc_indexbuilder.h b/khelpcenter/khc_indexbuilder.h
index 9dd0b3d71..8cbaf6b00 100644
--- a/khelpcenter/khc_indexbuilder.h
+++ b/khelpcenter/khc_indexbuilder.h
@@ -30,9 +30,9 @@ class TDEProcess;
 
 namespace KHC {
 
-class IndexBuilder : public QObject
+class IndexBuilder : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     IndexBuilder(const TQString& cmdFile);
 
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index 8a79b536c..0bfc80118 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -90,37 +90,37 @@ MainWindow::MainWindow()
 {
     mSplitter = new TQSplitter( this );
 
-    mDoc = new View( mSplitter, 0, TQT_TQOBJECT(this), 0, TDEHTMLPart::DefaultGUI, actionCollection() );
-    connect( mDoc, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
-             TQT_SLOT( setCaption( const TQString & ) ) );
-    connect( mDoc, TQT_SIGNAL( setStatusBarText( const TQString & ) ),
-             TQT_SLOT( statusBarMessage( const TQString & ) ) );
-    connect( mDoc, TQT_SIGNAL( onURL( const TQString & ) ),
-             TQT_SLOT( statusBarMessage( const TQString & ) ) );
-    connect( mDoc, TQT_SIGNAL( started( TDEIO::Job * ) ),
-             TQT_SLOT( slotStarted( TDEIO::Job * ) ) );
-    connect( mDoc, TQT_SIGNAL( completed() ),
-             TQT_SLOT( documentCompleted() ) );
-    connect( mDoc, TQT_SIGNAL( searchResultCacheAvailable() ),
-             TQT_SLOT( enableLastSearchAction() ) );
-
-    connect( mDoc, TQT_SIGNAL( selectionChanged() ),
-             TQT_SLOT( enableCopyTextAction() ) );
+    mDoc = new View( mSplitter, 0, this, 0, TDEHTMLPart::DefaultGUI, actionCollection() );
+    connect( mDoc, TQ_SIGNAL( setWindowCaption( const TQString & ) ),
+             TQ_SLOT( setCaption( const TQString & ) ) );
+    connect( mDoc, TQ_SIGNAL( setStatusBarText( const TQString & ) ),
+             TQ_SLOT( statusBarMessage( const TQString & ) ) );
+    connect( mDoc, TQ_SIGNAL( onURL( const TQString & ) ),
+             TQ_SLOT( statusBarMessage( const TQString & ) ) );
+    connect( mDoc, TQ_SIGNAL( started( TDEIO::Job * ) ),
+             TQ_SLOT( slotStarted( TDEIO::Job * ) ) );
+    connect( mDoc, TQ_SIGNAL( completed() ),
+             TQ_SLOT( documentCompleted() ) );
+    connect( mDoc, TQ_SIGNAL( searchResultCacheAvailable() ),
+             TQ_SLOT( enableLastSearchAction() ) );
+
+    connect( mDoc, TQ_SIGNAL( selectionChanged() ),
+             TQ_SLOT( enableCopyTextAction() ) );
 
     statusBar()->insertItem(i18n("Preparing Index"), 0, 1);
     statusBar()->setItemAlignment(0, AlignLeft | AlignVCenter);
 
     connect( mDoc->browserExtension(),
-             TQT_SIGNAL( openURLRequest( const KURL &,
+             TQ_SIGNAL( openURLRequest( const KURL &,
                                      const KParts::URLArgs & ) ),
-             TQT_SLOT( slotOpenURLRequest( const KURL &,
+             TQ_SLOT( slotOpenURLRequest( const KURL &,
                                        const KParts::URLArgs & ) ) );
 
     mNavigator = new Navigator( mDoc, mSplitter, "nav" );
-    connect( mNavigator, TQT_SIGNAL( itemSelected( const TQString & ) ),
-             TQT_SLOT( viewUrl( const TQString & ) ) );
-    connect( mNavigator, TQT_SIGNAL( glossSelected( const GlossaryEntry & ) ),
-             TQT_SLOT( slotGlossSelected( const GlossaryEntry & ) ) );
+    connect( mNavigator, TQ_SIGNAL( itemSelected( const TQString & ) ),
+             TQ_SLOT( viewUrl( const TQString & ) ) );
+    connect( mNavigator, TQ_SIGNAL( glossSelected( const GlossaryEntry & ) ),
+             TQ_SLOT( slotGlossSelected( const GlossaryEntry & ) ) );
 
     mSplitter->moveToFirst(mNavigator);
     mSplitter->setResizeMode(mNavigator, TQSplitter::KeepSize);
@@ -150,10 +150,10 @@ MainWindow::MainWindow()
 
     History::self().installMenuBarHook( this );
 
-    connect( &History::self(), TQT_SIGNAL( goInternalUrl( const KURL & ) ),
-             mNavigator, TQT_SLOT( openInternalUrl( const KURL & ) ) );
-    connect( &History::self(), TQT_SIGNAL( goUrl( const KURL & ) ),
-             mNavigator, TQT_SLOT( selectItem( const KURL & ) ) );
+    connect( &History::self(), TQ_SIGNAL( goInternalUrl( const KURL & ) ),
+             mNavigator, TQ_SLOT( openInternalUrl( const KURL & ) ) );
+    connect( &History::self(), TQ_SIGNAL( goUrl( const KURL & ) ),
+             mNavigator, TQ_SLOT( selectItem( const KURL & ) ) );
 
     statusBarMessage(i18n("Ready"));
     enableCopyTextAction();
@@ -208,48 +208,48 @@ void MainWindow::writeConfig()
 
 void MainWindow::setupActions()
 {
-    KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
-    KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection(),
+    KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() );
+    KStdAction::print( this, TQ_SLOT( print() ), actionCollection(),
                        "printFrame" );
 
-    TDEAction *prevPage  = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQT_SLOT( prevPage() ),
+    TDEAction *prevPage  = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQ_SLOT( prevPage() ),
                          actionCollection(), "prevPage" );
     prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) );
 
-    TDEAction *nextPage  = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, TQT_SLOT( nextPage() ),
+    TDEAction *nextPage  = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, TQ_SLOT( nextPage() ),
                          actionCollection(), "nextPage" );
     nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) );
 
-    TDEAction *home = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( slotShowHome() ), actionCollection() );
+    TDEAction *home = KStdAction::home( this, TQ_SLOT( slotShowHome() ), actionCollection() );
     home->setText(i18n("Table of &Contents"));
     home->setToolTip(i18n("Table of contents"));
     home->setWhatsThis(i18n("Go back to the table of contents"));
 
-    mCopyText = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelectedText()), actionCollection(), "copy_text");
+    mCopyText = KStdAction::copy( this, TQ_SLOT(slotCopySelectedText()), actionCollection(), "copy_text");
 
-    mLastSearchAction = new TDEAction( i18n("&Last Search Result"), 0, TQT_TQOBJECT(this),
-                                     TQT_SLOT( slotLastSearch() ),
+    mLastSearchAction = new TDEAction( i18n("&Last Search Result"), 0, this,
+                                     TQ_SLOT( slotLastSearch() ),
                                      actionCollection(), "lastsearch" );
     mLastSearchAction->setEnabled( false );
 
-    new TDEAction( i18n("Build Search Index..."), 0, TQT_TQOBJECT(mNavigator),
-      TQT_SLOT( showIndexDialog() ), actionCollection(), "build_index" );
-    KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ),
+    new TDEAction( i18n("Build Search Index..."), 0, mNavigator,
+      TQ_SLOT( showIndexDialog() ), actionCollection(), "build_index" );
+    KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ),
       actionCollection() );
 
     TDEConfig *cfg = TDEGlobal::config();
     cfg->setGroup( "Debug" );
     if ( cfg->readBoolEntry( "SearchErrorLog", false ) ) {
-      new TDEAction( i18n("Show Search Error Log"), 0, TQT_TQOBJECT(this),
-                   TQT_SLOT( showSearchStderr() ), actionCollection(),
+      new TDEAction( i18n("Show Search Error Log"), 0, this,
+                   TQ_SLOT( showSearchStderr() ), actionCollection(),
                    "show_search_stderr" );
     }
 
     History::self().setupActions( actionCollection() );
 
-    new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" );
-    new TDEAction( i18n( "Increase Font Sizes" ), "zoom-in", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" );
-    new TDEAction( i18n( "Decrease Font Sizes" ), "zoom-out", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" );
+    new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), this, TQ_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" );
+    new TDEAction( i18n( "Increase Font Sizes" ), "zoom-in", TDEShortcut(), this, TQ_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" );
+    new TDEAction( i18n( "Decrease Font Sizes" ), "zoom-out", TDEShortcut(), this, TQ_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" );
 }
 
 void MainWindow::slotCopySelectedText()
@@ -265,8 +265,8 @@ void MainWindow::print()
 void MainWindow::slotStarted(TDEIO::Job *job)
 {
     if (job)
-       connect(job, TQT_SIGNAL(infoMessage( TDEIO::Job *, const TQString &)),
-               TQT_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &)));
+       connect(job, TQ_SIGNAL(infoMessage( TDEIO::Job *, const TQString &)),
+               TQ_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &)));
 
     History::self().updateActions();
 }
diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h
index 8db9247a3..22b07cdca 100644
--- a/khelpcenter/mainwindow.h
+++ b/khelpcenter/mainwindow.h
@@ -24,7 +24,7 @@ class View;
 
 class MainWindow : public TDEMainWindow, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
   public:
     MainWindow();
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index f8e4c2b62..8b10688cd 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -85,8 +85,8 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
     mShowMissingDocs = config->readBoolEntry("ShowMissingDocs",false);
 
     mSearchEngine = new SearchEngine( view );
-    connect( mSearchEngine, TQT_SIGNAL( searchFinished() ),
-             TQT_SLOT( slotSearchFinished() ) );
+    connect( mSearchEngine, TQ_SIGNAL( searchFinished() ),
+             TQ_SLOT( slotSearchFinished() ) );
 
     DocMetaInfo::self()->scanMetaInfo();
 
@@ -103,18 +103,18 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
     clearButton->setIconSet( TDEApplication::reverseLayout() ?
       SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") );
     searchLayout->addWidget( clearButton );
-    connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( clearSearch() ) );
+    connect( clearButton, TQ_SIGNAL( clicked() ), TQ_SLOT( clearSearch() ) );
     TQToolTip::add( clearButton, i18n("Clear search") );
 
     mSearchEdit = new TQLineEdit( mSearchFrame );
     searchLayout->addWidget( mSearchEdit );
-    connect( mSearchEdit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotSearch() ) );
-    connect( mSearchEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-             TQT_SLOT( checkSearchButton() ) );
+    connect( mSearchEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotSearch() ) );
+    connect( mSearchEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+             TQ_SLOT( checkSearchButton() ) );
 
     mSearchButton = new TQPushButton( i18n("&Search"), mSearchFrame );
     searchLayout->addWidget( mSearchButton );
-    connect( mSearchButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSearch() ) );
+    connect( mSearchButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSearch() ) );
 
     clearButton->setFixedHeight( mSearchButton->height() );
 
@@ -134,8 +134,8 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
       mSearchWidget->readConfig( TDEGlobal::config() );
     }
 
-    connect( mTabWidget, TQT_SIGNAL( currentChanged( QWidget * ) ),
-             TQT_SLOT( slotTabChanged( QWidget * ) ) );
+    connect( mTabWidget, TQ_SIGNAL( currentChanged( TQWidget * ) ),
+             TQ_SLOT( slotTabChanged( TQWidget * ) ) );
 }
 
 Navigator::~Navigator()
@@ -168,22 +168,22 @@ void Navigator::setupContentsTab()
     mContentsTree->setRootIsDecorated(false);
     mContentsTree->setSorting(-1, false);
 
-    connect(mContentsTree, TQT_SIGNAL(clicked(TQListViewItem*)),
-            TQT_SLOT(slotItemSelected(TQListViewItem*)));
-    connect(mContentsTree, TQT_SIGNAL(returnPressed(TQListViewItem*)),
-           TQT_SLOT(slotItemSelected(TQListViewItem*)));
+    connect(mContentsTree, TQ_SIGNAL(clicked(TQListViewItem*)),
+            TQ_SLOT(slotItemSelected(TQListViewItem*)));
+    connect(mContentsTree, TQ_SIGNAL(returnPressed(TQListViewItem*)),
+           TQ_SLOT(slotItemSelected(TQListViewItem*)));
     mTabWidget->addTab(mContentsTree, i18n("&Contents"));
 }
 
 void Navigator::setupSearchTab()
 {
     mSearchWidget = new SearchWidget( mSearchEngine, mTabWidget );
-    connect( mSearchWidget, TQT_SIGNAL( searchResult( const TQString & ) ),
-             TQT_SLOT( slotShowSearchResult( const TQString & ) ) );
-    connect( mSearchWidget, TQT_SIGNAL( scopeCountChanged( int ) ),
-             TQT_SLOT( checkSearchButton() ) );
-    connect( mSearchWidget, TQT_SIGNAL( showIndexDialog() ),
-      TQT_SLOT( showIndexDialog() ) );
+    connect( mSearchWidget, TQ_SIGNAL( searchResult( const TQString & ) ),
+             TQ_SLOT( slotShowSearchResult( const TQString & ) ) );
+    connect( mSearchWidget, TQ_SIGNAL( scopeCountChanged( int ) ),
+             TQ_SLOT( checkSearchButton() ) );
+    connect( mSearchWidget, TQ_SIGNAL( showIndexDialog() ),
+      TQ_SLOT( showIndexDialog() ) );
 
     mTabWidget->addTab( mSearchWidget, i18n("Search Options"));
 }
@@ -191,8 +191,8 @@ void Navigator::setupSearchTab()
 void Navigator::setupGlossaryTab()
 {
     mGlossaryTree = new Glossary( mTabWidget );
-    connect( mGlossaryTree, TQT_SIGNAL( entrySelected( const GlossaryEntry & ) ),
-             this, TQT_SIGNAL( glossSelected( const GlossaryEntry & ) ) );
+    connect( mGlossaryTree, TQ_SIGNAL( entrySelected( const GlossaryEntry & ) ),
+             this, TQ_SIGNAL( glossSelected( const GlossaryEntry & ) ) );
     mTabWidget->addTab( mGlossaryTree, i18n( "G&lossary" ) );
 }
 
@@ -294,14 +294,14 @@ void Navigator::createItemFromDesktopFile( NavigatorItem *topItem,
 
 void Navigator::insertInfoDocs( NavigatorItem *topItem )
 {
-  InfoTree *infoTree = new InfoTree( TQT_TQOBJECT(this) );
+  InfoTree *infoTree = new InfoTree( this );
   infoTree->build( topItem );
 }
 
 NavigatorItem *Navigator::insertScrollKeeperDocs( NavigatorItem *topItem,
                                                   NavigatorItem *after )
 {
-  ScrollKeeperTreeBuilder *builder = new ScrollKeeperTreeBuilder( TQT_TQOBJECT(this) );
+  ScrollKeeperTreeBuilder *builder = new ScrollKeeperTreeBuilder( this );
   return builder->build( topItem, after );
 }
 
@@ -556,7 +556,7 @@ void Navigator::slotSearch()
 
   // disable search Button during searches
   mSearchButton->setEnabled(false);
-  TQApplication::setOverrideCursor(tqwaitCursor);
+  TQApplication::setOverrideCursor(TQt::waitCursor);
 
   if ( !mSearchEngine->search( words, method, pages, scope ) ) {
     slotSearchFinished();
@@ -643,8 +643,8 @@ void Navigator::showIndexDialog()
 {
   if ( !mIndexDialog ) {
     mIndexDialog = new KCMHelpCenter( mSearchEngine, this );
-    connect( mIndexDialog, TQT_SIGNAL( searchIndexUpdated() ), mSearchWidget,
-             TQT_SLOT( updateScopeList() ) );
+    connect( mIndexDialog, TQ_SIGNAL( searchIndexUpdated() ), mSearchWidget,
+             TQ_SLOT( updateScopeList() ) );
   }
   mIndexDialog->show();
   mIndexDialog->raise();
diff --git a/khelpcenter/navigator.h b/khelpcenter/navigator.h
index 88769ceef..798f71101 100644
--- a/khelpcenter/navigator.h
+++ b/khelpcenter/navigator.h
@@ -54,7 +54,7 @@ class Formatter;
 
 class Navigator : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     Navigator(View *, TQWidget *parent=0, const char *name=0);
     virtual ~Navigator();
diff --git a/khelpcenter/plugins/CMakeLists.txt b/khelpcenter/plugins/CMakeLists.txt
index 54b806127..da976193a 100644
--- a/khelpcenter/plugins/CMakeLists.txt
+++ b/khelpcenter/plugins/CMakeLists.txt
@@ -18,7 +18,8 @@ tde_create_translated_desktop(
     applets.desktop contact.desktop faq.desktop info.desktop
     links.desktop support.desktop userguide.desktop welcome.desktop
     hardwaremodules.desktop kcontrolmodules.desktop konqplugins.desktop
-    tdeioslaves.desktop quickstart.desktop visualdict.desktop adminguide.desktop
+    tdeioslaves.desktop quickstart.desktop releasenotes.desktop
+    visualdict.desktop adminguide.desktop
   DESTINATION ${DATA_INSTALL_DIR}/khelpcenter/plugins
   PO_DIR khelpcenter-desktops
 )
diff --git a/khelpcenter/plugins/Makefile.am b/khelpcenter/plugins/Makefile.am
index f9c4f477a..979be4a92 100644
--- a/khelpcenter/plugins/Makefile.am
+++ b/khelpcenter/plugins/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS = Applications Manpages
 plugin_DATA = applets.desktop contact.desktop faq.desktop info.desktop \
   links.desktop support.desktop userguide.desktop welcome.desktop \
   kicmodules.desktop kcontrolmodules.desktop konqplugins.desktop \
-  tdeioslaves.desktop quickstart.desktop visualdict.desktop adminguide.desktop
+  tdeioslaves.desktop quickstart.desktop releasenotes.desktop \
+  visualdict.desktop adminguide.desktop
 
 plugindir = $(kde_datadir)/khelpcenter/plugins
diff --git a/khelpcenter/plugins/releasenotes.desktop b/khelpcenter/plugins/releasenotes.desktop
new file mode 100644
index 000000000..e834fad6c
--- /dev/null
+++ b/khelpcenter/plugins/releasenotes.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+X-DocPath=help:/khelpcenter/releasenotes
+X-DOC-Weight=-1800
+Icon=kmenu
+
+Name=TDE Release Notes
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index c16da7d50..7d54f0f63 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -61,7 +61,7 @@ NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent,
   KProcIO proc;
   proc << "scrollkeeper-get-content-list";
   proc << lang;
-  connect(&proc,TQT_SIGNAL(readReady(KProcIO *)),TQT_SLOT(getContentsList(KProcIO *)));
+  connect(&proc,TQ_SIGNAL(readReady(KProcIO *)),TQ_SLOT(getContentsList(KProcIO *)));
   if (!proc.start(TDEProcess::Block)) {
     kdDebug(1400) << "Could not execute scrollkeeper-get-content-list" << endl;
     return 0;
diff --git a/khelpcenter/scrollkeepertreebuilder.h b/khelpcenter/scrollkeepertreebuilder.h
index 4b2c6c11e..cca8a2c22 100644
--- a/khelpcenter/scrollkeepertreebuilder.h
+++ b/khelpcenter/scrollkeepertreebuilder.h
@@ -33,7 +33,7 @@ namespace KHC {
 
 class ScrollKeeperTreeBuilder : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     ScrollKeeperTreeBuilder( TQObject *parent, const char *name = 0 );
 
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index 07aa81535..6dde748a9 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -97,10 +97,10 @@ void SearchTraverser::connectHandler( SearchHandler *handler )
   int count = 0;
   if ( it != mConnectCount.end() ) count = *it;
   if ( count == 0 ) {
-    connect( handler, TQT_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ),
-      TQT_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) );
-    connect( handler, TQT_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ),
-      TQT_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) );
+    connect( handler, TQ_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ),
+      TQ_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) );
+    connect( handler, TQ_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ),
+      TQ_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) );
   }
   mConnectCount[ handler ] = ++count;
 }
@@ -116,10 +116,10 @@ void SearchTraverser::disconnectHandler( SearchHandler *handler )
     int count = *it;
     --count;
     if ( count == 0 ) {
-      disconnect( handler, TQT_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ),
-        this, TQT_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) );
-      disconnect( handler, TQT_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ),
-        this, TQT_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) );
+      disconnect( handler, TQ_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ),
+        this, TQ_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) );
+      disconnect( handler, TQ_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ),
+        this, TQ_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) );
     }
     mConnectCount[ handler ] = count;
   }
@@ -352,12 +352,12 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
       *mProc << arg.utf8();
     }
 
-    connect( mProc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
-             TQT_SLOT( searchStdout( TDEProcess *, char *, int ) ) );
-    connect( mProc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
-             TQT_SLOT( searchStderr( TDEProcess *, char *, int ) ) );
-    connect( mProc, TQT_SIGNAL( processExited( TDEProcess * ) ),
-             TQT_SLOT( searchExited( TDEProcess * ) ) );
+    connect( mProc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+             TQ_SLOT( searchStdout( TDEProcess *, char *, int ) ) );
+    connect( mProc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+             TQ_SLOT( searchStderr( TDEProcess *, char *, int ) ) );
+    connect( mProc, TQ_SIGNAL( processExited( TDEProcess * ) ),
+             TQ_SLOT( searchExited( TDEProcess * ) ) );
 
     mSearchRunning = true;
     mSearchResult = "";
diff --git a/khelpcenter/searchengine.h b/khelpcenter/searchengine.h
index 57ba9368d..268954618 100644
--- a/khelpcenter/searchengine.h
+++ b/khelpcenter/searchengine.h
@@ -24,7 +24,7 @@ class SearchHandler;
 
 class SearchTraverser : public TQObject, public DocEntryTraverser
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     SearchTraverser( SearchEngine *engine, int level );
     ~SearchTraverser();
@@ -66,7 +66,7 @@ class SearchTraverser : public TQObject, public DocEntryTraverser
 
 class SearchEngine : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     enum Operation { And, Or };
 
diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp
index 54a0a9a38..a2eab853d 100644
--- a/khelpcenter/searchhandler.cpp
+++ b/khelpcenter/searchhandler.cpp
@@ -114,12 +114,12 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
       *proc << arg.utf8();
     }
 
-    connect( proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
-             TQT_SLOT( searchStdout( TDEProcess *, char *, int ) ) );
-    connect( proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
-             TQT_SLOT( searchStderr( TDEProcess *, char *, int ) ) );
-    connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
-             TQT_SLOT( searchExited( TDEProcess * ) ) );
+    connect( proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+             TQ_SLOT( searchStdout( TDEProcess *, char *, int ) ) );
+    connect( proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+             TQ_SLOT( searchStderr( TDEProcess *, char *, int ) ) );
+    connect( proc, TQ_SIGNAL( processExited( TDEProcess * ) ),
+             TQ_SLOT( searchExited( TDEProcess * ) ) );
 
     SearchJob *searchJob = new SearchJob;
     searchJob->mEntry = entry;
@@ -139,10 +139,10 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
     kdDebug() << "SearchHandler::search() URL: " << urlString << endl;
   
     TDEIO::TransferJob *job = TDEIO::get( KURL( urlString ) );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
-    connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-             TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+             TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
 
     SearchJob *searchJob = new SearchJob;
     searchJob->mEntry = entry;
diff --git a/khelpcenter/searchhandler.h b/khelpcenter/searchhandler.h
index 31c3adb1f..b580d0ebb 100644
--- a/khelpcenter/searchhandler.h
+++ b/khelpcenter/searchhandler.h
@@ -47,9 +47,9 @@ class SearchJob
     TQString mError;
 };
 
-class SearchHandler : public QObject
+class SearchHandler : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     static SearchHandler *initFromFile( const TQString &filename );
 
diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp
index c4ceb20be..176db92c7 100644
--- a/khelpcenter/searchwidget.cpp
+++ b/khelpcenter/searchwidget.cpp
@@ -81,8 +81,8 @@ SearchWidget::SearchWidget( SearchEngine *engine, TQWidget *parent )
   for (int i=0; i < ScopeNum; ++i ) {
     mScopeCombo->insertItem( scopeSelectionLabel( i ) );
   }
-  connect( mScopeCombo, TQT_SIGNAL( activated( int ) ),
-           TQT_SLOT( scopeSelectionChanged( int ) ) );
+  connect( mScopeCombo, TQ_SIGNAL( activated( int ) ),
+           TQ_SLOT( scopeSelectionChanged( int ) ) );
 
   l = new TQLabel( mScopeCombo, i18n("&Scope selection:"), this );
 
@@ -96,16 +96,16 @@ SearchWidget::SearchWidget( SearchEngine *engine, TQWidget *parent )
 
   TQPushButton *indexButton = new TQPushButton( i18n("Build Search &Index..."),
                                               this );
-  connect( indexButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( showIndexDialog() ) );
+  connect( indexButton, TQ_SIGNAL( clicked() ), TQ_SIGNAL( showIndexDialog() ) );
   topLayout->addWidget( indexButton );
 
 // FIXME: Use SearchHandler on double-clicked document
 #if 0
-  connect( mScopeListView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-           TQT_SLOT( scopeDoubleClicked( TQListViewItem * ) ) );
+  connect( mScopeListView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+           TQ_SLOT( scopeDoubleClicked( TQListViewItem * ) ) );
 #endif
-  connect( mScopeListView, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-           TQT_SLOT( scopeClicked( TQListViewItem * ) ) );
+  connect( mScopeListView, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+           TQ_SLOT( scopeClicked( TQListViewItem * ) ) );
 }
 
 
diff --git a/khelpcenter/searchwidget.h b/khelpcenter/searchwidget.h
index f9f394581..d6cd68729 100644
--- a/khelpcenter/searchwidget.h
+++ b/khelpcenter/searchwidget.h
@@ -44,7 +44,7 @@ class SearchEngine;
 
 class SearchWidget : public TQWidget, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
   k_dcop:
diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp
index 83083da9f..e1aaf10aa 100644
--- a/khelpcenter/toc.cpp
+++ b/khelpcenter/toc.cpp
@@ -133,8 +133,8 @@ int TOC::cachedCTime() const
 void TOC::buildCache()
 {
 	TDEProcess *meinproc = new TDEProcess;
-	connect( meinproc, TQT_SIGNAL( processExited( TDEProcess * ) ),
-	         this, TQT_SLOT( meinprocExited( TDEProcess * ) ) );
+	connect( meinproc, TQ_SIGNAL( processExited( TDEProcess * ) ),
+	         this, TQ_SLOT( meinprocExited( TDEProcess * ) ) );
 
 	*meinproc << locate( "exe", "meinproc" );
 	*meinproc << "--stylesheet" << locate( "data", "khelpcenter/table-of-contents.xslt" );
diff --git a/khelpcenter/toc.h b/khelpcenter/toc.h
index 72dc7d195..dba0921fc 100644
--- a/khelpcenter/toc.h
+++ b/khelpcenter/toc.h
@@ -30,9 +30,9 @@ class TDEProcess;
 
 namespace KHC {
 
-class TOC : public QObject
+class TOC : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		TOC( NavigatorItem *parentItem );
 
diff --git a/khelpcenter/treebuilder.h b/khelpcenter/treebuilder.h
index 00042589f..2e788e317 100644
--- a/khelpcenter/treebuilder.h
+++ b/khelpcenter/treebuilder.h
@@ -30,7 +30,7 @@ namespace KHC
 class NavigatorItem;
 class TreeBuilder : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		TreeBuilder( TQObject *parent, const char *name = 0 );
 
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index 725ce0455..49135e0b0 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -35,10 +35,10 @@ View::View( TQWidget *parentWidget, const char *widgetName,
 
     m_zoomStepping = 10;
 
-    connect( this, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
-             this, TQT_SLOT( setTitle( const TQString & ) ) );
-    connect( this, TQT_SIGNAL( popupMenu( const TQString &, const TQPoint& ) ),
-             this, TQT_SLOT( showMenu( const TQString &, const TQPoint& ) ) );
+    connect( this, TQ_SIGNAL( setWindowCaption( const TQString & ) ),
+             this, TQ_SLOT( setTitle( const TQString & ) ) );
+    connect( this, TQ_SIGNAL( popupMenu( const TQString &, const TQPoint& ) ),
+             this, TQ_SLOT( showMenu( const TQString &, const TQPoint& ) ) );
              
     TQString css = langLookup("common/tde-default.css");
     if (!css.isEmpty())
@@ -267,7 +267,7 @@ void View::showMenu( const TQString& url, const TQPoint& pos)
   }
   else
   {
-    pop->insertItem(i18n("Copy Link Address"), this, TQT_SLOT(slotCopyLink()));
+    pop->insertItem(i18n("Copy Link Address"), this, TQ_SLOT(slotCopyLink()));
     mCopyURL = completeURL(url).url();
   }
 	
@@ -329,7 +329,7 @@ bool View::eventFilter( TQObject *o, TQEvent *e )
        htmlDocument().links().length() == 0 )
     return TDEHTMLPart::eventFilter( o, e );
 
-  TQKeyEvent *ke = TQT_TQKEYEVENT( e );
+  TQKeyEvent *ke = static_cast<TQKeyEvent*>( e );
   if ( ke->state() & TQt::ShiftButton && ke->key() == Key_Space ) {
     // If we're on the first page, it does not make sense to go back.
     if ( baseURL().path().endsWith( "/index.html" ) )
diff --git a/khelpcenter/view.h b/khelpcenter/view.h
index 7742edae9..04b5af5e5 100644
--- a/khelpcenter/view.h
+++ b/khelpcenter/view.h
@@ -18,7 +18,7 @@ class Formatter;
 
 class View : public TDEHTMLPart
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     View( TQWidget *parentWidget, const char *widgetName,
           TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof,
diff --git a/khotkeys/README b/khotkeys/README
index 933ebc210..78d9d1014 100644
--- a/khotkeys/README
+++ b/khotkeys/README
@@ -97,7 +97,7 @@
     a .desktop file from the TDE Menu to execute (e.g. 'System/konsole.desktop')
   - DCOP call tab settings - enter the application, object, DCOP method and
     arguments (e.g. 'kdesktop', 'KBackgroundIface',
-    'setWallpaper(QString,int)' and '"/some/pic.jpg" 1')
+    'setWallpaper(TQString,int)' and '"/some/pic.jpg" 1')
   - Keyboard input tab settings - enter the keyboard input you want to be
     simulated ( no, sorry, the 'Edit' button doesn't really work yet ).
     The "keypresses" are separated by a colon ( ':' ) and are written
diff --git a/khotkeys/app/app.h b/khotkeys/app/app.h
index e23edfcb1..e0b3566ab 100644
--- a/khotkeys/app/app.h
+++ b/khotkeys/app/app.h
@@ -21,7 +21,7 @@ class Action_data_group;
 class KHotKeysApp
     : public KUniqueApplication
     {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
     k_dcop:
         ASYNC reread_configuration();
diff --git a/khotkeys/app/kded.h b/khotkeys/app/kded.h
index c0a1526ee..b2740a3a1 100644
--- a/khotkeys/app/kded.h
+++ b/khotkeys/app/kded.h
@@ -22,7 +22,7 @@ class Action_data_group;
 class KHotKeysModule
     : public KDEDModule
     {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
     k_dcop:
         ASYNC reread_configuration();
diff --git a/khotkeys/arts/soundrecorder_arts.cpp b/khotkeys/arts/soundrecorder_arts.cpp
index 0fdc48ab9..22732fa97 100644
--- a/khotkeys/arts/soundrecorder_arts.cpp
+++ b/khotkeys/arts/soundrecorder_arts.cpp
@@ -61,7 +61,7 @@ SoundRecorderArts::SoundRecorderArts(TQObject *parent, const char *name)
         ( void ) check;
 
 	m_recStream->usePolling( false );
-	connect( m_recStream, TQT_SIGNAL(data (TQByteArray &)), this, TQT_SLOT(slotDataReceived(TQByteArray& )));
+	connect( m_recStream, TQ_SIGNAL(data (TQByteArray &)), this, TQ_SLOT(slotDataReceived(TQByteArray& )));
 }
 
 SoundRecorderArts::~SoundRecorderArts()
@@ -80,7 +80,7 @@ void SoundRecorderArts::start()
 void SoundRecorderArts::stop()
 {
 	m_recStream->stop();
-	TQTimer::singleShot(400,this,TQT_SLOT(slotEmitSignal()));
+	TQTimer::singleShot(400,this,TQ_SLOT(slotEmitSignal()));
 }
 
 void SoundRecorderArts::abort()
diff --git a/khotkeys/arts/soundrecorder_arts.h b/khotkeys/arts/soundrecorder_arts.h
index 72e901832..7e279f9ee 100644
--- a/khotkeys/arts/soundrecorder_arts.h
+++ b/khotkeys/arts/soundrecorder_arts.h
@@ -38,7 +38,7 @@ namespace KHotKeys
 */
 class SoundRecorderArts : public SoundRecorder
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     SoundRecorderArts(TQObject *parent = 0, const char *name = 0);
     virtual ~SoundRecorderArts();
diff --git a/khotkeys/kcontrol/CMakeLists.txt b/khotkeys/kcontrol/CMakeLists.txt
index 5028763ce..902c5a0e6 100644
--- a/khotkeys/kcontrol/CMakeLists.txt
+++ b/khotkeys/kcontrol/CMakeLists.txt
@@ -37,7 +37,7 @@ tde_create_translated_desktop( khotkeys.desktop )
 tde_add_kpart( kcm_khotkeys AUTOMOC
   SOURCES
     menuedit.cpp window_trigger_widget.cpp tab_widget.cpp main_buttons_widget.cpp
-    actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp
+    actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp waiting_widget.cpp
     action_group_tab.cpp kcmkhotkeys.cpp command_url_widget.cpp windowdef_list_widget.cpp
     windowdef_simple_widget.cpp triggers_tab.cpp dcop_widget.cpp info_tab.cpp
     action_list_widget.cpp keyboard_input_widget.cpp condition_list_widget.cpp
diff --git a/khotkeys/kcontrol/Makefile.am b/khotkeys/kcontrol/Makefile.am
index 7eb3f2f6d..03a728ae3 100644
--- a/khotkeys/kcontrol/Makefile.am
+++ b/khotkeys/kcontrol/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_khotkeys.la kcm_khotkeys_init.la
 
 kcm_khotkeys_la_SOURCES = \
     menuedit.cpp window_trigger_widget.cpp tab_widget.cpp main_buttons_widget.cpp \
-    actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp \
+    actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp waiting_widget.cpp \
     action_group_tab.cpp kcmkhotkeys.cpp command_url_widget.cpp windowdef_list_widget.cpp \
     windowdef_simple_widget.cpp triggers_tab.cpp dcop_widget.cpp info_tab.cpp \
     action_list_widget.cpp keyboard_input_widget.cpp condition_list_widget.cpp \
diff --git a/khotkeys/kcontrol/action_group_tab.cpp b/khotkeys/kcontrol/action_group_tab.cpp
index 1bdeffd75..8ba35f323 100644
--- a/khotkeys/kcontrol/action_group_tab.cpp
+++ b/khotkeys/kcontrol/action_group_tab.cpp
@@ -36,18 +36,18 @@ Action_group_tab::Action_group_tab( TQWidget* parent_P , const char* name_P )
     {
     clear_data();
     // KHotKeys::Module::changed()
-    connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( disable_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( comment_multilineedit, TQT_SIGNAL( textChanged()),
-        module, TQT_SLOT( changed()));
+    connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( disable_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( comment_multilineedit, TQ_SIGNAL( textChanged()),
+        module, TQ_SLOT( changed()));
     }
     
 void Action_group_tab::clear_data()
     {
-    disconnect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), this,
-        TQT_SLOT( action_group_name_changed( const TQString& )));
+    disconnect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), this,
+        TQ_SLOT( action_group_name_changed( const TQString& )));
     action_name_lineedit->clear();
     action_name_lineedit->setReadOnly( false );
     disable_checkbox->setChecked( false );
@@ -71,8 +71,8 @@ void Action_group_tab::set_data( const Action_data_group* data_P )
     else
         disable_checkbox->setText( i18n( "&Disable" ));
     comment_multilineedit->setText( data_P->comment());
-    connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), this,
-        TQT_SLOT( action_group_name_changed( const TQString& )));
+    connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), this,
+        TQ_SLOT( action_group_name_changed( const TQString& )));
     system_group = data_P->system_group();
     }
 
diff --git a/khotkeys/kcontrol/action_group_tab.h b/khotkeys/kcontrol/action_group_tab.h
index 970f16379..5b1435346 100644
--- a/khotkeys/kcontrol/action_group_tab.h
+++ b/khotkeys/kcontrol/action_group_tab.h
@@ -23,7 +23,7 @@ class Windowdef_list;
 class Action_group_tab
     : public Action_group_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Action_group_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Action_data_group* data_P );
diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp
index 79744a09e..2f87132d8 100644
--- a/khotkeys/kcontrol/action_list_widget.cpp
+++ b/khotkeys/kcontrol/action_list_widget.cpp
@@ -32,6 +32,7 @@
 #include "dcop_widget.h"
 #include "keyboard_input_widget.h"
 #include "activate_window_widget.h"
+#include "waiting_widget.h"
 #include "kcmkhotkeys.h"
 
 namespace KHotKeys
@@ -48,7 +49,8 @@ Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P )
     popup->insertItem( i18n( "DCOP Call..." ), TYPE_DCOP_ACTION );
     popup->insertItem( i18n( "Keyboard Input..." ), TYPE_KEYBOARD_INPUT_ACTION );
     popup->insertItem( i18n( "Activate Window..." ), TYPE_ACTIVATE_WINDOW_ACTION );
-    connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
+    popup->insertItem( i18n( "Waiting..." ), TYPE_WAITING_ACTION );
+    connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int )));
     new_button->setPopup( popup );
     actions_listview->header()->hide();
     actions_listview->addColumn( "" );
@@ -58,20 +60,17 @@ Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P )
     modify_button->setEnabled( false );
     delete_button->setEnabled( false );
     clear_data();
-    connect( actions_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
-             this, TQT_SLOT( modify_pressed() ) );
+    connect( actions_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+             this, TQ_SLOT( modify_pressed() ) );
 
     // KHotKeys::Module::changed()
-    connect( new_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( copy_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( modify_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( delete_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
+    connect(new_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(copy_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(modify_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(delete_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(move_up_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(move_down_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(comment_lineedit, TQ_SIGNAL(textChanged(const TQString&)), module, TQ_SLOT(changed()));
     }
 
 Action_list_widget::~Action_list_widget()
@@ -132,6 +131,9 @@ void Action_list_widget::new_selected( int type_P )
         case TYPE_ACTIVATE_WINDOW_ACTION: // Activate_window_action_dialog
             dlg = new Activate_window_action_dialog( NULL );
           break;
+        case TYPE_WAITING_ACTION: // Waiting_action_dialog
+            dlg = new Waiting_action_dialog( NULL );
+          break;
         default:
           assert( false );
         }
@@ -148,24 +150,81 @@ void Action_list_widget::new_selected( int type_P )
 
 void Action_list_widget::copy_pressed()
     {
-        if ( !selected_item )
-            return;
+    if ( !selected_item )
+      {
+      return;
+      }
+
     actions_listview->setSelected( create_listview_item( selected_item->action(),
-        selected_item->parent() ? NULL : actions_listview, selected_item->parent(),
-        selected_item, true ), true );
+    selected_item->parent() ? NULL : actions_listview, selected_item->parent(),
+    selected_item, true ), true );
     }
 
 void Action_list_widget::delete_pressed()
     {
-    delete selected_item; // CHECKME snad vyvola signaly pro enable()
+    if ( !selected_item )
+        {
+        return;
+        }
+
+    Action_list_item *nextItem = static_cast< Action_list_item* >(selected_item->nextSibling());
+    delete selected_item;
     selected_item = NULL;
+    if (!nextItem)
+        {
+        // If the last item of the list was deleted, get the new last item
+        nextItem = static_cast< Action_list_item* >(actions_listview->lastItem());
+        }
+    if (nextItem)
+        {
+        actions_listview->setSelected(nextItem, true);
+        current_changed(nextItem);
+        }
     }
 
 void Action_list_widget::modify_pressed()
     {
-        if ( !selected_item )
-            return;
-        edit_listview_item( selected_item );
+    if ( !selected_item )
+        {
+        return;
+        }
+    edit_listview_item( selected_item );
+    }
+
+void Action_list_widget::move_up_pressed()
+    {
+    if ( !selected_item )
+        {
+        return;
+        }
+
+    Action_list_item *prevItem = nullptr;
+    TQListViewItem *currItem = actions_listview->firstChild();
+    while (currItem != selected_item)
+        {
+        prevItem = static_cast< Action_list_item* >(currItem);
+        currItem = currItem->nextSibling();
+        }
+    if (prevItem)
+        {
+        prevItem->moveItem(selected_item);
+        current_changed(selected_item);
+        }
+    }
+
+void Action_list_widget::move_down_pressed()
+    {
+    if ( !selected_item )
+        {
+        return;
+        }
+
+    Action_list_item *nextItem = static_cast< Action_list_item* >(selected_item->nextSibling());
+    if (nextItem)
+        {
+        selected_item->moveItem(nextItem);
+        current_changed(selected_item);
+        }
     }
 
 void Action_list_widget::current_changed( TQListViewItem* item_P )
@@ -177,6 +236,8 @@ void Action_list_widget::current_changed( TQListViewItem* item_P )
     copy_button->setEnabled( item_P != NULL );
     modify_button->setEnabled( item_P != NULL );
     delete_button->setEnabled( item_P != NULL );
+    move_up_button->setEnabled(selected_item != actions_listview->firstChild());
+    move_down_button->setEnabled(selected_item != actions_listview->lastChild());
     }
 
 Action_list_item* Action_list_widget::create_listview_item( Action* action_P,
@@ -215,6 +276,8 @@ void Action_list_widget::edit_listview_item( Action_list_item* item_P )
     else if( Activate_window_action* action
         = dynamic_cast< Activate_window_action* >( item_P->action()))
         dlg = new Activate_window_action_dialog( action );
+    else if( Waiting_action* action = dynamic_cast< Waiting_action* >( item_P->action()))
+        dlg = new Waiting_action_dialog( action );
     else // CHECKME TODO pridat dalsi
         assert( false );
     Action* new_action = dlg->edit_action();
@@ -349,6 +412,28 @@ void Activate_window_action_dialog::accept()
     action = new Activate_window_action( NULL, widget->get_data()); // CHECKME NULL ?
     }
 
+// Waiting_action_dialog
+
+Waiting_action_dialog::Waiting_action_dialog( Waiting_action* action_P )
+    : KDialogBase( NULL, NULL, true, "", Ok | Cancel ), action( NULL )
+    {
+    widget = new Waiting_widget( this );
+    widget->set_data( action_P );
+    setMainWidget( widget );
+    }
+
+Action* Waiting_action_dialog::edit_action()
+    {
+    exec();
+    return action;
+    }
+
+void Waiting_action_dialog::accept()
+    {
+    KDialogBase::accept();
+    action = widget->get_data( NULL );
+    }
+
 } // namespace KHotKeys
 
 #include "action_list_widget.moc"
diff --git a/khotkeys/kcontrol/action_list_widget.h b/khotkeys/kcontrol/action_list_widget.h
index c2f32477e..eb3ca7995 100644
--- a/khotkeys/kcontrol/action_list_widget.h
+++ b/khotkeys/kcontrol/action_list_widget.h
@@ -1,11 +1,11 @@
 /****************************************************************************
 
  KHotKeys
- 
+
  Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
 
  Distributed under the terms of the GNU General Public License version 2.
- 
+
 ****************************************************************************/
 
 #ifndef _ACTION_LIST_WIDGET_H_
@@ -28,13 +28,14 @@ class Command_url_widget;
 class Menuentry_widget;
 class Dcop_widget;
 class Keyboard_input_widget;
+class Waiting_widget;
 
 class Action_list_item;
 
 class Action_list_widget
     : public Action_list_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Action_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         virtual ~Action_list_widget();
@@ -47,12 +48,14 @@ class Action_list_widget
             TQListViewItem* parent2_P, TQListViewItem* after_P, bool copy_P );
         void edit_listview_item( Action_list_item* item_P );
         enum type_t { TYPE_COMMAND_URL_ACTION, TYPE_MENUENTRY_ACTION, TYPE_DCOP_ACTION,
-            TYPE_KEYBOARD_INPUT_ACTION, TYPE_ACTIVATE_WINDOW_ACTION };
+            TYPE_KEYBOARD_INPUT_ACTION, TYPE_ACTIVATE_WINDOW_ACTION, TYPE_WAITING_ACTION };
     protected slots:
         void new_selected( int type_P );
         virtual void copy_pressed();
         virtual void delete_pressed();
         virtual void modify_pressed();
+        virtual void move_up_pressed();
+        virtual void move_down_pressed();
         virtual void current_changed( TQListViewItem* item_P );
     protected:
         Action_list_item* selected_item;
@@ -75,18 +78,18 @@ class Action_list_item
     protected:
         Action* _action; // owns it
     };
-        
+
 class Action_dialog
     {
     public:
         virtual Action* edit_action() = 0;
         virtual ~Action_dialog();
     };
-    
+
 class Command_url_action_dialog
     : public KDialogBase, public Action_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Command_url_action_dialog( Command_url_action* action_P );
         virtual Action* edit_action();
@@ -95,11 +98,11 @@ class Command_url_action_dialog
         Command_url_widget* widget;
         Command_url_action* action;
     };
-        
+
 class Menuentry_action_dialog
     : public KDialogBase, public Action_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Menuentry_action_dialog( Menuentry_action* action_P );
         virtual Action* edit_action();
@@ -108,11 +111,11 @@ class Menuentry_action_dialog
         Menuentry_widget* widget;
         Menuentry_action* action;
     };
-        
+
 class Dcop_action_dialog
     : public KDialogBase, public Action_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Dcop_action_dialog( Dcop_action* action_P );
         virtual Action* edit_action();
@@ -121,11 +124,11 @@ class Dcop_action_dialog
         Dcop_widget* widget;
         Dcop_action* action;
     };
-        
+
 class Keyboard_input_action_dialog
     : public KDialogBase, public Action_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Keyboard_input_action_dialog( Keyboard_input_action* action_P );
         virtual Action* edit_action();
@@ -134,11 +137,11 @@ class Keyboard_input_action_dialog
         Keyboard_input_widget* widget;
         Keyboard_input_action* action;
     };
-        
+
 class Activate_window_action_dialog
     : public KDialogBase, public Action_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Activate_window_action_dialog( Activate_window_action* action_P );
         virtual Action* edit_action();
@@ -147,7 +150,20 @@ class Activate_window_action_dialog
         Activate_window_widget* widget;
         Activate_window_action* action;
     };
-        
+
+class Waiting_action_dialog
+    : public KDialogBase, public Action_dialog
+    {
+    TQ_OBJECT
+    public:
+        Waiting_action_dialog( Waiting_action* action_P );
+        virtual Action* edit_action();
+    protected:
+        virtual void accept();
+        Waiting_widget* widget;
+        Waiting_action* action;
+    };
+
 //***************************************************************************
 // Inline
 //***************************************************************************
@@ -159,7 +175,7 @@ Action_list_item::Action_list_item( TQListView* parent_P, Action* action_P )
     : TQListViewItem( parent_P ), _action( action_P )
     {
     }
-    
+
 inline
 Action_list_item::Action_list_item( TQListViewItem* parent_P, Action* action_P )
     : TQListViewItem( parent_P ), _action( action_P )
@@ -185,7 +201,7 @@ Action* Action_list_item::action() const
     {
     return _action;
     }
-    
+
 inline
 void Action_list_item::set_action( Action* action_P )
     {
diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp
index e528005ed..9fe4716c2 100644
--- a/khotkeys/kcontrol/actions_listview_widget.cpp
+++ b/khotkeys/kcontrol/actions_listview_widget.cpp
@@ -1,11 +1,11 @@
 /****************************************************************************
 
  KHotKeys
- 
+
  Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
 
  Distributed under the terms of the GNU General Public License version 2.
- 
+
 ****************************************************************************/
 
 #define _ACTIONS_LISTVIEW_WIDGET_CPP_
@@ -39,10 +39,10 @@ Actions_listview_widget::Actions_listview_widget( TQWidget* parent_P, const char
     actions_listview->header()->hide();
     actions_listview->addColumn( "" );
     actions_listview->setRootIsDecorated( true ); // CHECKME
-    connect( actions_listview, TQT_SIGNAL( current_changed( TQListViewItem* )),
-        TQT_SLOT( current_changed( TQListViewItem* )));
-    connect( actions_listview, TQT_SIGNAL( moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )),
-        TQT_SLOT( item_moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )));
+    connect( actions_listview, TQ_SIGNAL( current_changed( TQListViewItem* )),
+        TQ_SLOT( current_changed( TQListViewItem* )));
+    connect( actions_listview, TQ_SIGNAL( moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )),
+        TQ_SLOT( item_moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )));
     // KHotKeys::Module::changed()
     }
 
@@ -138,7 +138,7 @@ void Actions_listview_widget::build_up()
     {
     build_up_recursively( module->actions_root(), NULL );
     }
-    
+
 void Actions_listview_widget::build_up_recursively( Action_data_group* parent_P,
     Action_listview_item* item_parent_P )
     {
@@ -147,13 +147,13 @@ void Actions_listview_widget::build_up_recursively( Action_data_group* parent_P,
          it;
          ++it )
         {
-        prev = create_item( item_parent_P, prev, ( *it )); 
+        prev = create_item( item_parent_P, prev, ( *it ));
         Action_data_group* grp = dynamic_cast< Action_data_group* >( *it );
         if( grp != NULL )
             build_up_recursively( grp, prev );
         }
     }
-    
+
 Action_listview_item* Actions_listview_widget::create_item( TQListViewItem* parent_P,
     TQListViewItem* after_P, Action_data_base* data_P )
     {
diff --git a/khotkeys/kcontrol/actions_listview_widget.h b/khotkeys/kcontrol/actions_listview_widget.h
index 0f3a632f4..cfad501f5 100644
--- a/khotkeys/kcontrol/actions_listview_widget.h
+++ b/khotkeys/kcontrol/actions_listview_widget.h
@@ -1,11 +1,11 @@
 /****************************************************************************
 
  KHotKeys
- 
+
  Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
 
  Distributed under the terms of the GNU General Public License version 2.
- 
+
 ****************************************************************************/
 
 #ifndef _ACTIONS_LISTVIEW_WIDGET_H_
@@ -27,13 +27,13 @@ class Action_data_base;
 
 class Actions_listview_widget
     : public Actions_listview_widget_ui
-    { 
-    Q_OBJECT
+    {
+    TQ_OBJECT
     public:
         Actions_listview_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         Action_listview_item* current_action() const;
         void set_current_action( Action_listview_item* item );
-        Action_data_base* current_action_data() const; 
+        Action_data_base* current_action_data() const;
         void set_action_data( Action_data_base* data_P, bool recent_action_P = false );
         void action_name_changed( const TQString& name_P );
         void clear();
@@ -54,9 +54,9 @@ class Actions_listview_widget
     };
 
 class Actions_listview
-    : public KHListView    
+    : public KHListView
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Actions_listview( TQWidget* parent_P = NULL, const char* name_P = NULL );
         Actions_listview_widget* widget();
@@ -78,7 +78,7 @@ class Action_listview_item
             Action_data_base* data_P );
     protected:
         Action_data_base* _data; // CHECKME doesn't own !!!
-    };    
+    };
 
 //***************************************************************************
 // Inline
@@ -113,7 +113,7 @@ Actions_listview_widget* Actions_listview::widget()
     {
     return _widget;
     }
-    
+
 // Action_listview_item
 
 inline
@@ -139,7 +139,7 @@ Action_data_base* Action_listview_item::data() const
     {
     return _data;
     }
-    
+
 inline
 void Action_listview_item::set_data( Action_data_base* data_P )
     {
diff --git a/khotkeys/kcontrol/command_url_widget.cpp b/khotkeys/kcontrol/command_url_widget.cpp
index 133913360..5d06c1a16 100644
--- a/khotkeys/kcontrol/command_url_widget.cpp
+++ b/khotkeys/kcontrol/command_url_widget.cpp
@@ -37,8 +37,8 @@ Command_url_widget::Command_url_widget( TQWidget* parent_P, const char* name_P )
     {
     clear_data();
     // KHotKeys::Module::changed()
-    connect( command_url_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
+    connect( command_url_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
     }
 
 void Command_url_widget::clear_data()
diff --git a/khotkeys/kcontrol/command_url_widget.h b/khotkeys/kcontrol/command_url_widget.h
index af9a9dc2a..3465bfa96 100644
--- a/khotkeys/kcontrol/command_url_widget.h
+++ b/khotkeys/kcontrol/command_url_widget.h
@@ -22,7 +22,7 @@ class Action_data;
 class Command_url_widget
     : public Command_url_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Command_url_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Command_url_action* data_P );
diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp
index ba3be5e71..f0a43cb93 100644
--- a/khotkeys/kcontrol/condition_list_widget.cpp
+++ b/khotkeys/kcontrol/condition_list_widget.cpp
@@ -49,10 +49,10 @@ Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* na
     popup->insertItem( i18n( "Not_condition", "Not" ), TYPE_NOT );
     popup->insertItem( i18n( "And_condition", "And" ), TYPE_AND );
     popup->insertItem( i18n( "Or_condition", "Or" ), TYPE_OR );
-    connect( conditions_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
-             this, TQT_SLOT( modify_pressed() ) );
+    connect( conditions_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+             this, TQ_SLOT( modify_pressed() ) );
 
-    connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
+    connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int )));
     new_button->setPopup( popup );
     conditions_listview->header()->hide();
     conditions_listview->addColumn( "" );
@@ -62,18 +62,18 @@ Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* na
     copy_button->setEnabled( false );
     modify_button->setEnabled( false );
     delete_button->setEnabled( false );
+    move_up_button->setEnabled( false );
+    move_down_button->setEnabled( false );
     clear_data();
     // KHotKeys::Module::changed()
-    connect( new_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( copy_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( modify_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( delete_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
+    connect(new_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(copy_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(modify_button, TQ_SIGNAL(clicked()), module, TQ_SLOT( changed()));
+    connect(delete_button, TQ_SIGNAL(clicked()), module, TQ_SLOT( changed()));
+    connect(move_up_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(move_down_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(comment_lineedit, TQ_SIGNAL(textChanged(const TQString&)),
+            module, TQ_SLOT(changed()));
     }
 
 Condition_list_widget::~Condition_list_widget()
@@ -213,8 +213,11 @@ void Condition_list_widget::new_selected( int type_P )
 
 void Condition_list_widget::copy_pressed()
     {
-        if ( !selected_item )
-            return;
+    if ( !selected_item )
+      {
+      return;
+      }
+
     conditions_listview->setSelected( create_listview_item(
         selected_item->condition()->copy( selected_item->condition()->parent()),
         selected_item->parent() ? NULL : conditions_listview,
@@ -223,22 +226,72 @@ void Condition_list_widget::copy_pressed()
     }
 
 void Condition_list_widget::delete_pressed()
-{
-    if ( selected_item )
     {
-        conditions.remove( selected_item->condition()); // we own it
-        delete selected_item; // CHECKME snad vyvola signaly pro enable()
-        selected_item = NULL;
+    if ( !selected_item )
+        {
+        return;
+        }
+    Condition_list_item *nextItem = static_cast< Condition_list_item* >(selected_item->nextSibling());
+    conditions.remove( selected_item->condition()); // we own it
+    delete selected_item;
+    selected_item = NULL;
+    if (!nextItem)
+        {
+        // If the last item of the list was deleted, get the new last item
+        nextItem = static_cast< Condition_list_item* >(conditions_listview->lastItem());
+        }
+    if (nextItem)
+        {
+        conditions_listview->setSelected(nextItem, true);
+        current_changed(nextItem);
+        }
     }
-}
 
 void Condition_list_widget::modify_pressed()
     {
-        if ( !selected_item )
-            return;
+    if ( !selected_item )
+        {
+        return;
+        }
     edit_listview_item( selected_item );
     }
 
+void Condition_list_widget::move_up_pressed()
+    {
+    if ( !selected_item )
+        {
+        return;
+        }
+
+    Condition_list_item *prevItem = nullptr;
+    TQListViewItem *currItem = conditions_listview->firstChild();
+    while (currItem != selected_item)
+        {
+        prevItem = static_cast< Condition_list_item* >(currItem);
+        currItem = currItem->nextSibling();
+        }
+    if (prevItem)
+        {
+        prevItem->moveItem(selected_item);
+        current_changed(selected_item);
+        }
+    }
+
+void Condition_list_widget::move_down_pressed()
+    {
+    if ( !selected_item )
+        {
+        return;
+        }
+
+    Condition_list_item *nextItem = static_cast< Condition_list_item* >(selected_item->nextSibling());
+    if (nextItem)
+        {
+        selected_item->moveItem(nextItem);
+        current_changed(selected_item);
+        }
+    }
+
 void Condition_list_widget::current_changed( TQListViewItem* item_P )
     {
 //    if( item_P == selected_item )
@@ -260,6 +313,8 @@ void Condition_list_widget::current_changed( TQListViewItem* item_P )
         }
     else
         modify_button->setEnabled( false );
+    move_up_button->setEnabled(selected_item != conditions_listview->firstChild());
+    move_down_button->setEnabled(selected_item != conditions_listview->lastChild());
     }
 
 Condition_list_item* Condition_list_widget::create_listview_item( Condition* condition_P,
@@ -268,7 +323,7 @@ Condition_list_item* Condition_list_widget::create_listview_item( Condition* con
 #ifdef KHOTKEYS_DEBUG
     kdDebug( 1217 ) << "Condition_list_widget::create_listview_item():" << endl;
     Condition::debug_list( conditions );
-	kdDebug( 1217 ) << kdBacktrace() << endl;
+  kdDebug( 1217 ) << kdBacktrace() << endl;
 #endif
     Condition* new_cond = copy_P ? condition_P->copy( parent2_P
         ? static_cast< Condition_list_base* >( parent2_P->condition()) : NULL ) : condition_P;
diff --git a/khotkeys/kcontrol/condition_list_widget.h b/khotkeys/kcontrol/condition_list_widget.h
index 0c99fd46c..35f401205 100644
--- a/khotkeys/kcontrol/condition_list_widget.h
+++ b/khotkeys/kcontrol/condition_list_widget.h
@@ -1,11 +1,11 @@
 /****************************************************************************
 
  KHotKeys
- 
+
  Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
 
  Distributed under the terms of the GNU General Public License version 2.
- 
+
 ****************************************************************************/
 
 #ifndef _CONDITIONS_LIST_WIDGET_H_
@@ -30,7 +30,7 @@ class Condition_list_item;
 class Condition_list_widget
     : public Condition_list_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Condition_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         virtual ~Condition_list_widget();
@@ -48,6 +48,8 @@ class Condition_list_widget
         virtual void copy_pressed();
         virtual void delete_pressed();
         virtual void modify_pressed();
+        virtual void move_up_pressed();
+        virtual void move_down_pressed();
         virtual void current_changed( TQListViewItem* item_P );
     private:
         void insert_listview_items( const Condition_list_base* parent_P,
@@ -74,18 +76,18 @@ class Condition_list_item
     protected:
         Condition* _condition; // owns it
     };
-        
+
 class Condition_dialog
     {
     public:
         virtual Condition* edit_condition() = 0;
         virtual ~Condition_dialog();
     };
-    
+
 class Active_window_condition_dialog
     : public KDialogBase, public Condition_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Active_window_condition_dialog( Active_window_condition* condition_P );
         virtual Condition* edit_condition();
@@ -94,11 +96,11 @@ class Active_window_condition_dialog
         Windowdef_list_widget* widget;
         Active_window_condition* condition;
     };
-        
+
 class Existing_window_condition_dialog
     : public KDialogBase, public Condition_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Existing_window_condition_dialog( Existing_window_condition* condition_P );
         virtual Condition* edit_condition();
@@ -107,7 +109,7 @@ class Existing_window_condition_dialog
         Windowdef_list_widget* widget;
         Existing_window_condition* condition;
     };
-        
+
 
 //***************************************************************************
 // Inline
@@ -120,7 +122,7 @@ Condition_list_item::Condition_list_item( TQListView* parent_P, Condition* condi
     : TQListViewItem( parent_P ), _condition( condition_P )
     {
     }
-    
+
 inline
 Condition_list_item::Condition_list_item( TQListViewItem* parent_P, Condition* condition_P )
     : TQListViewItem( parent_P ), _condition( condition_P )
@@ -146,7 +148,7 @@ Condition* Condition_list_item::condition() const
     {
     return _condition;
     }
-    
+
 inline
 void Condition_list_item::set_condition( Condition* condition_P )
     {
diff --git a/khotkeys/kcontrol/dcop_widget.cpp b/khotkeys/kcontrol/dcop_widget.cpp
index bee149860..d986e5a51 100644
--- a/khotkeys/kcontrol/dcop_widget.cpp
+++ b/khotkeys/kcontrol/dcop_widget.cpp
@@ -36,14 +36,14 @@ Dcop_widget::Dcop_widget( TQWidget* parent_P, const char* name_P )
     clear_data();
     try_button->setText( i18n( "to try", "&Try" )); // Qt designer can't do this
     // KHotKeys::Module::changed()
-    connect( remote_app_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( remote_object_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( called_function_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( arguments_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
+    connect( remote_app_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( remote_object_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( called_function_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( arguments_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
     }
     
 void Dcop_widget::clear_data()
diff --git a/khotkeys/kcontrol/dcop_widget.h b/khotkeys/kcontrol/dcop_widget.h
index 43523f00d..a7b6f1bca 100644
--- a/khotkeys/kcontrol/dcop_widget.h
+++ b/khotkeys/kcontrol/dcop_widget.h
@@ -22,7 +22,7 @@ class Action_data;
 class Dcop_widget
     : public Dcop_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Dcop_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Dcop_action* data_P );
diff --git a/khotkeys/kcontrol/general_settings_tab.cpp b/khotkeys/kcontrol/general_settings_tab.cpp
index cf2337446..a0e1e84c7 100644
--- a/khotkeys/kcontrol/general_settings_tab.cpp
+++ b/khotkeys/kcontrol/general_settings_tab.cpp
@@ -27,8 +27,8 @@ General_settings_tab::General_settings_tab( TQWidget* parent_P, const char* name
     : General_settings_tab_ui( parent_P, name_P )
     {
     // KHotKeys::Module::changed()
-    connect( disable_daemon_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
+    connect( disable_daemon_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
     }
 
 void General_settings_tab::import_clicked()
diff --git a/khotkeys/kcontrol/general_settings_tab.h b/khotkeys/kcontrol/general_settings_tab.h
index 8bcd5cd21..ba76bf68e 100644
--- a/khotkeys/kcontrol/general_settings_tab.h
+++ b/khotkeys/kcontrol/general_settings_tab.h
@@ -19,7 +19,7 @@ namespace KHotKeys
 class General_settings_tab
     : public General_settings_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         General_settings_tab( TQWidget* parent = NULL, const char* name = NULL );
         void read_data();
diff --git a/khotkeys/kcontrol/general_tab.cpp b/khotkeys/kcontrol/general_tab.cpp
index 1cd98d461..21ca6f952 100644
--- a/khotkeys/kcontrol/general_tab.cpp
+++ b/khotkeys/kcontrol/general_tab.cpp
@@ -73,22 +73,22 @@ General_tab::General_tab( TQWidget* parent_P, const char* name_P )
             }
     clear_data();
     // KHotKeys::Module::changed()
-    connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( disable_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( comment_multilineedit, TQT_SIGNAL( textChanged()),
-        module, TQT_SLOT( changed()));
-    connect( action_type_combo, TQT_SIGNAL( activated( int )),
-        module, TQT_SLOT( changed()));
+    connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( disable_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( comment_multilineedit, TQ_SIGNAL( textChanged()),
+        module, TQ_SLOT( changed()));
+    connect( action_type_combo, TQ_SIGNAL( activated( int )),
+        module, TQ_SLOT( changed()));
     }
     
 void General_tab::clear_data()
     {
-    disconnect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        this, TQT_SLOT( action_name_changed( const TQString& )));
-    disconnect( action_type_combo, TQT_SIGNAL( activated( int )),
-        this, TQT_SIGNAL( action_type_changed( int ))); // CHECKME neodpoji to sloty od nej ?
+    disconnect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        this, TQ_SLOT( action_name_changed( const TQString& )));
+    disconnect( action_type_combo, TQ_SIGNAL( activated( int )),
+        this, TQ_SIGNAL( action_type_changed( int ))); // CHECKME neodpoji to sloty od nej ?
     action_name_lineedit->clear();
     disable_checkbox->setChecked( false );
     disable_checkbox->setText( i18n( "&Disable" ));
@@ -113,10 +113,10 @@ void General_tab::set_data( const Action_data* data_P )
     comment_multilineedit->setText( data_P->comment());
     action_type_combo->setCurrentItem( Tab_widget::type( data_P ));
 //    module->set_action_type( data_P->type());
-    connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        TQT_SLOT( action_name_changed( const TQString& )));
-    connect( action_type_combo, TQT_SIGNAL( activated( int )),
-        TQT_SIGNAL( action_type_changed( int )));
+    connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        TQ_SLOT( action_name_changed( const TQString& )));
+    connect( action_type_combo, TQ_SIGNAL( activated( int )),
+        TQ_SIGNAL( action_type_changed( int )));
     }
 
 void General_tab::get_data( TQString& name_O, TQString& comment_O, bool& enabled_O )
diff --git a/khotkeys/kcontrol/general_tab.h b/khotkeys/kcontrol/general_tab.h
index 58f670a68..bd738f6a1 100644
--- a/khotkeys/kcontrol/general_tab.h
+++ b/khotkeys/kcontrol/general_tab.h
@@ -25,7 +25,7 @@ class Action_list;
 class General_tab
     : public General_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         General_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Action_data* data_P );
diff --git a/khotkeys/kcontrol/gesture_triggers_tab.cpp b/khotkeys/kcontrol/gesture_triggers_tab.cpp
index b00f60963..52c41cd9e 100644
--- a/khotkeys/kcontrol/gesture_triggers_tab.cpp
+++ b/khotkeys/kcontrol/gesture_triggers_tab.cpp
@@ -35,12 +35,12 @@ Gesture_triggers_tab::Gesture_triggers_tab( TQWidget* parent_P, const char* name
     {
     clear_data();
     // KHotKeys::Module::changed()
-    connect( gesture_edit_button1, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( gesture_edit_button2, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( gesture_edit_button3, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
+    connect( gesture_edit_button1, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( gesture_edit_button2, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( gesture_edit_button3, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
     } 
 
 void Gesture_triggers_tab::clear_data()
@@ -142,8 +142,8 @@ Gesture_edit_dialog::Gesture_edit_dialog( const TQString& gesture_P )
     _page = new GestureRecordPage( _gesture,
                                   this, "GestureRecordPage");
    
-//    connect(_page, TQT_SIGNAL(gestureRecorded(bool)), // allow clearing the gesture
-//            this, TQT_SLOT(enableButtonOK(bool)));
+//    connect(_page, TQ_SIGNAL(gestureRecorded(bool)), // allow clearing the gesture
+//            this, TQ_SLOT(enableButtonOK(bool)));
    
     setMainWidget( _page );
     }
diff --git a/khotkeys/kcontrol/gesture_triggers_tab.h b/khotkeys/kcontrol/gesture_triggers_tab.h
index c11787d03..95bdebe94 100644
--- a/khotkeys/kcontrol/gesture_triggers_tab.h
+++ b/khotkeys/kcontrol/gesture_triggers_tab.h
@@ -26,7 +26,7 @@ class Action_data;
 class Gesture_triggers_tab
     : public Gesture_triggers_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Gesture_triggers_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Trigger_list* triggers_P );
@@ -46,7 +46,7 @@ class GestureRecordPage;
 class Gesture_edit_dialog
     : public KDialogBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Gesture_edit_dialog( const TQString& gesture_P );
         TQString edit_gesture();
diff --git a/khotkeys/kcontrol/gesturedrawer.h b/khotkeys/kcontrol/gesturedrawer.h
index ee3af6809..c3476348e 100644
--- a/khotkeys/kcontrol/gesturedrawer.h
+++ b/khotkeys/kcontrol/gesturedrawer.h
@@ -24,7 +24,7 @@ namespace KHotKeys
 
 class GestureDrawer : public TQFrame
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         GestureDrawer(TQWidget *parent, const char *name);
         ~GestureDrawer();
diff --git a/khotkeys/kcontrol/gesturerecorder.cpp b/khotkeys/kcontrol/gesturerecorder.cpp
index 6e4395a5b..db946cf06 100644
--- a/khotkeys/kcontrol/gesturerecorder.cpp
+++ b/khotkeys/kcontrol/gesturerecorder.cpp
@@ -32,7 +32,7 @@ GestureRecorder::~GestureRecorder()
 
 void GestureRecorder::mousePressEvent(TQMouseEvent *ev)
     {
-    if (ev->button() == Qt::LeftButton)
+    if (ev->button() == TQt::LeftButton)
         {
         _mouseButtonDown = true;
         stroke.reset();
@@ -43,7 +43,7 @@ void GestureRecorder::mousePressEvent(TQMouseEvent *ev)
 
 void GestureRecorder::mouseReleaseEvent(TQMouseEvent *ev)
     {
-    if ((ev->button() == Qt::LeftButton) && (_mouseButtonDown))
+    if ((ev->button() == TQt::LeftButton) && (_mouseButtonDown))
         {
         TQPoint pos = ev->pos();
         stroke.record(pos.x(), pos.y());
diff --git a/khotkeys/kcontrol/gesturerecorder.h b/khotkeys/kcontrol/gesturerecorder.h
index e42de2c0e..07e5f88a4 100644
--- a/khotkeys/kcontrol/gesturerecorder.h
+++ b/khotkeys/kcontrol/gesturerecorder.h
@@ -24,7 +24,7 @@ namespace KHotKeys
 
 class GestureRecorder : public TQFrame
     {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         GestureRecorder(TQWidget *parent, const char *name);
diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp
index e9e768bb0..bc254a878 100644
--- a/khotkeys/kcontrol/gesturerecordpage.cpp
+++ b/khotkeys/kcontrol/gesturerecordpage.cpp
@@ -49,8 +49,8 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture,
     _recorder = new GestureRecorder(this, "recorder");
     _recorder->setMinimumHeight(150);
     setStretchFactor(_recorder, 1);
-    connect(_recorder, TQT_SIGNAL(recorded(const TQString &)),
-            this, TQT_SLOT(slotRecorded(const TQString &)));
+    connect(_recorder, TQ_SIGNAL(recorded(const TQString &)),
+            this, TQ_SLOT(slotRecorded(const TQString &)));
 
     TQHBox *hBox = new TQHBox(this, "hbox");
 
@@ -62,8 +62,8 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture,
     hBox->setStretchFactor(spacer, 1);
 
     _resetButton = new TQPushButton(i18n("&Reset"), hBox, "resetButton");
-    connect(_resetButton, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotResetClicked()));
+    connect(_resetButton, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotResetClicked()));
 
 
 
diff --git a/khotkeys/kcontrol/gesturerecordpage.h b/khotkeys/kcontrol/gesturerecordpage.h
index 306710c0e..5b498577c 100644
--- a/khotkeys/kcontrol/gesturerecordpage.h
+++ b/khotkeys/kcontrol/gesturerecordpage.h
@@ -28,7 +28,7 @@ class GestureRecorder;
 
 class GestureRecordPage : public TQVBox
     {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         GestureRecordPage(const TQString &gesture,
diff --git a/khotkeys/kcontrol/gestures_settings_tab.cpp b/khotkeys/kcontrol/gestures_settings_tab.cpp
index 8585fedbc..200fa6b97 100644
--- a/khotkeys/kcontrol/gestures_settings_tab.cpp
+++ b/khotkeys/kcontrol/gestures_settings_tab.cpp
@@ -39,12 +39,12 @@ Gestures_settings_tab::Gestures_settings_tab( TQWidget* parent_P, const char* na
     mouse_button_combo->insertItem( i18n( "Button 8 (if available)" ), 6 );
     mouse_button_combo->insertItem( i18n( "Button 9 (if available)" ), 7 );
     // KHotKeys::Module::changed()
-    connect( mouse_gestures_globally, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( mouse_button_combo, TQT_SIGNAL( activated( int )),
-        module, TQT_SLOT( changed()));
-    connect( timeout_input, TQT_SIGNAL( valueChanged( int )),
-        module, TQT_SLOT( changed()));
+    connect( mouse_gestures_globally, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( mouse_button_combo, TQ_SIGNAL( activated( int )),
+        module, TQ_SLOT( changed()));
+    connect( timeout_input, TQ_SIGNAL( valueChanged( int )),
+        module, TQ_SLOT( changed()));
     }
 
 void Gestures_settings_tab::read_data()
diff --git a/khotkeys/kcontrol/gestures_settings_tab.h b/khotkeys/kcontrol/gestures_settings_tab.h
index 813209439..bf4b2611b 100644
--- a/khotkeys/kcontrol/gestures_settings_tab.h
+++ b/khotkeys/kcontrol/gestures_settings_tab.h
@@ -19,7 +19,7 @@ namespace KHotKeys
 class Gestures_settings_tab
     : public Gestures_settings_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Gestures_settings_tab( TQWidget* parent = NULL, const char* name = NULL );
         void read_data();
diff --git a/khotkeys/kcontrol/info_tab.h b/khotkeys/kcontrol/info_tab.h
index 32212ae98..451f58514 100644
--- a/khotkeys/kcontrol/info_tab.h
+++ b/khotkeys/kcontrol/info_tab.h
@@ -19,7 +19,7 @@ namespace KHotKeys
 class Info_tab
     : public Info_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Info_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
     public slots:
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 85dbaaaa8..48349a65c 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -67,7 +67,7 @@ Module::Module( TQWidget* parent_P, const char* )
     {
     setButtons( Help | Cancel | Apply | Ok );
     module = this;
-    init_global_data( false, TQT_TQOBJECT(this) ); // don't grab keys
+    init_global_data( false, this ); // don't grab keys
     init_arts();
     TQVBoxLayout* vbox = new TQVBoxLayout( this ); 
     vbox->setSpacing( 6 );
@@ -78,12 +78,12 @@ Module::Module( TQWidget* parent_P, const char* )
     vbox->addWidget( splt );
     buttons_widget = new Main_buttons_widget( this );
     vbox->addWidget( buttons_widget );
-    connect( actions_listview_widget, TQT_SIGNAL( current_action_changed()),
-        TQT_SLOT( listview_current_action_changed()));
-    connect( buttons_widget, TQT_SIGNAL( new_action_pressed()),  TQT_SLOT( new_action()));
-    connect( buttons_widget, TQT_SIGNAL( new_action_group_pressed()),  TQT_SLOT( new_action_group()));
-    connect( buttons_widget, TQT_SIGNAL( delete_action_pressed()),  TQT_SLOT( delete_action()));
-    connect( buttons_widget, TQT_SIGNAL( global_settings_pressed()), TQT_SLOT( global_settings()));
+    connect( actions_listview_widget, TQ_SIGNAL( current_action_changed()),
+        TQ_SLOT( listview_current_action_changed()));
+    connect( buttons_widget, TQ_SIGNAL( new_action_pressed()),  TQ_SLOT( new_action()));
+    connect( buttons_widget, TQ_SIGNAL( new_action_group_pressed()),  TQ_SLOT( new_action_group()));
+    connect( buttons_widget, TQ_SIGNAL( delete_action_pressed()),  TQ_SLOT( delete_action()));
+    connect( buttons_widget, TQ_SIGNAL( global_settings_pressed()), TQ_SLOT( global_settings()));
 //    listview_current_action_changed(); // init
 						
 		TDEAboutData* about = new TDEAboutData("kcmkhotkeys", I18N_NOOP("KHotKeys"), KHOTKEYS_VERSION,
diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h
index 2fffc2b16..7d1876d8d 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.h
+++ b/khotkeys/kcontrol/kcmkhotkeys.h
@@ -30,7 +30,7 @@ class Main_buttons_widget;
 class Module
     : public TDECModule
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Module( TQWidget *parent_P, const char *name_P );
         virtual ~Module();
diff --git a/khotkeys/kcontrol/keyboard_input_widget.cpp b/khotkeys/kcontrol/keyboard_input_widget.cpp
index 4d5727482..a518fa02d 100644
--- a/khotkeys/kcontrol/keyboard_input_widget.cpp
+++ b/khotkeys/kcontrol/keyboard_input_widget.cpp
@@ -36,16 +36,16 @@ Keyboard_input_widget::Keyboard_input_widget( TQWidget* parent_P, const char* na
     {
     clear_data();
     // KHotKeys::Module::changed()
-    connect( action_window_radio, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( active_window_radio, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( specific_window_radio, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( keyboard_input_multilineedit, TQT_SIGNAL( textChanged()),
-        module, TQT_SLOT( changed()));
-    connect( modify_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
+    connect( action_window_radio, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( active_window_radio, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( specific_window_radio, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( keyboard_input_multilineedit, TQ_SIGNAL( textChanged()),
+        module, TQ_SLOT( changed()));
+    connect( modify_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
     }
 
 void Keyboard_input_widget::clear_data()
diff --git a/khotkeys/kcontrol/keyboard_input_widget.h b/khotkeys/kcontrol/keyboard_input_widget.h
index 32690f44e..1d1a141bd 100644
--- a/khotkeys/kcontrol/keyboard_input_widget.h
+++ b/khotkeys/kcontrol/keyboard_input_widget.h
@@ -22,7 +22,7 @@ class Action_data;
 class Keyboard_input_widget
     : public Keyboard_input_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Keyboard_input_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Keyboard_input_action* data_P );
diff --git a/khotkeys/kcontrol/main_buttons_widget.cpp b/khotkeys/kcontrol/main_buttons_widget.cpp
index 3532cc13f..4a1e258b5 100644
--- a/khotkeys/kcontrol/main_buttons_widget.cpp
+++ b/khotkeys/kcontrol/main_buttons_widget.cpp
@@ -26,18 +26,18 @@ namespace KHotKeys
 Main_buttons_widget::Main_buttons_widget( TQWidget* parent_P, const char* name_P )
     : Main_buttons_widget_ui( parent_P, name_P )
     {
-    connect( new_action_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( new_action_pressed()));
-    connect( new_action_group_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( new_action_group_pressed()));
-    connect( delete_action_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( delete_action_pressed()));
-    connect( global_settings_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( global_settings_pressed()));
+    connect( new_action_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( new_action_pressed()));
+    connect( new_action_group_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( new_action_group_pressed()));
+    connect( delete_action_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( delete_action_pressed()));
+    connect( global_settings_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( global_settings_pressed()));
     enable_delete( false );
     // KHotKeys::Module::changed()
-    connect( new_action_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( new_action_group_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( delete_action_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
+    connect( new_action_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( new_action_group_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( delete_action_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
     setMaximumHeight( sizeHint().height()); // it gets too high and I have no idea why
     }
 
diff --git a/khotkeys/kcontrol/main_buttons_widget.h b/khotkeys/kcontrol/main_buttons_widget.h
index e4410d9d0..ce08570bf 100644
--- a/khotkeys/kcontrol/main_buttons_widget.h
+++ b/khotkeys/kcontrol/main_buttons_widget.h
@@ -19,7 +19,7 @@ namespace KHotKeys
 class Main_buttons_widget
     : public Main_buttons_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Main_buttons_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void enable_delete( bool enable_P );
diff --git a/khotkeys/kcontrol/menuentry_widget.cpp b/khotkeys/kcontrol/menuentry_widget.cpp
index 9b313d20d..8fac287b8 100644
--- a/khotkeys/kcontrol/menuentry_widget.cpp
+++ b/khotkeys/kcontrol/menuentry_widget.cpp
@@ -37,8 +37,8 @@ Menuentry_widget::Menuentry_widget( TQWidget* parent_P, const char* name_P )
     {
     clear_data();
     // KHotKeys::Module::changed()
-    connect( menuentry_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
+    connect( menuentry_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
     }
 
 void Menuentry_widget::clear_data()
diff --git a/khotkeys/kcontrol/menuentry_widget.h b/khotkeys/kcontrol/menuentry_widget.h
index f4b61677d..c9cc8e36c 100644
--- a/khotkeys/kcontrol/menuentry_widget.h
+++ b/khotkeys/kcontrol/menuentry_widget.h
@@ -22,7 +22,7 @@ class Action_data;
 class Menuentry_widget
     : public Menuentry_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Menuentry_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Menuentry_action* data_P );
diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp
index d3ca4afbe..236d755d2 100644
--- a/khotkeys/kcontrol/tab_widget.cpp
+++ b/khotkeys/kcontrol/tab_widget.cpp
@@ -59,8 +59,8 @@ Tab_widget::Tab_widget( TQWidget* parent_P, const char* name_P )
     pages[ TAB_GESTURES_SETTINGS ] = new Gestures_settings_tab;
     General_tab* general_tab;
     pages[ TAB_GENERAL ] = general_tab = new General_tab;
-    connect( general_tab, TQT_SIGNAL( action_type_changed( int )),
-        TQT_SLOT( set_action_type_slot( int )));
+    connect( general_tab, TQ_SIGNAL( action_type_changed( int )),
+        TQ_SLOT( set_action_type_slot( int )));
     pages[ TAB_GROUP_GENERAL ] = new Action_group_tab;
     pages[ TAB_CONDITIONS ] = new Condition_list_tab;
     pages[ TAB_ACTIONS ] = new Action_list_tab;
@@ -76,7 +76,7 @@ Tab_widget::Tab_widget( TQWidget* parent_P, const char* name_P )
     for( tab_pos_t i = TAB_FIRST;
          i < TAB_END;
          ++i )
-        connect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data()));
+        connect( this, TQ_SIGNAL( clear_pages_signal()), pages[ i ], TQ_SLOT( clear_data()));
 #ifdef HAVE_ARTS
     if( haveArts())
         show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS, TAB_VOICE_SETTINGS ));
@@ -441,18 +441,18 @@ void Tab_widget::show_pages( const Pages_set& pages_P )
         {
         removePage( pages[ i ] );
         if( pages_P.is_set( i )) // don't clear page contents if it stays visible
-            disconnect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data()));
+            disconnect( this, TQ_SIGNAL( clear_pages_signal()), pages[ i ], TQ_SLOT( clear_data()));
         }
     clear_pages();
     // reconnect all pages to this signal
-    disconnect( this, TQT_SIGNAL( clear_pages_signal()), NULL, NULL );
+    disconnect( this, TQ_SIGNAL( clear_pages_signal()), NULL, NULL );
     for( tab_pos_t i = TAB_FIRST;
          i < TAB_END;
          ++i )
         {
         if( pages_P.is_set( i ))
             addTab( pages[ i ], i18n( tab_labels[ i ] ));
-        connect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data()));
+        connect( this, TQ_SIGNAL( clear_pages_signal()), pages[ i ], TQ_SLOT( clear_data()));
         }
     show();
     }
diff --git a/khotkeys/kcontrol/tab_widget.h b/khotkeys/kcontrol/tab_widget.h
index 81fb9e4ad..1439864f1 100644
--- a/khotkeys/kcontrol/tab_widget.h
+++ b/khotkeys/kcontrol/tab_widget.h
@@ -21,7 +21,7 @@ namespace KHotKeys
 class Tab_widget
     : public TQTabWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         enum action_type_t
             {
diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index d4f7ff9d3..d3773c3f3 100644
--- a/khotkeys/kcontrol/triggers_tab.cpp
+++ b/khotkeys/kcontrol/triggers_tab.cpp
@@ -55,9 +55,9 @@ Triggers_tab::Triggers_tab( TQWidget* parent_P, const char* name_P )
     if( haveArts())
         popup->insertItem( i18n( "Voice Trigger..." ), TYPE_VOICE_TRIGGER );
 #endif
-    connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
-    connect( triggers_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
-             this, TQT_SLOT( modify_pressed() ) );
+    connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int )));
+    connect( triggers_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+             this, TQ_SLOT( modify_pressed() ) );
 
     new_button->setPopup( popup );
     copy_button->setEnabled( false );
@@ -69,16 +69,16 @@ Triggers_tab::Triggers_tab( TQWidget* parent_P, const char* name_P )
     triggers_listview->setForceSelect( true );
     clear_data();
     // KHotKeys::Module::changed()
-    connect( new_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( copy_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( modify_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( delete_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
+    connect( new_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( copy_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( modify_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( delete_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( comment_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
     }
 
 Triggers_tab::~Triggers_tab()
@@ -227,11 +227,11 @@ Shortcut_trigger_widget::Shortcut_trigger_widget( TQWidget* parent_P, const char
     lay->addWidget( lbl );
     lay->addSpacing( 10 );
     bt = new KKeyButton( this );
-    lay->addWidget( bt, 0 , Qt::AlignHCenter );
+    lay->addWidget( bt, 0 , TQt::AlignHCenter );
     lay->addStretch();
     clear_data();
-    connect( bt, TQT_SIGNAL( capturedShortcut( const TDEShortcut& )),
-        this, TQT_SLOT( capturedShortcut( const TDEShortcut& )));
+    connect( bt, TQ_SIGNAL( capturedShortcut( const TDEShortcut& )),
+        this, TQ_SLOT( capturedShortcut( const TDEShortcut& )));
     }
 
 void Shortcut_trigger_widget::clear_data()
@@ -320,8 +320,8 @@ Gesture_trigger_dialog::Gesture_trigger_dialog( Gesture_trigger* trigger_P )
     _page = new GestureRecordPage( _trigger->gesturecode(),
                                   this, "GestureRecordPage");
 
-    connect(_page, TQT_SIGNAL(gestureRecorded(bool)),
-            this, TQT_SLOT(enableButtonOK(bool)));
+    connect(_page, TQ_SIGNAL(gestureRecorded(bool)),
+            this, TQ_SLOT(enableButtonOK(bool)));
 
     setMainWidget( _page );
     }
@@ -343,7 +343,7 @@ _trigger( trigger_P ), _page( NULL )
 {
 	_page = new VoiceRecordPage( _trigger ? _trigger->voicecode() : TQString::null ,  this, "VoiceRecordPage");
 
-	connect(_page, TQT_SIGNAL(voiceRecorded(bool)), this, TQT_SLOT(enableButtonOK(bool)));
+	connect(_page, TQ_SIGNAL(voiceRecorded(bool)), this, TQ_SLOT(enableButtonOK(bool)));
 
 	setMainWidget( _page );
 }
diff --git a/khotkeys/kcontrol/triggers_tab.h b/khotkeys/kcontrol/triggers_tab.h
index c4d6160fe..dc99bda5c 100644
--- a/khotkeys/kcontrol/triggers_tab.h
+++ b/khotkeys/kcontrol/triggers_tab.h
@@ -35,7 +35,7 @@ class KHotKeysShortcutList;
 class Triggers_tab
     : public Triggers_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Triggers_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
         virtual ~Triggers_tab();
@@ -82,7 +82,7 @@ class Trigger_dialog
 class Shortcut_trigger_widget
     : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Shortcut_trigger_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Shortcut_trigger* trigger_P );
@@ -100,7 +100,7 @@ typedef Shortcut_trigger_widget Shortcut_trigger_tab;
 class Shortcut_trigger_dialog
     : public KDialogBase, public Trigger_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Shortcut_trigger_dialog( Shortcut_trigger* trigger_P );
         virtual Trigger* edit_trigger();
@@ -113,7 +113,7 @@ class Shortcut_trigger_dialog
 class Window_trigger_dialog
     : public KDialogBase, public Trigger_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Window_trigger_dialog( Window_trigger* trigger_P );
         virtual Trigger* edit_trigger();
@@ -128,7 +128,7 @@ class GestureRecordPage;
 class Gesture_trigger_dialog
     : public KDialogBase, public Trigger_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Gesture_trigger_dialog( Gesture_trigger* trigger_P );
         virtual Trigger* edit_trigger();
@@ -144,7 +144,7 @@ class VoiceRecordPage;
 class Voice_trigger_dialog
 	: public KDialogBase, public Trigger_dialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		Voice_trigger_dialog( Voice_trigger* trigger_P );
 		virtual Trigger* edit_trigger();
diff --git a/khotkeys/kcontrol/ui/CMakeLists.txt b/khotkeys/kcontrol/ui/CMakeLists.txt
index 85212affb..ab8db9e78 100644
--- a/khotkeys/kcontrol/ui/CMakeLists.txt
+++ b/khotkeys/kcontrol/ui/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
 tde_add_library( ui STATIC_PIC AUTOMOC
   SOURCES
     windowdef_simple_widget_ui.ui windowdef_list_widget_ui.ui
-    command_url_widget_ui.ui menuentry_widget_ui.ui
+    command_url_widget_ui.ui menuentry_widget_ui.ui waiting_widget_ui.ui
     triggers_tab_ui.ui general_tab_ui.ui action_group_tab_ui.ui
     dcop_widget_ui.ui main_buttons_widget_ui.ui voice_settings_tab_ui.ui
     info_tab_ui.ui window_trigger_widget_ui.ui action_list_widget_ui.ui
diff --git a/khotkeys/kcontrol/ui/Makefile.am b/khotkeys/kcontrol/ui/Makefile.am
index 14ea5c44d..ee63c6871 100644
--- a/khotkeys/kcontrol/ui/Makefile.am
+++ b/khotkeys/kcontrol/ui/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libui.la
 libui_la_SOURCES = dummy.cpp windowdef_simple_widget_ui.ui windowdef_list_widget_ui.ui \
-    command_url_widget_ui.ui menuentry_widget_ui.ui triggers_tab_ui.ui general_tab_ui.ui \
+    command_url_widget_ui.ui menuentry_widget_ui.ui triggers_tab_ui.ui general_tab_ui.ui waiting_widget_ui.ui \
     action_group_tab_ui.ui dcop_widget_ui.ui main_buttons_widget_ui.ui \
     actions_listview_widget_ui.ui info_tab_ui.ui window_trigger_widget_ui.ui \
     action_list_widget_ui.ui keyboard_input_widget_ui.ui condition_list_widget_ui.ui \
diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
index 69d51ef55..5e56226a9 100644
--- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
@@ -98,9 +98,9 @@
         </widget>
     </vbox>
 </widget>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">action_group_name_changed( const TQString&amp; )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">ktextedit.h</include>
diff --git a/khotkeys/kcontrol/ui/action_list_widget_ui.ui b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
index d78c6b5f1..12537d770 100644
--- a/khotkeys/kcontrol/ui/action_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
@@ -97,6 +97,22 @@
                                 <string>Delete</string>
                             </property>
                         </widget>
+                        <widget class="TQPushButton">
+                            <property name="name">
+                                <cstring>move_up_button</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Move &amp;up</string>
+                            </property>
+                        </widget>
+                        <widget class="TQPushButton">
+                            <property name="name">
+                                <cstring>move_down_button</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Move &amp;down</string>
+                            </property>
+                        </widget>
                     </vbox>
                 </widget>
             </hbox>
@@ -148,6 +164,18 @@
         <slot>delete_pressed()</slot>
     </connection>
     <connection>
+        <sender>move_up_button</sender>
+        <signal>clicked()</signal>
+        <receiver>Action_list_widget_ui</receiver>
+        <slot>move_up_pressed()</slot>
+    </connection>
+    <connection>
+        <sender>move_down_button</sender>
+        <signal>clicked()</signal>
+        <receiver>Action_list_widget_ui</receiver>
+        <slot>move_down_pressed()</slot>
+    </connection>
+    <connection>
         <sender>actions_listview</sender>
         <signal>current_changed(TQListViewItem*)</signal>
         <receiver>Action_list_widget_ui</receiver>
@@ -157,12 +185,14 @@
 <forwards>
     <forward>class TQListViewItem;</forward>
 </forwards>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
     <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</Q_SLOTS>
+    <slot access="protected" specifier="pure virtual">move_up_pressed()</slot>
+    <slot access="protected" specifier="pure virtual">move_down_pressed()</slot>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/command_url_widget_ui.ui b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
index 5a285b32e..375ae4138 100644
--- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
@@ -50,9 +50,9 @@
         </widget>
     </vbox>
 </widget>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">browse_pressed()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
index 9b3727ffd..98b13c653 100644
--- a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
@@ -94,7 +94,23 @@
                                 <cstring>delete_button</cstring>
                             </property>
                             <property name="text">
-                                <string>Delete</string>
+                                <string>D&amp;elete</string>
+                            </property>
+                        </widget>
+                        <widget class="TQPushButton">
+                            <property name="name">
+                                <cstring>move_up_button</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Move &amp;up</string>
+                            </property>
+                        </widget>
+                        <widget class="TQPushButton">
+                            <property name="name">
+                                <cstring>move_down_button</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Move &amp;down</string>
                             </property>
                         </widget>
                     </vbox>
@@ -147,6 +163,18 @@
         <slot>delete_pressed()</slot>
     </connection>
     <connection>
+        <sender>move_up_button</sender>
+        <signal>clicked()</signal>
+        <receiver>Condition_list_widget_ui</receiver>
+        <slot>move_up_pressed()</slot>
+    </connection>
+    <connection>
+        <sender>move_down_button</sender>
+        <signal>clicked()</signal>
+        <receiver>Condition_list_widget_ui</receiver>
+        <slot>move_down_pressed()</slot>
+    </connection>
+    <connection>
         <sender>conditions_listview</sender>
         <signal>current_changed(TQListViewItem*)</signal>
         <receiver>Condition_list_widget_ui</receiver>
@@ -156,12 +184,14 @@
 <forwards>
     <forward>class TQListViewItem;</forward>
 </forwards>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
     <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</Q_SLOTS>
+    <slot access="protected" specifier="pure virtual">move_up_pressed()</slot>
+    <slot access="protected" specifier="pure virtual">move_down_pressed()</slot>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/dcop_widget_ui.ui b/khotkeys/kcontrol/ui/dcop_widget_ui.ui
index feeae535d..a9dc2e8c6 100644
--- a/khotkeys/kcontrol/ui/dcop_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/dcop_widget_ui.ui
@@ -261,10 +261,10 @@
     <tabstop>try_button</tabstop>
     <tabstop>PushButton1</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">run_kdcop_pressed()</slot>
     <slot access="protected" specifier="pure virtual">try_pressed()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
index 9dc10309e..9242b6da9 100644
--- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
@@ -107,9 +107,9 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">import_clicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui
index 9deef2245..b422d09cc 100644
--- a/khotkeys/kcontrol/ui/general_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_tab_ui.ui
@@ -133,10 +133,10 @@
         </widget>
     </vbox>
 </widget>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">action_name_changed( const TQString&amp; )</slot>
     <slot access="protected" specifier="pure virtual">action_type_changed(int)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">ktextedit.h</include>
diff --git a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
index 068806a02..c848ef4fe 100644
--- a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
@@ -506,11 +506,11 @@
         <slot>edit_gesture_pressed3()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">edit_gesture_pressed1()</slot>
     <slot access="protected" specifier="pure virtual">edit_gesture_pressed2()</slot>
     <slot access="protected" specifier="pure virtual">edit_gesture_pressed3()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
index 521e44f46..ff00fbf6e 100644
--- a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
@@ -183,9 +183,9 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">ktextedit.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
index 6af0aefc6..a24d36665 100644
--- a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
@@ -89,9 +89,9 @@
         <slot>browse_pressed()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">browse_pressed()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/triggers_tab_ui.ui b/khotkeys/kcontrol/ui/triggers_tab_ui.ui
index 557be7dd4..e1d110522 100644
--- a/khotkeys/kcontrol/ui/triggers_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/triggers_tab_ui.ui
@@ -157,12 +157,12 @@
 <forwards>
     <forward>class TQListViewItem;</forward>
 </forwards>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
     <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
index bcd113c57..8ccb8a9e2 100644
--- a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
@@ -90,11 +90,11 @@
         <slot>slotPlayPressed()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">slotRecordPressed()</slot>
     <slot access="protected" specifier="pure virtual">slotPlayPressed()</slot>
     <slot access="protected" specifier="pure virtual">slotStopPressed()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
diff --git a/khotkeys/kcontrol/ui/waiting_widget_ui.ui b/khotkeys/kcontrol/ui/waiting_widget_ui.ui
new file mode 100644
index 000000000..5942a34ba
--- /dev/null
+++ b/khotkeys/kcontrol/ui/waiting_widget_ui.ui
@@ -0,0 +1,72 @@
+<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
+<class>KHotKeys::Waiting_widget_ui</class>
+<widget class="TQWidget">
+    <property name="name">
+        <cstring>Waiting_widget_ui</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>580</width>
+            <height>480</height>
+        </rect>
+    </property>
+    <hbox>
+        <property name="name">
+            <cstring>unnamed</cstring>
+        </property>
+        <property name="margin">
+            <number>11</number>
+        </property>
+        <property name="spacing">
+            <number>6</number>
+        </property>
+        <widget class="TQLabel">
+            <property name="name">
+                <cstring>waiting_label</cstring>
+            </property>
+            <property name="text">
+                <string>Waiting time (ms): </string>
+            </property>
+            <property name="buddy" stdset="0">
+                <cstring>waiting_spinbox</cstring>
+            </property>
+        </widget>
+        <widget class="KIntSpinBox">
+            <property name="name">
+                <cstring>waiting_spinbox</cstring>
+            </property>
+            <property name="minValue">
+                <number>0</number>
+            </property>
+            <property name="maxValue">
+                <number>20000</number>
+            </property>
+        </widget>
+        <spacer>
+            <property name="name">
+                <cstring>Spacer16</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Horizontal</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>0</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+    </hbox>
+</widget>
+<includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</UI>
diff --git a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
index aaa52e891..78a106a81 100644
--- a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
@@ -156,12 +156,12 @@
 <forwards>
     <forward>class TQListViewItem;</forward>
 </forwards>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
     <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
index d15dab5df..a21633852 100644
--- a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
@@ -480,11 +480,11 @@
     <tabstop>window_role_lineedit</tabstop>
     <tabstop>autodetect_button</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">window_class_combo_changed(int)</slot>
     <slot access="protected" specifier="pure virtual">window_role_combo_changed(int)</slot>
     <slot access="protected" specifier="pure virtual">window_title_combo_changed(int)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/voice_settings_tab.cpp b/khotkeys/kcontrol/voice_settings_tab.cpp
index 1d97d69ab..952cc0dbe 100644
--- a/khotkeys/kcontrol/voice_settings_tab.cpp
+++ b/khotkeys/kcontrol/voice_settings_tab.cpp
@@ -26,7 +26,7 @@ namespace KHotKeys
 Voice_settings_tab::Voice_settings_tab( TQWidget* parent_P, const char* name_P )
     : Voice_settings_tab_ui( parent_P, name_P )
     {
-		connect( keyButton , TQT_SIGNAL(capturedShortcut (const TDEShortcut &)) , this, TQT_SLOT(slotCapturedKey( const TDEShortcut& )));
+		connect( keyButton , TQ_SIGNAL(capturedShortcut (const TDEShortcut &)) , this, TQ_SLOT(slotCapturedKey( const TDEShortcut& )));
     }
 
 void Voice_settings_tab::read_data()
diff --git a/khotkeys/kcontrol/voice_settings_tab.h b/khotkeys/kcontrol/voice_settings_tab.h
index c59a911a2..57b5905c5 100644
--- a/khotkeys/kcontrol/voice_settings_tab.h
+++ b/khotkeys/kcontrol/voice_settings_tab.h
@@ -21,7 +21,7 @@ namespace KHotKeys
 class Voice_settings_tab
     : public Voice_settings_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Voice_settings_tab( TQWidget* parent = NULL, const char* name = NULL );
         void read_data();
diff --git a/khotkeys/kcontrol/voicerecorder.cpp b/khotkeys/kcontrol/voicerecorder.cpp
index fc231a82c..9af645045 100644
--- a/khotkeys/kcontrol/voicerecorder.cpp
+++ b/khotkeys/kcontrol/voicerecorder.cpp
@@ -46,13 +46,13 @@ bool VoiceRecorder::init( KLibrary* lib )
 }
 
 VoiceRecorder::VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWidget *parent, const char *name)
-	: Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(TQT_TQOBJECT(this))) , _state(sNotModified), _tempFile(0L) ,  _voiceId(voiceId)
+	: Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(this)) , _state(sNotModified), _tempFile(0L) ,  _voiceId(voiceId)
 {
 	_sound=sound_P;
 	buttonPlay->setEnabled(sound_P.size() > 50);
 	buttonStop->setEnabled(false);
 
-	connect (_recorder , TQT_SIGNAL(recorded(const Sound& )) , this , TQT_SLOT(slotSoundRecorded(const Sound& ) ));
+	connect (_recorder , TQ_SIGNAL(recorded(const Sound& )) , this , TQ_SLOT(slotSoundRecorded(const Sound& ) ));
 
 	//if(voiceid_P.isEmpty())
 	emit recorded(false);
@@ -168,7 +168,7 @@ bool VoiceRecorder::drawSound()
 	uint lx=0;
 	uint ly=height/2;
 
-	/***     DRAW THE TQT_SIGNAL     ******/
+	/***     DRAW THE TQ_SIGNAL     ******/
 	for(uint f=1; f<length; f++)
 	{
 		uint nx=f*width/length;
diff --git a/khotkeys/kcontrol/voicerecorder.h b/khotkeys/kcontrol/voicerecorder.h
index 30d03acdc..6edb20f37 100644
--- a/khotkeys/kcontrol/voicerecorder.h
+++ b/khotkeys/kcontrol/voicerecorder.h
@@ -30,7 +30,7 @@ namespace KHotKeys
 
 class VoiceRecorder : public Voice_input_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWidget *parent, const char *name);
diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp
index 1c7f8c938..c450abe44 100644
--- a/khotkeys/kcontrol/voicerecordpage.cpp
+++ b/khotkeys/kcontrol/voicerecordpage.cpp
@@ -59,9 +59,9 @@ VoiceRecordPage::VoiceRecordPage( const TQString &voiceid_P, TQWidget *parent, c
     setStretchFactor(spacer, 1);
 
 
-	connect(_recorder1, TQT_SIGNAL(recorded(bool)) , this, TQT_SLOT(slotChanged()));
-	connect(_recorder2, TQT_SIGNAL(recorded(bool)) , this, TQT_SLOT(slotChanged()));
-	connect(_lineEdit , TQT_SIGNAL( textChanged (const TQString&)) , this , TQT_SLOT(slotChanged()));
+	connect(_recorder1, TQ_SIGNAL(recorded(bool)) , this, TQ_SLOT(slotChanged()));
+	connect(_recorder2, TQ_SIGNAL(recorded(bool)) , this, TQ_SLOT(slotChanged()));
+	connect(_lineEdit , TQ_SIGNAL( textChanged (const TQString&)) , this , TQ_SLOT(slotChanged()));
 
 
     }
diff --git a/khotkeys/kcontrol/voicerecordpage.h b/khotkeys/kcontrol/voicerecordpage.h
index 9cb934b61..970ccf83b 100644
--- a/khotkeys/kcontrol/voicerecordpage.h
+++ b/khotkeys/kcontrol/voicerecordpage.h
@@ -31,7 +31,7 @@ class VoiceSignature;
 
 class VoiceRecordPage : public TQVBox
     {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         VoiceRecordPage(const TQString &voiceip_P, TQWidget *parent, const char *name);
diff --git a/khotkeys/kcontrol/waiting_widget.cpp b/khotkeys/kcontrol/waiting_widget.cpp
new file mode 100644
index 000000000..135261e30
--- /dev/null
+++ b/khotkeys/kcontrol/waiting_widget.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+
+ KHotKeys
+
+ Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
+
+ Distributed under the terms of the GNU General Public License version 2.
+
+****************************************************************************/
+
+#define _WAITING_WIDGET_CPP_
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "waiting_widget.h"
+
+#include <knuminput.h>
+
+#include <kdebug.h>
+
+#include <actions.h>
+#include <action_data.h>
+
+#include "windowdef_list_widget.h"
+#include "kcmkhotkeys.h"
+
+namespace KHotKeys
+{
+
+Waiting_widget::Waiting_widget( TQWidget* parent_P, const char* name_P )
+    : Waiting_widget_ui( parent_P, name_P )
+    {
+    // KHotKeys::Module::changed()
+    connect(waiting_spinbox, TQ_SIGNAL(valueChanged(int)),
+        module, TQ_SLOT(changed()));
+    }
+
+void Waiting_widget::set_data( const Waiting_action* data_P )
+    {
+    if( data_P == NULL )
+        {
+        return;
+        }
+    waiting_spinbox->setValue(data_P->_waiting_time);
+    }
+
+Waiting_action* Waiting_widget::get_data( Action_data* data_P ) const
+    {
+    return new Waiting_action( data_P, waiting_spinbox->value());
+    }
+
+} // namespace KHotKeys
+
+#include "waiting_widget.moc"
diff --git a/khotkeys/kcontrol/waiting_widget.h b/khotkeys/kcontrol/waiting_widget.h
new file mode 100644
index 000000000..a339e2b98
--- /dev/null
+++ b/khotkeys/kcontrol/waiting_widget.h
@@ -0,0 +1,36 @@
+/****************************************************************************
+
+ KHotKeys
+
+ Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
+
+ Distributed under the terms of the GNU General Public License version 2.
+
+****************************************************************************/
+
+#ifndef _WAITING_WIDGET_H_
+#define _WAITING_WIDGET_H_
+
+#include <waiting_widget_ui.h>
+
+namespace KHotKeys
+{
+
+class Waiting_action;
+class Action_data;
+
+class Waiting_widget
+    : public Waiting_widget_ui
+    {
+    TQ_OBJECT
+    public:
+        Waiting_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
+        void set_data( const Waiting_action* data_P );
+        Waiting_action* get_data( Action_data* data_P ) const;
+    };
+
+typedef Waiting_widget Waiting_tab;
+
+} // namespace KHotKeys
+
+#endif
diff --git a/khotkeys/kcontrol/window_trigger_widget.cpp b/khotkeys/kcontrol/window_trigger_widget.cpp
index c897cf14a..ad8871504 100644
--- a/khotkeys/kcontrol/window_trigger_widget.cpp
+++ b/khotkeys/kcontrol/window_trigger_widget.cpp
@@ -33,14 +33,14 @@ Window_trigger_widget::Window_trigger_widget( TQWidget* parent_P, const char* na
     {
     clear_data();
     // KHotKeys::Module::changed()
-    connect( window_appears_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( window_disappears_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( window_activates_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( window_deactivates_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
+    connect( window_appears_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( window_disappears_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( window_activates_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( window_deactivates_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
     } 
 
 void Window_trigger_widget::clear_data()
diff --git a/khotkeys/kcontrol/window_trigger_widget.h b/khotkeys/kcontrol/window_trigger_widget.h
index c012a0bca..60efdf317 100644
--- a/khotkeys/kcontrol/window_trigger_widget.h
+++ b/khotkeys/kcontrol/window_trigger_widget.h
@@ -22,7 +22,7 @@ class Action_data;
 class Window_trigger_widget
     : public Window_trigger_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Window_trigger_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Window_trigger* trigger_P );
diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp
index dc16d780f..b36e46e0d 100644
--- a/khotkeys/kcontrol/windowdef_list_widget.cpp
+++ b/khotkeys/kcontrol/windowdef_list_widget.cpp
@@ -43,10 +43,10 @@ Windowdef_list_widget::Windowdef_list_widget( TQWidget* parent_P, const char* na
     {
     TQPopupMenu* popup = new TQPopupMenu; // CHECKME looks like setting parent doesn't work
     popup->insertItem( i18n( "Simple Window..." ), TYPE_WINDOWDEF_SIMPLE );
-    connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
+    connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int )));
 
-    connect( windows_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
-             this, TQT_SLOT( modify_pressed() ) );
+    connect( windows_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+             this, TQ_SLOT( modify_pressed() ) );
     new_button->setPopup( popup );
     windows_listview->header()->hide();
     windows_listview->addColumn( "" );
@@ -57,16 +57,16 @@ Windowdef_list_widget::Windowdef_list_widget( TQWidget* parent_P, const char* na
     delete_button->setEnabled( false );
     clear_data();
     // KHotKeys::Module::changed()
-    connect( new_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( copy_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( modify_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( delete_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
+    connect( new_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( copy_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( modify_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( delete_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( comment_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
     }
 
 Windowdef_list_widget::~Windowdef_list_widget()
diff --git a/khotkeys/kcontrol/windowdef_list_widget.h b/khotkeys/kcontrol/windowdef_list_widget.h
index 6e923c902..972bbdb05 100644
--- a/khotkeys/kcontrol/windowdef_list_widget.h
+++ b/khotkeys/kcontrol/windowdef_list_widget.h
@@ -30,7 +30,7 @@ class Windowdef_list_item;
 class Windowdef_list_widget
     : public Windowdef_list_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Windowdef_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         virtual ~Windowdef_list_widget();
@@ -84,7 +84,7 @@ class Windowdef_dialog
 class Windowdef_simple_dialog
     : public KDialogBase, public Windowdef_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Windowdef_simple_dialog( Windowdef_simple* window_P, TQObject* obj_P, const char* slot_P );
         virtual Windowdef* edit_windowdef();
diff --git a/khotkeys/kcontrol/windowdef_simple_widget.cpp b/khotkeys/kcontrol/windowdef_simple_widget.cpp
index e0a6671e7..381287166 100644
--- a/khotkeys/kcontrol/windowdef_simple_widget.cpp
+++ b/khotkeys/kcontrol/windowdef_simple_widget.cpp
@@ -37,31 +37,31 @@ Windowdef_simple_widget::Windowdef_simple_widget( TQWidget* parent_P, const char
     window_title_lineedit->setEnabled( false );
     window_class_lineedit->setEnabled( false );
     window_role_lineedit->setEnabled( false );
-    connect( autodetect_button, TQT_SIGNAL( clicked()), TQT_SLOT( autodetect_clicked()));
+    connect( autodetect_button, TQ_SIGNAL( clicked()), TQ_SLOT( autodetect_clicked()));
     clear_data();
     // KHotKeys::Module::changed()
-    connect( window_title_combo, TQT_SIGNAL( activated( int )),
-        module, TQT_SLOT( changed()));
-    connect( window_title_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( window_class_combo, TQT_SIGNAL( activated( int )),
-        module, TQT_SLOT( changed()));
-    connect( window_class_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( window_role_combo, TQT_SIGNAL( activated( int )),
-        module, TQT_SLOT( changed()));
-    connect( window_role_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( type_normal_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( type_dialog_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( type_dock_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( type_desktop_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
+    connect( window_title_combo, TQ_SIGNAL( activated( int )),
+        module, TQ_SLOT( changed()));
+    connect( window_title_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( window_class_combo, TQ_SIGNAL( activated( int )),
+        module, TQ_SLOT( changed()));
+    connect( window_class_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( window_role_combo, TQ_SIGNAL( activated( int )),
+        module, TQ_SLOT( changed()));
+    connect( window_role_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( type_normal_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( type_dialog_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( type_dock_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( type_desktop_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( comment_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
     }
 
 void Windowdef_simple_widget::clear_data()
@@ -144,9 +144,9 @@ void Windowdef_simple_widget::window_title_combo_changed( int item_P )
     
 void Windowdef_simple_widget::set_autodetect( TQObject* obj_P, const char* slot_P )
     {
-    disconnect( TQT_SIGNAL( autodetect_signal()));
+    disconnect( TQ_SIGNAL( autodetect_signal()));
     if( obj_P != NULL )
-        connect( this, TQT_SIGNAL( autodetect_signal()), obj_P, slot_P );
+        connect( this, TQ_SIGNAL( autodetect_signal()), obj_P, slot_P );
     }
     
 void Windowdef_simple_widget::autodetect_clicked()
@@ -157,7 +157,7 @@ void Windowdef_simple_widget::autodetect_clicked()
     
 void Windowdef_simple_widget::autodetect()
     {
-    WindowSelector* sel = new WindowSelector( TQT_TQOBJECT(this), TQT_SLOT( autodetect_window_selected( WId )));
+    WindowSelector* sel = new WindowSelector( this, TQ_SLOT( autodetect_window_selected( WId )));
     sel->select();
     }
 
diff --git a/khotkeys/kcontrol/windowdef_simple_widget.h b/khotkeys/kcontrol/windowdef_simple_widget.h
index 26db6fd87..0c21d3b2d 100644
--- a/khotkeys/kcontrol/windowdef_simple_widget.h
+++ b/khotkeys/kcontrol/windowdef_simple_widget.h
@@ -22,7 +22,7 @@ class Windowdef_list_item;
 class Windowdef_simple_widget
     : public Windowdef_simple_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Windowdef_simple_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Windowdef_simple* data_P );
diff --git a/khotkeys/kcontrol/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp
index d1cbe8f5f..d5a1f4859 100644
--- a/khotkeys/kcontrol/windowselector.cpp
+++ b/khotkeys/kcontrol/windowselector.cpp
@@ -29,13 +29,13 @@ namespace KHotKeys
 
 WindowSelector::WindowSelector( TQObject* receiver_P, const char* slot_P )
     {
-    connect( this, TQT_SIGNAL( selected_signal( WId )), receiver_P, slot_P );
+    connect( this, TQ_SIGNAL( selected_signal( WId )), receiver_P, slot_P );
     }
 
 void WindowSelector::select()
     {
-    kapp->desktop()->grabMouse( TQCursor( tqcrossCursor ));
-    kapp->installX11EventFilter( TQT_TQWIDGET(this) );
+    kapp->desktop()->grabMouse( TQCursor( TQt::crossCursor ));
+    kapp->installX11EventFilter( this );
     }
 
 bool WindowSelector::x11Event( XEvent* e )
diff --git a/khotkeys/kcontrol/windowselector.h b/khotkeys/kcontrol/windowselector.h
index 4f52312ea..0abb41811 100644
--- a/khotkeys/kcontrol/windowselector.h
+++ b/khotkeys/kcontrol/windowselector.h
@@ -17,9 +17,9 @@ namespace KHotKeys
 {
 
 class WindowSelector
-    : public QWidget
+    : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         WindowSelector( TQObject* receiver, const char* slot );
         void select();
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp
index c8590789a..69c853fed 100644
--- a/khotkeys/shared/actions.cpp
+++ b/khotkeys/shared/actions.cpp
@@ -54,7 +54,9 @@ Action* Action::create_cfg_read( TDEConfig& cfg_P, Action_data* data_P )
         return new Keyboard_input_action( cfg_P, data_P );
     if( type == "ACTIVATE_WINDOW" )
         return new Activate_window_action( cfg_P, data_P );
-    kdWarning( 1217 ) << "Unknown Action type read from cfg file\n";
+    if( type == "WAITING" )
+        return new Waiting_action( cfg_P, data_P );
+    kdWarning( 1217 ) << "Unknown Action type read from cfg file: " << type << endl;
     return NULL;
     }
 
@@ -452,4 +454,34 @@ Action* Activate_window_action::copy( Action_data* data_P ) const
     return new Activate_window_action( data_P, window()->copy());
     }
 
+// Waiting_action
+
+Waiting_action::Waiting_action( TDEConfig& cfg_P, Action_data* data_P )
+    : Action( cfg_P, data_P )
+    {
+    _waiting_time = cfg_P.readNumEntry("Time");
+    }
+
+void Waiting_action::cfg_write( TDEConfig& cfg_P ) const
+    {
+    base::cfg_write( cfg_P );
+    cfg_P.writeEntry( "Type", "WAITING" ); // overwrites value set in base::cfg_write()
+    cfg_P.writeEntry( "Time", _waiting_time);
+    }
+
+void Waiting_action::execute()
+    {
+		usleep(_waiting_time * 1000);
+    }
+
+TQString Waiting_action::description() const
+    {
+    return i18n( "Waiting %1 ms" ).arg(_waiting_time);
+    }
+
+Action* Waiting_action::copy( Action_data* data_P ) const
+    {
+    return new Waiting_action( data_P, _waiting_time);
+    }
+
 } // namespace KHotKeys
diff --git a/khotkeys/shared/actions.h b/khotkeys/shared/actions.h
index f381683e1..c7cabf0fc 100644
--- a/khotkeys/shared/actions.h
+++ b/khotkeys/shared/actions.h
@@ -50,7 +50,7 @@ class KDE_EXPORT Action_list
     : public TQPtrList< Action >
     {
     public:
-        Action_list( const TQString& comment_P ); // CHECKME nebo i data ?
+        Action_list( const TQString& comment_P );
         Action_list( TDEConfig& cfg_P, Action_data* data_P );
         void cfg_write( TDEConfig& cfg_P ) const;
         typedef TQPtrListIterator< Action > Iterator;
@@ -111,7 +111,7 @@ class KDE_EXPORT Dcop_action
         virtual TQString description() const;
         virtual Action* copy( Action_data* data_P ) const;
     private:
-        TQString app; // CHECKME TQCString ?
+        TQString app;
         TQString obj;
         TQString call;
         TQString args;
@@ -159,6 +159,21 @@ class KDE_EXPORT Activate_window_action
         const Windowdef_list* _window;
     };
         
+class KDE_EXPORT Waiting_action
+    : public Action
+    {
+    typedef Action base;
+    public:
+        Waiting_action( Action_data* data_P, const int waiting_time );
+        Waiting_action( TDEConfig& cfg_P, Action_data* data_P );
+        virtual void cfg_write( TDEConfig& cfg_P ) const;
+        virtual void execute();
+        virtual TQString description() const;
+        virtual Action* copy( Action_data* data_P ) const;
+
+        int _waiting_time;
+    };
+
 //***************************************************************************
 // Inline
 //***************************************************************************
@@ -300,6 +315,14 @@ const Windowdef_list* Activate_window_action::window() const
     return _window;
     }
 
+// Waiting_action
+
+inline
+Waiting_action::Waiting_action( Action_data* data_P, const int waiting_time)
+    : Action( data_P ), _waiting_time(waiting_time)
+    {
+    }
+
 } // namespace KHotKeys
-    
+
 #endif
diff --git a/khotkeys/shared/conditions.cpp b/khotkeys/shared/conditions.cpp
index b09284b44..1d9f37b9c 100644
--- a/khotkeys/shared/conditions.cpp
+++ b/khotkeys/shared/conditions.cpp
@@ -257,8 +257,8 @@ Active_window_condition::Active_window_condition( TDEConfig& cfg_P, Condition_li
 
 void Active_window_condition::init()
     {
-    connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )),
-        this, TQT_SLOT( active_window_changed( WId )));
+    connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )),
+        this, TQ_SLOT( active_window_changed( WId )));
     }
 
 bool Active_window_condition::match() const
@@ -323,8 +323,8 @@ Existing_window_condition::Existing_window_condition( TDEConfig& cfg_P, Conditio
 
 void Existing_window_condition::init()
     {
-    connect( windows_handler, TQT_SIGNAL( window_added( WId )), this, TQT_SLOT( window_added( WId )));
-    connect( windows_handler, TQT_SIGNAL( window_removed( WId )), this, TQT_SLOT( window_removed( WId )));
+    connect( windows_handler, TQ_SIGNAL( window_added( WId )), this, TQ_SLOT( window_added( WId )));
+    connect( windows_handler, TQ_SIGNAL( window_removed( WId )), this, TQ_SLOT( window_removed( WId )));
     }
 
 bool Existing_window_condition::match() const
diff --git a/khotkeys/shared/conditions.h b/khotkeys/shared/conditions.h
index ff1af7d07..8e5b9e813 100644
--- a/khotkeys/shared/conditions.h
+++ b/khotkeys/shared/conditions.h
@@ -87,7 +87,7 @@ class KDE_EXPORT Condition_list
 class KDE_EXPORT Active_window_condition
     : public TQObject, public Condition
     {
-    Q_OBJECT
+    TQ_OBJECT
     typedef Condition base;
     public:
         Active_window_condition( Windowdef_list* window_P, Condition_list_base* parent_P );
@@ -114,7 +114,7 @@ class KDE_EXPORT Active_window_condition
 class KDE_EXPORT Existing_window_condition
     : public TQObject, public Condition
     {
-    Q_OBJECT
+    TQ_OBJECT
     typedef Condition base;
     public:
         Existing_window_condition( Windowdef_list* window_P, Condition_list_base* parent_P );
diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp
index 9933ba74f..5777f9a4f 100644
--- a/khotkeys/shared/gestures.cpp
+++ b/khotkeys/shared/gestures.cpp
@@ -49,9 +49,9 @@ Gesture::Gesture( bool /*enabled_P*/, TQObject* parent_P )
     (void) new DeleteObject( this, parent_P );
     assert( gesture_handler == NULL );
     gesture_handler = this;
-    connect( &nostroke_timer, TQT_SIGNAL( timeout()), TQT_SLOT( stroke_timeout()));
-    connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )),
-        TQT_SLOT( active_window_changed( WId )));
+    connect( &nostroke_timer, TQ_SIGNAL( timeout()), TQ_SLOT( stroke_timeout()));
+    connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )),
+        TQ_SLOT( active_window_changed( WId )));
     }
       
 Gesture::~Gesture()
@@ -108,7 +108,7 @@ void Gesture::register_handler( TQObject* receiver_P, const char* slot_P )
     if( handlers.contains( receiver_P ))
         return;
     handlers[ receiver_P ] = true;
-    connect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )),
+    connect( this, TQ_SIGNAL( handle_gesture( const TQString&, WId )),
         receiver_P, slot_P );
     if( handlers.count() == 1 )
         update_grab();
@@ -119,7 +119,7 @@ void Gesture::unregister_handler( TQObject* receiver_P, const char* slot_P )
     if( !handlers.contains( receiver_P ))
         return;
     handlers.remove( receiver_P );
-    disconnect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )),
+    disconnect( this, TQ_SIGNAL( handle_gesture( const TQString&, WId )),
         receiver_P, slot_P );
     if( handlers.count() == 0 )
         update_grab();
diff --git a/khotkeys/shared/gestures.h b/khotkeys/shared/gestures.h
index 4f0f3f94c..01da65d00 100644
--- a/khotkeys/shared/gestures.h
+++ b/khotkeys/shared/gestures.h
@@ -65,7 +65,7 @@ class KDE_EXPORT Stroke
 class KDE_EXPORT Gesture
     : public TQWidget // not TQObject because of x11EventFilter()
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Gesture( bool enabled_P, TQObject* parent_P );
         virtual ~Gesture();
@@ -103,7 +103,7 @@ class KDE_EXPORT Gesture
 class DeleteObject
     : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         DeleteObject( TQWidget* widget_P, TQObject* parent_P )
             : TQObject( parent_P ), widget( widget_P ) {}
diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp
index 7b9696c7e..96338b055 100644
--- a/khotkeys/shared/input.cpp
+++ b/khotkeys/shared/input.cpp
@@ -106,12 +106,12 @@ void Kbd::grab_shortcut( const TDEShortcut& shortcut_P )
         // CHECKME ugly ugly hack
         TQString name = ' ' + TQString::number( keycode_P );
         kga->insertItem( "", name, keycode_P );
-        kga->connectItem( name, this, TQT_SLOT( key_slot( int )));
+        kga->connectItem( name, this, TQ_SLOT( key_slot( int )));
 #endif
         TQString name = ' ' + shortcut_P.toStringInternal();
         kga->insert( name, name, TQString::null, shortcut_P, shortcut_P,
-            this, TQT_SLOT( key_slot( TQString )));
-        TQTimer::singleShot( 0, this, TQT_SLOT( update_connections()));
+            this, TQ_SLOT( key_slot( TQString )));
+        TQTimer::singleShot( 0, this, TQ_SLOT( update_connections()));
         }
     }
     
@@ -129,7 +129,7 @@ void Kbd::ungrab_shortcut( const TDEShortcut& shortcut_P )
 #endif
         kga->remove( ' ' + shortcut_P.toStringInternal());
         grabs.remove( shortcut_P );
-        TQTimer::singleShot( 0, this, TQT_SLOT( update_connections()));
+        TQTimer::singleShot( 0, this, TQ_SLOT( update_connections()));
         }
     }
 
diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h
index c6bbdf1e5..e810cea80 100644
--- a/khotkeys/shared/input.h
+++ b/khotkeys/shared/input.h
@@ -35,7 +35,7 @@ class Kbd_receiver
 class Kbd
     : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
 	Kbd( bool grabbing_enabled_P, TQObject* parent_P );
         virtual ~Kbd();
diff --git a/khotkeys/shared/khlistbox.cpp b/khotkeys/shared/khlistbox.cpp
index ff6d96221..f0080d6de 100644
--- a/khotkeys/shared/khlistbox.cpp
+++ b/khotkeys/shared/khlistbox.cpp
@@ -25,15 +25,15 @@ KHListBox::KHListBox( TQWidget* parent_P, const char* name_P )
     : TQListBox( parent_P, name_P ), saved_current_item( NULL ),
         in_clear( false ), force_select( false )
     {
-    connect( this, TQT_SIGNAL( selectionChanged( TQListBoxItem* )),
-        TQT_SLOT( slot_selection_changed( TQListBoxItem* )));
-    connect( this, TQT_SIGNAL( currentChanged( TQListBoxItem* )),
-        TQT_SLOT( slot_current_changed( TQListBoxItem* )));
+    connect( this, TQ_SIGNAL( selectionChanged( TQListBoxItem* )),
+        TQ_SLOT( slot_selection_changed( TQListBoxItem* )));
+    connect( this, TQ_SIGNAL( currentChanged( TQListBoxItem* )),
+        TQ_SLOT( slot_current_changed( TQListBoxItem* )));
     // CHECKME grrr
-    connect( this, TQT_SIGNAL( selectionChanged()),
-        TQT_SLOT( slot_selection_changed()));
-    connect( &insert_select_timer, TQT_SIGNAL( timeout()),
-        TQT_SLOT( slot_insert_select()));
+    connect( this, TQ_SIGNAL( selectionChanged()),
+        TQ_SLOT( slot_selection_changed()));
+    connect( &insert_select_timer, TQ_SIGNAL( timeout()),
+        TQ_SLOT( slot_insert_select()));
     }
 
 void KHListBox::slot_selection_changed()
diff --git a/khotkeys/shared/khlistbox.h b/khotkeys/shared/khlistbox.h
index d0f9b51ae..8f4a77138 100644
--- a/khotkeys/shared/khlistbox.h
+++ b/khotkeys/shared/khlistbox.h
@@ -21,7 +21,7 @@ namespace KHotKeys
 class KHListBox
     : public TQListBox
     {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect )
     public:
         KHListBox( TQWidget* parent_P, const char* name_P = NULL );
diff --git a/khotkeys/shared/khlistview.cpp b/khotkeys/shared/khlistview.cpp
index ae348af33..a9943996a 100644
--- a/khotkeys/shared/khlistview.cpp
+++ b/khotkeys/shared/khlistview.cpp
@@ -25,15 +25,15 @@ KHListView::KHListView( TQWidget* parent_P, const char* name_P )
     : TDEListView( parent_P, name_P ), saved_current_item( NULL ),
         in_clear( false ), ignore( false ), force_select( false )
     {
-    connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem* )),
-        TQT_SLOT( slot_selection_changed( TQListViewItem* )));
-    connect( this, TQT_SIGNAL( currentChanged( TQListViewItem* )),
-        TQT_SLOT( slot_current_changed( TQListViewItem* )));
+    connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem* )),
+        TQ_SLOT( slot_selection_changed( TQListViewItem* )));
+    connect( this, TQ_SIGNAL( currentChanged( TQListViewItem* )),
+        TQ_SLOT( slot_current_changed( TQListViewItem* )));
     // CHECKME grrr
-    connect( this, TQT_SIGNAL( selectionChanged()),
-        TQT_SLOT( slot_selection_changed()));
-    connect( &insert_select_timer, TQT_SIGNAL( timeout()),
-        TQT_SLOT( slot_insert_select()));
+    connect( this, TQ_SIGNAL( selectionChanged()),
+        TQ_SLOT( slot_selection_changed()));
+    connect( &insert_select_timer, TQ_SIGNAL( timeout()),
+        TQ_SLOT( slot_insert_select()));
     }
 
 void KHListView::slot_selection_changed()
diff --git a/khotkeys/shared/khlistview.h b/khotkeys/shared/khlistview.h
index 2cee34617..1a0f27e2b 100644
--- a/khotkeys/shared/khlistview.h
+++ b/khotkeys/shared/khlistview.h
@@ -22,7 +22,7 @@ namespace KHotKeys
 class KDE_EXPORT KHListView
     : public TDEListView
     {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect )
     public:
         KHListView( TQWidget* parent_P, const char* name_P = NULL );
diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp
index 76adac6b9..becacd5d1 100644
--- a/khotkeys/shared/settings.cpp
+++ b/khotkeys/shared/settings.cpp
@@ -145,9 +145,11 @@ void Settings::write_settings()
         gestures_exclude->cfg_write( cfg );
         }
     else
+        {
         cfg.deleteGroup( "GesturesExclude" );
-	cfg.setGroup( "Voice" );
-	cfg.writeEntry("Shortcut" , voice_shortcut.toStringInternal() );
+        }
+    cfg.setGroup( "Voice" );
+    cfg.writeEntry("Shortcut" , voice_shortcut.toStringInternal() );
 
     }
 
diff --git a/khotkeys/shared/soundrecorder.h b/khotkeys/shared/soundrecorder.h
index c7e55fc22..5a770abbe 100644
--- a/khotkeys/shared/soundrecorder.h
+++ b/khotkeys/shared/soundrecorder.h
@@ -36,7 +36,7 @@ namespace KHotKeys
 */
 class KDE_EXPORT SoundRecorder : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     static SoundRecorder* create( TQObject* parent = 0, const char* name = 0 );
     virtual ~SoundRecorder();
diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp
index 115bc6687..1b6e903b7 100644
--- a/khotkeys/shared/triggers.cpp
+++ b/khotkeys/shared/triggers.cpp
@@ -197,13 +197,13 @@ Window_trigger::~Window_trigger()
 void Window_trigger::init()
     {
     kdDebug( 1217 ) << "Window_trigger::init()" << endl;
-    connect( windows_handler, TQT_SIGNAL( window_added( WId )), this, TQT_SLOT( window_added( WId )));
-    connect( windows_handler, TQT_SIGNAL( window_removed( WId )), this, TQT_SLOT( window_removed( WId )));
+    connect( windows_handler, TQ_SIGNAL( window_added( WId )), this, TQ_SLOT( window_added( WId )));
+    connect( windows_handler, TQ_SIGNAL( window_removed( WId )), this, TQ_SLOT( window_removed( WId )));
     if( window_actions & ( WINDOW_ACTIVATES | WINDOW_DEACTIVATES /*| WINDOW_DISAPPEARS*/ ))
-        connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )),
-            this, TQT_SLOT( active_window_changed( WId )));
-    connect( windows_handler, TQT_SIGNAL( window_changed( WId, unsigned int )),
-        this, TQT_SLOT( window_changed( WId, unsigned int )));
+        connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )),
+            this, TQ_SLOT( active_window_changed( WId )));
+    connect( windows_handler, TQ_SIGNAL( window_changed( WId, unsigned int )),
+        this, TQ_SLOT( window_changed( WId, unsigned int )));
     }
 
 void Window_trigger::activate( bool activate_P )
@@ -277,6 +277,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P )
     bool matches = windows()->match( Window_data( window_P ));
     existing_windows[ window_P ] = matches;
     if( active && matches && !was_match )
+        {
         if( window_actions & WINDOW_APPEARS )
             {
             windows_handler->set_action_window( window_P );
@@ -287,6 +288,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P )
             windows_handler->set_action_window( window_P );
             data->execute();
             }
+        }
     kdDebug( 1217 ) << "Window_trigger::w_changed() : " << was_match << "|" << matches << endl;
     }
 
@@ -333,7 +335,7 @@ Gesture_trigger::Gesture_trigger( TDEConfig& cfg_P, Action_data* data_P )
 
 Gesture_trigger::~Gesture_trigger()
     {
-    gesture_handler->unregister_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId )));
+    gesture_handler->unregister_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId )));
     }
 
 void Gesture_trigger::cfg_write( TDEConfig& cfg_P ) const
@@ -366,9 +368,9 @@ void Gesture_trigger::handle_gesture( const TQString &gesture_P, WId window_P )
 void Gesture_trigger::activate( bool activate_P )
     {
     if( activate_P )
-        gesture_handler->register_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId )));
+        gesture_handler->register_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId )));
     else
-        gesture_handler->unregister_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId )));
+        gesture_handler->unregister_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId )));
     }
 
 
diff --git a/khotkeys/shared/triggers.h b/khotkeys/shared/triggers.h
index c74a3a54a..3ed2171f0 100644
--- a/khotkeys/shared/triggers.h
+++ b/khotkeys/shared/triggers.h
@@ -82,7 +82,7 @@ class KDE_EXPORT Shortcut_trigger
 class KDE_EXPORT Window_trigger
     : public TQObject, public Trigger        
     {
-    Q_OBJECT
+    TQ_OBJECT
     typedef Trigger base;
     public:
         enum window_action_t
@@ -124,7 +124,7 @@ class KDE_EXPORT Window_trigger
 class KDE_EXPORT Gesture_trigger
     : public TQObject, public Trigger
     {
-    Q_OBJECT
+    TQ_OBJECT
     typedef Trigger base;
     public:
         Gesture_trigger( Action_data* data_P, const TQString& gesture_P );
@@ -145,7 +145,7 @@ class KDE_EXPORT Gesture_trigger
 class KDE_EXPORT Voice_trigger
     : public TQObject, public Trigger
     {
-    Q_OBJECT
+    TQ_OBJECT
     typedef Trigger base;
     public:
 		Voice_trigger( Action_data* data_P, const TQString& Voice_P, const VoiceSignature & signature1_P, const VoiceSignature & signature2_P );
diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp
index a31ac8237..031f75c78 100644
--- a/khotkeys/shared/voices.cpp
+++ b/khotkeys/shared/voices.cpp
@@ -95,7 +95,7 @@ void Voice::record_start()
 	if(!_recorder)
 	{
 		_recorder= SoundRecorder::create(this);
-		connect(_recorder, TQT_SIGNAL(recorded(const Sound& )), this, TQT_SLOT(slot_sound_recorded(const Sound& )));
+		connect(_recorder, TQ_SIGNAL(recorded(const Sound& )), this, TQ_SLOT(slot_sound_recorded(const Sound& )));
 	}
 
 	_recorder->start();
@@ -208,7 +208,7 @@ void Voice::set_shortcut( const TDEShortcut &shortcut)
         _kga = new TDEGlobalAccel( this );	
     _kga->remove("voice");
 
-	_kga->insert( "voice", i18n("Voice"), TQString::null,  shortcut, 0, this, TQT_SLOT(slot_key_pressed())) ;
+	_kga->insert( "voice", i18n("Voice"), TQString::null,  shortcut, 0, this, TQ_SLOT(slot_key_pressed())) ;
         _kga->updateConnections();
 }
 
@@ -224,7 +224,7 @@ void Voice::slot_key_pressed()
 		if(!_timer)
 		{
 			_timer=new TQTimer(this);
-			connect(_timer, TQT_SIGNAL(timeout()) , this, TQT_SLOT(slot_timeout()));
+			connect(_timer, TQ_SIGNAL(timeout()) , this, TQ_SLOT(slot_timeout()));
 		}
 		
 		_timer->start(1000*20,true);
diff --git a/khotkeys/shared/voices.h b/khotkeys/shared/voices.h
index ccd07563f..ccf7943fc 100644
--- a/khotkeys/shared/voices.h
+++ b/khotkeys/shared/voices.h
@@ -30,7 +30,7 @@ class VoiceSignature;
 
 class KDE_EXPORT Voice  : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Voice( bool enabled_P, TQObject* parent_P );
         virtual ~Voice();
diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp
index 077bf7b1d..e91e41df3 100644
--- a/khotkeys/shared/windows.cpp
+++ b/khotkeys/shared/windows.cpp
@@ -45,10 +45,10 @@ Windows::Windows( bool enable_signal_P, TQObject* parent_P )
     windows_handler = this;
     if( signals_enabled )
         {
-        connect( twin_module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( window_added_slot( WId )));
-        connect( twin_module, TQT_SIGNAL( windowRemoved( WId )), TQT_SLOT( window_removed_slot( WId )));
-        connect( twin_module, TQT_SIGNAL( activeWindowChanged( WId )),
-            TQT_SLOT( active_window_changed_slot( WId )));
+        connect( twin_module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( window_added_slot( WId )));
+        connect( twin_module, TQ_SIGNAL( windowRemoved( WId )), TQ_SLOT( window_removed_slot( WId )));
+        connect( twin_module, TQ_SIGNAL( activeWindowChanged( WId )),
+            TQ_SLOT( active_window_changed_slot( WId )));
         }
     }
 
diff --git a/khotkeys/shared/windows.h b/khotkeys/shared/windows.h
index 4fa403436..e9868e52b 100644
--- a/khotkeys/shared/windows.h
+++ b/khotkeys/shared/windows.h
@@ -37,7 +37,7 @@ class Windowdef_list;
 class KDE_EXPORT Windows
     : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Windows( bool enable_signals_P, TQObject* parent_P );
         virtual ~Windows();
diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp
index 3368ee21e..19e503ac5 100644
--- a/khotkeys/update/update.cpp
+++ b/khotkeys/update/update.cpp
@@ -46,7 +46,7 @@ int main( int argc, char* argv[] )
         kdWarning() << "File " << id << " not found!" << endl;
         return 1;
         }
-    init_global_data( false, TQT_TQOBJECT(&app) );
+    init_global_data( false, &app );
     Settings settings;
     settings.read_settings( true );
     TDEConfig cfg( file, true );
diff --git a/kicker/HACKING b/kicker/HACKING
index c03925cdc..12f48652d 100644
--- a/kicker/HACKING
+++ b/kicker/HACKING
@@ -3,10 +3,10 @@ The Short Story
 Four space tabs, braces on their own lines, 80 character lines.
 Code should look something like this:
 
-QString ExtensionManager::uniqueId()
+TQString ExtensionManager::uniqueId()
 {
-    QString idBase = "Extension_%1";
-    QString newId;
+    TQString idBase = "Extension_%1";
+    TQString newId;
     int i = 0;
     bool unique = false;
 
@@ -255,7 +255,7 @@ from tight loops or is in a hot path) or if it is a simple, one-liner
 setter/getter method. Otherwise methods should be implemented outside of
 the class definition.
 
-[1] macros include things like Q_OBJECT and K_DCOP. the should ONLY appear in
+[1] macros include things like TQ_OBJECT and K_DCOP. the should ONLY appear in
 files where they are actually necessary and not just randomly thrown in there
 for fun. ;-)
 
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 86ee8b059..7cbb5a6c8 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -84,7 +84,7 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent,
     setIcon(SmallIcon("date"));
 
     settings = new SettingsWidgetImp(prefs, zone, 0, "General");
-    connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));
+    connect(settings->kcfg_Type, TQ_SIGNAL(activated(int)), TQ_SLOT(selectPage(int)));
 
     settings->kcfg_PlainBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
     settings->kcfg_DateBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
@@ -104,24 +104,24 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent,
     settings->widgetStack->addWidget(fuzzyPage, 3);
     fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
 
-    connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(settings->kcfg_PlainShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDate), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDate), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
+    connect(settings->kcfg_PlainShowDate, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(settings->kcfg_PlainShowDayOfWeek, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(digitalPage->kcfg_DigitalShowDate, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(digitalPage->kcfg_DigitalShowDayOfWeek, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(digitalPage->kcfg_DigitalShowDate, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(analogPage->kcfg_AnalogShowDate, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(analogPage->kcfg_AnalogShowDayOfWeek, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(fuzzyPage->kcfg_FuzzyShowDate, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
 
     addPage(settings, i18n("General"), TQString::fromLatin1("package_settings"));
 }
@@ -144,7 +144,7 @@ void TDEConfigDialogSingle::updateWidgetsDefault()
     item->swapDefault();
     // This is ugly, but kcfg_Type does not have its correct setting
     // at this point in time.
-    TQTimer::singleShot(0, this, TQT_SLOT(dateToggled()));
+    TQTimer::singleShot(0, this, TQ_SLOT(dateToggled()));
 }
 
 void TDEConfigDialogSingle::selectPage(int p)
@@ -425,7 +425,7 @@ void DigitalClock::drawContents( TQPainter * p)
     p->translate( +1, +1 );
     TQLCDNumber::drawContents( p );
     if (_prefs->digitalLCDStyle())
-        pal.setColor( TQColorGroup::Foreground, Qt::black);
+        pal.setColor( TQColorGroup::Foreground, TQt::black);
     else
         pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor());
     setPalette( pal );
@@ -633,8 +633,8 @@ void AnalogClock::paintEvent( TQPaintEvent * )
         }
 
         if (_prefs->analogLCDStyle()) {
-            paint.setPen( TQPen(Qt::black, aaFactor) );
-            paint.setBrush( Qt::black );
+            paint.setPen( TQPen(TQt::black, aaFactor) );
+            paint.setBrush( TQt::black );
         } else {
             paint.setPen( TQPen(_prefs->analogForegroundColor(), aaFactor) );
             paint.setBrush( _prefs->analogForegroundColor() );
@@ -743,7 +743,7 @@ FuzzyClock::FuzzyClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, cons
 void FuzzyClock::deleteMyself()
 {
     if(alreadyDrawing) // try again later
-        TQTimer::singleShot(1000, this, TQT_SLOT(deleteMyself()));
+        TQTimer::singleShot(1000, this, TQ_SLOT(deleteMyself()));
     else
         delete this;
 }
@@ -854,7 +854,7 @@ void FuzzyClock::drawContents(TQPainter *p)
 
     TQRect tr;
 
-    if (_applet->getOrientation() == Qt::Vertical)
+    if (_applet->getOrientation() == TQt::Vertical)
     {
         p->rotate(90);
         tr = TQRect(4, -2, height() - 8, -(width()) + 2);
@@ -917,9 +917,9 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
     _date->setBackgroundOrigin(AncestorOrigin);
     _date->installEventFilter(this);   // catch mouse clicks
 
-    connect(m_layoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout()));
-    connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate()));
-    connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(globalPaletteChange()));
+    connect(m_layoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fixupLayout()));
+    connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdate()));
+    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(globalPaletteChange()));
 
     reconfigure();    // initialize clock widget
     slotUpdate();
@@ -927,8 +927,8 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
     if (kapp->authorizeTDEAction("kicker_rmb"))
     {
         menu = new TDEPopupMenu();
-        connect(menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu()));
-        connect(menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+        connect(menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu()));
+        connect(menu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
         setCustomMenu(menu);
     }
 
@@ -970,7 +970,7 @@ KTextShadowEngine *ClockApplet::shadowEngine()
 
 int ClockApplet::widthForHeight(int h) const
 {
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         return width();
     }
@@ -1081,7 +1081,7 @@ int ClockApplet::widthForHeight(int h) const
 
 int ClockApplet::heightForWidth(int w) const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return height();
     }
@@ -1156,7 +1156,7 @@ void ClockApplet::preferences(bool timezone)
   if (!dialog)
   {
     dialog = new TDEConfigDialogSingle(zone, this, configFileName, _prefs, KDialogBase::Swallow);
-    connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotReconfigure()));
+    connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotReconfigure()));
   }
 
   if (timezone)
@@ -1242,7 +1242,7 @@ void ClockApplet::reconfigure()
     m_updateOnTheMinute = updateInterval != shortInterval;
     if (m_updateOnTheMinute)
     {
-        connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
+        connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60()));
         updateInterval = ((60 - clockGetTime().second()) * 1000) + 500;
     }
     else
@@ -1250,7 +1250,7 @@ void ClockApplet::reconfigure()
         // in case we reconfigure to show seconds but setTimerTo60 is going to be called
         // we need to make sure to disconnect this so we don't end up updating only once
         // a minute ;)
-        disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
+        disconnect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60()));
     }
 
     _timer->start(updateInterval);
@@ -1300,7 +1300,7 @@ void ClockApplet::reconfigure()
 void ClockApplet::setTimerTo60()
 {
 //    kdDebug() << "setTimerTo60" << endl;
-    disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
+    disconnect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60()));
     _timer->changeInterval(60000);
 }
 
@@ -1417,7 +1417,7 @@ void ClockApplet::slotUpdate()
 
         if (seconds > 2)
         {
-            connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
+            connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60()));
             _timer->changeInterval(((60 - seconds) * 1000) + 500);
         }
     }
@@ -1430,7 +1430,7 @@ void ClockApplet::slotCalendarDeleted()
     _calendar = 0L;
     // don't reopen the calendar immediately ...
     _disableCalendar = true;
-    TQTimer::singleShot(100, this, TQT_SLOT(slotEnableCalendar()));
+    TQTimer::singleShot(100, this, TQ_SLOT(slotEnableCalendar()));
 
     // we are free to show a tip know :)
     installEventFilter(KickerTip::the());
@@ -1460,7 +1460,7 @@ void ClockApplet::toggleCalendar()
     removeEventFilter(KickerTip::the());
 
     _calendar = new DatePicker(this, _lastDate, _prefs);
-    connect(_calendar, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCalendarDeleted()));
+    connect(_calendar, TQ_SIGNAL(destroyed()), TQ_SLOT(slotCalendarDeleted()));
 
     TQSize size = _prefs->calendarSize();
 
@@ -1542,24 +1542,24 @@ void ClockApplet::aboutToShowContextMenu()
 
     TDELocale *loc = TDEGlobal::locale();
     TQDateTime dt = TQDateTime::currentDateTime();
-    dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset));
+    dt = dt.addSecs(TZoffset);
 
     TDEPopupMenu *copyMenu = new TDEPopupMenu( menu );
     copyMenu->insertItem(loc->formatDateTime(dt), 201);
-    copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date())), 202);
-    copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date()), true), 203);
-    copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time())), 204);
-    copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time()), true), 205);
+    copyMenu->insertItem(loc->formatDate(dt.date()), 202);
+    copyMenu->insertItem(loc->formatDate(dt.date(), true), 203);
+    copyMenu->insertItem(loc->formatTime(dt.time()), 204);
+    copyMenu->insertItem(loc->formatTime(dt.time(), true), 205);
     copyMenu->insertItem(dt.date().toString(), 206);
     copyMenu->insertItem(dt.time().toString(), 207);
     copyMenu->insertItem(dt.toString(), 208);
     copyMenu->insertItem(dt.toString("yyyy-MM-dd hh:mm:ss"), 209);
-    connect( copyMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotCopyMenuActivated(int) ) );
+    connect( copyMenu, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotCopyMenuActivated(int) ) );
 
     if (!bImmutable)
     {
         TDEPopupMenu *zoneMenu = new TDEPopupMenu( menu );
-        connect(zoneMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+        connect(zoneMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
         for (int i = 0; i <= zone->remoteZoneCount(); i++)
         {
             if (i == 0)
@@ -1576,7 +1576,7 @@ void ClockApplet::aboutToShowContextMenu()
         zoneMenu->insertItem(SmallIcon("configure"), i18n("&Configure Timezones..."), 110);
 
         TDEPopupMenu *type_menu = new TDEPopupMenu(menu);
-        connect(type_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+        connect(type_menu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
         type_menu->insertItem(i18n("&Plain"), Prefs::EnumType::Plain, 1);
         type_menu->insertItem(i18n("&Digital"), Prefs::EnumType::Digital, 2);
         type_menu->insertItem(i18n("&Analog"), Prefs::EnumType::Analog, 3);
@@ -1610,12 +1610,12 @@ void ClockApplet::slotCopyMenuActivated( int id )
 
 TQTime ClockApplet::clockGetTime()
 {
-    return TQT_TQTIME_OBJECT(TQTime::currentTime().addSecs(TZoffset));
+    return TQTime::currentTime().addSecs(TZoffset);
 }
 
 TQDate ClockApplet::clockGetDate()
 {
-    return TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().addSecs(TZoffset).date());
+    return TQDateTime::currentDateTime().addSecs(TZoffset).date();
 }
 
 void ClockApplet::showZone(int z)
@@ -1642,13 +1642,13 @@ void ClockApplet::mousePressEvent(TQMouseEvent *ev)
 {
     switch (ev->button()) 
     {
-        case Qt::LeftButton:
+        case TQt::LeftButton:
             toggleCalendar();
             break;
-        case Qt::RightButton:
+        case TQt::RightButton:
             openContextMenu();
             break;
-        case Qt::MidButton:
+        case TQt::MidButton:
             nextZone();
             TQToolTip::remove(_clock->widget());
             break;
@@ -1675,10 +1675,10 @@ void ClockApplet::wheelEvent(TQWheelEvent* e)
 // catch the mouse clicks of our child widgets
 bool ClockApplet::eventFilter( TQObject *o, TQEvent *e )
 {
-    if (( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_clock->widget()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_date) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_dayOfWeek)) &&
+    if (( o == _clock->widget() || o == _date || o == _dayOfWeek) &&
         e->type() == TQEvent::MouseButtonPress )
     {
-        mousePressEvent(TQT_TQMOUSEEVENT(e) );
+        mousePressEvent(static_cast<TQMouseEvent*>(e) );
         return true;
     }
 
@@ -1794,7 +1794,7 @@ void ClockApplet::fixupLayout()
     // this fixes problems triggered by having the date first
     // because of the date format (e.g. YY/MM/DD) and then hiding
     // the date
-    if (orientation() == Qt::Horizontal && height() < 32)
+    if (orientation() == TQt::Horizontal && height() < 32)
     {
         bool mustShowDate = showDate || (zone->zoneIndex() != 0);
 
@@ -1840,7 +1840,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
          (m_clock->type() == Prefs::EnumType::Analog) )
     {
         // show full time (incl. hour) as tooltip for Fuzzy clock
-        tipText = TDEGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset)));
+        tipText = TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset));
     }
     else
     {
diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h
index 36e5f00bf..9f4031539 100644
--- a/kicker/applets/clock/clock.h
+++ b/kicker/applets/clock/clock.h
@@ -66,7 +66,7 @@ class SettingsWidgetImp;
 
 class SettingsWidgetImp : public SettingsWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     public:
         SettingsWidgetImp(Prefs *p=0,
@@ -84,7 +84,7 @@ class SettingsWidgetImp : public SettingsWidget
 
 class TDEConfigDialogSingle : public TDEConfigDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     public:
         TDEConfigDialogSingle(Zone *zone,
@@ -139,7 +139,7 @@ class ClockWidget
 
 class PlainClock : public TQLabel, public ClockWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         PlainClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0);
@@ -162,7 +162,7 @@ class PlainClock : public TQLabel, public ClockWidget
 
 class DigitalClock : public TQLCDNumber, public ClockWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         DigitalClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0);
@@ -189,7 +189,7 @@ class DigitalClock : public TQLCDNumber, public ClockWidget
 
 class AnalogClock : public TQFrame, public ClockWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         AnalogClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0);
@@ -216,7 +216,7 @@ class AnalogClock : public TQFrame, public ClockWidget
 
 class FuzzyClock : public TQFrame, public ClockWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         FuzzyClock(ClockApplet *applet, Prefs* prefs, TQWidget *parent=0, const char *name=0);
@@ -260,7 +260,7 @@ class ClockAppletToolTip : public TQToolTip
 
 class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
   friend class ClockAppletToolTip;
diff --git a/kicker/applets/clock/datepicker.cpp b/kicker/applets/clock/datepicker.cpp
index d6165306e..99b9fe33e 100644
--- a/kicker/applets/clock/datepicker.cpp
+++ b/kicker/applets/clock/datepicker.cpp
@@ -69,7 +69,7 @@ void DatePicker::keyPressEvent(TQKeyEvent *e)
 {
     TQVBox::keyPressEvent(e);
 
-    if (e->key() == Qt::Key_Escape)
+    if (e->key() == TQt::Key_Escape)
     {
         close();
     }
diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui
index e8ced7f2d..c63eb7d32 100644
--- a/kicker/applets/clock/digital.ui
+++ b/kicker/applets/clock/digital.ui
@@ -293,9 +293,9 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">tdefontrequester.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>kcfg_DigitalLCDStyle_stateChanged( int )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui
index 81e126560..bd33473cd 100644
--- a/kicker/applets/clock/settings.ui
+++ b/kicker/applets/clock/settings.ui
@@ -509,9 +509,9 @@
     <include location="global" impldecl="in implementation">tdefontrequester.h</include>
     <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>configureType()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index aa9126b8c..85a4f3f19 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -85,7 +85,7 @@ int Zone::calc_TZ_offset(const TQString& zone, bool /* reset */)
 
   if (z)
   {
-    return -z->offset(Qt::LocalTime);
+    return -z->offset(TQt::LocalTime);
   }
 
   return 0;
diff --git a/kicker/applets/launcher/configdlg.cpp b/kicker/applets/launcher/configdlg.cpp
index d542d2593..88301b7cf 100644
--- a/kicker/applets/launcher/configdlg.cpp
+++ b/kicker/applets/launcher/configdlg.cpp
@@ -47,8 +47,8 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config,
         m_ui->iconDim->insertItem(TQString::number(
             m_settings->iconDimChoices()[n]));
     }
-    connect(m_ui->iconDim, TQT_SIGNAL(textChanged(const TQString&)),
-            this, TQT_SLOT(updateButtons()));
+    connect(m_ui->iconDim, TQ_SIGNAL(textChanged(const TQString&)),
+            this, TQ_SLOT(updateButtons()));
     updateWidgets();
     m_oldIconDimText = m_ui->iconDim->currentText();
     updateButtons();
diff --git a/kicker/applets/launcher/configdlg.h b/kicker/applets/launcher/configdlg.h
index b96caf459..14fda2cac 100644
--- a/kicker/applets/launcher/configdlg.h
+++ b/kicker/applets/launcher/configdlg.h
@@ -31,7 +31,7 @@ class Prefs;
 
 class ConfigDlg : public TDEConfigDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ConfigDlg(TQWidget *parent, const char *name, Prefs *config, int autoSize,
diff --git a/kicker/applets/launcher/flowgridmanager.cpp b/kicker/applets/launcher/flowgridmanager.cpp
index 46c79a857..5172b4eee 100644
--- a/kicker/applets/launcher/flowgridmanager.cpp
+++ b/kicker/applets/launcher/flowgridmanager.cpp
@@ -17,7 +17,7 @@ FlowGridManager::FlowGridManager(TQSize p_item_size,
                                  TQSize p_space_size,
                                  TQSize p_border_size,
                                  TQSize p_frame_size,
-                                 Qt::Orientation orient,
+                                 TQt::Orientation orient,
                                  int num_items,
                                  Slack slack_x,Slack slack_y)
 {
@@ -65,15 +65,15 @@ void FlowGridManager::setFrameSize(TQSize p_frame_size)
         return;
     _pFrameSize=p_frame_size;
     if (_pFrameSize.width()<=0) {
-        _orientation=Qt::Vertical;
+        _orientation=TQt::Vertical;
     }
     if (_pFrameSize.height()<=0) {
-        _orientation=Qt::Horizontal;
+        _orientation=TQt::Horizontal;
     }
     _dirty=true;
 }
 
-void FlowGridManager::setOrientation(Qt::Orientation orient)
+void FlowGridManager::setOrientation(TQt::Orientation orient)
 {   if (orient==_orientation)
         return;
     _orientation=orient; _dirty=true;
@@ -114,7 +114,7 @@ TQSize  FlowGridManager::frameSize() const
 TQPoint FlowGridManager::origin() const
 {   _checkReconfigure();  return _origin;}
 
-Qt::Orientation FlowGridManager::orientation() const
+TQt::Orientation FlowGridManager::orientation() const
 {   _checkReconfigure();  return _orientation;}
 
 /*Slack FlowGridManager::slackX() const
@@ -154,7 +154,7 @@ TQPoint FlowGridManager::cell(int index) const
 // return height if orientation is Horizontal
 // return width if orientation is Vertical
 int FlowGridManager::_getHH(TQSize size) const
-{  if (_orientation==Qt::Horizontal)
+{  if (_orientation==TQt::Horizontal)
         return size.height();
     return size.width();
 }
@@ -162,14 +162,14 @@ int FlowGridManager::_getHH(TQSize size) const
 // return height if orientation is Vertical
 // return width if orientation is Horizontal
 int FlowGridManager::_getWH(TQSize size) const
-{  if (_orientation==Qt::Horizontal)
+{  if (_orientation==TQt::Horizontal)
         return size.width();
     return size.height();
 }
 
 // swap horizontal and vertical if orientation is Vertical, otherwise return arg
 TQSize FlowGridManager::_swapHV(TQSize hv) const
-{  if (_orientation==Qt::Horizontal)
+{  if (_orientation==TQt::Horizontal)
         return hv;
     TQSize temp=hv;
     temp.transpose();
diff --git a/kicker/applets/launcher/flowgridmanager.h b/kicker/applets/launcher/flowgridmanager.h
index c801431b4..228210884 100644
--- a/kicker/applets/launcher/flowgridmanager.h
+++ b/kicker/applets/launcher/flowgridmanager.h
@@ -26,7 +26,7 @@ public:
                                      TQSize p_space_size=TQSize(0,0),
                                      TQSize p_border_size=TQSize(0,0),
                                      TQSize frame_size=TQSize(0,0),
-                                     Qt::Orientation orient=Qt::Horizontal,
+                                     TQt::Orientation orient=TQt::Horizontal,
                                      int num_items=0,
                                      Slack slack_x=ItemSlack,
                                      Slack slack_y=ItemSlack);
@@ -36,7 +36,7 @@ public:
     void setItemSize(TQSize item_size);
     void setSpaceSize(TQSize space_size);
     void setBorderSize(TQSize border_size);
-    void setOrientation(Qt::Orientation orient);
+    void setOrientation(TQt::Orientation orient);
     void setFrameSize(TQSize frame_size);
     void setSlack(Slack slack_x, Slack slack_y);
     void setConserveSpace(bool conserve);
@@ -49,7 +49,7 @@ public:
     TQSize  gridSpacing() const;
     TQSize  frameSize() const;
     TQPoint origin() const;
-    Qt::Orientation orientation() const;
+    TQt::Orientation orientation() const;
     bool   conserveSpace() const;
 
 //    Slack  slackX() const;
@@ -76,7 +76,7 @@ protected:
     TQSize _pItemSize,_pSpaceSize,_pBorderSize,_pFrameSize;
     Slack _slackX, _slackY;
     bool _conserveSpace;
-    Qt::Orientation _orientation;
+    TQt::Orientation _orientation;
     int _numItems;
 
     // results
diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp
index cdbc94dd5..bf496e028 100644
--- a/kicker/applets/launcher/quickaddappsmenu.cpp
+++ b/kicker/applets/launcher/quickaddappsmenu.cpp
@@ -38,8 +38,8 @@ QuickAddAppsMenu::QuickAddAppsMenu(const TQString &label, const TQString &relPat
 {
    _targetObject = target;
    _sender = sender;
-   connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)), 
-           target, TQT_SLOT(addAppBeforeManually(TQString,TQString)));
+   connect(this, TQ_SIGNAL(addAppBefore(TQString,TQString)), 
+           target, TQ_SLOT(addAppBeforeManually(TQString,TQString)));
 }
 
 QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQString &sender, const char *name)
@@ -47,8 +47,8 @@ QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQS
 {
    _targetObject = target;
    _sender = sender;
-   connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)),
-           target, TQT_SLOT(addAppBeforeManually(TQString,TQString)));
+   connect(this, TQ_SIGNAL(addAppBefore(TQString,TQString)),
+           target, TQ_SLOT(addAppBeforeManually(TQString,TQString)));
 }
 
 void QuickAddAppsMenu::slotExec(int id)
diff --git a/kicker/applets/launcher/quickaddappsmenu.h b/kicker/applets/launcher/quickaddappsmenu.h
index 01c185181..b5bab8bfc 100644
--- a/kicker/applets/launcher/quickaddappsmenu.h
+++ b/kicker/applets/launcher/quickaddappsmenu.h
@@ -29,7 +29,7 @@ s
 #include "service_mnu.h"
 
 class QuickAddAppsMenu: public PanelServiceMenu {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    QuickAddAppsMenu(const TQString &label, const TQString &relPath, TQWidget *target, TQWidget *parent=0, const char *name=0, const TQString &sender=TQString(""));
    QuickAddAppsMenu(TQWidget *target, TQWidget *parent=0, const TQString &sender=TQString(""), const char *name=0);
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 19377c1b4..2b09dac34 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -138,7 +138,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, TDEIcon::Group _group,
        pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state);
    }
    // Resize to fit button
-   pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQ_ScaleMin));
+   pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQImage::ScaleMin));
    return pxmap;
 }
 
@@ -158,7 +158,7 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction,
     if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
         setToggleButton(true);
         setOn( ShowDesktop::the()->desktopShowing() );
-        connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) );
+        connect( ShowDesktop::the(), TQ_SIGNAL(desktopShown(bool)), this, TQ_SLOT(toggle(bool)) );
     }
 
     TQToolTip::add(this, _qurl->name());
@@ -172,18 +172,18 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction,
     configAction->plug(_popup);
         _popup->insertSeparator();
     _popup->insertItem(SmallIcon("remove"), i18n("Remove Application"), 
-            this, TQT_SLOT(removeApp()));
+            this, TQ_SLOT(removeApp()));
 
     m_stickyAction = new TDEToggleAction(i18n("Never Remove Automatically"),
-        TDEShortcut(), TQT_TQOBJECT(this));
-    connect(m_stickyAction, TQT_SIGNAL(toggled(bool)), 
-        this, TQT_SLOT(slotStickyToggled(bool)));
+        TDEShortcut(), this);
+    connect(m_stickyAction, TQ_SIGNAL(toggled(bool)), 
+        this, TQ_SLOT(slotStickyToggled(bool)));
     m_stickyAction->plug(_popup, 2);
     m_stickyId = _popup->idAt(2);
 
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(launch()));
-    connect(this, TQT_SIGNAL(removeApp(QuickButton *)), parent,
-        TQT_SLOT(removeAppManually(QuickButton *)));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(launch()));
+    connect(this, TQ_SIGNAL(removeApp(QuickButton *)), parent,
+        TQ_SLOT(removeAppManually(QuickButton *)));
 }
 
 QuickButton::~QuickButton()
@@ -219,9 +219,9 @@ void QuickButton::resizeEvent(TQResizeEvent *e)
 
 void QuickButton::mousePressEvent(TQMouseEvent *e)
 {
-   if (e->button() == Qt::RightButton)
+   if (e->button() == TQt::RightButton)
       _popup->popup(e->globalPos());
-   else if (e->button() == Qt::LeftButton) {
+   else if (e->button() == TQt::LeftButton) {
       _dragPos = e->pos();
       TQButton::mousePressEvent(e);
    }
@@ -229,7 +229,7 @@ void QuickButton::mousePressEvent(TQMouseEvent *e)
 
 void QuickButton::mouseMoveEvent(TQMouseEvent *e)
 {
-   if ((e->state() & Qt::LeftButton) == 0) return;
+   if ((e->state() & TQt::LeftButton) == 0) return;
    TQPoint p(e->pos() - _dragPos);
    if (p.manhattanLength() <= TDEGlobalSettings::dndEventDelay())
       return;
@@ -246,7 +246,7 @@ void QuickButton::mouseMoveEvent(TQMouseEvent *e)
        dd->drag();
        releaseKeyboard();
    } else {
-       setCursor(Qt::ForbiddenCursor);
+       setCursor(TQt::ForbiddenCursor);
    }
 }
 
@@ -303,7 +303,7 @@ void QuickButton::removeApp()
 void QuickButton::flash()
 {
    m_flashCounter = 2000;
-   TQTimer::singleShot(0, this, TQT_SLOT(slotFlash()));
+   TQTimer::singleShot(0, this, TQ_SLOT(slotFlash()));
 }
 
 void QuickButton::slotFlash()
@@ -314,7 +314,7 @@ void QuickButton::slotFlash()
         m_flashCounter -= timeout;
         if (m_flashCounter < 0) m_flashCounter = 0;
         update();
-        TQTimer::singleShot(timeout, this, TQT_SLOT(slotFlash()));
+        TQTimer::singleShot(timeout, this, TQ_SLOT(slotFlash()));
     }
 }
 
diff --git a/kicker/applets/launcher/quickbutton.h b/kicker/applets/launcher/quickbutton.h
index ea5ed21aa..ebb967def 100644
--- a/kicker/applets/launcher/quickbutton.h
+++ b/kicker/applets/launcher/quickbutton.h
@@ -66,7 +66,7 @@ private:
 
 
 class QuickButton: public SimpleButton, public KickerTip::Client {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum { DEFAULT_ICON_DIM = 16 };
diff --git a/kicker/applets/launcher/quickbuttongroup.h b/kicker/applets/launcher/quickbuttongroup.h
index 1c153d85c..d45480542 100644
--- a/kicker/applets/launcher/quickbuttongroup.h
+++ b/kicker/applets/launcher/quickbuttongroup.h
@@ -28,7 +28,7 @@ public:
 };
 
 QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc)
-{   return findProperty(desc, std::mem_fun(&QuickButton::url));}
+{   return findProperty(desc, std::mem_fn(&QuickButton::url));}
 
 inline void QuickButtonGroup::setUpdatesEnabled(bool enable)
 {   for (QuickButtonGroup::iterator i=begin();i!=end();++i) {
@@ -38,16 +38,16 @@ inline void QuickButtonGroup::setUpdatesEnabled(bool enable)
 }
 
 inline void QuickButtonGroup::show()
-{   std::for_each(begin(),end(),std::mem_fun(&TQWidget::show));}
+{   std::for_each(begin(),end(),std::mem_fn(&TQWidget::show));}
 
 inline void QuickButtonGroup::hide()
-{   std::for_each(begin(),end(),std::mem_fun(&TQWidget::hide));}
+{   std::for_each(begin(),end(),std::mem_fn(&TQWidget::hide));}
 
 inline void QuickButtonGroup::setDragging(bool drag)
-{   std::for_each(begin(),end(),std::bind2nd(std::mem_fun(&QuickButton::setDragging),drag));}
+{   std::for_each(begin(),end(),std::bind(std::mem_fn(&QuickButton::setDragging),std::placeholders::_1,drag));}
 
 inline void QuickButtonGroup::setEnableDrag(bool enable)
-{   std::for_each(begin(),end(),std::bind2nd(std::mem_fun(&QuickButton::setEnableDrag),enable));}
+{   std::for_each(begin(),end(),std::bind(std::mem_fn(&QuickButton::setEnableDrag),std::placeholders::_1,enable));}
 
 inline void QuickButtonGroup::deleteContents()
 {   for (QuickButtonGroup::iterator i=begin();i!=end();++i) {
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 1ee251b36..3f0ee88a8 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -108,10 +108,10 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
     m_dragButtons = 0;
 
     m_configAction = new TDEAction(i18n("Configure Quicklauncher..."), "configure", TDEShortcut(),
-        TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this));
+        this, TQ_SLOT(slotConfigure()), this);
 
     m_saveTimer = new TQTimer(this, "m_saveTimer");
-    connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig()));
+    connect(m_saveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(saveConfig()));
 
     m_popularity = new PopularityStatistics();
 
@@ -168,15 +168,15 @@ void QuickLauncher::buildPopupMenu()
     m_appletPopup = new TQPopupMenu(this);
     m_appletPopup->insertItem(i18n("Add Application"), addAppsMenu);
     m_removeAppsMenu = new TQPopupMenu(this);
-    connect(m_removeAppsMenu, TQT_SIGNAL(aboutToShow()),
-            TQT_SLOT(fillRemoveAppsMenu()));
-    connect(m_removeAppsMenu, TQT_SIGNAL(activated(int)), 
-            TQT_SLOT(removeAppManually(int)));
+    connect(m_removeAppsMenu, TQ_SIGNAL(aboutToShow()),
+            TQ_SLOT(fillRemoveAppsMenu()));
+    connect(m_removeAppsMenu, TQ_SIGNAL(activated(int)), 
+            TQ_SLOT(removeAppManually(int)));
     m_appletPopup->insertItem(i18n("Remove Application"), m_removeAppsMenu);
 
     m_appletPopup->insertSeparator();
     m_appletPopup->setCheckable( true );
-    m_appletPopup->insertItem(i18n("About"), this, TQT_SLOT(about()));
+    m_appletPopup->insertItem(i18n("About"), this, TQ_SLOT(about()));
     setCustomMenu(m_appletPopup);
 }
 
@@ -235,8 +235,8 @@ void QuickLauncher::slotConfigure()
         m_configDialog = new ConfigDlg(this, "configdialog", 
             m_settings, SIZE_AUTO, KDialogBase::Plain, KDialogBase::Ok | 
             KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Default);
-        connect(m_configDialog, TQT_SIGNAL(settingsChanged()),
-            this, TQT_SLOT(slotSettingsDialogChanged()));
+        connect(m_configDialog, TQ_SIGNAL(settingsChanged()),
+            this, TQ_SLOT(slotSettingsDialogChanged()));
     }
 
     m_configDialog->show();
@@ -338,7 +338,7 @@ int QuickLauncher::widthForHeight(int h) const
 {
     FlowGridManager temp_manager = *m_manager;
     temp_manager.setFrameSize(TQSize(h,h));
-    temp_manager.setOrientation(Qt::Horizontal); // ??? probably not necessary
+    temp_manager.setOrientation(TQt::Horizontal); // ??? probably not necessary
     if (temp_manager.isValid())
     {
         return temp_manager.frameSize().width();
@@ -351,7 +351,7 @@ int QuickLauncher::heightForWidth(int w) const
 {
     FlowGridManager temp_manager=*m_manager;
     temp_manager.setFrameSize(TQSize(w,w));
-    temp_manager.setOrientation(Qt::Vertical); // ??? probably not necessary
+    temp_manager.setOrientation(TQt::Vertical); // ??? probably not necessary
     if (temp_manager.isValid())
     {
         return temp_manager.frameSize().height();
@@ -362,7 +362,7 @@ int QuickLauncher::heightForWidth(int w) const
 
 int QuickLauncher::dimension() const
 {
-    if (orientation()==Qt::Vertical)
+    if (orientation()==TQt::Vertical)
     {
         return size().width();
     }
@@ -392,10 +392,10 @@ void QuickLauncher::addApp(TQString url, bool manuallyAdded)
 QuickButton* QuickLauncher::createButton(TQString url)
 {
     QuickButton* newButton=new QuickButton(url, m_configAction, this);
-    connect(newButton, TQT_SIGNAL(executed(TQString)), 
-            this, TQT_SLOT(slotOwnServiceExecuted(TQString)));
-    connect(newButton, TQT_SIGNAL(stickyToggled(bool)), 
-            this, TQT_SLOT(slotStickyToggled()));
+    connect(newButton, TQ_SIGNAL(executed(TQString)), 
+            this, TQ_SLOT(slotOwnServiceExecuted(TQString)));
+    connect(newButton, TQ_SIGNAL(stickyToggled(bool)), 
+            this, TQ_SLOT(slotStickyToggled()));
     newButton->setPopupDirection(popupDirection());
     return newButton;
 }
@@ -507,7 +507,7 @@ void QuickLauncher::about()
 
 void QuickLauncher::mousePressEvent(TQMouseEvent *e)
 {
-    if (e->button() == Qt::RightButton)
+    if (e->button() == TQt::RightButton)
     {
         m_popup->popup(e->globalPos());
     }
@@ -856,7 +856,7 @@ void QuickLauncher::loadConfig()
     int n = 0;
     while (iter != urls.end()) {
         TQString url = *iter;
-        addApp(url, n, false);
+        if(!url.isEmpty()) addApp(url, n, false);
         ++iter;
         ++n;
     }
@@ -973,7 +973,7 @@ void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString sto
 
     if (m_settings->autoAdjustEnabled())
     {
-        TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotAdjustToCurrentPopularity()));
     }
 }
 
@@ -1047,7 +1047,7 @@ void QuickLauncher::slotOwnServiceExecuted(TQString serviceMenuId)
     m_popularity->useService(serviceMenuId);
     if (m_settings->autoAdjustEnabled())
     {
-        TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotAdjustToCurrentPopularity()));
     }
 }
 
@@ -1077,7 +1077,7 @@ void QuickLauncher::updateStickyHighlightLayer()
     m_stickyHighlightLayer = TQImage(width(), height(), 32);
     m_stickyHighlightLayer.setAlphaBuffer(true);
     int pix, tlPix, brPix, w(width()), h(height());
-    QRgb transparent(tqRgba(0, 0, 0, 0));
+    TQRgb transparent(tqRgba(0, 0, 0, 0));
     for (int y = h-1; y >= 0; --y)
     {
         for (int x = w-1; x >= 0; --x)
diff --git a/kicker/applets/launcher/quicklauncher.h b/kicker/applets/launcher/quicklauncher.h
index 2c47b602a..b6211f054 100644
--- a/kicker/applets/launcher/quicklauncher.h
+++ b/kicker/applets/launcher/quicklauncher.h
@@ -45,7 +45,7 @@ typedef QuickButtonGroup ButtonGroup;
 
 class QuickLauncher: public KPanelApplet, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 k_dcop:
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index d4c14c9db..fcda62468 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -62,7 +62,7 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
     //setFrameStyle(Panel | Sunken);
     setBackgroundOrigin( AncestorOrigin );
 
-    if ( orientation() == Qt::Horizontal )
+    if ( orientation() == TQt::Horizontal )
         layout = new TQBoxLayout( this, TQBoxLayout::TopToBottom );
     else
         layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
@@ -82,8 +82,8 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
 
     bTransparent = conf->readBoolEntry( "Transparent", bTransparent );
 
-    connect( lockButton, TQT_SIGNAL( clicked() ), TQT_SLOT( lock() ));
-    connect( logoutButton, TQT_SIGNAL( clicked() ), TQT_SLOT( logout() ));
+    connect( lockButton, TQ_SIGNAL( clicked() ), TQ_SLOT( lock() ));
+    connect( logoutButton, TQ_SIGNAL( clicked() ), TQ_SLOT( logout() ));
 
     lockButton->installEventFilter( this );
     logoutButton->installEventFilter( this );
@@ -100,7 +100,7 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
     if ( !kapp->dcopClient()->isAttached() )
         kapp->dcopClient()->attach();
 
-    connect( kapp, TQT_SIGNAL( iconChanged(int) ), TQT_SLOT( slotIconChanged() ));
+    connect( kapp, TQ_SIGNAL( iconChanged(int) ), TQ_SLOT( slotIconChanged() ));
 }
 
 Lockout::~Lockout()
@@ -117,13 +117,13 @@ void Lockout::checkLayout( int height ) const
     TQBoxLayout::Direction direction = layout->direction();
 
     if ( direction == TQBoxLayout::LeftToRight &&
-         ( ( orientation() == Qt::Vertical   && s.width() - 2 >= height ) ||
-           ( orientation() == Qt::Horizontal && s.width() - 2 < height ) ) ) {
+         ( ( orientation() == TQt::Vertical   && s.width() - 2 >= height ) ||
+           ( orientation() == TQt::Horizontal && s.width() - 2 < height ) ) ) {
         layout->setDirection( TQBoxLayout::TopToBottom );
     }
     else if ( direction == TQBoxLayout::TopToBottom &&
-              ( ( orientation() == Qt::Vertical   && s.height() - 2 < height ) ||
-                ( orientation() == Qt::Horizontal && s.height() - 2 >= height ) ) ) {
+              ( ( orientation() == TQt::Vertical   && s.height() - 2 < height ) ||
+                ( orientation() == TQt::Horizontal && s.height() - 2 >= height ) ) ) {
         layout->setDirection( TQBoxLayout::LeftToRight );
     }
 }
@@ -193,25 +193,25 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
         TDEConfig *conf = config();
         conf->setGroup("lockout");
 
-        TQMouseEvent *me = TQT_TQMOUSEEVENT( e );
-        if( me->button() == Qt::RightButton )
+        TQMouseEvent *me = static_cast<TQMouseEvent*>( e );
+        if( me->button() == TQt::RightButton )
         {
-            if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lockButton) )
+            if( o == lockButton )
             {
                 TQPopupMenu *popup = new TQPopupMenu();
 
                 popup->insertItem( SmallIcon( "system-lock-screen" ), i18n("Lock Session"),
-                                   this, TQT_SLOT( lock() ) );
+                                   this, TQ_SLOT( lock() ) );
                 popup->insertSeparator();
                 
                 i18n("&Transparent");
                 //popup->insertItem( i18n( "&Transparent" ), 100 );
                 popup->insertItem( SmallIcon( "configure" ),
                                    i18n( "&Configure Screen Saver..." ),
-                                   this, TQT_SLOT( slotLockPrefs() ) );
+                                   this, TQ_SLOT( slotLockPrefs() ) );
 
                 //popup->setItemChecked( 100, bTransparent );
-                //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) );
+                //popup->connectItem(100, this, TQ_SLOT( slotTransparent() ) );
                 //if (conf->entryIsImmutable( "Transparent" ))
                 //    popup->setItemEnabled( 100, false );
                 popup->exec( me->globalPos() );
@@ -219,20 +219,20 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
 
                 return true;
             }
-            else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(logoutButton) )
+            else if ( o == logoutButton )
             {
                 TQPopupMenu *popup = new TQPopupMenu();
 
                 popup->insertItem( SmallIcon( "system-log-out" ), i18n("&Log Out..."),
-                                   this, TQT_SLOT( logout() ) );
+                                   this, TQ_SLOT( logout() ) );
                 popup->insertSeparator();
                 //popup->insertItem( i18n( "&Transparent" ), 100 );
                 popup->insertItem( SmallIcon( "configure" ),
                                    i18n( "&Configure Session Manager..." ),
-                                   this, TQT_SLOT( slotLogoutPrefs() ) );
+                                   this, TQ_SLOT( slotLogoutPrefs() ) );
 
                 //popup->setItemChecked( 100, bTransparent );
-                //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) );
+                //popup->connectItem(100, this, TQ_SLOT( slotTransparent() ) );
                 //if (conf->entryIsImmutable( "Transparent" ))
                 //    popup->setItemEnabled( 100, false );
                 popup->exec( me->globalPos() );
diff --git a/kicker/applets/lockout/lockout.h b/kicker/applets/lockout/lockout.h
index 6be995790..dd6428628 100644
--- a/kicker/applets/lockout/lockout.h
+++ b/kicker/applets/lockout/lockout.h
@@ -12,7 +12,7 @@ class TQToolButton;
 
 class Lockout : public KPanelApplet
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Lockout( const TQString& configFile,
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index c3b964ce1..89f836492 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -57,18 +57,18 @@ MediaApplet::MediaApplet(const TQString& configFile, Type type, int actions, TQW
     
     mpDirLister = new KDirLister();
     
-    connect( mpDirLister, TQT_SIGNAL( clear() ),
-            this, TQT_SLOT( slotClear() ) );
-    connect( mpDirLister, TQT_SIGNAL( started(const KURL&) ),
-            this, TQT_SLOT( slotStarted(const KURL&) ) );
-    connect( mpDirLister, TQT_SIGNAL( completed() ),
-            this, TQT_SLOT( slotCompleted() ) );
-    connect( mpDirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ),
-            this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
-    connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
-            this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
-    connect( mpDirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ),
-            this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) );
+    connect( mpDirLister, TQ_SIGNAL( clear() ),
+            this, TQ_SLOT( slotClear() ) );
+    connect( mpDirLister, TQ_SIGNAL( started(const KURL&) ),
+            this, TQ_SLOT( slotStarted(const KURL&) ) );
+    connect( mpDirLister, TQ_SIGNAL( completed() ),
+            this, TQ_SLOT( slotCompleted() ) );
+    connect( mpDirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ),
+            this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) );
+    connect( mpDirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ),
+            this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) );
+    connect( mpDirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ),
+            this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) );
     
     reloadList();
 }
@@ -154,7 +154,7 @@ void MediaApplet::arrangeButtons()
         MediumButton *button = *it;
         
         button_size = std::max(button_size,
-                            orientation() == Qt::Vertical ?
+                            orientation() == TQt::Vertical ?
                     button->heightForWidth(width()) :
                 button->widthForHeight(height()) );
     //		                           button->widthForHeight(height()) :
@@ -162,7 +162,7 @@ void MediaApplet::arrangeButtons()
     }
     
     int kicker_size;
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         kicker_size = width();
     }
@@ -200,7 +200,7 @@ void MediaApplet::arrangeButtons()
         
         ++pack_count;
     
-        if(orientation() == Qt::Vertical)
+        if(orientation() == TQt::Vertical)
                     {
         if (pack_count < max_packed_buttons)
         {
@@ -425,7 +425,7 @@ void MediaApplet::reloadList()
 
 void MediaApplet::mousePressEvent(TQMouseEvent *e)
 {
-    if(e->button()==Qt::RightButton)
+    if(e->button()==TQt::RightButton)
     {
         TDEPopupMenu menu(this);
     
diff --git a/kicker/applets/media/mediaapplet.h b/kicker/applets/media/mediaapplet.h
index 4c57b508d..1703d98f0 100644
--- a/kicker/applets/media/mediaapplet.h
+++ b/kicker/applets/media/mediaapplet.h
@@ -38,7 +38,7 @@ typedef TQValueList<MediumButton*> MediumButtonList;
 
 class MediaApplet : public KPanelApplet
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	MediaApplet(const TQString& configFile, Type t = Normal, int actions = 0,
diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp
index b87f73ab1..be75a3d40 100644
--- a/kicker/applets/media/mediumbutton.cpp
+++ b/kicker/applets/media/mediumbutton.cpp
@@ -45,13 +45,13 @@
 #include <konq_drag.h>
 
 MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem)
-	: PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0,
+	: PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem), mOpenTimer(0,
                 "MediumButton::mOpenTimer")
 {
-    TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
+    TDEAction *a = KStdAction::paste(this, TQ_SLOT(slotPaste()),
                                     &mActions, "pasteto");
     a->setShortcut(0);
-    a = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), &mActions, "copy");
+    a = KStdAction::copy(this, TQ_SLOT(slotCopy()), &mActions, "copy");
     a->setShortcut(0);
     
     setBackgroundOrigin(AncestorOrigin);
@@ -64,11 +64,11 @@ MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem)
     
     refreshType();
     
-    connect(&mOpenTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDragOpen()));
+    connect(&mOpenTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotDragOpen()));
     
     // Activate this code only if we find a way to have both an
     // action and a popup menu for the same kicker button
-    //connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));
+    //connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked()));
     
     setPopup(new TQPopupMenu());
 }
diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h
index 76e448b27..40ee85ebd 100644
--- a/kicker/applets/media/mediumbutton.h
+++ b/kicker/applets/media/mediumbutton.h
@@ -32,7 +32,7 @@
 
 class MediumButton : public PanelPopupButton
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	MediumButton(TQWidget *parent, const KFileItem &fileItem);
diff --git a/kicker/applets/media/preferencesdialog.h b/kicker/applets/media/preferencesdialog.h
index b29f697ae..2354a73a2 100644
--- a/kicker/applets/media/preferencesdialog.h
+++ b/kicker/applets/media/preferencesdialog.h
@@ -30,7 +30,7 @@
 
 class PreferencesDialog : public KDialogBase
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
 	PreferencesDialog(KFileItemList media, TQWidget *parent=0, const char *name=0);
 	~PreferencesDialog();
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index f95e4e4c5..dff03a036 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -89,8 +89,8 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P )
     setBackgroundOrigin(AncestorOrigin);
     dcopclient.registerAs( "menuapplet", false );
     // toolbarAppearanceChanged(int) is sent when changing macstyle
-    connect( kapp, TQT_SIGNAL( toolbarAppearanceChanged( int )),
-        this, TQT_SLOT( readSettings()));
+    connect( kapp, TQ_SIGNAL( toolbarAppearanceChanged( int )),
+        this, TQ_SLOT( readSettings()));
     claimSelection();
     readSettings();
     updateTopEdgeOffset();
@@ -298,11 +298,11 @@ void Applet::claimSelection()
 	{
         delete selection_watcher;
         selection_watcher = NULL;
-        connect( selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection()));
+        connect( selection, TQ_SIGNAL( lostOwnership()), TQ_SLOT( lostSelection()));
         module = new KWinModule;
-	connect( module, TQT_SIGNAL( windowAdded( WId )), this, TQT_SLOT( windowAdded( WId )));
-	connect( module, TQT_SIGNAL( activeWindowChanged( WId )),
-	    this, TQT_SLOT( activeWindowChanged( WId )));
+	connect( module, TQ_SIGNAL( windowAdded( WId )), this, TQ_SLOT( windowAdded( WId )));
+	connect( module, TQ_SIGNAL( activeWindowChanged( WId )),
+	    this, TQ_SLOT( activeWindowChanged( WId )));
 	TQValueList< WId > windows = module->windows();
 	for( TQValueList< WId >::ConstIterator it = windows.begin();
 	     it != windows.end();
@@ -328,7 +328,7 @@ void Applet::lostSelection()
     if( selection_watcher == NULL )
         {
         selection_watcher = new TDESelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
-        connect( selection_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( claimSelection()));
+        connect( selection_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( claimSelection()));
         }
     delete module;
     module = NULL;
@@ -476,7 +476,7 @@ void MenuEmbed::setMinimumSize( int w, int h )
         assert( msg_type_atom != None );
         ev.xclient.message_type = msg_type_atom;
         ev.xclient.format = 32;
-        ev.xclient.data.l[0] = GET_QT_X_TIME();
+        ev.xclient.data.l[0] = get_tqt_x_time();
         ev.xclient.data.l[1] = minimumWidth();
         ev.xclient.data.l[2] = minimumHeight();
         ev.xclient.data.l[3] = 0;
diff --git a/kicker/applets/menu/menuapplet.h b/kicker/applets/menu/menuapplet.h
index 0b09334b6..159c7a37d 100644
--- a/kicker/applets/menu/menuapplet.h
+++ b/kicker/applets/menu/menuapplet.h
@@ -66,7 +66,7 @@ class MenuEmbed;
 
 class Applet : public KPanelApplet, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 k_dcop:
@@ -186,7 +186,7 @@ private:
 class MenuEmbed
     : public QXEmbed
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index ac0fa1340..437bae679 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -114,7 +114,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
 
     setFont( TDEGlobalSettings::taskbarFont() );
 
-    m_twin = new KWinModule(TQT_TQOBJECT(this));
+    m_twin = new KWinModule(this);
     m_activeWindow = m_twin->activeWindow();
     m_curDesk = m_twin->currentDesktop();
 
@@ -123,7 +123,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
         m_curDesk = 1;
     }
 
-    desktopLayoutOrientation = Qt::Horizontal;
+    desktopLayoutOrientation = TQt::Horizontal;
     desktopLayoutX = -1;
     desktopLayoutY = -1;
 
@@ -132,22 +132,22 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
 
     drawButtons();
 
-    connect( m_twin, TQT_SIGNAL( currentDesktopChanged(int)), TQT_SLOT( slotSetDesktop(int) ) );
-    connect( m_twin, TQT_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQT_SLOT(slotSetDesktopViewport(int, const TQPoint&)));
-    connect( m_twin, TQT_SIGNAL( numberOfDesktopsChanged(int)), TQT_SLOT( slotSetDesktopCount(int) ) );
-    connect( m_twin, TQT_SIGNAL( desktopGeometryChanged(int)), TQT_SLOT( slotRefreshViewportCount(int) ) );
-    connect( m_twin, TQT_SIGNAL( activeWindowChanged(WId)), TQT_SLOT( slotActiveWindowChanged(WId) ) );
-    connect( m_twin, TQT_SIGNAL( windowAdded(WId) ), this, TQT_SLOT( slotWindowAdded(WId) ) );
-    connect( m_twin, TQT_SIGNAL( windowRemoved(WId) ), this, TQT_SLOT( slotWindowRemoved(WId) ) );
-    connect( m_twin, TQT_SIGNAL( windowChanged(WId,unsigned int) ), this, TQT_SLOT( slotWindowChanged(WId,unsigned int) ) );
-    connect( m_twin, TQT_SIGNAL( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) );
-    connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) );
+    connect( m_twin, TQ_SIGNAL( currentDesktopChanged(int)), TQ_SLOT( slotSetDesktop(int) ) );
+    connect( m_twin, TQ_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQ_SLOT(slotSetDesktopViewport(int, const TQPoint&)));
+    connect( m_twin, TQ_SIGNAL( numberOfDesktopsChanged(int)), TQ_SLOT( slotSetDesktopCount(int) ) );
+    connect( m_twin, TQ_SIGNAL( desktopGeometryChanged(int)), TQ_SLOT( slotRefreshViewportCount(int) ) );
+    connect( m_twin, TQ_SIGNAL( activeWindowChanged(WId)), TQ_SLOT( slotActiveWindowChanged(WId) ) );
+    connect( m_twin, TQ_SIGNAL( windowAdded(WId) ), this, TQ_SLOT( slotWindowAdded(WId) ) );
+    connect( m_twin, TQ_SIGNAL( windowRemoved(WId) ), this, TQ_SLOT( slotWindowRemoved(WId) ) );
+    connect( m_twin, TQ_SIGNAL( windowChanged(WId,unsigned int) ), this, TQ_SLOT( slotWindowChanged(WId,unsigned int) ) );
+    connect( m_twin, TQ_SIGNAL( desktopNamesChanged() ), this, TQ_SLOT( slotDesktopNamesChanged() ) );
+    connect( kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) );
 
     if (kapp->authorizeTDEAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
     {
         m_contextMenu = new TQPopupMenu();
-        connect(m_contextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu()));
-        connect(m_contextMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+        connect(m_contextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu()));
+        connect(m_contextMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
         setCustomMenu(m_contextMenu);
     }
 
@@ -246,7 +246,7 @@ void KMiniPager::slotButtonSelected( int desk )
 
 int KMiniPager::widthForHeight(int h) const
 {
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         return width();
     }
@@ -302,7 +302,7 @@ int KMiniPager::widthForHeight(int h) const
 
 int KMiniPager::heightForWidth(int w) const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return height();
     }
@@ -366,7 +366,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
     { // must own manager selection before setting global desktop layout
         int screen = DefaultScreen( tqt_xdisplay());
         m_desktopLayoutOwner = new TDESelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
-            screen, TQT_TQOBJECT(this) );
+            screen, this );
         if( !m_desktopLayoutOwner->claim( false ))
         {
             delete m_desktopLayoutOwner;
@@ -374,14 +374,14 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
             return;
         }
     }
-    NET::Orientation orient = o == Qt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical;
+    NET::Orientation orient = o == TQt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical;
     NETRootInfo i( tqt_xdisplay(), 0 );
     i.setDesktopLayout( orient, x, y, NET::DesktopLayoutCornerTopLeft );
 }
 
 void KMiniPager::resizeEvent(TQResizeEvent*)
 {
-    bool horiz = orientation() == Qt::Horizontal;
+    bool horiz = orientation() == TQt::Horizontal;
 
     int deskNum = m_desktops.count();
     int rowNum = m_settings->numberOfRows();
@@ -408,13 +408,13 @@ void KMiniPager::resizeEvent(TQResizeEvent*)
     {
         nDX = rowNum;
         nDY = deskCols;
-        updateDesktopLayout(Qt::Horizontal, -1, nDX);
+        updateDesktopLayout(TQt::Horizontal, -1, nDX);
     }
     else
     {
         nDX = deskCols;
         nDY = rowNum;
-        updateDesktopLayout(Qt::Horizontal, nDY, -1);
+        updateDesktopLayout(TQt::Horizontal, nDY, -1);
     }
 
     // 1 pixel spacing.
@@ -484,10 +484,10 @@ void KMiniPager::drawButtons()
             m_desktops.append( desk );
             m_group->insert( desk, count );
 
-            connect(desk, TQT_SIGNAL(buttonSelected(int)),
-                    TQT_SLOT(slotButtonSelected(int)) );
-            connect(desk, TQT_SIGNAL(showMenu(const TQPoint&, int )),
-                    TQT_SLOT(slotShowMenu(const TQPoint&, int )) );
+            connect(desk, TQ_SIGNAL(buttonSelected(int)),
+                    TQ_SLOT(slotButtonSelected(int)) );
+            connect(desk, TQ_SIGNAL(showMenu(const TQPoint&, int )),
+                    TQ_SLOT(slotShowMenu(const TQPoint&, int )) );
 
             desk->show();
             ++count;
@@ -727,8 +727,8 @@ void KMiniPager::aboutToShowContextMenu()
     rowMenu->insertItem(i18n("one row or column", "&1"), 1 + rowOffset);
     rowMenu->insertItem(i18n("two rows or columns", "&2"), 2 + rowOffset);
     rowMenu->insertItem( i18n("three rows or columns", "&3"), 3 + rowOffset);
-    connect(rowMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
-    showMenu->insertItem((orientation()==Qt::Horizontal) ? i18n("&Rows"):
+    connect(rowMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
+    showMenu->insertItem((orientation()==TQt::Horizontal) ? i18n("&Rows"):
                                                        i18n("&Columns"),
                          rowMenu);
 
@@ -753,7 +753,7 @@ void KMiniPager::aboutToShowContextMenu()
         showMenu->insertItem(i18n("&Desktop Wallpaper"),
                          PagerSettings::EnumBackgroundType::BgLive + bgOffset);
     }
-    connect(showMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+    connect(showMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
     m_contextMenu->insertItem(i18n("&Pager Options"),showMenu);
 
     m_contextMenu->insertItem(SmallIcon("configure"),
@@ -892,7 +892,7 @@ void KMiniPager::showPager()
     else
     {
     // Let's run kpager if it isn't running
-        connect( dcop, TQT_SIGNAL( applicationRegistered(const TQCString &) ), this, TQT_SLOT(applicationRegistered(const TQCString &)) );
+        connect( dcop, TQ_SIGNAL( applicationRegistered(const TQCString &) ), this, TQ_SLOT(applicationRegistered(const TQCString &)) );
         dcop->setNotifications(true);
         TQString strAppPath(locate("exe", "kpager"));
         if (!strAppPath.isEmpty())
@@ -941,8 +941,8 @@ void KMiniPager::applicationRegistered( const TQCString  & appName )
 {
     if (appName == "kpager")
     {
-        disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRegistered(const TQCString &) ),
-                    this, TQT_SLOT(applicationRegistered(const TQCString &)) );
+        disconnect( kapp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString &) ),
+                    this, TQ_SLOT(applicationRegistered(const TQCString &)) );
         showKPager(false);
     }
 }
diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h
index 1f0edc409..ceb5ec8f4 100644
--- a/kicker/applets/minipager/pagerapplet.h
+++ b/kicker/applets/minipager/pagerapplet.h
@@ -46,7 +46,7 @@ class PagerSettings;
 
 class KMiniPager : public KPanelApplet
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KMiniPager(const TQString& configFile, Type t = Normal, int actions = 0,
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index e9f42e18a..22f59956d 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -83,10 +83,10 @@ KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const TQPoint& v
 
     m_desktopName = m_pager->twin()->desktopName(m_desktop);
 
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()));
-    connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
-    connect(&m_dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragSwitch()));
-    connect(&m_updateCompressor, TQT_SIGNAL(timeout()), this, TQT_SLOT(update()));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked()));
+    connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool)));
+    connect(&m_dragSwitchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragSwitch()));
+    connect(&m_updateCompressor, TQ_SIGNAL(timeout()), this, TQ_SLOT(update()));
 
     if (m_pager->desktopPreview())
     {
@@ -247,8 +247,8 @@ void KMiniPagerButton::loadBgPixmap()
         }
         else if (s_commonSharedPixmap)
         { // other button is already fetching the pixmap
-            connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)),
-                    TQT_SLOT(backgroundLoaded(bool)));
+            connect(s_commonSharedPixmap, TQ_SIGNAL(done(bool)),
+                    TQ_SLOT(backgroundLoaded(bool)));
             return;
         }
     }
@@ -258,8 +258,8 @@ void KMiniPagerButton::loadBgPixmap()
         if (!s_commonSharedPixmap)
         {
             s_commonSharedPixmap = new TDESharedPixmap;
-            connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)),
-                    TQT_SLOT(backgroundLoaded(bool)));
+            connect(s_commonSharedPixmap, TQ_SIGNAL(done(bool)),
+                    TQ_SLOT(backgroundLoaded(bool)));
         }
         retval = s_commonSharedPixmap->loadFromShared(TQString("DESKTOP1"));
         if (retval == false) {
@@ -274,8 +274,8 @@ void KMiniPagerButton::loadBgPixmap()
         if (!m_sharedPixmap)
         {
             m_sharedPixmap = new TDESharedPixmap;
-            connect(m_sharedPixmap, TQT_SIGNAL(done(bool)),
-                    TQT_SLOT(backgroundLoaded(bool)));
+            connect(m_sharedPixmap, TQ_SIGNAL(done(bool)),
+                    TQ_SLOT(backgroundLoaded(bool)));
         }
         retval = m_sharedPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_desktop));
         if (retval == false) {
@@ -528,10 +528,10 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
 
 void KMiniPagerButton::mousePressEvent(TQMouseEvent * e)
 {
-    if (e->button() == Qt::RightButton)
+    if (e->button() == TQt::RightButton)
     {
         // prevent LMB down -> RMB down -> LMB up sequence
-        if ((e->state() & Qt::MouseButtonMask ) == Qt::NoButton)
+        if ((e->state() & TQt::MouseButtonMask ) == TQt::NoButton)
         {
             emit showMenu(e->globalPos(), m_desktop);
             return;
@@ -726,7 +726,7 @@ void KMiniPagerButton::rename()
 {
   if ( !m_lineEdit ) {
     m_lineEdit = new TQLineEdit( this );
-    connect( m_lineEdit, TQT_SIGNAL( returnPressed() ), m_lineEdit, TQT_SLOT( hide() ) );
+    connect( m_lineEdit, TQ_SIGNAL( returnPressed() ), m_lineEdit, TQ_SLOT( hide() ) );
     m_lineEdit->installEventFilter( this );
   }
   m_lineEdit->setGeometry( rect() );
@@ -747,12 +747,12 @@ void KMiniPagerButton::slotToggled( bool b )
 
 bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e)
 {
-    if (o && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) &&
+    if (o && o == m_lineEdit &&
         (e->type() == TQEvent::FocusOut || e->type() == TQEvent::Hide))
     {
         m_pager->twin()->setDesktopName( m_desktop, m_lineEdit->text() );
         m_desktopName = m_lineEdit->text();
-        TQTimer::singleShot( 0, m_lineEdit, TQT_SLOT( deleteLater() ) );
+        TQTimer::singleShot( 0, m_lineEdit, TQ_SLOT( deleteLater() ) );
         m_lineEdit = 0;
         return true;
     }
diff --git a/kicker/applets/minipager/pagerbutton.h b/kicker/applets/minipager/pagerbutton.h
index 042820f20..4d889c39e 100644
--- a/kicker/applets/minipager/pagerbutton.h
+++ b/kicker/applets/minipager/pagerbutton.h
@@ -37,7 +37,7 @@ class TQLineEdit;
 
 class KMiniPagerButton : public TQButton, public KickerTip::Client
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KMiniPagerButton(int desk, bool useViewports, const TQPoint& viewport,
             KMiniPager *parent=0, const char *name=0);
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index 8eb26afbc..83db26d12 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -71,24 +71,24 @@ NaughtyApplet::NaughtyApplet
   TQVBoxLayout * layout = new TQVBoxLayout(this);
   layout->addWidget(button_);
 
-  monitor_ = new NaughtyProcessMonitor(2, 20, TQT_TQOBJECT(this));
+  monitor_ = new NaughtyProcessMonitor(2, 20, this);
 
   connect
     (
-     button_,   TQT_SIGNAL(clicked()),
-     this,      TQT_SLOT(slotPreferences())
+     button_,   TQ_SIGNAL(clicked()),
+     this,      TQ_SLOT(slotPreferences())
     );
 
   connect
     (
-     monitor_,  TQT_SIGNAL(runawayProcess(ulong, const TQString &)),
-     this,      TQT_SLOT(slotWarn(ulong, const TQString &))
+     monitor_,  TQ_SIGNAL(runawayProcess(ulong, const TQString &)),
+     this,      TQ_SLOT(slotWarn(ulong, const TQString &))
     );
 
   connect
     (
-     monitor_,  TQT_SIGNAL(load(uint)),
-     this,      TQT_SLOT(slotLoad(uint))
+     monitor_,  TQ_SIGNAL(load(uint)),
+     this,      TQ_SLOT(slotLoad(uint))
     );
 
   loadSettings();
diff --git a/kicker/applets/naughty/NaughtyApplet.h b/kicker/applets/naughty/NaughtyApplet.h
index a907ca9bb..0ef796ea4 100644
--- a/kicker/applets/naughty/NaughtyApplet.h
+++ b/kicker/applets/naughty/NaughtyApplet.h
@@ -31,7 +31,7 @@ class TQPushButton;
 
 class NaughtyApplet : public KPanelApplet
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/kicker/applets/naughty/NaughtyConfigDialog.h b/kicker/applets/naughty/NaughtyConfigDialog.h
index 4e428f00f..41be8344e 100644
--- a/kicker/applets/naughty/NaughtyConfigDialog.h
+++ b/kicker/applets/naughty/NaughtyConfigDialog.h
@@ -28,7 +28,7 @@ class KIntNumInput;
 
 class NaughtyConfigDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
index 09c02cbf9..63b634e59 100644
--- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp
+++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
@@ -39,6 +39,10 @@
 #include <signal.h>
 #include <unistd.h>
 
+#ifdef Q_OS_SOLARIS
+#include <procfs.h>
+#endif
+
 #include <tqfile.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
@@ -107,7 +111,7 @@ NaughtyProcessMonitor::NaughtyProcessMonitor
 #ifdef __NetBSD__
   d->kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, "kvm_open");
 #endif
-  connect(d->timer_, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
+  connect(d->timer_, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()));
 }
 
 NaughtyProcessMonitor::~NaughtyProcessMonitor()
@@ -210,7 +214,7 @@ NaughtyProcessMonitor::_process(ulong pid, uint load)
   bool
 NaughtyProcessMonitor::canKill(ulong pid) const
 {
-#ifdef __linux__
+#ifdef Q_OS_LINUX
   TQFile f("/proc/" + TQString::number(pid) + "/status");
 
   if (!f.open(IO_ReadOnly))
@@ -240,6 +244,17 @@ NaughtyProcessMonitor::canKill(ulong pid) const
       return false ;
   
   return geteuid () == d->uidMap_[pid] ;
+#elif defined(Q_OS_SOLARIS)
+  TQFile f("/proc/" + TQString::number(pid) + "/psinfo");
+  TQByteArray raw;
+  psinfo_t *inf;
+
+  if (!f.open(IO_ReadOnly))
+    return false;
+  raw = f.readAll();
+  f.close();
+  inf = (psinfo_t *)raw.data();
+  return geteuid() == inf->pr_euid;
 #else
   Q_UNUSED( pid );
   return false;
@@ -249,8 +264,9 @@ NaughtyProcessMonitor::canKill(ulong pid) const
   TQString
 NaughtyProcessMonitor::processName(ulong pid) const
 {
-#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__)
-#ifdef __linux__
+#if defined(Q_OS_LINUX) || defined(__OpenBSD__) || defined(__NetBSD__) || \
+    defined(Q_OS_SOLARIS)
+#if defined(Q_OS_LINUX) || defined(Q_OS_SOLARIS)
   TQFile f("/proc/" + TQString::number(pid) + "/cmdline");
 
   if (!f.open(IO_ReadOnly))
@@ -344,7 +360,7 @@ NaughtyProcessMonitor::processName(ulong pid) const
   uint
 NaughtyProcessMonitor::cpuLoad() const
 {
-#ifdef __linux__
+#ifdef Q_OS_LINUX
   TQFile f("/proc/stat");
 
   if (!f.open(IO_ReadOnly))
@@ -400,7 +416,7 @@ NaughtyProcessMonitor::cpuLoad() const
   TQValueList<ulong>
 NaughtyProcessMonitor::pidList() const
 {
-#ifdef __linux__
+#if defined(Q_OS_LINUX) || defined(Q_OS_SOLARIS)
   TQStringList dl(TQDir("/proc").entryList());
 
   TQValueList<ulong> pl;
@@ -505,7 +521,7 @@ NaughtyProcessMonitor::pidList() const
   bool
 NaughtyProcessMonitor::getLoad(ulong pid, uint & load) const
 {
-#ifdef __linux__
+#ifdef Q_OS_LINUX
   TQFile f("/proc/" + TQString::number(pid) + "/stat");
 
   if (!f.open(IO_ReadOnly))
@@ -540,7 +556,8 @@ NaughtyProcessMonitor::getLoad(ulong pid, uint & load) const
   bool
 NaughtyProcessMonitor::kill(ulong pid) const
 {
-#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#if defined(Q_OS_LINUX) || defined(__OpenBSD__) || defined(__NetBSD__) ||\
+  defined(Q_OS_SOLARIS)
   return 0 == ::kill(pid, SIGKILL);
 #else
   Q_UNUSED( pid );
diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.h b/kicker/applets/naughty/NaughtyProcessMonitor.h
index d66479964..3075bb9bd 100644
--- a/kicker/applets/naughty/NaughtyProcessMonitor.h
+++ b/kicker/applets/naughty/NaughtyProcessMonitor.h
@@ -27,7 +27,7 @@ class NaughtyProcessMonitorPrivate;
 
 class NaughtyProcessMonitor : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index aaadfc33d..638ce93c8 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -69,15 +69,15 @@ RunApplet::RunApplet(const TQString& configFile, Type type, int actions,
     f = _btn->font();
     f.setPixelSize(12);
     _btn->setFont(f);
-    connect(_btn, TQT_SIGNAL(clicked()), TQT_SLOT(popup_combo()));
+    connect(_btn, TQ_SIGNAL(clicked()), TQ_SLOT(popup_combo()));
 
     // setup history combo
     _input = new KHistoryCombo(this);
     _input->setFocus();
     _input->clearEdit();
     watchForFocus(_input->lineEdit());
-    connect(_input, TQT_SIGNAL(activated(const TQString&)),
-	    TQT_SLOT(run_command(const TQString&)));
+    connect(_input, TQ_SIGNAL(activated(const TQString&)),
+	    TQ_SLOT(run_command(const TQString&)));
 
     TDEConfig *c = config();
     c->setGroup("General");
@@ -115,7 +115,7 @@ RunApplet::~RunApplet()
 
 void RunApplet::resizeEvent(TQResizeEvent*)
 {
-    if(orientation() == Qt::Horizontal)
+    if(orientation() == TQt::Horizontal)
 	{
 	    _btn->hide();
 	    _input->reparent(this, TQPoint(0,0), true);
@@ -288,7 +288,7 @@ void RunApplet::run_command(const TQString& command)
     return;
 
  hide:
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
 	_hbox->hide();
     needsFocus(focusNeeded);
 }
diff --git a/kicker/applets/run/runapplet.h b/kicker/applets/run/runapplet.h
index d5d12435f..adb0d4c6f 100644
--- a/kicker/applets/run/runapplet.h
+++ b/kicker/applets/run/runapplet.h
@@ -35,7 +35,7 @@ class KURIFilterData;
 
 class RunApplet : public KPanelApplet
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     RunApplet(const TQString& configFile, Type t = Stretch, int actions = 0,
diff --git a/kicker/applets/swallow/prefwidget.h b/kicker/applets/swallow/prefwidget.h
index a23d6414b..03cde1399 100644
--- a/kicker/applets/swallow/prefwidget.h
+++ b/kicker/applets/swallow/prefwidget.h
@@ -23,7 +23,7 @@
 
 class PreferencesWidget : public PreferencesWidgetBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	PreferencesWidget( SwallowCommandList* swc, TQWidget* parent = 0 );
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index 1ac34cfec..c30a31cff 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -157,8 +157,8 @@ void SwallowApplet::createApps( SwallowCommandList* list )
     while ( (it.current()) ) {
 	app = new SwallowApp( it.current(), this );
 	app->hide();
-	connect( app, TQT_SIGNAL( embedded(SwallowApp *)),
-		 TQT_SLOT( embedded(SwallowApp *)));
+	connect( app, TQ_SIGNAL( embedded(SwallowApp *)),
+		 TQ_SLOT( embedded(SwallowApp *)));
 	appList->append( app );
 	++it;
 	kapp->processEvents();
@@ -179,8 +179,8 @@ void SwallowApplet::embedded( SwallowApp *app )
     kdDebug() << "--> ratio: " << app->sizeRatio() << endl;
     kdDebug() << "**** " << app << " is embedded now, with (" << app->width() << ", " << app->height() << ")" << endl;
 
-    disconnect( app, TQT_SIGNAL( embedded(SwallowApp *)),
-		this, TQT_SLOT( embedded(SwallowApp *)));
+    disconnect( app, TQ_SIGNAL( embedded(SwallowApp *)),
+		this, TQ_SLOT( embedded(SwallowApp *)));
 
     embeddedList->append( app );
 
@@ -278,8 +278,8 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent,
     QXEmbed::initialize();
 
     winTitle = swc->title;
-    connect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)),
-	    this, TQT_SLOT(windowAdded(WId)));
+    connect(SwallowApplet::winModule(), TQ_SIGNAL(windowAdded(WId)),
+	    this, TQ_SLOT(windowAdded(WId)));
 
     if (!swc->cmdline.isEmpty()) {
 	TDEProcess *process = new TDEProcess;
@@ -289,8 +289,8 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent,
 	//	*process << "-geometry";
 	//	*process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height());
 
-	connect(process, TQT_SIGNAL(processExited(TDEProcess*)),
-		this, TQT_SLOT(processExited(TDEProcess*)));
+	connect(process, TQ_SIGNAL(processExited(TDEProcess*)),
+		this, TQ_SLOT(processExited(TDEProcess*)));
 
 	process->start();
     }
@@ -330,8 +330,8 @@ void SwallowApp::windowAdded(WId win)
 	embed(win);
 	XReparentWindow(tqt_xdisplay(), win, winId(), 0, 0);
 
-	disconnect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)),
-		   this, TQT_SLOT(windowAdded(WId)));
+	disconnect(SwallowApplet::winModule(), TQ_SIGNAL(windowAdded(WId)),
+		   this, TQ_SLOT(windowAdded(WId)));
 
 	emit embedded( this );
     }
diff --git a/kicker/applets/swallow/swallow.h b/kicker/applets/swallow/swallow.h
index b4be4f624..8bacc79f3 100644
--- a/kicker/applets/swallow/swallow.h
+++ b/kicker/applets/swallow/swallow.h
@@ -44,7 +44,7 @@ typedef TQPtrList<SwallowApp> SwallowAppList;
 
 class SwallowApplet : public KPanelApplet
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SwallowApplet( const TQString& configFile, TQWidget *parent,
@@ -88,7 +88,7 @@ private:
 
 class SwallowApp : public QXEmbed
 {
-    Q_OBJECT
+    TQ_OBJECT
 	
 public:
     SwallowApp( const SwallowCommand * swc, TQWidget* parent = 0,
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 97b71d1b2..664dd85ad 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -99,19 +99,19 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac
 
     m_clockApplet = new ClockApplet(configFile, KPanelApplet::Normal, KPanelApplet::Preferences, this, "clockapplet");
     updateClockGeometry();
-    connect(m_clockApplet, TQT_SIGNAL(clockReconfigured()), this, TQT_SLOT(updateClockGeometry()));
-    connect(m_clockApplet, TQT_SIGNAL(updateLayout()), this, TQT_SLOT(updateClockGeometry()));
+    connect(m_clockApplet, TQ_SIGNAL(clockReconfigured()), this, TQ_SLOT(updateClockGeometry()));
+    connect(m_clockApplet, TQ_SIGNAL(updateLayout()), this, TQ_SLOT(updateClockGeometry()));
 
     setBackgroundOrigin(AncestorOrigin);
 
-    twin_module = new KWinModule(TQT_TQOBJECT(this));
+    twin_module = new KWinModule(this);
 
     // kApplication notifies us of settings changes. added to support
     // disabling of frame effect on mouse hover
     kapp->dcopClient()->setNotifications(true);
     connectDCOPSignal("kicker", "kicker", "configurationChanged()", "loadSettings()", false);
 
-    TQTimer::singleShot(0, this, TQT_SLOT(initialize()));
+    TQTimer::singleShot(0, this, TQ_SLOT(initialize()));
 }
 
 void SystemTrayApplet::updateClockGeometry()
@@ -119,7 +119,7 @@ void SystemTrayApplet::updateClockGeometry()
     if (m_clockApplet)
     {
         m_clockApplet->setPosition(position());
-			  if (orientation() == Qt::Horizontal)
+			  if (orientation() == TQt::Horizontal)
 			  {
 	          m_clockApplet->setFixedSize(m_clockApplet->widthForHeight(height()),height());
    			}
@@ -151,10 +151,10 @@ void SystemTrayApplet::initialize()
     }
 
     // the KWinModule notifies us when tray windows are added or removed
-    connect( twin_module, TQT_SIGNAL( systemTrayWindowAdded(WId) ),
-             this, TQT_SLOT( systemTrayWindowAdded(WId) ) );
-    connect( twin_module, TQT_SIGNAL( systemTrayWindowRemoved(WId) ),
-             this, TQT_SLOT( updateTrayWindows() ) );
+    connect( twin_module, TQ_SIGNAL( systemTrayWindowAdded(WId) ),
+             this, TQ_SLOT( systemTrayWindowAdded(WId) ) );
+    connect( twin_module, TQ_SIGNAL( systemTrayWindowRemoved(WId) ),
+             this, TQ_SLOT( updateTrayWindows() ) );
 
     TQCString screenstr;
     screenstr.setNum(tqt_xscreen());
@@ -249,11 +249,11 @@ void SystemTrayApplet::preferences()
                                        KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel,
                                        KDialogBase::Ok, true);
     m_settingsDialog->resize(450, 400);
-    connect(m_settingsDialog, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(applySettings()));
-    connect(m_settingsDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(applySettings()));
-    connect(m_settingsDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(settingsDialogFinished()));
+    connect(m_settingsDialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(applySettings()));
+    connect(m_settingsDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(applySettings()));
+    connect(m_settingsDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(settingsDialogFinished()));
 
-    TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 2, Qt::Vertical);
+    TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 2, TQt::Vertical);
 
     m_showClockSettingCB = new TQCheckBox(i18n("Show Clock in Tray"), settingsGrid);
     m_showClockSettingCB->setChecked(m_showClockInTray);
@@ -432,11 +432,11 @@ void SystemTrayApplet::showExpandButton(bool show)
     {
         if (!m_expandButton)
         {
-            m_expandButton = new SimpleArrowButton(this, Qt::UpArrow, 0, KickerSettings::showDeepButtons());
+            m_expandButton = new SimpleArrowButton(this, TQt::UpArrow, 0, KickerSettings::showDeepButtons());
             m_expandButton->installEventFilter(this);
             refreshExpandButton();
 
-            if (orientation() == Qt::Vertical)
+            if (orientation() == TQt::Vertical)
             {
                 m_expandButton->setFixedSize(width() - 4,
                                              m_expandButton->sizeHint()
@@ -448,12 +448,12 @@ void SystemTrayApplet::showExpandButton(bool show)
                                                             .width(),
                                              height() - 4);
             }
-            connect(m_expandButton, TQT_SIGNAL(clicked()),
-                    this, TQT_SLOT(toggleExpanded()));
+            connect(m_expandButton, TQ_SIGNAL(clicked()),
+                    this, TQ_SLOT(toggleExpanded()));
 
             m_autoRetractTimer = new TQTimer(this, "m_autoRetractTimer");
-            connect(m_autoRetractTimer, TQT_SIGNAL(timeout()),
-                    this, TQT_SLOT(checkAutoRetract()));
+            connect(m_autoRetractTimer, TQ_SIGNAL(timeout()),
+                    this, TQ_SLOT(checkAutoRetract()));
         }
         else
         {
@@ -559,7 +559,7 @@ void SystemTrayApplet::embedWindow( WId w, bool kde_tray )
         return;
     }
 
-    connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows()));
+    connect(emb, TQ_SIGNAL(embeddedWindowDestroyed()), TQ_SLOT(updateTrayWindows()));
     emb->setFixedSize(m_iconSize, m_iconSize);
 
     if (shouldHide(w))
@@ -677,12 +677,12 @@ void SystemTrayApplet::refreshExpandButton()
         return;
     }
 
-    Qt::ArrowType a;
+    TQt::ArrowType a;
 
-    if (orientation() == Qt::Vertical)
-        a = m_showHidden ? Qt::DownArrow : Qt::UpArrow;
+    if (orientation() == TQt::Vertical)
+        a = m_showHidden ? TQt::DownArrow : TQt::UpArrow;
     else
-        a = (m_showHidden ^ kapp->reverseLayout()) ? Qt::RightArrow : Qt::LeftArrow;
+        a = (m_showHidden ^ kapp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow;
     
     m_expandButton->setArrowType(a);
 }
@@ -833,17 +833,17 @@ int SystemTrayApplet::maxIconHeight() const
 
 bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e)
 {
-    if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_expandButton))
+    if (watched == m_expandButton)
     {
         TQPoint p;
         if (e->type() == TQEvent::ContextMenu)
         {
-            p = TQT_TQCONTEXTMENUEVENT(e)->globalPos();
+            p = static_cast<TQContextMenuEvent*>(e)->globalPos();
         }
         else if (e->type() == TQEvent::MouseButtonPress)
         {
-            TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
-            if (me->button() == Qt::RightButton)
+            TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
+            if (me->button() == TQt::RightButton)
             {
                 p = me->globalPos();
             }
@@ -853,9 +853,9 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e)
         {
             TQPopupMenu* contextMenu = new TQPopupMenu(this);
             contextMenu->insertItem(SmallIcon("configure"), i18n("Configure System Tray..."),
-                                    this, TQT_SLOT(configure()));
+                                    this, TQ_SLOT(configure()));
 
-            contextMenu->exec(TQT_TQCONTEXTMENUEVENT(e)->globalPos());
+            contextMenu->exec(static_cast<TQContextMenuEvent*>(e)->globalPos());
 
             delete contextMenu;
             return true;
@@ -867,7 +867,7 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e)
 
 int SystemTrayApplet::widthForHeight(int h) const
 {
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         return width();
     }
@@ -886,7 +886,7 @@ int SystemTrayApplet::widthForHeight(int h) const
 
 int SystemTrayApplet::heightForWidth(int w) const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return height();
     }
@@ -913,7 +913,7 @@ void SystemTrayApplet::resizeEvent( TQResizeEvent* )
 {
     layoutTray();
     // we need to give ourselves a chance to adjust our size before calling this
-    TQTimer::singleShot(0, this, TQT_SIGNAL(updateLayout()));
+    TQTimer::singleShot(0, this, TQ_SIGNAL(updateLayout()));
 }
 
 void SystemTrayApplet::layoutTray()
@@ -937,7 +937,7 @@ void SystemTrayApplet::layoutTray()
 
     if (m_expandButton)
     {
-        if (orientation() == Qt::Vertical)
+        if (orientation() == TQt::Vertical)
         {
             m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint().height());
         }
@@ -961,7 +961,7 @@ void SystemTrayApplet::layoutTray()
     // This fix makes the workarounds in the heightForWidth() and widthForHeight() methods unneeded.
     //
 
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         int iconWidth = maxIconWidth() + ICON_MARGIN; // +2 for the margins that implied by the layout
         heightWidth = width() - ICON_MARGIN;
@@ -972,7 +972,7 @@ void SystemTrayApplet::layoutTray()
         m_layout->addMultiCellWidget(m_leftSpacer,
                                      0, 0,
                                      0, nbrOfLines - 1,
-                                     Qt::AlignHCenter | Qt::AlignVCenter);
+                                     TQt::AlignHCenter | TQt::AlignVCenter);
         col = 1;
 
         if (showExpandButton)
@@ -980,7 +980,7 @@ void SystemTrayApplet::layoutTray()
             m_layout->addMultiCellWidget(m_expandButton,
                                          1, 1,
                                          0, nbrOfLines - 1,
-                                         Qt::AlignHCenter | Qt::AlignVCenter);
+                                         TQt::AlignHCenter | TQt::AlignVCenter);
             col = 2;
         }
 
@@ -993,7 +993,7 @@ void SystemTrayApplet::layoutTray()
                 line = i % nbrOfLines;
                 (*emb)->show();
                 m_layout->addWidget((*emb), col, line,
-                                    Qt::AlignHCenter | Qt::AlignVCenter);
+                                    TQt::AlignHCenter | TQt::AlignVCenter);
 
                 if ((line + 1) == nbrOfLines)
                 {
@@ -1011,7 +1011,7 @@ void SystemTrayApplet::layoutTray()
             line = i % nbrOfLines;
             (*emb)->show();
             m_layout->addWidget((*emb), col, line,
-                                Qt::AlignHCenter | Qt::AlignVCenter);
+                                TQt::AlignHCenter | TQt::AlignVCenter);
 
             if ((line + 1) == nbrOfLines)
             {
@@ -1024,7 +1024,7 @@ void SystemTrayApplet::layoutTray()
         m_layout->addMultiCellWidget(m_rightSpacer,
                                      col, col,
                                      0, nbrOfLines - 1,
-                                     Qt::AlignHCenter | Qt::AlignVCenter);
+                                     TQt::AlignHCenter | TQt::AlignVCenter);
 
         if (m_clockApplet) {
             if (m_showClockInTray)
@@ -1035,7 +1035,7 @@ void SystemTrayApplet::layoutTray()
             m_layout->addMultiCellWidget(m_clockApplet,
                                      col+1, col+1,
                                      0, nbrOfLines - 1,
-                                     Qt::AlignHCenter | Qt::AlignVCenter);
+                                     TQt::AlignHCenter | TQt::AlignVCenter);
         }
     }
     else // horizontal
@@ -1048,7 +1048,7 @@ void SystemTrayApplet::layoutTray()
         m_layout->addMultiCellWidget(m_leftSpacer,
                                      0, nbrOfLines - 1,
                                      0, 0,
-                                     Qt::AlignHCenter | Qt::AlignVCenter);
+                                     TQt::AlignHCenter | TQt::AlignVCenter);
         col = 1;
 
         if (showExpandButton)
@@ -1056,7 +1056,7 @@ void SystemTrayApplet::layoutTray()
             m_layout->addMultiCellWidget(m_expandButton,
                                          0, nbrOfLines - 1,
                                          1, 1,
-                                         Qt::AlignHCenter | Qt::AlignVCenter);
+                                         TQt::AlignHCenter | TQt::AlignVCenter);
             col = 2;
         }
 
@@ -1068,7 +1068,7 @@ void SystemTrayApplet::layoutTray()
                 line = i % nbrOfLines;
                 (*emb)->show();
                 m_layout->addWidget((*emb), line, col,
-                                    Qt::AlignHCenter | Qt::AlignVCenter);
+                                    TQt::AlignHCenter | TQt::AlignVCenter);
 
                 if ((line + 1) == nbrOfLines)
                 {
@@ -1086,7 +1086,7 @@ void SystemTrayApplet::layoutTray()
             line = i % nbrOfLines;
             (*emb)->show();
             m_layout->addWidget((*emb), line, col,
-                                Qt::AlignHCenter | Qt::AlignVCenter);
+                                TQt::AlignHCenter | TQt::AlignVCenter);
 
             if ((line + 1) == nbrOfLines)
             {
@@ -1099,7 +1099,7 @@ void SystemTrayApplet::layoutTray()
         m_layout->addMultiCellWidget(m_rightSpacer,
                                      0, nbrOfLines - 1,
                                      col, col,
-                                     Qt::AlignHCenter | Qt::AlignVCenter);
+                                     TQt::AlignHCenter | TQt::AlignVCenter);
 
         if (m_clockApplet) {
             if (m_showClockInTray)
@@ -1110,7 +1110,7 @@ void SystemTrayApplet::layoutTray()
             m_layout->addMultiCellWidget(m_clockApplet,
                                          0, nbrOfLines - 1,
                                          col+1, col+1,
-                                         Qt::AlignHCenter | Qt::AlignVCenter);
+                                         TQt::AlignHCenter | TQt::AlignVCenter);
         }
     }
 
diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h
index e311a1bdd..2b49ce93e 100644
--- a/kicker/applets/systemtray/systemtrayapplet.h
+++ b/kicker/applets/systemtray/systemtrayapplet.h
@@ -48,7 +48,7 @@ class TDEActionSelector;
 
 class SystemTrayApplet : public KPanelApplet, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
     typedef TQValueVector<TrayEmbed*> TrayEmbedList;
 
@@ -125,7 +125,7 @@ private:
 
 class TrayEmbed : public QXEmbed
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TrayEmbed( bool kdeTray, TQWidget* parent = NULL );
     ~TrayEmbed();
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp
index 5673cb563..37a78a923 100644
--- a/kicker/applets/taskbar/taskbarapplet.cpp
+++ b/kicker/applets/taskbar/taskbarapplet.cpp
@@ -59,7 +59,7 @@ TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions
     TQHBoxLayout* layout = new TQHBoxLayout( this );
     container = new TaskBarContainer( false, configFile, this );
     container->setBackgroundOrigin( AncestorOrigin );
-    connect(container, TQT_SIGNAL(containerCountChanged()), this, TQT_SIGNAL(updateLayout()));
+    connect(container, TQ_SIGNAL(containerCountChanged()), this, TQ_SIGNAL(updateLayout()));
     layout->addWidget( container, 1 );
     container->popupDirectionChange(popupDirection());
 }
@@ -72,14 +72,14 @@ TaskbarApplet::~TaskbarApplet()
 
 int TaskbarApplet::widthForHeight(int h) const
 {
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         return width();
     }
 
     // FIXME KDE4: when either TaskBarContainer or Applet smartens up
     //             simplify this
-    KPanelExtension::Position d = orientation() == Qt::Horizontal ?
+    KPanelExtension::Position d = orientation() == TQt::Horizontal ?
                                   KPanelExtension::Top :
                                   KPanelExtension::Left;
     return container->sizeHint(d, TQSize(200, h)).width();
@@ -87,14 +87,14 @@ int TaskbarApplet::widthForHeight(int h) const
 
 int TaskbarApplet::heightForWidth(int w) const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return height();
     }
 
     // FIXME KDE4: when either TaskBarContainer or Applet smartens up
     //             simplify this
-    KPanelExtension::Position d = orientation() == Qt::Horizontal ?
+    KPanelExtension::Position d = orientation() == TQt::Horizontal ?
                                   KPanelExtension::Top :
                                   KPanelExtension::Left;
     return container->sizeHint(d, TQSize(w, 200)).height();
diff --git a/kicker/applets/taskbar/taskbarapplet.h b/kicker/applets/taskbar/taskbarapplet.h
index 9685b436b..6204e94f5 100644
--- a/kicker/applets/taskbar/taskbarapplet.h
+++ b/kicker/applets/taskbar/taskbarapplet.h
@@ -31,7 +31,7 @@ class TQPalette;
 
 class TaskbarApplet : public KPanelApplet
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TaskbarApplet( const TQString& configFile, Type t = Normal, int actions = 0,
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index f431b8aed..9fe7eccf6 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -53,12 +53,12 @@ TrashApplet::TrashApplet(const TQString& configFile, Type type, int actions, TQW
 
 	mpDirLister = new KDirLister();
 
-	connect( mpDirLister, TQT_SIGNAL( clear() ),
-	         this, TQT_SLOT( slotClear() ) );
-	connect( mpDirLister, TQT_SIGNAL( completed() ),
-	         this, TQT_SLOT( slotCompleted() ) );
-	connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
-	         this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
+	connect( mpDirLister, TQ_SIGNAL( clear() ),
+	         this, TQ_SLOT( slotClear() ) );
+	connect( mpDirLister, TQ_SIGNAL( completed() ),
+	         this, TQ_SLOT( slotCompleted() ) );
+	connect( mpDirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ),
+	         this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) );
 
 	mpDirLister->openURL("trash:/");
 }
@@ -67,8 +67,8 @@ TrashApplet::~TrashApplet()
 {
 	// disconnect the dir lister before quitting so as not to crash
 	// on kicker exit
-	disconnect( mpDirLister, TQT_SIGNAL( clear() ),
-	            this, TQT_SLOT( slotClear() ) );
+	disconnect( mpDirLister, TQ_SIGNAL( clear() ),
+	            this, TQ_SLOT( slotClear() ) );
 	delete mpDirLister;
 	TDEGlobal::locale()->removeCatalogue("trashapplet");
 }
@@ -121,12 +121,12 @@ void TrashApplet::resizeEvent( TQResizeEvent * )
 	int size = 1;
 
 	size = std::max( size, 
-			 orientation() == Qt::Vertical ?
+			 orientation() == TQt::Vertical ?
 			 	mButton->heightForWidth( width() ) :
 				mButton->widthForHeight( height() ) );
 
 	
-	if(orientation() == Qt::Vertical)
+	if(orientation() == TQt::Vertical)
 	{
 		mButton->resize( width(), size );
 	}
diff --git a/kicker/applets/trash/trashapplet.h b/kicker/applets/trash/trashapplet.h
index c77cf3755..124ae4310 100644
--- a/kicker/applets/trash/trashapplet.h
+++ b/kicker/applets/trash/trashapplet.h
@@ -33,7 +33,7 @@
 
 class TrashApplet : public KPanelApplet
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	TrashApplet(const TQString& configFile, Type t = Normal, int actions = 0,
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index 85c0eef62..96efb7436 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -32,14 +32,14 @@
 #include <konq_popupmenu.h>
 
 TrashButton::TrashButton(TQWidget *parent)
-	: PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)),
+	: PanelPopupButton(parent), mActions(this, this),
 	  mFileItem(KFileItem::Unknown, KFileItem::Unknown, "trash:/")
 {
 	TDEIO::UDSEntry entry;
 	TDEIO::NetAccess::stat("trash:/", entry, 0L);
 	mFileItem.assign(KFileItem(entry, "trash:/"));
 
-	TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
+	TDEAction *a = KStdAction::paste(this, TQ_SLOT(slotPaste()),
 	                               &mActions, "paste");
 	a->setShortcut(0);
 
@@ -53,7 +53,7 @@ TrashButton::TrashButton(TQWidget *parent)
 
 	// Activate this code only if we find a way to have both an
 	// action and a popup menu for the same kicker button
-	//connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));
+	//connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked()));
 
 	setPopup(new TQPopupMenu());
 }
diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h
index bbf596a0c..fa1ce7077 100644
--- a/kicker/applets/trash/trashbutton.h
+++ b/kicker/applets/trash/trashbutton.h
@@ -32,7 +32,7 @@
 
 class TrashButton : public PanelPopupButton
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	TrashButton(TQWidget *parent);
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index 446991109..a5aeefa57 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -57,8 +57,8 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type,
   : KPanelExtension(configFile, type, actions, parent, name)
 {
     dragging_container = 0;
-    twin_module = new KWinModule(TQT_TQOBJECT(this));
-    connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) );
+    twin_module = new KWinModule(this);
+    connect( twin_module, TQ_SIGNAL( windowAdded(WId) ), TQ_SLOT( windowAdded(WId) ) );
     setMinimumSize(DockContainer::sz(), DockContainer::sz());
     setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
     loadContainerConfig();
@@ -174,7 +174,7 @@ void DockBarExtension::layoutContainers()
          it != containers.constEnd();
          ++it)
     {
-        if (orientation() == Qt::Horizontal)
+        if (orientation() == TQt::Horizontal)
             (*it)->move(DockContainer::sz() * i, 0);
         else
             (*it)->move(0, DockContainer::sz() * i);
@@ -236,10 +236,10 @@ void DockBarExtension::addContainer(DockContainer* c, int pos)
 
         containers.insert(it, c);
     }
-    connect(c, TQT_SIGNAL(embeddedWindowDestroyed(DockContainer*)), 
-            TQT_SLOT(embeddedWindowDestroyed(DockContainer*)));
-    connect(c, TQT_SIGNAL(settingsChanged(DockContainer*)), 
-            TQT_SLOT(settingsChanged(DockContainer*)));
+    connect(c, TQ_SIGNAL(embeddedWindowDestroyed(DockContainer*)), 
+            TQ_SLOT(embeddedWindowDestroyed(DockContainer*)));
+    connect(c, TQ_SIGNAL(settingsChanged(DockContainer*)), 
+            TQ_SLOT(settingsChanged(DockContainer*)));
     c->resize(DockContainer::sz(), DockContainer::sz());
     c->show();
 }
@@ -345,17 +345,17 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p)
 }
 
 void DockBarExtension::mousePressEvent(TQMouseEvent *e ) {
-    if (e->button() == Qt::LeftButton) {
+    if (e->button() == TQt::LeftButton) {
         // Store the position of the mouse clic.
         mclic_pos = e->pos();
-    } else if (e->button() == Qt::RightButton) {
+    } else if (e->button() == TQt::RightButton) {
         int pos = findContainerAtPoint(e->pos());
         if (pos != -1) containers.at(pos)->popupMenu(e->globalPos());
     }
 }
 
 void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) {
-    if (e->button() != Qt::LeftButton) return;
+    if (e->button() != TQt::LeftButton) return;
     if (dragging_container) {  
         releaseMouse();
         original_container->embed(dragging_container->embeddedWinId());
@@ -366,7 +366,7 @@ void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) {
 }
 
 void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) {
-    if (! (e->state() & Qt::LeftButton) ) return;
+    if (! (e->state() & TQt::LeftButton) ) return;
     if (dragging_container == 0) {
         // Check whether the user has moved far enough.
         int delay = TQApplication::startDragDistance();
@@ -393,7 +393,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) {
         int pdrag1,pdrag2,psz;
         pdrag1 = dragpos.x() - barpos.x() + DockContainer::sz()/2;
         pdrag2 = dragpos.y() - barpos.y() + DockContainer::sz()/2;
-        if (orientation() == Qt::Vertical) {
+        if (orientation() == TQt::Vertical) {
             int tmp = pdrag1; pdrag1 = pdrag2; pdrag2 = tmp;
             psz = height();
         } else psz = width();
diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h
index 0952d259e..1431f29ee 100644
--- a/kicker/extensions/dockbar/dockbarextension.h
+++ b/kicker/extensions/dockbar/dockbarextension.h
@@ -32,7 +32,7 @@ class KWinModule;
 
 class DockBarExtension : public KPanelExtension
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     DockBarExtension(const TQString& configFile, Type t = Normal,
diff --git a/kicker/extensions/dockbar/dockcontainer.h b/kicker/extensions/dockbar/dockcontainer.h
index 278b8e450..9ab21efb5 100644
--- a/kicker/extensions/dockbar/dockcontainer.h
+++ b/kicker/extensions/dockbar/dockcontainer.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class DockContainer : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     typedef TQValueVector<DockContainer*> Vector;
diff --git a/kicker/extensions/kasbar/docs.h b/kicker/extensions/kasbar/docs.h
index 105176d08..8a5ded920 100644
--- a/kicker/extensions/kasbar/docs.h
+++ b/kicker/extensions/kasbar/docs.h
@@ -36,19 +36,19 @@
 
 
 
-class QObject
+class TQObject
 {
 };
 
-class TQWidget : public QObject
+class TQWidget : public TQObject
 {
 };
 
-class TQDialog : public QWidget
+class TQDialog : public TQWidget
 {
 };
 
-class TQFrame : public QWidget
+class TQFrame : public TQWidget
 {
 };
 
@@ -64,6 +64,6 @@ class KDialogBase : public QDialog
 {
 };
 
-class KPanelExtension : public QWidget
+class KPanelExtension : public TQWidget
 {
 };
diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp
index 1d15dc7c8..e1c9f4afc 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.cpp
+++ b/kicker/extensions/kasbar/kasaboutdlg.cpp
@@ -118,7 +118,7 @@ void KasAboutDialog::addDemoBar()
    box->setSpacing( spacingHint() );
    box->setMargin( marginHint() );
 
-   KasBar *bar = new KasBar( Qt::Horizontal, box );
+   KasBar *bar = new KasBar( TQt::Horizontal, box );
    bar->setItemSize( KasBar::Large );
    bar->setMasked( false );
 
@@ -129,9 +129,9 @@ void KasAboutDialog::addDemoBar()
    KasPopup *pop = new KasPopup( ci );
    ci->setPopup( pop );
    ci->setCustomPopup( true );
-   connect( ci, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQT_SLOT(togglePopup()) );
+   connect( ci, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQ_SLOT(togglePopup()) );
 
-   KasBar *groupbar = bar->createChildBar( ( bar->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop );
+   KasBar *groupbar = bar->createChildBar( ( bar->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop );
    KasItem *i = 0;
 
    KasClockItem *clk = new KasClockItem( groupbar );
diff --git a/kicker/extensions/kasbar/kasaboutdlg.h b/kicker/extensions/kasbar/kasaboutdlg.h
index 0eb1a13f4..dda84045b 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.h
+++ b/kicker/extensions/kasbar/kasaboutdlg.h
@@ -63,7 +63,7 @@ class KasBar;
  */
 class KasAboutDialog : public KDialogBase
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    KasAboutDialog( TQWidget *parent=0 );
diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp
index 87fc7c629..323a58150 100644
--- a/kicker/extensions/kasbar/kasbar.cpp
+++ b/kicker/extensions/kasbar/kasbar.cpp
@@ -80,7 +80,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f )
    : TQWidget( parent, name, f ),
      master_(0),
      orient( o ),
-     direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
+     direction_( o == TQt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
      itemUnderMouse_( 0 ),
      boxesPerLine_(10), // Temp value
      inDrag( false ),
@@ -102,14 +102,14 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f )
     setMouseTracking( true );
     setMaxBoxes( 0 );
 
-    connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) );
+    connect( this, TQ_SIGNAL( configChanged() ), TQ_SLOT( repaint() ) );
 }
 
 KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f )
    : TQWidget( parent, name, f ),
      master_(master),
      orient( o ),
-     direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
+     direction_( o == TQt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
      itemUnderMouse_( 0 ),
      boxesPerLine_(10), // Temp value
      inDrag( false ),
@@ -130,7 +130,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam
     items.setAutoDelete( true );
     setMouseTracking( true );
     setMaxBoxes( 0 );
-    connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) );
+    connect( master_, TQ_SIGNAL( configChanged() ), TQ_SLOT( repaint() ) );
 }
 
 KasBar::~KasBar()
@@ -145,8 +145,8 @@ KasResources *KasBar::resources()
 
     if ( isTopLevel() ) {
 	res = new KasResources( this );
-	connect( res, TQT_SIGNAL( changed() ), TQT_SIGNAL( configChanged() ) );
-	connect( this, TQT_SIGNAL( itemSizeChanged(int) ), res, TQT_SLOT( itemSizeChanged() ) );
+	connect( res, TQ_SIGNAL( changed() ), TQ_SIGNAL( configChanged() ) );
+	connect( this, TQ_SIGNAL( itemSizeChanged(int) ), res, TQ_SLOT( itemSizeChanged() ) );
 	return res;
     }
 
@@ -218,8 +218,8 @@ void KasBar::setTransparent( bool enable )
        kdDebug(1345) << "KasBar: Enabling transparency" << endl;
 
        rootPix = new KRootPixmap( this );
-       connect( rootPix, TQT_SIGNAL( backgroundUpdated(const TQPixmap &) ),
-		this, TQT_SLOT( setBackground(const TQPixmap &) ) );
+       connect( rootPix, TQ_SIGNAL( backgroundUpdated(const TQPixmap &) ),
+		this, TQ_SLOT( setBackground(const TQPixmap &) ) );
 
        rootPix->setCustomPainting( true );
 
@@ -318,9 +318,9 @@ void KasBar::setDirection( Direction dir )
 	return;
 
     if ( ( dir == TQBoxLayout::LeftToRight ) || ( dir == TQBoxLayout::RightToLeft ) )
-	orient = Qt::Horizontal;
+	orient = TQt::Horizontal;
     else
-	orient = Qt::Vertical;
+	orient = TQt::Vertical;
 
     direction_ = dir;
     emit directionChanged();
@@ -332,7 +332,7 @@ void KasBar::setOrientation( Orientation o )
     if ( orient == o )
 	return;
 
-    if ( o == Qt::Horizontal )
+    if ( o == TQt::Horizontal )
 	setDirection( TQBoxLayout::LeftToRight );
     else
 	setDirection( TQBoxLayout::TopToBottom );
@@ -377,7 +377,7 @@ void KasBar::setDetached( bool detach )
 
 TQSize KasBar::sizeHint( Orientation o,  TQSize sz )
 {
-    if ( o == Qt::Horizontal )
+    if ( o == TQt::Horizontal )
 	setBoxesPerLine( sz.width() / itemExtent() );
     else
 	setBoxesPerLine( sz.height() / itemExtent() );
@@ -396,7 +396,7 @@ TQSize KasBar::sizeHint( Orientation o,  TQSize sz )
       ++r;
 
    TQSize s;
-   if( o == Qt::Horizontal ) {
+   if( o == TQt::Horizontal ) {
       s.setWidth( c*itemExtent() );
       s.setHeight( r*itemExtent() );
    }
@@ -434,7 +434,7 @@ void KasBar::updateLayout()
       ++r;
 
    TQSize sz;
-   if ( orient == Qt::Horizontal )
+   if ( orient == TQt::Horizontal )
        sz = TQSize( c * itemExtent(), r * itemExtent() );
    else
        sz = TQSize( r * itemExtent(), c * itemExtent() );
@@ -449,7 +449,7 @@ void KasBar::updateLayout()
    TQRegion mask;
 
    KasItem *i;
-   if ( orient == Qt::Horizontal ) {
+   if ( orient == TQt::Horizontal ) {
        for ( i = items.first(); i; i = items.next() ) {
 	   int x = (items.at() % c) * itemExtent();
 
@@ -720,7 +720,7 @@ void KasBar::addTestItems()
    i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
    i->setAnimation( resources()->startupAnimation() );
    TQTimer *aniTimer = new TQTimer( i, "aniTimer" );
-   connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) );
+   connect( aniTimer, TQ_SIGNAL( timeout() ), i, TQ_SLOT( advanceAnimation() ) );
    aniTimer->start( 100 );
    i->setShowAnimation( true );
 
diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h
index 5d8ac3266..5aad7392a 100644
--- a/kicker/extensions/kasbar/kasbar.h
+++ b/kicker/extensions/kasbar/kasbar.h
@@ -74,7 +74,7 @@ typedef TQPtrList<KasItem> KasItemList;
  */
 class KDE_EXPORT KasBar : public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
    TQ_PROPERTY( int maxBoxes READ maxBoxes )
    TQ_PROPERTY( uint boxesPerLine READ boxesPerLine )
    TQ_PROPERTY( Direction direction READ direction )
@@ -84,8 +84,8 @@ class KDE_EXPORT KasBar : public TQWidget
 
    friend class KasItem;
 public:
-   KasBar( Qt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 );
-   KasBar( Qt::Orientation o, KasBar *master, 
+   KasBar( TQt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 );
+   KasBar( TQt::Orientation o, KasBar *master, 
 	   TQWidget* parent=0, const char* name=0, WFlags f=0 );
 
    virtual ~KasBar();
@@ -99,7 +99,7 @@ public:
    KasBar *master() const { return master_; }
 
    /** Creates a child bar of the kasbar. The child will inherit the appearance options. */
-   virtual KasBar *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 );
+   virtual KasBar *createChildBar( TQt::Orientation o, TQWidget *parent, const char *name=0 );
 
    /** Factory method that returns the singleton resources object. */
    virtual KasResources *resources();
@@ -136,8 +136,8 @@ public:
    int maxBoxes() const { return maxBoxes_; }
    uint boxesPerLine() const { return boxesPerLine_; }
 
-   void setOrientation( Qt::Orientation o );
-   Qt::Orientation orientation() const { return orient; }
+   void setOrientation( TQt::Orientation o );
+   TQt::Orientation orientation() const { return orient; }
 
    void setDirection( Direction dir );
    Direction direction() const { return direction_; }
@@ -147,7 +147,7 @@ public:
 
    bool isDrag() const { return inDrag; }
 
-   TQSize sizeHint( Qt::Orientation,  TQSize max );
+   TQSize sizeHint( TQt::Orientation,  TQSize max );
 
    //
    // Look and feel options
@@ -282,7 +282,7 @@ private:
    TQPixmap offscreen;
    KasBar *master_;
    KasItemList items;
-   Qt::Orientation orient;
+   TQt::Orientation orient;
    Direction direction_;
    KasItem *itemUnderMouse_;
    uint boxesPerLine_;
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index ebb2422d3..a9a5fd68a 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -88,7 +88,7 @@ int main( int argc, char **argv )
   TDEConfig conf( "kasbarrc" );
 
   if ( args->isSet("test") ) {
-      kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags );
+      kasbar = new KasBar( TQt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
       kasbar->setItemSize( KasBar::Large );
       kasbar->append( new KasClockItem(kasbar) );
       kasbar->append( new KasItem(kasbar) );
@@ -97,14 +97,14 @@ int main( int argc, char **argv )
       kasbar->addTestItems();
   }
   else {
-      KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags );
+      KasTasker *kastasker = new KasTasker( TQt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
       kastasker->setConfig( &conf );
       kastasker->setStandAlone( true );
       kasbar = kastasker;
 
       kastasker->readConfig();
       kastasker->move( kastasker->detachedPosition() );
-      kastasker->connect( kastasker->resources(), TQT_SIGNAL(changed()), TQT_SLOT(readConfig()) );
+      kastasker->connect( kastasker->resources(), TQ_SIGNAL(changed()), TQ_SLOT(readConfig()) );
       kastasker->refreshAll();
   }
 
@@ -118,7 +118,7 @@ int main( int argc, char **argv )
 
   TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
 
-  app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) );
+  app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) );
 
   return app.exec();
 }
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index 5d870dae6..327fd564c 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -97,8 +97,8 @@ KasBarExtension::KasBarExtension( const TQString& configFile,
 //    setBackgroundMode( NoBackground );
     kasbar = new KasTasker( orientation(), this, name );
 
-    connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) );
-    connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) );
+    connect( kasbar, TQ_SIGNAL( layoutChanged() ), this, TQ_SIGNAL( updateLayout() ) );
+    connect( kasbar, TQ_SIGNAL( detachedChanged(bool) ), this, TQ_SLOT( setDetached(bool) ) );
 
     kasbar->setConfig( config() );
     kasbar->readConfig();
@@ -146,7 +146,7 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ )
 
 TQSize KasBarExtension::detachedSize()
 {
-    if ( orientation() == Qt::Vertical )
+    if ( orientation() == TQt::Vertical )
 	return TQSize( kasbar->itemExtent()/2, 0 );
     else
 	return TQSize( 0, kasbar->itemExtent()/2 );
@@ -155,13 +155,13 @@ TQSize KasBarExtension::detachedSize()
 
 TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const
 {
-   Orientation o = Qt::Horizontal;
+   Orientation o = TQt::Horizontal;
 
    if ( p == Left || p == Right )
-      o = Qt::Vertical;
+      o = TQt::Vertical;
 
    if ( detached_ ) {
-       if ( o == Qt::Vertical )
+       if ( o == TQt::Vertical )
 	   return TQSize( kasbar->itemExtent()/2, 0 );
        else
 	   return TQSize( 0, kasbar->itemExtent()/2 );
diff --git a/kicker/extensions/kasbar/kasbarextension.h b/kicker/extensions/kasbar/kasbarextension.h
index e5700eeea..c1786c953 100644
--- a/kicker/extensions/kasbar/kasbarextension.h
+++ b/kicker/extensions/kasbar/kasbarextension.h
@@ -64,7 +64,7 @@ class KasTasker;
  */
 class KasBarExtension : public KPanelExtension
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KasBarExtension( const TQString& configFile,
diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp
index 249e7c051..a99c5f8ba 100644
--- a/kicker/extensions/kasbar/kasclockitem.cpp
+++ b/kicker/extensions/kasbar/kasclockitem.cpp
@@ -39,7 +39,7 @@ KasClockItem::KasClockItem( KasBar *parent )
     setCustomPopup( true );
 
     TQTimer *t = new TQTimer( this, "t" );
-    connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateTime() ) );
+    connect( t, TQ_SIGNAL( timeout() ), TQ_SLOT( updateTime() ) );
     t->start( 1000 );
 
     lcd = new LCD( parent );
@@ -53,8 +53,8 @@ KasClockItem::KasClockItem( KasBar *parent )
     lcd->setAutoMask( true );
     updateTime();
 
-    connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) );
-    connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) );
+    connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(togglePopup()) );
+    connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showMenuAt(TQMouseEvent *) ) );
 }
 
 KasClockItem::~KasClockItem()
diff --git a/kicker/extensions/kasbar/kasclockitem.h b/kicker/extensions/kasbar/kasclockitem.h
index a020608b0..b6b263318 100644
--- a/kicker/extensions/kasbar/kasclockitem.h
+++ b/kicker/extensions/kasbar/kasclockitem.h
@@ -8,7 +8,7 @@
  */
 class KDE_EXPORT KasClockItem : public KasItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KasClockItem( KasBar *parent );
diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp
index a14dff2ea..de59f7b88 100644
--- a/kicker/extensions/kasbar/kasgroupitem.cpp
+++ b/kicker/extensions/kasbar/kasgroupitem.cpp
@@ -83,10 +83,10 @@ KasGroupItem::KasGroupItem( KasTasker *parent )
     setGroupItem( true );
     setText( i18n("Group") );
 
-    connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) );
-    connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) );
-    connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) );
-    connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) );
+    connect( parent, TQ_SIGNAL( layoutChanged() ), this, TQ_SLOT( hidePopup() ) );
+    connect( parent, TQ_SIGNAL( layoutChanged() ), this, TQ_SLOT( update() ) );
+    connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(togglePopup()) );
+    connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showGroupMenuAt(TQMouseEvent *) ) );
 }
 
 KasGroupItem::~KasGroupItem()
@@ -109,7 +109,7 @@ void KasGroupItem::addTask( Task::Ptr t )
 	updateIcon();
     }
 
-    connect( t, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( update() ) );
+    connect( t, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( update() ) );
     update();
 }
 
@@ -255,9 +255,9 @@ void KasGroupItem::updatePopup()
 KasPopup *KasGroupItem::createPopup()
 {
     KasPopup *pop = new KasPopup( this );
-    bar = kasbar()->createChildBar( ( kasbar()->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop );
+    bar = kasbar()->createChildBar( ( kasbar()->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop );
 
-    connect( pop, TQT_SIGNAL(shown()), TQT_SLOT(updatePopup()) );
+    connect( pop, TQ_SIGNAL(shown()), TQ_SLOT(updatePopup()) );
 
     return pop;
 
@@ -291,7 +291,7 @@ void KasGroupItem::showGroupMenuAt( TQMouseEvent *ev )
 void KasGroupItem::showGroupMenuAt( const TQPoint &p )
 {
     TaskRMBMenu *tm = new TaskRMBMenu(items, true, NULL, kasbar());
-    tm->insertItem( i18n("&Ungroup" ), this, TQT_SLOT( ungroup() ) );
+    tm->insertItem( i18n("&Ungroup" ), this, TQ_SLOT( ungroup() ) );
     tm->insertSeparator();
     tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() );
 
diff --git a/kicker/extensions/kasbar/kasgroupitem.h b/kicker/extensions/kasbar/kasgroupitem.h
index 33d913430..2acad3004 100644
--- a/kicker/extensions/kasbar/kasgroupitem.h
+++ b/kicker/extensions/kasbar/kasgroupitem.h
@@ -68,7 +68,7 @@ class Task;
  */
 class KasGroupItem : public KasItem
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    enum GroupType {
diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp
index 2523ef18c..a95dac049 100644
--- a/kicker/extensions/kasbar/kasitem.cpp
+++ b/kicker/extensions/kasbar/kasitem.cpp
@@ -94,8 +94,8 @@ KasItem::KasItem( KasBar *parent )
      frame(true), modified(false), attention_(false), prog( -1 ),
      anim(), aniFrame( 0 ), drawAnim( false )
 {
-    connect( parent, TQT_SIGNAL( dragStarted() ), TQT_SLOT( hidePopup() ) );
-    connect( this, TQT_SIGNAL( middleButtonClicked(TQMouseEvent *) ), parent, TQT_SLOT( toggleOrientation() ) );
+    connect( parent, TQ_SIGNAL( dragStarted() ), TQ_SLOT( hidePopup() ) );
+    connect( this, TQ_SIGNAL( middleButtonClicked(TQMouseEvent *) ), parent, TQ_SLOT( toggleOrientation() ) );
 }
 
 KasItem::~KasItem()
@@ -169,7 +169,7 @@ void KasItem::mouseEnter()
 
    if ( (!customPopup) && (popupTimer == 0) ) {
       popupTimer = new TQTimer( this, "popupTimer" );
-      connect( popupTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( showPopup() ) );
+      connect( popupTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( showPopup() ) );
       popupTimer->start( POPUP_DELAY, true );
    }
 
@@ -179,11 +179,11 @@ void KasItem::mouseEnter()
 
 void KasItem::mouseReleaseEvent( TQMouseEvent *ev )
 {
-    if ( ev->button() == Qt::LeftButton )
+    if ( ev->button() == TQt::LeftButton )
 	emit leftButtonClicked( ev );
-    else if ( ev->button() == Qt::RightButton )
+    else if ( ev->button() == TQt::RightButton )
 	emit rightButtonClicked( ev );
-    else if ( ev->button() == Qt::MidButton )
+    else if ( ev->button() == TQt::MidButton )
 	emit middleButtonClicked( ev );
 }
 
@@ -205,7 +205,7 @@ void KasItem::checkPopup()
 	    hidePopup();
     }
     else {
-	TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) );
+	TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQ_SLOT( checkPopup() ) );
     }
 }
 
@@ -215,7 +215,7 @@ void KasItem::dragEnter()
 
    if ( dragTimer == 0 ) {
       dragTimer = new TQTimer( this, "dragTimer" );
-      connect( dragTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( dragOverAction() ) );
+      connect( dragTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( dragOverAction() ) );
       dragTimer->start( DRAG_SWITCH_DELAY, true );
    }
 
@@ -268,7 +268,7 @@ void KasItem::showPopup()
    pop->show();
    update();
 
-   TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) );
+   TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQ_SLOT( checkPopup() ) );
 }
 
 void KasItem::hidePopup()
@@ -312,13 +312,13 @@ void KasItem::paintFrame( TQPainter *p )
 	   p->drawRect( 0, 0, extent(), extent());
        }
        else {
-	   pen = TQPen( Qt::white );
+	   pen = TQPen( TQt::white );
 	   p->setPen( pen );
 	   p->drawRect(0, 0, extent(), extent());
        }
    }
    else if ( kas->paintInactiveFrames() ) {
-       p->setPen( attention_ ? resources()->attentionColor() : Qt::black );
+       p->setPen( attention_ ? resources()->attentionColor() : TQt::black );
        p->drawRect(0, 0, extent(), extent());
    }
 }
diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h
index 4408227cb..508955f9d 100644
--- a/kicker/extensions/kasbar/kasitem.h
+++ b/kicker/extensions/kasbar/kasitem.h
@@ -75,7 +75,7 @@ class KasPopup;
  */
 class KDE_EXPORT KasItem : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     friend class KasBar;
diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp
index 6169d09b1..450d80154 100644
--- a/kicker/extensions/kasbar/kasloaditem.cpp
+++ b/kicker/extensions/kasbar/kasloaditem.cpp
@@ -34,11 +34,11 @@ KasLoadItem::KasLoadItem( KasBar *parent )
     : KasItem( parent )
 {
     TQTimer *t = new TQTimer( this, "KasLoadItem::t" );
-    connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateDisplay() ) );
+    connect( t, TQ_SIGNAL( timeout() ), TQ_SLOT( updateDisplay() ) );
     t->start( 1000 );
     updateDisplay();
 
-    connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) );
+    connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showMenuAt(TQMouseEvent *) ) );
 }
 
 KasLoadItem::~KasLoadItem()
diff --git a/kicker/extensions/kasbar/kasloaditem.h b/kicker/extensions/kasbar/kasloaditem.h
index 0b7312ab6..91af06080 100644
--- a/kicker/extensions/kasbar/kasloaditem.h
+++ b/kicker/extensions/kasbar/kasloaditem.h
@@ -10,7 +10,7 @@
  */
 class KDE_EXPORT KasLoadItem : public KasItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KasLoadItem( KasBar *parent );
diff --git a/kicker/extensions/kasbar/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp
index 0edc0a77a..33966bdb9 100644
--- a/kicker/extensions/kasbar/kaspopup.cpp
+++ b/kicker/extensions/kasbar/kaspopup.cpp
@@ -95,7 +95,7 @@ TQPoint KasPopup::calcPosition( KasItem *item, int w, int h )
    int x = pos.x();
    int y = pos.y();
 
-   if ( kasbar->orientation() == Qt::Horizontal ) {
+   if ( kasbar->orientation() == TQt::Horizontal ) {
       if ( y < ( tqApp->desktop()->height() / 2 ) )
 	 y = y + kasbar->itemExtent();
       else
diff --git a/kicker/extensions/kasbar/kaspopup.h b/kicker/extensions/kasbar/kaspopup.h
index 2de7ee6bd..701ca01dd 100644
--- a/kicker/extensions/kasbar/kaspopup.h
+++ b/kicker/extensions/kasbar/kaspopup.h
@@ -69,7 +69,7 @@ class KasBar;
  */
 class KasPopup : public TQHBox
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    KasPopup( KasItem *item, const char *name=0 );
diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp
index 729fda525..cce36b250 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.cpp
+++ b/kicker/extensions/kasbar/kasprefsdlg.cpp
@@ -134,9 +134,9 @@ void KasPrefsDialog::addLookPage()
 
    itemSizeLabel->setBuddy( itemSizeCombo );
 
-   connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ),
-	    kasbar, TQT_SLOT( setItemSize( int ) ) );
-   connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( itemSizeChanged( int ) ) );
+   connect( itemSizeCombo, TQ_SIGNAL( activated( int ) ),
+	    kasbar, TQ_SLOT( setItemSize( int ) ) );
+   connect( itemSizeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( itemSizeChanged( int ) ) );
 
    new TQWidget( itemSizeBox );
 
@@ -144,10 +144,10 @@ void KasPrefsDialog::addLookPage()
 
    customSize->setValue( kasbar->itemExtent() );
 
-   connect( customSize, TQT_SIGNAL( valueChanged( int ) ),
-	    kasbar, TQT_SLOT( setItemExtent( int ) ) );
-   connect( customSize, TQT_SIGNAL( valueChanged( int ) ),
-	    kasbar, TQT_SLOT( customSizeChanged( int ) ) );
+   connect( customSize, TQ_SIGNAL( valueChanged( int ) ),
+	    kasbar, TQ_SLOT( setItemExtent( int ) ) );
+   connect( customSize, TQ_SIGNAL( valueChanged( int ) ),
+	    kasbar, TQ_SLOT( customSizeChanged( int ) ) );
 
    int sz = kasbar->itemSize();
    itemSizeCombo->setCurrentItem( sz );
@@ -171,7 +171,7 @@ void KasPrefsDialog::addLookPage()
 				   conf ? conf->readNumEntry( "MaxBoxes", 0 ) : 11,
 				   10,
 				   maxBoxesBox, "maxboxes" );
-   connect( maxBoxesSpin, TQT_SIGNAL( valueChanged( int ) ), kasbar, TQT_SLOT( setMaxBoxes( int ) ) );
+   connect( maxBoxesSpin, TQ_SIGNAL( valueChanged( int ) ), kasbar, TQ_SLOT( setMaxBoxes( int ) ) );
    maxBoxesLabel->setBuddy( maxBoxesSpin );
 
    //
@@ -183,7 +183,7 @@ void KasPrefsDialog::addLookPage()
 
    detachedCheck->setEnabled( !kasbar->isStandAlone() );
    detachedCheck->setChecked( kasbar->isDetached() );
-   connect( detachedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setDetached(bool) ) );
+   connect( detachedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setDetached(bool) ) );
 
    (void) new TQWidget( lookPage, "spacer" );
    (void) new TQWidget( lookPage, "spacer" );
@@ -197,40 +197,40 @@ void KasPrefsDialog::addBackgroundPage()
    transCheck = new TQCheckBox( i18n("Trans&parent"), bgPage );
    TQWhatsThis::add( transCheck, i18n( "Enables pseudo-transparent mode." ) );
    transCheck->setChecked( kasbar->isTransparent() );
-   connect( transCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTransparent(bool) ) );
+   connect( transCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setTransparent(bool) ) );
 
    tintCheck = new TQCheckBox( i18n("Enable t&int"), bgPage );
    TQWhatsThis::add( tintCheck,
 		    i18n( "Enables tinting the background that shows through in transparent mode." ) );
    tintCheck->setChecked( kasbar->hasTint() );
-   connect( tintCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTint(bool) ) );
+   connect( tintCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setTint(bool) ) );
 
    TQHBox *tintColBox = new TQHBox( bgPage );
    TQWhatsThis::add( tintColBox,
 		    i18n( "Specifies the color used for the background tint." ) );
-   connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintColBox, TQT_SLOT( setEnabled(bool) ) );
+   connect( tintCheck, TQ_SIGNAL( toggled(bool) ), tintColBox, TQ_SLOT( setEnabled(bool) ) );
    tintColBox->setEnabled( kasbar->hasTint() );
 
    TQLabel *tintLabel = new TQLabel( i18n("Tint &color:"), tintColBox );
 
    tintButton = new KColorButton( kasbar->tintColor(), tintColBox );
-   connect( tintButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    kasbar, TQT_SLOT( setTintColor( const TQColor & ) ) );
+   connect( tintButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    kasbar, TQ_SLOT( setTintColor( const TQColor & ) ) );
    tintLabel->setBuddy( tintButton );
 
    TQHBox *tintAmtBox = new TQHBox( bgPage );
    TQWhatsThis::add( tintAmtBox,
 		    i18n( "Specifies the strength of the background tint." ) );
-   connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintAmtBox, TQT_SLOT( setEnabled(bool) ) );
+   connect( tintCheck, TQ_SIGNAL( toggled(bool) ), tintAmtBox, TQ_SLOT( setEnabled(bool) ) );
    tintAmtBox->setEnabled( kasbar->hasTint() );
 
    TQLabel *tintStrengthLabel = new TQLabel( i18n("Tint &strength: "), tintAmtBox );
 
    int percent = (int) (kasbar->tintAmount() * 100.0);
-   tintAmount = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, tintAmtBox );
+   tintAmount = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, tintAmtBox );
    tintAmount->setTracking( true );
-   connect( tintAmount, TQT_SIGNAL( valueChanged( int ) ),
-	    kasbar, TQT_SLOT( setTintAmount( int ) ) );
+   connect( tintAmount, TQ_SIGNAL( valueChanged( int ) ),
+	    kasbar, TQ_SLOT( setTintAmount( int ) ) );
    tintStrengthLabel->setBuddy( tintAmount );
 
    (void) new TQWidget( bgPage, "spacer" );
@@ -249,11 +249,11 @@ void KasPrefsDialog::addThumbsPage()
 			  "approximate, and may not reflect the current window contents.\n\n"
 			  "Using this option on a slow machine may cause performance problems." ) );
    thumbsCheck->setChecked( kasbar->thumbnailsEnabled() );
-   connect( thumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setThumbnailsEnabled(bool) ) );
+   connect( thumbsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setThumbnailsEnabled(bool) ) );
 
    embedThumbsCheck = new TQCheckBox( i18n("&Embed thumbnails"), thumbsPage );
    embedThumbsCheck->setChecked( kasbar->embedThumbnails() );
-   connect( embedThumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setEmbedThumbnails(bool) ) );
+   connect( embedThumbsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setEmbedThumbnails(bool) ) );
 
    TQHBox *thumbSizeBox = new TQHBox( thumbsPage );
    TQWhatsThis::add( thumbSizeBox,
@@ -261,9 +261,9 @@ void KasPrefsDialog::addThumbsPage()
 			  "cause performance problems." ) );
    TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox );
    int percent = (int) (kasbar->thumbnailSize() * 100.0);
-   thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, thumbSizeBox );
-   connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ),
-	    kasbar, TQT_SLOT( setThumbnailSize( int ) ) );
+   thumbSizeSlider = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, thumbSizeBox );
+   connect( thumbSizeSlider, TQ_SIGNAL( valueChanged( int ) ),
+	    kasbar, TQ_SLOT( setThumbnailSize( int ) ) );
    thumbSizeLabel->setBuddy( thumbSizeSlider );
 
    TQHBox *thumbUpdateBox = new TQHBox( thumbsPage );
@@ -275,8 +275,8 @@ void KasPrefsDialog::addThumbsPage()
    TQLabel *thumbUpdateLabel = new TQLabel( i18n("&Update thumbnail every: "), thumbUpdateBox );
    thumbUpdateSpin = new TQSpinBox( 0, 1000, 1, thumbUpdateBox );
    thumbUpdateSpin->setValue( kasbar->thumbnailUpdateDelay() );
-   connect( thumbUpdateSpin, TQT_SIGNAL( valueChanged( int ) ),
-   	    kasbar, TQT_SLOT( setThumbnailUpdateDelay( int ) ) );
+   connect( thumbUpdateSpin, TQ_SIGNAL( valueChanged( int ) ),
+   	    kasbar, TQ_SLOT( setThumbnailUpdateDelay( int ) ) );
    (void) new TQLabel( i18n("seconds"), thumbUpdateBox );
    thumbUpdateLabel->setBuddy( thumbUpdateSpin );
 
@@ -293,21 +293,21 @@ void KasPrefsDialog::addBehavePage()
    TQWhatsThis::add( groupWindowsCheck,
 		    i18n( "Enables the grouping together of related windows." ) );
    groupWindowsCheck->setChecked( kasbar->groupWindows() );
-   connect( groupWindowsCheck, TQT_SIGNAL( toggled(bool) ),
-	    kasbar, TQT_SLOT( setGroupWindows(bool) ) );
+   connect( groupWindowsCheck, TQ_SIGNAL( toggled(bool) ),
+	    kasbar, TQ_SLOT( setGroupWindows(bool) ) );
 
    showAllWindowsCheck = new TQCheckBox( i18n("Show all &windows"), behavePage );
    TQWhatsThis::add( showAllWindowsCheck,
 		    i18n( "Enables the display of all windows, not just those on the current desktop." ) );
    showAllWindowsCheck->setChecked( kasbar->showAllWindows() );
-   connect( showAllWindowsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAllWindows(bool) ) );
+   connect( showAllWindowsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowAllWindows(bool) ) );
 
    groupInactiveCheck = new TQCheckBox( i18n("&Group windows on inactive desktops"), behavePage );
    TQWhatsThis::add( groupInactiveCheck,
 		    i18n( "Enables the grouping together of windows that are not on the current desktop." ) );
    groupInactiveCheck->setChecked( kasbar->groupInactiveDesktops() );
-   connect( groupInactiveCheck, TQT_SIGNAL( toggled(bool) ),
-	    kasbar, TQT_SLOT( setGroupInactiveDesktops(bool) ) );
+   connect( groupInactiveCheck, TQ_SIGNAL( toggled(bool) ),
+	    kasbar, TQ_SLOT( setGroupInactiveDesktops(bool) ) );
 
    onlyShowMinimizedCheck = new TQCheckBox( i18n("Only show &minimized windows"), behavePage );
    TQWhatsThis::add( onlyShowMinimizedCheck,
@@ -315,7 +315,7 @@ void KasPrefsDialog::addBehavePage()
 			  "This gives Kasbar similar behavior to the icon handling in older environments " \
 			  "like CDE or OpenLook." ) );
    onlyShowMinimizedCheck->setChecked( kasbar->onlyShowMinimized() );
-   connect( onlyShowMinimizedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setOnlyShowMinimized(bool) ) );
+   connect( onlyShowMinimizedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setOnlyShowMinimized(bool) ) );
 
    (void) new TQWidget( behavePage, "spacer" );
    (void) new TQWidget( behavePage, "spacer" );
@@ -331,14 +331,14 @@ void KasPrefsDialog::addColorsPage()
    TQLabel *labelPenLabel = new TQLabel( i18n("Label foreground:"), group );
 
    labelPenButton = new KColorButton( res->labelPenColor(), group );
-   connect( labelPenButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setLabelPenColor( const TQColor & ) ) );
+   connect( labelPenButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setLabelPenColor( const TQColor & ) ) );
    labelPenLabel->setBuddy( labelPenButton );
 
    TQLabel *labelBackgroundLabel = new TQLabel( i18n("Label background:"), group );
    labelBackgroundButton = new KColorButton( res->labelBgColor(), group );
-   connect( labelBackgroundButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setLabelBgColor( const TQColor & ) ) );
+   connect( labelBackgroundButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setLabelBgColor( const TQColor & ) ) );
    labelBackgroundLabel->setBuddy( labelBackgroundButton );
 
    // Inactive colors
@@ -346,14 +346,14 @@ void KasPrefsDialog::addColorsPage()
 
    TQLabel *inactivePenLabel = new TQLabel( i18n("Inactive foreground:"), group );
    inactivePenButton = new KColorButton( res->inactivePenColor(), group );
-   connect( inactivePenButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setInactivePenColor( const TQColor & ) ) );
+   connect( inactivePenButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setInactivePenColor( const TQColor & ) ) );
    inactivePenLabel->setBuddy( inactivePenButton );
 
    TQLabel *inactiveBgLabel = new TQLabel( i18n("Inactive background:"), group );
    inactiveBgButton = new KColorButton( res->inactiveBgColor(), group );
-   connect( inactiveBgButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setInactiveBgColor( const TQColor & ) ) );
+   connect( inactiveBgButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setInactiveBgColor( const TQColor & ) ) );
    inactiveBgLabel->setBuddy( inactiveBgButton );
 
    // Active colors
@@ -361,28 +361,28 @@ void KasPrefsDialog::addColorsPage()
 
    TQLabel *activePenLabel = new TQLabel( i18n("Active foreground:"), group );
    activePenButton = new KColorButton( res->activePenColor(), group );
-   connect( activePenButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setActivePenColor( const TQColor & ) ) );
+   connect( activePenButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setActivePenColor( const TQColor & ) ) );
    activePenLabel->setBuddy( activePenButton );
 
    TQLabel *activeBgLabel = new TQLabel( i18n("Active background:"), group );
    activeBgButton = new KColorButton( res->activeBgColor(), group );
-   connect( activeBgButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setActiveBgColor( const TQColor & ) ) );
+   connect( activeBgButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setActiveBgColor( const TQColor & ) ) );
    activeBgLabel->setBuddy( activeBgButton );
 
    group = new TQGrid( 2, colorsPage );
 
    TQLabel *progressLabel = new TQLabel( i18n("&Progress color:"), group );
    progressButton = new KColorButton( res->progressColor(), group );
-   connect( progressButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setProgressColor( const TQColor & ) ) );
+   connect( progressButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setProgressColor( const TQColor & ) ) );
    progressLabel->setBuddy( progressButton );
 
    TQLabel *attentionLabel = new TQLabel( i18n("&Attention color:"), group );
    attentionButton = new KColorButton( res->attentionColor(), group );
-   connect( attentionButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setAttentionColor( const TQColor & ) ) );
+   connect( attentionButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setAttentionColor( const TQColor & ) ) );
    attentionLabel->setBuddy( attentionButton );
 
    (void) new TQWidget( colorsPage, "spacer" );
@@ -406,7 +406,7 @@ void KasPrefsDialog::addAdvancedPage()
 		    i18n( "Enables the display of tasks that are starting but have not yet "
 			  "created a window." ) );
    notifierCheck->setChecked( kasbar->notifierEnabled() );
-   connect( notifierCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setNotifierEnabled(bool) ) );
+   connect( notifierCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setNotifierEnabled(bool) ) );
 
    // Status advanced
    modifiedCheck = new TQCheckBox( i18n("Enable &modified indicator"), advancedPage );
@@ -414,26 +414,26 @@ void KasPrefsDialog::addAdvancedPage()
 		    i18n( "Enables the display of a floppy disk state icon for windows containing "
 			  "a modified document." ) );
    modifiedCheck->setChecked( kasbar->showModified() );
-   connect( modifiedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowModified(bool) ) );
+   connect( modifiedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowModified(bool) ) );
 
    progressCheck = new TQCheckBox( i18n("Enable &progress indicator"), advancedPage );
    TQWhatsThis::add( progressCheck,
 		    i18n( "Enables the display of a progress indicator in the label of windows." ) );
    progressCheck->setChecked( kasbar->showProgress() );
-   connect( progressCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowProgress(bool) ) );
+   connect( progressCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowProgress(bool) ) );
 
    attentionCheck = new TQCheckBox( i18n("Enable &attention indicator"), advancedPage );
    TQWhatsThis::add( attentionCheck,
 		    i18n( "Enables the display of an icon that indicates a window that needs attention." ) );
    attentionCheck->setChecked( kasbar->showAttention() );
-   connect( attentionCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAttention(bool) ) );
+   connect( attentionCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowAttention(bool) ) );
 
    inactiveFramesCheck = new TQCheckBox( i18n("Enable frames for inactive items"), advancedPage );
    TQWhatsThis::add( inactiveFramesCheck,
 		    i18n( "Enables frames around inactive items, if you want the bar to disappear into " \
 			  "the background you should probably uncheck this option." ) );
    inactiveFramesCheck->setChecked( kasbar->paintInactiveFrames() );
-   connect( inactiveFramesCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setPaintInactiveFrames(bool) ) );
+   connect( inactiveFramesCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setPaintInactiveFrames(bool) ) );
 
    (void) new TQWidget( advancedPage, "spacer" );
    (void) new TQWidget( advancedPage, "spacer" );
diff --git a/kicker/extensions/kasbar/kasprefsdlg.h b/kicker/extensions/kasbar/kasprefsdlg.h
index 05ad8c3a7..b35e96bed 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.h
+++ b/kicker/extensions/kasbar/kasprefsdlg.h
@@ -72,7 +72,7 @@ class KasResources;
  */
 class KasPrefsDialog : public KDialogBase
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    KasPrefsDialog( KasTasker *kas, TQWidget *parent=0 );
diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp
index 78b25e8c0..219c324fb 100644
--- a/kicker/extensions/kasbar/kasresources.cpp
+++ b/kicker/extensions/kasbar/kasresources.cpp
@@ -126,10 +126,10 @@ static const char *micro_shade[]={
 KasResources::KasResources( KasBar *parent, const char *name )
     : TQObject( parent, name ? name : "kasbar_resources" ),
       kasbar( parent ),
-      labelPenColor_( Qt::white ), labelBgColor_( Qt::black ),
-      activePenColor_( Qt::black ), activeBgColor_( Qt::white ),
-      inactivePenColor_( Qt::black ), inactiveBgColor_( Qt::white ),
-      progressColor_( Qt::green ), attentionColor_( Qt::red ),
+      labelPenColor_( TQt::white ), labelBgColor_( TQt::black ),
+      activePenColor_( TQt::black ), activeBgColor_( TQt::white ),
+      inactivePenColor_( TQt::black ), inactiveBgColor_( TQt::white ),
+      progressColor_( TQt::green ), attentionColor_( TQt::red ),
       startupFrames_()
 {
 }
diff --git a/kicker/extensions/kasbar/kasresources.h b/kicker/extensions/kasbar/kasresources.h
index e82c1b9e0..81f06086c 100644
--- a/kicker/extensions/kasbar/kasresources.h
+++ b/kicker/extensions/kasbar/kasresources.h
@@ -73,7 +73,7 @@ class KasBar;
  */
 class KasResources : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KasResources( KasBar *parent, const char *name=0 );
diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp
index 2f008d0c5..84e17dd21 100644
--- a/kicker/extensions/kasbar/kasstartupitem.cpp
+++ b/kicker/extensions/kasbar/kasstartupitem.cpp
@@ -80,7 +80,7 @@ KasStartupItem::KasStartupItem( KasBar *parent, Startup::Ptr startup )
     setAnimation( resources()->startupAnimation() );
 
     aniTimer = new TQTimer( this, "aniTimer" );
-    connect( aniTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( aniTimerFired() ) );
+    connect( aniTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( aniTimerFired() ) );
     aniTimer->start( 100 );
 }
 
diff --git a/kicker/extensions/kasbar/kasstartupitem.h b/kicker/extensions/kasbar/kasstartupitem.h
index 4c0ade4e2..24cf4fe60 100644
--- a/kicker/extensions/kasbar/kasstartupitem.h
+++ b/kicker/extensions/kasbar/kasstartupitem.h
@@ -67,7 +67,7 @@ class TQTimer;
  */
 class KasStartupItem : public KasItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KasStartupItem( KasBar *parent, Startup::Ptr startup );
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index d10805a78..3d28a723d 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -102,17 +102,17 @@ KasTasker::KasTasker( Orientation o, TQWidget* parent, const char* name, WFlags
     loadItem(0)
 {
    setAcceptDrops( true );
-   connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)), TQT_SLOT(addTask(Task::Ptr)));
-   connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), TQT_SLOT(removeTask(Task::Ptr)));
-   connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)), TQT_SLOT(addStartup(Startup::Ptr)));
-   connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)), TQT_SLOT(removeStartup(Startup::Ptr)));
-   connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAllLater()));
-//   connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAllLater() ) );
+   connect(TaskManager::the(), TQ_SIGNAL(taskAdded(Task::Ptr)), TQ_SLOT(addTask(Task::Ptr)));
+   connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)), TQ_SLOT(removeTask(Task::Ptr)));
+   connect(TaskManager::the(), TQ_SIGNAL(startupAdded(Startup::Ptr)), TQ_SLOT(addStartup(Startup::Ptr)));
+   connect(TaskManager::the(), TQ_SIGNAL(startupRemoved(Startup::Ptr)), TQ_SLOT(removeStartup(Startup::Ptr)));
+   connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), TQ_SLOT(refreshAllLater()));
+//   connect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), TQ_SLOT( refreshAllLater() ) );
 
-   connect( this, TQT_SIGNAL( itemSizeChanged( int ) ), TQT_SLOT( refreshAll() ) );
+   connect( this, TQ_SIGNAL( itemSizeChanged( int ) ), TQ_SLOT( refreshAll() ) );
 
-   connect( this, TQT_SIGNAL( detachedPositionChanged(const TQPoint &) ), TQT_SLOT( writeLayout() ) );
-   connect( this, TQT_SIGNAL( directionChanged() ), TQT_SLOT( writeLayout() ) );
+   connect( this, TQ_SIGNAL( detachedPositionChanged(const TQPoint &) ), TQ_SLOT( writeLayout() ) );
+   connect( this, TQ_SIGNAL( directionChanged() ), TQ_SLOT( writeLayout() ) );
 }
 
 KasTasker::KasTasker( Orientation o, KasTasker *master, TQWidget* parent, const char* name, WFlags f )
@@ -152,62 +152,62 @@ TDEPopupMenu *KasTasker::contextMenu()
 	menu = new TDEPopupMenu;
 
 	showAllWindowsAction = new TDEToggleAction( i18n("Show &All Windows"), TDEShortcut(),
-						  TQT_TQOBJECT(this), "toggle_show_all_windows" );
+						  this, "toggle_show_all_windows" );
 	showAllWindowsAction->setChecked( showAllWindows() );
 	showAllWindowsAction->plug( menu );
-	connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) );
-	connect( TQT_TQOBJECT(this), TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) );
+	connect( showAllWindowsAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowAllWindows(bool)) );
+	connect( this, TQ_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQ_SLOT(setChecked(bool)) );
 
 	groupWindowsAction = new TDEToggleAction( i18n("&Group Windows"), TDEShortcut(),
-						TQT_TQOBJECT(this), "toggle_group_windows" );
+						this, "toggle_group_windows" );
 	groupWindowsAction->setChecked( groupWindows() );
 	groupWindowsAction->plug( menu );
-	connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) );
-	connect( TQT_TQOBJECT(this), TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) );
+	connect( groupWindowsAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setGroupWindows(bool)) );
+	connect( this, TQ_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQ_SLOT(setChecked(bool)) );
 
-	showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_clock" );
+	showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), this, "toggle_show_clock" );
 	showClockAction->setChecked( showClock() );
 	showClockAction->plug( menu );
-	connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) );
-	connect( TQT_TQOBJECT(this), TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) );
+	connect( showClockAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowClock(bool)) );
+	connect( this, TQ_SIGNAL(showClockChanged(bool)), showClockAction, TQ_SLOT(setChecked(bool)) );
 
-	showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_load" );
+	showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), this, "toggle_show_load" );
 	showLoadAction->setChecked( showLoad() );
 	showLoadAction->plug( menu );
-	connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) );
-	connect( TQT_TQOBJECT(this), TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) );
+	connect( showLoadAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowLoad(bool)) );
+	connect( this, TQ_SIGNAL(showLoadChanged(bool)), showLoadAction, TQ_SLOT(setChecked(bool)) );
 
 	menu->insertSeparator();
 
 	if ( !standalone_ ) {
-	    toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_detached" );
+	    toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), this, "toggle_detached" );
 	    toggleDetachedAction->setChecked( isDetached() );
 	    toggleDetachedAction->plug( menu );
-	    connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) );
-	    connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) );
+	    connect( toggleDetachedAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setDetached(bool)) );
+	    connect( this, TQ_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQ_SLOT(setChecked(bool)) );
 	}
 
 	rotateBarAction = new TDEAction( i18n("R&otate Bar"), TQString("rotate"), TDEShortcut(),
-				       TQT_TQOBJECT(this), TQT_SLOT( toggleOrientation() ),
-				       TQT_TQOBJECT(this), "rotate_bar" );
+				       this, TQ_SLOT( toggleOrientation() ),
+				       this, "rotate_bar" );
 	rotateBarAction->plug( menu );
-	connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) );
-	connect( rotateBarAction, TQT_SIGNAL(activated()), TQT_SLOT(writeConfigLater()) );
+	connect( this, TQ_SIGNAL(detachedChanged(bool)), rotateBarAction, TQ_SLOT(setEnabled(bool)) );
+	connect( rotateBarAction, TQ_SIGNAL(activated()), TQ_SLOT(writeConfigLater()) );
 
-	menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), TQT_TQOBJECT(this), TQT_SLOT( refreshAll() ) );
+	menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQ_SLOT( refreshAll() ) );
 
 	menu->insertSeparator();
 
-	menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), TQT_TQOBJECT(this), TQT_SLOT( showPreferences() ) );
+	menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQ_SLOT( showPreferences() ) );
 
 	// Help menu
 	TDEPopupMenu *help = new TDEPopupMenu;
-	help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), TQT_TQOBJECT(this), TQT_SLOT( showAbout() ) );
+	help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQ_SLOT( showAbout() ) );
 	menu->insertItem( SmallIcon("help"), i18n("&Help"), help );
 
 	if ( standalone_ ) {
 	    menu->insertSeparator();
-	    menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) );
+	    menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), tqApp, TQ_SLOT( quit() ) );
 	}
     }
 
@@ -294,7 +294,7 @@ KasGroupItem *KasTasker::convertToGroup( Task::Ptr t )
   removeTask( t );
   insert( i, gi );
 
-  connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), gi, TQT_SLOT(removeTask(Task::Ptr)));
+  connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)), gi, TQ_SLOT(removeTask(Task::Ptr)));
 
   return gi;
 }
@@ -371,7 +371,7 @@ void KasTasker::refreshAll()
 
 void KasTasker::refreshAllLater()
 {
-    TQTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, TQT_SLOT( refreshAll() ) );
+    TQTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, TQ_SLOT( refreshAll() ) );
 }
 
 void KasTasker::refreshIconGeometry()
@@ -432,12 +432,12 @@ void KasTasker::setShowAllWindows( bool enable )
       showAllWindows_ = enable;
       refreshAll();
       if ( !showAllWindows_ ) {
-	connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAll()));
-//	connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAll() ) );
+	connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), TQ_SLOT(refreshAll()));
+//	connect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), TQ_SLOT( refreshAll() ) );
       }
       else {
-	disconnect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), this, TQT_SLOT(refreshAll()));
-//	disconnect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), this, TQT_SLOT( refreshAll() ) );
+	disconnect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), this, TQ_SLOT(refreshAll()));
+//	disconnect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), this, TQ_SLOT( refreshAll() ) );
       }
 
       emit showAllWindowsChanged( enable );
@@ -551,7 +551,7 @@ void KasTasker::readConfig()
 
 void KasTasker::writeConfigLater()
 {
-   TQTimer::singleShot( 10, this, TQT_SLOT( writeConfig() ) );
+   TQTimer::singleShot( 10, this, TQ_SLOT( writeConfig() ) );
 }
 
 void KasTasker::writeConfig()
@@ -635,7 +635,7 @@ void KasTasker::readConfig( TDEConfig *conf )
    conf->setGroup("Layout");
 
    setDirection( (Direction) conf->readNumEntry( "Direction", TQBoxLayout::LeftToRight ) );
-   setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Qt::Horizontal ) );
+   setOrientation( (TQt::Orientation) conf->readNumEntry( "Orientation", TQt::Horizontal ) );
    setMaxBoxes( conf->readUnsignedNumEntry( "MaxBoxes", 0 ) );
 
    TQPoint pos(100, 100);
diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h
index c56015aad..c05c13bb6 100644
--- a/kicker/extensions/kasbar/kastasker.h
+++ b/kicker/extensions/kasbar/kastasker.h
@@ -82,21 +82,21 @@ class KasGrouper;
  */
 class KDE_EXPORT KasTasker : public KasBar
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool isTopLevel READ isTopLevel )
     TQ_PROPERTY( bool showClock READ showClock )
     TQ_PROPERTY( bool showLoad READ showLoad )
 
 public:
     /** Create a KasTasker widget. */
-    KasTasker( Qt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
+    KasTasker( TQt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
 
     /**
      * Create a KasTasker widget that is slaved to another KasTasker. The
      * created widget will inherit the settings of the parent, but will
      * not connect to the signals of the TaskManager.
      */
-    KasTasker( Qt::Orientation o, KasTasker *master,
+    KasTasker( TQt::Orientation o, KasTasker *master,
 	       TQWidget *parent=0, const char *name=0, WFlags f=0 );
 
     /** Cleans up. */
@@ -105,7 +105,7 @@ public:
     /** Factory method that returns the default menu for items in the bar. */
     virtual TDEPopupMenu *contextMenu();
 
-    virtual KasTasker *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 );
+    virtual KasTasker *createChildBar( TQt::Orientation o, TQWidget *parent, const char *name=0 );
 
     /**
      * Returns true if this is the top KasTasker. Note that it is possible for
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index 0f57524cc..b7ab94de6 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -99,17 +99,17 @@ KasTaskItem::KasTaskItem( KasTasker *parent, Task::Ptr task )
     setAttention( task->demandsAttention() );
     updateTask(false);
 
-    connect( task, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( updateTask(bool) ) );
-    connect( task, TQT_SIGNAL( activated() ), this, TQT_SLOT( startAutoThumbnail() ) );
-    connect( task, TQT_SIGNAL( deactivated() ), this, TQT_SLOT( stopAutoThumbnail() ) );
-    connect( task, TQT_SIGNAL( iconChanged() ), this, TQT_SLOT( iconChanged() ) );
-    connect( task, TQT_SIGNAL( thumbnailChanged() ), this, TQT_SLOT( iconChanged() ) );
+    connect( task, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( updateTask(bool) ) );
+    connect( task, TQ_SIGNAL( activated() ), this, TQ_SLOT( startAutoThumbnail() ) );
+    connect( task, TQ_SIGNAL( deactivated() ), this, TQ_SLOT( stopAutoThumbnail() ) );
+    connect( task, TQ_SIGNAL( iconChanged() ), this, TQ_SLOT( iconChanged() ) );
+    connect( task, TQ_SIGNAL( thumbnailChanged() ), this, TQ_SLOT( iconChanged() ) );
 
-    connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(toggleActivateAction()) );
-    connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showWindowMenuAt(TQMouseEvent *) ) );
+    connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(toggleActivateAction()) );
+    connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showWindowMenuAt(TQMouseEvent *) ) );
 
     attentionTimer = new TQTimer( this, "attentionTimer" );
-    connect( attentionTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAttention() ) );
+    connect( attentionTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkAttention() ) );
     attentionTimer->start( CHECK_ATTENTION_DELAY );
 }
 
@@ -295,12 +295,12 @@ void KasTaskItem::startAutoThumbnail()
 
     if ( kasbar()->thumbnailUpdateDelay() > 0 ) {
 	thumbTimer = new TQTimer( this, "thumbTimer" );
-	connect( thumbTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( refreshThumbnail() ) );
+	connect( thumbTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( refreshThumbnail() ) );
 
 	thumbTimer->start( kasbar()->thumbnailUpdateDelay() * 1000 );
     }
 
-    TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) );
+    TQTimer::singleShot( 200, this, TQ_SLOT( refreshThumbnail() ) );
 }
 
 void KasTaskItem::stopAutoThumbnail()
@@ -322,7 +322,7 @@ void KasTaskItem::refreshThumbnail()
     // TODO: Check if the popup obscures the window
     KasItem *i = kasbar()->itemUnderMouse();
     if ( i && i->isShowingPopup() ) {
-	TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) );
+	TQTimer::singleShot( 200, this, TQ_SLOT( refreshThumbnail() ) );
 	return;
     }
 
@@ -333,11 +333,11 @@ void KasTaskItem::refreshThumbnail()
 void KasTaskItem::showWindowMenuAt( TQPoint p )
 {
     TaskRMBMenu *tm = new TaskRMBMenu(task_, true, kasbar());
-    tm->insertItem( i18n("To &Tray" ), this, TQT_SLOT( sendToTray() ) );
+    tm->insertItem( i18n("To &Tray" ), this, TQ_SLOT( sendToTray() ) );
     tm->insertSeparator();
     tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() );
     tm->insertSeparator();
-    tm->insertItem( i18n("&Properties" ), this, TQT_SLOT( showPropertiesDialog() ) );
+    tm->insertItem( i18n("&Properties" ), this, TQ_SLOT( showPropertiesDialog() ) );
 
     mouseLeave();
     kasbar()->updateMouseOver();
@@ -390,7 +390,7 @@ void KasTaskItem::showPropertiesDialog()
     tabs->addTab( createTaskProps( task_, tabs ), i18n("Task") );
 
     tabs->addTab( createTaskProps( this, tabs ), i18n("Item") );
-    tabs->addTab( createTaskProps( TQT_TQOBJECT(kasbar()), tabs, false ), i18n("Bar") );
+    tabs->addTab( createTaskProps( kasbar(), tabs, false ), i18n("Bar") );
 
 #if 0
     tabs->addTab( createNETProps( tabs ), i18n("NET") );
diff --git a/kicker/extensions/kasbar/kastaskitem.h b/kicker/extensions/kasbar/kastaskitem.h
index 7c18685dd..99205ae27 100644
--- a/kicker/extensions/kasbar/kastaskitem.h
+++ b/kicker/extensions/kasbar/kastaskitem.h
@@ -67,7 +67,7 @@ class KPixmap;
  */
 class KasTaskItem : public KasItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
  public:
     KasTaskItem( KasTasker *parent, Task::Ptr task );
diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp
index 7b5fe4ed5..8905af37a 100644
--- a/kicker/extensions/kasbar/kastaskpopup.cpp
+++ b/kicker/extensions/kasbar/kastaskpopup.cpp
@@ -91,10 +91,10 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name )
     }
 
     KPixmapEffect::gradient( titleBg, 
-                             Qt::black, colorGroup().mid(),
+                             TQt::black, colorGroup().mid(),
                              KPixmapEffect::DiagonalGradient );
 
-    connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) );
+    connect( item->task(), TQ_SIGNAL( thumbnailChanged() ), TQ_SLOT( refresh() ) );
 }
 
 KasTaskPopup::~KasTaskPopup()
@@ -119,7 +119,7 @@ void KasTaskPopup::paintEvent( TQPaintEvent * )
 
     TQString text = item->task()->visibleIconicName();
 
-    p.setPen( Qt::white );
+    p.setPen( TQt::white );
     if ( fontMetrics().width( text ) > width() - 4 )
         p.drawText( 1, 1, width() - 4, TITLE_HEIGHT - 1, AlignLeft | AlignVCenter,
                      text );
@@ -133,7 +133,7 @@ void KasTaskPopup::paintEvent( TQPaintEvent * )
     //
     // Draw border
     //
-    p.setPen( Qt::black );
+    p.setPen( TQt::black );
     p.drawRect( 0, 0, width(), height() );
 }
 
diff --git a/kicker/extensions/kasbar/kastaskpopup.h b/kicker/extensions/kasbar/kastaskpopup.h
index 00b390dec..c209f8774 100644
--- a/kicker/extensions/kasbar/kastaskpopup.h
+++ b/kicker/extensions/kasbar/kastaskpopup.h
@@ -66,7 +66,7 @@ class KasTaskItem;
  */
 class KasTaskPopup : public KasPopup
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KasTaskPopup( KasTaskItem *item, const char *name=0 );
diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp
index 1a4f6924b..142b42ee3 100644
--- a/kicker/extensions/sidebar/sidebarextension.cpp
+++ b/kicker/extensions/sidebar/sidebarextension.cpp
@@ -57,15 +57,15 @@ SidebarExtension::SidebarExtension( const TQString& configFile,
 						"konq_sidebar",
                                                  m_sbWrapper,
                                                  "SideBar_View",
-                                                 TQT_TQOBJECT(this),
+                                                 this,
                                                  "Sidebar","universal");
 
     KParts::BrowserExtension *be=KParts::BrowserExtension::childObject(p);
     if (be) {
-	connect(be,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
-                        this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
-	connect(be,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
-                        this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
+	connect(be,TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
+                        this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
+	connect(be,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
+                        this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
 
     }
 
@@ -73,8 +73,8 @@ SidebarExtension::SidebarExtension( const TQString& configFile,
     m_resizeHandle->setFrameShape(TQFrame::Panel);
     m_resizeHandle->setFrameShadow(TQFrame::Raised);
     m_resizeHandle->setFixedWidth(6);
-    m_resizeHandle->setCursor(TQCursor(Qt::SizeHorCursor));
-    connect(p->widget(),TQT_SIGNAL(panelHasBeenExpanded(bool)),this,TQT_SLOT(needLayoutUpdate(bool)));
+    m_resizeHandle->setCursor(TQCursor(TQt::SizeHorCursor));
+    connect(p->widget(),TQ_SIGNAL(panelHasBeenExpanded(bool)),this,TQ_SLOT(needLayoutUpdate(bool)));
     needLayoutUpdate(false);
     m_resizeHandle->installEventFilter(this);
     m_resizeHandle->setMouseTracking(true);
diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h
index 5a117b1ee..bd8210a3c 100644
--- a/kicker/extensions/sidebar/sidebarextension.h
+++ b/kicker/extensions/sidebar/sidebarextension.h
@@ -26,7 +26,7 @@ class TQVBox;
 
 class SidebarExtension : public KPanelExtension
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SidebarExtension( const TQString& configFile,
diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp
index 4606b27fb..56f33c66d 100644
--- a/kicker/extensions/taskbar/taskbarextension.cpp
+++ b/kicker/extensions/taskbar/taskbarextension.cpp
@@ -63,17 +63,17 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type,
     positionChange(position());
     layout->addWidget(m_container);
 
-    connect(m_container, TQT_SIGNAL(containerCountChanged()),
-            TQT_SIGNAL(updateLayout()));
+    connect(m_container, TQ_SIGNAL(containerCountChanged()),
+            TQ_SIGNAL(updateLayout()));
 
     kapp->dcopClient()->setNotifications(true);
     connectDCOPSignal("kicker", "kicker", "configurationChanged()",
                       "configure()", false);
 
-    connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
-            TQT_SLOT(setBackgroundTheme()));
+    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+            TQ_SLOT(setBackgroundTheme()));
 
-    TQTimer::singleShot(0, this, TQT_SLOT(setBackgroundTheme()));
+    TQTimer::singleShot(0, this, TQ_SLOT(setBackgroundTheme()));
 }
 
 TaskBarExtension::~TaskBarExtension()
@@ -101,7 +101,7 @@ void TaskBarExtension::positionChange( Position p )
         m_container->popupDirectionChange(KPanelApplet::Right);
         break;
     case Floating:
-        if (orientation() == Qt::Horizontal)
+        if (orientation() == TQt::Horizontal)
         {
             m_container->popupDirectionChange(KPanelApplet::Down);
         }
@@ -150,8 +150,8 @@ void TaskBarExtension::setBackgroundTheme()
         {
             m_rootPixmap = new KRootPixmap(this);
             m_rootPixmap->setCustomPainting(true);
-            connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)),
-                    TQT_SLOT(updateBackground(const TQPixmap&)));
+            connect(m_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap&)),
+                    TQ_SLOT(updateBackground(const TQPixmap&)));
         }
         else
         {
@@ -185,7 +185,7 @@ void TaskBarExtension::setBackgroundTheme()
         {
             TQImage bgImage = m_bgImage;
 
-            if (orientation() == Qt::Vertical)
+            if (orientation() == TQt::Vertical)
             {
                 if (KickerSettings::rotateBackground())
                 {
diff --git a/kicker/extensions/taskbar/taskbarextension.h b/kicker/extensions/taskbar/taskbarextension.h
index 2848e80c7..f2bc3ebf0 100644
--- a/kicker/extensions/taskbar/taskbarextension.h
+++ b/kicker/extensions/taskbar/taskbarextension.h
@@ -34,7 +34,7 @@ class TaskBarContainer;
 
 class TaskBarExtension : public KPanelExtension, virtual public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 k_dcop:
diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h
index bb6d450e1..18d03214c 100644
--- a/kicker/kicker/buttons/bookmarksbutton.h
+++ b/kicker/kicker/buttons/bookmarksbutton.h
@@ -36,7 +36,7 @@ class KBookmarkOwner;
  */
 class BookmarksButton : public PanelPopupButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     BookmarksButton(TQWidget* parent);
diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp
index 71f2d0504..7ab5de6de 100644
--- a/kicker/kicker/buttons/browserbutton.cpp
+++ b/kicker/kicker/buttons/browserbutton.cpp
@@ -66,7 +66,7 @@ void BrowserButton::initialize( const TQString& icon, const TQString& path )
     setPopup(topMenu);
 
     _menuTimer = new TQTimer( this, "_menuTimer" );
-    connect( _menuTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDelayedPopup()) );
+    connect( _menuTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotDelayedPopup()) );
 
     TQToolTip::add(this, i18n("Browse: %1").arg(path));
     setTitle( path );
diff --git a/kicker/kicker/buttons/browserbutton.h b/kicker/kicker/buttons/browserbutton.h
index 507a764ed..627368472 100644
--- a/kicker/kicker/buttons/browserbutton.h
+++ b/kicker/kicker/buttons/browserbutton.h
@@ -33,7 +33,7 @@ class PanelBrowserMenu;
  */
 class BrowserButton : public PanelPopupButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     BrowserButton( const TQString& icon, const TQString& startDir, TQWidget* parent );
diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp
index fe70954f9..b548579f6 100644
--- a/kicker/kicker/buttons/desktopbutton.cpp
+++ b/kicker/kicker/buttons/desktopbutton.cpp
@@ -45,8 +45,8 @@ DesktopButton::DesktopButton( TQWidget* parent )
     setTitle(i18n("Desktop Access"));
     setIcon("desktop");
 
-    connect( this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showDesktop(bool)) );
-    connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) );
+    connect( this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showDesktop(bool)) );
+    connect( ShowDesktop::the(), TQ_SIGNAL(desktopShown(bool)), this, TQ_SLOT(toggle(bool)) );
 
     setOn( ShowDesktop::the()->desktopShowing() );
 }
diff --git a/kicker/kicker/buttons/desktopbutton.h b/kicker/kicker/buttons/desktopbutton.h
index c896bdf92..3ea98a49e 100644
--- a/kicker/kicker/buttons/desktopbutton.h
+++ b/kicker/kicker/buttons/desktopbutton.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 class DesktopButton : public PanelButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     DesktopButton( TQWidget* parent );
diff --git a/kicker/kicker/buttons/extensionbutton.h b/kicker/kicker/buttons/extensionbutton.h
index 2d2d2d1f2..3c9932655 100644
--- a/kicker/kicker/buttons/extensionbutton.h
+++ b/kicker/kicker/buttons/extensionbutton.h
@@ -31,7 +31,7 @@ class KPanelMenu;
 
 class ExtensionButton : public PanelPopupButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ExtensionButton( const TQString& desktopFile, TQWidget* parent );
diff --git a/kicker/kicker/buttons/kbutton.h b/kicker/kicker/buttons/kbutton.h
index 896bf56c2..fd34e5104 100644
--- a/kicker/kicker/buttons/kbutton.h
+++ b/kicker/kicker/buttons/kbutton.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 class KButton : public PanelPopupButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KButton( TQWidget *parent );
diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp
index ee5fa9c1f..ee3a942e5 100644
--- a/kicker/kicker/buttons/knewbutton.cpp
+++ b/kicker/kicker/buttons/knewbutton.cpp
@@ -100,7 +100,7 @@ void KNewButton::show()
      KButton::show();
 
      if (KickerSettings::firstRun()) {
-         TQTimer::singleShot(0,this,TQT_SLOT(slotExecMenu()));
+         TQTimer::singleShot(0,this,TQ_SLOT(slotExecMenu()));
          KickerSettings::setFirstRun(false);
          KickerSettings::writeConfig();
      }
@@ -112,11 +112,11 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e)
         e->type() == TQEvent::MouseButtonPress   ||
         e->type() == TQEvent::MouseButtonDblClick )
     {
-        TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
-        if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())))
+        TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
+        if (rect().contains(mapFromGlobal(me->globalPos())))
         {
             if (m_pressedDuringPopup && m_popup && m_openTimer != -1
-                    && (me->button() & Qt::LeftButton) )
+                    && (me->button() & TQt::LeftButton) )
                 return true;
         }
     }
diff --git a/kicker/kicker/buttons/knewbutton.h b/kicker/kicker/buttons/knewbutton.h
index 1bdbbafbd..d38df07c6 100644
--- a/kicker/kicker/buttons/knewbutton.h
+++ b/kicker/kicker/buttons/knewbutton.h
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 class KNewButton : public KButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KNewButton( TQWidget *parent );
diff --git a/kicker/kicker/buttons/nontdeappbutton.cpp b/kicker/kicker/buttons/nontdeappbutton.cpp
index 4f88f2d37..972944897 100644
--- a/kicker/kicker/buttons/nontdeappbutton.cpp
+++ b/kicker/kicker/buttons/nontdeappbutton.cpp
@@ -61,7 +61,7 @@ NonKDEAppButton::NonKDEAppButton(const TQString& name,
     // to the slotExec() slot
     // we do this here instead of in initialize(...) since initialize(...) may
     // get called later, e.g after reconfiguring it
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()));
 }
 
 // this constructor is used when restoring a button, usually at startup
@@ -77,7 +77,7 @@ NonKDEAppButton::NonKDEAppButton( const TDEConfigGroup& config, TQWidget* parent
                config.readBoolEntry("RunInTerminal"));
 
     // see comment on connect in above constructor
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()));
 }
 
 void NonKDEAppButton::initialize(const TQString& name,
@@ -278,8 +278,8 @@ void NonKDEAppButton::properties()
 
     // ... connect the signal it emits when it has data for us to save
     // to our updateSettings slot (see above) ...
-    connect(dlg, TQT_SIGNAL(updateSettings(PanelExeDialog*)), this,
-            TQT_SLOT(updateSettings(PanelExeDialog*)));
+    connect(dlg, TQ_SIGNAL(updateSettings(PanelExeDialog*)), this,
+            TQ_SLOT(updateSettings(PanelExeDialog*)));
 
     // ... and then show it to the user
     dlg->show();
diff --git a/kicker/kicker/buttons/nontdeappbutton.h b/kicker/kicker/buttons/nontdeappbutton.h
index 94c7cb59d..eac6ce412 100644
--- a/kicker/kicker/buttons/nontdeappbutton.h
+++ b/kicker/kicker/buttons/nontdeappbutton.h
@@ -37,8 +37,8 @@ class PanelExeDialog;
  */
 class NonKDEAppButton : public PanelButton
 {
-    // the Q_OBJECT macro provides the magic glue for signals 'n slots
-    Q_OBJECT
+    // the TQ_OBJECT macro provides the magic glue for signals 'n slots
+    TQ_OBJECT
 
 public:
     // define our two constructors, one used for creating new buttons...
diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp
index 716a750ed..9b368407e 100644
--- a/kicker/kicker/buttons/servicebutton.cpp
+++ b/kicker/kicker/buttons/servicebutton.cpp
@@ -121,7 +121,7 @@ void ServiceButton::loadServiceFromId(const TQString &id)
 void ServiceButton::initialize()
 {
     readDesktopFile();
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()));
 }
 
 void ServiceButton::readDesktopFile()
@@ -192,7 +192,7 @@ void ServiceButton::slotExec()
 {
     // this allows the button to return to a non-pressed state
     // before launching
-    TQTimer::singleShot(0, this, TQT_SLOT(performExec()));
+    TQTimer::singleShot(0, this, TQ_SLOT(performExec()));
 }
 
 void ServiceButton::performExec()
@@ -223,10 +223,10 @@ void ServiceButton::properties()
     KPropertiesDialog* dialog = new KPropertiesDialog(serviceURL, 0, 0,
                                                       false, false);
     dialog->setFileNameReadOnly(true);
-    connect(dialog, TQT_SIGNAL(saveAs(const KURL &, KURL &)),
-            this, TQT_SLOT(slotSaveAs(const KURL &, KURL &)));
-    connect(dialog, TQT_SIGNAL(propertiesClosed()),
-            this, TQT_SLOT(slotUpdate()));
+    connect(dialog, TQ_SIGNAL(saveAs(const KURL &, KURL &)),
+            this, TQ_SLOT(slotSaveAs(const KURL &, KURL &)));
+    connect(dialog, TQ_SIGNAL(propertiesClosed()),
+            this, TQ_SLOT(slotUpdate()));
     dialog->show();
 }
 
diff --git a/kicker/kicker/buttons/servicebutton.h b/kicker/kicker/buttons/servicebutton.h
index ac551adb5..a2d7939e8 100644
--- a/kicker/kicker/buttons/servicebutton.h
+++ b/kicker/kicker/buttons/servicebutton.h
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class ServiceButton : public PanelButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ServiceButton( const TQString& desktopFile, TQWidget* parent );
diff --git a/kicker/kicker/buttons/servicemenubutton.h b/kicker/kicker/buttons/servicemenubutton.h
index da512105d..bef038859 100644
--- a/kicker/kicker/buttons/servicemenubutton.h
+++ b/kicker/kicker/buttons/servicemenubutton.h
@@ -33,7 +33,7 @@ class PanelServiceMenu;
  */
 class ServiceMenuButton : public PanelPopupButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ServiceMenuButton( const TQString& relPath, TQWidget* parent );
diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp
index 13ff95323..d398b07b0 100644
--- a/kicker/kicker/buttons/urlbutton.cpp
+++ b/kicker/kicker/buttons/urlbutton.cpp
@@ -90,7 +90,7 @@ void URLButton::initialize( const TQString& _url )
     }
     fileItem = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, url );
     setIcon( fileItem->iconName() );
-    connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()) );
+    connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()) );
     setToolTip();
 
     if (url.isLocalFile())
@@ -196,6 +196,6 @@ void URLButton::properties()
 
     pDlg = new KPropertiesDialog(fileItem, 0L, 0L, false, false); // will delete itself
     pDlg->setFileNameReadOnly(true);
-    connect(pDlg, TQT_SIGNAL(applied()), TQT_SLOT(updateURL()));
+    connect(pDlg, TQ_SIGNAL(applied()), TQ_SLOT(updateURL()));
     pDlg->show();
 }
diff --git a/kicker/kicker/buttons/urlbutton.h b/kicker/kicker/buttons/urlbutton.h
index ba4a1b43d..dd55d78b4 100644
--- a/kicker/kicker/buttons/urlbutton.h
+++ b/kicker/kicker/buttons/urlbutton.h
@@ -34,7 +34,7 @@ class KPropertiesDialog;
  */
 class URLButton : public PanelButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     URLButton( const TQString& url, TQWidget* parent );
diff --git a/kicker/kicker/buttons/windowlistbutton.h b/kicker/kicker/buttons/windowlistbutton.h
index d8b57c62e..d9b67fb67 100644
--- a/kicker/kicker/buttons/windowlistbutton.h
+++ b/kicker/kicker/buttons/windowlistbutton.h
@@ -33,7 +33,7 @@ class KWindowListMenu;
  */
 class WindowListButton : public PanelPopupButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     WindowListButton( TQWidget* parent );
diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp
index 1806fedbb..c8f87b02e 100644
--- a/kicker/kicker/core/applethandle.cpp
+++ b/kicker/kicker/core/applethandle.cpp
@@ -64,8 +64,8 @@ AppletHandle::AppletHandle(AppletContainer* parent)
         m_menuButton->installEventFilter(this);
         m_layout->addWidget(m_menuButton);
 
-        connect(m_menuButton, TQT_SIGNAL(pressed()),
-                this, TQT_SLOT(menuButtonPressed()));
+        connect(m_menuButton, TQ_SIGNAL(pressed()),
+                this, TQ_SLOT(menuButtonPressed()));
         TQToolTip::add(m_menuButton, i18n("%1 menu").arg(parent->info().name()));
     }
 
@@ -89,7 +89,7 @@ int AppletHandle::widthForHeight( int /* h */ ) const
 
 void AppletHandle::setPopupDirection(KPanelApplet::Direction d)
 {
-    Qt::ArrowType a = Qt::UpArrow;
+    TQt::ArrowType a = TQt::UpArrow;
 
     if (d == m_popupDirection || !m_menuButton)
     {
@@ -102,19 +102,19 @@ void AppletHandle::setPopupDirection(KPanelApplet::Direction d)
     {
         case KPanelApplet::Up:
             m_layout->setDirection(TQBoxLayout::BottomToTop);
-            a = Qt::UpArrow;
+            a = TQt::UpArrow;
             break;
         case KPanelApplet::Down:
             m_layout->setDirection(TQBoxLayout::TopToBottom);
-            a = Qt::DownArrow;
+            a = TQt::DownArrow;
             break;
         case KPanelApplet::Left:
             m_layout->setDirection(TQBoxLayout::RightToLeft);
-            a = Qt::LeftArrow;
+            a = TQt::LeftArrow;
             break;
         case KPanelApplet::Right:
             m_layout->setDirection(TQBoxLayout::LeftToRight);
-            a = Qt::RightArrow;
+            a = TQt::RightArrow;
             break;
     }
 
@@ -151,8 +151,8 @@ void AppletHandle::setFadeOutHandle(bool fadeOut)
         if (!m_handleHoverTimer)
         {
             m_handleHoverTimer = new TQTimer(this, "m_handleHoverTimer");
-            connect(m_handleHoverTimer, TQT_SIGNAL(timeout()),
-                    this, TQT_SLOT(checkHandleHover()));
+            connect(m_handleHoverTimer, TQ_SIGNAL(timeout()),
+                    this, TQ_SLOT(checkHandleHover()));
             m_applet->installEventFilter(this);
         }
     }
@@ -200,7 +200,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
                     // a hack for applets that have out-of-process
                     // elements (e.g the systray) so that the handle
                     // doesn't flicker when moving over those elements
-                    if (TQT_TQRECT_OBJECT(w->rect()).contains(w->mapFromGlobal(TQCursor::pos())))
+                    if (w->rect().contains(w->mapFromGlobal(TQCursor::pos())))
                     {
                         nowDrawIt = true;
                     }
@@ -220,12 +220,12 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
 
         return TQWidget::eventFilter( o, e );
     }
-    else if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_dragBar))
+    else if (o == m_dragBar)
     {
         if (e->type() == TQEvent::MouseButtonPress)
         {
-            TQMouseEvent* ev = TQT_TQMOUSEEVENT(e);
-            if (ev->button() == Qt::LeftButton || ev->button() == Qt::MidButton)
+            TQMouseEvent* ev = static_cast<TQMouseEvent*>(e);
+            if (ev->button() == TQt::LeftButton || ev->button() == TQt::MidButton)
             {
                 emit moveApplet(m_applet->mapFromGlobal(ev->globalPos()));
             }
@@ -234,8 +234,8 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
 
     if (m_menuButton && e->type() == TQEvent::MouseButtonPress)
     {
-        TQMouseEvent* ev = TQT_TQMOUSEEVENT(e);
-        if (ev->button() == Qt::RightButton)
+        TQMouseEvent* ev = static_cast<TQMouseEvent*>(e);
+        if (ev->button() == TQt::RightButton)
         {
             if (!m_menuButton->isDown())
             {
@@ -312,7 +312,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const
 {
     int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
 
-    if (m_parent->orientation() == Qt::Horizontal)
+    if (m_parent->orientation() == TQt::Horizontal)
     {
         return TQSize(wh, 0);
     }
@@ -322,7 +322,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const
 
 TQSizePolicy AppletHandleDrag::sizePolicy() const
 {
-    if (m_parent->orientation() == Qt::Horizontal)
+    if (m_parent->orientation() == TQt::Horizontal)
     {
         return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
     }
@@ -360,14 +360,14 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *)
         
         TQStyle::SFlags flags = TQStyle::Style_Default;
         flags |= TQStyle::Style_Enabled;
-        if (m_parent->orientation() == Qt::Horizontal)
+        if (m_parent->orientation() == TQt::Horizontal)
         {
             flags |= TQStyle::Style_Horizontal;
         }
     
         TQRect r = rect();
     
-        style().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r,
+        style().drawPrimitive(TQStyle::PE_DockWindowHandle, &p, r,
                             colorGroup(), flags);
     }
     else
@@ -387,7 +387,7 @@ TQSize AppletHandleButton::minimumSizeHint() const
     int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
     int width = height;
 
-    if (m_parent->orientation() == Qt::Horizontal)
+    if (m_parent->orientation() == TQt::Horizontal)
     {
         return TQSize(width, height);
     }
diff --git a/kicker/kicker/core/applethandle.h b/kicker/kicker/core/applethandle.h
index 34e8e3576..578bc1dc3 100644
--- a/kicker/kicker/core/applethandle.h
+++ b/kicker/kicker/core/applethandle.h
@@ -37,7 +37,7 @@ class AppletHandleButton;
 
 class AppletHandle : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     public:
         AppletHandle(AppletContainer* parent);
@@ -87,7 +87,7 @@ class AppletHandle : public TQWidget
 
 class AppletHandleDrag : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     public:
         AppletHandleDrag(AppletHandle* parent);
@@ -109,7 +109,7 @@ class AppletHandleDrag : public TQWidget
 
 class AppletHandleButton : public SimpleArrowButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     public:
         AppletHandleButton(AppletHandle *parent);
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index d710a1ade..e53e831ba 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -79,7 +79,7 @@ AppletContainer::AppletContainer(const AppletInfo& info,
     _appletframe->setFrameStyle(TQFrame::NoFrame);
     _appletframe->installEventFilter(this);
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0);
     }
@@ -92,10 +92,10 @@ AppletContainer::AppletContainer(const AppletInfo& info,
 
     _layout->addSpacing(APPLET_MARGIN);
     _handle = new AppletHandle(this);
-    _layout->addWidget(TQT_TQWIDGET(_handle), 0);
-    connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)),
-            this, TQT_SLOT(moveApplet(const TQPoint&)));
-    connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu()));
+    _layout->addWidget(_handle, 0);
+    connect(_handle, TQ_SIGNAL(moveApplet(const TQPoint&)),
+            this, TQ_SLOT(moveApplet(const TQPoint&)));
+    connect(_handle, TQ_SIGNAL(showAppletMenu()), this, TQ_SLOT(showAppletMenu()));
 
     _layout->addWidget(_appletframe, 1);
     _layout->activate();
@@ -124,12 +124,12 @@ AppletContainer::AppletContainer(const AppletInfo& info,
 
     setImmutable(immutable);
 
-    connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout()));
-    connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(activateWindow()));
-    connect(_applet, TQT_SIGNAL(requestFocus(bool)), TQT_SLOT(focusRequested(bool)));
+    connect(_applet, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout()));
+    connect(_applet, TQ_SIGNAL(requestFocus()), TQ_SLOT(activateWindow()));
+    connect(_applet, TQ_SIGNAL(requestFocus(bool)), TQ_SLOT(focusRequested(bool)));
 
-    connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
-            this, TQT_SLOT(slotReconfigure()));
+    connect(Kicker::the(), TQ_SIGNAL(configurationChanged()),
+            this, TQ_SLOT(slotReconfigure()));
 }
 
 void AppletContainer::configure()
@@ -191,7 +191,7 @@ void AppletContainer::resetLayout()
 {
     _handle->resetLayout();
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         _layout->setDirection( TQBoxLayout::LeftToRight );
     }
@@ -225,7 +225,7 @@ void AppletContainer::showAppletMenu()
 
     Kicker::the()->setInsertionPoint(_handle->mapToGlobal(_handle->rect().center()));
 
-    switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(_handle))))
+    switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, _handle)))
     {
         case PanelAppletOpMenu::Move:
             moveApplet(_handle->mapToParent(_handle->rect().center()));
@@ -298,7 +298,7 @@ void AppletContainer::doSaveConfiguration( TDEConfigGroup& config,
                                            bool layoutOnly ) const
 {
     // immutability is checked by ContainerBase
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         config.writeEntry( "WidthForHeightHint", widthForHeight(height()) );
     }
@@ -321,8 +321,8 @@ TQPopupMenu* AppletContainer::createOpMenu()
                                                _info.name(), _info.icon(),
                                                this);
 
-    connect(opMenu, TQT_SIGNAL(escapePressed()),
-            _handle, TQT_SLOT(toggleMenuButtonOff()));
+    connect(opMenu, TQ_SIGNAL(escapePressed()),
+            _handle, TQ_SLOT(toggleMenuButtonOff()));
 
     return opMenu;
 }
@@ -471,7 +471,7 @@ void AppletContainer::setImmutable(bool immutable)
     }
     else if (!_handle->isVisibleTo(this))
     {
-        TQToolTip::add(TQT_TQWIDGET(_handle), _info.name());
+        TQToolTip::add(_handle, _info.name());
         _handle->show();
         setBackground();
     }
diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h
index 458f18fe0..d5b80930e 100644
--- a/kicker/kicker/core/container_applet.h
+++ b/kicker/kicker/core/container_applet.h
@@ -40,7 +40,7 @@ class AppletHandle;
 
 class AppletContainer : public BaseContainer
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     AppletContainer(const AppletInfo& info, TQPopupMenu* opMenu, bool isImmutable = false, TQWidget* parent = 0);
diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp
index e3131b2ed..64886f436 100644
--- a/kicker/kicker/core/container_base.cpp
+++ b/kicker/kicker/core/container_base.cpp
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const char * name )
   : TQWidget( parent, name )
   , _dir(KPanelApplet::Up)
-  , _orient(Qt::Horizontal)
+  , _orient(TQt::Horizontal)
   , _alignment(KPanelExtension::LeftTop)
   , _fspace(0)
   , _moveOffset(TQPoint(0,0))
@@ -47,7 +47,7 @@ BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const
   , _opMnu(0)
   , _appletOpMnu(appletOpMenu)
 {
-    setCursor(tqarrowCursor);
+    setCursor(TQt::arrowCursor);
 }
 
 BaseContainer::~BaseContainer()
diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h
index 88e06e715..6cf61bec6 100644
--- a/kicker/kicker/core/container_base.h
+++ b/kicker/kicker/core/container_base.h
@@ -36,7 +36,7 @@ class TQPopupMenu;
 
 class BaseContainer : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     typedef TQValueList<BaseContainer*> List;
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index 40f479308..d3a550a07 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -161,13 +161,13 @@ void ButtonContainer::embedButton(PanelButton* b)
     }
     _layout = vbox;
 
-    connect(_button, TQT_SIGNAL(requestSave()), TQT_SIGNAL(requestSave()));
-    connect(_button, TQT_SIGNAL(hideme(bool)), TQT_SLOT(hideRequested(bool)));
-    connect(_button, TQT_SIGNAL(removeme()), TQT_SLOT(removeRequested()));
-    connect(_button, TQT_SIGNAL(dragme(const TQPixmap)),
-            TQT_SLOT(dragButton(const TQPixmap)));
-    connect(_button, TQT_SIGNAL(dragme(const KURL::List, const TQPixmap)),
-            TQT_SLOT(dragButton(const KURL::List, const TQPixmap)));
+    connect(_button, TQ_SIGNAL(requestSave()), TQ_SIGNAL(requestSave()));
+    connect(_button, TQ_SIGNAL(hideme(bool)), TQ_SLOT(hideRequested(bool)));
+    connect(_button, TQ_SIGNAL(removeme()), TQ_SLOT(removeRequested()));
+    connect(_button, TQ_SIGNAL(dragme(const TQPixmap)),
+            TQ_SLOT(dragButton(const TQPixmap)));
+    connect(_button, TQ_SIGNAL(dragme(const KURL::List, const TQPixmap)),
+            TQ_SLOT(dragButton(const KURL::List, const TQPixmap)));
 }
 
 TQPopupMenu* ButtonContainer::createOpMenu()
@@ -225,7 +225,7 @@ void ButtonContainer::dragButton(const TQPixmap icon)
 
 bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
 {
-    if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_button) && e->type() == TQEvent::MouseButtonPress)
+    if (o == _button && e->type() == TQEvent::MouseButtonPress)
     {
         static bool sentinal = false;
 
@@ -235,10 +235,10 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
         }
 
         sentinal = true;
-        TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
+        TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
         switch (me->button())
         {
-        case Qt::MidButton:
+        case TQt::MidButton:
         {
             if (isImmutable())
             {
@@ -252,7 +252,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
             return true;
         }
 
-        case Qt::RightButton:
+        case TQt::RightButton:
         {
             if (!kapp->authorizeTDEAction("kicker_rmb") ||
                 isImmutable())
@@ -261,9 +261,9 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
             }
 
             TQPopupMenu* menu = opMenu();
-            connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) );
-            TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(this),
-                                                  (orientation() == Qt::Horizontal) ?
+            connect( menu, TQ_SIGNAL( aboutToHide() ), this, TQ_SLOT( slotMenuClosed() ) );
+            TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this,
+                                                  (orientation() == TQt::Horizontal) ?
                                                    TQPoint(0, 0) : me->pos());
 
             Kicker::the()->setInsertionPoint(me->globalPos());
diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h
index 1e48989c1..d564354b0 100644
--- a/kicker/kicker/core/container_button.h
+++ b/kicker/kicker/core/container_button.h
@@ -36,7 +36,7 @@ class TDEConfigGroup;
 
 class ButtonContainer : public BaseContainer
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0);
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 721df418e..afb786f7f 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -137,20 +137,20 @@ void ExtensionContainer::init()
     KWin::setState(winId(), NET::Sticky);
     KWin::setOnAllDesktops(winId(), true);
 
-    connect(Kicker::the()->twinModule(), TQT_SIGNAL(strutChanged()), this, TQT_SLOT(strutChanged()));
-    connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
-            this, TQT_SLOT( currentDesktopChanged(int)));
+    connect(Kicker::the()->twinModule(), TQ_SIGNAL(strutChanged()), this, TQ_SLOT(strutChanged()));
+    connect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)),
+            this, TQ_SLOT( currentDesktopChanged(int)));
 
     setBackgroundOrigin(AncestorOrigin);
     setFrameStyle(NoFrame);
     setLineWidth(0);
     setMargin(0);
 
-    connect(UnhideTrigger::the(), TQT_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)),
-            this, TQT_SLOT(unhideTriggered(UnhideTrigger::Trigger,int)));
+    connect(UnhideTrigger::the(), TQ_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)),
+            this, TQ_SLOT(unhideTriggered(UnhideTrigger::Trigger,int)));
 
-    _popupWidgetFilter = new PopupWidgetFilter( TQT_TQOBJECT(this) );
-    connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer()));
+    _popupWidgetFilter = new PopupWidgetFilter( this );
+    connect(_popupWidgetFilter, TQ_SIGNAL(popupWidgetHiding()), TQ_SLOT(maybeStartAutoHideTimer()));
 
     // layout
     _layout = new TQGridLayout(this, 3, 3, 0, 0);
@@ -160,15 +160,15 @@ void ExtensionContainer::init()
 
     // instantiate the autohide timer
     _autohideTimer = new TQTimer(this, "_autohideTimer");
-    connect(_autohideTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoHideTimeout()));
+    connect(_autohideTimer, TQ_SIGNAL(timeout()), TQ_SLOT(autoHideTimeout()));
 
     // instantiate the updateLayout event compressor timer
     _updateLayoutTimer = new TQTimer(this, "_updateLayoutTimer");
-    connect(_updateLayoutTimer, TQT_SIGNAL(timeout()), TQT_SLOT(actuallyUpdateLayout()));
+    connect(_updateLayoutTimer, TQ_SIGNAL(timeout()), TQ_SLOT(actuallyUpdateLayout()));
 
     installEventFilter(this); // for mouse event handling
 
-    connect(Kicker::the(), TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(updateHighlightColor()));
+    connect(Kicker::the(), TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(updateHighlightColor()));
     updateHighlightColor();
 
     // if we were hidden when kicker quit, let's start out hidden as well!
@@ -207,9 +207,9 @@ void ExtensionContainer::init()
             item->setDefaultValue(m_extension->customSize());
         }
 
-        connect(m_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(updateLayout()));
-        connect(m_extension, TQT_SIGNAL(maintainFocus(bool)),
-                TQT_SLOT(maintainFocus(bool)));
+        connect(m_extension, TQ_SIGNAL(updateLayout()), TQ_SLOT(updateLayout()));
+        connect(m_extension, TQ_SIGNAL(maintainFocus(bool)),
+                TQ_SLOT(maintainFocus(bool)));
 
         _layout->addWidget(m_extension, 1, 1);
     }
@@ -733,7 +733,7 @@ void ExtensionContainer::autoHideTimeout()
 {
 //    kdDebug(1210) << "PanelContainer::autoHideTimeout() " << name() << endl;
     // Hack: If there is a popup open, don't autohide until it closes.
-    TQWidget* popup = TQT_TQWIDGET(TQApplication::activePopupWidget());
+    TQWidget* popup = TQApplication::activePopupWidget();
     if (popup)
     {
 
@@ -885,7 +885,7 @@ void ExtensionContainer::autoHide(bool hide)
 
     _in_autohide = false;
 
-    TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects()));
+    TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects()));
 }
 
 void ExtensionContainer::animatedHide(bool left)
@@ -925,7 +925,7 @@ void ExtensionContainer::animatedHide(bool left)
                 !TQApplication::desktop()->screenGeometry(s).intersects(geometry()))
             {
                 blockUserInput(false);
-                TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects()));
+                TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects()));
                 return;
             }
         }
@@ -988,7 +988,7 @@ void ExtensionContainer::animatedHide(bool left)
     config->setGroup(extensionId());
     config->writeEntry("UserHidden", userHidden());
 
-    TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects()));
+    TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects()));
 }
 
 bool ExtensionContainer::reserveStrut() const
@@ -1208,7 +1208,7 @@ int ExtensionContainer::arrangeHideButtons()
         _layout->setEnabled(false);
     }
 
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         int maxWidth = width();
 
@@ -1227,7 +1227,7 @@ int ExtensionContainer::arrangeHideButtons()
             _ltHB->setMaximumWidth(maxWidth);
             _ltHB->setMaximumHeight(14);
             _layout->remove(_ltHB);
-            _layout->addWidget(_ltHB, 0, 1, Qt::AlignBottom | Qt::AlignLeft);
+            _layout->addWidget(_ltHB, 0, 1, TQt::AlignBottom | TQt::AlignLeft);
         }
 
         if (_rbHB)
@@ -1252,8 +1252,8 @@ int ExtensionContainer::arrangeHideButtons()
             maxHeight = maxHeight - (PANEL_RESIZE_HANDLE_WIDTH + PANEL_BOTTOM_SPACING_W_RESIZE_HANDLE);
         }
 
-        int vertAlignment = (position() == KPanelExtension::Top) ? Qt::AlignTop : 0;
-        int leftAlignment = Qt::AlignRight;
+        int vertAlignment = (position() == KPanelExtension::Top) ? TQt::AlignTop : 0;
+        int leftAlignment = TQt::AlignRight;
 
         if (_ltHB)
         {
@@ -1262,11 +1262,11 @@ int ExtensionContainer::arrangeHideButtons()
             _layout->remove(_ltHB);
             if (kapp->reverseLayout())
             {
-                _layout->addWidget(_ltHB, 1, 2, (TQ_Alignment)vertAlignment);
+                _layout->addWidget(_ltHB, 1, 2, (TQt::AlignmentFlags)vertAlignment);
             }
             else
             {
-                _layout->addWidget(_ltHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment));
+                _layout->addWidget(_ltHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment));
             }
         }
 
@@ -1277,11 +1277,11 @@ int ExtensionContainer::arrangeHideButtons()
             _layout->remove(_rbHB);
             if (kapp->reverseLayout())
             {
-                _layout->addWidget(_rbHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment));
+                _layout->addWidget(_rbHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment));
             }
             else
             {
-                _layout->addWidget(_rbHB, 1, 2, (TQ_Alignment)vertAlignment);
+                _layout->addWidget(_rbHB, 1, 2, (TQt::AlignmentFlags)vertAlignment);
             }
         }
     }
@@ -1315,7 +1315,7 @@ int ExtensionContainer::setupBorderSpace()
     TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen());
     TQRect h = geometry();
 
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         if (h.top() > 0)
         {
@@ -1417,26 +1417,26 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e)
         // KPanelExtension::Left/Right don't seem to draw the separators at all!
         if (position() == KPanelExtension::Left) {
             rect = TQRect(width()-2,0,PANEL_RESIZE_HANDLE_WIDTH,height());
-            style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal );
+            style().drawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal );
         }
         else if (position() == KPanelExtension::Right) {
             rect = TQRect(0,0,PANEL_RESIZE_HANDLE_WIDTH,height());
-            style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal );
+            style().drawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal );
         }
         else if (position() == KPanelExtension::Top) {
             // Nastiness to both vertically flip the PE_Separator
             // and make sure it pops out of, not sinks into, the screen
             TQPixmap inv_pm(width(),PANEL_RESIZE_HANDLE_WIDTH);
-            TQPainter myp(TQT_TQPAINTDEVICE(&inv_pm));
+            TQPainter myp(&inv_pm);
             rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH);
             TQColorGroup darkcg = colorGroup();
             darkcg.setColor(TQColorGroup::Light, colorGroup().dark());
-            style().tqdrawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default );
+            style().drawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default );
             p.drawPixmap(0,height()-2,inv_pm);
         }
         else {
             rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH);
-            style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default );
+            style().drawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default );
         }
     }
 }
@@ -1486,7 +1486,7 @@ void ExtensionContainer::unhideIfHidden(int showForAtLeastHowManyMS)
     {
         autoHide(false);
         TQTimer::singleShot(showForAtLeastHowManyMS,
-                           this, TQT_SLOT(maybeStartAutoHideTimer()));
+                           this, TQ_SLOT(maybeStartAutoHideTimer()));
         return;
     }
 
@@ -1582,11 +1582,11 @@ KPanelExtension::Orientation ExtensionContainer::orientation() const
 {
     if (position() == KPanelExtension::Top || position() == KPanelExtension::Bottom)
     {
-        return Qt::Horizontal;
+        return TQt::Horizontal;
     }
     else
     {
-        return Qt::Vertical;
+        return TQt::Vertical;
     }
 }
 
@@ -1627,18 +1627,18 @@ void ExtensionContainer::resetLayout()
             _ltHB = new HideButton(this);
             _ltHB->installEventFilter(this);
             _ltHB->setEnabled(true);
-            connect(_ltHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideLeft()));
+            connect(_ltHB, TQ_SIGNAL(clicked()), this, TQ_SLOT(hideLeft()));
             haveToArrangeButtons = true;
         }
 
-        if (orientation() == Qt::Horizontal)
+        if (orientation() == TQt::Horizontal)
         {
-            _ltHB->setArrowType(Qt::LeftArrow);
+            _ltHB->setArrowType(TQt::LeftArrow);
             _ltHB->setFixedSize(m_settings.hideButtonSize(), height());
         }
         else
         {
-            _ltHB->setArrowType(Qt::UpArrow);
+            _ltHB->setArrowType(TQt::UpArrow);
             _ltHB->setFixedSize(width(), m_settings.hideButtonSize());
         }
 
@@ -1658,18 +1658,18 @@ void ExtensionContainer::resetLayout()
             _rbHB = new HideButton(this);
             _rbHB->installEventFilter(this);
             _rbHB->setEnabled(true);
-            connect(_rbHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideRight()));
+            connect(_rbHB, TQ_SIGNAL(clicked()), this, TQ_SLOT(hideRight()));
             haveToArrangeButtons = true;
         }
 
-        if ( orientation() == Qt::Horizontal)
+        if ( orientation() == TQt::Horizontal)
         {
-            _rbHB->setArrowType(Qt::RightArrow);
+            _rbHB->setArrowType(TQt::RightArrow);
             _rbHB->setFixedSize(m_settings.hideButtonSize(), height());
         }
         else
         {
-            _rbHB->setArrowType(Qt::DownArrow);
+            _rbHB->setArrowType(TQt::DownArrow);
             _rbHB->setFixedSize(width(), m_settings.hideButtonSize());
         }
 
@@ -1709,7 +1709,7 @@ void ExtensionContainer::resetLayout()
     updateGeometry();
     int endBorderWidth = haveToArrangeButtons ? arrangeHideButtons() : setupBorderSpace();
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         if (m_extension)
         {
@@ -2145,8 +2145,8 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
     {
         case TQEvent::MouseButtonPress:
         {
-            TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
-            if ( me->button() == Qt::LeftButton )
+            TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
+            if ( me->button() == TQt::LeftButton )
             {
                 if (inResizeArea(me->pos()))
                 {
@@ -2170,7 +2170,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
                     _is_lmb_down = true;
                 }
             }
-            else if (me->button() == Qt::RightButton)
+            else if (me->button() == TQt::RightButton)
             {
                 showPanelMenu(me->globalPos());
                 return true; // don't crash!
@@ -2180,8 +2180,8 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
 
         case TQEvent::MouseButtonRelease:
         {
-            TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
-            if ( me->button() == Qt::LeftButton )
+            TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
+            if ( me->button() == TQt::LeftButton )
             {
                 _is_lmb_down = false;
             }
@@ -2190,7 +2190,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
 
         case TQEvent::MouseMove:
         {
-            TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
+            TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
             if (KickerSettings::useResizeHandle())
             {
                 KPanelExtension::Position pos = position();
@@ -2202,7 +2202,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
                     }
                     else
                     {
-                        setCursor(tqarrowCursor);
+                        setCursor(TQt::arrowCursor);
                     }
                 }
                 else if (pos == KPanelExtension::Right)
@@ -2213,35 +2213,35 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
                     }
                     else
                     {
-                        setCursor(tqarrowCursor);
+                        setCursor(TQt::arrowCursor);
                     }
                 }
                 else if (pos == KPanelExtension::Top)
                 {
                     if (inResizeArea(me->pos()))
                     {
-                        setCursor(tqsizeVerCursor);
+                        setCursor(TQt::sizeVerCursor);
                     }
                     else
                     {
-                        setCursor(tqarrowCursor);
+                        setCursor(TQt::arrowCursor);
                     }
                 }
                 else
                 {
                     if (inResizeArea(me->pos()))
                     {
-                        setCursor(tqsizeVerCursor);
+                        setCursor(TQt::sizeVerCursor);
                     }
                     else
                     {
-                        setCursor(tqarrowCursor);
+                        setCursor(TQt::arrowCursor);
                     }
                 }
             }
 
             if (_is_lmb_down &&
-                ((me->state() & Qt::LeftButton) == Qt::LeftButton) &&
+                ((me->state() & TQt::LeftButton) == TQt::LeftButton) &&
                 !Kicker::the()->isImmutable() &&
                 !m_settings.config()->isImmutable() &&
                 !ExtensionManager::the()->isMenuBar(this))
diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h
index 8948341d1..b1db1efeb 100644
--- a/kicker/kicker/core/container_extension.h
+++ b/kicker/kicker/core/container_extension.h
@@ -51,7 +51,7 @@ class TQColor;
 
 class ExtensionContainer : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum UserHidden { Unhidden, LeftTop, RightBottom };
@@ -203,7 +203,7 @@ private:
 
 class PopupWidgetFilter : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     PopupWidgetFilter( TQObject *parent );
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 5b1eb5c8c..234aba375 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -103,11 +103,11 @@ ContainerArea::ContainerArea(TDEConfig* _c,
 
     setBackground();
 
-    connect(&_autoScrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoScroll()));
-    connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(setBackground()));
-    connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)),
-            TQT_SLOT(immutabilityChanged(bool)));
-    connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground()));
+    connect(&_autoScrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(autoScroll()));
+    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(setBackground()));
+    connect(Kicker::the(), TQ_SIGNAL(immutabilityChanged(bool)),
+            TQ_SLOT(immutabilityChanged(bool)));
+    connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground()));
 }
 
 ContainerArea::~ContainerArea()
@@ -142,7 +142,7 @@ void ContainerArea::initialize(bool useDefaultConfig)
     }
 
     setAcceptDrops(!isImmutable());
-    TQTimer::singleShot(0, this, TQT_SLOT(resizeContents()));
+    TQTimer::singleShot(0, this, TQ_SLOT(resizeContents()));
 }
 
 void ContainerArea::defaultContainerConfig()
@@ -153,7 +153,7 @@ void ContainerArea::defaultContainerConfig()
     containers.append(new KMenuButtonContainer(m_opMenu, m_contents));
 
     int dsize;
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         dsize = width();
     }
@@ -377,7 +377,7 @@ void ContainerArea::loadContainers(const TQStringList& containers)
     // it gets executed too soon. we need to wait until the containers are
     // actually resized, but we enter the event loop prior to that happening
     // above.
-    TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground()));
+    TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground()));
 }
 
 void ContainerArea::saveContainerConfig(bool layoutOnly)
@@ -728,20 +728,20 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index)
         m_layout->add(a);
     }
 
-    connect(a, TQT_SIGNAL(moveme(BaseContainer*)),
-            TQT_SLOT(startContainerMove(BaseContainer*)));
-    connect(a, TQT_SIGNAL(removeme(BaseContainer*)),
-            TQT_SLOT(removeContainer(BaseContainer*)));
-    connect(a, TQT_SIGNAL(takeme(BaseContainer*)),
-            TQT_SLOT(takeContainer(BaseContainer*)));
-    connect(a, TQT_SIGNAL(requestSave()),
-            TQT_SLOT(slotSaveContainerConfig()));
-    connect(a, TQT_SIGNAL(maintainFocus(bool)),
-            this, TQT_SIGNAL(maintainFocus(bool)));
+    connect(a, TQ_SIGNAL(moveme(BaseContainer*)),
+            TQ_SLOT(startContainerMove(BaseContainer*)));
+    connect(a, TQ_SIGNAL(removeme(BaseContainer*)),
+            TQ_SLOT(removeContainer(BaseContainer*)));
+    connect(a, TQ_SIGNAL(takeme(BaseContainer*)),
+            TQ_SLOT(takeContainer(BaseContainer*)));
+    connect(a, TQ_SIGNAL(requestSave()),
+            TQ_SLOT(slotSaveContainerConfig()));
+    connect(a, TQ_SIGNAL(maintainFocus(bool)),
+            this, TQ_SIGNAL(maintainFocus(bool)));
 
     if (dynamic_cast<AppletContainer*>(a))
     {
-        connect(a, TQT_SIGNAL(updateLayout()), TQT_SLOT(resizeContents()));
+        connect(a, TQ_SIGNAL(updateLayout()), TQ_SLOT(resizeContents()));
     }
 
     a->configure(orientation(), popupDirection());
@@ -824,16 +824,16 @@ void ContainerArea::takeContainer(BaseContainer* a)
         return;
     }
 
-    disconnect(a, TQT_SIGNAL(moveme(BaseContainer*)),
-               this, TQT_SLOT(startContainerMove(BaseContainer*)));
-    disconnect(a, TQT_SIGNAL(removeme(BaseContainer*)),
-               this, TQT_SLOT(removeContainer(BaseContainer*)));
-    disconnect(a, TQT_SIGNAL(takeme(BaseContainer*)),
-               this, TQT_SLOT(takeContainer(BaseContainer*)));
-    disconnect(a, TQT_SIGNAL(requestSave()),
-               this, TQT_SLOT(slotSaveContainerConfig()));
-    disconnect(a, TQT_SIGNAL(maintainFocus(bool)),
-               this, TQT_SIGNAL(maintainFocus(bool)));
+    disconnect(a, TQ_SIGNAL(moveme(BaseContainer*)),
+               this, TQ_SLOT(startContainerMove(BaseContainer*)));
+    disconnect(a, TQ_SIGNAL(removeme(BaseContainer*)),
+               this, TQ_SLOT(removeContainer(BaseContainer*)));
+    disconnect(a, TQ_SIGNAL(takeme(BaseContainer*)),
+               this, TQ_SLOT(takeContainer(BaseContainer*)));
+    disconnect(a, TQ_SIGNAL(requestSave()),
+               this, TQ_SLOT(slotSaveContainerConfig()));
+    disconnect(a, TQ_SIGNAL(maintainFocus(bool)),
+               this, TQ_SIGNAL(maintainFocus(bool)));
 
     // Just remove the group from our own config file. Leave separate config
     // files untouched.
@@ -850,7 +850,7 @@ void ContainerArea::resizeContents()
     int w = width();
     int h = height();
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         int newWidth = m_layout->widthForHeight(h);
         if (newWidth > w)
@@ -923,7 +923,7 @@ void ContainerArea::startContainerMove(BaseContainer *a)
     KickerTip::enableTipping(false);
     emit maintainFocus(true);
     setMouseTracking(true);
-    grabMouse(tqsizeAllCursor);
+    grabMouse(TQt::sizeAllCursor);
 
     m_layout->setStretchEnabled(false);
     a->raise();
@@ -940,7 +940,7 @@ void ContainerArea::mouseReleaseEvent(TQMouseEvent *)
     // so we need to complete the move here
     _autoScrollTimer.stop();
     releaseMouse();
-    setCursor(tqarrowCursor);
+    setCursor(TQt::arrowCursor);
     setMouseTracking(false);
 
     _moveAC->completeMoveOperation();
@@ -962,12 +962,12 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
         return;
     }
 
-    if (ev->state() == Qt::LeftButton && !TQT_TQRECT_OBJECT(rect()).contains(ev->pos()))
+    if (ev->state() == TQt::LeftButton && !rect().contains(ev->pos()))
     {
         // leaveEvent() doesn't work, while grabbing the mouse
         _autoScrollTimer.stop();
         releaseMouse();
-        setCursor(tqarrowCursor);
+        setCursor(TQt::arrowCursor);
         setMouseTracking(false);
 
         _moveAC->completeMoveOperation();
@@ -986,7 +986,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
         return;
     }
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         int oldX = _moveAC->x() + _moveAC->moveOffset().x();
         int x = ev->pos().x() + contentsX();
@@ -1082,7 +1082,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev)
         preferedHeight = draggedContainer->heightForWidth(width());
     }
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         _dragIndicator->setPreferredSize(TQSize(preferedWidth, height()));
     }
@@ -1103,9 +1103,9 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev)
             --it;
             BaseContainer* a = *it;
 
-            if ((orientation() == Qt::Horizontal &&
+            if ((orientation() == TQt::Horizontal &&
                  a->x() < (ev->pos().x() + contentsX()) - _dragMoveOffset.x()) ||
-                (orientation() == Qt::Vertical &&
+                (orientation() == TQt::Vertical &&
                  a->y() < (ev->pos().y() + contentsY()) - _dragMoveOffset.y()))
             {
                 _dragMoveAC = a;
@@ -1114,7 +1114,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev)
         } while (it != m_containers.begin());
     }
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x());
     }
@@ -1143,7 +1143,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev)
         startContainerMove(_moveAC);
 
         // Align the container to the mouse position.
-        if (orientation() == Qt::Horizontal)
+        if (orientation() == TQt::Horizontal)
         {
             m_layout->moveContainerSwitch(_moveAC, ev->pos().x() + contentsX() - _moveAC->x());
         }
@@ -1159,7 +1159,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev)
         return;
     }
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x());
     }
@@ -1201,7 +1201,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
         }
 
         TQObject *parent = ev->source() ? ev->source()->parent() : 0;
-        while (parent && (TQT_BASE_OBJECT(parent) != TQT_BASE_OBJECT(this)))
+        while (parent && (parent != this))
         {
             parent = parent->parent();
         }
@@ -1209,13 +1209,13 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
         if (parent)
         {
             // Move container a
-            if (orientation() == Qt::Horizontal)
+            if (orientation() == TQt::Horizontal)
             {
                 int oldX = a->x();
                 int x = _dragIndicator->x();
                 m_layout->moveContainerSwitch(a, x - oldX);
             }
-            else if (orientation() == Qt::Vertical)
+            else if (orientation() == TQt::Vertical)
             {
                 int oldY = a->y();
                 int y = _dragIndicator->y();
@@ -1387,7 +1387,7 @@ bool ContainerArea::eventFilter(TQObject* o, TQEvent* e)
     // which contain a ContainerArea can react to layout changes of its
     // contents. For example: If an applets grows, the top level widget may
     // want to grow as well.
-    if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_contents))
+    if (o == m_contents)
     {
         if (e->type() == TQEvent::LayoutHint)
         {
@@ -1408,7 +1408,7 @@ void ContainerArea::resizeEvent(TQResizeEvent *ev)
 void ContainerArea::viewportResizeEvent(TQResizeEvent* ev)
 {
     Panner::viewportResizeEvent(ev);
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         m_contents->resize(kMax(widthForHeight(ev->size().height()),
                                 ev->size().width()),
@@ -1436,8 +1436,8 @@ void ContainerArea::setBackground()
         {
             _rootPixmap = new KRootPixmap(this);
             _rootPixmap->setCustomPainting(true);
-            connect(_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)),
-                    TQT_SLOT(updateBackground(const TQPixmap&)));
+            connect(_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap&)),
+                    TQ_SLOT(updateBackground(const TQPixmap&)));
         }
         else
         {
@@ -1487,7 +1487,7 @@ void ContainerArea::setBackground()
         {
             TQImage bgImage = srcImage;
 
-            if (orientation() == Qt::Vertical)
+            if (orientation() == TQt::Vertical)
             {
                 if (KickerSettings::rotateBackground())
                 {
@@ -1516,7 +1516,7 @@ void ContainerArea::setBackground()
                 KickerLib::colorize(bgImage);
             }
             setPaletteBackgroundPixmap(TQPixmap(bgImage));
-            TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground()));
+            TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground()));
         }
     }
 
@@ -1538,7 +1538,7 @@ void ContainerArea::immutabilityChanged(bool immutable)
     }
 
     setAcceptDrops(!isImmutable());
-    TQTimer::singleShot(0, this, TQT_SLOT(setBackground()));
+    TQTimer::singleShot(0, this, TQ_SLOT(setBackground()));
 }
 
 TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a)
@@ -1565,7 +1565,7 @@ TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a)
         }
     }
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         if (a)
         {
@@ -1599,7 +1599,7 @@ void ContainerArea::moveDragIndicator(int pos)
 
     // Move _dragIndicator to position pos, restricted by availableSpace.
     // Resize _dragIndicator if necessary.
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         if (availableSpace.size().width() <
             _dragIndicator->preferredSize().width())
@@ -1663,7 +1663,7 @@ void ContainerArea::resizeContents(int w, int h)
     if (!m_updateBackgroundsCalled)
     {
         m_updateBackgroundsCalled = true;
-        TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground()));
+        TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground()));
     }
 }
 
@@ -1680,9 +1680,9 @@ void ContainerArea::setPosition(KPanelExtension::Position p)
     }
 
     _pos = p;
-    Qt::Orientation o = (p == KPanelExtension::Top ||
+    TQt::Orientation o = (p == KPanelExtension::Top ||
                          p == KPanelExtension::Bottom) ?
-                        Qt::Horizontal : Qt::Vertical;
+                        TQt::Horizontal : TQt::Vertical;
     bool orientationChanged = (orientation() != o);
     m_layout->setEnabled(false);
 
@@ -1696,7 +1696,7 @@ void ContainerArea::setPosition(KPanelExtension::Position p)
         // when that gets called AFTER we've been moved
         // it's not always safe to do the resize here, as scroll buttons
         // from the panner may get in our way. =/
-        if (o == Qt::Horizontal)
+        if (o == TQt::Horizontal)
         {
             resizeContents(0, height());
         }
@@ -1742,7 +1742,7 @@ void ContainerArea::autoScroll()
 {
     if(!_moveAC) return;
 
-    if(orientation() == Qt::Horizontal) {
+    if(orientation() == TQt::Horizontal) {
         if(_moveAC->pos().x() <= 80)
             scrollBy(-10, 0);
         else if(_moveAC->pos().x() >= width() - _moveAC->width() - 80)
@@ -1793,7 +1793,7 @@ void ContainerArea::updateContainersBackground()
         if( !m_cachedGeometry.contains( *it ))
         {
             m_cachedGeometry[ *it ] = TQRect();
-            connect( *it, TQT_SIGNAL( destroyed()), TQT_SLOT( destroyCachedGeometry()));
+            connect( *it, TQ_SIGNAL( destroyed()), TQ_SLOT( destroyCachedGeometry()));
         }
         if( m_cachedGeometry[ *it ] != (*it)->geometry())
         {
@@ -1910,7 +1910,7 @@ void ContainerArea::showAddAppletDialog()
     if (!m_addAppletDialog)
     {
         m_addAppletDialog = new AddAppletDialog(this, this, 0);
-        connect(m_addAppletDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(addAppletDialogDone()));
+        connect(m_addAppletDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(addAppletDialogDone()));
     }
     else
     {
@@ -1958,7 +1958,7 @@ void DragIndicator::paintEvent(TQPaintEvent*)
 {
     TQPainter painter(this);
     TQRect rect(0, 0, width(), height());
-    style().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(),
+    style().drawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(),
                            TQStyle::Style_Default, colorGroup().base() );
 }
 
diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h
index f52003982..2b543e6ac 100644
--- a/kicker/kicker/core/containerarea.h
+++ b/kicker/kicker/core/containerarea.h
@@ -45,7 +45,7 @@ class AddAppletDialog;
 
 class ContainerArea : public Panner
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ContainerArea( TDEConfig* config, TQWidget* parent, TQPopupMenu* opMenu, const char* name = 0 );
@@ -174,7 +174,7 @@ private:
 
 class DragIndicator : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     DragIndicator(TQWidget* parent = 0, const char* name = 0);
diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp
index c12778fbb..81080fe82 100644
--- a/kicker/kicker/core/containerarealayout.cpp
+++ b/kicker/kicker/core/containerarealayout.cpp
@@ -122,7 +122,7 @@ void ContainerAreaLayoutItem::setFreeSpaceRatio(double ratio)
         m_freeSpaceRatio = ratio;
 }
 
-Qt::Orientation ContainerAreaLayoutItem::orientation() const
+TQt::Orientation ContainerAreaLayoutItem::orientation() const
 {
     return m_layout->orientation();
 }
@@ -139,7 +139,7 @@ void ContainerAreaLayoutItem::setGeometryR(const TQRect& r)
 
 int ContainerAreaLayoutItem::widthForHeightR(int h) const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return widthForHeight(h);
     }
@@ -151,7 +151,7 @@ int ContainerAreaLayoutItem::widthForHeightR(int h) const
 
 int ContainerAreaLayoutItem::widthR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return geometry().width();
     }
@@ -163,7 +163,7 @@ int ContainerAreaLayoutItem::widthR() const
 
 int ContainerAreaLayoutItem::heightR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return geometry().height();
     }
@@ -175,7 +175,7 @@ int ContainerAreaLayoutItem::heightR() const
 
 int ContainerAreaLayoutItem::leftR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         if (TQApplication::reverseLayout())
             return m_layout->geometry().right() - geometry().right();
@@ -190,7 +190,7 @@ int ContainerAreaLayoutItem::leftR() const
 
 int ContainerAreaLayoutItem::rightR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         if (TQApplication::reverseLayout())
             return m_layout->geometry().right() - geometry().left();
@@ -206,46 +206,14 @@ int ContainerAreaLayoutItem::rightR() const
 
 ContainerAreaLayout::ContainerAreaLayout(TQWidget* parent)
     : TQLayout(parent),
-      m_orientation(Qt::Horizontal),
+      m_orientation(TQt::Horizontal),
       m_stretchEnabled(true)
 {
 }
 
-#ifdef USE_QT4
-/*!
-    \reimp
-*/
-int ContainerAreaLayout::count() const {
-	return m_items.count();
-}
-
-/*!
-    \reimp
-*/
-TQLayoutItem* ContainerAreaLayout::itemAt(int index) const {
-	return index >= 0 && index < m_items.count() ? (*m_items.at(index))->item : 0;
-}
-
-/*!
-    \reimp
-*/
-TQLayoutItem* ContainerAreaLayout::takeAt(int index) {
-	if (index < 0 || index >= m_items.count())
-		return 0;
-	ContainerAreaLayoutItem *b = *m_items.at(index);
-	m_items.remove(m_items.at(index));
-	TQLayoutItem *item = b->item;
-	b->item = 0;
-	delete b;
-
-	invalidate();
-	return item;
-}
-#endif // USE_QT4
-
 void ContainerAreaLayout::addItem(TQLayoutItem* item)
 {
-    m_items.append(new ContainerAreaLayoutItem(static_cast<TQLayoutItem*>(item), this));
+    m_items.append(new ContainerAreaLayoutItem(item, this));
 }
 
 void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertionPoint)
@@ -283,7 +251,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertio
         return;
     }
 
-    int insPos = (orientation() == Qt::Horizontal) ? insertionPoint.x(): insertionPoint.y();
+    int insPos = (orientation() == TQt::Horizontal) ? insertionPoint.x(): insertionPoint.y();
     Item* current = *currentIt;
     Item* next = *nextIt;
 
@@ -419,7 +387,7 @@ TQSize ContainerAreaLayout::sizeHint() const
 {
     const int size = KickerLib::sizeValue(KPanelExtension::SizeSmall);
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return TQSize(widthForHeight(size), size);
     }
@@ -433,7 +401,7 @@ TQSize ContainerAreaLayout::minimumSize() const
 {
     const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny);
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return TQSize(widthForHeight(size), size);
     }
@@ -445,13 +413,7 @@ TQSize ContainerAreaLayout::minimumSize() const
 
 TQLayoutIterator ContainerAreaLayout::iterator()
 {
-    // [FIXME]
-#ifdef USE_QT4
-    #warning [FIXME] ContainerAreaLayout iterators may not function correctly under Qt4
-    return TQLayoutIterator(this);	    	// [FIXME]
-#else // USE_QT4
     return TQLayoutIterator(new ContainerAreaLayoutIterator(&m_items));
-#endif // USE_QT4
 }
 
 void ContainerAreaLayout::setGeometry(const TQRect& rect)
@@ -559,7 +521,7 @@ int ContainerAreaLayout::distanceToPreviousItem(ItemList::const_iterator it) con
 
 void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance)
 {
-    const bool horizontal    = orientation() == Qt::Horizontal;
+    const bool horizontal    = orientation() == TQt::Horizontal;
     const bool reverseLayout = TQApplication::reverseLayout();
 
     if (horizontal && reverseLayout)
@@ -696,7 +658,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance)
 
 int ContainerAreaLayout::moveContainerPush(TQWidget* a, int distance)
 {
-    const bool horizontal    = orientation() == Qt::Horizontal;
+    const bool horizontal    = orientation() == TQt::Horizontal;
     const bool reverseLayout = TQApplication::reverseLayout();
 
     // Get the iterator 'it' pointing to the layoutitem representing 'a'.
@@ -767,7 +729,7 @@ int ContainerAreaLayout::moveContainerPushRecursive(ItemList::const_iterator it,
 
 TQRect ContainerAreaLayout::transform(const TQRect& r) const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         if (TQApplication::reverseLayout())
         {
@@ -788,7 +750,7 @@ TQRect ContainerAreaLayout::transform(const TQRect& r) const
 
 int ContainerAreaLayout::widthForHeightR(int h) const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return widthForHeight(h);
     }
@@ -800,7 +762,7 @@ int ContainerAreaLayout::widthForHeightR(int h) const
 
 int ContainerAreaLayout::widthR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return geometry().width();
     }
@@ -812,7 +774,7 @@ int ContainerAreaLayout::widthR() const
 
 int ContainerAreaLayout::heightR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return geometry().height();
     }
@@ -824,7 +786,7 @@ int ContainerAreaLayout::heightR() const
 
 int ContainerAreaLayout::leftR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
         return geometry().left();
     else
         return geometry().top();
@@ -832,7 +794,7 @@ int ContainerAreaLayout::leftR() const
 
 int ContainerAreaLayout::rightR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
         return geometry().right();
     else
         return geometry().bottom();
diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h
index 4edeb8be2..abb28c6f0 100644
--- a/kicker/kicker/core/containerarealayout.h
+++ b/kicker/kicker/core/containerarealayout.h
@@ -108,12 +108,6 @@ class ContainerAreaLayout : public TQLayout
         int leftR() const;
         int rightR() const;
 
-#ifdef USE_QT4
-
-        QLAYOUT_REQUIRED_METHOD_DECLARATIONS
-
-#endif // USE_QT4
-
     private:
         int moveContainerPushRecursive(ItemList::const_iterator it, int distance);
         int distanceToPreviousItem(ItemList::const_iterator it) const;
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index 796b98125..cb20c7a58 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -179,7 +179,7 @@ void ExtensionManager::initialize()
     m_loadingContainers = false;
 
     pm->clearUntrustedLists();
-    connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), TQT_SLOT(configurationChanged()));
+    connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), TQ_SLOT(configurationChanged()));
     DCOPRef r( "ksmserver", "ksmserver" );
     r.send( "resumeStartup", TQCString( "kicker" ));
 }
@@ -222,7 +222,7 @@ void ExtensionManager::configureMenubar(bool duringInit)
         updateMenubar();
 
         m_menubarPanel->show();
-        connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(updateMenubar()));
+        connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(updateMenubar()));
     }
     else if (m_menubarPanel)
     {
@@ -437,8 +437,8 @@ void ExtensionManager::addContainer(ExtensionContainer* e)
 
     _containers.append(e);
 
-    connect(e, TQT_SIGNAL(removeme(ExtensionContainer*)),
-            this, TQT_SLOT(removeContainer(ExtensionContainer*)));
+    connect(e, TQ_SIGNAL(removeme(ExtensionContainer*)),
+            this, TQ_SLOT(removeContainer(ExtensionContainer*)));
 
     if (!m_loadingContainers) {
         emit desktopIconsAreaChanged(desktopIconsArea(e->xineramaScreen()),
diff --git a/kicker/kicker/core/extensionmanager.h b/kicker/kicker/core/extensionmanager.h
index b4a53ec31..1e36bca56 100644
--- a/kicker/kicker/core/extensionmanager.h
+++ b/kicker/kicker/core/extensionmanager.h
@@ -33,7 +33,7 @@ const int XineramaAllScreens = -2;
 
 class ExtensionManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static ExtensionManager* the();
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index 94517607e..19c348851 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -77,7 +77,7 @@ Kicker::Kicker()
         // this means we've most likely crashed once. so let's see if we
         // stay up for more than 2 minutes time, and if so reset the
         // crash handler since the crash isn't a frequent offender
-        TQTimer::singleShot(120000, this, TQT_SLOT(setCrashHandler()));
+        TQTimer::singleShot(120000, this, TQ_SLOT(setCrashHandler()));
     }
     else
     {
@@ -116,7 +116,7 @@ Kicker::Kicker()
 
     // initialize our keys
     // note that this creates the KMenu by calling MenuManager::the()
-    keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+    keys = new TDEGlobalAccel( this );
 #define KICKER_ALL_BINDINGS
 #include "kickerbindings.cpp"
     keys->readSettings();
@@ -125,19 +125,19 @@ Kicker::Kicker()
     // set up our global settings
     configure();
 
-    connect(this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
-    connect(this, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
-    connect(this, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged()));
+    connect(this, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+    connect(this, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
+    connect(this, TQ_SIGNAL(tdedisplayStyleChanged()), TQ_SLOT(slotStyleChanged()));
 
 #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
-    connect(desktop(), TQT_SIGNAL(resized(int)), TQT_SLOT(slotDesktopResized()));
+    connect(desktop(), TQ_SIGNAL(resized(int)), TQ_SLOT(slotDesktopResized()));
 #endif
 
     // the panels, aka extensions
-    TQTimer::singleShot(0, ExtensionManager::the(), TQT_SLOT(initialize()));
+    TQTimer::singleShot(0, ExtensionManager::the(), TQ_SLOT(initialize()));
 
-    connect(ExtensionManager::the(), TQT_SIGNAL(desktopIconsAreaChanged(const TQRect &, int)),
-            this, TQT_SLOT(slotDesktopIconsAreaChanged(const TQRect &, int)));
+    connect(ExtensionManager::the(), TQ_SIGNAL(desktopIconsAreaChanged(const TQRect &, int)),
+            this, TQ_SLOT(slotDesktopIconsAreaChanged(const TQRect &, int)));
 }
 
 Kicker::~Kicker()
@@ -258,7 +258,7 @@ void Kicker::quit()
 void Kicker::restart()
 {
     // do this on a timer to give us time to return true
-    TQTimer::singleShot(0, this, TQT_SLOT(slotRestart()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotRestart()));
 }
 
 void Kicker::slotRestart()
@@ -352,7 +352,7 @@ void Kicker::showConfig(const TQString& configPath, const TQString& configFile,
             moduleNumber++;
          }
 
-         connect(m_configDialog, TQT_SIGNAL(finished()), TQT_SLOT(configDialogFinished()));
+         connect(m_configDialog, TQ_SIGNAL(finished()), TQ_SLOT(configDialogFinished()));
     }
 
     if (!configPath.isEmpty())
diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h
index 6a3e02d36..1868c0bbe 100644
--- a/kicker/kicker/core/kicker.h
+++ b/kicker/kicker/core/kicker.h
@@ -38,7 +38,7 @@ class PanelPopupButton;
 
 class Kicker : public KUniqueApplication
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 public:
diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp
index 46cfa432d..e8999a22d 100644
--- a/kicker/kicker/core/kickerbindings.cpp
+++ b/kicker/kicker/core/kickerbindings.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, target, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(target), TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, target, TQ_SLOT(fnSlot) )
 #else
 # define DEF( name, key3, key4, target, fnSlot ) \
    keys->insert( name, i18n(name), TQString(), key3, key4 )
@@ -37,12 +37,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #ifdef LAUNCH_MENU
 	keys->insert("Program:kicker", i18n("Panel"));
-	DEF(I18N_NOOP("Popup Launch Menu" ), ALT+Qt::Key_F1, WIN+Qt::Key_Menu,
+	DEF(I18N_NOOP("Popup Launch Menu" ), ALT+TQt::Key_F1, WIN+TQt::Key_Menu,
                       MenuManager::the(), kmenuAccelActivated());
 #endif
 
 #ifdef SHOW_DESKTOP
-	DEF(I18N_NOOP( "Toggle Showing Desktop" ), ALT+CTRL+Qt::Key_D, WIN+CTRL+Qt::Key_D,
+	DEF(I18N_NOOP( "Toggle Showing Desktop" ), ALT+CTRL+TQt::Key_D, WIN+CTRL+TQt::Key_D,
             this, slotToggleShowDesktop());
 #endif
 
diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp
index a7326844e..94ee0acfb 100644
--- a/kicker/kicker/core/menumanager.cpp
+++ b/kicker/kicker/core/menumanager.cpp
@@ -71,8 +71,8 @@ MenuManager::MenuManager(TQObject *parent)
 	m_kmenu = new KMenuStub(new KMenu);
 
     kapp->dcopClient()->setNotifications(true);
-    connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)),
-            this, TQT_SLOT(applicationRemoved(const TQCString&)));
+    connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
+            this, TQ_SLOT(applicationRemoved(const TQCString&)));
 }
 
 MenuManager::~MenuManager()
@@ -164,7 +164,7 @@ void MenuManager::kmenuAccelActivated()
         // the item under the cursor gets selected. The single shot
         // avoids this from happening by allowing the item to be selected
         // when the event loop is enterred, and then resetting it.
-        TQTimer::singleShot(0, this, TQT_SLOT(slotSetKMenuItemActive()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotSetKMenuItemActive()));
     }
     else
     {
diff --git a/kicker/kicker/core/menumanager.h b/kicker/kicker/core/menumanager.h
index 1139b0b61..03e107767 100644
--- a/kicker/kicker/core/menumanager.h
+++ b/kicker/kicker/core/menumanager.h
@@ -40,7 +40,7 @@ typedef TQValueList<PanelPopupButton*> KButtonList;
  */
 class MenuManager : public TQObject, DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     static MenuManager* the();
 
diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp
index 93bd2356b..e55f65697 100644
--- a/kicker/kicker/core/panelextension.cpp
+++ b/kicker/kicker/core/panelextension.cpp
@@ -71,7 +71,7 @@ PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, con
 
     // container area
     _containerArea = new ContainerArea( config(), this, opMenu() );
-    connect(_containerArea, TQT_SIGNAL(maintainFocus(bool)), this, TQT_SIGNAL(maintainFocus(bool)));
+    connect(_containerArea, TQ_SIGNAL(maintainFocus(bool)), this, TQ_SIGNAL(maintainFocus(bool)));
     _layout->addWidget(_containerArea);
 
     _containerArea->viewport()->installEventFilter(this);
@@ -81,15 +81,15 @@ PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, con
     // beginning.
     positionChange(position());
 
-    connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
-            TQT_SLOT(configurationChanged()));
-    connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)),
-            TQT_SLOT(immutabilityChanged(bool)));
+    connect(Kicker::the(), TQ_SIGNAL(configurationChanged()),
+            TQ_SLOT(configurationChanged()));
+    connect(Kicker::the(), TQ_SIGNAL(immutabilityChanged(bool)),
+            TQ_SLOT(immutabilityChanged(bool)));
 
     // we wait to get back to the event loop to start up the container area so that
     // the main panel in ExtensionManager will be assigned and we can tell in a
     // relatively non-hackish way that we are (or aren't) the "main panel"
-    TQTimer::singleShot(0, this, TQT_SLOT(populateContainerArea()));
+    TQTimer::singleShot(0, this, TQ_SLOT(populateContainerArea()));
 }
 
 PanelExtension::~PanelExtension()
@@ -129,7 +129,7 @@ TQPopupMenu* PanelExtension::opMenu()
     }
 
     _opMnu = new TQPopupMenu(this);
-    connect(_opMnu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBuildOpMenu()));
+    connect(_opMnu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotBuildOpMenu()));
 
     return _opMnu;
 }
@@ -162,7 +162,7 @@ bool PanelExtension::eventFilter(TQObject*, TQEvent * e)
     if ( e->type() == TQEvent::MouseButtonPress )
     {
         TQMouseEvent* me = (TQMouseEvent*) e;
-        if ( me->button() == Qt::RightButton && kapp->authorize("action/kicker_rmb"))
+        if ( me->button() == TQt::RightButton && kapp->authorize("action/kicker_rmb"))
         {
             Kicker::the()->setInsertionPoint(me->globalPos());
             opMenu()->exec(me->globalPos());
@@ -339,7 +339,7 @@ void PanelExtension::slotBuildOpMenu()
         {
             _opMnu->insertItem(isMenuBar ? i18n("Add &Applet to Menubar...")
                                          : i18n("Add &Applet to Panel..."),
-                               _containerArea, TQT_SLOT(showAddAppletDialog()));
+                               _containerArea, TQ_SLOT(showAddAppletDialog()));
             m_panelAddMenu = new PanelAddButtonMenu(_containerArea, this);
             _opMnu->insertItem(isMenuBar ? i18n("Add Appli&cation to Menubar")
                                          : i18n("Add Appli&cation to Panel"),
@@ -362,7 +362,7 @@ void PanelExtension::slotBuildOpMenu()
         }
 
         _opMnu->insertItem(SmallIconSet("system-lock-screen"), i18n("&Lock Panels"),
-                Kicker::the(), TQT_SLOT(toggleLock()));
+                Kicker::the(), TQ_SLOT(toggleLock()));
     }
     else if (!Kicker::the()->isKioskImmutable())
     {
@@ -370,20 +370,20 @@ void PanelExtension::slotBuildOpMenu()
                                             SmallIconSet("system-lock-screen"),
                            kickerImmutable ? i18n("Un&lock Panels") :
                                              i18n("&Lock Panels"),
-                           Kicker::the(), TQT_SLOT(toggleLock()));
+                           Kicker::the(), TQ_SLOT(toggleLock()));
     }
 
     if (!isMenuBar && !Kicker::the()->isKioskImmutable())
     {
         _opMnu->insertItem(SmallIconSet("configure"),
                             i18n("&Configure Panel..."),
-                            this, TQT_SLOT(showConfig()));
+                            this, TQ_SLOT(showConfig()));
         _opMnu->insertSeparator();
     }
 
     _opMnu->insertItem(SmallIconSet("fork"),
                             i18n("&Launch Process Manager..."),
-                            this, TQT_SLOT(showProcessManager()));
+                            this, TQ_SLOT(showProcessManager()));
     _opMnu->insertSeparator();
 
     if (kapp->authorize("action/help"))
diff --git a/kicker/kicker/core/panelextension.h b/kicker/kicker/core/panelextension.h
index c7882291f..02460b00b 100644
--- a/kicker/kicker/core/panelextension.h
+++ b/kicker/kicker/core/panelextension.h
@@ -40,7 +40,7 @@ class TQGridLayout;
 
 class PanelExtension : public KPanelExtension, virtual public  DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 public:
@@ -109,7 +109,7 @@ private:
 
 class MenubarExtension : public PanelExtension
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         MenubarExtension(const AppletInfo& info);
diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp
index a8b79877a..78db46495 100644
--- a/kicker/kicker/core/pluginmanager.cpp
+++ b/kicker/kicker/core/pluginmanager.cpp
@@ -123,8 +123,8 @@ PluginManager::~PluginManager()
     AppletInfo::Dict::const_iterator it = _dict.constBegin();
     for (; it != _dict.constEnd(); ++it)
     {
-        disconnect(it.key(), TQT_SIGNAL(destroyed( TQObject*)),
-                   this, TQT_SLOT(slotPluginDestroyed(TQObject*)));
+        disconnect(it.key(), TQ_SIGNAL(destroyed( TQObject*)),
+                   this, TQ_SLOT(slotPluginDestroyed(TQObject*)));
         delete it.data();
     }
 
@@ -159,9 +159,9 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info,
 
     if (applet)
     {
-        _dict.insert( TQT_TQOBJECT(applet), new AppletInfo( info ) );
-        connect( applet, TQT_SIGNAL( destroyed( TQObject* ) ),
-                 TQT_SLOT( slotPluginDestroyed( TQObject* ) ) );
+        _dict.insert( applet, new AppletInfo( info ) );
+        connect( applet, TQ_SIGNAL( destroyed( TQObject* ) ),
+                 TQ_SLOT( slotPluginDestroyed( TQObject* ) ) );
     }
 
     return applet;
@@ -197,9 +197,9 @@ KPanelExtension* PluginManager::loadExtension(
     KPanelExtension* extension = init_ptr( parent, info.configFile() );
 
     if( extension ) {
-        _dict.insert( TQT_TQOBJECT(extension), new AppletInfo( info ) );
-        connect( extension, TQT_SIGNAL( destroyed( TQObject* ) ),
-                 TQT_SLOT( slotPluginDestroyed( TQObject* ) ) );
+        _dict.insert( extension, new AppletInfo( info ) );
+        connect( extension, TQ_SIGNAL( destroyed( TQObject* ) ),
+                 TQ_SLOT( slotPluginDestroyed( TQObject* ) ) );
     }
 
     return extension;
@@ -360,12 +360,12 @@ LibUnloader::LibUnloader( const TQString &libName, TQObject *parent )
 {
     // NOTE: this doesn't work on kicker shutdown because the timer never gets
     //       fired.
-    TQTimer::singleShot( 0, this, TQT_SLOT( unload() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( unload() ) );
 }
 
 void LibUnloader::unload( const TQString &libName )
 {
-    (void)new LibUnloader( libName, TQT_TQOBJECT(kapp) );
+    (void)new LibUnloader( libName, kapp );
 }
 
 void LibUnloader::unload()
diff --git a/kicker/kicker/core/pluginmanager.h b/kicker/kicker/core/pluginmanager.h
index f67c13490..d78d1b07a 100644
--- a/kicker/kicker/core/pluginmanager.h
+++ b/kicker/kicker/core/pluginmanager.h
@@ -40,7 +40,7 @@ class TQPopupMenu;
 
 class KDE_EXPORT PluginManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static PluginManager* the();
@@ -90,7 +90,7 @@ private:
 
 class LibUnloader : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     static void unload( const TQString &libName );
 
diff --git a/kicker/kicker/core/showdesktop.cpp b/kicker/kicker/core/showdesktop.cpp
index 4a6639574..0a1e2907c 100644
--- a/kicker/kicker/core/showdesktop.cpp
+++ b/kicker/kicker/core/showdesktop.cpp
@@ -49,8 +49,8 @@ ShowDesktop::ShowDesktop()
     m_wmSupport = i.isSupported( NET::WM2ShowingDesktop );
     if( m_wmSupport )
     {
-        connect( Kicker::the()->twinModule(), TQT_SIGNAL( showingDesktopChanged( bool )),
-            TQT_SLOT( showingDesktopChanged( bool )));
+        connect( Kicker::the()->twinModule(), TQ_SIGNAL( showingDesktopChanged( bool )),
+            TQ_SLOT( showingDesktopChanged( bool )));
         showingDesktopChanged( m_showingDesktop = Kicker::the()->twinModule()->showingDesktop());
     }
 }
@@ -161,21 +161,21 @@ void ShowDesktop::showDesktop( bool b )
         }
 
         // on desktop changes or when a window is deiconified, we abort the show desktop mode
-        connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
-                TQT_SLOT(slotCurrentDesktopChanged(int)));
-        connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
-                TQT_SLOT(slotWindowChanged(WId,unsigned int)));
-        connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)),
-                TQT_SLOT(slotWindowAdded(WId)));
+        connect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)),
+                TQ_SLOT(slotCurrentDesktopChanged(int)));
+        connect(Kicker::the()->twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)),
+                TQ_SLOT(slotWindowChanged(WId,unsigned int)));
+        connect(Kicker::the()->twinModule(), TQ_SIGNAL(windowAdded(WId)),
+                TQ_SLOT(slotWindowAdded(WId)));
     }
     else
     {
-        disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
-                   this, TQT_SLOT(slotCurrentDesktopChanged(int)));
-        disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
-                   this, TQT_SLOT(slotWindowChanged(WId,unsigned int)));
-        disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)),
-                   this, TQT_SLOT(slotWindowAdded(WId)));
+        disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)),
+                   this, TQ_SLOT(slotCurrentDesktopChanged(int)));
+        disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)),
+                   this, TQ_SLOT(slotWindowChanged(WId,unsigned int)));
+        disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(windowAdded(WId)),
+                   this, TQ_SLOT(slotWindowAdded(WId)));
 
         for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin();
              it != m_iconifiedList.end();
diff --git a/kicker/kicker/core/showdesktop.h b/kicker/kicker/core/showdesktop.h
index 88cc7d7c7..ec7119438 100644
--- a/kicker/kicker/core/showdesktop.h
+++ b/kicker/kicker/core/showdesktop.h
@@ -33,7 +33,7 @@ class KWinModule;
  */
 class ShowDesktop : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static ShowDesktop* the();
diff --git a/kicker/kicker/core/unhidetrigger.cpp b/kicker/kicker/core/unhidetrigger.cpp
index 0a5093a61..1acc182f6 100644
--- a/kicker/kicker/core/unhidetrigger.cpp
+++ b/kicker/kicker/core/unhidetrigger.cpp
@@ -40,7 +40,7 @@ UnhideTrigger::UnhideTrigger()
 	, enabledCount( 0 )
 {
 	_timer = new TQTimer( this, "UnhideTrigger" );
-	connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(pollMouse()) );
+	connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(pollMouse()) );
 }
 
 void UnhideTrigger::setEnabled( bool enable )
diff --git a/kicker/kicker/core/unhidetrigger.h b/kicker/kicker/core/unhidetrigger.h
index af05a43f5..472009014 100644
--- a/kicker/kicker/core/unhidetrigger.h
+++ b/kicker/kicker/core/unhidetrigger.h
@@ -32,9 +32,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqobject.h>
 
-class UnhideTrigger : public QObject
+class UnhideTrigger : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	enum Trigger { None = 0, Top, TopRight, Right, BottomRight, Bottom, BottomLeft, Left, TopLeft };
 	static UnhideTrigger* the();
diff --git a/kicker/kicker/core/userrectsel.cpp b/kicker/kicker/core/userrectsel.cpp
index d48c43aad..04a2a4afd 100644
--- a/kicker/kicker/core/userrectsel.cpp
+++ b/kicker/kicker/core/userrectsel.cpp
@@ -46,7 +46,7 @@ UserRectSel::~UserRectSel()
 
 void UserRectSel::mouseReleaseEvent(TQMouseEvent * e)
 {
-    if (e->button() == Qt::LeftButton)
+    if (e->button() == TQt::LeftButton)
     {
         tqApp->exit_loop();
     }
@@ -89,7 +89,7 @@ void UserRectSel::paintCurrent()
         for (i = 0; i < 4; i++)
         {
             _frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM));
-            _frame[i]->setPaletteBackgroundColor(Qt::black);
+            _frame[i]->setPaletteBackgroundColor(TQt::black);
         }
         for (i = 4; i < 8; i++)
         {
diff --git a/kicker/kicker/core/userrectsel.h b/kicker/kicker/core/userrectsel.h
index 564a6d980..dbc4d62be 100644
--- a/kicker/kicker/core/userrectsel.h
+++ b/kicker/kicker/core/userrectsel.h
@@ -34,7 +34,7 @@ class ShutUpCompiler;
 
 class UserRectSel : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
     public:
         class PanelStrut
diff --git a/kicker/kicker/core/usersizesel.cpp b/kicker/kicker/core/usersizesel.cpp
index 107a2527a..654114d90 100644
--- a/kicker/kicker/core/usersizesel.cpp
+++ b/kicker/kicker/core/usersizesel.cpp
@@ -46,7 +46,7 @@ UserSizeSel::UserSizeSel(const TQRect& rect, const KPanelExtension::Position pos
     }
     if ((pos == KPanelExtension::Top) || (pos == KPanelExtension::Bottom))
     {
-        setCursor(tqsizeVerCursor);
+        setCursor(TQt::sizeVerCursor);
     }
 
     setGeometry(-10, -10, 2, 2);
@@ -69,7 +69,7 @@ UserSizeSel::~UserSizeSel()
 
 void UserSizeSel::mouseReleaseEvent(TQMouseEvent * e)
 {
-    if (e->button() == Qt::LeftButton)
+    if (e->button() == TQt::LeftButton)
     {
         tqApp->exit_loop();
     }
@@ -156,7 +156,7 @@ void UserSizeSel::paintCurrent()
         for (i = 0; i < 4; i++)
         {
             _frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM));
-            _frame[i]->setPaletteBackgroundColor(Qt::black);
+            _frame[i]->setPaletteBackgroundColor(TQt::black);
         }
         for (i = 4; i < 8; i++)
         {
diff --git a/kicker/kicker/core/usersizesel.h b/kicker/kicker/core/usersizesel.h
index 64c8950bd..658baecf2 100644
--- a/kicker/kicker/core/usersizesel.h
+++ b/kicker/kicker/core/usersizesel.h
@@ -34,7 +34,7 @@ class ShutUpCompiler;
 
 class UserSizeSel : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
     public:
         static TQRect select(const TQRect& rect, const KPanelExtension::Position pos, const TQColor& color);
diff --git a/kicker/kicker/interfaces/kickoff-search-plugin.h b/kicker/kicker/interfaces/kickoff-search-plugin.h
index e605e27c5..fc733f207 100644
--- a/kicker/kicker/interfaces/kickoff-search-plugin.h
+++ b/kicker/kicker/interfaces/kickoff-search-plugin.h
@@ -91,7 +91,7 @@ namespace KickoffSearch {
 
     class KDE_EXPORT Plugin : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
 
     public:
         Plugin(TQObject *parent, const char* name=0);
diff --git a/kicker/kicker/interfaces/kickoffsearchinterface.h b/kicker/kicker/interfaces/kickoffsearchinterface.h
index 485e9757c..b8a866c7b 100644
--- a/kicker/kicker/interfaces/kickoffsearchinterface.h
+++ b/kicker/kicker/interfaces/kickoffsearchinterface.h
@@ -30,7 +30,7 @@ namespace KickoffSearch
 {
     class KDE_EXPORT KickoffSearchInterface :public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
 
     public:
         KickoffSearchInterface( TQObject* parent, const char* name = 0);
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index 0db6bc352..fb5e3f16d 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -61,7 +61,7 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent)
       m_odd(odd),
       m_selected(false)
 {
-    setFocusPolicy(TQ_StrongFocus);
+    setFocusPolicy(TQWidget::StrongFocus);
     setSelected(m_selected);
     
     itemTitle->setText("<h3>" + info.name() + "</h3>");
@@ -84,8 +84,8 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
 {
     if (e->type() == TQEvent::MouseButtonPress)
     {
-        TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
-        if (me->button() & Qt::LeftButton)
+        TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
+        if (me->button() & TQt::LeftButton)
         {
             m_dragStart = me->pos();
         }
@@ -97,7 +97,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
 
     if (e->type() == TQEvent::MouseMove)
     {
-        TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
+        TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
         if ((me->pos() - m_dragStart).manhattanLength() >
             TDEGlobalSettings::dndEventDelay())
         {
@@ -123,21 +123,21 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
 
 void AppletWidget::keyPressEvent(TQKeyEvent *e)
 {
-    if (e->key() == Qt::Key_Enter ||
-        e->key() == Qt::Key_Return)
+    if (e->key() == TQt::Key_Enter ||
+        e->key() == TQt::Key_Return)
     {
         emit doubleClicked(this);
     }
-    else if (e->key() == Qt::Key_Up)
+    else if (e->key() == TQt::Key_Up)
     {
         TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_BackTab, 0, 0);
         TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_BackTab, 0, 0);
         TQApplication::sendEvent(this, &fakedKeyPress);
         TQApplication::sendEvent(this, &fakedKeyRelease);
     }
-    else if (e->key() == Qt::Key_Down)
+    else if (e->key() == TQt::Key_Down)
     {
-        TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_Tab, 0, 0);
+        TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_Tab, 0, 0);
         TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0);
         TQApplication::sendEvent(this, &fakedKeyPress);
         TQApplication::sendEvent(this, &fakedKeyRelease);
@@ -150,7 +150,7 @@ void AppletWidget::keyPressEvent(TQKeyEvent *e)
 
 void AppletWidget::mousePressEvent(TQMouseEvent *e)
 {
-    if (e->button() == Qt::LeftButton)
+    if (e->button() == TQt::LeftButton)
     {
         emit clicked(this);
         m_dragStart = e->pos();
@@ -162,7 +162,7 @@ void AppletWidget::mousePressEvent(TQMouseEvent *e)
 
 void AppletWidget::mouseMoveEvent(TQMouseEvent *e)
 {
-    if (e->button() == Qt::LeftButton &&
+    if (e->button() == TQt::LeftButton &&
         !m_dragStart.isNull() &&
         (e->pos() - m_dragStart).manhattanLength() >
          TDEGlobalSettings::dndEventDelay())
@@ -186,7 +186,7 @@ void AppletWidget::mouseReleaseEvent(TQMouseEvent *e)
 
 void AppletWidget::mouseDoubleClickEvent(TQMouseEvent *e)
 {
-    if (!e->button() == Qt::LeftButton)
+    if (!e->button() == TQt::LeftButton)
     {
         AppletItem::mouseDoubleClickEvent(e);
         return;
@@ -254,16 +254,16 @@ AddAppletDialog::AddAppletDialog(ContainerArea* cArea,
     m_mainWidget->appletInstall->setGuiItem(addGuiItem);
     m_mainWidget->closeButton->setGuiItem(KStdGuiItem::close());
 
-    connect(m_mainWidget->appletSearch, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(delayedSearch()));
-    connect(m_searchDelay, TQT_SIGNAL(timeout()), this, TQT_SLOT(search()));
-    connect(m_mainWidget->appletFilter, TQT_SIGNAL(activated(int)), this, TQT_SLOT(filter(int)));
-    connect(m_mainWidget->appletInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(addCurrentApplet()));
-    connect(m_mainWidget->closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()));
+    connect(m_mainWidget->appletSearch, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(delayedSearch()));
+    connect(m_searchDelay, TQ_SIGNAL(timeout()), this, TQ_SLOT(search()));
+    connect(m_mainWidget->appletFilter, TQ_SIGNAL(activated(int)), this, TQ_SLOT(filter(int)));
+    connect(m_mainWidget->appletInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(addCurrentApplet()));
+    connect(m_mainWidget->closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(close()));
 
     m_selectedType = AppletInfo::Undefined;
     m_appletBox = 0;
 
-    TQTimer::singleShot(0, this, TQT_SLOT(populateApplets()));
+    TQTimer::singleShot(0, this, TQ_SLOT(populateApplets()));
 }
 
 void AddAppletDialog::updateInsertionPoint()
@@ -303,9 +303,9 @@ void AddAppletDialog::resizeAppletView()
 bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e)
 {
     if (e->type() == TQEvent::Resize)
-        TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView()));
+        TQTimer::singleShot(0, this, TQ_SLOT(resizeAppletView()));
     
-    return TQT_TQOBJECT(this)->TQObject::eventFilter(o, e);
+    return this->TQObject::eventFilter(o, e);
 }
 
 void AddAppletDialog::populateApplets()
@@ -372,10 +372,10 @@ void AddAppletDialog::populateApplets()
         setTabOrder(prevTabWidget, itemWidget);
         prevTabWidget = itemWidget;
 
-        connect(itemWidget, TQT_SIGNAL(clicked(AppletWidget*)),
-                this, TQT_SLOT(selectApplet(AppletWidget*)));
-        connect(itemWidget, TQT_SIGNAL(doubleClicked(AppletWidget*)),
-                this, TQT_SLOT(addApplet(AppletWidget*)));
+        connect(itemWidget, TQ_SIGNAL(clicked(AppletWidget*)),
+                this, TQ_SLOT(selectApplet(AppletWidget*)));
+        connect(itemWidget, TQ_SIGNAL(doubleClicked(AppletWidget*)),
+                this, TQ_SLOT(addApplet(AppletWidget*)));
 
         if (m_closing)
         {
@@ -518,7 +518,7 @@ void AddAppletDialog::search()
         }
     }
     
-    TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView()));
+    TQTimer::singleShot(0, this, TQ_SLOT(resizeAppletView()));
 }
 
 void AddAppletDialog::filter(int i)
diff --git a/kicker/kicker/ui/addapplet.h b/kicker/kicker/ui/addapplet.h
index bc2763f0b..c62b2b2ec 100644
--- a/kicker/kicker/ui/addapplet.h
+++ b/kicker/kicker/ui/addapplet.h
@@ -41,7 +41,7 @@ class TQTimer;
 
 class AddAppletDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         AddAppletDialog(ContainerArea* cArea, TQWidget* parent, const char* name);
diff --git a/kicker/kicker/ui/addapplet_mnu.cpp b/kicker/kicker/ui/addapplet_mnu.cpp
index 6d5c4482f..f68159b98 100644
--- a/kicker/kicker/ui/addapplet_mnu.cpp
+++ b/kicker/kicker/ui/addapplet_mnu.cpp
@@ -33,8 +33,8 @@ PanelAddAppletMenu::PanelAddAppletMenu(ContainerArea* cArea, TQWidget *parent, c
     : TQPopupMenu(parent, name), containerArea(cArea)
 {
     setCheckable(true);
-    connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
-    connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
+    connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int)));
+    connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow()));
 }
 
 void PanelAddAppletMenu::slotAboutToShow()
diff --git a/kicker/kicker/ui/addapplet_mnu.h b/kicker/kicker/ui/addapplet_mnu.h
index 79c539687..dfe15bbeb 100644
--- a/kicker/kicker/ui/addapplet_mnu.h
+++ b/kicker/kicker/ui/addapplet_mnu.h
@@ -33,7 +33,7 @@ class ContainerArea;
 
 class PanelAddAppletMenu : public TQPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelAddAppletMenu(ContainerArea *cArea, TQWidget *parent=0, const char *name=0);
diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp
index 62ff12675..dd6f04135 100644
--- a/kicker/kicker/ui/addappletvisualfeedback.cpp
+++ b/kicker/kicker/ui/addappletvisualfeedback.cpp
@@ -54,9 +54,9 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget,
       m_moveTimer(0, "m_moveTimer"),
       m_dirty(false)
 {
-    setFocusPolicy(TQ_NoFocus);
+    setFocusPolicy(TQWidget::NoFocus);
     setBackgroundMode(NoBackground);
-    connect(&m_moveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(swoopCloser()));
+    connect(&m_moveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(swoopCloser()));
 
     TQString m = "<qt><h3>" + i18n("%1 Added").arg(widget->info().name());
 
@@ -109,10 +109,10 @@ void AddAppletVisualFeedback::makeMask()
 {
     TQPainter maskPainter(&m_mask);
 
-    m_mask.fill(Qt::black);
+    m_mask.fill(TQt::black);
 
-    maskPainter.setBrush(Qt::white);
-    maskPainter.setPen(Qt::white);
+    maskPainter.setBrush(TQt::white);
+    maskPainter.setPen(TQt::white);
     maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(),
                               1600 / m_mask.rect().height());
     setMask(m_mask);
@@ -156,7 +156,7 @@ void AddAppletVisualFeedback::displayInternal()
 
     // draw background
     TQPainter bufferPainter(&m_pixmap);
-    bufferPainter.setPen(Qt::black);
+    bufferPainter.setPen(TQt::black);
     bufferPainter.setBrush(colorGroup().background());
     bufferPainter.drawRoundRect(0, 0, width, height,
                                 1600 / width, 1600 / height);
@@ -218,7 +218,7 @@ void AddAppletVisualFeedback::swoopCloser()
     {
         m_moveTimer.stop();
         displayInternal();
-        TQTimer::singleShot(2000, this, TQT_SLOT(deleteLater()));
+        TQTimer::singleShot(2000, this, TQ_SLOT(deleteLater()));
     }
 }
 
diff --git a/kicker/kicker/ui/addappletvisualfeedback.h b/kicker/kicker/ui/addappletvisualfeedback.h
index dc660bff1..d2e3da5e6 100644
--- a/kicker/kicker/ui/addappletvisualfeedback.h
+++ b/kicker/kicker/ui/addappletvisualfeedback.h
@@ -40,7 +40,7 @@ class TQTimer;
 
 class AddAppletVisualFeedback : TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         AddAppletVisualFeedback(AppletWidget* parent,
diff --git a/kicker/kicker/ui/addbutton_mnu.h b/kicker/kicker/ui/addbutton_mnu.h
index 209e7e9a3..1a19b9480 100644
--- a/kicker/kicker/ui/addbutton_mnu.h
+++ b/kicker/kicker/ui/addbutton_mnu.h
@@ -30,7 +30,7 @@ class ContainerArea;
 
 class PanelAddButtonMenu : public PanelServiceMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelAddButtonMenu(ContainerArea* cArea, const TQString & label, const TQString & relPath,
diff --git a/kicker/kicker/ui/addextension_mnu.cpp b/kicker/kicker/ui/addextension_mnu.cpp
index b22187443..c0eda09ab 100644
--- a/kicker/kicker/ui/addextension_mnu.cpp
+++ b/kicker/kicker/ui/addextension_mnu.cpp
@@ -31,8 +31,8 @@ PanelAddExtensionMenu::PanelAddExtensionMenu(TQWidget *parent, const char *name)
     : TQPopupMenu(parent, name)
 {
     setCheckable(true);
-    connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
-    connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
+    connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int)));
+    connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow()));
 }
 
 void PanelAddExtensionMenu::slotAboutToShow()
diff --git a/kicker/kicker/ui/addextension_mnu.h b/kicker/kicker/ui/addextension_mnu.h
index 76163250f..f3be54c1f 100644
--- a/kicker/kicker/ui/addextension_mnu.h
+++ b/kicker/kicker/ui/addextension_mnu.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class PanelAddExtensionMenu : public TQPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelAddExtensionMenu(TQWidget *parent=0, const char *name=0);
diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp
index a037909b6..740260d7f 100644
--- a/kicker/kicker/ui/appletop_mnu.cpp
+++ b/kicker/kicker/ui/appletop_mnu.cpp
@@ -169,10 +169,10 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
         }
 
         if (KickerSettings::legacyKMenu()) 
-//          insertItem(SmallIcon("kickoff"), i18n("Switch to Kickoff Menu Style"), this, TQT_SLOT(toggleLegacy()));
-          insertItem(SmallIcon("launch"), i18n("Switch to Kickoff Menu Style"), this, TQT_SLOT(toggleLegacy()));
+//          insertItem(SmallIcon("kickoff"), i18n("Switch to Kickoff Menu Style"), this, TQ_SLOT(toggleLegacy()));
+          insertItem(SmallIcon("launch"), i18n("Switch to Kickoff Menu Style"), this, TQ_SLOT(toggleLegacy()));
         else
-          insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQT_SLOT(toggleLegacy()));
+          insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQ_SLOT(toggleLegacy()));
     }
 
     if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeTDEAction("menuedit"))
@@ -213,7 +213,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
 
 void PanelAppletOpMenu::keyPressEvent(TQKeyEvent* e)
 {
-    if (e->key() == Qt::Key_Escape)
+    if (e->key() == TQt::Key_Escape)
     {
         emit escapePressed();
     }
diff --git a/kicker/kicker/ui/appletop_mnu.h b/kicker/kicker/ui/appletop_mnu.h
index 35e10be3c..ae058cea1 100644
--- a/kicker/kicker/ui/appletop_mnu.h
+++ b/kicker/kicker/ui/appletop_mnu.h
@@ -31,7 +31,7 @@ class AppletInfo;
 // The button operations menu (usually right click)
 class PanelAppletOpMenu : public TQPopupMenu
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     enum OpButton{Move = 9900, Remove = 9901, Help = 9902, About = 9903, Preferences = 9904, ReportBug = 9905 };
diff --git a/kicker/kicker/ui/appletwidget.h b/kicker/kicker/ui/appletwidget.h
index d0bb9e885..e0a0b485c 100644
--- a/kicker/kicker/ui/appletwidget.h
+++ b/kicker/kicker/ui/appletwidget.h
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class AppletWidget: public AppletItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         typedef TQValueList<AppletWidget*> List;
diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp
index 0e98054d8..27eb0def5 100644
--- a/kicker/kicker/ui/browser_dlg.cpp
+++ b/kicker/kicker/ui/browser_dlg.cpp
@@ -55,7 +55,7 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic
     hbox1->setSpacing( KDialog::spacingHint() );
     TQLabel *label2 = new TQLabel( i18n ( "Path:" ), hbox1 );
     pathInput = new KLineEdit( hbox1 );
-    connect( pathInput, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotPathChanged( const TQString & )));
+    connect( pathInput, TQ_SIGNAL( textChanged ( const TQString & )), this, TQ_SLOT( slotPathChanged( const TQString & )));
 
     pathInput->setText( path );
     pathInput->setFocus();
@@ -69,7 +69,7 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic
     else
         iconBtn->setIcon( icon );
 
-    connect( browseBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( browse() ) );
+    connect( browseBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( browse() ) );
 }
 
 PanelBrowserDialog::~PanelBrowserDialog()
diff --git a/kicker/kicker/ui/browser_dlg.h b/kicker/kicker/ui/browser_dlg.h
index d1b3b623d..8aad531a2 100644
--- a/kicker/kicker/ui/browser_dlg.h
+++ b/kicker/kicker/ui/browser_dlg.h
@@ -31,7 +31,7 @@ class KLineEdit;
 
 class PanelBrowserDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelBrowserDialog( const TQString &path = TQString::null, const TQString &icon = TQString::null, TQWidget *parent = 0, const char *name = 0 );
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index c5b76569c..63ea58f1b 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -64,12 +64,12 @@ PanelBrowserMenu::PanelBrowserMenu(TQString path, TQWidget *parent, const char *
 
     // we are not interested for dirty events on files inside the
     // directory (see slotClearIfNeeded)
-    connect( &_dirWatch, TQT_SIGNAL(dirty(const TQString&)),
-             this, TQT_SLOT(slotClearIfNeeded(const TQString&)) );
-    connect( &_dirWatch, TQT_SIGNAL(created(const TQString&)),
-             this, TQT_SLOT(slotClear()) );
-    connect( &_dirWatch, TQT_SIGNAL(deleted(const TQString&)),
-             this, TQT_SLOT(slotClear()) );
+    connect( &_dirWatch, TQ_SIGNAL(dirty(const TQString&)),
+             this, TQ_SLOT(slotClearIfNeeded(const TQString&)) );
+    connect( &_dirWatch, TQ_SIGNAL(created(const TQString&)),
+             this, TQ_SLOT(slotClear()) );
+    connect( &_dirWatch, TQ_SIGNAL(deleted(const TQString&)),
+             this, TQ_SLOT(slotClear()) );
 
     kdDebug() << "PanelBrowserMenu Constructor " << path << endl;
 }
@@ -151,9 +151,9 @@ void PanelBrowserMenu::initialize()
        insertTitle(path());
        TDEConfig *c = TDEGlobal::config();
        c->setGroup("menus");
-       insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager()));
+       insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQ_SLOT(slotOpenFileManager()));
 	if (kapp->authorize("shell_access") && KickerSettings::showOpenInTerminal())
-	    insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQT_SLOT(slotOpenTerminal()));
+	    insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQ_SLOT(slotOpenTerminal()));
     	insertSeparator();
     }
 
@@ -334,7 +334,7 @@ void PanelBrowserMenu::initialize()
         if(!_mimecheckTimer)
             _mimecheckTimer = new TQTimer(this, "_mimecheckTimer");
 
-        connect(_mimecheckTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMimeCheck()));
+        connect(_mimecheckTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMimeCheck()));
         _mimecheckTimer->start(0);
     }
 }
@@ -380,7 +380,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e)
 {
     TQPopupMenu::mouseMoveEvent(e);
 
-    if (!(e->state() & Qt::LeftButton)) return;
+    if (!(e->state() & TQt::LeftButton)) return;
     if(_lastpress == TQPoint(-1, -1)) return;
 
     // DND delay
@@ -398,7 +398,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e)
     url.setPath(path() + "/" + _filemap[id]);
     KURL::List files(url);
     KURLDrag *d = new KURLDrag(files, this);
-    connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed()));
+    connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDragObjectDestroyed()));
     d->setPixmap(iconSet(id)->pixmap());
     d->drag();
 }
@@ -422,7 +422,7 @@ void PanelBrowserMenu::dragEnterEvent( TQDragEnterEvent *ev )
 
 void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev)
 {
-    TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), Qt::NoButton, Qt::LeftButton);
+    TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), TQt::NoButton, TQt::LeftButton);
     TQPopupMenu::mouseMoveEvent(&mev);
 }
 
diff --git a/kicker/kicker/ui/browser_mnu.h b/kicker/kicker/ui/browser_mnu.h
index 38f9b9690..1359e855e 100644
--- a/kicker/kicker/ui/browser_mnu.h
+++ b/kicker/kicker/ui/browser_mnu.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class PanelBrowserMenu : public KPanelMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelBrowserMenu(TQString path, TQWidget *parent = 0, const char *name = 0, int startid = 0);
diff --git a/kicker/kicker/ui/clicklineedit.h b/kicker/kicker/ui/clicklineedit.h
index 85efcada8..22dc8f904 100644
--- a/kicker/kicker/ui/clicklineedit.h
+++ b/kicker/kicker/ui/clicklineedit.h
@@ -35,7 +35,7 @@ namespace KPIM {
 */
 class KDE_EXPORT ClickLineEdit : public KLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     ClickLineEdit( TQWidget *parent, const TQString &msg = TQString::null, const char* name = 0 );
     ~ClickLineEdit();
diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp
index 0ad2107d1..8a69f0749 100644
--- a/kicker/kicker/ui/client_mnu.cpp
+++ b/kicker/kicker/ui/client_mnu.cpp
@@ -46,13 +46,13 @@ void KickerClientMenu::clear()
 
 void KickerClientMenu::insertItem( TQPixmap icon, TQString text, int id )
 {
-    int globalid = TQPopupMenu::insertItem( icon, text, this, TQT_SLOT( slotActivated(int) ) );
+    int globalid = TQPopupMenu::insertItem( icon, text, this, TQ_SLOT( slotActivated(int) ) );
     setItemParameter( globalid, id );
 }
 
 void KickerClientMenu::insertItem( TQString text, int id )
 {
-    int globalid = TQPopupMenu::insertItem( text, this, TQT_SLOT( slotActivated(int) ) );
+    int globalid = TQPopupMenu::insertItem( text, this, TQ_SLOT( slotActivated(int) ) );
     setItemParameter( globalid, id );
 }
 
diff --git a/kicker/kicker/ui/client_mnu.h b/kicker/kicker/ui/client_mnu.h
index 272f6364f..c1884469d 100644
--- a/kicker/kicker/ui/client_mnu.h
+++ b/kicker/kicker/ui/client_mnu.h
@@ -40,7 +40,7 @@ class PanelKMenu;
  */
 class KickerClientMenu : public TQPopupMenu, DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KickerClientMenu( TQWidget *parent=0, const char *name=0);
     ~KickerClientMenu();
diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp
index 07caa2b55..6861ba988 100644
--- a/kicker/kicker/ui/exe_dlg.cpp
+++ b/kicker/kicker/ui/exe_dlg.cpp
@@ -68,14 +68,14 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio
 
     updateIcon();
 
-    connect(ui->m_exec, TQT_SIGNAL(urlSelected(const TQString &)),
-            this, TQT_SLOT(slotSelect(const TQString &)));
-    connect(ui->m_exec, TQT_SIGNAL(textChanged(const TQString &)),
-            this, TQT_SLOT(slotTextChanged(const TQString &)));
-    connect(ui->m_exec, TQT_SIGNAL(returnPressed()),
-            this, TQT_SLOT(slotReturnPressed()));
-    connect(ui->m_icon, TQT_SIGNAL(iconChanged(TQString)),
-            this, TQT_SLOT(slotIconChanged(TQString)));
+    connect(ui->m_exec, TQ_SIGNAL(urlSelected(const TQString &)),
+            this, TQ_SLOT(slotSelect(const TQString &)));
+    connect(ui->m_exec, TQ_SIGNAL(textChanged(const TQString &)),
+            this, TQ_SLOT(slotTextChanged(const TQString &)));
+    connect(ui->m_exec, TQ_SIGNAL(returnPressed()),
+            this, TQ_SLOT(slotReturnPressed()));
+    connect(ui->m_icon, TQ_SIGNAL(iconChanged(TQString)),
+            this, TQ_SLOT(slotIconChanged(TQString)));
 
     // leave decent space for the commandline
     resize(sizeHint().width() > 300 ? sizeHint().width() : 300,
diff --git a/kicker/kicker/ui/exe_dlg.h b/kicker/kicker/ui/exe_dlg.h
index ef96fe9d0..669e98a61 100644
--- a/kicker/kicker/ui/exe_dlg.h
+++ b/kicker/kicker/ui/exe_dlg.h
@@ -29,7 +29,7 @@ class NonKDEButtonSettings;
 
 class PanelExeDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PanelExeDialog(const TQString& title, const TQString& description,
                    const TQString &path, const TQString &pixmap=TQString::null,
diff --git a/kicker/kicker/ui/flipscrollview.cpp b/kicker/kicker/ui/flipscrollview.cpp
index ae96ebcaa..e2e19d406 100644
--- a/kicker/kicker/ui/flipscrollview.cpp
+++ b/kicker/kicker/ui/flipscrollview.cpp
@@ -101,20 +101,20 @@ FlipScrollView::FlipScrollView( TQWidget * parent, const char * name )
     addChild( mRightView );
 
     mTimer = new TQTimer( this, "mTimer" );
-    connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotScrollTimer() ) );
-
-    connect( mLeftView, TQT_SIGNAL( startService(KService::Ptr) ),
-             TQT_SIGNAL( startService(KService::Ptr) ) );
-    connect( mLeftView, TQT_SIGNAL( startURL(const TQString& ) ),
-             TQT_SIGNAL( startURL(const TQString& ) ) );
-    connect( mLeftView, TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ),
-             TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) );
-    connect( mRightView, TQT_SIGNAL( startService(KService::Ptr) ),
-             TQT_SIGNAL( startService(KService::Ptr) ) );
-    connect( mRightView, TQT_SIGNAL( startURL(const TQString& ) ),
-             TQT_SIGNAL( startURL(const TQString& ) ) );
-    connect( mRightView, TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ),
-             TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) );
+    connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotScrollTimer() ) );
+
+    connect( mLeftView, TQ_SIGNAL( startService(KService::Ptr) ),
+             TQ_SIGNAL( startService(KService::Ptr) ) );
+    connect( mLeftView, TQ_SIGNAL( startURL(const TQString& ) ),
+             TQ_SIGNAL( startURL(const TQString& ) ) );
+    connect( mLeftView, TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ),
+             TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) );
+    connect( mRightView, TQ_SIGNAL( startService(KService::Ptr) ),
+             TQ_SIGNAL( startService(KService::Ptr) ) );
+    connect( mRightView, TQ_SIGNAL( startURL(const TQString& ) ),
+             TQ_SIGNAL( startURL(const TQString& ) ) );
+    connect( mRightView, TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ),
+             TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) );
 
     // wild hack to make sure it has correct width
     mLeftView->setVScrollBarMode( TQScrollView::AlwaysOn );
@@ -124,7 +124,7 @@ FlipScrollView::FlipScrollView( TQWidget * parent, const char * name )
 
     mBackrow = new BackFrame( this );
     mBackrow->resize( 24, 100 );
-    connect( mBackrow, TQT_SIGNAL( clicked() ), TQT_SIGNAL( backButtonClicked() ) );
+    connect( mBackrow, TQ_SIGNAL( clicked() ), TQ_SIGNAL( backButtonClicked() ) );
 }
 
 ItemView* FlipScrollView::prepareRightMove()
diff --git a/kicker/kicker/ui/flipscrollview.h b/kicker/kicker/ui/flipscrollview.h
index d2de2ab5e..6ba2615b3 100644
--- a/kicker/kicker/ui/flipscrollview.h
+++ b/kicker/kicker/ui/flipscrollview.h
@@ -51,7 +51,7 @@ class ItemView;
 
 class BackFrame : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     BackFrame( TQWidget *parent );
@@ -71,7 +71,7 @@ private:
 
 class FlipScrollView : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum State{ StoppedLeft, StoppedRight, ScrollingLeft, ScrollingRight };
     FlipScrollView( TQWidget * parent = 0, const char * name = 0 );
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 971679359..3107fe17a 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -34,12 +34,12 @@
 HideButton::HideButton(TQWidget *parent, const char *name)
     : TQButton(parent, name),
       m_highlight(false),
-      m_arrow(Qt::LeftArrow)
+      m_arrow(TQt::LeftArrow)
 {
     setBackgroundOrigin(AncestorOrigin);
 
-    connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
-    connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int)));
+    connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+    connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)));
 
     kapp->addKipcEventMask(KIPC::SettingsChanged);
     kapp->addKipcEventMask(KIPC::IconChanged);
@@ -49,22 +49,22 @@ HideButton::HideButton(TQWidget *parent, const char *name)
 
 void HideButton::drawButton(TQPainter *p)
 {
-    if (m_arrow == Qt::LeftArrow)
+    if (m_arrow == TQt::LeftArrow)
     {
         p->setPen(colorGroup().mid());
         p->drawLine(width()-1, 0, width()-1, height());
     }
-    else if (m_arrow == Qt::RightArrow)
+    else if (m_arrow == TQt::RightArrow)
     {
         p->setPen(colorGroup().mid());
         p->drawLine(0, 0, 0, height());
     }
-    else if (m_arrow == Qt::UpArrow)
+    else if (m_arrow == TQt::UpArrow)
     {
         p->setPen(colorGroup().mid());
         p->drawLine(0, height()-1, width(), height()-1);
     }
-    else if (m_arrow == Qt::DownArrow)
+    else if (m_arrow == TQt::DownArrow)
     {
         p->setPen(colorGroup().mid());
         p->drawLine(0, 0, width(), 0);
@@ -106,24 +106,24 @@ void HideButton::setPixmap(const TQPixmap &pix)
     generateIcons();
 }
 
-void HideButton::setArrowType(Qt::ArrowType arrow)
+void HideButton::setArrowType(TQt::ArrowType arrow)
 {
     m_arrow = arrow;
     switch (arrow)
     {
-        case Qt::LeftArrow:
+        case TQt::LeftArrow:
             setPixmap(SmallIcon("1leftarrow"));
         break;
 
-        case Qt::RightArrow:
+        case TQt::RightArrow:
             setPixmap(SmallIcon("1rightarrow"));
         break;
 
-        case Qt::UpArrow:
+        case TQt::UpArrow:
             setPixmap(SmallIcon("1uparrow"));
         break;
 
-        case Qt::DownArrow:
+        case TQt::DownArrow:
         default:
             setPixmap(SmallIcon("1downarrow"));
         break;
@@ -138,7 +138,7 @@ void HideButton::generateIcons()
     }
 
     TQImage image = pixmap()->convertToImage();
-    image = image.smoothScale(size() - TQSize(4, 4), TQ_ScaleMin);
+    image = image.smoothScale(size() - TQSize(4, 4), TQImage::ScaleMin);
 
     TDEIconEffect effect;
 
diff --git a/kicker/kicker/ui/hidebutton.h b/kicker/kicker/ui/hidebutton.h
index c73c25ba7..c8c754857 100644
--- a/kicker/kicker/ui/hidebutton.h
+++ b/kicker/kicker/ui/hidebutton.h
@@ -25,11 +25,11 @@
 
 class HideButton : public TQButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     HideButton(TQWidget *parent, const char *name = 0);
-    void setArrowType(Qt::ArrowType arrow);
+    void setArrowType(TQt::ArrowType arrow);
     void setPixmap(const TQPixmap &pix);
 
   protected:
@@ -44,7 +44,7 @@ class HideButton : public TQButton
     bool m_highlight;
     TQPixmap m_normalIcon;
     TQPixmap m_activeIcon;
-    Qt::ArrowType m_arrow;
+    TQt::ArrowType m_arrow;
 
   protected slots:
     void slotSettingsChanged( int category );
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 4ca9acb81..155584ab9 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -158,12 +158,12 @@ void KMenuItem::setup()
     float min_font_size = 7. * TQMAX(1., TDEGlobalSettings::generalFont().pointSizeFloat() / 10.);
 
     const int expected_height = 38;
-    description_font_size = TQMAX( pointSize( expected_height * .3, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ;
-    title_font_size = TQMAX( pointSize( expected_height * .25, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 );
+    description_font_size = TQMAX( pointSize( expected_height * .3, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ;
+    title_font_size = TQMAX( pointSize( expected_height * .25, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 );
 
     //kdDebug() << description_font_size << " " << title_font_size << " " << pointSize( expected_height * .25, listView() ) << endl;
     TQListViewItem::setup();
-    setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, TQT_TQPAINTDEVICE(listView()))));
+    setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, listView())));
 }
 
 void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align)
@@ -278,7 +278,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column
     if ( m_description.isEmpty() )
         spacing = ( height() - f1h ) / 2;
 
-    int right_triangle_size = pixelSize( 7, TQT_TQPAINTDEVICE(listView()) );
+    int right_triangle_size = pixelSize( 7, listView() );
 
     int right_margin = listView()->verticalScrollBar()->width();
     if ( m_has_children )
@@ -531,7 +531,7 @@ void KMenuItemHeader::paintCell(TQPainter* p, const TQColorGroup & cg, int , int
     int r = left_margin + margin * 2;
 
     const int min_font_size = 7;
-    int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), TQT_TQPAINTDEVICE(listView()) ) );
+    int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), listView() ) );
 
     TQFont f1 = p->font();
     f1.setPixelSize( title_font_pixelSize );
@@ -635,16 +635,16 @@ ItemView::ItemView(TQWidget* parent, const char* name)
     setItemMargin(0);
     setSorting(-1);
     setTreeStepSize(38);
-    setFocusPolicy(TQ_NoFocus);
+    setFocusPolicy(TQWidget::NoFocus);
 
     m_lastOne = 0;
     m_old_contentY = -1;
 
-    connect(this, TQT_SIGNAL(mouseButtonClicked( int, TQListViewItem*, const TQPoint &, int )),
-                  TQT_SLOT(slotItemClicked(int, TQListViewItem*, const TQPoint &, int)));
+    connect(this, TQ_SIGNAL(mouseButtonClicked( int, TQListViewItem*, const TQPoint &, int )),
+                  TQ_SLOT(slotItemClicked(int, TQListViewItem*, const TQPoint &, int)));
 
-    connect(this, TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*)));
-    connect(this, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*)));
+    connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*)));
+    connect(this, TQ_SIGNAL(spacePressed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*)));
 
     new ItemViewTip( viewport(), this );
 }
@@ -944,14 +944,14 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e)
     if (m_mouseMoveSelects) {
       if(i && i->isEnabled() && !i->isSelected() &&
          // FIXME: This is wrong if you drag over the items.
-         (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0)
+         (e->state() & (TQt::LeftButton|TQt::MidButton|TQt::RightButton)) == 0)
           TDEListView::setSelected(i, true);
       else if (!i && selectedItem())
           TDEListView::setSelected(selectedItem(), false);
     }
 
     if ( link_cursor )
-        setCursor( Qt::PointingHandCursor );
+        setCursor( TQt::PointingHandCursor );
     else
         unsetCursor();
 
@@ -999,7 +999,7 @@ void ItemView::contentsWheelEvent(TQWheelEvent *e)
 
     if(i && i->isEnabled() && !i->isSelected() &&
        // FIXME: This is wrong if you drag over the items.
-       (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0)
+       (e->state() & (TQt::LeftButton|TQt::MidButton|TQt::RightButton)) == 0)
         TDEListView::setSelected(i, true);
     else if (!i && selectedItem())
         TDEListView::setSelected(selectedItem(), false);
@@ -1029,7 +1029,7 @@ TQDragObject * ItemView::dragObject()
           mask = *pix.mask();
       else {
 	  mask.resize(pix.size());
-	  mask.fill(Qt::color1);
+	  mask.fill(TQt::color1);
       }
 
       bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.mask(), 0, 0, add.width(), add.height(), OrROP );
diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h
index 27807c939..bab0142c2 100644
--- a/kicker/kicker/ui/itemview.h
+++ b/kicker/kicker/ui/itemview.h
@@ -156,7 +156,7 @@ class ItemView : public TDEListView
 {
     friend class KMenuItem;
 
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ItemView(TQWidget* parent, const char* name = 0);
 
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index b99d6e3ba..768056473 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -87,8 +87,8 @@ PanelKMenu::PanelKMenu()
     disableAutoClear();
     actionCollection = new TDEActionCollection(this);
     setCaption(i18n("TDE Menu"));
-    connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
-            this, TQT_SLOT(configChanged()));
+    connect(Kicker::the(), TQ_SIGNAL(configurationChanged()),
+            this, TQ_SLOT(configChanged()));
     DCOPClient *dcopClient = TDEApplication::dcopClient();
     dcopClient->connectDCOPSignal(0, "appLauncher",
         "serviceStartedByStorageId(TQString,TQString)",
@@ -96,7 +96,7 @@ PanelKMenu::PanelKMenu()
         "slotServiceStartedByStorageId(TQString,TQString)",
         false);
     displayRepairTimer = new TQTimer( this );
-    connect( displayRepairTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repairDisplay()) );
+    connect( displayRepairTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(repairDisplay()) );
 }
 
 PanelKMenu::~PanelKMenu()
@@ -122,15 +122,12 @@ void PanelKMenu::hideMenu()
 {
     hide();
 
-#ifdef USE_QT4
-    // The hacks below aren't needed any more because Qt4 supports true transparency for the fading logout screen
-#else // USE_QT4
     // Try to redraw the area under the menu
     // Qt makes this surprisingly difficult to do in a timely fashion!
     while (isShown() == true)
         kapp->eventLoop()->processEvents(1000);
     TQTimer *windowtimer = new TQTimer( this );
-    connect( windowtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) );
+    connect( windowtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) );
     windowTimerTimedOut = false;
     windowtimer->start( 0, TRUE );	// Wait for all window system events to be processed
     while (windowTimerTimedOut == false)
@@ -143,12 +140,11 @@ void PanelKMenu::hideMenu()
     // thereby removing a bad shutdown screen artifact while still providing
     // a somewhat snappy user interface.
     TQTimer *delaytimer = new TQTimer( this );
-    connect( delaytimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) );
+    connect( delaytimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) );
     windowTimerTimedOut = false;
     delaytimer->start( 100, TRUE );	// Wait for 100 milliseconds
     while (windowTimerTimedOut == false)
         kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
-#endif // USE_QT4
 }
 
 void PanelKMenu::windowClearTimeout()
@@ -251,10 +247,10 @@ void PanelKMenu::initialize()
     if (loadSidePixmap())
     {
         // in case we've been through here before, let's disconnect
-        disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
-                   this, TQT_SLOT(paletteChanged()));
-        connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
-                this, TQT_SLOT(paletteChanged()));
+        disconnect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+                   this, TQ_SLOT(paletteChanged()));
+        connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+                this, TQ_SLOT(paletteChanged()));
     }
     else
     {
@@ -287,16 +283,16 @@ void PanelKMenu::initialize()
 	}
         searchEdit = new KPIM::ClickLineEdit( hbox, placeholder );
 
-        hbox->setFocusPolicy(TQ_StrongFocus);
+        hbox->setFocusPolicy(TQWidget::StrongFocus);
         hbox->setFocusProxy(searchEdit);
         hbox->setSpacing( 3 );
-        connect(clearButton, TQT_SIGNAL(clicked()), searchEdit, TQT_SLOT(clear()));
-        connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClearSearch()));
-        connect(searchEdit, TQT_SIGNAL(textChanged(const TQString&)),
-            this, TQT_SLOT( slotUpdateSearch( const TQString&)));
+        connect(clearButton, TQ_SIGNAL(clicked()), searchEdit, TQ_SLOT(clear()));
+        connect(this, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotClearSearch()));
+        connect(searchEdit, TQ_SIGNAL(textChanged(const TQString&)),
+            this, TQ_SLOT( slotUpdateSearch( const TQString&)));
 	accel->insert("search", i18n("Search"), i18n("TDE Menu search"),
 		      TDEShortcut(KickerSettings::searchShortcut()),
-		      this, TQT_SLOT(slotFocusSearch()));
+		      this, TQ_SLOT(slotFocusSearch()));
 		      
         insertItem(hbox, searchLineID, 0);
     } else {
@@ -394,7 +390,7 @@ void PanelKMenu::initialize()
         insertItem(KickerLib::menuIconSet("system-run"),
                    i18n("Run Command..."),
                    this,
-                   TQT_SLOT( slotRunCommand()));
+                   TQ_SLOT( slotRunCommand()));
         insertSeparator();
     }
 
@@ -402,8 +398,8 @@ void PanelKMenu::initialize()
     {
         sessionsMenu = new TQPopupMenu( this );
         insertItem(KickerLib::menuIconSet("switchuser"), i18n("Switch User"), sessionsMenu);
-        connect( sessionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotPopulateSessions()) );
-        connect( sessionsMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSessionActivated(int)) );
+        connect( sessionsMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotPopulateSessions()) );
+        connect( sessionsMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSessionActivated(int)) );
     }
 
     /*
@@ -413,17 +409,17 @@ void PanelKMenu::initialize()
     ksmserver.setGroup("General");
     if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession")
     {
-        insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQT_SLOT(slotSaveSession()));
+        insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQ_SLOT(slotSaveSession()));
     }
 
     if (kapp->authorize("lock_screen"))
     {
-        insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQT_SLOT(slotLock()));
+        insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQ_SLOT(slotLock()));
     }
 
     if (kapp->authorize("logout"))
     {
-        insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQT_SLOT(slotLogout()));
+        insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQ_SLOT(slotLogout()));
     }
 
 #if 0
@@ -532,7 +528,7 @@ void PanelKMenu::slotSessionActivated( int ent )
 void PanelKMenu::doNewSession( bool lock )
 {
     int result = KMessageBox::warningContinueCancel(
-        TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))),
+        kapp->desktop()->screen(kapp->desktop()->screenNumber(this)),
         i18n("<p>You have chosen to open another desktop session.<br>"
                "The current session will be hidden "
                "and a new login screen will be displayed.<br>"
@@ -659,7 +655,7 @@ void PanelKMenu::paintEvent(TQPaintEvent * e)
     TQPainter p(this);
     p.setClipRegion(e->region());
 
-    style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
+    style().drawPrimitive( TQStyle::PE_PanelPopup, &p,
                            TQRect( 0, 0, width(), height() ),
                            colorGroup(), TQStyle::Style_Default,
                            TQStyleOption( frameWidth(), 0 ) );
@@ -730,7 +726,7 @@ void PanelKMenu::slotUpdateSearch(const TQString& searchString)
 void PanelKMenu::slotClearSearch()
 {
     if (searchEdit && searchEdit->text().isEmpty() == false) {
-        TQTimer::singleShot(0, searchEdit, TQT_SLOT(clear()));
+        TQTimer::singleShot(0, searchEdit, TQ_SLOT(clear()));
     }
 }
 
diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h
index cf5a1917b..bb2056590 100644
--- a/kicker/kicker/ui/k_mnu.h
+++ b/kicker/kicker/ui/k_mnu.h
@@ -45,7 +45,7 @@ class Panel;
 
 class PanelKMenu : public PanelServiceMenu, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 k_dcop:
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 712868adb..834086f33 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -31,6 +31,11 @@
 #include <dmctl.h>
 #include <inttypes.h>
 
+#ifdef Q_OS_SOLARIS
+#include <sys/statvfs.h>
+#define statfs statvfs
+#endif /* Q_OS_SOLARIS */
+
 #include <tqimage.h>
 #include <tqpainter.h>
 #include <tqstyle.h>
@@ -201,15 +206,15 @@ KMenu::KMenu()
     m_iconName(TQString()),  m_orientation(UnDetermined), m_search_plugin( 0 )
 {
     setMouseTracking(true);
-    connect(&m_sloppyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotSloppyTimeout()));
+    connect(&m_sloppyTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotSloppyTimeout()));
 
     // set the first client id to some arbitrarily large value.
     client_id = 10000;
     // Don't automatically clear the main menu.
     actionCollection = new TDEActionCollection(this);
 
-    connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
-            this, TQT_SLOT(configChanged()));
+    connect(Kicker::the(), TQ_SIGNAL(configurationChanged()),
+            this, TQ_SLOT(configChanged()));
 
     KUser * user = new KUser();
 
@@ -223,7 +228,7 @@ KMenu::KMenu()
     setupUi();
 
     m_userInfo->setBackgroundMode( PaletteBase );
-    TQColor userInfoColor = TQApplication::palette().color( TQPalette::Normal, TQColorGroup::Mid );
+    TQColor userInfoColor = TQApplication::palette().color( TQPalette::Active, TQColorGroup::Mid );
     if ( tqGray( userInfoColor.rgb() ) > 120 )
         userInfoColor = userInfoColor.dark( 200 );
     else
@@ -231,7 +236,7 @@ KMenu::KMenu()
     m_userInfo->setPaletteForegroundColor( userInfoColor );
 
     m_tabBar = new KickoffTabBar(this, "m_tabBar");
-    connect(m_tabBar, TQT_SIGNAL(tabClicked(TQTab*)), TQT_SLOT(tabClicked(TQTab*)));
+    connect(m_tabBar, TQ_SIGNAL(tabClicked(TQTab*)), TQ_SLOT(tabClicked(TQTab*)));
 
     const int tab_icon_size = 32;
 
@@ -279,8 +284,8 @@ KMenu::KMenu()
 	m_tabs[LeaveTab]->setIconSet(BarIcon("leave", tab_icon_size));
     }
 
-    connect(m_tabBar, TQT_SIGNAL(selected(int)), m_stacker, TQT_SLOT(raiseWidget(int)));
-    connect(m_stacker, TQT_SIGNAL(aboutToShow(int)), m_tabBar, TQT_SLOT(setCurrentTab(int)));
+    connect(m_tabBar, TQ_SIGNAL(selected(int)), m_stacker, TQ_SLOT(raiseWidget(int)));
+    connect(m_stacker, TQ_SIGNAL(aboutToShow(int)), m_tabBar, TQ_SLOT(setCurrentTab(int)));
 
     m_favoriteView = new FavoritesItemView (m_stacker, "m_favoriteView");
     m_favoriteView->setAcceptDrops(true);
@@ -295,11 +300,11 @@ KMenu::KMenu()
 
     m_browserView = new FlipScrollView(m_stacker, "m_browserView");
     m_stacker->addWidget(m_browserView, ApplicationsTab);
-    connect( m_browserView, TQT_SIGNAL( backButtonClicked() ), TQT_SLOT( slotGoBack() ) );
+    connect( m_browserView, TQ_SIGNAL( backButtonClicked() ), TQ_SLOT( slotGoBack() ) );
 
     m_exitView = new FlipScrollView(m_stacker, "m_exitView");
     m_stacker->addWidget(m_exitView, LeaveTab);
-    connect( m_exitView, TQT_SIGNAL( backButtonClicked() ), TQT_SLOT( slotGoExitMainMenu() ) );
+    connect( m_exitView, TQ_SIGNAL( backButtonClicked() ), TQ_SLOT( slotGoExitMainMenu() ) );
 
     m_searchWidget = new TQVBox (m_stacker, "m_searchWidget");
     m_searchWidget->setSpacing(0);
@@ -326,7 +331,7 @@ KMenu::KMenu()
     m_searchResultsWidget->setItemMargin(4);
 //    m_searchResultsWidget->setIconSize(16);
     m_searchActions = new ItemView (m_searchWidget, "m_searchActions");
-    m_searchActions->setFocusPolicy(TQ_NoFocus);
+    m_searchActions->setFocusPolicy(TQWidget::NoFocus);
     m_searchActions->setItemMargin(4);
     m_searchInternet = new TQListViewItem(m_searchActions, i18n("Search Internet"));
     m_searchInternet->setPixmap(0,icon);
@@ -336,40 +341,40 @@ KMenu::KMenu()
 
     m_searchActions->setMaximumHeight(5+m_searchInternet->height());
 
-    connect(m_searchActions, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*)));
-    connect(m_searchActions, TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*)));
-    connect(m_searchActions, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*)));
+    connect(m_searchActions, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*)));
+    connect(m_searchActions, TQ_SIGNAL(returnPressed(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*)));
+    connect(m_searchActions, TQ_SIGNAL(spacePressed(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*)));
 
-    connect(m_searchResultsWidget, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr)));
-    connect(m_searchResultsWidget, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&)));
-    connect(m_searchResultsWidget, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+    connect(m_searchResultsWidget, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr)));
+    connect(m_searchResultsWidget, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&)));
+    connect(m_searchResultsWidget, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
 
-    connect(m_recentlyView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr)));
-    connect(m_recentlyView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&)));
-    connect(m_recentlyView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int  )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+    connect(m_recentlyView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr)));
+    connect(m_recentlyView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&)));
+    connect(m_recentlyView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int  )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
 
-    connect(m_favoriteView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr)));
-    connect(m_favoriteView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&)));
-    connect(m_favoriteView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int  )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
-    connect(m_favoriteView, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), TQT_SLOT(slotFavoritesMoved( TQListViewItem*, TQListViewItem*, TQListViewItem* )));
+    connect(m_favoriteView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr)));
+    connect(m_favoriteView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&)));
+    connect(m_favoriteView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int  )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+    connect(m_favoriteView, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), TQ_SLOT(slotFavoritesMoved( TQListViewItem*, TQListViewItem*, TQListViewItem* )));
 
-    connect(m_systemView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&)));
-    connect(m_systemView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr)));
-    connect(m_systemView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+    connect(m_systemView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&)));
+    connect(m_systemView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr)));
+    connect(m_systemView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
 
-    connect(m_browserView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotGoSubMenu(const TQString&)));
-    connect(m_browserView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr)));
-    connect(m_browserView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+    connect(m_browserView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotGoSubMenu(const TQString&)));
+    connect(m_browserView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr)));
+    connect(m_browserView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
 
-    connect(m_exitView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&)));
-    connect(m_exitView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+    connect(m_exitView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&)));
+    connect(m_exitView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
 
     m_kcommand->setDuplicatesEnabled( false );
     m_kcommand->setLineEdit(new KLineEdit(m_kcommand, "m_kcommand-lineedit"));
     m_kcommand->setCompletionMode( TDEGlobalSettings::CompletionAuto );
-    connect(m_kcommand, TQT_SIGNAL(cleared()), TQT_SLOT(clearedHistory()));
-    connect(m_kcommand->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(searchAccept()));
-    connect(m_kcommand->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(searchChanged(const TQString &)));
+    connect(m_kcommand, TQ_SIGNAL(cleared()), TQ_SLOT(clearedHistory()));
+    connect(m_kcommand->lineEdit(), TQ_SIGNAL(returnPressed()), TQ_SLOT(searchAccept()));
+    connect(m_kcommand->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(searchChanged(const TQString &)));
 
     // URI Filter meta object...
     m_filterData = new KURIFilterData();
@@ -378,14 +383,14 @@ KMenu::KMenu()
     categorised_hit_total = new int [num_categories];
 
     input_timer = new TQTimer (this, "input_timer");
-    connect( input_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doQuery()) );
+    connect( input_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doQuery()) );
 
     init_search_timer = new TQTimer (this, "init_search_timer");
-    connect( init_search_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initSearch()) );
+    connect( init_search_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(initSearch()) );
     init_search_timer->start(2000, true);
 
-    connect( m_favoriteView, TQT_SIGNAL( dropped (TQDropEvent *, TQListViewItem * ) ),
-             TQT_SLOT( slotFavDropped( TQDropEvent *, TQListViewItem * ) ) );
+    connect( m_favoriteView, TQ_SIGNAL( dropped (TQDropEvent *, TQListViewItem * ) ),
+             TQ_SLOT( slotFavDropped( TQDropEvent *, TQListViewItem * ) ) );
 
     this->installEventFilter(this);
     m_tabBar->installEventFilter(this);
@@ -445,10 +450,10 @@ void KMenu::setupUi()
     m_stacker->setGeometry( TQRect( 90, 260, 320, 220 ) );
     m_stacker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) );
     m_stacker->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) );
-   // m_stacker->setFocusPolicy( TQ_StrongFocus );
+   // m_stacker->setFocusPolicy( TQWidget::StrongFocus );
     m_stacker->setLineWidth( 0 );
-    m_stacker->setFocusPolicy(TQ_NoFocus);
-    connect(m_stacker, TQT_SIGNAL(aboutToShow(TQWidget*)), TQT_SLOT(stackWidgetRaised(TQWidget*)));
+    m_stacker->setFocusPolicy(TQWidget::NoFocus);
+    connect(m_stacker, TQ_SIGNAL(aboutToShow(TQWidget*)), TQ_SLOT(stackWidgetRaised(TQWidget*)));
 
     m_kcommand->setName("m_kcommand");
 }
@@ -475,16 +480,16 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
         TQPoint p;
 
         if (e->type() == TQEvent::MouseMove || e->type() == TQEvent::MouseButtonPress) {
-            TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
+            TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
             p = me->globalPos();
         }
         else if (e->type() == TQEvent::Wheel) {
-            TQWheelEvent* we = TQT_TQWHEELEVENT(e);
+            TQWheelEvent* we = static_cast<TQWheelEvent*>(e);
             p = we->globalPos();
         }
 
         while (receiver) {
-            if (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_tabBar) && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) {
+            if (receiver == m_tabBar && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) {
                 TQTab* s = m_tabBar->selectTab(m_tabBar->mapFromGlobal(p));
                 if (s && s->identifier() == ApplicationsTab)
                     raiseWidget = m_browserView;
@@ -504,8 +509,8 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
 
             /* we do not want hover activation for the search line edit as this can be
              * pretty disturbing */
-            if ( (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchPixmap) ||
-                 ( ( TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchLabel) || TQT_BASE_OBJECT(receiver)==TQT_BASE_OBJECT(m_kcommand->lineEdit()) ) &&
+            if ( (receiver == m_searchPixmap ||
+                 ( ( receiver == m_searchLabel || receiver==m_kcommand->lineEdit() ) &&
                  ( e->type() == TQEvent::KeyPress || e->type() == TQEvent::Wheel
                    || e->type() == TQEvent::MouseButtonPress ) ) ) &&
                     !m_isShowing) {
@@ -517,25 +522,25 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
             if(raiseWidget)
                 break;
             if(receiver->isWidgetType())
-                receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->parentWidget(true));
+                receiver = static_cast<TQWidget*>(receiver)->parentWidget(true);
             else
                 break;
         }
 
         if (e->type() == TQEvent::FocusIn && receiver && raiseWidget) {
-            m_searchResultsWidget->setFocusPolicy(TQ_StrongFocus);
+            m_searchResultsWidget->setFocusPolicy(TQWidget::StrongFocus);
             m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ?
-                    TQ_StrongFocus : TQ_NoFocus);
+                    TQWidget::StrongFocus : TQWidget::NoFocus);
             setTabOrder(raiseWidget, m_searchResultsWidget);
             if (raiseWidget != m_stacker->visibleWidget()
-                && TQT_TQWIDGET(receiver)->focusPolicy() == TQ_NoFocus
+                && static_cast<TQWidget*>(receiver)->focusPolicy() == TQWidget::NoFocus
                 && m_stacker->id(raiseWidget) >= 0) {
 
                 m_stacker->raiseWidget(raiseWidget);
                 return true;
             }
 
-            if (raiseWidget->focusPolicy() != TQ_NoFocus)
+            if (raiseWidget->focusPolicy() != TQWidget::NoFocus)
                 return false;
         }
 
@@ -557,7 +562,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
     }
 
     if(e->type() == TQEvent::Enter && receiver->isWidgetType()) {
-	TQT_TQWIDGET(receiver)->setMouseTracking(true);
+	static_cast<TQWidget*>(receiver)->setMouseTracking(true);
         TQToolTip::hide();
     }
 
@@ -584,7 +589,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
         if (view)
         {
             bool handled = true;
-            switch (TQT_TQKEYEVENT(e)->key()) {
+            switch (static_cast<TQKeyEvent*>(e)->key()) {
                 case Key_Up:
                     if (view->selectedItem()) {
                         view->setSelected(view->selectedItem()->itemAbove(),true);
@@ -661,7 +666,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
         r = true;
     }
 
-    if (e->type() == TQEvent::Enter && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_stacker))
+    if (e->type() == TQEvent::Enter && receiver == m_stacker)
     {
         TQRect r(m_stacker->mapToGlobal(TQPoint(-8,-32)), m_stacker->size());
         r.setSize(r.size()+TQSize(16,128));
@@ -738,8 +743,8 @@ void KMenu::paintSearchTab( bool active )
 
         m_tabBar->deactivateTabs(true);
 
-        p.setBrush( Qt::white );
-        p.setPen( Qt::NoPen );
+        p.setBrush( TQt::white );
+        p.setPen( TQt::NoPen );
 
         if ( m_orientation == BottomUp ) {
             search_tab_center.convertFromImage( search_tab_center.convertToImage().scale(search_tab_center.width(), m_searchFrame->height()));
@@ -1220,17 +1225,17 @@ void KMenu::initialize()
     kdDebug(1210) << "KMenu::initialize()" << endl;
 
     // in case we've been through here before, let's disconnect
-    disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
-            this, TQT_SLOT(paletteChanged()));
-    connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
-            this, TQT_SLOT(paletteChanged()));
+    disconnect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+            this, TQ_SLOT(paletteChanged()));
+    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+            this, TQ_SLOT(paletteChanged()));
 
    /*
        If  the user configured ksmserver to
      */
     TDEConfig ksmserver("ksmserverrc", false, false);
     ksmserver.setGroup("General");
-    connect( m_branding, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenHomepage()));
+    connect( m_branding, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenHomepage()));
     m_tabBar->setTabEnabled(LeaveTab, kapp->authorize("logout"));
 
     // load search field history
@@ -1440,11 +1445,11 @@ void KMenu::insertStaticItems()
     m_systemView->insertItem( "network", i18n( "Network Folders" ),
                               "remote:/", "remote:/", nId++, index++ );
 
-    m_mediaWatcher = new MediaWatcher( TQT_TQOBJECT(this) );
-    connect( m_mediaWatcher, TQT_SIGNAL( mediumChanged() ), TQT_SLOT( updateMedia() ) );
+    m_mediaWatcher = new MediaWatcher( this );
+    connect( m_mediaWatcher, TQ_SIGNAL( mediumChanged() ), TQ_SLOT( updateMedia() ) );
     m_media_id = 0;
 
-    connect(&m_mediaFreeTimer, TQT_SIGNAL(timeout()), TQT_SLOT( updateMedia()));
+    connect(&m_mediaFreeTimer, TQ_SIGNAL(timeout()), TQ_SLOT( updateMedia()));
 }
 
 int KMenu::insertClientMenu(KickerClientMenu *)
@@ -1529,7 +1534,7 @@ void KMenu::slotSessionActivated( int ent )
 void KMenu::doNewSession( bool lock )
 {
     int result = KMessageBox::warningContinueCancel(
-        TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))),
+        kapp->desktop()->screen(kapp->desktop()->screenNumber(this)),
         i18n("<p>You have chosen to open another desktop session.<br>"
                "The current session will be hidden "
                "and a new login screen will be displayed.<br>"
@@ -1747,7 +1752,7 @@ void KMenu::setOrientation(MenuOrientation orientation)
 
     m_orientation=orientation;
 
-    m_resizeHandle->setCursor(m_orientation == BottomUp ? tqsizeBDiagCursor : tqsizeFDiagCursor);
+    m_resizeHandle->setCursor(m_orientation == BottomUp ? TQt::sizeBDiagCursor : TQt::sizeFDiagCursor);
 
     TQPixmap pix;
     if ( m_orientation == BottomUp )
@@ -1996,7 +2001,7 @@ void KMenu::createNewProgramList()
     m_seenPrograms = KickerSettings::firstSeenApps();
     m_newInstalledPrograms.clear();
 
-    m_currentDate = TQDate::currentDate().toString(Qt::ISODate);
+    m_currentDate = TQDate::currentDate().toString(TQt::ISODate);
 
     bool initialize = (m_seenPrograms.count() == 0);
 
@@ -2058,7 +2063,7 @@ void KMenu::createNewProgramList(TQString relPath)
                             else {
                                 ++it_find;
                                 if (*(it_find)!="-") {
-                                   TQDate date = TQDate::fromString(*(it_find),Qt::ISODate);
+                                   TQDate date = TQDate::fromString(*(it_find),TQt::ISODate);
                                    if (date.daysTo(TQDate::currentDate())<3) {
                                       if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end())
                                          m_newInstalledPrograms+=s->storageId();
@@ -2278,7 +2283,7 @@ TQString KMenu::insertBreaks(const TQString& text, TQFontMetrics fm, int width,
 void KMenu::clearSearchResults(bool showHelp)
 {
     m_searchResultsWidget->clear();
-    m_searchResultsWidget->setFocusPolicy(showHelp ? TQ_NoFocus : TQ_StrongFocus);
+    m_searchResultsWidget->setFocusPolicy(showHelp ? TQWidget::NoFocus : TQWidget::StrongFocus);
     setTabOrder(m_kcommand, m_searchResultsWidget);
 
     if (showHelp) {
@@ -2760,7 +2765,7 @@ void KMenu::slotStartURL(const TQString& u)
 
 void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos, int /*col*/ )
 {
-    const TQObject* source = TQT_TQOBJECT_CONST(sender());
+    const TQObject* source = sender();
 
     if (!item)
         return;
@@ -2790,12 +2795,12 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
     }
 
     m_popupMenu = new TDEPopupMenu(this);
-    connect(m_popupMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int)));
+    connect(m_popupMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContextMenu(int)));
     bool hasEntries = false;
 
     m_popupMenu->insertTitle(SmallIcon(kitem->icon()),kitem->title());
 
-     if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView))
+     if (source==m_favoriteView)
      {
          hasEntries = true;
          m_popupMenu->insertItem(SmallIconSet("remove"),
@@ -2827,7 +2832,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
          }
      }
 
-     if (TQT_BASE_OBJECT_CONST(source)!=TQT_BASE_OBJECT(m_exitView)) {
+     if (source!=m_exitView) {
         if (m_popupService || (!m_popupPath.path.startsWith("kicker:/") && !m_popupPath.path.startsWith("system:/") && !m_popupPath.path.startsWith("kaddressbook:/"))) {
             if (hasEntries)
                 m_popupMenu->insertSeparator();
@@ -2867,7 +2872,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                i18n("Put Into Run Dialog"), PutIntoRunDialog);
             }
         }
-        if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_searchResultsWidget) || ((TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView) || TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView) || TQT_BASE_OBJECT_CONST(source) == TQT_BASE_OBJECT(m_systemView)) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) {
+        if (source==m_searchResultsWidget || ((source==m_favoriteView || source==m_recentlyView || source == m_systemView) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) {
             TQString uri;
             if (m_popupService)
                 uri = locate("apps", m_popupService->desktopEntryPath());
@@ -2904,7 +2909,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
         }
     }
 
-    if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView)) {
+    if (source==m_recentlyView) {
        m_popupMenu->insertSeparator();
        if (m_popupService)
          m_popupMenu->insertItem(SmallIconSet("history_clear"),
@@ -2974,7 +2979,7 @@ void KMenu::slotContextMenu(int selected)
 	case EditItem:
         case EditMenu:
 	    accept();
-            proc = new TDEProcess(TQT_TQOBJECT(this));
+            proc = new TDEProcess(this);
             *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
             *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1);
             proc->start();
diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h
index e4ffe91fc..b0e18e7cb 100644
--- a/kicker/kicker/ui/k_new_mnu.h
+++ b/kicker/kicker/ui/k_new_mnu.h
@@ -78,7 +78,7 @@ enum OverflowCategoryState { None, Filling, NotNeeded };
 
 class KMenu : public KMenuBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY (bool TDEStyleMenuDropShadow READ useTDEStyleMenuDropShadow )
 
 public:
diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp
index c13bffe14..977ec1089 100644
--- a/kicker/kicker/ui/kickoff_bar.cpp
+++ b/kicker/kicker/ui/kickoff_bar.cpp
@@ -199,7 +199,7 @@ void KickoffTabBar::layoutTabs()
         int w = TQMAX(st.width() / count(), parentWidget()->width() / count());
 
         TQRect r = tab->rect();
-        tab->setRect(TQRect(TQPoint(x, 0), style().tqsizeFromContents(TQStyle::CT_TabBarTab, this,
+        tab->setRect(TQRect(TQPoint(x, 0), style().sizeFromContents(TQStyle::CT_TabBarTab, this,
                     TQSize(w, h), TQStyleOption(tab))));
         x += tab->rect().width() - overlap;
     }
@@ -223,7 +223,7 @@ void KickoffTabBar::dragMoveEvent(TQDragMoveEvent* event)
 
 void KickoffTabBar::mousePressEvent( TQMouseEvent * e )
 {
-    if ( e->button() != Qt::LeftButton ) {
+    if ( e->button() != TQt::LeftButton ) {
 	e->ignore();
 	return;
     }
diff --git a/kicker/kicker/ui/kickoff_bar.h b/kicker/kicker/ui/kickoff_bar.h
index 941f1144f..d5dcb8d3c 100644
--- a/kicker/kicker/ui/kickoff_bar.h
+++ b/kicker/kicker/ui/kickoff_bar.h
@@ -27,7 +27,7 @@
 
 class KickoffTabBar : public TQTabBar
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KickoffTabBar(TQWidget* parent, const char* name);
 
diff --git a/kicker/kicker/ui/media_watcher.h b/kicker/kicker/ui/media_watcher.h
index 604fcaabe..0f6cb6fae 100644
--- a/kicker/kicker/ui/media_watcher.h
+++ b/kicker/kicker/ui/media_watcher.h
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class MediaWatcher : public TQObject, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
     TQStringList m_devices;
diff --git a/kicker/kicker/ui/mykickoffsearchinterface.h b/kicker/kicker/ui/mykickoffsearchinterface.h
index b728718c4..4271766d8 100644
--- a/kicker/kicker/ui/mykickoffsearchinterface.h
+++ b/kicker/kicker/ui/mykickoffsearchinterface.h
@@ -28,7 +28,7 @@ using namespace KickoffSearch;
 
 class MyKickoffSearchInterface :public KickoffSearchInterface
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     MyKickoffSearchInterface( KMenu*, TQObject* parent, const char* name = 0 );
diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h
index d839a3b84..7aa839218 100644
--- a/kicker/kicker/ui/popupmenutitle.h
+++ b/kicker/kicker/ui/popupmenutitle.h
@@ -46,7 +46,7 @@ public:
     {
         p->save();
         TQRect r(x, y, w, h);
-        kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu,
+        kapp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu,
                                     p, r, cg);
 
         if (!m_desktopName.isEmpty())
diff --git a/kicker/kicker/ui/quickbrowser_mnu.h b/kicker/kicker/ui/quickbrowser_mnu.h
index 01b12d09d..98a3eb4c4 100644
--- a/kicker/kicker/ui/quickbrowser_mnu.h
+++ b/kicker/kicker/ui/quickbrowser_mnu.h
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class PanelQuickBrowser : public KPanelMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelQuickBrowser(TQWidget *parent=0, const char *name=0);
diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp
index a7bc609a6..4ce3c4ea0 100644
--- a/kicker/kicker/ui/removeapplet_mnu.cpp
+++ b/kicker/kicker/ui/removeapplet_mnu.cpp
@@ -37,8 +37,8 @@ PanelRemoveAppletMenu::PanelRemoveAppletMenu(ContainerArea* cArea,
                                              const char *name)
     : TQPopupMenu(parent, name), m_containerArea(cArea)
 {
-    connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
-    connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
+    connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int)));
+    connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow()));
 }
 
 void PanelRemoveAppletMenu::slotAboutToShow()
@@ -81,7 +81,7 @@ void PanelRemoveAppletMenu::slotAboutToShow()
     if (m_containers.count() > 1)
     {
         insertSeparator();
-        insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id);
+        insertItem(i18n("All"), this, TQ_SLOT(slotRemoveAll()), 0, id);
     }
 }
 
diff --git a/kicker/kicker/ui/removeapplet_mnu.h b/kicker/kicker/ui/removeapplet_mnu.h
index 895ded710..17b24b496 100644
--- a/kicker/kicker/ui/removeapplet_mnu.h
+++ b/kicker/kicker/ui/removeapplet_mnu.h
@@ -34,7 +34,7 @@ class ContainerArea;
 
 class PanelRemoveAppletMenu : public TQPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelRemoveAppletMenu(ContainerArea* cArea, TQWidget* parent = 0, const char* name = 0);
diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp
index 819eff533..6617975f5 100644
--- a/kicker/kicker/ui/removebutton_mnu.cpp
+++ b/kicker/kicker/ui/removebutton_mnu.cpp
@@ -40,8 +40,8 @@ PanelRemoveButtonMenu::PanelRemoveButtonMenu( ContainerArea* cArea,
                                               TQWidget *parent, const char *name )
     : TQPopupMenu( parent, name ), containerArea( cArea )
 {
-    connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
-    connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
+    connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int)));
+    connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow()));
 }
 
 void PanelRemoveButtonMenu::addToContainers(const TQString& type)
@@ -89,7 +89,7 @@ void PanelRemoveButtonMenu::slotAboutToShow()
     if (containers.count() > 1)
     {
         insertSeparator();
-        insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id);
+        insertItem(i18n("All"), this, TQ_SLOT(slotRemoveAll()), 0, id);
     }
 }
 
diff --git a/kicker/kicker/ui/removebutton_mnu.h b/kicker/kicker/ui/removebutton_mnu.h
index 211edd771..d3b5d7237 100644
--- a/kicker/kicker/ui/removebutton_mnu.h
+++ b/kicker/kicker/ui/removebutton_mnu.h
@@ -34,7 +34,7 @@ class ContainerArea;
 
 class PanelRemoveButtonMenu : public TQPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelRemoveButtonMenu( ContainerArea *cArea, TQWidget *parent=0, const char *name=0 );
diff --git a/kicker/kicker/ui/removecontainer_mnu.cpp b/kicker/kicker/ui/removecontainer_mnu.cpp
index 1b30506cc..a447b4d66 100644
--- a/kicker/kicker/ui/removecontainer_mnu.cpp
+++ b/kicker/kicker/ui/removecontainer_mnu.cpp
@@ -44,7 +44,7 @@ RemoveContainerMenu::RemoveContainerMenu( ContainerArea* cArea,
     buttonId = insertItem(i18n("Appli&cation"),
                           new PanelRemoveButtonMenu( containerArea, this ) );
     adjustSize();
-    connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) );
+    connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) );
 }
 
 RemoveContainerMenu::~RemoveContainerMenu()
diff --git a/kicker/kicker/ui/removecontainer_mnu.h b/kicker/kicker/ui/removecontainer_mnu.h
index bd6d03d89..4f5546449 100644
--- a/kicker/kicker/ui/removecontainer_mnu.h
+++ b/kicker/kicker/ui/removecontainer_mnu.h
@@ -30,7 +30,7 @@ class ContainerArea;
 
 class RemoveContainerMenu : public TQPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     RemoveContainerMenu(ContainerArea* cArea, TQWidget *parent=0, const char *name=0);
diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp
index 829dfab5c..ef345921d 100644
--- a/kicker/kicker/ui/removeextension_mnu.cpp
+++ b/kicker/kicker/ui/removeextension_mnu.cpp
@@ -37,8 +37,8 @@ static const int REMOVEALLID = 1000;
 PanelRemoveExtensionMenu::PanelRemoveExtensionMenu( TQWidget *parent, const char *name )
     : TQPopupMenu( parent, name )
 {
-    connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
-    connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
+    connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int)));
+    connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow()));
 }
 
 PanelRemoveExtensionMenu::PanelRemoveExtensionMenu()
diff --git a/kicker/kicker/ui/removeextension_mnu.h b/kicker/kicker/ui/removeextension_mnu.h
index e77522bc8..847179caa 100644
--- a/kicker/kicker/ui/removeextension_mnu.h
+++ b/kicker/kicker/ui/removeextension_mnu.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class PanelRemoveExtensionMenu : public TQPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelRemoveExtensionMenu( TQWidget *parent=0, const char *name=0 );
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index b7e069706..e661ee1ea 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -68,10 +68,10 @@ PanelServiceMenu::PanelServiceMenu(const TQString & label, const TQString & relP
 {
     excludeNoDisplay_=true;
 
-    connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()),
-            TQT_SLOT(slotClearOnClose()));
-    connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClose()));
-    connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotSetTooltip(int)));
+    connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()),
+            TQ_SLOT(slotClearOnClose()));
+    connect(this, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotClose()));
+    connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotSetTooltip(int)));
 }
 
 PanelServiceMenu::~PanelServiceMenu()
@@ -378,7 +378,7 @@ void PanelServiceMenu::doInitialize()
         if (relPath_ == "")
         {
             insertItem(KickerLib::menuIconSet("application-x-executable"), i18n("Add Non-TDE Application"),
-                       this, TQT_SLOT(addNonKDEApp()));
+                       this, TQ_SLOT(addNonKDEApp()));
         }
 
         if (list.count() > 0) {
@@ -571,7 +571,7 @@ void PanelServiceMenu::mousePressEvent(TQMouseEvent * ev)
 
 void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
 {
-    if (ev->button() == Qt::RightButton && !Kicker::the()->isKioskImmutable())
+    if (ev->button() == TQt::RightButton && !Kicker::the()->isKioskImmutable())
     {
         int id = idAt( ev->pos() );
 
@@ -590,7 +590,7 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
 
         delete popupMenu_;
         popupMenu_ = new TDEPopupMenu(this);
-        connect(popupMenu_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int)));
+        connect(popupMenu_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContextMenu(int)));
         bool hasEntries = false;
 
         switch (contextKSycocaEntry_->sycocaType())
@@ -696,7 +696,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
         }
 
 	case EditItem:
-            proc = new TDEProcess(TQT_TQOBJECT(this));
+            proc = new TDEProcess(this);
             *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
             *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId();
             proc->start();
@@ -740,7 +740,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
         }
 
         case EditMenu:
-            proc = new TDEProcess(TQT_TQOBJECT(this));
+            proc = new TDEProcess(this);
             *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
             *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath();
             proc->start();
@@ -758,7 +758,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
     if (Kicker::the()->isKioskImmutable())
         return;
 
-    if ( (ev->state() & Qt::LeftButton ) != Qt::LeftButton )
+    if ( (ev->state() & TQt::LeftButton ) != TQt::LeftButton )
         return;
 
     TQPoint p = ev->pos() - startPos_;
@@ -814,7 +814,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
     // path from KStdDirs.
 
     KURLDrag *d = new KURLDrag(KURL::List(url), this);
-    connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed()));
+    connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDragObjectDestroyed()));
     d->setPixmap(icon);
     d->dragCopy();
 
@@ -840,7 +840,7 @@ void PanelServiceMenu::dragEnterEvent(TQDragEnterEvent *event)
 void PanelServiceMenu::dragLeaveEvent(TQDragLeaveEvent *)
 {
     // see PanelServiceMenu::dragEnterEvent why this is nescessary
-    if (!TQT_TQRECT_OBJECT(frameGeometry()).contains(TQCursor::pos()))
+    if (!frameGeometry().contains(TQCursor::pos()))
     {
         KURLDrag::setTarget(0);
     }
@@ -857,7 +857,7 @@ void PanelServiceMenu::slotDragObjectDestroyed()
         // the execution of any code after the original exec() statement
         // though the panels themselves continue on otherwise normally
         // (we just have some sort of nested event loop)
-        TQTimer::singleShot(0, this, TQT_SLOT(close()));
+        TQTimer::singleShot(0, this, TQ_SLOT(close()));
     }
 }
 
@@ -898,7 +898,7 @@ void PanelServiceMenu::slotClear()
         // QPopupMenu's aboutToHide() is emitted before the popup is really hidden,
         // and also before a click in the menu is handled, so do the clearing
         // only after that has been handled
-        TQTimer::singleShot(100, this, TQT_SLOT(slotClear()));
+        TQTimer::singleShot(100, this, TQ_SLOT(slotClear()));
         return;
     }
 
diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h
index 9cbfaa068..a52e10d45 100644
--- a/kicker/kicker/ui/service_mnu.h
+++ b/kicker/kicker/ui/service_mnu.h
@@ -50,7 +50,7 @@ typedef TQMap<PanelServiceMenu*,int> PanelServiceMenuMap;
 
 class KDE_EXPORT PanelServiceMenu : public KPanelMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelServiceMenu(const TQString & label, const TQString & relPath,
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index 62f7f055a..224cf427a 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -114,19 +114,19 @@ KPanelApplet::Direction arrowToDirection(TQt::ArrowType p)
 {
     switch (p)
     {
-        case Qt::DownArrow:
+        case TQt::DownArrow:
             return KPanelApplet::Down;
         break;
 
-        case Qt::LeftArrow:
+        case TQt::LeftArrow:
             return KPanelApplet::Left;
         break;
 
-        case Qt::RightArrow:
+        case TQt::RightArrow:
             return KPanelApplet::Right;
         break;
 
-        case Qt::UpArrow:
+        case TQt::UpArrow:
         default:
             return KPanelApplet::Up;
         break;
@@ -464,20 +464,15 @@ TQIconSet menuIconSet(const TQString& icon)
 void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color, int alpha)
 {
     static TQPixmap pix;
-    static TQColor last_color = Qt::black;
+    static TQColor last_color = TQt::black;
     static int last_alpha = 0;
     
     if (pix.isNull() || last_color != color || last_alpha != alpha)
     {
         TQImage img(16, 16, 32);
-#ifdef USE_QT4
+        img.setAlphaBuffer(false);
+        img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF));
         img.setAlphaBuffer(true);
-	img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF));
-#else // USE_QT4
-	img.setAlphaBuffer(false);
-	img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF));
-	img.setAlphaBuffer(true);
-#endif // USE_QT4
         pix.convertFromImage(img);
         last_color = color;
         last_alpha = alpha;
diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h
index 663987174..61ba2f0ea 100644
--- a/kicker/libkicker/global.h
+++ b/kicker/libkicker/global.h
@@ -57,7 +57,7 @@ KDE_EXPORT void colorize(TQImage& image);
 /**
  * Blend a color rectangle on a painter
  */
-KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = Qt::black, int alpha = 0x40);
+KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = TQt::black, int alpha = 0x40);
 
 /**
  * Blend two colours together to get a colour halfway in between
diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg
index dfdf501e4..9951fe9e1 100644
--- a/kicker/libkicker/kickerSettings.kcfg
+++ b/kicker/libkicker/kickerSettings.kcfg
@@ -316,7 +316,7 @@
 
 <entry name="KMenuTileColor" type="Color" >
       <label>Color to use for Kmenu button background</label>
-      <default code="true">QColor()</default>
+      <default code="true">TQColor()</default>
    </entry>
 
 <entry name="DesktopButtonTile" type="Path" >
@@ -325,7 +325,7 @@
 
 <entry name="DesktopButtonTileColor" type="Color" >
       <label>Color to use for Kmenu button background</label>
-      <default code="true">QColor()</default>
+      <default code="true">TQColor()</default>
    </entry>
 
 <entry name="URLTile" type="Path" >
@@ -334,7 +334,7 @@
 
 <entry name="URLTileColor" type="Color" >
       <label>Color to use for Application, URL and special button backgrounds</label>
-      <default code="true">QColor()</default>
+      <default code="true">TQColor()</default>
    </entry>
 
 <entry name="BrowserTile" type="Path" >
@@ -343,7 +343,7 @@
 
 <entry name="BrowserTileColor" type="Color" >
       <label>Color to use for Browser button background</label>
-      <default code="true">QColor()</default>
+      <default code="true">TQColor()</default>
    </entry>
 
 <entry name="WindowListTile" type="Path" >
@@ -352,7 +352,7 @@
 
 <entry name="WindowListTileColor" type="Color" >
       <label>Color to use for Window List button background</label>
-      <default code="true">QColor()</default>
+      <default code="true">TQColor()</default>
    </entry>
 
 </group>
@@ -416,7 +416,7 @@
 
    <entry name="CustomKMenuIcon" key="CustomIcon" type="Path" >
       <label>Custom TDE Menu Button Icon</label>
-      <default code="true">QString("kmenu")</default>
+      <default code="true">TQString("kmenu")</default>
    </entry>
 
    <entry name="SearchShortcut" type="String" >
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index 0a6000f37..c896c830a 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -76,13 +76,13 @@ KickerTip::KickerTip(TQWidget * parent)
       m_timer(0, "KickerTip::m_timer"),
       m_frameTimer(0, "KickerTip::m_frameTimer")
 {
-    setFocusPolicy(TQ_NoFocus);
+    setFocusPolicy(TQWidget::NoFocus);
     setBackgroundMode(NoBackground);
     resize(0, 0);
     hide();
-    connect(&m_frameTimer, TQT_SIGNAL(timeout()), TQT_SLOT(internalUpdate()));
+    connect(&m_frameTimer, TQ_SIGNAL(timeout()), TQ_SLOT(internalUpdate()));
 //     // FIXME: The settingsChanged(SettingsCategory) signal is not available under Trinity; where was it originally supposed to come from?
-//     connect(kapp, TQT_SIGNAL(settingsChanged(SettingsCategory)), TQT_SLOT(slotSettingsChanged()));
+//     connect(kapp, TQ_SIGNAL(settingsChanged(SettingsCategory)), TQ_SLOT(slotSettingsChanged()));
 }
 
 KickerTip::~KickerTip()
@@ -176,8 +176,8 @@ void KickerTip::display()
     // close the message window after given mS
     if (data.duration > 0)
     {
-        disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0);
-        connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide()));
+        disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0);
+        connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide()));
         m_timer.start(data.duration, true);
     }
     else
@@ -283,10 +283,10 @@ void KickerTip::plainMask()
 {
     TQPainter maskPainter(&m_mask);
 
-    m_mask.fill(Qt::color0);
+    m_mask.fill(TQt::color0);
 
-    maskPainter.setBrush(Qt::color1);
-    maskPainter.setPen(Qt::NoPen);
+    maskPainter.setBrush(TQt::color1);
+    maskPainter.setPen(TQt::NoPen);
     //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
     drawRoundRect(maskPainter, m_mask.rect());
     setMask(m_mask);
@@ -297,10 +297,10 @@ void KickerTip::dissolveMask()
 {
     TQPainter maskPainter(&m_mask);
 
-    m_mask.fill(Qt::color0);
+    m_mask.fill(TQt::color0);
 
-    maskPainter.setBrush(Qt::color1);
-    maskPainter.setPen(Qt::NoPen);
+    maskPainter.setBrush(TQt::color1);
+    maskPainter.setPen(TQt::NoPen);
     //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
     drawRoundRect(maskPainter, m_mask.rect());
 
@@ -424,16 +424,16 @@ void KickerTip::tipFor(const TQWidget* w)
 {
     if (m_tippingFor)
     {
-        disconnect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)),
-                   this, TQT_SLOT(tipperDestroyed(TQObject*)));
+        disconnect(m_tippingFor, TQ_SIGNAL(destroyed(TQObject*)),
+                   this, TQ_SLOT(tipperDestroyed(TQObject*)));
     }
 
     m_tippingFor = w;
 
     if (m_tippingFor)
     {
-        connect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)),
-                this, TQT_SLOT(tipperDestroyed(TQObject*)));
+        connect(m_tippingFor, TQ_SIGNAL(destroyed(TQObject*)),
+                this, TQ_SLOT(tipperDestroyed(TQObject*)));
     }
 }
 
@@ -452,7 +452,7 @@ void KickerTip::tipperDestroyed(TQObject* o)
 {
     // we can't do a dynamic cast because we are in the process of dying
     // so static it is.
-    untipFor(TQT_TQWIDGET(o));
+    untipFor(static_cast<TQWidget*>(o));
 }
 
 void KickerTip::internalUpdate()
@@ -508,7 +508,7 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event)
         return false;
     }
 
-    TQWidget *widget = TQT_TQWIDGET(object);
+    TQWidget *widget = static_cast<TQWidget*>(object);
 
     switch (event->type())
     {
@@ -526,8 +526,8 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event)
 
                 tipFor(widget);
                 m_timer.stop();
-                disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0);
-                connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(display()));
+                disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0);
+                connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(display()));
 
                 // delay to avoid false starts
                 // e.g. when the user quickly zooms their mouse over
@@ -547,8 +547,8 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event)
 
             if (isTippingFor(widget) && isVisible())
             {
-                disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0);
-                connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide()));
+                disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0);
+                connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide()));
                 m_timer.start(KickerSettings::mouseOversHideDelay(), true);
             }
 
diff --git a/kicker/libkicker/kickertip.h b/kicker/libkicker/kickertip.h
index b7332967f..7295b4efa 100644
--- a/kicker/libkicker/kickertip.h
+++ b/kicker/libkicker/kickertip.h
@@ -40,7 +40,7 @@ class TQTimer;
 
 class KDE_EXPORT KickerTip : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum MaskEffect { Plain, Dissolve };
diff --git a/kicker/libkicker/kshadowengine.cpp b/kicker/libkicker/kshadowengine.cpp
index a933026d5..76f1b9d87 100644
--- a/kicker/libkicker/kshadowengine.cpp
+++ b/kicker/libkicker/kshadowengine.cpp
@@ -236,7 +236,7 @@ void KTextShadowEngine::drawText(TQPainter &p, const TQRect &tr, int tf, const T
 
     // draw text
     pixPainter.begin(&textPixmap);
-    pixPainter.setPen(Qt::white);
+    pixPainter.setPen(TQt::white);
     pixPainter.setFont(p.font()); // get the font from the root painter
     pixPainter.drawText(tr, tf, str);
     pixPainter.end();
diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp
index a8e4bf1fa..8cdc4c664 100644
--- a/kicker/libkicker/menuinfo.cpp
+++ b/kicker/libkicker/menuinfo.cpp
@@ -64,5 +64,5 @@ KPanelMenu* MenuInfo::load(TQWidget *parent, const char *name)
 
     return KParts::ComponentFactory::createInstanceFromLibrary<KPanelMenu>(
                TQFile::encodeName( library_ ),
-               TQT_TQOBJECT(parent), name );
+               parent, name );
 }
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index aaac124c2..0708d0b5f 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -74,7 +74,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
       m_arrowDirection(KPanelExtension::Bottom),
       m_popupDirection(KPanelApplet::Up),
       m_iconAlignment(AlignCenter),
-      m_orientation(Qt::Horizontal),
+      m_orientation(TQt::Horizontal),
       m_size((TDEIcon::StdSizes)-1),
       m_fontPercent(0.40),
       m_forceStandardCursor(forceStandardCursor)
@@ -93,8 +93,8 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
 
     installEventFilter(KickerTip::the());
 
-    connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(updateSettings(int)));
-    connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(updateIcon(int)));
+    connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int)));
+    connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int)));
 }
 
 void PanelButton::configure()
@@ -196,7 +196,7 @@ void PanelButton::setPopupDirection(KPanelApplet::Direction d)
     setArrowDirection(KickerLib::directionToPopupPosition(d));
 }
 
-void PanelButton::setIconAlignment(TQ_Alignment align)
+void PanelButton::setIconAlignment(TQt::AlignmentFlags align)
 {
     m_iconAlignment = align;
     update();
@@ -245,7 +245,7 @@ void PanelButton::checkForDeletion(const TQString& path)
     if (path == m_backingFile)
     {
         setEnabled(false);
-        TQTimer::singleShot(1000, this, TQT_SLOT(scheduleForRemoval()));
+        TQTimer::singleShot(1000, this, TQ_SLOT(scheduleForRemoval()));
     }
 }
 
@@ -278,7 +278,7 @@ void PanelButton::scheduleForRemoval()
         }
 
         timelapse *= 2;
-        TQTimer::singleShot(timelapse, this, TQT_SLOT(scheduleForRemoval()));
+        TQTimer::singleShot(timelapse, this, TQ_SLOT(scheduleForRemoval()));
     }
 }
 
@@ -305,7 +305,7 @@ int PanelButton::widthForHeight(int height) const
 
     // we only paint the text when horizontal, so make sure we're horizontal
     // before adding the text in here
-    if (orientation() == Qt::Horizontal && !m_buttonText.isEmpty())
+    if (orientation() == TQt::Horizontal && !m_buttonText.isEmpty())
     {
         TQFont f(font());
         //f.setPixelSize(KMIN(height, KMAX(int(float(height) * m_fontPercent), 16)));
@@ -483,7 +483,7 @@ void PanelButton::dropEvent(TQDropEvent* e)
 
 void PanelButton::mouseMoveEvent(TQMouseEvent *e)
 {
-    if (!m_isLeftMouseButtonDown || (e->state() & Qt::LeftButton) == 0)
+    if (!m_isLeftMouseButtonDown || (e->state() & TQt::LeftButton) == 0)
     {
         return;
     }
@@ -501,7 +501,7 @@ void PanelButton::mouseMoveEvent(TQMouseEvent *e)
 
 void PanelButton::mousePressEvent(TQMouseEvent *e)
 {
-    if (e->button() == Qt::LeftButton)
+    if (e->button() == TQt::LeftButton)
     {
         m_lastLeftMouseButtonPress = e->pos();
         m_isLeftMouseButtonDown = true;
@@ -511,7 +511,7 @@ void PanelButton::mousePressEvent(TQMouseEvent *e)
 
 void PanelButton::mouseReleaseEvent(TQMouseEvent *e)
 {
-    if (e->button() == Qt::LeftButton)
+    if (e->button() == TQt::LeftButton)
     {
         m_isLeftMouseButtonDown = false;
 	
@@ -540,7 +540,7 @@ void PanelButton::drawButton(TQPainter *p)
     if (m_tileColor.isValid())
     {
         p->fillRect(rect(), m_tileColor);
-        style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
+        style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
     }
     else if (paletteBackgroundPixmap())
     {
@@ -560,7 +560,7 @@ void PanelButton::drawButton(TQPainter *p)
     else if (isDown() || isOn())
     {
         // Draw shapes to indicate the down state.
-        style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken);
+        style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken);
     }
 
     drawButtonLabel(p);
@@ -568,9 +568,9 @@ void PanelButton::drawButton(TQPainter *p)
     if (hasFocus() || m_hasAcceptedDrag)
     {
         int x1, y1, x2, y2;
-        TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2);
+        rect().coords(&x1, &y1, &x2, &y2);
         TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
-        style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
+        style().drawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
         TQStyle::Style_Default, colorGroup().button());
     }
 }
@@ -582,7 +582,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
     if (m_tileColor.isValid())
     {
         p->fillRect(rect(), m_tileColor);
-        style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
+        style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
     }
     else if (paletteBackgroundPixmap())
     {
@@ -596,10 +596,10 @@ void PanelButton::drawDeepButton(TQPainter *p)
 
     TQRect btn_rect = TQRect(rect().x(), rect().y()+1, rect().width(), rect().height()-2);
     if (isDown() || isOn()) {
-        style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down);
+        style().drawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down);
     }
     else {
-        style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised);
+        style().drawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised);
     }
 
     drawButtonLabel(p,0,FALSE);
@@ -607,9 +607,9 @@ void PanelButton::drawDeepButton(TQPainter *p)
     if (hasFocus() || m_hasAcceptedDrag)
     {
         int x1, y1, x2, y2;
-        TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2);
+        rect().coords(&x1, &y1, &x2, &y2);
         TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
-        style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
+        style().drawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
         TQStyle::Style_Default, colorGroup().button());
     }
 }
@@ -645,7 +645,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
     else if (m_iconAlignment & AlignBottom)
         y = (height() - icon.height());
 
-    if (!m_buttonText.isEmpty() && orientation() == Qt::Horizontal)
+    if (!m_buttonText.isEmpty() && orientation() == TQt::Horizontal)
     {
         int h = height();
         int w = width();
@@ -749,7 +749,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
                 r = TQRect(0, (height() - arrowSize)/2, arrowSize, arrowSize);
                 break;
             case KPanelExtension::Floating:
-                if (orientation() == Qt::Horizontal)
+                if (orientation() == TQt::Horizontal)
                 {
                     e = TQStyle::PE_ArrowDown;
                     r.moveBy(0, height() - arrowSize);
@@ -772,7 +772,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
         {
             flags |= TQStyle::Style_Down;
         }
-        style().tqdrawPrimitive(e, p, r, colorGroup(), flags);
+        style().drawPrimitive(e, p, r, colorGroup(), flags);
     }
 }
 
@@ -795,7 +795,7 @@ int PanelButton::preferredIconSize(int proposed_size) const
 
     if (proposed_size < 0)
     {
-        proposed_size = (orientation() == Qt::Horizontal) ? height() : width();
+        proposed_size = (orientation() == TQt::Horizontal) ? height() : width();
     }
 
     // determine the upper limit on the size.  Normally, this is panelSize,
@@ -833,16 +833,16 @@ void PanelButton::backedByFile(const TQString& localFilePath)
     }
 
     // avoid multiple connections
-    disconnect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)),
-               this, TQT_SLOT(checkForDeletion(const TQString&)));
+    disconnect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)),
+               this, TQ_SLOT(checkForDeletion(const TQString&)));
 
     if (!KDirWatch::self()->contains(m_backingFile))
     {
         KDirWatch::self()->addFile(m_backingFile);
     }
 
-    connect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)),
-            this, TQT_SLOT(checkForDeletion(const TQString&)));
+    connect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)),
+            this, TQ_SLOT(checkForDeletion(const TQString&)));
 
 }
 
@@ -966,7 +966,7 @@ PanelPopupButton::PanelPopupButton(TQWidget *parent, const char *name, bool forc
     m_pressedDuringPopup(false),
     m_initialized(false)
 {
-    connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotExecMenu()));
+    connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotExecMenu()));
 }
 
 void PanelPopupButton::setPopup(TQWidget *popup)
@@ -974,7 +974,7 @@ void PanelPopupButton::setPopup(TQWidget *popup)
     if (m_popup)
     {
         m_popup->removeEventFilter(this);
-        disconnect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide()));
+        disconnect(m_popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(menuAboutToHide()));
     }
 
     m_popup = popup;
@@ -983,7 +983,7 @@ void PanelPopupButton::setPopup(TQWidget *popup)
     if (m_popup)
     {
         m_popup->installEventFilter(this);
-        connect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide()));
+        connect(m_popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(menuAboutToHide()));
     }
 }
 
@@ -996,8 +996,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e)
 {
     if (e->type() == TQEvent::MouseMove)
     {
-        TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
-        if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())) &&
+        TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
+        if (rect().contains(mapFromGlobal(me->globalPos())) &&
             ((me->state() & ControlButton) != 0 ||
              (me->state() & ShiftButton) != 0))
         {
@@ -1008,8 +1008,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e)
     else if (e->type() == TQEvent::MouseButtonPress ||
              e->type() == TQEvent::MouseButtonDblClick)
     {
-        TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
-        if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())))
+        TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
+        if (rect().contains(mapFromGlobal(me->globalPos())))
         {
             m_pressedDuringPopup = true;
             return true;
@@ -1017,8 +1017,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e)
     }
     else if (e->type() == TQEvent::MouseButtonRelease)
     {
-        TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
-        if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())))
+        TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
+        if (rect().contains(mapFromGlobal(me->globalPos())))
         {
             if (m_pressedDuringPopup && m_popup)
             {
diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h
index 80b26f377..cea132680 100644
--- a/kicker/libkicker/panelbutton.h
+++ b/kicker/libkicker/panelbutton.h
@@ -45,7 +45,7 @@ class KShadowEngine;
  */
 class KDE_EXPORT PanelButton: public TQButton, public KickerTip::Client
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -263,7 +263,7 @@ public slots:
 
 protected:
 
-    void setIconAlignment(TQ_Alignment align);
+    void setIconAlignment(TQt::AlignmentFlags align);
     /**
      * Subclasses must implement this to define the name of the button which is
      * used to identify this button for saving and loading. It must be unique
@@ -406,7 +406,7 @@ private:
     TQPixmap m_iconz; // mouse over
     KPanelExtension::Position m_arrowDirection;
     KPanelApplet::Direction m_popupDirection;
-    TQ_Alignment m_iconAlignment;
+    TQt::AlignmentFlags m_iconAlignment;
     Orientation m_orientation;
     int m_size;
     double m_fontPercent;
@@ -422,7 +422,7 @@ private:
  */
 class KDE_EXPORT PanelPopupButton : public PanelButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
    /**
diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp
index ec06b30c9..0401cfcdc 100644
--- a/kicker/libkicker/panner.cpp
+++ b/kicker/libkicker/panner.cpp
@@ -46,7 +46,7 @@ Panner::Panner( TQWidget* parent, const char* name )
     setBackgroundOrigin( AncestorOrigin );
 
     _updateScrollButtonsTimer = new TQTimer(this);
-    connect(_updateScrollButtonsTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reallyUpdateScrollButtons()));
+    connect(_updateScrollButtonsTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reallyUpdateScrollButtons()));
 
     _clipper = new TQWidget(this);
     _clipper->setBackgroundOrigin(AncestorOrigin);
@@ -57,7 +57,7 @@ Panner::Panner( TQWidget* parent, const char* name )
     // layout
     _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight);
     _layout->addWidget(_clipper, 1);
-    setOrientation(Qt::Horizontal);
+    setOrientation(TQt::Horizontal);
 }
 
 Panner::~Panner() 
@@ -78,8 +78,8 @@ void Panner::createScrollButtons()
     _luSB->setMinimumSize(12, 12);
     _luSB->hide();
     _layout->addWidget(_luSB);
-    connect(_luSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollLeftUp()));
-    connect(_luSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll()));
+    connect(_luSB, TQ_SIGNAL(pressed()), TQ_SLOT(startScrollLeftUp()));
+    connect(_luSB, TQ_SIGNAL(released()), TQ_SLOT(stopScroll()));
 
     // right/down scroll button
     _rdSB = new SimpleArrowButton(this);
@@ -88,8 +88,8 @@ void Panner::createScrollButtons()
     _rdSB->setMinimumSize(12, 12);
     _rdSB->hide();
     _layout->addWidget(_rdSB);
-    connect(_rdSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollRightDown()));
-    connect(_rdSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll()));
+    connect(_rdSB, TQ_SIGNAL(pressed()), TQ_SLOT(startScrollRightDown()));
+    connect(_rdSB, TQ_SIGNAL(released()), TQ_SLOT(stopScroll()));
 
     // set up the buttons
     setupButtons();
@@ -97,12 +97,12 @@ void Panner::createScrollButtons()
 
 void Panner::setupButtons()
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         if (_luSB)
         {
-            _luSB->setArrowType(Qt::LeftArrow);
-            _rdSB->setArrowType(Qt::RightArrow);
+            _luSB->setArrowType(TQt::LeftArrow);
+            _rdSB->setArrowType(TQt::RightArrow);
             _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
             _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
             TQToolTip::add(_luSB, i18n("Scroll left"));
@@ -115,8 +115,8 @@ void Panner::setupButtons()
     {
         if (_luSB)
         {
-            _luSB->setArrowType(Qt::UpArrow);
-            _rdSB->setArrowType(Qt::DownArrow);
+            _luSB->setArrowType(TQt::UpArrow);
+            _rdSB->setArrowType(TQt::DownArrow);
             _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
             _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
             TQToolTip::add(_luSB, i18n("Scroll up"));
@@ -149,7 +149,7 @@ void Panner::resizeEvent( TQResizeEvent* )
 
 void Panner::scrollRightDown()
 {
-    if(orientation() == Qt::Horizontal) // scroll right
+    if(orientation() == TQt::Horizontal) // scroll right
         scrollBy( _step, 0 );
     else // scroll down
         scrollBy( 0, _step );
@@ -159,7 +159,7 @@ void Panner::scrollRightDown()
 
 void Panner::scrollLeftUp()
 {
-    if(orientation() == Qt::Horizontal) // scroll left
+    if(orientation() == TQt::Horizontal) // scroll left
         scrollBy( -_step, 0 );
     else // scroll up
         scrollBy( 0, -_step );
@@ -170,7 +170,7 @@ void Panner::scrollLeftUp()
 void Panner::startScrollRightDown()
 {
     _scrollTimer = new TQTimer(this);
-    connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollRightDown()));
+    connect(_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(scrollRightDown()));
     _scrollTimer->start(50);
     _step = 8;
     scrollRightDown();
@@ -179,7 +179,7 @@ void Panner::startScrollRightDown()
 void Panner::startScrollLeftUp()
 {
     _scrollTimer = new TQTimer(this);
-    connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollLeftUp()));
+    connect(_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(scrollLeftUp()));
     _scrollTimer->start(50);
     _step = 8;
     scrollLeftUp();
@@ -197,7 +197,7 @@ void Panner::reallyUpdateScrollButtons()
     
     _updateScrollButtonsTimer->stop();
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         delta = contentsWidth() - width();
     }
@@ -336,7 +336,7 @@ void Panner::ensureVisible( int x, int y, int xmargin, int ymargin )
 
 bool Panner::eventFilter( TQObject *obj, TQEvent *e )
 {
-    if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_viewport) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_clipper) ) 
+    if ( obj == _viewport || obj == _clipper ) 
     {
         switch ( e->type() ) 
         {
diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h
index 7ae68d096..36305bb0c 100644
--- a/kicker/libkicker/panner.h
+++ b/kicker/libkicker/panner.h
@@ -33,7 +33,7 @@ class TQTimer;
 
 class KDE_EXPORT Panner : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Panner( TQWidget* parent, const char* name = 0 );
@@ -41,8 +41,8 @@ public:
 
     TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); }
 
-    Qt::Orientation orientation() const { return _orient; }
-    virtual void setOrientation(Qt::Orientation orientation);
+    TQt::Orientation orientation() const { return _orient; }
+    virtual void setOrientation(TQt::Orientation orientation);
     
     TQWidget *viewport() const { return _viewport; }
     
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index 12d5085d4..79fd19915 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -42,15 +42,15 @@
 SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandardCursor)
     : TQButton(parent, name),
       m_highlight(false),
-      m_orientation(Qt::Horizontal),
+      m_orientation(TQt::Horizontal),
       m_forceStandardCursor(forceStandardCursor)
 {
     setBackgroundOrigin( AncestorOrigin );
 
-    connect( kapp, TQT_SIGNAL( settingsChanged( int ) ),
-       TQT_SLOT( slotSettingsChanged( int ) ) );
-    connect( kapp, TQT_SIGNAL( iconChanged( int ) ),
-       TQT_SLOT( slotIconChanged( int ) ) );
+    connect( kapp, TQ_SIGNAL( settingsChanged( int ) ),
+       TQ_SLOT( slotSettingsChanged( int ) ) );
+    connect( kapp, TQ_SIGNAL( iconChanged( int ) ),
+       TQ_SLOT( slotIconChanged( int ) ) );
 
     kapp->addKipcEventMask( KIPC::SettingsChanged );
     kapp->addKipcEventMask( KIPC::IconChanged );
@@ -65,7 +65,7 @@ void SimpleButton::setPixmap(const TQPixmap &pix)
     update();
 }
 
-void SimpleButton::setOrientation(Qt::Orientation orientation)
+void SimpleButton::setOrientation(TQt::Orientation orientation)
 {
     m_orientation = orientation;
     update();
@@ -99,7 +99,7 @@ void SimpleButton::drawButton( TQPainter *p )
         if (m_highlight || isDown() || isOn()) {
             int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
             if (isDown() || isOn()) flags |= TQStyle::Style_Down;
-            style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags);
+            style().drawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags);
         }
     }
 
@@ -220,7 +220,7 @@ void SimpleButton::resizeEvent( TQResizeEvent * )
 }
 
 
-SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, const char *name, bool forceStandardCursor)
+SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, const char *name, bool forceStandardCursor)
     : SimpleButton(parent, name, forceStandardCursor),
       m_forceStandardCursor(forceStandardCursor)
 {
@@ -234,7 +234,7 @@ TQSize SimpleArrowButton::sizeHint() const
     return TQSize( 12, 12 );
 }
 
-void SimpleArrowButton::setArrowType(Qt::ArrowType a)
+void SimpleArrowButton::setArrowType(TQt::ArrowType a)
 {
     if (_arrow != a) 
     {
@@ -243,7 +243,7 @@ void SimpleArrowButton::setArrowType(Qt::ArrowType a)
     }
 }
 
-Qt::ArrowType SimpleArrowButton::arrowType() const
+TQt::ArrowType SimpleArrowButton::arrowType() const
 {
     return _arrow;
 }
@@ -255,15 +255,15 @@ void SimpleArrowButton::drawButton( TQPainter *p )
     TQStyle::PrimitiveElement pe = TQStyle::PE_ArrowLeft;
     switch (_arrow)
     {
-        case Qt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break;
-        case Qt::RightArrow: pe = TQStyle::PE_ArrowRight; break;
-        case Qt::UpArrow: pe = TQStyle::PE_ArrowUp; break;
-        case Qt::DownArrow: pe = TQStyle::PE_ArrowDown; break;
+        case TQt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break;
+        case TQt::RightArrow: pe = TQStyle::PE_ArrowRight; break;
+        case TQt::UpArrow: pe = TQStyle::PE_ArrowUp; break;
+        case TQt::DownArrow: pe = TQStyle::PE_ArrowDown; break;
     }
 
     int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
     if (isDown() || isOn())	flags |= TQStyle::Style_Down;
-    style().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
+    style().drawPrimitive(pe, p, r, colorGroup(), flags);
 
     if (m_forceStandardCursor) {
         SimpleButton::drawButton(p);
diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h
index e89571ef0..7f1718273 100644
--- a/kicker/libkicker/simplebutton.h
+++ b/kicker/libkicker/simplebutton.h
@@ -28,12 +28,12 @@
 
 class KDE_EXPORT SimpleButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = FALSE);
         void setPixmap(const TQPixmap &pix);
-        void setOrientation(Qt::Orientation orientaton);
+        void setOrientation(TQt::Orientation orientaton);
         TQSize sizeHint() const;
         TQSize minimumSizeHint() const;
 
@@ -55,7 +55,7 @@ class KDE_EXPORT SimpleButton : public TQButton
         TQPixmap m_normalIcon;
         TQPixmap m_activeIcon;
         TQPixmap m_disabledIcon;
-        Qt::Orientation m_orientation;
+        TQt::Orientation m_orientation;
         bool m_forceStandardCursor;
         class SimpleButtonPrivate;
         SimpleButtonPrivate* d;
@@ -63,10 +63,10 @@ class KDE_EXPORT SimpleButton : public TQButton
 
 class KDE_EXPORT SimpleArrowButton: public SimpleButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     public:
-        SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE);
+        SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE);
         virtual ~SimpleArrowButton() {};
         TQSize sizeHint() const;
     
@@ -74,13 +74,13 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
         virtual void enterEvent( TQEvent *e );
         virtual void leaveEvent( TQEvent *e );
         virtual void drawButton(TQPainter *p);
-        Qt::ArrowType arrowType() const;
+        TQt::ArrowType arrowType() const;
     
     public slots:
-        void setArrowType(Qt::ArrowType a);
+        void setArrowType(TQt::ArrowType a);
     
     private:
-        Qt::ArrowType _arrow;
+        TQt::ArrowType _arrow;
         bool m_forceStandardCursor;
         bool _inside;
 };
diff --git a/kicker/menuext/find/findmenu.h b/kicker/menuext/find/findmenu.h
index b8c3e3d96..85dd0e04d 100644
--- a/kicker/menuext/find/findmenu.h
+++ b/kicker/menuext/find/findmenu.h
@@ -30,7 +30,7 @@ class TQStringList;
 
 class FindMenu : public KPanelMenu
 {
-	Q_OBJECT
+	TQ_OBJECT
 
   public:
     FindMenu( TQWidget* parent, const char* name, const TQStringList &/*args*/ );
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index c992cf855..089a8ac93 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -117,7 +117,7 @@ void KateSessionMenu::initialize()
 
   // means for updating, to let the user manually update if he/she added new sessions.
   insertSeparator();
-  insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQT_SLOT(reloadSessionsList()) );
+  insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQ_SLOT(reloadSessionsList()) );
 }
 
 void KateSessionMenu::slotExec( int id )
@@ -136,7 +136,7 @@ void KateSessionMenu::slotExec( int id )
     TQString name = KInputDialog::getText( i18n("Session Name"),
                                           i18n("Please enter a name for the new session"),
                                           TQString::null,
-                                          &ok, 0, 0, new Validator( TQT_TQOBJECT(m_parent) ) );
+                                          &ok, 0, 0, new Validator( m_parent ) );
     if ( ! ok )
       return;
 
diff --git a/kicker/menuext/kate/katesessionmenu.h b/kicker/menuext/kate/katesessionmenu.h
index 78ab50e17..b6a10e885 100644
--- a/kicker/menuext/kate/katesessionmenu.h
+++ b/kicker/menuext/kate/katesessionmenu.h
@@ -24,7 +24,7 @@
 #include <kpanelmenu.h>
 
 class KateSessionMenu : public KPanelMenu {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KateSessionMenu( TQWidget *parent=0, const char *name=0, const TQStringList& /*args*/=TQStringList() );
     ~KateSessionMenu();
diff --git a/kicker/menuext/konq-profiles/konqy_menu.h b/kicker/menuext/konq-profiles/konqy_menu.h
index ba3bb19f7..927f1ec6e 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.h
+++ b/kicker/menuext/konq-profiles/konqy_menu.h
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class KonquerorProfilesMenu : public KPanelMenu
 {
-   Q_OBJECT
+   TQ_OBJECT
 
    public:
       KonquerorProfilesMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/);
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index c9439c8db..2e196186f 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -150,8 +150,8 @@ void KonsoleMenu::initialize()
     insertItem(SmallIconSet("keditbookmarks"),
                i18n("New Session at Bookmark"), m_bookmarksSession);
     connect(m_bookmarkHandlerSession,
-            TQT_SIGNAL(openURL(const TQString&, const TQString&)),
-            TQT_SLOT(newSession(const TQString&, const TQString&)));
+            TQ_SIGNAL(openURL(const TQString&, const TQString&)),
+            TQ_SLOT(newSession(const TQString&, const TQString&)));
 
 
     screenList.clear();
@@ -229,11 +229,11 @@ void KonsoleMenu::initialize()
         // we don't have any profiles, disable the menu
         setItemEnabled(profileID, false);
     }
-    connect(m_profileMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(launchProfile(int)));
+    connect(m_profileMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(launchProfile(int)));
 
     insertSeparator();
     insertItem(SmallIconSet("reload"),
-               i18n("Reload Sessions"), this, TQT_SLOT(reinitialize()));
+               i18n("Reload Sessions"), this, TQ_SLOT(reinitialize()));
 }
 
 void KonsoleMenu::slotExec(int id)
diff --git a/kicker/menuext/konsole/konsole_mnu.h b/kicker/menuext/konsole/konsole_mnu.h
index 4272fbaf9..68473693f 100644
--- a/kicker/menuext/konsole/konsole_mnu.h
+++ b/kicker/menuext/konsole/konsole_mnu.h
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class KonsoleMenu : public KPanelMenu/*, public KPReloadObject*/
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonsoleMenu(TQWidget *parent, const char *name, const TQStringList& /* args */);
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index 9ace6483e..b2249d858 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -38,8 +38,8 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool )
     manager->setUpdate( true );
     manager->setShowNSBookmarks( false );
 
-    connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
-             TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) );
+    connect( manager, TQ_SIGNAL( changed(const TQString &, const TQString &) ),
+             TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) );
     m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu,
                              NULL, false, /*Not toplevel*/
 			     false /*No 'Add Bookmark'*/ );
@@ -62,13 +62,13 @@ void KonsoleBookmarkHandler::importOldBookmarks( const TQString& path,
 
     KNSBookmarkImporter importer( path );
     connect( &importer,
-             TQT_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )),
-             TQT_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& )));
+             TQ_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )),
+             TQ_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& )));
     connect( &importer,
-             TQT_SIGNAL( newFolder( const TQString&, bool, const TQString& )),
-             TQT_SLOT( slotNewFolder( const TQString&, bool, const TQString& )));
-    connect( &importer, TQT_SIGNAL( newSeparator() ), TQT_SLOT( newSeparator() ));
-    connect( &importer, TQT_SIGNAL( endMenu() ), TQT_SLOT( endMenu() ));
+             TQ_SIGNAL( newFolder( const TQString&, bool, const TQString& )),
+             TQ_SLOT( slotNewFolder( const TQString&, bool, const TQString& )));
+    connect( &importer, TQ_SIGNAL( newSeparator() ), TQ_SLOT( newSeparator() ));
+    connect( &importer, TQ_SIGNAL( endMenu() ), TQ_SLOT( endMenu() ));
 
     importer.parseNSBookmarks( false );
 
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.h b/kicker/menuext/konsole/konsolebookmarkhandler.h
index a1d2f54de..f7231fd24 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.h
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.h
@@ -14,7 +14,7 @@ class KonsoleMenu;
 
 class KonsoleBookmarkHandler : public TQObject, public KBookmarkOwner
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonsoleBookmarkHandler( KonsoleMenu *konsole, bool toplevel );
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
index 0860cc123..840b3b8f6 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
@@ -31,14 +31,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
     /*
      * First, we disconnect KBookmarkMenu::slotAboutToShow()
      * Then,  we connect    KonsoleBookmarkMenu::slotAboutToShow().
-     * They are named differently because the TQT_SLOT() macro thinks we want
+     * They are named differently because the TQ_SLOT() macro thinks we want
      * KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow()
      * Could this be solved if slotAboutToShow() is virtual in KBookmarMenu?
      */
-    disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this,
-                TQT_SLOT( slotAboutToShow() ) );
-    connect( _parentMenu, TQT_SIGNAL( aboutToShow() ),
-             TQT_SLOT( slotAboutToShow2() ) );
+    disconnect( _parentMenu, TQ_SIGNAL( aboutToShow() ), this,
+                TQ_SLOT( slotAboutToShow() ) );
+    connect( _parentMenu, TQ_SIGNAL( aboutToShow() ),
+             TQ_SLOT( slotAboutToShow2() ) );
 }
 
 /*
@@ -100,8 +100,8 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
                                          m_actionCollection, false,
 					 m_bAddBookmark, TQString::null );
       m_lstSubMenus.append(subMenu);
-      connect( actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu,
-               TQT_SLOT(slotNSLoad()));
+      connect( actionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), subMenu,
+               TQ_SLOT(slotNSLoad()));
     }
   }
 
@@ -128,7 +128,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
         // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl;
         // create a normal URL item, with ID as a name
         TDEAction * action = new TDEAction( text, bm.icon(), 0,
-                                        this, TQT_SLOT( slotBookmarkSelected() ),
+                                        this, TQ_SLOT( slotBookmarkSelected() ),
                                         m_actionCollection, bm.url().url().utf8() );
 
         action->setStatusText( bm.url().prettyURL() );
@@ -168,7 +168,7 @@ void KonsoleBookmarkMenu::slotBookmarkSelected()
     if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
     a = (TDEAction*)sender();
     b = a->text();
-    m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */
+    m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */
                                ( (TDEAction *)sender() )->text() /* Title */ );
 }
 
@@ -177,7 +177,7 @@ void KonsoleBookmarkMenu::slotNSBookmarkSelected()
     TDEAction *a;
     TQString b;
 
-    TQString link(TQT_TQOBJECT_CONST(sender())->name()+8);
+    TQString link(sender()->name()+8);
     a = (TDEAction*)sender();
     b = a->text();
     m_kOwner->openBookmarkURL( link, /*URL */
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.h b/kicker/menuext/konsole/konsolebookmarkmenu.h
index 103b6bc19..4bb08a798 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.h
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.h
@@ -23,7 +23,7 @@ class KonsoleBookmarkMenu;
 
 class KonsoleBookmarkMenu : public KBookmarkMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonsoleBookmarkMenu( KBookmarkManager* mgr,
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 534387394..5440c1ed7 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -60,11 +60,11 @@ PrefMenu::PrefMenu(const TQString& label,
 {
     m_subMenus.setAutoDelete(true);
 
-    connect(KSycoca::self(),  TQT_SIGNAL(databaseChanged()),
-            this, TQT_SLOT(clearOnClose()));
+    connect(KSycoca::self(),  TQ_SIGNAL(databaseChanged()),
+            this, TQ_SLOT(clearOnClose()));
 
-    connect(this, TQT_SIGNAL(aboutToHide()),
-            this, TQT_SLOT(aboutToClose()));
+    connect(this, TQ_SIGNAL(aboutToHide()),
+            this, TQ_SLOT(aboutToClose()));
 }
 
 PrefMenu::~PrefMenu()
@@ -136,7 +136,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
 {
     KPanelMenu::mouseMoveEvent(ev);
 
-    if ((ev->state() & Qt::LeftButton) != Qt::LeftButton)
+    if ((ev->state() & TQt::LeftButton) != TQt::LeftButton)
     {
         return;
     }
@@ -198,7 +198,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
     // If the path to the desktop file is relative, try to get the full
     // path from KStdDirs.
     KURLDrag *d = new KURLDrag(KURL::List(url), this);
-    connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(dragObjectDestroyed()));
+    connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(dragObjectDestroyed()));
     d->setPixmap(icon);
     d->dragCopy();
 
@@ -224,7 +224,7 @@ void PrefMenu::dragEnterEvent(TQDragEnterEvent *event)
 void PrefMenu::dragLeaveEvent(TQDragLeaveEvent */*event*/)
 {
     // see PrefMenu::dragEnterEvent why this is nescessary
-    if (!TQT_TQRECT_OBJECT(frameGeometry()).contains(TQCursor::pos()))
+    if (!frameGeometry().contains(TQCursor::pos()))
     {
         KURLDrag::setTarget(0);
     }
@@ -246,7 +246,7 @@ void PrefMenu::initialize()
     {
         insertItem(KickerLib::menuIconSet("kcontrol"),
                    i18n("Trinity Control Center"),
-                   this, TQT_SLOT(launchControlCenter()));
+                   this, TQ_SLOT(launchControlCenter()));
         insertSeparator();
     }
 
@@ -358,7 +358,7 @@ void PrefMenu::slotClear()
         // QPopupMenu's aboutToHide() is emitted before the popup is really hidden,
         // and also before a click in the menu is handled, so do the clearing
         // only after that has been handled
-        TQTimer::singleShot( 100, this, TQT_SLOT( slotClear()));
+        TQTimer::singleShot( 100, this, TQ_SLOT( slotClear()));
         return;
     }
 
diff --git a/kicker/menuext/prefmenu/prefmenu.h b/kicker/menuext/prefmenu/prefmenu.h
index 10befe6b2..a56391ece 100644
--- a/kicker/menuext/prefmenu/prefmenu.h
+++ b/kicker/menuext/prefmenu/prefmenu.h
@@ -34,7 +34,7 @@ typedef TQPtrList<TQPopupMenu> PopupMenuList;
 
 class PrefMenu : public KPanelMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         PrefMenu(TQWidget *parent,
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index 19adfa868..90c84ee32 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -52,7 +52,7 @@ RecentDocsMenu::~RecentDocsMenu()
 void RecentDocsMenu::initialize() {
 	if (initialized()) clear();
 
-	insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQT_SLOT(slotClearHistory()));
+	insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQ_SLOT(slotClearHistory()));
 	insertSeparator();
 
 	_fileList = TDERecentDocument::recentDocuments();
@@ -111,10 +111,10 @@ void RecentDocsMenu::mousePressEvent(TQMouseEvent* e) {
 void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) {
 	KPanelMenu::mouseMoveEvent(e);
 
-	if (!(e->state() & Qt::LeftButton))
+	if (!(e->state() & TQt::LeftButton))
 		return;
 
-	if (!TQT_TQRECT_OBJECT(rect()).contains(_mouseDown))
+	if (!rect().contains(_mouseDown))
 		return;
 
 	int dragLength = (e->pos() - _mouseDown).manhattanLength();
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.h b/kicker/menuext/recentdocs/recentdocsmenu.h
index 487a9fe94..2ec65a1a4 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.h
+++ b/kicker/menuext/recentdocs/recentdocsmenu.h
@@ -31,7 +31,7 @@ class TQPoint;
 
 class RecentDocsMenu : public KPanelMenu
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	RecentDocsMenu(TQWidget* parent, const char* name, const TQStringList &/*args*/);
diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp
index aeaff8e94..8c0a8407a 100644
--- a/kicker/menuext/remote/remotemenu.cpp
+++ b/kicker/menuext/remote/remotemenu.cpp
@@ -68,9 +68,9 @@ void RemoteMenu::initialize()
     }
 
     id = insertItem(SmallIcon("wizard"), i18n("Add Network Folder"));
-    connectItem(id, this, TQT_SLOT(startWizard()));
+    connectItem(id, this, TQ_SLOT(startWizard()));
     id = insertItem(SmallIcon("kfm"), i18n("Manage Network Folders"));
-    connectItem(id, this, TQT_SLOT(openRemoteDir()));
+    connectItem(id, this, TQ_SLOT(openRemoteDir()));
 
     insertSeparator();
 
diff --git a/kicker/menuext/remote/remotemenu.h b/kicker/menuext/remote/remotemenu.h
index 607e1fc64..327cc79b2 100644
--- a/kicker/menuext/remote/remotemenu.h
+++ b/kicker/menuext/remote/remotemenu.h
@@ -26,7 +26,7 @@
 
 class RemoteMenu : public KPanelMenu, public KDirNotify
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
     public:
diff --git a/kicker/menuext/system/systemmenu.cpp b/kicker/menuext/system/systemmenu.cpp
index 12ec087d8..e738e7af9 100644
--- a/kicker/menuext/system/systemmenu.cpp
+++ b/kicker/menuext/system/systemmenu.cpp
@@ -32,8 +32,8 @@ SystemMenu::SystemMenu(TQWidget *parent, const char *name,
                        const TQStringList &/*args*/)
   : KPanelMenu( parent, name)
 {
-    connect( &m_dirLister, TQT_SIGNAL( completed() ),
-             this, TQT_SLOT( slotCompleted() ) );
+    connect( &m_dirLister, TQ_SIGNAL( completed() ),
+             this, TQ_SLOT( slotCompleted() ) );
 
     m_dirLister.openURL(KURL("system:/"));
 }
diff --git a/kicker/menuext/system/systemmenu.h b/kicker/menuext/system/systemmenu.h
index 1efbc3c57..26263af81 100644
--- a/kicker/menuext/system/systemmenu.h
+++ b/kicker/menuext/system/systemmenu.h
@@ -27,7 +27,7 @@
 
 class SystemMenu : public KPanelMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         SystemMenu(TQWidget *parent, const char *name,
diff --git a/kicker/menuext/tdeprint/print_mnu.h b/kicker/menuext/tdeprint/print_mnu.h
index 47c9e609e..4be9b80a5 100644
--- a/kicker/menuext/tdeprint/print_mnu.h
+++ b/kicker/menuext/tdeprint/print_mnu.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class PrintMenu : public KPanelMenu, public KPReloadObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PrintMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/);
diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp
index 0fa85a1e3..973c52ee9 100644
--- a/kicker/menuext/tom/tom.cpp
+++ b/kicker/menuext/tom/tom.cpp
@@ -105,7 +105,7 @@ class runMenuWidget : public TQWidget, public QMenuItem
             l1->setPixmap(foo);
             runLayout->addWidget(l1);*/
             /*TQLabel* l2 = new TQLabel(i18n("&Run: "), this);
-            l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
+            l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
             l2->setBuddy(this);
             runLayout->addWidget(l2);*/
             m_runEdit = new KHistoryCombo(this);
@@ -116,21 +116,21 @@ class runMenuWidget : public TQWidget, public QMenuItem
             TQSettings settings;
             if (settings.readEntry("/TDEStyle/Settings/MenuTransparencyEngine", "Disabled") != "Disabled")
             {
-                setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
-                //l1->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
-                //l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
-                m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
+                setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+                //l1->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+                //l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+                m_runEdit->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
             }
             else
             {
-                /*setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
-                l1->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
-                l2->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
-                m_runEdit->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);*/
+                /*setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+                l1->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+                l2->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+                m_runEdit->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);*/
                 //l1->setAutoMask(true);
-                //l1->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
-                //l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
-                //m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
+                //l1->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+                //l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+                //m_runEdit->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
             }
 
             setMinimumHeight(TDEIcon::SizeMedium + 2);
@@ -217,7 +217,7 @@ void TOM::initializeRecentDocs()
 {
     m_recentDocsMenu->clear();
     m_recentDocsMenu->insertItem(SmallIconSet("history_clear"), i18n("Clear History"),
-                                 this, TQT_SLOT(clearRecentDocHistory()));
+                                 this, TQ_SLOT(clearRecentDocHistory()));
     m_recentDocsMenu->insertSeparator();
 
     m_recentDocURLs = TDERecentDocument::recentDocuments();
@@ -365,13 +365,13 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
         return 0;
     }
 
-    connect(taskGroup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(runTask(int)));
+    connect(taskGroup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(runTask(int)));
     // so we have an actual task group menu with tasks, let's add it
 
     if (inSubMenu)
     {
-        TQObject::connect(taskGroup, TQT_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)),
-                         this, TQT_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*)));
+        TQObject::connect(taskGroup, TQ_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)),
+                         this, TQ_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*)));
 
         m_submenus.append(taskGroup);
 
@@ -389,7 +389,7 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
             rmbMenu->insertItem(title, contextMenuTitleID);
             rmbMenu->insertItem(i18n("Add This Task to Panel"));
             rmbMenu->insertItem(i18n("Modify This Task..."));
-            rmbMenu->insertItem(i18n("Remove This Task..."), this, TQT_SLOT(removeTask()));
+            rmbMenu->insertItem(i18n("Remove This Task..."), this, TQ_SLOT(removeTask()));
             rmbMenu->insertItem(i18n("Insert New Task..."));
         }
     }
@@ -432,7 +432,7 @@ void TOM::initialize()
     }
     else
     {
-      connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
+      connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
     }*/
 
     // TASKS
@@ -486,7 +486,7 @@ void TOM::initialize()
     }
     else if (kapp->authorize("run_command"))
     {
-        insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
+        insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand()));
     }
 
     // RECENTLY USED ITEMS
@@ -494,8 +494,8 @@ void TOM::initialize()
 
     m_recentDocsMenu = new TDEPopupMenu(this, "recentDocs");
     m_recentDocsMenu->setFont(m_largerFont);
-    connect(m_recentDocsMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(initializeRecentDocs()));
-    connect(m_recentDocsMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openRecentDocument(int)));
+    connect(m_recentDocsMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(initializeRecentDocs()));
+    connect(m_recentDocsMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(openRecentDocument(int)));
     insertItem(DesktopIcon("text-x-generic", TDEIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu);
     m_submenus.append(m_recentDocsMenu);
 
@@ -512,7 +512,7 @@ void TOM::initialize()
     // if we have no destinations, put the run command here
     if (numDests == 0 && kapp->authorize("run_command"))
     {
-        insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
+        insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand()));
     }
 
 
@@ -564,7 +564,7 @@ void TOM::initialize()
     }
 
     insertItem(DesktopIcon("system-log-out", TDEIcon::SizeMedium),
-               i18n("Logout %1").arg(username), this, TQT_SLOT(logout()));
+               i18n("Logout %1").arg(username), this, TQ_SLOT(logout()));
 }
 
 void TOM::reload()
@@ -755,7 +755,7 @@ void TOM::paintEvent(TQPaintEvent * e)
 
     TQPainter p(this);
 
-    style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
+    style().drawPrimitive( TQStyle::PE_PanelPopup, &p,
                            TQRect( 0, 0, width(), height() ),
                            colorGroup(), TQStyle::Style_Default,
                            TQStyleOption( frameWidth(), 0 ) );
diff --git a/kicker/menuext/tom/tom.h b/kicker/menuext/tom/tom.h
index b67f2bd6c..7e7b9e5ec 100644
--- a/kicker/menuext/tom/tom.h
+++ b/kicker/menuext/tom/tom.h
@@ -32,7 +32,7 @@ typedef TQMap<int, KService::Ptr> TaskMap;
 
 class TOM : public KPanelMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         TOM(TQWidget *parent = 0, const char *name = 0);
@@ -102,7 +102,7 @@ class TOMFactory : public KLibFactory
 
     protected:
         TQObject* createObject(TQObject *parent = 0, const char *name = 0,
-                              const char *classname = TQOBJECT_OBJECT_NAME_STRING,
+                              const char *classname = "TQObject",
                               const TQStringList& args = TQStringList());
 };
 
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index ac2f969d8..daf6312d9 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -197,9 +197,9 @@ void AppletProxy::loadApplet(const TQString& desktopFile, const TQString& config
     }
 
     // connect updateLayout signal
-    connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout()));
+    connect(_applet, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout()));
     // connect requestFocus signal
-    connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(slotRequestFocus()));
+    connect(_applet, TQ_SIGNAL(requestFocus()), TQ_SLOT(slotRequestFocus()));
 }
 
 KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info)
@@ -258,8 +258,8 @@ void AppletProxy::dock(const TQCString& callbackID)
     DCOPClient* dcop = kapp->dcopClient();
 
     dcop->setNotifications(true);
-    connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)),
-	    TQT_SLOT(slotApplicationRemoved(const TQCString&)));
+    connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)),
+	    TQ_SLOT(slotApplicationRemoved(const TQCString&)));
 
     WId win;
 
diff --git a/kicker/proxy/appletproxy.h b/kicker/proxy/appletproxy.h
index 4c504022f..59fb375b7 100644
--- a/kicker/proxy/appletproxy.h
+++ b/kicker/proxy/appletproxy.h
@@ -36,7 +36,7 @@ class KickerPluginManager;
 
 class AppletProxy : public TQObject, DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     AppletProxy(TQObject* parent, const char* name = 0);
diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp
index c210e7b9e..e91d7ac7f 100644
--- a/kicker/proxy/extensiondebugger.cpp
+++ b/kicker/proxy/extensiondebugger.cpp
@@ -129,7 +129,7 @@ int main( int argc, char ** argv )
     ExtensionContainer *container = new ExtensionContainer( extension );
     container->show();
 
-    TQObject::connect( &a, TQT_SIGNAL( lastWindowClosed() ), &a, TQT_SLOT( quit() ) );
+    TQObject::connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) );
 
     int result = a.exec();
 
@@ -143,8 +143,8 @@ ExtensionContainer::ExtensionContainer( KPanelExtension *extension, TQWidget *pa
     ( new TQVBoxLayout( this ) )->setAutoAdd( true );
 
     TQPushButton *configButton = new TQPushButton( i18n( "Configure..." ), this );
-    connect( configButton, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( showPreferences() ) );
+    connect( configButton, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( showPreferences() ) );
 
     m_extension->reparent( this, TQPoint( 0, 0 ) );
 }
diff --git a/kicker/proxy/extensiondebugger.h b/kicker/proxy/extensiondebugger.h
index 0f4719b9f..fd1cba1af 100644
--- a/kicker/proxy/extensiondebugger.h
+++ b/kicker/proxy/extensiondebugger.h
@@ -29,7 +29,7 @@ class KPanelExtension;
 
 class ExtensionContainer : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ExtensionContainer(KPanelExtension *extension, TQWidget* parent = 0, const char* name = 0);
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index 13c40e67b..4168bc14a 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -161,7 +161,7 @@ void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString
     }
 
     // connect updateLayout signal
-    connect(_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout()));
+    connect(_extension, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout()));
 }
 
 KPanelExtension* ExtensionProxy::loadExtension(const AppletInfo& info)
@@ -198,8 +198,8 @@ void ExtensionProxy::dock(const TQCString& callbackID)
     DCOPClient* dcop = kapp->dcopClient();
 
     dcop->setNotifications(true);
-    connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)),
-	    TQT_SLOT(slotApplicationRemoved(const TQCString&)));
+    connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)),
+	    TQ_SLOT(slotApplicationRemoved(const TQCString&)));
 
     WId win;
 
diff --git a/kicker/proxy/extensionproxy.h b/kicker/proxy/extensionproxy.h
index 88bc0a325..d32b8f70b 100644
--- a/kicker/proxy/extensionproxy.h
+++ b/kicker/proxy/extensionproxy.h
@@ -35,7 +35,7 @@ class KPanelExtension;
 
 class ExtensionProxy : public TQObject, DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ExtensionProxy(TQObject* parent, const char* name = 0);
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index 29c06da89..ac0133668 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "taskbar.h"
 #include "taskbar.moc"
 
-#define READ_MERGED_TASBKAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x())
+#define READ_MERGED_TASKBAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x())
 
 TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent, const char *name )
     : Panner( parent, name ),
@@ -81,7 +81,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin
 
     // init
     setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
-    m_sortByAppPrev = READ_MERGED_TASBKAR_SETTING(sortByApp);
+    m_sortByAppPrev = READ_MERGED_TASKBAR_SETTING(sortByApp);
 
     // setup animation frames
     for (int i = 1; i < 11; i++)
@@ -92,24 +92,24 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin
     // configure
     configure();
 
-    connect(&m_relayoutTimer, TQT_SIGNAL(timeout()),
-            this, TQT_SLOT(reLayout()));
+    connect(&m_relayoutTimer, TQ_SIGNAL(timeout()),
+            this, TQ_SLOT(reLayout()));
 
-		connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground()));
+		connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground()));
 
     // connect manager
-    connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)),
-            this, TQT_SLOT(add(Task::Ptr)));
-    connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)),
-            this, TQT_SLOT(remove(Task::Ptr)));
-    connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)),
-            this, TQT_SLOT(add(Startup::Ptr)));
-    connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)),
-            this, TQT_SLOT(remove(Startup::Ptr)));
-    connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)),
-            this, TQT_SLOT(desktopChanged(int)));
-    connect(TaskManager::the(), TQT_SIGNAL(windowChanged(Task::Ptr)),
-            this, TQT_SLOT(windowChanged(Task::Ptr)));
+    connect(TaskManager::the(), TQ_SIGNAL(taskAdded(Task::Ptr)),
+            this, TQ_SLOT(add(Task::Ptr)));
+    connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)),
+            this, TQ_SLOT(remove(Task::Ptr)));
+    connect(TaskManager::the(), TQ_SIGNAL(startupAdded(Startup::Ptr)),
+            this, TQ_SLOT(add(Startup::Ptr)));
+    connect(TaskManager::the(), TQ_SIGNAL(startupRemoved(Startup::Ptr)),
+            this, TQ_SLOT(remove(Startup::Ptr)));
+    connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)),
+            this, TQ_SLOT(desktopChanged(int)));
+    connect(TaskManager::the(), TQ_SIGNAL(windowChanged(Task::Ptr)),
+            this, TQ_SLOT(windowChanged(Task::Ptr)));
 
     isGrouping = shouldGroup();
 
@@ -131,8 +131,8 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin
 
     blocklayout = false;
 
-    connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
-    keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+    connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+    keys = new TDEGlobalAccel( this );
 #include "taskbarbindings.cpp"
     keys->readSettings();
     keys->updateConnections();
@@ -174,31 +174,40 @@ KTextShadowEngine *TaskBar::textShadowEngine()
     return m_textShadowEngine;
 }
 
-
-TQSize TaskBar::sizeHint() const
+int TaskBar::buttonHeight() const
 {
-    // get our minimum height based on the minimum button height or the
-    // height of the font in use, which is largest
     TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
-    int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ?
-                          fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight);
+    int bh = TQMAX(fm.height(), READ_MERGED_TASKBAR_SETTING(minimumButtonHeight));
+
+    if(showIcons())
+    {
+        bh = TQMAX(bh, READ_MERGED_TASKBAR_SETTING(iconSize));
+    }
+
+    return bh + 2;
+}
+
+int TaskBar::buttonWidth() const
+{
+    return TQMAX(BUTTON_MIN_WIDTH, READ_MERGED_TASKBAR_SETTING(iconSize)) + 2;
+}
 
-    return TQSize(BUTTON_MIN_WIDTH, minButtonHeight);
+
+TQSize TaskBar::sizeHint() const
+{
+    return TQSize(buttonWidth(), buttonHeight());
 }
 
 TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
 {
-    // get our minimum height based on the minimum button height or the
-    // height of the font in use, which is largest
-    TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
-    int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ?
-                          fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight);
+    // get our minimum height based on the minimum button height, the icon size or the
+    // height of the font in use, whichever is largest
 
     if ( p == KPanelExtension::Left || p == KPanelExtension::Right )
     {
         // Vertical layout
         // Minimum space allows for one icon, the window list button and the up/down scrollers
-        int minHeight = minButtonHeight*3;
+        int minHeight = buttonHeight()*3;
         if (minHeight > maxSize.height())
             return maxSize;
         return TQSize(maxSize.width(), minHeight);
@@ -207,7 +216,7 @@ TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
     {
         // Horizontal layout
         // Minimum space allows for one column of icons, the window list button and the left/right scrollers
-        int min_width=BUTTON_MIN_WIDTH*3;
+        int min_width=buttonWidth()*3;
         if (min_width > maxSize.width())
             return maxSize;
         return TQSize(min_width, maxSize.height());
@@ -233,16 +242,18 @@ void TaskBar::configure()
     bool wasDisplayIconsNText = m_displayIconsNText;
     bool wasShowOnlyIconified = m_showOnlyIconified;
     int  wasShowTaskStates = m_showTaskStates;
+    int  wasIconSize = m_iconSize;
 
-    m_showAllWindows = READ_MERGED_TASBKAR_SETTING(showAllWindows);
-    m_sortByDesktop = m_showAllWindows && READ_MERGED_TASBKAR_SETTING(sortByDesktop);
-    m_displayIconsNText = READ_MERGED_TASBKAR_SETTING(displayIconsNText);
-    m_showOnlyIconified = READ_MERGED_TASBKAR_SETTING(showOnlyIconified);
-    m_cycleWheel = READ_MERGED_TASBKAR_SETTING(cycleWheel);
-    m_showTaskStates = READ_MERGED_TASBKAR_SETTING(showTaskStates);
+    m_showAllWindows = READ_MERGED_TASKBAR_SETTING(showAllWindows);
+    m_sortByDesktop = m_showAllWindows && READ_MERGED_TASKBAR_SETTING(sortByDesktop);
+    m_displayIconsNText = READ_MERGED_TASKBAR_SETTING(displayIconsNText);
+    m_showOnlyIconified = READ_MERGED_TASKBAR_SETTING(showOnlyIconified);
+    m_cycleWheel = READ_MERGED_TASKBAR_SETTING(cycleWheel);
+    m_showTaskStates = READ_MERGED_TASKBAR_SETTING(showTaskStates);
+    m_iconSize = READ_MERGED_TASKBAR_SETTING(iconSize);
 
     m_currentScreen = -1;    // Show all screens or re-get our screen
-    m_showOnlyCurrentScreen = (READ_MERGED_TASBKAR_SETTING(showCurrentScreenOnly) &&
+    m_showOnlyCurrentScreen = (READ_MERGED_TASKBAR_SETTING(showCurrentScreenOnly) &&
                               TQApplication::desktop()->isVirtualDesktop() &&
                               TQApplication::desktop()->numScreens() > 1);
 
@@ -250,12 +261,12 @@ void TaskBar::configure()
     // are paying attention to the current Xinerama screen
     // disconnect first in case we've been here before
     // to avoid multiple connections
-    disconnect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)),
-                this, TQT_SLOT(windowChangedGeometry(Task::Ptr)));
+    disconnect(TaskManager::the(), TQ_SIGNAL(windowChangedGeometry(Task::Ptr)),
+                this, TQ_SLOT(windowChangedGeometry(Task::Ptr)));
     if (m_showOnlyCurrentScreen)
     {
-        connect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)),
-                 this, TQT_SLOT(windowChangedGeometry(Task::Ptr)));
+        connect(TaskManager::the(), TQ_SIGNAL(windowChangedGeometry(Task::Ptr)),
+                 this, TQ_SLOT(windowChangedGeometry(Task::Ptr)));
     }
     TaskManager::the()->trackGeometry(m_showOnlyCurrentScreen);
 
@@ -264,7 +275,8 @@ void TaskBar::configure()
         wasDisplayIconsNText != m_displayIconsNText ||
         wasCycleWheel != m_cycleWheel ||
         wasShowOnlyIconified != m_showOnlyIconified ||
-        wasShowTaskStates != m_showTaskStates)
+        wasShowTaskStates != m_showTaskStates ||
+        wasIconSize != m_iconSize)
     {
         // relevant settings changed, update our task containers
         for (TaskContainer::Iterator it = containers.begin();
@@ -275,12 +287,12 @@ void TaskBar::configure()
         }
     }
 
-    if (m_sortByAppPrev != READ_MERGED_TASBKAR_SETTING(sortByApp)) {
-        m_sortByAppPrev = READ_MERGED_TASBKAR_SETTING(sortByApp);
+    if (m_sortByAppPrev != READ_MERGED_TASKBAR_SETTING(sortByApp)) {
+        m_sortByAppPrev = READ_MERGED_TASKBAR_SETTING(sortByApp);
         reSort();
     }
 
-    TaskManager::the()->setXCompositeEnabled(READ_MERGED_TASBKAR_SETTING(showThumbnails));
+    TaskManager::the()->setXCompositeEnabled(READ_MERGED_TASKBAR_SETTING(showThumbnails));
 
     reLayoutEventually();
 }
@@ -374,7 +386,7 @@ void TaskBar::add(Startup::Ptr startup)
     // create new container
     TaskContainer *container = new TaskContainer(startup, frames, this, m_settingsObject, m_globalSettingsObject, viewport());
     m_hiddenContainers.append(container);
-    connect(container, TQT_SIGNAL(showMe(TaskContainer*)), this, TQT_SLOT(showTaskContainer(TaskContainer*)));
+    connect(container, TQ_SIGNAL(showMe(TaskContainer*)), this, TQ_SLOT(showTaskContainer(TaskContainer*)));
 }
 
 void TaskBar::reSort()
@@ -409,7 +421,7 @@ void TaskBar::showTaskContainer(TaskContainer* container)
     }
 
     // try to place the container after one of the same app
-    if (READ_MERGED_TASBKAR_SETTING(sortByApp))
+    if (READ_MERGED_TASKBAR_SETTING(sortByApp))
     {
         TaskContainer::Iterator it = containers.begin();
         for (; it != containers.end(); ++it)
@@ -731,14 +743,12 @@ void TaskBar::reLayout()
     // number of rows simply depends on our height which is either the
     // minimum button height or the height of the font in use, whichever is
     // largest
-    TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
-    int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ?
-                          fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight);
+    int minButtonHeight = buttonHeight();
 
     // horizontal layout
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
-        int bwidth=BUTTON_MIN_WIDTH;
+        int bwidth=buttonWidth();
         int rows = contentsRect().height() / minButtonHeight;
         if (rows<1)
           rows=1;
@@ -752,20 +762,20 @@ void TaskBar::reLayout()
         int bpr = static_cast<int>(ceil(static_cast<double>(list.count()) / rows));
 
         // adjust content size
-        if ( contentsRect().width() < bpr * BUTTON_MIN_WIDTH )
+        if ( contentsRect().width() < bpr * bwidth )
         {
-            resizeContents( bpr * BUTTON_MIN_WIDTH, contentsRect().height() );
+            resizeContents( bpr * bwidth, contentsRect().height() );
         }
 
         // maximum number of buttons per row
-        int mbpr = contentsRect().width() / BUTTON_MIN_WIDTH;
+        int mbpr = contentsRect().width() / bwidth;
 
         // expand button width if space permits and the taskbar is not in 'icons only' mode
         if (mbpr > bpr)
         {
             if (!showIcons() || showText())
               bwidth = contentsRect().width() / bpr;
-            int maxWidth = READ_MERGED_TASBKAR_SETTING(maximumButtonWidth);
+            int maxWidth = READ_MERGED_TASKBAR_SETTING(maximumButtonWidth);
             if (maxWidth > 0 && bwidth > maxWidth)
             {
                 bwidth = maxWidth;
@@ -844,7 +854,7 @@ void TaskBar::reLayout()
         }
     }
     
-    TQTimer::singleShot(100, this, TQT_SLOT(publishIconGeometry()));
+    TQTimer::singleShot(100, this, TQ_SLOT(publishIconGeometry()));
 }
 
 void TaskBar::setViewportBackground()
@@ -987,9 +997,7 @@ int TaskBar::taskCount() const
 
 int TaskBar::maximumButtonsWithoutShrinking() const
 {
-    TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
-    int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ?
-                          fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight);
+    int minButtonHeight = buttonHeight();
     int rows = contentsRect().height() / minButtonHeight;
 
     if (rows < 1)
@@ -997,9 +1005,9 @@ int TaskBar::maximumButtonsWithoutShrinking() const
         rows = 1;
     }
 
-    if ( orientation() == Qt::Horizontal ) {
+    if ( orientation() == TQt::Horizontal ) {
         // maxWidth of 0 means no max width, drop back to default
-        int maxWidth = READ_MERGED_TASBKAR_SETTING(maximumButtonWidth);
+        int maxWidth = READ_MERGED_TASKBAR_SETTING(maximumButtonWidth);
         if (maxWidth == 0)
         {
             maxWidth = BUTTON_MAX_WIDTH;
@@ -1017,8 +1025,8 @@ int TaskBar::maximumButtonsWithoutShrinking() const
 
 bool TaskBar::shouldGroup() const
 {
-    return READ_MERGED_TASBKAR_SETTING(groupTasks) == m_settingsObject->GroupAlways ||
-           ((READ_MERGED_TASBKAR_SETTING(groupTasks) == m_settingsObject->GroupWhenFull &&
+    return READ_MERGED_TASKBAR_SETTING(groupTasks) == m_settingsObject->GroupAlways ||
+           ((READ_MERGED_TASKBAR_SETTING(groupTasks) == m_settingsObject->GroupWhenFull &&
              taskCount() > maximumButtonsWithoutShrinking()));
 }
 
@@ -1166,7 +1174,7 @@ void TaskBar::activateNextTask(bool forward)
 void TaskBar::wheelEvent(TQWheelEvent* e)
 {
 
-    if(READ_MERGED_TASBKAR_SETTING(cycleWheel)) {
+    if(READ_MERGED_TASKBAR_SETTING(cycleWheel)) {
 
         if (e->delta() > 0)
         {
@@ -1246,7 +1254,7 @@ TQImage* TaskBar::blendGradient(const TQSize& size)
 
 void TaskBar::sortContainersByDesktop(TaskContainer::List& list)
 {
-    typedef TQValueVector<QPair<int, QPair<int, TaskContainer*> > > SortVector;
+    typedef TQValueVector<TQPair<int, TQPair<int, TaskContainer*> > > SortVector;
     SortVector sorted;
     sorted.resize(list.count());
     int i = 0;
diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h
index 0ab614a61..dc34129e0 100644
--- a/kicker/taskbar/taskbar.h
+++ b/kicker/taskbar/taskbar.h
@@ -70,7 +70,7 @@ namespace TaskMoveDestination
 
 class TaskBar : public Panner
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent = 0, const char *name = 0 );
@@ -137,37 +137,40 @@ protected:
     void moveEvent( TQMoveEvent* );
     bool idMatch( const TQString& id1, const TQString& id2 );
     TaskContainer::List filteredContainers();
+    int buttonHeight() const;
+    int buttonWidth() const;
 
 private:
     void sortContainersByDesktop(TaskContainer::List& list);
     void setViewportBackground();
 
-    bool			          blocklayout;
-    bool			          m_showAllWindows;
-    bool			          m_cycleWheel;
-    int 			          m_currentScreen;    // The screen to show, -1 for all screens
-    bool			          m_showOnlyCurrentScreen;
-    bool			          m_sortByDesktop;
+    bool                blocklayout;
+    bool                m_showAllWindows;
+    bool                m_cycleWheel;
+    int                 m_currentScreen;    // The screen to show, -1 for all screens
+    bool                m_showOnlyCurrentScreen;
+    bool                m_sortByDesktop;
     int                 m_displayIconsNText;
-    bool			          m_showOnlyIconified;
-    int				          m_showTaskStates;
-    ArrowType 			    arrowType;
-    TaskContainer::List	containers;
-    TaskContainer::List	m_hiddenContainers;
-    TaskContainer::List	m_deletableContainers;
-    PixmapList			    frames;
+    bool                m_showOnlyIconified;
+    int                 m_showTaskStates;
+    int                 m_iconSize;
+    ArrowType           arrowType;
+    TaskContainer::List containers;
+    TaskContainer::List m_hiddenContainers;
+    TaskContainer::List m_deletableContainers;
+    PixmapList          frames;
     int                 maximumButtonsWithoutShrinking() const;
     bool                shouldGroup() const;
     bool                isGrouping;
     void                reGroup();
     TDEGlobalAccel*     keys;
-    KTextShadowEngine*	m_textShadowEngine;
-    bool			          m_ignoreUpdates;
-    bool			          m_sortByAppPrev;
-    TQTimer			        m_relayoutTimer;
-    TQImage			        m_blendGradient;
-    TaskBarSettings*		m_settingsObject;
-    TaskBarSettings*		m_globalSettingsObject;
+    KTextShadowEngine*  m_textShadowEngine;
+    bool                m_ignoreUpdates;
+    bool                m_sortByAppPrev;
+    TQTimer             m_relayoutTimer;
+    TQImage             m_blendGradient;
+    TaskBarSettings*    m_settingsObject;
+    TaskBarSettings*    m_globalSettingsObject;
 };
 
 #endif
diff --git a/kicker/taskbar/taskbar.kcfg b/kicker/taskbar/taskbar.kcfg
index 95596ad34..86ea32dca 100644
--- a/kicker/taskbar/taskbar.kcfg
+++ b/kicker/taskbar/taskbar.kcfg
@@ -75,9 +75,9 @@
                     <label>Only Running</label>
                 </choice>
             </choices>
-	    <default>ShowAll</default>
+      <default>ShowAll</default>
             <label>Show tasks with state:</label>
-	    <whatsthis>The taskbar can show and/or hide tasks based on their current process state. Select <em>Any</em> to show all tasks regardless of current state.</whatsthis>
+      <whatsthis>The taskbar can show and/or hide tasks based on their current process state. Select <em>Any</em> to show all tasks regardless of current state.</whatsthis>
         </entry>
         <entry key="SortByDesktop" type="Bool" >
             <default>true</default>
@@ -91,9 +91,10 @@
         </entry>
         <entry key="MaximumButtonWidth" type="Int" >
             <default>200</default>
-            <min>0</min>
-            <label></label>
-            <whatsthis></whatsthis>
+            <min>50</min>
+            <max>500</max>
+            <label>Maximum button width</label>
+            <whatsthis>The maximum width to which a taskbar item can expand.</whatsthis>
         </entry>
         <entry key="MinimumButtonHeight" type="Int" >
             <default>18</default>
@@ -172,19 +173,20 @@
             <label>Draw taskbar entries "flat" and not as a button</label>
             <whatsthis>Turning this option on will cause the taskbar to draw visible button frames for each entry in the taskbar. By default, this option is off.</whatsthis>
         </entry>
+        <entry key="ShowButtonOnHover" type="Bool" >
+            <default>true</default>
+            <label>Show a visible button frame on the task the cursor is positioned over</label>
+            <whatsthis>Turning this option on will cause the taskbar to draw a visible button frame around the item currently under the mouse. By default, this option is on.</whatsthis>
+        </entry>
         <entry key="HaloText" type="Bool" >
             <default>false</default>
             <label>Draw taskbar text with a halo around it</label>
             <whatsthis>Turning this option on will cause the taskbar to draw fancier text that has an outline around it. While this is useful for transparent panels or particularly dark panel backgrounds, it is slower.</whatsthis>
         </entry>
-        <entry key="ShowButtonOnHover" type="Bool" >
-            <default>true</default>
-            <label>Show a visible button frame on the task the cursor is positioned over</label>
-        </entry>
         <entry key="ShowThumbnails" type="Bool" >
             <default>false</default>
             <label>Show thumbnails instead of icons in the mouse-over effects</label>
-            <whatsthis>Enabling this option will draw a thumbnail of the window in its mouse-over effect.<p>If a window is minimized or resides on a different desktop while the taskbar is starting, an icon is shown until the window is restored or the appropriate desktop is activated, respectively.</p></whatsthis>
+            <whatsthis>Enabling this option will draw a thumbnail of the window in its mouse-over effect.<p>If a window is minimized or resides on a different desktop while the taskbar is starting, an icon is shown until the window is restored or the appropriate desktop is activated, respectively. This options needs a TWin compositor in order to work.</p></whatsthis>
         </entry>
         <entry key="ThumbnailMaxDimension" type="UInt" >
             <default>100</default>
@@ -198,18 +200,21 @@
         </entry>
         <entry name="ActiveTaskTextColor" type="Color" >
             <label>Color to use for active task button text</label>
-            <default code="true">QColor()</default>
+            <default code="true">TQColor()</default>
             <whatsthis>This color is used for displaying text on taskbar button for task which is active at the moment.</whatsthis>
         </entry>
         <entry name="InactiveTaskTextColor" type="Color" >
             <label>Color to use for inactive tasks button text</label>
-            <default code="true">QColor()</default>
+            <default code="true">TQColor()</default>
             <whatsthis>This color is used for displaying text on taskbar button for tasks other than active.</whatsthis>
         </entry>
         <entry name="TaskBackgroundColor" type="Color" >
             <label>Color to use for taskbar buttons background</label>
-            <default code="true">QColor()</default>
+            <default code="true">TQColor()</default>
             <whatsthis>This color is used for displaying background of taskbar buttons.</whatsthis>
         </entry>
+        <entry name="IconSize" type="UInt" >
+            <default>16</default>
+        </entry>
     </group>
 </kcfg>
diff --git a/kicker/taskbar/taskbarbindings.cpp b/kicker/taskbar/taskbarbindings.cpp
index 364faac97..f604e3bc6 100644
--- a/kicker/taskbar/taskbarbindings.cpp
+++ b/kicker/taskbar/taskbarbindings.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
 #else
 # define DEF( name, key3, key4, fnSlot ) \
    keys->insert( name, i18n(name), TQString(), key3, key4 )
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index a891cf64e..efde7dd2c 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -99,7 +99,7 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid
     taskBar = new TaskBar(settingsObject, globalSettingsObject, this);
     layout->addWidget( taskBar );
 
-    connect( taskBar, TQT_SIGNAL( containerCountChanged() ), TQT_SIGNAL( containerCountChanged() ) );
+    connect( taskBar, TQ_SIGNAL( containerCountChanged() ), TQ_SIGNAL( containerCountChanged() ) );
 
     setBackground();
 
@@ -134,10 +134,10 @@ void TaskBarContainer::configure()
         // window list button
         windowListButton = new SimpleButton(this);
         windowListMenu= new KWindowListMenu;
-        connect(windowListButton, TQT_SIGNAL(pressed()),
-                TQT_SLOT(showWindowListMenu()));
-        connect(windowListMenu, TQT_SIGNAL(aboutToHide()),
-                TQT_SLOT(windowListMenuAboutToHide()));
+        connect(windowListButton, TQ_SIGNAL(pressed()),
+                TQ_SLOT(showWindowListMenu()));
+        connect(windowListMenu, TQ_SIGNAL(aboutToHide()),
+                TQ_SLOT(windowListMenuAboutToHide()));
 
         // geometry
         TQString icon;
@@ -207,7 +207,7 @@ void TaskBarContainer::preferences()
 
 void TaskBarContainer::orientationChange(Orientation o)
 {
-    if (o == Qt::Horizontal)
+    if (o == TQt::Horizontal)
      {
         if (windowListButton)
         {
@@ -299,9 +299,9 @@ void TaskBarContainer::showWindowListMenu()
             break;
     }
 
-    disconnect( windowListButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( showWindowListMenu() ) );
+    disconnect( windowListButton, TQ_SIGNAL( pressed() ), this, TQ_SLOT( showWindowListMenu() ) );
     windowListMenu->exec( pos );
-    TQTimer::singleShot(100, this, TQT_SLOT(reconnectWindowListButton()));
+    TQTimer::singleShot(100, this, TQ_SLOT(reconnectWindowListButton()));
 }
 
 void TaskBarContainer::windowListMenuAboutToHide()
@@ -313,7 +313,7 @@ void TaskBarContainer::windowListMenuAboutToHide()
 
 void TaskBarContainer::reconnectWindowListButton()
 {
-    connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) );
+    connect( windowListButton, TQ_SIGNAL( pressed() ), TQ_SLOT( showWindowListMenu() ) );
 }
 
 TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
diff --git a/kicker/taskbar/taskbarcontainer.h b/kicker/taskbar/taskbarcontainer.h
index 7fc13241f..a8b078d67 100644
--- a/kicker/taskbar/taskbarcontainer.h
+++ b/kicker/taskbar/taskbarcontainer.h
@@ -38,7 +38,7 @@ class TaskBarSettings;
 
 class KDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 public:
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index cc533f0b9..5a8464cd5 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -26,6 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <assert.h>
 
+#ifdef Q_OS_SOLARIS
+#include <procfs.h>
+#endif /* SunOS */
+
 #include <tqbitmap.h>
 #include <tqcolor.h>
 #include <tqcursor.h>
@@ -45,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kiconloader.h>
 #include <kimageeffect.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <netwm.h>
 #include <fixx11h.h>
@@ -62,8 +66,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "taskcontainer.h"
 #include "taskcontainer.moc"
 
-#define READ_MERGED_TASBKAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x())
-#define READ_MERGED_TASBKAR_ACTION(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->action(x):m_settingsObject->action(x))
+#define READ_MERGED_TASKBAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x())
+#define READ_MERGED_TASKBAR_ACTION(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->action(x):m_settingsObject->action(x))
 
 static Bool netwm_atoms_created = False;
 static Atom net_wm_pid = 0;
@@ -96,6 +100,18 @@ static void create_atoms(Display *d) {
 }
 
 bool is_process_resumable(pid_t pid) {
+#ifdef Q_OS_SOLARIS
+	TQFile procStatFile(TQString("/proc/%1/lwp/1/lwpsinfo").arg(pid));
+	if (procStatFile.open(IO_ReadOnly)) {
+		TQByteArray statRaw = procStatFile.readAll();
+		lwpsinfo_t *inf = (lwpsinfo_t *)statRaw.data();
+
+		procStatFile.close();
+		if( inf->pr_sname == 'T' ) {
+			return true;
+		}
+	}
+#else /* default */
 	TQFile procStatFile(TQString("/proc/%1/stat").arg(pid));
 	if (procStatFile.open(IO_ReadOnly)) {
 		TQByteArray statRaw = procStatFile.readAll();
@@ -107,13 +123,9 @@ bool is_process_resumable(pid_t pid) {
 		if( state == "T" ) {
 			return true;
 		}
-		else {
-			return false;
-		}
-	}
-	else {
-		return false;
 	}
+#endif /* read process status */
+	return false;
 }
 
 TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar, TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent, const char *name)
@@ -174,7 +186,7 @@ TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames, Ta
 
     sid = m_startup->bin();
 
-    connect(m_startup, TQT_SIGNAL(changed()), TQT_SLOT(update()));
+    connect(m_startup, TQ_SIGNAL(changed()), TQ_SLOT(update()));
 
     dragSwitchTimer.start(333, true);
 }
@@ -192,16 +204,18 @@ void TaskContainer::init()
 
     if (!netwm_atoms_created) create_atoms(TQPaintDevice::x11AppDisplay());
 
+    int iconSize = READ_MERGED_TASKBAR_SETTING(iconSize);
+
     setWFlags(TQt::WNoAutoErase);
     setBackgroundMode(NoBackground);
-    animBg = TQPixmap(16, 16);
+    animBg = TQPixmap(iconSize, iconSize);
 
     installEventFilter(KickerTip::the());
 
-    connect(&animationTimer, TQT_SIGNAL(timeout()), TQT_SLOT(animationTimerFired()));
-    connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(showMe()));
-    connect(&attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimerFired()));
-    connect(&m_paintEventCompressionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateNow()));
+    connect(&animationTimer, TQ_SIGNAL(timeout()), TQ_SLOT(animationTimerFired()));
+    connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(showMe()));
+    connect(&attentionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(attentionTimerFired()));
+    connect(&m_paintEventCompressionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateNow()));
 }
 
 TaskContainer::~TaskContainer()
@@ -221,8 +235,8 @@ void TaskContainer::showMe()
         animationTimer.start(100);
 
     emit showMe(this);
-    disconnect(&dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showMe()));
-    connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch()));
+    disconnect(&dragSwitchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showMe()));
+    connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(dragSwitch()));
 }
 
 void TaskContainer::stopTimers()
@@ -242,7 +256,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange)
         return;
     }
 
-    const TQObject* source = TQT_TQOBJECT_CONST(sender());
+    const TQObject* source = sender();
     Task::Ptr task = 0;
     Task::List::const_iterator itEnd = tasks.constEnd();
     for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it)
@@ -265,7 +279,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange)
 
 void TaskContainer::iconChanged()
 {
-    const TQObject* source = TQT_TQOBJECT_CONST(sender());
+    const TQObject* source = sender();
     Task::Ptr task = 0;
     Task::List::const_iterator itEnd = tasks.constEnd();
     for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it)
@@ -366,11 +380,11 @@ void TaskContainer::checkAttention(const Task::Ptr t)
 void TaskContainer::attentionTimerFired()
 {
     assert( attentionState != -1 );
-    if (attentionState < READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations)*2)
+    if (attentionState < READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations)*2)
     {
         ++attentionState;
     }
-    else if (READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations) < 1000)
+    else if (READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations) < 1000)
     {
         attentionTimer.stop();
     }
@@ -390,9 +404,22 @@ TQSizePolicy TaskContainer::sizePolicy() const
 
 void TaskContainer::resizeEvent( TQResizeEvent * )
 {
-    // calculate the icon rect
-    TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) );
-    iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this );
+    recalculateIconRect();
+}
+
+void TaskContainer::recalculateIconRect()
+{
+    iconSize = READ_MERGED_TASKBAR_SETTING(iconSize);
+
+    if(taskBar->showText())
+    {
+        TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) );
+        iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - iconSize) / 2, iconSize, iconSize), this );
+    }
+    else
+    {
+        iconRect = TQStyle::visualRect( TQRect((width() - iconSize) / 2, (height() - iconSize) / 2, iconSize, iconSize), this );
+    }
 }
 
 void TaskContainer::add(Task::Ptr task)
@@ -415,9 +442,9 @@ void TaskContainer::add(Task::Ptr task)
     KickerTip::Client::updateKickerTip();
     update();
 
-    connect(task, TQT_SIGNAL(changed(bool)), TQT_SLOT(taskChanged(bool)));
-    connect(task, TQT_SIGNAL(iconChanged()), TQT_SLOT(iconChanged()));
-    connect(task, TQT_SIGNAL(activated()), TQT_SLOT(setLastActivated()));
+    connect(task, TQ_SIGNAL(changed(bool)), TQ_SLOT(taskChanged(bool)));
+    connect(task, TQ_SIGNAL(iconChanged()), TQ_SLOT(iconChanged()));
+    connect(task, TQ_SIGNAL(activated()), TQ_SLOT(setLastActivated()));
 }
 
 void TaskContainer::remove(Task::Ptr task)
@@ -581,13 +608,14 @@ void TaskContainer::drawButton(TQPainter *p)
     TQPixmap *pm((TQPixmap*)p->device());
     TQPixmap pixmap; // icon
     Task::Ptr task = 0;
-    bool iconified = !READ_MERGED_TASBKAR_SETTING(showOnlyIconified);
-    bool halo = READ_MERGED_TASBKAR_SETTING(haloText);
-    bool alwaysDrawButtons = READ_MERGED_TASBKAR_SETTING(drawButtons);
+    bool iconified = !READ_MERGED_TASKBAR_SETTING(showOnlyIconified);
+    bool halo = READ_MERGED_TASKBAR_SETTING(haloText);
+    bool alwaysDrawButtons = READ_MERGED_TASKBAR_SETTING(drawButtons);
     bool drawButton = alwaysDrawButtons ||
                       (m_mouseOver && !halo && isEnabled() &&
-                       READ_MERGED_TASBKAR_SETTING(showButtonOnHover));
+                       READ_MERGED_TASKBAR_SETTING(showButtonOnHover));
     TQFont font(TDEGlobalSettings::taskbarFont());
+    recalculateIconRect();
 
     // draw sunken if we contain the active task
     bool active = false;
@@ -608,7 +636,7 @@ void TaskContainer::drawButton(TQPainter *p)
 
         if (task->demandsAttention())
         {
-            demandsAttention = attentionState == READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations) ||
+            demandsAttention = attentionState == READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations) ||
                                attentionState % 2 == 0;
         }
     }
@@ -616,15 +644,15 @@ void TaskContainer::drawButton(TQPainter *p)
     font.setBold(active);
 
     TQColorGroup colors = palette().active();
-    
-    if (READ_MERGED_TASBKAR_SETTING(useCustomColors))
+
+    if (READ_MERGED_TASKBAR_SETTING(useCustomColors))
     {
-        colors.setColor( TQColorGroup::Button, READ_MERGED_TASBKAR_SETTING(taskBackgroundColor));
-        colors.setColor( TQColorGroup::Background, READ_MERGED_TASBKAR_SETTING(taskBackgroundColor) );
-        colors.setColor( TQColorGroup::ButtonText, READ_MERGED_TASBKAR_SETTING(inactiveTaskTextColor) );
-        colors.setColor( TQColorGroup::Text, READ_MERGED_TASBKAR_SETTING(inactiveTaskTextColor) );
+        colors.setColor( TQColorGroup::Button, READ_MERGED_TASKBAR_SETTING(taskBackgroundColor));
+        colors.setColor( TQColorGroup::Background, READ_MERGED_TASKBAR_SETTING(taskBackgroundColor) );
+        colors.setColor( TQColorGroup::ButtonText, READ_MERGED_TASKBAR_SETTING(inactiveTaskTextColor) );
+        colors.setColor( TQColorGroup::Text, READ_MERGED_TASKBAR_SETTING(inactiveTaskTextColor) );
     }
-    
+
     if (demandsAttention)
     {
         if (!drawButton)
@@ -638,7 +666,7 @@ void TaskContainer::drawButton(TQPainter *p)
             for (int i = 0; i < 2; ++i)
             {
                 line = KickerLib::blendColors(line, colors.background());
-                p->setPen(TQPen(line, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+                p->setPen(TQPen(line, 1, TQt::SolidLine, TQt::RoundCap, TQt::RoundJoin));
                 r.addCoords(-1, -1, 1, 1);
                 p->drawRect(r);
             }
@@ -659,7 +687,7 @@ void TaskContainer::drawButton(TQPainter *p)
     // get the task icon
     if (task)
     {
-        pixmap = task->pixmap();
+        pixmap = task->icon(iconSize, iconSize, true);
     }
 
     bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate));
@@ -671,13 +699,13 @@ void TaskContainer::drawButton(TQPainter *p)
     // draw button background
     if (drawButton)
     {
-        if (READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()) {
-            style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p,
+        if (READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()) {
+            style().drawPrimitive(TQStyle::PE_ButtonBevel, p,
                               TQRect(1, 1, width()-3, height()-2),
                               colors, sunken ? TQStyle::Style_On : TQStyle::Style_Raised);
         }
         else {
-            style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p,
+            style().drawPrimitive(TQStyle::PE_ButtonTool, p,
                               TQRect(1, 1, width()-2, height()-2),
                               colors, sunken ? TQStyle::Style_Down : TQStyle::Style_Raised);
         }
@@ -690,21 +718,21 @@ void TaskContainer::drawButton(TQPainter *p)
     }
 
     TQString text = name();  // find text
-    int textPos = ( taskBar->showIcons() && (!pixmap.isNull() || m_startup)) ? 2 + 16 + 2 : 0;
+    int textPos = ( taskBar->showIcons() && (!pixmap.isNull() || m_startup)) ? 2 + iconSize + 2 : 0;
 
     // show icons
     if (taskBar->showIcons())
     {
       if (pixmap.isNull() && m_startup)
-          pixmap = SmallIcon(m_startup->icon());
+          pixmap = kapp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize);
 
       if ( !pixmap.isNull() )
       {
-          // make sure it is no larger than 16x16
-          if ( pixmap.width() > 16 || pixmap.height() > 16 )
+          // make sure it is no larger than icon size
+          if ( pixmap.width() > iconSize || pixmap.height() > iconSize )
           {
               TQImage tmp = pixmap.convertToImage();
-              pixmap.convertFromImage( tmp.smoothScale( 16, 16 ) );
+              pixmap.convertFromImage( tmp.smoothScale( iconSize, iconSize ) );
           }
 
           // fade out the icon when minimized
@@ -718,28 +746,36 @@ void TaskContainer::drawButton(TQPainter *p)
       }
 
       // modified overlay icon
-      if (taskBar->showText())
+      static TQString modStr = "[" + i18n( "modified" ) + "]";
+      int modStrPos = text.find( modStr );
+      if (modStrPos >= 0)
       {
-        static TQString modStr = "[" + i18n( "modified" ) + "]";
-        int modStrPos = text.find( modStr );
-        if (modStrPos >= 0)
+        TQRect r;
+        TQPixmap modPixmap = SmallIcon("modified");
+        if (iconified)
         {
-          // +1 because we include a space after the closing brace.
-          text.remove(modStrPos, modStr.length() + 1);
-          TQPixmap modPixmap = SmallIcon("modified");
+            TDEIconEffect::semiTransparent(modPixmap);
+        }
 
-          // draw modified overlay
-          if (!modPixmap.isNull())
-          {
-            TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos,(height() - 16) / 2, 16, 16), this);
-            if (iconified)
+        if (taskBar->showText()) // has text
+        {
+            // +1 because we include a space after the closing brace.
+            text.remove(modStrPos, modStr.length() + 1);
+
+            // draw modified overlay
+            if (!modPixmap.isNull())
             {
-              TDEIconEffect::semiTransparent(modPixmap);
+                r = TQStyle::visualRect(TQRect(br.x() + textPos,(height() - iconSize) / 2, iconSize, iconSize), this);
+                textPos += iconSize + 2;
             }
-            p->drawPixmap(r, modPixmap);
-            textPos += 16 + 2;
-          }
-        }
+         }
+         else if (taskBar->showIcons()) // has only icon
+         {
+             r = TQRect(0, 0, iconSize / 2, iconSize / 2);
+             r.moveBottomRight(iconRect.bottomRight());
+         }
+
+         p->drawPixmap(r, modPixmap);
       }
     }
 
@@ -765,9 +801,9 @@ void TaskContainer::drawButton(TQPainter *p)
           }
           else // hack for the dotNET style and others
           {
-              if (READ_MERGED_TASBKAR_SETTING(useCustomColors))
+              if (READ_MERGED_TASKBAR_SETTING(useCustomColors))
               {
-                  textPen = TQPen(READ_MERGED_TASBKAR_SETTING(activeTaskTextColor));
+                  textPen = TQPen(READ_MERGED_TASKBAR_SETTING(activeTaskTextColor));
               }
               else
               {
@@ -775,7 +811,7 @@ void TaskContainer::drawButton(TQPainter *p)
               }
           }
 
-          int availableWidth = width() - (br.x() * 2) - textPos - 2 - (READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())?2:0;
+          int availableWidth = width() - (br.x() * 2) - textPos - 2 - (READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())?2:0;
           if (m_filteredTasks.count() > 1)
           {
               availableWidth -= 8;
@@ -852,16 +888,16 @@ void TaskContainer::drawButton(TQPainter *p)
     }
 
     // draw popup arrow
-    if ((m_filteredTasks.count() > 1) && (!(READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())))
+    if ((m_filteredTasks.count() > 1) && (!(READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())))
     {
         TQStyle::PrimitiveElement e = TQStyle::PE_ArrowLeft;
 
         switch (arrowType)
         {
-            case Qt::LeftArrow:  e = TQStyle::PE_ArrowLeft;  break;
-            case Qt::RightArrow: e = TQStyle::PE_ArrowRight; break;
-            case Qt::UpArrow:    e = TQStyle::PE_ArrowUp;    break;
-            case Qt::DownArrow:  e = TQStyle::PE_ArrowDown;  break;
+            case TQt::LeftArrow:  e = TQStyle::PE_ArrowLeft;  break;
+            case TQt::RightArrow: e = TQStyle::PE_ArrowRight; break;
+            case TQt::UpArrow:    e = TQStyle::PE_ArrowUp;    break;
+            case TQt::DownArrow:  e = TQStyle::PE_ArrowDown;  break;
         }
 
         int flags = TQStyle::Style_Enabled;
@@ -872,7 +908,7 @@ void TaskContainer::drawButton(TQPainter *p)
             flags |= TQStyle::Style_Down;
         }
 
-        style().tqdrawPrimitive(e, p, ar, colors, flags);
+        style().drawPrimitive(e, p, ar, colors, flags);
     }
     
     // draw mouse over frame in transparent mode
@@ -979,7 +1015,7 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e )
         return;
     }
 
-    if (e->button() == Qt::LeftButton)
+    if (e->button() == TQt::LeftButton)
     {
         m_dragStartPos = e->pos();
     }
@@ -994,15 +1030,15 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e )
     // Other actions will be handled in mouseReleaseEvent
     switch (e->button())
     {
-        case Qt::LeftButton:
-            buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->LeftButton);
+        case TQt::LeftButton:
+            buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton);
             break;
-        case Qt::MidButton:
-            buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->MiddleButton);
+        case TQt::MidButton:
+            buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton);
             break;
-        case Qt::RightButton:
+        case TQt::RightButton:
         default:
-            buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->RightButton);
+            buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton);
             break;
     }
 
@@ -1018,14 +1054,14 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
 {
     m_dragStartPos = TQPoint();
 
-    if (!READ_MERGED_TASBKAR_SETTING(drawButtons))
+    if (!READ_MERGED_TASKBAR_SETTING(drawButtons))
     {
         setDown(false);
     }
 
     // This is to avoid the flicker caused by redrawing the
     // button as unpressed just before it's activated.
-    if (!TQT_TQRECT_OBJECT(rect()).contains(e->pos()))
+    if (!rect().contains(e->pos()))
     {
         TQToolButton::mouseReleaseEvent(e);
         return;
@@ -1035,15 +1071,15 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
 
     switch (e->button())
     {
-        case Qt::LeftButton:
-            buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->LeftButton);
+        case TQt::LeftButton:
+            buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton);
             break;
-        case Qt::MidButton:
-            buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->MiddleButton);
+        case TQt::MidButton:
+            buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton);
             break;
-        case Qt::RightButton:
+        case TQt::RightButton:
         default:
-            buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->RightButton);
+            buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton);
             break;
     }
 
@@ -1061,7 +1097,7 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
     }
 
     performAction( buttonAction );
-    TQTimer::singleShot(0, this, TQT_SLOT(update()));
+    TQTimer::singleShot(0, this, TQ_SLOT(update()));
 }
 
 void TaskContainer::performAction(int action)
@@ -1223,7 +1259,7 @@ void TaskContainer::popupMenu(int action)
             return;
         }
 
-        m_menu = new TaskRMBMenu(m_filteredTasks, taskBar->showAllWindows(), (READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange))?makeTaskMoveMenu():NULL);
+        m_menu = new TaskRMBMenu(m_filteredTasks, taskBar->showAllWindows(), (READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange))?makeTaskMoveMenu():NULL);
     }
     else
     {
@@ -1274,22 +1310,22 @@ TQPopupMenu* TaskContainer::makeTaskMoveMenu()
 
     id = menu->insertItem(SmallIconSet("go-first"),
                           i18n("Move to Beginning"),
-                          this, TQT_SLOT(slotTaskMoveBeginning()));
+                          this, TQ_SLOT(slotTaskMoveBeginning()));
     menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left));
 
     id = menu->insertItem(SmallIconSet("back"),
                           i18n("Move Left"),
-                          this, TQT_SLOT(slotTaskMoveLeft()));
+                          this, TQ_SLOT(slotTaskMoveLeft()));
     menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left));
 
     id = menu->insertItem(SmallIconSet("forward"),
                           i18n("Move Right"),
-                          this, TQT_SLOT(slotTaskMoveRight()));
+                          this, TQ_SLOT(slotTaskMoveRight()));
     menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right));
 
     id = menu->insertItem(SmallIconSet("go-last"),
                           i18n("Move to End"),
-                          this, TQT_SLOT(slotTaskMoveEnd()));
+                          this, TQ_SLOT(slotTaskMoveEnd()));
     menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right));
 
     return menu;
@@ -1328,11 +1364,6 @@ void TaskContainer::mouseMoveEvent( TQMouseEvent* e )
 
 bool TaskContainer::startDrag(const TQPoint& pos)
 {
-    if (m_filteredTasks.count() != 1)
-    {
-        return false;
-    }
-
     int delay = TDEGlobalSettings::dndEventDelay();
 
     if ((m_dragStartPos - pos).manhattanLength() > delay)
@@ -1375,7 +1406,7 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e)
             if ( TQApplication::widgetAt( p, true ) == this )
             {
                 if (me->type() == TQEvent::MouseButtonPress &&
-                    me->button() == Qt::LeftButton)
+                    me->button() == TQt::LeftButton)
                 {
                     m_dragStartPos = mapFromGlobal(p);
                 }
@@ -1393,10 +1424,10 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e)
         {
             if (!m_dragStartPos.isNull())
             {
-                TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
+                TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
                 TQPoint p(me->globalPos());
 
-                if (me->state() & Qt::LeftButton &&
+                if (me->state() & TQt::LeftButton &&
                     TQApplication::widgetAt(p, true) == this)
                 {
                     kdDebug() << "event move" << endl;
@@ -1452,7 +1483,7 @@ void TaskContainer::dragEnterEvent( TQDragEnterEvent* e )
         return;
     }
 
-    if (e->source() && (e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASBKAR_SETTING(sortByApp)))
+    if (e->source() && (e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASKBAR_SETTING(sortByApp)))
     {
         e->accept();
     }
@@ -1480,7 +1511,7 @@ void TaskContainer::dropEvent( TQDropEvent* e )
         return;
     }
 
-    if ((e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASBKAR_SETTING(sortByApp)))
+    if ((e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASKBAR_SETTING(sortByApp)))
     {
         if (taskBar->taskMoveHandler(TaskMoveDestination::Position, TaskDrag::decode(e), TQWidget::mapTo(taskBar, e->pos()))) {
             e->accept();
@@ -1631,10 +1662,10 @@ void TaskContainer::updateFilteredTaskList()
     {
         Task::Ptr t = *it;
         if ((taskBar->showAllWindows() || t->isOnCurrentDesktop()) &&
-            (!READ_MERGED_TASBKAR_SETTING(showOnlyIconified) || t->isIconified()))
+            (!READ_MERGED_TASKBAR_SETTING(showOnlyIconified) || t->isIconified()))
         {
             pid_t pid = 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
             Atom type_ret;
             int format_ret;
             unsigned long nitems_ret = 0, unused = 0;
@@ -1652,15 +1683,15 @@ void TaskContainer::updateFilteredTaskList()
             if (pid < 0) {
                 m_filteredTasks.append(t);
             }
-            else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) != m_settingsObject->ShowAll) {
+            else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) != m_settingsObject->ShowAll) {
                 if (is_process_resumable(pid)) {
-                    if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) {
+                    if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) {
                         m_filteredTasks.append(t);
                     }
-                    else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) {
+                    else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) {
                         m_filteredTasks.append(t);
                     }
-                    else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) {
+                    else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) {
                         t->publishIconGeometry( TQRect());
                     }
                     else {
@@ -1668,13 +1699,13 @@ void TaskContainer::updateFilteredTaskList()
                     }
                 }
                 else {
-                    if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) {
+                    if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) {
                         m_filteredTasks.append(t);
                     }
-                    else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) {
+                    else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) {
                         t->publishIconGeometry( TQRect());
                     }
-                    else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) {
+                    else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) {
                         m_filteredTasks.append(t);
                     }
                     else {
@@ -1695,7 +1726,7 @@ void TaskContainer::updateFilteredTaskList()
     // sort container list by desktop
     if (taskBar->sortByDesktop() && m_filteredTasks.count() > 1)
     {
-        TQValueVector<QPair<int, Task::Ptr> > sorted;
+        TQValueVector<TQPair<int, Task::Ptr> > sorted;
         sorted.resize(m_filteredTasks.count());
         int i = 0;
 
@@ -1710,7 +1741,7 @@ void TaskContainer::updateFilteredTaskList()
         qHeapSort(sorted);
 
         m_filteredTasks.clear();
-        for (TQValueVector<QPair<int, Task::Ptr> >::iterator it = sorted.begin();
+        for (TQValueVector<TQPair<int, Task::Ptr> >::iterator it = sorted.begin();
              it != sorted.end();
              ++it)
         {
@@ -1742,6 +1773,8 @@ void TaskContainer::settingsChanged()
 
 void TaskContainer::updateKickerTip(KickerTip::Data& data)
 {
+    int iconSize = READ_MERGED_TASKBAR_SETTING(iconSize);
+
     if (m_startup)
     {
         data.message = m_startup->text();
@@ -1749,7 +1782,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
         data.subtext = i18n("Loading application ...");
         data.icon = TDEGlobal::iconLoader()->loadIcon(m_startup->icon(),
                                                     TDEIcon::Small,
-                                                    TDEIcon::SizeMedium,
+						    iconSize,
                                                     TDEIcon::DefaultState,
                                                     0, true);
         return;
@@ -1761,21 +1794,18 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
     
     if (m_filteredTasks.count() > 0)
     {
-        if (READ_MERGED_TASBKAR_SETTING(showThumbnails) &&
+        if (READ_MERGED_TASKBAR_SETTING(showThumbnails) &&
             m_filteredTasks.count() == 1)
         {
             Task::Ptr t = m_filteredTasks.first();
     
-            pixmap = t->thumbnail(READ_MERGED_TASBKAR_SETTING(thumbnailMaxDimension));
+            pixmap = t->thumbnail(READ_MERGED_TASKBAR_SETTING(thumbnailMaxDimension));
         }
     
         if (pixmap.isNull() && tasks.count())
         {
             // try to load icon via net_wm
-            pixmap = KWin::icon(tasks.last()->window(),
-                                TDEIcon::SizeMedium,
-                                TDEIcon::SizeMedium,
-                                true);
+            pixmap = KWin::icon(tasks.last()->window(), iconSize, iconSize, true);
         }
     
         // Collect all desktops the tasks are on. Sort naturally.
@@ -1809,7 +1839,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
             }
         }
     
-        if (READ_MERGED_TASBKAR_SETTING(showAllWindows) && KWin::numberOfDesktops() > 1)
+        if (READ_MERGED_TASKBAR_SETTING(showAllWindows) && KWin::numberOfDesktops() > 1)
         {
             if (desktopMap.isEmpty())
             {
diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h
index edaf337b4..0ae864185 100644
--- a/kicker/taskbar/taskcontainer.h
+++ b/kicker/taskbar/taskcontainer.h
@@ -39,7 +39,7 @@ typedef TQValueList<TQPixmap*> PixmapList;
 
 class TaskContainer : public TQToolButton, public KickerTip::Client
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     typedef TQValueList<TaskContainer*> List;
@@ -117,6 +117,8 @@ protected:
     void popupMenu(int);
 
     void updateFilteredTaskList();
+    void updateIconSize();
+    void recalculateIconRect();
 
 protected slots:
     void animationTimerFired();
@@ -144,6 +146,7 @@ private:
     PixmapList                  frames;
     int                         attentionState;
     TQRect                      iconRect;
+    int                         iconSize;
     TQPixmap                    animBg;
     Task::List                  tasks;
     Task::List                  m_filteredTasks;
diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index 1be54ca8b..79c809e39 100644
--- a/kicker/taskmanager/tasklmbmenu.cpp
+++ b/kicker/taskmanager/tasklmbmenu.cpp
@@ -99,7 +99,7 @@ TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, TQWidget *parent, const char *
     setAcceptDrops(true); // Always enabled to activate task during drag&drop.
 
     m_dragSwitchTimer = new TQTimer(this, "DragSwitchTimer");
-    connect(m_dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch()));
+    connect(m_dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(dragSwitch()));
 }
 
 void TaskLMBMenu::fillMenu()
@@ -118,7 +118,7 @@ void TaskLMBMenu::fillMenu()
                                                   t->isIconified(),
                                                   t->demandsAttention());
         int id = insertItem(TQIconSet(t->pixmap()), menuItem);
-        connectItem(id, t, TQT_SLOT(activateRaiseOrIconify()));
+        connectItem(id, t, TQ_SLOT(activateRaiseOrIconify()));
         setItemChecked(id, t->isActive());
 
         if (t->demandsAttention())
@@ -131,7 +131,7 @@ void TaskLMBMenu::fillMenu()
     if (m_attentionState)
     {
         m_attentionTimer = new TQTimer(this, "AttentionTimer");
-        connect(m_attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimeout()));
+        connect(m_attentionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(attentionTimeout()));
         m_attentionTimer->start(500, true);
     }
 }
@@ -229,7 +229,7 @@ void TaskLMBMenu::dragSwitch()
 
 void TaskLMBMenu::mousePressEvent( TQMouseEvent* e )
 {
-    if (e->button() == Qt::LeftButton)
+    if (e->button() == TQt::LeftButton)
     {
         m_dragStartPos = e->pos();
     }
diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h
index 7eedc115b..4c20819b6 100644
--- a/kicker/taskmanager/tasklmbmenu.h
+++ b/kicker/taskmanager/tasklmbmenu.h
@@ -53,7 +53,7 @@ private:
 
 class KDE_EXPORT TaskLMBMenu : public TQPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TaskLMBMenu(const Task::List& list, TQWidget *parent = 0, const char *name = 0);
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 33df1ddd6..54bf6d919 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -61,16 +61,16 @@ TaskManager::TaskManager()
       m_trackGeometry(false)
 {
     TDEGlobal::locale()->insertCatalogue("libtaskmanager");
-    connect(m_winModule, TQT_SIGNAL(windowAdded(WId)),
-            this,        TQT_SLOT(windowAdded(WId)));
-    connect(m_winModule, TQT_SIGNAL(windowRemoved(WId)),
-            this,        TQT_SLOT(windowRemoved(WId)));
-    connect(m_winModule, TQT_SIGNAL(activeWindowChanged(WId)),
-            this,        TQT_SLOT(activeWindowChanged(WId)));
-    connect(m_winModule, TQT_SIGNAL(currentDesktopChanged(int)),
-            this,        TQT_SLOT(currentDesktopChanged(int)));
-    connect(m_winModule, TQT_SIGNAL(windowChanged(WId,unsigned int)),
-            this,        TQT_SLOT(windowChanged(WId,unsigned int)));
+    connect(m_winModule, TQ_SIGNAL(windowAdded(WId)),
+            this,        TQ_SLOT(windowAdded(WId)));
+    connect(m_winModule, TQ_SIGNAL(windowRemoved(WId)),
+            this,        TQ_SLOT(windowRemoved(WId)));
+    connect(m_winModule, TQ_SIGNAL(activeWindowChanged(WId)),
+            this,        TQ_SLOT(activeWindowChanged(WId)));
+    connect(m_winModule, TQ_SIGNAL(currentDesktopChanged(int)),
+            this,        TQ_SLOT(currentDesktopChanged(int)));
+    connect(m_winModule, TQ_SIGNAL(windowChanged(WId,unsigned int)),
+            this,        TQ_SLOT(windowChanged(WId,unsigned int)));
 
     // register existing windows
     const TQValueList<WId> windows = m_winModule->windows();
@@ -99,14 +99,14 @@ void TaskManager::configure_startup()
         return;
     _startup_info = new TDEStartupInfo( TDEStartupInfo::CleanOnCantDetect, this );
     connect( _startup_info,
-        TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
-        TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
+        TQ_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( _startup_info,
-        TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
-        TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
+        TQ_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( _startup_info,
-        TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
-        TQT_SLOT( killStartup( const TDEStartupInfoId& )));
+        TQ_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( killStartup( const TDEStartupInfoId& )));
     c.setGroup( "TaskbarButtonSettings" );
     _startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 ));
 }
@@ -1305,7 +1305,7 @@ void Task::updateThumbnail()
     // by the thumbnail generation. This makes things much smoother
     // on slower machines.
     //
-    TQWidget *rootWin = TQT_TQWIDGET(tqApp->desktop());
+    TQWidget *rootWin = tqApp->desktop();
     TQRect geom = _info.geometry();
     _grab = TQPixmap::grabWindow(rootWin->winId(),
                                 geom.x(), geom.y(),
@@ -1313,7 +1313,7 @@ void Task::updateThumbnail()
 
     if (!_grab.isNull())
     {
-       TQTimer::singleShot(200, this, TQT_SLOT(generateThumbnail()));
+       TQTimer::singleShot(200, this, TQ_SLOT(generateThumbnail()));
     }
 }
 
diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h
index 2753218c8..3771d29a6 100644
--- a/kicker/taskmanager/taskmanager.h
+++ b/kicker/taskmanager/taskmanager.h
@@ -70,7 +70,7 @@ typedef TQValueList<WId> WindowList;
  */
 class KDE_EXPORT Task: public TQObject, public TDEShared
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQString visibleIconicName READ visibleIconicName )
     TQ_PROPERTY( TQString iconicName READ iconicName )
     TQ_PROPERTY( TQString visibleIconicNameWithState READ visibleIconicNameWithState )
@@ -513,7 +513,7 @@ public:
  */
 class KDE_EXPORT Startup: public TQObject, public TDEShared
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQString text READ text )
     TQ_PROPERTY( TQString bin READ bin )
     TQ_PROPERTY( TQString icon READ icon )
@@ -567,7 +567,7 @@ private:
  */
 class KDE_EXPORT TaskManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( int currentDesktop READ currentDesktop )
     TQ_PROPERTY( int numberOfDesktops READ numberOfDesktops )
 
diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp
index 58682196b..943160d26 100644
--- a/kicker/taskmanager/taskrmbmenu.cpp
+++ b/kicker/taskmanager/taskrmbmenu.cpp
@@ -78,7 +78,7 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
         if (showAll)
         {
             id = insertItem(i18n("&To Current Desktop"),
-                            t, TQT_SLOT(toCurrentDesktop()));
+                            t, TQ_SLOT(toCurrentDesktop()));
             setItemEnabled( id, !t->isOnCurrentDesktop() );
         }
 
@@ -88,21 +88,21 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
         }
     }
 
-    id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQT_SLOT(move()));
+    id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQ_SLOT(move()));
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMove));
 
-    id = insertItem(i18n("Re&size"), t, TQT_SLOT(resize()));
+    id = insertItem(i18n("Re&size"), t, TQ_SLOT(resize()));
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionResize));
 
-    id = insertItem(i18n("Mi&nimize"), t, TQT_SLOT(toggleIconified()));
+    id = insertItem(i18n("Mi&nimize"), t, TQ_SLOT(toggleIconified()));
     setItemChecked(id, t->isIconified());
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMinimize));
 
-    id = insertItem(i18n("Ma&ximize"), t, TQT_SLOT(toggleMaximized()));
+    id = insertItem(i18n("Ma&ximize"), t, TQ_SLOT(toggleMaximized()));
     setItemChecked(id, t->isMaximized());
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMax));
 
-    id = insertItem(i18n("&Shade"), t, TQT_SLOT(toggleShaded()));
+    id = insertItem(i18n("&Shade"), t, TQ_SLOT(toggleShaded()));
     setItemChecked(id, t->isShaded());
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionShade));
 
@@ -115,28 +115,28 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
         insertSeparator();
     }
 
-    id = insertItem(SmallIcon("window-close"), i18n("&Close"), t, TQT_SLOT(close()));
+    id = insertItem(SmallIcon("window-close"), i18n("&Close"), t, TQ_SLOT(close()));
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionClose));
 }
 
 void TaskRMBMenu::fillMenu()
 {
-	int id;
-	setCheckable( true );
+    int id;
+    setCheckable( true );
 
     Task::List::iterator itEnd = tasks.end();
     for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
     {
-		Task::Ptr t = (*it);
+        Task::Ptr t = (*it);
 
-		id = insertItem( TQIconSet( t->pixmap() ),
-				 t->visibleNameWithState(),
-		                 new TaskRMBMenu(t, this) );
-		setItemChecked( id, t->isActive() );
-		connectItem( id, t, TQT_SLOT( activateRaiseOrIconify() ) );
-	}
+        id = insertItem( TQIconSet( t->pixmap() ),
+                         t->visibleNameWithState(),
+		         new TaskRMBMenu(t, this) );
+        setItemChecked( id, t->isActive() );
+        connectItem( id, t, TQ_SLOT( activateRaiseOrIconify() ) );
+    }
 
-	insertSeparator();
+    insertSeparator();
 
     bool enable = false;
 
@@ -144,7 +144,7 @@ void TaskRMBMenu::fillMenu()
     {
         id = insertItem(i18n("All to &Desktop"), makeDesktopsMenu());
 
-        id = insertItem(i18n("All &to Current Desktop"), this, TQT_SLOT(slotAllToCurrentDesktop()));
+        id = insertItem(i18n("All &to Current Desktop"), this, TQ_SLOT(slotAllToCurrentDesktop()));
         Task::List::iterator itEnd = tasks.end();
         for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
         {
@@ -159,48 +159,55 @@ void TaskRMBMenu::fillMenu()
 
     enable = false;
 
-	id = insertItem( i18n( "Mi&nimize All" ), this, TQT_SLOT( slotMinimizeAll() ) );
+    id = insertItem( i18n( "Mi&nimize All" ), this, TQ_SLOT( slotMinimizeAll() ) );
     itEnd = tasks.end();
     for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
     {
-		if( !(*it)->isIconified() ) {
-			enable = true;
-			break;
-		}
-	}
-	setItemEnabled( id, enable );
+        if( !(*it)->isIconified() ) {
+            enable = true;
+            break;
+        }
+    }
+    setItemEnabled( id, enable );
 
-	enable = false;
+    enable = false;
 
-	id = insertItem( i18n( "Ma&ximize All" ), this, TQT_SLOT( slotMaximizeAll() ) );
+    id = insertItem( i18n( "Ma&ximize All" ), this, TQ_SLOT( slotMaximizeAll() ) );
     itEnd = tasks.end();
     for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
     {
         if( !(*it)->isMaximized() ) {
-			enable = true;
-			break;
-		}
-	}
-	setItemEnabled( id, enable );
+            enable = true;
+            break;
+        }
+    }
+    setItemEnabled( id, enable );
 
-	enable = false;
+    enable = false;
 
-	id = insertItem( i18n( "&Restore All" ), this, TQT_SLOT( slotRestoreAll() ) );
+    id = insertItem( i18n( "&Restore All" ), this, TQ_SLOT( slotRestoreAll() ) );
     itEnd = tasks.end();
     for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
     {
-		if( (*it)->isIconified() || (*it)->isMaximized() ) {
-			enable = true;
-			break;
-		}
-	}
-	setItemEnabled( id, enable );
+        if( (*it)->isIconified() || (*it)->isMaximized() ) {
+            enable = true;
+            break;
+        }
+    }
+    setItemEnabled( id, enable );
+
+    insertSeparator();
+
+    enable = false;
 
-	insertSeparator();
+    if (taskMoveMenu) {
+        taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), FALSE);
+        insertItem(i18n("Move Task Button"), taskMoveMenu);
 
-	enable = false;
+        insertSeparator();
+    }
 
-	insertItem( SmallIcon( "remove" ), i18n( "&Close All" ), this, TQT_SLOT( slotCloseAll() ) );
+    insertItem( SmallIcon( "window-close" ), i18n( "&Close All" ), this, TQ_SLOT( slotCloseAll() ) );
 }
 
 TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t)
@@ -212,17 +219,17 @@ TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t)
 
     id = menu->insertItem(SmallIconSet("go-up"),
                           i18n("Keep &Above Others"),
-                          t, TQT_SLOT(toggleAlwaysOnTop()));
+                          t, TQ_SLOT(toggleAlwaysOnTop()));
     menu->setItemChecked(id, t->isAlwaysOnTop());
 
     id = menu->insertItem(SmallIconSet("go-down"),
                           i18n("Keep &Below Others"),
-                          t, TQT_SLOT(toggleKeptBelowOthers()));
+                          t, TQ_SLOT(toggleKeptBelowOthers()));
     menu->setItemChecked(id, t->isKeptBelowOthers());
 
     id = menu->insertItem(SmallIconSet("view-fullscreen"),
                           i18n("&Fullscreen"),
-                          t, TQT_SLOT(toggleFullScreen()));
+                          t, TQ_SLOT(toggleFullScreen()));
     menu->setItemChecked(id, t->isFullScreen());
 
     if (KWin::allowedActionsSupported())
@@ -238,7 +245,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t)
 	TQPopupMenu* m = new TQPopupMenu( this );
 	m->setCheckable( true );
 
-	int id = m->insertItem( i18n("&All Desktops"), t, TQT_SLOT( toDesktop(int) ) );
+	int id = m->insertItem( i18n("&All Desktops"), t, TQ_SLOT( toDesktop(int) ) );
 	m->setItemParameter( id, 0 ); // 0 means all desktops
 	m->setItemChecked( id, t->isOnAllDesktops() );
 
@@ -246,7 +253,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t)
 
 	for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) {
 		TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
-		id = m->insertItem( name, t, TQT_SLOT( toDesktop(int) ) );
+		id = m->insertItem( name, t, TQ_SLOT( toDesktop(int) ) );
 		m->setItemParameter( id, i );
 		m->setItemChecked( id, !t->isOnAllDesktops() && t->desktop() == i );
 	}
@@ -259,14 +266,14 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu()
 	TQPopupMenu* m = new TQPopupMenu( this );
 	m->setCheckable( true );
 
-	int id = m->insertItem( i18n("&All Desktops"), this, TQT_SLOT( slotAllToDesktop(int) ) );
+	int id = m->insertItem( i18n("&All Desktops"), this, TQ_SLOT( slotAllToDesktop(int) ) );
 	m->setItemParameter( id, 0 ); // 0 means all desktops
 
 	m->insertSeparator();
 
 	for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) {
 		TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
-		id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) );
+		id = m->insertItem( name, this, TQ_SLOT( slotAllToDesktop(int) ) );
 		m->setItemParameter( id, i );
 	}
 
diff --git a/kicker/taskmanager/taskrmbmenu.h b/kicker/taskmanager/taskrmbmenu.h
index 76b209ca7..a73d83d3a 100644
--- a/kicker/taskmanager/taskrmbmenu.h
+++ b/kicker/taskmanager/taskrmbmenu.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class KDE_EXPORT TaskRMBMenu : public TQPopupMenu
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TaskRMBMenu(const Task::List&, bool showAll = true, TQPopupMenu* moveMenu = NULL, TQWidget *parent = 0, const char *name = 0);
diff --git a/klipper/applet.h b/klipper/applet.h
index 7b7cf7a7c..acf4e1083 100644
--- a/klipper/applet.h
+++ b/klipper/applet.h
@@ -28,7 +28,7 @@ class KlipperAppletWidget;
 
 class KlipperApplet : public KPanelApplet
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
     KlipperApplet(const TQString& configFile, Type t = Normal, int actions = 0,
                   TQWidget *parent = 0, const char *name = 0);
@@ -49,7 +49,7 @@ private:
 
 class KlipperAppletWidget : public KlipperWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 k_dcop:
     int newInstance();
diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp
index a4c4b46c5..a2f5368a8 100644
--- a/klipper/clipboardpoll.cpp
+++ b/klipper/clipboardpoll.cpp
@@ -108,13 +108,13 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent )
     
 void ClipboardPoll::initPolling()
 {
-    connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged() ), TQT_SLOT(qtSelectionChanged()));
-    connect( kapp->clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( qtClipboardChanged() ));
-    connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( timeout()));
+    connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged() ), TQ_SLOT(qtSelectionChanged()));
+    connect( kapp->clipboard(), TQ_SIGNAL( dataChanged() ), TQ_SLOT( qtClipboardChanged() ));
+    connect( &timer, TQ_SIGNAL( timeout()), TQ_SLOT( timeout()));
     timer.start( 1000, false );
     selection.atom = XA_PRIMARY;
     clipboard.atom = xa_clipboard;
-    selection.last_change = clipboard.last_change = GET_QT_X_TIME(); // don't trigger right after startup
+    selection.last_change = clipboard.last_change = get_tqt_x_time(); // don't trigger right after startup
     selection.last_owner = XGetSelectionOwner( tqt_xdisplay(), XA_PRIMARY );
 #ifdef NOISY_KLIPPER_
     kdDebug() << "(1) Setting last_owner for =" << "selection" << ":" << selection.last_owner << endl;
@@ -151,7 +151,7 @@ bool ClipboardPoll::x11Event( XEvent* e )
 #ifdef NOISY_KLIPPER_
             kdDebug() << "SELECTION CHANGED (XFIXES)" << endl;
 #endif
-            SET_QT_X_TIME(ev->timestamp);
+            set_tqt_x_time(ev->timestamp);
             emit clipboardChanged( true );
         }
         else if( ev->selection == xa_clipboard && !kapp->clipboard()->ownsClipboard())
@@ -159,7 +159,7 @@ bool ClipboardPoll::x11Event( XEvent* e )
 #ifdef NOISY_KLIPPER_
             kdDebug() << "CLIPBOARD CHANGED (XFIXES)" << endl;
 #endif
-            SET_QT_X_TIME(ev->timestamp);
+            set_tqt_x_time(ev->timestamp);
             emit clipboardChanged( false );
         }
     }
@@ -269,9 +269,9 @@ bool ClipboardPoll::checkTimestamp( SelectionData& data )
         return false;
     }
     XDeleteProperty( tqt_xdisplay(), winId(), data.timestamp_atom );
-    XConvertSelection( tqt_xdisplay(), data.atom, xa_timestamp, data.timestamp_atom, winId(), GET_QT_X_TIME() );
+    XConvertSelection( tqt_xdisplay(), data.atom, xa_timestamp, data.timestamp_atom, winId(), get_tqt_x_time() );
     data.waiting_for_timestamp = true;
-    data.waiting_x_time = GET_QT_X_TIME();
+    data.waiting_x_time = get_tqt_x_time();
 #ifdef REALLY_NOISY_KLIPPER_
     kdDebug() << "WAITING TIMESTAMP:" << ( data.atom == XA_PRIMARY ) << endl;
 #endif
diff --git a/klipper/clipboardpoll.h b/klipper/clipboardpoll.h
index 170232851..a8d078e35 100644
--- a/klipper/clipboardpoll.h
+++ b/klipper/clipboardpoll.h
@@ -27,7 +27,7 @@
 class ClipboardPoll
     : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         ClipboardPoll( TQWidget* parent );
     signals:
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index 25c095c2a..0dfc7ede1 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -158,11 +158,11 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
     maxItems = new KIntNumInput( this );
     maxItems->setLabel(  i18n( "C&lipboard history size:" ) );
     maxItems->setRange( 2, 2048, 1, true );
-    connect( maxItems, TQT_SIGNAL( valueChanged( int )),
-             TQT_SLOT( historySizeChanged( int ) ));
+    connect( maxItems, TQ_SIGNAL( valueChanged( int )),
+             TQ_SLOT( historySizeChanged( int ) ));
 
-    connect( group, TQT_SIGNAL( clicked( int )),
-             TQT_SLOT( slotClipConfigChanged() ));
+    connect( group, TQ_SIGNAL( clicked( int )),
+             TQ_SLOT( slotClipConfigChanged() ));
     slotClipConfigChanged();
 
     // Add some spacing at the end
@@ -201,7 +201,7 @@ void ListView::rename( TQListViewItem* item, int c )
 
   if ( gui ) {
     if ( ! _regExpEditor )
-      _regExpEditor = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+      _regExpEditor = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
     KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( _regExpEditor->tqt_cast( "KRegExpEditorInterface" ) );
     assert( iface );
     iface->setRegExp( item->text( 0 ) );
@@ -243,13 +243,13 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
     listView->setMultiSelection( false );
     listView->setAllColumnsShowFocus( true );
     listView->setSelectionMode( TQListView::Single );
-    connect( listView, TQT_SIGNAL(executed( TQListViewItem*, const TQPoint&, int )),
-             TQT_SLOT( slotItemChanged( TQListViewItem*, const TQPoint& , int ) ));
-    connect( listView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )),
-             TQT_SLOT(selectionChanged ( TQListViewItem * )));
+    connect( listView, TQ_SIGNAL(executed( TQListViewItem*, const TQPoint&, int )),
+             TQ_SLOT( slotItemChanged( TQListViewItem*, const TQPoint& , int ) ));
+    connect( listView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )),
+             TQ_SLOT(selectionChanged ( TQListViewItem * )));
     connect(listView,
-            TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)),
-            TQT_SLOT( slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+            TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)),
+            TQ_SLOT( slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 
     ClipAction *action   = 0L;
     ClipCommand *command = 0L;
@@ -291,10 +291,10 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
     TQHBox *box = new TQHBox( this );
     box->setSpacing( KDialog::spacingHint() );
     TQPushButton *button = new TQPushButton( i18n("&Add Action"), box );
-    connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddAction() ));
+    connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddAction() ));
 
     delActionButton = new TQPushButton( i18n("&Delete Action"), box );
-    connect( delActionButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDeleteAction() ));
+    connect( delActionButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDeleteAction() ));
 
     TQLabel *label = new TQLabel(i18n("Click on a highlighted item's column to change it. \"%s\" in a command will be replaced with the clipboard contents."), box);
     label->setAlignment( WordBreak | AlignLeft | AlignVCenter );
@@ -304,7 +304,7 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
     box = new TQHBox( this );
     TQPushButton *advanced = new TQPushButton( i18n("Advanced..."), box );
     advanced->setFixedSize( advanced->sizeHint() );
-    connect( advanced, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdvanced() ));
+    connect( advanced, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdvanced() ));
     (void) new TQWidget( box ); // spacer
 
     delActionButton->setEnabled(listView->currentItem () !=0);
diff --git a/klipper/configdialog.h b/klipper/configdialog.h
index 29aaa856d..fec1f7eaa 100644
--- a/klipper/configdialog.h
+++ b/klipper/configdialog.h
@@ -43,7 +43,7 @@ class ConfigDialog;
 
 class GeneralWidget : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class ConfigDialog;
 
@@ -67,7 +67,7 @@ private:
 // only for use inside ActionWidget
 class AdvancedWidget : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     AdvancedWidget( TQWidget *parent = 0L, const char *name = 0L );
@@ -82,7 +82,7 @@ private:
 
 class ActionWidget : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class ConfigDialog;
 
@@ -118,7 +118,7 @@ private:
 
 /*class KeysWidget : public QVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class ConfigDialog;
 
@@ -133,7 +133,7 @@ private:
 
 class ConfigDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ConfigDialog( const ActionList *list, TDEGlobalAccel *accel, bool isApplet );
diff --git a/klipper/history.cpp b/klipper/history.cpp
index 625fbef0f..99db4eaba 100644
--- a/klipper/history.cpp
+++ b/klipper/history.cpp
@@ -29,7 +29,7 @@ History::History( TQWidget* parent, const char* name )
       m_popup( new KlipperPopup( this, parent, "main_widget" ) ),
       m_topIsUserSelected( false )
 {
-    connect( this, TQT_SIGNAL( changed() ), m_popup,  TQT_SLOT( slotHistoryChanged() ) );
+    connect( this, TQ_SIGNAL( changed() ), m_popup,  TQ_SLOT( slotHistoryChanged() ) );
     itemList.setAutoDelete( true );
 
 }
diff --git a/klipper/history.h b/klipper/history.h
index cef62c95c..eaa7e58f3 100644
--- a/klipper/history.h
+++ b/klipper/history.h
@@ -31,7 +31,7 @@ class QptrListIterator;
 
 class History : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     History( TQWidget* parent, const char* name );
     ~History();
diff --git a/klipper/klipperbindings.cpp b/klipper/klipperbindings.cpp
index 6e0e33352..8db1f5fe8 100644
--- a/klipper/klipperbindings.cpp
+++ b/klipper/klipperbindings.cpp
@@ -18,7 +18,7 @@
 */
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
 #else
 # define DEF( name, key3, key4, fnSlot ) \
    keys->insert( name, i18n(name), TQString(), key3, key4 )
@@ -27,9 +27,9 @@
 
 	keys->insert( "Program:klipper", i18n("Clipboard") );
 
-	DEF( I18N_NOOP("Show Klipper Popup-Menu"), ALT+CTRL+Qt::Key_V, WIN+CTRL+Qt::Key_V, slotPopupMenu() );
-	DEF( I18N_NOOP("Manually Invoke Action on Current Clipboard"), ALT+CTRL+Qt::Key_R, WIN+CTRL+Qt::Key_R, slotRepeatAction() );
-	DEF( I18N_NOOP("Enable/Disable Clipboard Actions"), ALT+CTRL+Qt::Key_X, WIN+CTRL+Qt::Key_X, toggleURLGrabber() );
+	DEF( I18N_NOOP("Show Klipper Popup-Menu"), ALT+CTRL+TQt::Key_V, WIN+CTRL+TQt::Key_V, slotPopupMenu() );
+	DEF( I18N_NOOP("Manually Invoke Action on Current Clipboard"), ALT+CTRL+TQt::Key_R, WIN+CTRL+TQt::Key_R, slotRepeatAction() );
+	DEF( I18N_NOOP("Enable/Disable Clipboard Actions"), ALT+CTRL+TQt::Key_X, WIN+CTRL+TQt::Key_X, toggleURLGrabber() );
 
 #undef DEF
 #undef WIN
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index c3881a7a6..38cd51aa5 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -45,16 +45,16 @@ namespace {
 #ifdef DEBUG_EVENTS__
 kdbgstream& operator<<( kdbgstream& stream,  const TQKeyEvent& e ) {
     stream << "(TQKeyEvent(text=" << e.text() << ",key=" << e.key() << ( e.isAccepted()?",accepted":",ignored)" ) << ",count=" << e.count();
-    if ( e.state() & Qt::AltButton ) {
+    if ( e.state() & TQt::AltButton ) {
         stream << ",ALT";
     }
-    if ( e.state() & Qt::ControlButton ) {
+    if ( e.state() & TQt::ControlButton ) {
         stream << ",CTRL";
     }
-    if ( e.state() & Qt::MetaButton ) {
+    if ( e.state() & TQt::MetaButton ) {
         stream << ",META";
     }
-    if ( e.state() & Qt::ShiftButton ) {
+    if ( e.state() & TQt::ShiftButton ) {
         stream << ",SHIFT";
     }
     if ( e.isAutoRepeat() ) {
@@ -112,7 +112,7 @@ KlipperPopup::KlipperPopup( History* history, TQWidget* parent, const char* name
 
     m_popupProxy = new PopupProxy( this, "popup_proxy", menu_height, menu_width );
 
-    connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) );
+    connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) );
 }
 
 KlipperPopup::~KlipperPopup() {
@@ -145,7 +145,7 @@ void KlipperPopup::buildFromScratch() {
     m_filterWidget = new KLineEditBlackKey( this, "Klipper filter widget" );
     insertTitle( SmallIcon( "klipper" ), i18n("Klipper - Clipboard Tool"));
     m_filterWidgetId = insertItem( m_filterWidget, m_filterWidgetId, 1 );
-    m_filterWidget->setFocusPolicy( TQ_NoFocus );
+    m_filterWidget->setFocusPolicy( TQWidget::NoFocus );
     setItemVisible( m_filterWidgetId,  false );
     m_filterWidget->hide();
     TQString lastGroup;
@@ -249,15 +249,15 @@ void KlipperPopup::keyPressEvent( TQKeyEvent* e ) {
     // widget, except a few used for navigation:
     // These go to the superobject.
     switch( e->key() ) {
-    case Qt::Key_Up:
-    case Qt::Key_Down:
-    case Qt::Key_Right:
-    case Qt::Key_Left:
-    case Qt::Key_Tab:
-    case Qt::Key_Backtab:
-    case Qt::Key_Escape:
-    case Qt::Key_Return:
-    case Qt::Key_Enter:
+    case TQt::Key_Up:
+    case TQt::Key_Down:
+    case TQt::Key_Right:
+    case TQt::Key_Left:
+    case TQt::Key_Tab:
+    case TQt::Key_Backtab:
+    case TQt::Key_Escape:
+    case TQt::Key_Return:
+    case TQt::Key_Enter:
     {
 #ifdef DEBUG_EVENTS__
         kdDebug() << "Passing this event to ancestor (TDEPopupMenu): " << e << endl;
diff --git a/klipper/klipperpopup.h b/klipper/klipperpopup.h
index 756f7a44a..f374a9978 100644
--- a/klipper/klipperpopup.h
+++ b/klipper/klipperpopup.h
@@ -36,7 +36,7 @@ class KLineEdit;
  */
 class KlipperPopup : public TDEPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KlipperPopup( History* history, TQWidget* parent=0, const char* name=0 );
diff --git a/klipper/main.cpp b/klipper/main.cpp
index 6d0b5e9e2..4fc686f67 100644
--- a/klipper/main.cpp
+++ b/klipper/main.cpp
@@ -29,7 +29,7 @@
 #include "toplevel.h"
 #include "version.h"
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <qxembed.h> // schroder
 #endif
 
@@ -51,7 +51,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
 
   // Make Klipper conform to freedesktop system tray standard, see
   // http://bugs.kde.org/show_bug.cgi?id=69119
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
   QXEmbed::initialize();
 #endif
 
diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp
index 71adba63d..20f8139a1 100644
--- a/klipper/popupproxy.cpp
+++ b/klipper/popupproxy.cpp
@@ -39,7 +39,7 @@ PopupProxy::PopupProxy( KlipperPopup* parent, const char* name, int menu_height,
       m_menu_width( menu_width ),
       nextItemNumber( 0 )
 {
-    connect( parent->history(), TQT_SIGNAL( changed() ), TQT_SLOT( slotHistoryChanged() ) );
+    connect( parent->history(), TQ_SIGNAL( changed() ), TQ_SLOT( slotHistoryChanged() ) );
 }
 
 void PopupProxy::slotHistoryChanged() {
@@ -98,7 +98,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item,
     } else {
         const TQSize max_size( m_menu_width,m_menu_height/4 );
         if ( image.height() > max_size.height() || image.width() > max_size.width() ) {
-            image.convertFromImage( TQImage(image.convertToImage()).smoothScale( max_size, TQ_ScaleMin ) );
+            image.convertFromImage( TQImage(image.convertToImage()).smoothScale( max_size, TQImage::ScaleMin ) );
         }
         id = proxy_for_menu->insertItem( image,  -1,  index );
     }
@@ -108,7 +108,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item,
     Q_ASSERT( id != -1 ); // Be sure that the item was inserted.
     TQMenuItem* mi = proxy_for_menu->findItem( id );
     int fontheight = TQFontMetrics( proxy_for_menu->fontMetrics()  ).height();
-    int itemheight = proxy_for_menu->style().tqsizeFromContents(TQStyle::CT_PopupMenuItem,
+    int itemheight = proxy_for_menu->style().sizeFromContents(TQStyle::CT_PopupMenuItem,
                                                               proxy_for_menu,
                                                               TQSize( 0, fontheight ),
                                                               TQStyleOption(mi,10,0) ).height();
@@ -117,7 +117,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item,
     History* history = parent()->history();
     proxy_for_menu->connectItem(  id,
                                   history,
-                                  TQT_SLOT( slotMoveToTop( int ) ) );
+                                  TQ_SLOT( slotMoveToTop( int ) ) );
     proxy_for_menu->setItemParameter(  id,  nextItemNumber );
 
 }
@@ -151,7 +151,7 @@ int PopupProxy::insertFromSpill( int index ) {
     if ( spillPointer.current() ) {
         TDEPopupMenu* moreMenu = new TDEPopupMenu( proxy_for_menu, "a more menu" );
         proxy_for_menu->insertItem( i18n( "&More" ),  moreMenu, -1, index );
-        connect( moreMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) );
+        connect( moreMenu, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) );
         proxy_for_menu = moreMenu;
     }
 
diff --git a/klipper/popupproxy.h b/klipper/popupproxy.h
index f56f05097..6ca010f8c 100644
--- a/klipper/popupproxy.h
+++ b/klipper/popupproxy.h
@@ -36,7 +36,7 @@ class KlipperPopup;
  */
 class PopupProxy : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index ecdac5af7..b76c7472b 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -118,9 +118,6 @@ private:
 };
 
 extern bool tqt_qclipboard_bailout_hack;
-#if KDE_IS_VERSION( 15, 0, 0 )
-#error Check status of #80072 with Qt4.
-#endif
 
 static void ensureGlobalSyncOff(TDEConfig* config);
 
@@ -143,10 +140,10 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
     setBackgroundMode( X11ParentRelative );
     clip = kapp->clipboard();
 
-    connect( &m_overflowClearTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotClearOverflow()));
+    connect( &m_overflowClearTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotClearOverflow()));
     m_overflowClearTimer.start( 1000 );
-    connect( &m_pendingCheckTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotCheckPending()));
-    connect( &m_setClipboardTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotDelayedSetClipboard()));
+    connect( &m_pendingCheckTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotCheckPending()));
+    connect( &m_setClipboardTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotDelayedSetClipboard()));
 
     m_history = new History( this, "main_history" );
 
@@ -159,25 +156,25 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
     clearHistoryAction = new TDEAction( i18n("C&lear Clipboard History"),
                                       "history_clear",
                                       0,
-                                      TQT_TQOBJECT(history()),
-                                      TQT_SLOT( slotClear() ),
+                                      history(),
+                                      TQ_SLOT( slotClear() ),
                                       collection,
                                       "clearHistoryAction" );
-    connect( clearHistoryAction, TQT_SIGNAL( activated() ), TQT_SLOT( slotClearClipboard() ) );
+    connect( clearHistoryAction, TQ_SIGNAL( activated() ), TQ_SLOT( slotClearClipboard() ) );
     clearHistoryAction->setGroup( defaultGroup );
     configureAction = new TDEAction( i18n("&Configure Klipper..."),
                                    "configure",
                                    0,
-                                   TQT_TQOBJECT(this),
-                                   TQT_SLOT( slotConfigure() ),
+                                   this,
+                                   TQ_SLOT( slotConfigure() ),
                                    collection,
                                    "configureAction" );
     configureAction->setGroup( defaultGroup );
     quitAction = new TDEAction( i18n("&Quit"),
                               "system-log-out",
                               0,
-                              TQT_TQOBJECT(this),
-                              TQT_SLOT( slotQuit() ),
+                              this,
+                              TQ_SLOT( slotQuit() ),
                               collection,
                               "quitAction" );
     quitAction->setGroup( "exit" );
@@ -190,11 +187,11 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
     showTimer = new TQTime();
 
     readProperties(m_config);
-    connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
+    connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
 
     poll = new ClipboardPoll( this );
-    connect( poll, TQT_SIGNAL( clipboardChanged( bool ) ),
-             this, TQT_SLOT( newClipData( bool ) ) );
+    connect( poll, TQ_SIGNAL( clipboardChanged( bool ) ),
+             this, TQ_SLOT( newClipData( bool ) ) );
 
     if ( isApplet() || !isShown() ) {
         m_pixmap = KSystemTray::loadIcon( "klipper" );
@@ -206,7 +203,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
     m_iconOrigHeight = m_pixmap.height();
     adjustSize();
 
-    globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+    globalKeys = new TDEGlobalAccel(this);
     TDEGlobalAccel* keys = globalKeys;
 #include "klipperbindings.cpp"
     // the keys need to be read from kdeglobals, not kickerrc --ellis, 22/9/02
@@ -214,13 +211,13 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
     globalKeys->updateConnections();
     toggleURLGrabAction->setShortcut(globalKeys->shortcut("Enable/Disable Clipboard Actions"));
 
-    connect( toggleURLGrabAction, TQT_SIGNAL( toggled( bool )),
-             this, TQT_SLOT( setURLGrabberEnabled( bool )));
+    connect( toggleURLGrabAction, TQ_SIGNAL( toggled( bool )),
+             this, TQ_SLOT( setURLGrabberEnabled( bool )));
 
     KlipperPopup* popup = history()->popup();
-    connect ( history(),  TQT_SIGNAL( topChanged() ), TQT_SLOT( slotHistoryTopChanged() ) );
-    connect( popup, TQT_SIGNAL( aboutToHide() ), TQT_SLOT( slotStartHideTimer() ) );
-    connect( popup, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotStartShowTimer() ) );
+    connect ( history(),  TQ_SIGNAL( topChanged() ), TQ_SLOT( slotHistoryTopChanged() ) );
+    connect( popup, TQ_SIGNAL( aboutToHide() ), TQ_SLOT( slotStartHideTimer() ) );
+    connect( popup, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotStartShowTimer() ) );
 
     popup->plugAction( toggleURLGrabAction );
     popup->plugAction( clearHistoryAction );
@@ -283,7 +280,7 @@ void KlipperWidget::clearClipboardHistory()
 
 void KlipperWidget::mousePressEvent(TQMouseEvent *e)
 {
-    if ( e->button() != Qt::LeftButton && e->button() != Qt::RightButton )
+    if ( e->button() != TQt::LeftButton && e->button() != TQt::RightButton )
         return;
 
     // if we only hid the menu less than a third of a second ago,
@@ -634,10 +631,10 @@ void KlipperWidget::slotRepeatAction()
 {
     if ( !myURLGrabber ) {
         myURLGrabber = new URLGrabber( m_config );
-        connect( myURLGrabber, TQT_SIGNAL( sigPopup( TQPopupMenu * )),
-                 TQT_SLOT( showPopupMenu( TQPopupMenu * )) );
-        connect( myURLGrabber, TQT_SIGNAL( sigDisablePopup() ),
-                 this, TQT_SLOT( disableURLGrabber() ) );
+        connect( myURLGrabber, TQ_SIGNAL( sigPopup( TQPopupMenu * )),
+                 TQ_SLOT( showPopupMenu( TQPopupMenu * )) );
+        connect( myURLGrabber, TQ_SIGNAL( sigDisablePopup() ),
+                 this, TQ_SLOT( disableURLGrabber() ) );
     }
 
     const HistoryStringItem* top = dynamic_cast<const HistoryStringItem*>( history()->first() );
@@ -669,10 +666,10 @@ void KlipperWidget::setURLGrabberEnabled( bool enable )
         toggleURLGrabAction->setText(i18n("&Actions Enabled"));
         if ( !myURLGrabber ) {
             myURLGrabber = new URLGrabber( m_config );
-            connect( myURLGrabber, TQT_SIGNAL( sigPopup( TQPopupMenu * )),
-                     TQT_SLOT( showPopupMenu( TQPopupMenu * )) );
-            connect( myURLGrabber, TQT_SIGNAL( sigDisablePopup() ),
-                     this, TQT_SLOT( disableURLGrabber() ) );
+            connect( myURLGrabber, TQ_SIGNAL( sigPopup( TQPopupMenu * )),
+                     TQ_SLOT( showPopupMenu( TQPopupMenu * )) );
+            connect( myURLGrabber, TQ_SIGNAL( sigDisablePopup() ),
+                     this, TQ_SLOT( disableURLGrabber() ) );
         }
     }
 }
@@ -789,8 +786,8 @@ bool KlipperWidget::blockFetchingNewData()
 //   contents, so in practice it's like the user has selected only the part which was
 //   selected when Klipper asked first.
     ButtonState buttonstate = kapp->keyboardMouseState();
-    if( ( buttonstate & ( ShiftButton | Qt::LeftButton )) == ShiftButton // #85198
-        || ( buttonstate & Qt::LeftButton ) == Qt::LeftButton ) { // #80302
+    if( ( buttonstate & ( ShiftButton | TQt::LeftButton )) == ShiftButton // #85198
+        || ( buttonstate & TQt::LeftButton ) == TQt::LeftButton ) { // #80302
         m_pendingContentsCheck = true;
         m_pendingCheckTimer.start( 100, true );
         return true;
@@ -1056,10 +1053,10 @@ bool KlipperWidget::ignoreClipboardChanges() const
     TQWidget *focusWidget = tqApp->focusWidget();
     if ( focusWidget )
     {
-        if ( focusWidget->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ||
+        if ( focusWidget->inherits( "TQSpinBox" ) ||
              (focusWidget->parentWidget() &&
-              focusWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) &&
-              focusWidget->parentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) )
+              focusWidget->inherits("TQLineEdit") &&
+              focusWidget->parentWidget()->inherits("TQSpinWidget")) )
         {
             return true;
         }
@@ -1117,7 +1114,7 @@ void KlipperWidget::updateTimestamp()
 { // Qt3.3.0 and 3.3.1 use tqt_x_user_time for clipboard operations
     Time time = ( strcmp( tqVersion(), "3.3.1" ) == 0
                 || strcmp( tqVersion(), "3.3.0" ) == 0 )
-                ? GET_QT_X_USER_TIME() : GET_QT_X_TIME();
+                ? get_tqt_x_user_time() : get_tqt_x_time();
     static TQWidget* w = 0;
     if ( !w )
         w = new TQWidget;
diff --git a/klipper/toplevel.h b/klipper/toplevel.h
index e48ab9d83..8a924a46f 100644
--- a/klipper/toplevel.h
+++ b/klipper/toplevel.h
@@ -42,7 +42,7 @@ class KlipperSessionManaged;
 
 class KlipperWidget : public TQWidget, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
 k_dcop:
@@ -215,7 +215,7 @@ private:
 
 class Klipper : public KlipperWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 k_dcop:
     int newInstance();
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index b8b1cb032..078e38097 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -61,8 +61,8 @@ URLGrabber::URLGrabber( TDEConfig* config )
     readConfiguration( m_config );
 
     myPopupKillTimer = new TQTimer( this );
-    connect( myPopupKillTimer, TQT_SIGNAL( timeout() ),
-             TQT_SLOT( slotKillPopupMenu() ));
+    connect( myPopupKillTimer, TQ_SIGNAL( timeout() ),
+             TQ_SLOT( slotKillPopupMenu() ));
 
     // testing
     /*
@@ -163,8 +163,8 @@ void URLGrabber::actionMenu( bool wm_class_check )
         myPopupKillTimer->stop();
         delete myMenu;
         myMenu = new TDEPopupMenu;
-        connect( myMenu, TQT_SIGNAL( activated( int )),
-                 TQT_SLOT( slotItemSelected( int )));
+        connect( myMenu, TQ_SIGNAL( activated( int )),
+                 TQ_SLOT( slotItemSelected( int )));
 
         for ( action = it.current(); action; action = ++it ) {
             TQPtrListIterator<ClipCommand> it2( action->commands() );
@@ -279,7 +279,7 @@ void URLGrabber::editData()
     if ( dlg->exec() == TQDialog::Accepted ) {
         myClipData = edit->text();
         delete dlg;
-        TQTimer::singleShot( 0, this, TQT_SLOT( slotActionMenu() ) );
+        TQTimer::singleShot( 0, this, TQ_SLOT( slotActionMenu() ) );
     }
     else
     {
diff --git a/klipper/urlgrabber.h b/klipper/urlgrabber.h
index 48ef020e4..cf1c9c784 100644
--- a/klipper/urlgrabber.h
+++ b/klipper/urlgrabber.h
@@ -40,7 +40,7 @@ typedef TQPtrListIterator<ClipAction> ActionListIterator;
 
 class URLGrabber : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   URLGrabber( TDEConfig* config );
diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp
index 32dba3f3e..1cde09440 100644
--- a/kmenuedit/basictab.cpp
+++ b/kmenuedit/basictab.cpp
@@ -101,18 +101,18 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
     grid->addWidget(_execLabel, 3, 0);
 
     // connect line inputs
-    connect(_nameEdit, TQT_SIGNAL(textChanged(const TQString&)),
-            TQT_SLOT(slotChanged()));
-    connect(_descriptionEdit, TQT_SIGNAL(textChanged(const TQString&)),
-	    TQT_SLOT(slotChanged()));
-    connect(_commentEdit, TQT_SIGNAL(textChanged(const TQString&)),
-            TQT_SLOT(slotChanged()));
-    connect(_execEdit, TQT_SIGNAL(textChanged(const TQString&)),
-            TQT_SLOT(slotChanged()));
-    connect(_execEdit, TQT_SIGNAL(urlSelected(const TQString&)),
-            TQT_SLOT(slotExecSelected()));
-    connect(_launchCB, TQT_SIGNAL(clicked()), TQT_SLOT(launchcb_clicked()));
-    connect(_systrayCB, TQT_SIGNAL(clicked()), TQT_SLOT(systraycb_clicked()));
+    connect(_nameEdit, TQ_SIGNAL(textChanged(const TQString&)),
+            TQ_SLOT(slotChanged()));
+    connect(_descriptionEdit, TQ_SIGNAL(textChanged(const TQString&)),
+	    TQ_SLOT(slotChanged()));
+    connect(_commentEdit, TQ_SIGNAL(textChanged(const TQString&)),
+            TQ_SLOT(slotChanged()));
+    connect(_execEdit, TQ_SIGNAL(textChanged(const TQString&)),
+            TQ_SLOT(slotChanged()));
+    connect(_execEdit, TQ_SIGNAL(urlSelected(const TQString&)),
+            TQ_SLOT(slotExecSelected()));
+    connect(_launchCB, TQ_SIGNAL(clicked()), TQ_SLOT(launchcb_clicked()));
+    connect(_systrayCB, TQ_SIGNAL(clicked()), TQ_SLOT(systraycb_clicked()));
 
     // add line inputs to the grid
     grid->addMultiCellWidget(_nameEdit, 0, 0, 1, 1);
@@ -126,7 +126,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
     _iconButton = new TDEIconButton(general_group);
     _iconButton->setFixedSize(56,56);
     _iconButton->setIconSize(48);
-    connect(_iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(slotChanged()));
+    connect(_iconButton, TQ_SIGNAL(iconChanged(TQString)), TQ_SLOT(slotChanged()));
     grid->addMultiCellWidget(_iconButton, 0, 1, 2, 2);
 
     // add the general group to the main layout
@@ -148,8 +148,8 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
 
     _pathLabel->setBuddy(_pathEdit);
 
-    connect(_pathEdit, TQT_SIGNAL(textChanged(const TQString&)),
-            TQT_SLOT(slotChanged()));
+    connect(_pathEdit, TQ_SIGNAL(textChanged(const TQString&)),
+            TQ_SLOT(slotChanged()));
     vbox->addWidget(hbox);
     layout->addMultiCellWidget(_path_group, 1, 1, 0, 1);
 
@@ -159,7 +159,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
 			   KDialog::spacingHint());
 
     _terminalCB = new TQCheckBox(i18n("Run in term&inal"), _term_group);
-    connect(_terminalCB, TQT_SIGNAL(clicked()), TQT_SLOT(termcb_clicked()));
+    connect(_terminalCB, TQ_SIGNAL(clicked()), TQ_SLOT(termcb_clicked()));
     vbox->addWidget(_terminalCB);
 
     hbox = new TQHBox(_term_group);
@@ -169,8 +169,8 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
     _termOptEdit->setAcceptDrops(false);
     _termOptLabel->setBuddy(_termOptEdit);
 
-    connect(_termOptEdit, TQT_SIGNAL(textChanged(const TQString&)),
-            TQT_SLOT(slotChanged()));
+    connect(_termOptEdit, TQ_SIGNAL(textChanged(const TQString&)),
+            TQ_SLOT(slotChanged()));
     vbox->addWidget(hbox);
     layout->addMultiCellWidget(_term_group, 2, 2, 0, 1);
 
@@ -182,7 +182,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
                            KDialog::spacingHint());
 
     _uidCB = new TQCheckBox(i18n("&Run as a different user"), _uid_group);
-    connect(_uidCB, TQT_SIGNAL(clicked()), TQT_SLOT(uidcb_clicked()));
+    connect(_uidCB, TQ_SIGNAL(clicked()), TQ_SLOT(uidcb_clicked()));
     vbox->addWidget(_uidCB);
 
     hbox = new TQHBox(_uid_group);
@@ -192,8 +192,8 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
     _uidEdit->setAcceptDrops(false);
     _uidLabel->setBuddy(_uidEdit);
 
-    connect(_uidEdit, TQT_SIGNAL(textChanged(const TQString&)),
-	    TQT_SLOT(slotChanged()));
+    connect(_uidEdit, TQ_SIGNAL(textChanged(const TQString&)),
+	    TQ_SLOT(slotChanged()));
     vbox->addWidget(hbox);
     layout->addMultiCellWidget(_uid_group, 3, 3, 0, 1);
 
@@ -216,11 +216,11 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
     //_keyEdit->setText( "" );
     //TQPushButton* _keyButton = new TQPushButton( i18n( "Change" ),
     //                                           general_group_keybind );
-    //connect( _keyButton, TQT_SIGNAL( clicked()), this, TQT_SLOT( keyButtonPressed()));
+    //connect( _keyButton, TQ_SIGNAL( clicked()), this, TQ_SLOT( keyButtonPressed()));
     _keyEdit = new KKeyButton(general_group_keybind);
     grid_keybind->addWidget(new TQLabel(_keyEdit, i18n("Current shortcut &key:"), general_group_keybind), 0, 0);
-    connect( _keyEdit, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)),
-             this, TQT_SLOT(slotCapturedShortcut(const TDEShortcut&)));
+    connect( _keyEdit, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)),
+             this, TQ_SLOT(slotCapturedShortcut(const TDEShortcut&)));
     grid_keybind->addWidget(_keyEdit, 0, 1);
     //grid_keybind->addWidget(_keyButton, 0, 2 );
 
diff --git a/kmenuedit/basictab.h b/kmenuedit/basictab.h
index 724f1f339..89f7cd660 100644
--- a/kmenuedit/basictab.h
+++ b/kmenuedit/basictab.h
@@ -40,7 +40,7 @@ class MenuEntryInfo;
 
 class BasicTab : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     BasicTab( TQWidget *parent=0, const char *name=0 );
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp
index 8a90cfcd0..282c9843c 100644
--- a/kmenuedit/kmenuedit.cpp
+++ b/kmenuedit/kmenuedit.cpp
@@ -67,12 +67,12 @@ void KMenuEdit::setupActions()
     if (!m_controlCenter)
        (void)new TDEAction(i18n("New S&eparator"), "menu_new_sep", 0, actionCollection(), "newsep");
 
-    (void)new TDEAction(i18n("Save && Quit"), "filesave_and_close", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSave_and_close()), actionCollection(), "file_save_and_quit");
+    (void)new TDEAction(i18n("Save && Quit"), "filesave_and_close", 0, this, TQ_SLOT( slotSave_and_close()), actionCollection(), "file_save_and_quit");
 
     m_actionDelete = 0;
 
-    KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT( slotSave() ), actionCollection());
-    KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection());
+    KStdAction::save(this, TQ_SLOT( slotSave() ), actionCollection());
+    KStdAction::quit(this, TQ_SLOT( close() ), actionCollection());
     KStdAction::cut(0, 0, actionCollection());
     KStdAction::copy(0, 0, actionCollection());
     KStdAction::paste(0, 0, actionCollection());
@@ -80,25 +80,25 @@ void KMenuEdit::setupActions()
 
 void KMenuEdit::setupView()
 {
-    m_splitter = new TQSplitter(Qt::Horizontal, this);
+    m_splitter = new TQSplitter(TQt::Horizontal, this);
     m_tree = new TreeView(m_controlCenter, actionCollection(), m_splitter);
     m_basicTab = new BasicTab(m_splitter);
 
-    connect(m_tree, TQT_SIGNAL(entrySelected(MenuFolderInfo *)),
-            m_basicTab, TQT_SLOT(setFolderInfo(MenuFolderInfo *)));
-    connect(m_tree, TQT_SIGNAL(entrySelected(MenuEntryInfo *)),
-            m_basicTab, TQT_SLOT(setEntryInfo(MenuEntryInfo *)));
-    connect(m_tree, TQT_SIGNAL(disableAction()),
-            m_basicTab, TQT_SLOT(slotDisableAction() ) );
+    connect(m_tree, TQ_SIGNAL(entrySelected(MenuFolderInfo *)),
+            m_basicTab, TQ_SLOT(setFolderInfo(MenuFolderInfo *)));
+    connect(m_tree, TQ_SIGNAL(entrySelected(MenuEntryInfo *)),
+            m_basicTab, TQ_SLOT(setEntryInfo(MenuEntryInfo *)));
+    connect(m_tree, TQ_SIGNAL(disableAction()),
+            m_basicTab, TQ_SLOT(slotDisableAction() ) );
 
-    connect(m_basicTab, TQT_SIGNAL(changed(MenuFolderInfo *)),
-            m_tree, TQT_SLOT(currentChanged(MenuFolderInfo *)));
+    connect(m_basicTab, TQ_SIGNAL(changed(MenuFolderInfo *)),
+            m_tree, TQ_SLOT(currentChanged(MenuFolderInfo *)));
 
-    connect(m_basicTab, TQT_SIGNAL(changed(MenuEntryInfo *)),
-            m_tree, TQT_SLOT(currentChanged(MenuEntryInfo *)));
+    connect(m_basicTab, TQ_SIGNAL(changed(MenuEntryInfo *)),
+            m_tree, TQ_SLOT(currentChanged(MenuEntryInfo *)));
 
-    connect(m_basicTab, TQT_SIGNAL(findServiceShortcut(const TDEShortcut&, KService::Ptr &)),
-            m_tree, TQT_SLOT(findServiceShortcut(const TDEShortcut&, KService::Ptr &)));
+    connect(m_basicTab, TQ_SIGNAL(findServiceShortcut(const TDEShortcut&, KService::Ptr &)),
+            m_tree, TQ_SLOT(findServiceShortcut(const TDEShortcut&, KService::Ptr &)));
 
     // restore splitter sizes
     TDEConfig* config = TDEGlobal::config();
diff --git a/kmenuedit/kmenuedit.h b/kmenuedit/kmenuedit.h
index 15e5c797f..f08247ebd 100644
--- a/kmenuedit/kmenuedit.h
+++ b/kmenuedit/kmenuedit.h
@@ -30,7 +30,7 @@ class TDEToggleAction;
 
 class KMenuEdit : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KMenuEdit( bool controlCenter, TQWidget *parent=0, const char *name=0 );
diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index 7f7e31dce..8340b4090 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -163,23 +163,23 @@ TreeView::TreeView( bool controlCenter, TDEActionCollection *ac, TQWidget *paren
     addColumn("");
     header()->hide();
 
-    connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
-	    TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
+    connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
+	    TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
 
-    connect(this, TQT_SIGNAL(clicked( TQListViewItem* )),
-	    TQT_SLOT(itemSelected( TQListViewItem* )));
+    connect(this, TQ_SIGNAL(clicked( TQListViewItem* )),
+	    TQ_SLOT(itemSelected( TQListViewItem* )));
 
-    connect(this,TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
-            TQT_SLOT(itemSelected( TQListViewItem* )));
+    connect(this,TQ_SIGNAL(selectionChanged ( TQListViewItem * )),
+            TQ_SLOT(itemSelected( TQListViewItem* )));
 
-    connect(this, TQT_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)),
-	    TQT_SLOT(slotRMBPressed(TQListViewItem*, const TQPoint&)));
+    connect(this, TQ_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)),
+	    TQ_SLOT(slotRMBPressed(TQListViewItem*, const TQPoint&)));
 
     // connect actions
-    connect(m_ac->action("newitem"), TQT_SIGNAL(activated()), TQT_SLOT(newitem()));
-    connect(m_ac->action("newsubmenu"), TQT_SIGNAL(activated()), TQT_SLOT(newsubmenu()));
+    connect(m_ac->action("newitem"), TQ_SIGNAL(activated()), TQ_SLOT(newitem()));
+    connect(m_ac->action("newsubmenu"), TQ_SIGNAL(activated()), TQ_SLOT(newsubmenu()));
     if (m_ac->action("newsep"))
-        connect(m_ac->action("newsep"), TQT_SIGNAL(activated()), TQT_SLOT(newsep()));
+        connect(m_ac->action("newsep"), TQ_SIGNAL(activated()), TQ_SLOT(newsep()));
 
     m_menuFile = new MenuFile( locateLocal("xdgconf-menu", "applications-tdemenuedit.menu"));
     m_rootFolder = new MenuFolderInfo;
@@ -215,21 +215,21 @@ void TreeView::setViewMode(bool showHidden)
     if(action) {
         action->plug(m_rmb);
         action->setEnabled(false);
-        connect(action, TQT_SIGNAL(activated()), TQT_SLOT(cut()));
+        connect(action, TQ_SIGNAL(activated()), TQ_SLOT(cut()));
     }
 
     action = m_ac->action("edit_copy");
     if(action) {
         action->plug(m_rmb);
         action->setEnabled(false);
-        connect(action, TQT_SIGNAL(activated()), TQT_SLOT(copy()));
+        connect(action, TQ_SIGNAL(activated()), TQ_SLOT(copy()));
     }
 
     action = m_ac->action("edit_paste");
     if(action) {
         action->plug(m_rmb);
         action->setEnabled(false);
-        connect(action, TQT_SIGNAL(activated()), TQT_SLOT(paste()));
+        connect(action, TQ_SIGNAL(activated()), TQ_SLOT(paste()));
     }
 
     m_rmb->insertSeparator();
@@ -238,7 +238,7 @@ void TreeView::setViewMode(bool showHidden)
     if(action) {
         action->plug(m_rmb);
         action->setEnabled(false);
-        connect(action, TQT_SIGNAL(activated()), TQT_SLOT(del()));
+        connect(action, TQ_SIGNAL(activated()), TQ_SLOT(del()));
     }
 
     m_rmb->insertSeparator();
@@ -310,7 +310,7 @@ void TreeView::readMenuFolderInfo(MenuFolderInfo *folderInfo, KServiceGroup::Ptr
 
 void TreeView::fill()
 {
-    TQApplication::setOverrideCursor(Qt::WaitCursor);
+    TQApplication::setOverrideCursor(TQt::WaitCursor);
     clear();
     fillBranch(m_rootFolder, 0);
     TQApplication::restoreOverrideCursor();
@@ -378,7 +378,7 @@ TreeItem *TreeView::createTreeItem(TreeItem *parent, TQListViewItem *after, Menu
    else
      item = new TreeItem(parent, after, entryInfo->menuId(),_init);
 
-   QString	name;
+   TQString	name;
 	 
    if (m_detailedMenuEntries && entryInfo->description.length() != 0)
    {
@@ -566,7 +566,7 @@ void TreeView::currentChanged(MenuEntryInfo *entryInfo)
     if (item == 0) return;
     if (entryInfo == 0) return;
 
-    QString	name;
+    TQString	name;
 	 
     if (m_detailedMenuEntries && entryInfo->description.length() != 0)
     {
diff --git a/kmenuedit/treeview.h b/kmenuedit/treeview.h
index 3370f5bc2..c456d1c9c 100644
--- a/kmenuedit/treeview.h
+++ b/kmenuedit/treeview.h
@@ -88,7 +88,7 @@ private:
 class TreeView : public TDEListView
 {
     friend class TreeItem;
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TreeView(bool controlCenter, TDEActionCollection *ac, TQWidget *parent=0, const char *name=0);
     ~TreeView();
diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui
index 781643ff1..f73f25707 100644
--- a/knetattach/knetattach.ui
+++ b/knetattach/knetattach.ui
@@ -424,7 +424,7 @@
 <variables>
     <variable access="private">TQString _type;</variable>
 </variables>
-<Q_SLOTS>
+<slots>
     <slot access="private">init()</slot>
     <slot>setInformationText( const TQString &amp; type )</slot>
     <slot access="private">showPage( TQWidget * page )</slot>
@@ -432,7 +432,7 @@
     <slot access="private">finished()</slot>
     <slot access="private">updatePort( bool encryption )</slot>
     <slot access="private">updateFinishButtonText( bool save )</slot>
-</Q_SLOTS>
+</slots>
 <functions>
     <function access="private" returnType="bool">doConnectionTest( const KURL &amp; url )</function>
     <function access="private" returnType="bool">updateForProtocol( const TQString &amp; protocol )</function>
diff --git a/knetattach/knetattach.ui.h b/knetattach/knetattach.ui.h
index f71240990..1df766960 100644
--- a/knetattach/knetattach.ui.h
+++ b/knetattach/knetattach.ui.h
@@ -13,8 +13,8 @@
 void KNetAttach::init()
 {
     setIcon(SmallIcon("knetattach"));
-    disconnect(finishButton(), TQT_SIGNAL(clicked()), (TQDialog*)this, TQT_SLOT(accept()));
-    connect(finishButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(finished()));
+    disconnect(finishButton(), TQ_SIGNAL(clicked()), (TQDialog*)this, TQ_SLOT(accept()));
+    connect(finishButton(), TQ_SIGNAL(clicked()), this, TQ_SLOT(finished()));
     finishButton()->setText(i18n("Save && C&onnect"));
     //setResizeMode(Fixed); FIXME: make the wizard fixed-geometry
     setFinishEnabled(_folderParameters, false);
diff --git a/konqueror/KonqMainWindowIface.cpp b/konqueror/KonqMainWindowIface.cpp
index a18301a2f..5f3cbd14f 100644
--- a/konqueror/KonqMainWindowIface.cpp
+++ b/konqueror/KonqMainWindowIface.cpp
@@ -153,13 +153,13 @@ TQMap<TQCString,DCOPRef> KonqMainWindowIface::actionMap()
 
 QCStringList KonqMainWindowIface::functionsDynamic()
 {
-    return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( TQT_TQOBJECT(m_pMainWindow) );
+    return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( m_pMainWindow );
 }
 
 bool KonqMainWindowIface::processDynamic( const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData )
 {
-    if ( KDCOPPropertyProxy::isPropertyRequest( fun, TQT_TQOBJECT(m_pMainWindow) ) )
-        return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, TQT_TQOBJECT(m_pMainWindow) );
+    if ( KDCOPPropertyProxy::isPropertyRequest( fun, m_pMainWindow ) )
+        return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, m_pMainWindow );
 
     return DCOPObject::processDynamic( fun, data, replyType, replyData );
 }
diff --git a/konqueror/KonquerorIface.cpp b/konqueror/KonquerorIface.cpp
index 6a164b160..db87e39ed 100644
--- a/konqueror/KonquerorIface.cpp
+++ b/konqueror/KonquerorIface.cpp
@@ -51,7 +51,7 @@ KonquerorIface::~KonquerorIface()
 
 DCOPRef KonquerorIface::openBrowserWindow( const TQString &url )
 {
-    SET_QT_X_USER_TIME(0);
+    set_tqt_x_user_time(0);
     KonqMainWindow *res = KonqMisc::createSimpleWindow( KURL(url) );
     if ( !res )
         return DCOPRef();
@@ -77,7 +77,7 @@ DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQCString
 
 DCOPRef KonquerorIface::createNewWindowWithSelection( const TQString &url, TQStringList filesToSelect )
 {
-    SET_QT_X_USER_TIME(0);
+    set_tqt_x_user_time(0);
     KonqMainWindow *res = KonqMisc::createNewWindow( KURL(url), KParts::URLArgs(), false, filesToSelect );
     if ( !res )
         return DCOPRef();
@@ -92,7 +92,7 @@ DCOPRef KonquerorIface::createNewWindowWithSelectionASN( const TQString &url, TQ
 
 DCOPRef KonquerorIface::createNewWindow( const TQString &url, const TQString &mimetype, bool tempFile )
 {
-    SET_QT_X_USER_TIME(0);
+    set_tqt_x_user_time(0);
     KParts::URLArgs args;
     args.serviceType = mimetype;
     // Filter the URL, so that "kfmclient openURL gg:foo" works also when konq is already running
@@ -112,7 +112,7 @@ DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQString
 
 DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString &path )
 {
-    SET_QT_X_USER_TIME(0);
+    set_tqt_x_user_time(0);
     kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( const TQString &path ) " << endl;
     kdDebug(1202) << path << endl;
     KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, TQString::null );
@@ -129,7 +129,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path,
 
 DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString & path, const TQString &filename )
 {
-    SET_QT_X_USER_TIME(0);
+    set_tqt_x_user_time(0);
     kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( path, filename ) " << endl;
     kdDebug(1202) << path << "," << filename << endl;
     KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename );
@@ -147,7 +147,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path,
 
 DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString & path, const TQString &filename, const TQString &url )
 {
-    SET_QT_X_USER_TIME(0);
+    set_tqt_x_user_time(0);
     KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url) );
     if ( !res )
         return DCOPRef();
@@ -163,7 +163,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString
 
 DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString &path, const TQString &filename, const TQString &url, const TQString &mimetype )
 {
-    SET_QT_X_USER_TIME(0);
+    set_tqt_x_user_time(0);
     KParts::URLArgs args;
     args.serviceType = mimetype;
     KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url), args );
diff --git a/konqueror/about/konq_aboutpage.cpp b/konqueror/about/konq_aboutpage.cpp
index cb2149f90..a18aa3eda 100644
--- a/konqueror/about/konq_aboutpage.cpp
+++ b/konqueror/about/konq_aboutpage.cpp
@@ -54,7 +54,7 @@ KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *parentWidget, co
                                                       TQObject *parent, const char *name,
                                                       const char *, const TQStringList & )
 {
-    //KonqFrame *frame = tqt_dynamic_cast<KonqFrame *>( parentWidget );
+    //KonqFrame *frame = dynamic_cast<KonqFrame *>( parentWidget );
     //if ( !frame ) return 0;
 
     return new KonqAboutPage( //frame->childView()->mainWindow(),
diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h
index a4192d570..1c359a89e 100644
--- a/konqueror/about/konq_aboutpage.h
+++ b/konqueror/about/konq_aboutpage.h
@@ -34,7 +34,7 @@ private:
 
 class KonqAboutPage : public TDEHTMLPart
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KonqAboutPage( /*KonqMainWindow *mainWindow,*/
                    TQWidget *parentWidget, const char *widgetName,
diff --git a/konqueror/client/kfmclient.cpp b/konqueror/client/kfmclient.cpp
index efc858f61..001734cdb 100644
--- a/konqueror/client/kfmclient.cpp
+++ b/konqueror/client/kfmclient.cpp
@@ -323,8 +323,8 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
             TDEStartupInfo::appStarted();
 
             KRun * run = new KRun( url, 0, 0, false, false /* no progress window */ ); // TODO pass tempFile [needs support in the KRun ctor]
-            TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() ));
-            TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() ));
+            TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() ));
+            TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() ));
             app.exec();
             return !krun_has_error;
         }
@@ -423,7 +423,7 @@ void clientApp::delayedQuit()
 {
     // Quit in 2 seconds. This leaves time for KRun to pop up
     // "app not found" in TDEProcessRunner, if that was the case.
-    TQTimer::singleShot( 2000, this, TQT_SLOT(deref()) );
+    TQTimer::singleShot( 2000, this, TQ_SLOT(deref()) );
     // don't access the KRun instance later, it will be deleted after calling slots
     if( static_cast< const KRun* >( sender())->hasError())
         krun_has_error = true;
@@ -504,8 +504,8 @@ bool clientApp::doIt()
   {
     checkArgumentCount(argc, 2, 2);
     KPropertiesDialog * p = new KPropertiesDialog( args->url(1) );
-    TQObject::connect( p, TQT_SIGNAL( destroyed() ), &app, TQT_SLOT( quit() ));
-    TQObject::connect( p, TQT_SIGNAL( canceled() ), &app, TQT_SLOT( slotDialogCanceled() ));
+    TQObject::connect( p, TQ_SIGNAL( destroyed() ), &app, TQ_SLOT( quit() ));
+    TQObject::connect( p, TQ_SIGNAL( canceled() ), &app, TQ_SLOT( slotDialogCanceled() ));
     app.exec();
     return m_ok;
   }
@@ -520,8 +520,8 @@ bool clientApp::doIt()
     else if ( argc == 2 )
     {
       KRun * run = new KRun( args->url(1), 0, 0, false, false /* no progress window */ );
-      TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() ));
-      TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() ));
+      TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() ));
+      TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() ));
       app.exec();
       return !krun_has_error;
     }
@@ -538,8 +538,8 @@ bool clientApp::doIt()
   else if ( command == "openBrowser" )
   {
     KRun * run = new KRun( "http://default.browser", 0, 0, false, false /* no progress window */ );
-    TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() ));
-    TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() ));
+    TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() ));
+    TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() ));
     app.exec();
     return !krun_has_error;
   }
@@ -553,7 +553,7 @@ bool clientApp::doIt()
     TDEIO::Job * job = TDEIO::move( srcLst, args->url(argc - 1) );
     if ( !s_interactive )
         job->setInteractive( false );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
     app.exec();
     return m_ok;
   }
@@ -588,7 +588,7 @@ bool clientApp::doIt()
     TDEIO::Job * job = TDEIO::copy( srcLst, dsturl );
     if ( !s_interactive )
         job->setInteractive( false );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
     app.exec();
     return m_ok;
   }
@@ -602,7 +602,7 @@ bool clientApp::doIt()
     TDEIO::Job * job = TDEIO::copy( srcLst, args->url(argc - 1) );
     if ( !s_interactive )
         job->setInteractive( false );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
     app.exec();
     return m_ok;
   }
diff --git a/konqueror/client/kfmclient.h b/konqueror/client/kfmclient.h
index 1e17279c6..f46f3d06f 100644
--- a/konqueror/client/kfmclient.h
+++ b/konqueror/client/kfmclient.h
@@ -25,7 +25,7 @@
 
 class clientApp : public TDEApplication
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /** Parse command-line arguments and "do it" */
   static bool doIt();
diff --git a/konqueror/delayedinitializer.cpp b/konqueror/delayedinitializer.cpp
index e30db3d21..a635fb1ac 100644
--- a/konqueror/delayedinitializer.cpp
+++ b/konqueror/delayedinitializer.cpp
@@ -38,7 +38,7 @@ bool DelayedInitializer::eventFilter( TQObject *receiver, TQEvent *event )
     // Move the emitting of the event to the end of the eventQueue
     // so we are absolutely sure the event we get here is handled before
     // the initialize is fired.
-    TQTimer::singleShot( 0, this, TQT_SLOT( slotInitialize() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( slotInitialize() ) );
 
     return false;
 }
diff --git a/konqueror/delayedinitializer.h b/konqueror/delayedinitializer.h
index 27953f203..c52fe04b0 100644
--- a/konqueror/delayedinitializer.h
+++ b/konqueror/delayedinitializer.h
@@ -24,7 +24,7 @@
 
 class DelayedInitializer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DelayedInitializer( int eventType, TQObject *parent, const char *name = 0 );
 
diff --git a/konqueror/iconview/konq_iconview.cpp b/konqueror/iconview/konq_iconview.cpp
index 5efc1e751..04b973f8f 100644
--- a/konqueror/iconview/konq_iconview.cpp
+++ b/konqueror/iconview/konq_iconview.cpp
@@ -184,22 +184,22 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
     m_pIconView = new KonqIconViewWidget( parentWidget, "qiconview" );
     m_pIconView->initConfig( true );
 
-    connect( m_pIconView,  TQT_SIGNAL(imagePreviewFinished()),
-             this, TQT_SLOT(slotRenderingFinished()));
+    connect( m_pIconView,  TQ_SIGNAL(imagePreviewFinished()),
+             this, TQ_SLOT(slotRenderingFinished()));
 
     // connect up the icon inc/dec signals
-    connect( m_pIconView,  TQT_SIGNAL(incIconSize()),
-             this, TQT_SLOT(slotIncIconSize()));
-    connect( m_pIconView,  TQT_SIGNAL(decIconSize()),
-             this, TQT_SLOT(slotDecIconSize()));
+    connect( m_pIconView,  TQ_SIGNAL(incIconSize()),
+             this, TQ_SLOT(slotIncIconSize()));
+    connect( m_pIconView,  TQ_SIGNAL(decIconSize()),
+             this, TQ_SLOT(slotDecIconSize()));
 
     // pass signals to the extension
-    connect( m_pIconView, TQT_SIGNAL( enableAction( const char *, bool ) ),
-             m_extension, TQT_SIGNAL( enableAction( const char *, bool ) ) );
+    connect( m_pIconView, TQ_SIGNAL( enableAction( const char *, bool ) ),
+             m_extension, TQ_SIGNAL( enableAction( const char *, bool ) ) );
 
     // signals from konqdirpart (for BC reasons)
-    connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) );
-    connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) );
+    connect( this, TQ_SIGNAL( findOpened( KonqDirPart * ) ), TQ_SLOT( slotKFindOpened() ) );
+    connect( this, TQ_SIGNAL( findClosed( KonqDirPart * ) ), TQ_SLOT( slotKFindClosed() ) );
 
     setWidget( m_pIconView );
     m_mimeTypeResolver = new KMimeTypeResolver<KFileIVI,KonqKfmIconView>(this);
@@ -211,22 +211,22 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
     // Don't repaint on configuration changes during construction
     m_bInit = true;
 
-    m_paDotFiles = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ),
+    m_paDotFiles = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQ_SLOT( slotShowDot() ),
                                       actionCollection(), "show_dot" );
 //    m_paDotFiles->setCheckedState(i18n("Hide &Hidden Files"));
     m_paDotFiles->setToolTip( i18n( "Toggle displaying of hidden dot files" ) );
 
-    m_paDirectoryOverlays = new TDEToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQT_SLOT( slotShowDirectoryOverlays() ),
+    m_paDirectoryOverlays = new TDEToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQ_SLOT( slotShowDirectoryOverlays() ),
                                       actionCollection(), "show_directory_overlays" );
 
-    m_paFreeSpaceOverlays = new TDEToggleAction( i18n( "&Media Icons Reflect Free Space" ), 0, this, TQT_SLOT( slotShowFreeSpaceOverlays() ),
+    m_paFreeSpaceOverlays = new TDEToggleAction( i18n( "&Media Icons Reflect Free Space" ), 0, this, TQ_SLOT( slotShowFreeSpaceOverlays() ),
                                       actionCollection(), "show_free_space_overlays" );
 
     m_pamPreview = new TDEActionMenu( i18n( "&Preview" ), actionCollection(), "iconview_preview" );
 
     m_paEnablePreviews = new TDEToggleAction( i18n("Enable Previews"), 0, actionCollection(), "iconview_preview_all" );
     m_paEnablePreviews->setCheckedState( i18n("Disable Previews") );
-    connect( m_paEnablePreviews, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) );
+    connect( m_paEnablePreviews, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPreview( bool ) ) );
     m_paEnablePreviews->setIcon("thumbnail");
     m_pamPreview->insert( m_paEnablePreviews );
     m_pamPreview->insert( new TDEActionSeparator(this) );
@@ -240,13 +240,13 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
         else
         {
             preview = new TDEToggleAction( (*it)->name(), 0, actionCollection(), (*it)->desktopEntryName().latin1() );
-            connect( preview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) );
+            connect( preview, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPreview( bool ) ) );
             m_pamPreview->insert( preview );
             m_paPreviewPlugins.append( preview );
         }
     }
     TDEToggleAction *soundPreview = new TDEToggleAction( i18n("Sound Files"), 0, actionCollection(), "audio/" );
-    connect( soundPreview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) );
+    connect( soundPreview, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPreview( bool ) ) );
     m_pamPreview->insert( soundPreview );
     m_paPreviewPlugins.append( soundPreview );
 
@@ -270,15 +270,15 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
     aSortByType->setChecked( false );
     aSortByDate->setChecked( false );
 
-    connect( aSortByNameCS, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByNameCaseSensitive( bool ) ) );
-    connect( aSortByNameCI, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByNameCaseInsensitive( bool ) ) );
-    connect( aSortBySize, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortBySize( bool ) ) );
-    connect( aSortByType, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByType( bool ) ) );
-    connect( aSortByDate, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByDate( bool ) ) );
+    connect( aSortByNameCS, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByNameCaseSensitive( bool ) ) );
+    connect( aSortByNameCI, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByNameCaseInsensitive( bool ) ) );
+    connect( aSortBySize, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortBySize( bool ) ) );
+    connect( aSortByType, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByType( bool ) ) );
+    connect( aSortByDate, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByDate( bool ) ) );
 
     //enable menu item representing the saved sorting criterion
     TQString sortcrit = KonqIconViewFactory::defaultViewProps()->sortCriterion();
-    TDERadioAction *sort_action = tqt_dynamic_cast<TDERadioAction *>(actionCollection()->action(sortcrit.latin1()));
+    TDERadioAction *sort_action = dynamic_cast<TDERadioAction *>(actionCollection()->action(sortcrit.latin1()));
     if(sort_action!=NULL) sort_action->activate();
 
     m_paSortDirsFirst = new TDEToggleAction( i18n( "Folders First" ), 0, actionCollection(), "sort_directoriesfirst" );
@@ -286,8 +286,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
 
     m_paSortDirsFirst->setChecked( KonqIconViewFactory::defaultViewProps()->isDirsFirst() );
 
-    connect( aSortDescending, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortDescending() ) );
-    connect( m_paSortDirsFirst, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortDirsFirst() ) );
+    connect( aSortDescending, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortDescending() ) );
+    connect( m_paSortDirsFirst, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortDirsFirst() ) );
 
     //enable stored settings
     slotSortDirsFirst();
@@ -307,15 +307,15 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
 
     m_pamSort->insert( aSortDescending );
     */
-    m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ),
+    m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQ_SLOT( slotSelect() ),
                               actionCollection(), "select" );
-    m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ),
+    m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQ_SLOT( slotUnselect() ),
                                 actionCollection(), "unselect" );
-    m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" );
-    m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ),
+    m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectall" );
+    m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQ_SLOT( slotUnselectAll() ),
                                    actionCollection(), "unselectall" );
     m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk,
-                                       this, TQT_SLOT( slotInvertSelection() ),
+                                       this, TQ_SLOT( slotInvertSelection() ),
                                        actionCollection(), "invertselection" );
 
     m_paSelect->setToolTip( i18n( "Allows selecting of file or folder items based on a given mask" ) );
@@ -328,67 +328,65 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
     //m_paRightText = new TDEToggleAction( i18n( "Text at &Right" ), 0, actionCollection(), "textright" );
     //m_paBottomText->setExclusiveGroup( "TextPos" );
     //m_paRightText->setExclusiveGroup( "TextPos" );
-    //connect( m_paBottomText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextBottom( bool ) ) );
-    //connect( m_paRightText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextRight( bool ) ) );
+    //connect( m_paBottomText, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotTextBottom( bool ) ) );
+    //connect( m_paRightText, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotTextRight( bool ) ) );
 
-    connect( m_pIconView, TQT_SIGNAL( executed( TQIconViewItem * ) ),
-             this, TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
-    connect( m_pIconView, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ),
-             this, TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
+    connect( m_pIconView, TQ_SIGNAL( executed( TQIconViewItem * ) ),
+             this, TQ_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
+    connect( m_pIconView, TQ_SIGNAL( returnPressed( TQIconViewItem * ) ),
+             this, TQ_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
 
-    connect( m_pIconView, TQT_SIGNAL( onItem( TQIconViewItem * ) ),
-             this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) );
+    connect( m_pIconView, TQ_SIGNAL( onItem( TQIconViewItem * ) ),
+             this, TQ_SLOT( slotOnItem( TQIconViewItem * ) ) );
 
-    connect( m_pIconView, TQT_SIGNAL( onViewport() ),
-             this, TQT_SLOT( slotOnViewport() ) );
+    connect( m_pIconView, TQ_SIGNAL( onViewport() ),
+             this, TQ_SLOT( slotOnViewport() ) );
 
-    connect( m_pIconView, TQT_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)),
-             this, TQT_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) );
-    connect( m_pIconView, TQT_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)),
-             this, TQT_SLOT( slotMouseButtonClicked(int, TQIconViewItem*, const TQPoint&)) );
-    connect( m_pIconView, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)),
-             this, TQT_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) );
-    connect( m_pIconView, TQT_SIGNAL( mouseDoubleClicked(TQIconViewItem*)),
-             this, TQT_SLOT( slotDoubleClicked(TQIconViewItem*)) );
+    connect( m_pIconView, TQ_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)),
+             this, TQ_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) );
+    connect( m_pIconView, TQ_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)),
+             this, TQ_SLOT( slotMouseButtonClicked(int, TQIconViewItem*, const TQPoint&)) );
+    connect( m_pIconView, TQ_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)),
+             this, TQ_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) );
 
     // Signals needed to implement the spring loading folders behavior
-    connect( m_pIconView, TQT_SIGNAL( held( TQIconViewItem * ) ),
-             this, TQT_SLOT( slotDragHeld( TQIconViewItem * ) ) );
-    connect( m_pIconView, TQT_SIGNAL( dragEntered( bool ) ),
-             this, TQT_SLOT( slotDragEntered( bool ) ) );
-    connect( m_pIconView, TQT_SIGNAL( dragLeft() ),
-             this, TQT_SLOT( slotDragLeft() ) );
-    connect( m_pIconView, TQT_SIGNAL( dragMove( bool ) ),
-             this, TQT_SLOT( slotDragMove( bool ) ) );
-    connect( m_pIconView, TQT_SIGNAL( dragFinished() ),
-             this, TQT_SLOT( slotDragFinished() ) );
+    connect( m_pIconView, TQ_SIGNAL( held( TQIconViewItem * ) ),
+             this, TQ_SLOT( slotDragHeld( TQIconViewItem * ) ) );
+    connect( m_pIconView, TQ_SIGNAL( dragEntered( bool ) ),
+             this, TQ_SLOT( slotDragEntered( bool ) ) );
+    connect( m_pIconView, TQ_SIGNAL( dragLeft() ),
+             this, TQ_SLOT( slotDragLeft() ) );
+    connect( m_pIconView, TQ_SIGNAL( dragMove( bool ) ),
+             this, TQ_SLOT( slotDragMove( bool ) ) );
+    connect( m_pIconView, TQ_SIGNAL( dragFinished() ),
+             this, TQ_SLOT( slotDragFinished() ) );
 
     // Create the directory lister
     m_dirLister = new KDirLister( true );
     setDirLister( m_dirLister );
     m_dirLister->setMainWindow(m_pIconView->topLevelWidget());
 
-    connect( m_dirLister, TQT_SIGNAL( started( const KURL & ) ),
-             this, TQT_SLOT( slotStarted() ) );
-    connect( m_dirLister, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) );
-    connect( m_dirLister, TQT_SIGNAL( canceled( const KURL& ) ), this, TQT_SLOT( slotCanceled( const KURL& ) ) );
-    connect( m_dirLister, TQT_SIGNAL( clear() ), this, TQT_SLOT( slotClear() ) );
-    connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList& ) ),
-             this, TQT_SLOT( slotNewItems( const KFileItemList& ) ) );
-    connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
-             this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
-    connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList& ) ),
-             this, TQT_SLOT( slotRefreshItems( const KFileItemList& ) ) );
-    connect( m_dirLister, TQT_SIGNAL( redirection( const KURL & ) ),
-             this, TQT_SLOT( slotRedirection( const KURL & ) ) );
-    connect( m_dirLister, TQT_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ),
-             TQT_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ) );
-    connect( m_dirLister, TQT_SIGNAL( infoMessage( const TQString& ) ),
-             extension(), TQT_SIGNAL( infoMessage( const TQString& ) ) );
-    connect( m_dirLister, TQT_SIGNAL( percent( int ) ),
-             extension(), TQT_SIGNAL( loadingProgress( int ) ) );
-    connect( m_dirLister, TQT_SIGNAL( speed( int ) ),
-             extension(), TQT_SIGNAL( speedProgress( int ) ) );
+    connect( m_dirLister, TQ_SIGNAL( started( const KURL & ) ),
+             this, TQ_SLOT( slotStarted() ) );
+    connect( m_dirLister, TQ_SIGNAL( completed() ), this, TQ_SLOT( slotCompleted() ) );
+    connect( m_dirLister, TQ_SIGNAL( canceled( const KURL& ) ), this, TQ_SLOT( slotCanceled( const KURL& ) ) );
+    connect( m_dirLister, TQ_SIGNAL( clear() ), this, TQ_SLOT( slotClear() ) );
+    connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList& ) ),
+             this, TQ_SLOT( slotNewItems( const KFileItemList& ) ) );
+    connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ),
+             this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) );
+    connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList& ) ),
+             this, TQ_SLOT( slotRefreshItems( const KFileItemList& ) ) );
+    connect( m_dirLister, TQ_SIGNAL( redirection( const KURL & ) ),
+             this, TQ_SLOT( slotRedirection( const KURL & ) ) );
+    connect( m_dirLister, TQ_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ),
+             TQ_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ) );
+    connect( m_dirLister, TQ_SIGNAL( infoMessage( const TQString& ) ),
+             extension(), TQ_SIGNAL( infoMessage( const TQString& ) ) );
+    connect( m_dirLister, TQ_SIGNAL( percent( int ) ),
+             extension(), TQ_SIGNAL( loadingProgress( int ) ) );
+    connect( m_dirLister, TQ_SIGNAL( speed( int ) ),
+             extension(), TQ_SIGNAL( speedProgress( int ) ) );
 
     // Now we may react to configuration changes
     m_bInit = false;
@@ -401,8 +399,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
     m_bPreviewRunningBeforeCloseURL = false;
     m_pIconView->setResizeMode( TQIconView::Adjust );
 
-    connect( m_pIconView, TQT_SIGNAL( selectionChanged() ),
-             this, TQT_SLOT( slotSelectionChanged() ) );
+    connect( m_pIconView, TQ_SIGNAL( selectionChanged() ),
+             this, TQ_SLOT( slotSelectionChanged() ) );
 
     // Respect kcmkonq's configuration for word-wrap icon text.
     // If we want something else, we have to adapt the configuration or remove it...
@@ -412,6 +410,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
     //    m_pIconView->calculateGridX();
 
     setViewMode( mode );
+
+    m_pActivateDoubleClickTimer = new TQTimer(this);
 }
 
 KonqKfmIconView::~KonqKfmIconView()
@@ -427,6 +427,13 @@ KonqKfmIconView::~KonqKfmIconView()
     delete m_pProps;
     //no need for that, KParts deletes our widget already ;-)
     //    delete m_pIconView;
+    m_pActivateDoubleClickTimer->stop();
+    delete m_pActivateDoubleClickTimer;
+    if (m_pTimeoutRefreshTimer)
+    {
+      m_pTimeoutRefreshTimer->stop();
+      delete m_pTimeoutRefreshTimer;
+    }
 }
 
 const KFileItem * KonqKfmIconView::currentItem()
@@ -436,7 +443,7 @@ const KFileItem * KonqKfmIconView::currentItem()
 
 void KonqKfmIconView::slotPreview( bool toggle )
 {
-    TQCString name = TQT_TQOBJECT_CONST(sender())->name(); // e.g. clipartthumbnail (or audio/, special case)
+    TQCString name = sender()->name(); // e.g. clipartthumbnail (or audio/, special case)
     if (name == "iconview_preview_all")
     {
         m_pProps->setShowingPreview( toggle );
@@ -832,7 +839,7 @@ void KonqKfmIconView::slotContextMenuRequested(TQIconViewItem* _item, const TQPo
 
 void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item, const TQPoint&)
 {
-    if ( _button == Qt::RightButton && !_item )
+    if ( _button == TQt::RightButton && !_item )
     {
         // Right click on viewport
         KFileItem * item = m_dirLister->rootItem();
@@ -869,21 +876,40 @@ void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item,
 
 void KonqKfmIconView::slotMouseButtonClicked(int _button, TQIconViewItem* _item, const TQPoint& )
 {
-    if( _button == Qt::MidButton )
+    if (_button == TQt::MidButton)
+    {
         mmbClicked( _item ? static_cast<KFileIVI*>(_item)->item() : 0L );
+    }
+    else if (!_item && _button == TQt::LeftButton)
+    {
+        if (m_pActivateDoubleClickTimer->isActive())
+        {
+            m_pActivateDoubleClickTimer->stop();
+            slotDoubleClicked(_item);
+        }
+        else
+        {
+            m_pActivateDoubleClickTimer->start(TQApplication::doubleClickInterval(), true);
+        }
+    }
 }
 
 void KonqKfmIconView::slotDoubleClicked(TQIconViewItem *_item)
 { 
-    if (!_item)
+    if (!_item && KonqFMSettings::settings()->doubleClickMoveToParent())
     {
         KParts::URLArgs args;
         args.trustedSource = true;
-        KURL upURL = m_dirLister->url().upURL();
+        KURL baseURL(m_dirLister->url().internalReferenceURL());
+        if (baseURL.isEmpty())
+        {
+            baseURL = m_dirLister->url();
+        }
+        KURL upURL = baseURL.upURL();
         if (!upURL.isEmpty())
-	{  
-	m_extension->openURLRequest(upURL, args);
-	}
+        {
+            m_extension->openURLRequest(upURL, args);
+        }
     }
 }
   
@@ -1124,8 +1150,8 @@ void KonqKfmIconView::showDirectoryOverlay(KFileIVI* item)
            if (!m_paOutstandingOverlaysTimer)
            {
               m_paOutstandingOverlaysTimer = new TQTimer(this);
-              connect(m_paOutstandingOverlaysTimer, TQT_SIGNAL(timeout()),
-                      TQT_SLOT(slotDirectoryOverlayStart()));
+              connect(m_paOutstandingOverlaysTimer, TQ_SIGNAL(timeout()),
+                      TQ_SLOT(slotDirectoryOverlayStart()));
            }
            m_paOutstandingOverlaysTimer->start(20, true);
         }
@@ -1140,8 +1166,8 @@ void KonqKfmIconView::showFreeSpaceOverlay(KFileIVI* item)
        if (!m_paOutstandingFreeSpaceOverlaysTimer)
        {
           m_paOutstandingFreeSpaceOverlaysTimer = new TQTimer(this);
-          connect(m_paOutstandingFreeSpaceOverlaysTimer, TQT_SIGNAL(timeout()),
-                  TQT_SLOT(slotFreeSpaceOverlayStart()));
+          connect(m_paOutstandingFreeSpaceOverlaysTimer, TQ_SIGNAL(timeout()),
+                  TQ_SLOT(slotFreeSpaceOverlayStart()));
        }
        m_paOutstandingFreeSpaceOverlaysTimer->start(20, true);
     }
@@ -1159,7 +1185,7 @@ void KonqKfmIconView::slotDirectoryOverlayStart()
 
        if (overlay)
        {
-          connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDirectoryOverlayFinished() ) );
+          connect( overlay, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDirectoryOverlayFinished() ) );
           overlay->start(); // Watch out, may emit finished() immediately!!
           return; // Let it run....
        }
@@ -1179,7 +1205,7 @@ void KonqKfmIconView::slotFreeSpaceOverlayStart()
 
        if (overlay)
        {
-          connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFreeSpaceOverlayFinished() ) );
+          connect( overlay, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFreeSpaceOverlayFinished() ) );
           overlay->start(); // Watch out, may emit finished() immediately!!
           return; // Let it run....
        }
@@ -1269,8 +1295,8 @@ void KonqKfmIconView::slotClear()
     if ( !m_pTimeoutRefreshTimer )
     {
         m_pTimeoutRefreshTimer = new TQTimer( this );
-        connect( m_pTimeoutRefreshTimer, TQT_SIGNAL( timeout() ),
-                 this, TQT_SLOT( slotRefreshViewport() ) );
+        connect( m_pTimeoutRefreshTimer, TQ_SIGNAL( timeout() ),
+                 this, TQ_SLOT( slotRefreshViewport() ) );
     }
     m_pTimeoutRefreshTimer->start( 700, true );
 
@@ -1549,8 +1575,8 @@ static KStaticDeleter<SpringLoadingManager> s_springManagerDeleter;
 SpringLoadingManager::SpringLoadingManager()
     : m_startPart(0L)
 {
-    connect( &m_endTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( finished() ) );
+    connect( &m_endTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( finished() ) );
 
 }
 
diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h
index 5c1584efc..f0713fcde 100644
--- a/konqueror/iconview/konq_iconview.h
+++ b/konqueror/iconview/konq_iconview.h
@@ -44,7 +44,7 @@ class IconViewBrowserExtension;
 class KonqKfmIconView : public KonqDirPart
 {
   friend class IconViewBrowserExtension; // to access m_pProps
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( bool supportsUndo READ supportsUndo )
   TQ_PROPERTY( TQString viewMode READ viewMode WRITE setViewMode )
 public:
@@ -224,6 +224,7 @@ protected:
   KonqIconViewWidget *m_pIconView;
 
   TQTimer *m_pTimeoutRefreshTimer;
+  TQTimer *m_pActivateDoubleClickTimer;
 
   TQPtrDict<KFileIVI> m_itemDict; // maps KFileItem * -> KFileIVI *
 
@@ -238,7 +239,7 @@ protected:
 
 class IconViewBrowserExtension : public KonqDirPartBrowserExtension
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class KonqKfmIconView; // so that it can emit our signals
 public:
   IconViewBrowserExtension( KonqKfmIconView *iconView );
@@ -274,9 +275,9 @@ private:
   bool m_bSaveViewPropertiesLocally;
 };
 
-class SpringLoadingManager : public QObject
+class SpringLoadingManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 private:
     SpringLoadingManager();
     static SpringLoadingManager *s_self;
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 246cbb0b8..395da6a5d 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -78,136 +78,136 @@ void KEBApp::createActions() {
 
     // save and quit should probably not be in the toplevel???
     (void) KStdAction::quit(
-        TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection());
-    KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
+        this, TQ_SLOT( close() ), actionCollection());
+    KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection());
     (void) KStdAction::configureToolbars(
-        TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection());
+        this, TQ_SLOT( slotConfigureToolbars() ), actionCollection());
 
     if (m_browser) {
         (void) KStdAction::open(
-            TQT_TQOBJECT(actn), TQT_SLOT( slotLoad() ), actionCollection());
+            actn, TQ_SLOT( slotLoad() ), actionCollection());
         (void) KStdAction::saveAs(
-            TQT_TQOBJECT(actn), TQT_SLOT( slotSaveAs() ), actionCollection());
+            actn, TQ_SLOT( slotSaveAs() ), actionCollection());
     }
 
-    (void) KStdAction::cut(TQT_TQOBJECT(actn), TQT_SLOT( slotCut() ), actionCollection());
-    (void) KStdAction::copy(TQT_TQOBJECT(actn), TQT_SLOT( slotCopy() ), actionCollection());
-    (void) KStdAction::paste(TQT_TQOBJECT(actn), TQT_SLOT( slotPaste() ), actionCollection());
-    (void) KStdAction::print(TQT_TQOBJECT(actn), TQT_SLOT( slotPrint() ), actionCollection());
+    (void) KStdAction::cut(actn, TQ_SLOT( slotCut() ), actionCollection());
+    (void) KStdAction::copy(actn, TQ_SLOT( slotCopy() ), actionCollection());
+    (void) KStdAction::paste(actn, TQ_SLOT( slotPaste() ), actionCollection());
+    (void) KStdAction::print(actn, TQ_SLOT( slotPrint() ), actionCollection());
 
     // settings menu
     (void) new TDEToggleAction(
         i18n("&Show Netscape Bookmarks in Konqueror"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotShowNS() ), actionCollection(),
+        actn, TQ_SLOT( slotShowNS() ), actionCollection(),
         "settings_showNS");
 
     // actions
     (void) new TDEAction(
         i18n("&Delete"), "edit-delete", Key_Delete,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotDelete() ), actionCollection(), "delete");
+        actn, TQ_SLOT( slotDelete() ), actionCollection(), "delete");
     (void) new TDEAction(
         i18n("Rename"), "text", Key_F2,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotRename() ), actionCollection(), "rename");
+        actn, TQ_SLOT( slotRename() ), actionCollection(), "rename");
     (void) new TDEAction(
         i18n("C&hange URL"), "text", Key_F3,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl");
+        actn, TQ_SLOT( slotChangeURL() ), actionCollection(), "changeurl");
     (void) new TDEAction(
         i18n("C&hange Comment"), "text", Key_F4,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment");
+        actn, TQ_SLOT( slotChangeComment() ), actionCollection(), "changecomment");
     (void) new TDEAction(
         i18n("Chan&ge Icon..."), "icons", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
+        actn, TQ_SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
     (void) new TDEAction(
         i18n("Update Favicon"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
+        actn, TQ_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
     (void) new TDEAction(
         i18n("Recursive Sort"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
+        actn, TQ_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
     (void) new TDEAction(
         i18n("&New Folder..."), "folder-new", CTRL+Key_N,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
+        actn, TQ_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
     (void) new TDEAction(
         i18n("&New Bookmark"), "www", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
+        actn, TQ_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
     (void) new TDEAction(
         i18n("&Insert Separator"), CTRL+Key_I,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotInsertSeparator() ), actionCollection(),
+        actn, TQ_SLOT( slotInsertSeparator() ), actionCollection(),
         "insertseparator");
     (void) new TDEAction(
         i18n("&Sort Alphabetically"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotSort() ), actionCollection(), "sort");
+        actn, TQ_SLOT( slotSort() ), actionCollection(), "sort");
     (void) new TDEAction(
         i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
+        actn, TQ_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
     (void) new TDEAction(
         i18n("Show in T&oolbar"), "bookmark_toolbar", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
+        actn, TQ_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
     (void) new TDEAction(
         i18n("Hide in T&oolbar"), "bookmark_toolbar", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
+        actn, TQ_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
     (void) new TDEAction(
         i18n("&Expand All Folders"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall");
+        actn, TQ_SLOT( slotExpandAll() ), actionCollection(), "expandall");
     (void) new TDEAction(
         i18n("Collapse &All Folders"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
+        actn, TQ_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
     (void) new TDEAction(
         i18n("&Open in Konqueror"), "document-open", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
+        actn, TQ_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
     (void) new TDEAction(
         i18n("Check &Status"), "bookmark", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
+        actn, TQ_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
 
     (void) new TDEAction(
         i18n("Check Status: &All"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotTestAll() ), actionCollection(), "testall" );
+        actn, TQ_SLOT( slotTestAll() ), actionCollection(), "testall" );
     (void) new TDEAction(
         i18n("Update All &Favicons"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(),
+        actn, TQ_SLOT( slotUpdateAllFavIcons() ), actionCollection(),
         "updateallfavicons" );
     (void) new TDEAction(
         i18n("Cancel &Checks"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
+        actn, TQ_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
     (void) new TDEAction(
         i18n("Cancel &Favicon Updates"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(),
+        actn, TQ_SLOT( slotCancelFavIconUpdates() ), actionCollection(),
         "cancelfaviconupdates" );
     (void) new TDEAction(
         i18n("Import &Netscape Bookmarks..."), "netscape", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importNS");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importNS");
     (void) new TDEAction(
         i18n("Import &Opera Bookmarks..."), "opera", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importOpera");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importOpera");
     (void) new TDEAction(
         i18n("Import All &Crash Sessions as Bookmarks..."), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importCrashes");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importCrashes");
     (void) new TDEAction(
         i18n("Import &Galeon Bookmarks..."), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importGaleon");
     (void) new TDEAction(
         i18n("Import &KDE2/KDE3/TDE Bookmarks..."), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importKDE2");
     (void) new TDEAction(
         i18n("Import &IE Bookmarks..."), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importIE");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importIE");
     (void) new TDEAction(
         i18n("Import &Mozilla Bookmarks..."), "mozilla", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importMoz");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importMoz");
     (void) new TDEAction(
         i18n("Export to &Netscape Bookmarks"), "netscape", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS");
+        actn, TQ_SLOT( slotExportNS() ), actionCollection(), "exportNS");
     (void) new TDEAction(
         i18n("Export to &Opera Bookmarks..."), "opera", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
+        actn, TQ_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
     (void) new TDEAction(
         i18n("Export to &HTML Bookmarks..."), "text-html", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
+        actn, TQ_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
     (void) new TDEAction(
         i18n("Export to &IE Bookmarks..."), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE");
+        actn, TQ_SLOT( slotExportIE() ), actionCollection(), "exportIE");
     (void) new TDEAction(
         i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
+        actn, TQ_SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
 }
 
 void ActionsImpl::slotLoad() {
@@ -392,7 +392,7 @@ void ActionsImpl::slotImport() {
     // kdDebug() << "ActionsImpl::slotImport() where sender()->name() == "
     //           << sender()->name() << endl;
     ImportCommand* import
-        = ImportCommand::performImport(TQT_TQOBJECT_CONST(sender())->name()+6, KEBApp::self());
+        = ImportCommand::performImport(sender()->name()+6, KEBApp::self());
     if (!import)
         return;
     CmdHistory::self()->addCommand(import);
@@ -444,7 +444,7 @@ void ActionsImpl::slotPrint() {
 
     s_appId = kapp->dcopClient()->appId();
     s_objId = s_part->property("dcopObjectId").toString().latin1();
-    connect(s_part, TQT_SIGNAL(completed()), this, TQT_SLOT(slotDelayedPrint()));
+    connect(s_part, TQ_SIGNAL(completed()), this, TQ_SLOT(slotDelayedPrint()));
 
     s_part->openURL(KURL( tmpf.name() ));
 }
diff --git a/konqueror/keditbookmarks/actionsimpl.h b/konqueror/keditbookmarks/actionsimpl.h
index 4e2ce3d2e..f0137245b 100644
--- a/konqueror/keditbookmarks/actionsimpl.h
+++ b/konqueror/keditbookmarks/actionsimpl.h
@@ -21,9 +21,9 @@
 
 #include <tqobject.h>
 
-class ActionsImpl : public QObject
+class ActionsImpl : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    bool save();
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index 8a7e05c3a..45da6db7a 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -231,7 +231,7 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name)
     : TQWidget(parent, name), m_connected(false) {
 
     timer = new TQTimer(this);
-    connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( commitChanges()));
+    connect(timer, TQ_SIGNAL( timeout() ), TQ_SLOT( commitChanges()));
 
     titlecmd = 0;
     urlcmd = 0;
@@ -246,9 +246,9 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name)
             new TQLabel(m_title_le, i18n("Name:"), this),
             0, 0);
 
-    connect(m_title_le, TQT_SIGNAL( textChanged(const TQString &) ),
-                        TQT_SLOT( slotTextChangedTitle(const TQString &) ));
-    connect(m_title_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitTitle() ));
+    connect(m_title_le, TQ_SIGNAL( textChanged(const TQString &) ),
+                        TQ_SLOT( slotTextChangedTitle(const TQString &) ));
+    connect(m_title_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitTitle() ));
 
     m_url_le = new BookmarkLineEdit(this);
     grid->addWidget(m_url_le, 1, 1);
@@ -256,18 +256,18 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name)
             new TQLabel(m_url_le, i18n("Location:"), this),
             1, 0);
 
-    connect(m_url_le, TQT_SIGNAL( textChanged(const TQString &) ),
-                      TQT_SLOT( slotTextChangedURL(const TQString &) ));
-    connect(m_url_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitURL() ));
+    connect(m_url_le, TQ_SIGNAL( textChanged(const TQString &) ),
+                      TQ_SLOT( slotTextChangedURL(const TQString &) ));
+    connect(m_url_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitURL() ));
 
     m_comment_le = new BookmarkLineEdit(this);
     grid->addWidget(m_comment_le, 2, 1);
     grid->addWidget(
             new TQLabel(m_comment_le, i18n("Comment:"), this),
             2, 0);
-    connect(m_comment_le, TQT_SIGNAL( textChanged(const TQString &) ),
-                          TQT_SLOT( slotTextChangedComment(const TQString &) ));
-    connect(m_comment_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitComment() ));
+    connect(m_comment_le, TQ_SIGNAL( textChanged(const TQString &) ),
+                          TQ_SLOT( slotTextChangedComment(const TQString &) ));
+    connect(m_comment_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitComment() ));
 
     m_credate_le = new KLineEdit(this);
     grid->addWidget(m_credate_le, 0, 3);
diff --git a/konqueror/keditbookmarks/bookmarkinfo.h b/konqueror/keditbookmarks/bookmarkinfo.h
index b1c00dc6b..782a7ece7 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.h
+++ b/konqueror/keditbookmarks/bookmarkinfo.h
@@ -29,7 +29,7 @@
 class TQTimer;
 
 class BookmarkLineEdit : public KLineEdit {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BookmarkLineEdit( TQWidget * );
 public slots:
@@ -38,7 +38,7 @@ public slots:
 
 
 class BookmarkInfoWidget : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BookmarkInfoWidget(TQWidget * = 0, const char * = 0);
     void showBookmark(const KBookmark &bk);
diff --git a/konqueror/keditbookmarks/bookmarkiterator.cpp b/konqueror/keditbookmarks/bookmarkiterator.cpp
index 41aa6299d..35374136f 100644
--- a/konqueror/keditbookmarks/bookmarkiterator.cpp
+++ b/konqueror/keditbookmarks/bookmarkiterator.cpp
@@ -27,8 +27,8 @@
 #include <tqtimer.h>
 
 BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> bks) : m_bklist(bks) {
-    connect(this, TQT_SIGNAL( deleteSelf(BookmarkIterator *) ), 
-            TQT_SLOT( slotCancelTest(BookmarkIterator *) ));
+    connect(this, TQ_SIGNAL( deleteSelf(BookmarkIterator *) ), 
+            TQ_SLOT( slotCancelTest(BookmarkIterator *) ));
     delayedEmitNextOne();
 }
 
@@ -37,7 +37,7 @@ BookmarkIterator::~BookmarkIterator() {
 }
 
 void BookmarkIterator::delayedEmitNextOne() {
-    TQTimer::singleShot(1, this, TQT_SLOT( nextOne() ));
+    TQTimer::singleShot(1, this, TQ_SLOT( nextOne() ));
 }
 
 void BookmarkIterator::slotCancelTest(BookmarkIterator *test) {
diff --git a/konqueror/keditbookmarks/bookmarkiterator.h b/konqueror/keditbookmarks/bookmarkiterator.h
index e0ce24ea0..8f5df481a 100644
--- a/konqueror/keditbookmarks/bookmarkiterator.h
+++ b/konqueror/keditbookmarks/bookmarkiterator.h
@@ -26,9 +26,9 @@
 class KEBListViewItem;
 class BookmarkIteratorHolder;
 
-class BookmarkIterator : public QObject
+class BookmarkIterator : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    BookmarkIterator(TQValueList<KBookmark> bks);
diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp
index 0d262bc7a..b02f0af16 100644
--- a/konqueror/keditbookmarks/dcop.cpp
+++ b/konqueror/keditbookmarks/dcop.cpp
@@ -37,8 +37,8 @@
 
 KBookmarkEditorIface::KBookmarkEditorIface()
     : TQObject(), DCOPObject("KBookmarkEditor") {
-    // connect(KBookmarkNotifier_stub, TQT_SIGNAL( updatedAccessMetadata(TQString,TQString) ), 
-    //         this,                   TQT_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) ));
+    // connect(KBookmarkNotifier_stub, TQ_SIGNAL( updatedAccessMetadata(TQString,TQString) ), 
+    //         this,                   TQ_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) ));
     connectDCOPSignal(0, "KBookmarkNotifier", "updatedAccessMetadata(TQString,TQString)", "slotDcopUpdatedAccessMetadata(TQString,TQString)", false);
 }
 
diff --git a/konqueror/keditbookmarks/dcop.h b/konqueror/keditbookmarks/dcop.h
index 8e9ae1bf9..441ff8c9e 100644
--- a/konqueror/keditbookmarks/dcop.h
+++ b/konqueror/keditbookmarks/dcop.h
@@ -23,7 +23,7 @@
 
 class KBookmarkEditorIface : public TQObject, public DCOPObject
 {
-   Q_OBJECT
+   TQ_OBJECT
    K_DCOP
 public:
    KBookmarkEditorIface();
diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index a1ea018b1..73cbd9ced 100644
--- a/konqueror/keditbookmarks/favicons.cpp
+++ b/konqueror/keditbookmarks/favicons.cpp
@@ -83,9 +83,9 @@ void FavIconsItr::doAction() {
     // kdDebug() << "FavIconsItr::doAction()" << endl;
     curItem()->setTmpStatus(i18n("Updating favicon..."));
     if (!m_updater) {
-        m_updater = new FavIconUpdater(TQT_TQOBJECT(kapp), "FavIconUpdater");
-        connect(m_updater, TQT_SIGNAL( done(bool) ),
-                this,      TQT_SLOT( slotDone(bool) ) );
+        m_updater = new FavIconUpdater(kapp, "FavIconUpdater");
+        connect(m_updater, TQ_SIGNAL( done(bool) ),
+                this,      TQ_SLOT( slotDone(bool) ) );
     }
     if (curBk().url().protocol().startsWith("http")) {
         m_updater->downloadIcon(curBk());
diff --git a/konqueror/keditbookmarks/favicons.h b/konqueror/keditbookmarks/favicons.h
index e857476ef..a2e4036bc 100644
--- a/konqueror/keditbookmarks/favicons.h
+++ b/konqueror/keditbookmarks/favicons.h
@@ -45,7 +45,7 @@ class FavIconUpdater;
 
 class FavIconsItr : public BookmarkIterator
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    FavIconsItr(TQValueList<KBookmark> bks);
diff --git a/konqueror/keditbookmarks/importers.h b/konqueror/keditbookmarks/importers.h
index e831d6f44..fd6aec917 100644
--- a/konqueror/keditbookmarks/importers.h
+++ b/konqueror/keditbookmarks/importers.h
@@ -33,7 +33,7 @@
 // part pure
 class ImportCommand : public TQObject, public KCommand, public IKEBCommand
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    ImportCommand()
       : KCommand(), m_utf8(false), m_folder(false), m_cleanUpCmd(0L)
diff --git a/konqueror/keditbookmarks/kebsearchline.h b/konqueror/keditbookmarks/kebsearchline.h
index c7031a377..36e94f535 100644
--- a/konqueror/keditbookmarks/kebsearchline.h
+++ b/konqueror/keditbookmarks/kebsearchline.h
@@ -24,7 +24,7 @@
 
 class KEBSearchLine : public TDEListViewSearchLine
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KEBSearchLine(TQWidget *parent = 0, TDEListView *listView = 0, const char *name = 0);
 
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index c533fa8c2..f5a8474cc 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -229,8 +229,8 @@ void ListView::selected(KEBListViewItem * item, bool s)
     }
     //FIXME do it once somewhere
     if (!KEBApp::self()->bkInfo()->connected()) {
-        connect(KEBApp::self()->bkInfo(), TQT_SIGNAL( updateListViewItem() ),
-                                          TQT_SLOT( slotBkInfoUpdateListViewItem() ));
+        connect(KEBApp::self()->bkInfo(), TQ_SIGNAL( updateListViewItem() ),
+                                          TQ_SLOT( slotBkInfoUpdateListViewItem() ));
         KEBApp::self()->bkInfo()->setConnected(true);
     }
 
@@ -646,7 +646,7 @@ class KeyPressEater : public TQObject {
 bool KeyPressEater::eventFilter(TQObject *, TQEvent *pe) {
     if (pe->type() == TQEvent::KeyPress) {
         TQKeyEvent *k = (TQKeyEvent *) pe;
-        if ((k->key() == Qt::Key_Backtab || k->key() == Qt::Key_Tab)
+        if ((k->key() == TQt::Key_Backtab || k->key() == TQt::Key_Tab)
                 && !(k->state() & ControlButton || k->state() & AltButton)
            ) {
             if (m_allowedToTab) {
@@ -655,7 +655,7 @@ bool KeyPressEater::eventFilter(TQObject *, TQEvent *pe) {
             }
             return true;
         } else {
-            m_allowedToTab = (k->key() == Qt::Key_Escape || k->key() == Qt::Key_Enter);
+            m_allowedToTab = (k->key() == TQt::Key_Escape || k->key() == TQt::Key_Enter);
         }
     }
     return false;
@@ -716,21 +716,21 @@ void KEBListView::init() {
     setDragEnabled(true);
     setSelectionModeExt((!m_folderList) ? TDEListView::Extended: TDEListView::Single);
     setAllColumnsShowFocus(true);
-    connect(header(), TQT_SIGNAL(sizeChange(int, int, int)),
-            this, TQT_SLOT(slotColumnSizeChanged(int, int, int)));
+    connect(header(), TQ_SIGNAL(sizeChange(int, int, int)),
+            this, TQ_SLOT(slotColumnSizeChanged(int, int, int)));
 }
 
 void KEBListView::makeConnections() {
-    connect(this, TQT_SIGNAL( moved() ),
-            TQT_SLOT( slotMoved() ));
-    connect(this, TQT_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ),
-            TQT_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) ));
-    connect(this, TQT_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ),
-            TQT_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) ));
-    connect(this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ),
-            TQT_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) ));
-    connect(this, TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ),
-            TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ));
+    connect(this, TQ_SIGNAL( moved() ),
+            TQ_SLOT( slotMoved() ));
+    connect(this, TQ_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ),
+            TQ_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) ));
+    connect(this, TQ_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ),
+            TQ_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) ));
+    connect(this, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ),
+            TQ_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) ));
+    connect(this, TQ_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ),
+            TQ_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ));
 }
 
 void KEBListView::readonlyFlagInit(bool readonly) {
@@ -911,7 +911,7 @@ void KEBListViewItem::setOpen(bool open) {
 void KEBListViewItem::greyStyle(TQColorGroup &cg) {
   int h, s, v;
   cg.background().hsv(&h, &s, &v);
-  TQColor color = (v > 180 && v < 220) ? (Qt::darkGray) : (Qt::gray);
+  TQColor color = (v > 180 && v < 220) ? (TQt::darkGray) : (TQt::gray);
   cg.setColor(TQColorGroup::Text, color);
 }
 
diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h
index 0a711e4df..15444c2a5 100644
--- a/konqueror/keditbookmarks/listview.h
+++ b/konqueror/keditbookmarks/listview.h
@@ -81,7 +81,7 @@ private:
 
 class KEBListView : public TDEListView
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    enum { 
       NameColumn = 0,
@@ -128,7 +128,7 @@ private:
 // DESIGN - make some stuff private if possible
 class ListView : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    // init stuff
    void initListViews();
diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp
index 767c15a50..707491741 100644
--- a/konqueror/keditbookmarks/testlink.cpp
+++ b/konqueror/keditbookmarks/testlink.cpp
@@ -88,10 +88,10 @@ void TestLinkItr::doAction() {
     m_job->addMetaData("errorPage", "true");
     m_job->addMetaData( TQString("cookies"), TQString("none") );
 
-    connect(m_job, TQT_SIGNAL( result( TDEIO::Job *)),
-            this, TQT_SLOT( slotJobResult(TDEIO::Job *)));
-    connect(m_job, TQT_SIGNAL( data( TDEIO::Job *,  const TQByteArray &)),
-            this, TQT_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &)));
+    connect(m_job, TQ_SIGNAL( result( TDEIO::Job *)),
+            this, TQ_SLOT( slotJobResult(TDEIO::Job *)));
+    connect(m_job, TQ_SIGNAL( data( TDEIO::Job *,  const TQByteArray &)),
+            this, TQ_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &)));
 
     curItem()->setTmpStatus(i18n("Checking..."));
     TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url());
diff --git a/konqueror/keditbookmarks/testlink.h b/konqueror/keditbookmarks/testlink.h
index a224279df..831029c25 100644
--- a/konqueror/keditbookmarks/testlink.h
+++ b/konqueror/keditbookmarks/testlink.h
@@ -53,7 +53,7 @@ private:
 
 class TestLinkItr : public BookmarkIterator
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    TestLinkItr(TQValueList<KBookmark> bks);
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 0c9e66381..d685e8dee 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -58,8 +58,8 @@ CmdHistory* CmdHistory::s_self = 0;
 
 CmdHistory::CmdHistory(TDEActionCollection *collection)
     : m_commandHistory(collection) {
-    connect(&m_commandHistory, TQT_SIGNAL( commandExecuted(KCommand *) ),
-            TQT_SLOT( slotCommandExecuted(KCommand *) ));
+    connect(&m_commandHistory, TQ_SIGNAL( commandExecuted(KCommand *) ),
+            TQ_SLOT( slotCommandExecuted(KCommand *) ));
     assert(!s_self);
     s_self = this; // this is hacky
 }
@@ -138,8 +138,8 @@ void CurrentMgr::createManager(const TQString &filename) {
 
     m_mgr = KBookmarkManager::managerForFile(filename, false);
 
-    connect(m_mgr, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
-            TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ));
+    connect(m_mgr, TQ_SIGNAL( changed(const TQString &, const TQString &) ),
+            TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ));
 }
 
 void CurrentMgr::slotBookmarksChanged(const TQString &, const TQString &) {
@@ -183,7 +183,7 @@ TQString CurrentMgr::makeTimeStr(int b)
     TQDateTime dt;
     dt.setTime_t(b);
     return (dt.daysTo(TQDateTime::currentDateTime()) > 31)
-        ? TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false)
+        ? TDEGlobal::locale()->formatDate(dt.date(), false)
         : TDEGlobal::locale()->formatDateTime(dt, false);
 }
 
@@ -219,8 +219,8 @@ KEBApp::KEBApp(
     TDEListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, "TDEListViewSearchLine");
     quicksearch->setStretchableWidget(searchLineEdit);
     lbl->setBuddy(searchLineEdit);
-    connect(resetQuickSearch, TQT_SIGNAL(activated()), searchLineEdit, TQT_SLOT(clear()));
-    connect(searchLineEdit, TQT_SIGNAL(searchUpdated()), TQT_SLOT(updateActions()));
+    connect(resetQuickSearch, TQ_SIGNAL(activated()), searchLineEdit, TQ_SLOT(clear()));
+    connect(searchLineEdit, TQ_SIGNAL(searchUpdated()), TQ_SLOT(updateActions()));
 
     ListView::createListViews(vsplitter);
     ListView::self()->initListViews();
@@ -229,7 +229,7 @@ KEBApp::KEBApp(
 
     m_bkinfo = new BookmarkInfoWidget(vsplitter);
 
-    vsplitter->setOrientation(Qt::Vertical);
+    vsplitter->setOrientation(TQt::Vertical);
     vsplitter->setSizes(TQValueList<int>() << h << 380
                                           << m_bkinfo->sizeHint().height() );
 
@@ -245,8 +245,8 @@ KEBApp::KEBApp(
 
     m_dcopIface = new KBookmarkEditorIface();
 
-    connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ),
-                               TQT_SLOT( slotClipboardDataChanged() ));
+    connect(kapp->clipboard(), TQ_SIGNAL( dataChanged() ),
+                               TQ_SLOT( slotClipboardDataChanged() ));
 
     ListView::self()->connectSignals();
 
@@ -337,8 +337,8 @@ void KEBApp::notifyCommandExecuted() {
 void KEBApp::slotConfigureToolbars() {
     saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
     KEditToolbar dlg(actionCollection());
-    connect(&dlg, TQT_SIGNAL( newToolbarConfig() ),
-                  TQT_SLOT( slotNewToolbarConfig() ));
+    connect(&dlg, TQ_SIGNAL( newToolbarConfig() ),
+                  TQ_SLOT( slotNewToolbarConfig() ));
     dlg.exec();
 }
 
diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h
index bd176288c..33a60073e 100644
--- a/konqueror/keditbookmarks/toplevel.h
+++ b/konqueror/keditbookmarks/toplevel.h
@@ -44,7 +44,7 @@ struct SelcAbilities {
 };
 
 class CmdHistory : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CmdHistory(TDEActionCollection *collection);
     virtual ~CmdHistory() { ; }
@@ -72,7 +72,7 @@ class KBookmark;
 class KBookmarkManager;
 
 class CurrentMgr : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     typedef enum {HTMLExport, OperaExport, IEExport, MozillaExport, NetscapeExport} ExportType;
 
@@ -107,7 +107,7 @@ private:
 };
 
 class KEBApp : public TDEMainWindow {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     static KEBApp* self() { return s_topLevel; }
 
diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp
index 9a0280dfa..377026411 100644
--- a/konqueror/keditbookmarks/updater.cpp
+++ b/konqueror/keditbookmarks/updater.cpp
@@ -95,10 +95,10 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
         part->setProperty("javaEnabled", TQVariant(false));
         part->setProperty("autoloadImages", TQVariant(false));
 
-        connect(part, TQT_SIGNAL( canceled(const TQString &) ),
-                this, TQT_SLOT( slotCompleted() ));
-        connect(part, TQT_SIGNAL( completed() ),
-                this, TQT_SLOT( slotCompleted() ));
+        connect(part, TQ_SIGNAL( canceled(const TQString &) ),
+                this, TQ_SLOT( slotCompleted() ));
+        connect(part, TQ_SIGNAL( completed() ),
+                this, TQ_SLOT( slotCompleted() ));
 
         KParts::BrowserExtension *ext = KParts::BrowserExtension::childObject(part);
         assert(ext);
@@ -106,8 +106,8 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
         m_browserIface = new FavIconBrowserInterface(this, "browseriface");
         ext->setBrowserInterface(m_browserIface);
 
-        connect(ext, TQT_SIGNAL( setIconURL(const KURL &) ),
-                this, TQT_SLOT( setIconURL(const KURL &) ));
+        connect(ext, TQ_SIGNAL( setIconURL(const KURL &) ),
+                this, TQ_SLOT( setIconURL(const KURL &) ));
 
         m_part = part;
     }
@@ -115,7 +115,7 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
     if (!m_timer) {
         // Timeout to stop the updating hanging
       m_timer = new TQTimer(this);
-      connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) );
+      connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) );
     }
     m_timer->start(15000,false);
     m_webGrabber = new FavIconWebGrabber(m_part, bk.url());
@@ -149,10 +149,10 @@ FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url
 
     TDEIO::Job *job = TDEIO::get(m_url, false, false);
     job->addMetaData( TQString("cookies"), TQString("none") );
-    connect(job, TQT_SIGNAL( result( TDEIO::Job *)),
-            this, TQT_SLOT( slotFinished(TDEIO::Job *) ));
-    connect(job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ),
-            this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ));
+    connect(job, TQ_SIGNAL( result( TDEIO::Job *)),
+            this, TQ_SLOT( slotFinished(TDEIO::Job *) ));
+    connect(job, TQ_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ),
+            this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ));
 }
 
 void FavIconWebGrabber::slotMimetype(TDEIO::Job *job, const TQString & /*type*/) {
diff --git a/konqueror/keditbookmarks/updater.h b/konqueror/keditbookmarks/updater.h
index af7031bbd..0e0e8b336 100644
--- a/konqueror/keditbookmarks/updater.h
+++ b/konqueror/keditbookmarks/updater.h
@@ -25,9 +25,9 @@
 #include <tdeparts/part.h>
 #include <tdeparts/browserinterface.h>
 
-class FavIconWebGrabber : public QObject
+class FavIconWebGrabber : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url);
     ~FavIconWebGrabber() {}
@@ -45,7 +45,7 @@ class FavIconBrowserInterface;
 
 class FavIconUpdater : public KonqFavIconMgr 
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     FavIconUpdater(TQObject *parent, const char *name);
@@ -75,7 +75,7 @@ private:
 
 class FavIconBrowserInterface : public KParts::BrowserInterface
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     FavIconBrowserInterface(FavIconUpdater *view, const char *name)
         : KParts::BrowserInterface(view, name), m_view(view) {
diff --git a/konqueror/konq_actions.cpp b/konqueror/konq_actions.cpp
index 934c326f7..fa93bca57 100644
--- a/konqueror/konq_actions.cpp
+++ b/konqueror/konq_actions.cpp
@@ -94,14 +94,14 @@ int KonqBidiHistoryAction::plug( TQWidget *widget, int index )
     return -1;
 
   // Go menu
-  if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+  if ( widget->inherits("TQPopupMenu") )
   {
     m_goMenu = (TQPopupMenu*)widget;
     // Forward signal (to main view)
-    connect( m_goMenu, TQT_SIGNAL( aboutToShow() ),
-             this, TQT_SIGNAL( menuAboutToShow() ) );
-    connect( m_goMenu, TQT_SIGNAL( activated( int ) ),
-             this, TQT_SLOT( slotActivated( int ) ) );
+    connect( m_goMenu, TQ_SIGNAL( aboutToShow() ),
+             this, TQ_SIGNAL( menuAboutToShow() ) );
+    connect( m_goMenu, TQ_SIGNAL( activated( int ) ),
+             this, TQ_SLOT( slotActivated( int ) ) );
     //kdDebug(1202) << "m_goMenu->count()=" << m_goMenu->count() << endl;
     // Store how many items the menu already contains.
     // This means, the KonqBidiHistoryAction has to be plugged LAST in a menu !
@@ -261,12 +261,12 @@ int KonqLogoAction::plug( TQWidget *widget, int index )
 
     int id_ = getToolButtonID();
 
-    bar->insertAnimatedWidget( id_, this, TQT_SIGNAL(activated()), TQString("trinity"), index );
+    bar->insertAnimatedWidget( id_, this, TQ_SIGNAL(activated()), TQString("trinity"), index );
     bar->alignItemRight( id_ );
 
     addContainer( bar, id_ );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -284,12 +284,12 @@ KonqViewModeAction::KonqViewModeAction( const TQString &text, const TQString &ic
 {
     m_menu = new TQPopupMenu;
 
-    connect( m_menu, TQT_SIGNAL( aboutToShow() ),
-             this, TQT_SLOT( slotPopupAboutToShow() ) );
-    connect( m_menu, TQT_SIGNAL( activated( int ) ),
-             this, TQT_SLOT( slotPopupActivated() ) );
-    connect( m_menu, TQT_SIGNAL( aboutToHide() ),
-             this, TQT_SLOT( slotPopupAboutToHide() ) );
+    connect( m_menu, TQ_SIGNAL( aboutToShow() ),
+             this, TQ_SLOT( slotPopupAboutToShow() ) );
+    connect( m_menu, TQ_SIGNAL( activated( int ) ),
+             this, TQ_SLOT( slotPopupActivated() ) );
+    connect( m_menu, TQ_SIGNAL( aboutToHide() ),
+             this, TQ_SLOT( slotPopupAboutToHide() ) );
 }
 
 KonqViewModeAction::~KonqViewModeAction()
@@ -355,10 +355,10 @@ KonqMostOftenURLSAction::KonqMostOftenURLSAction( const TQString& text,
 {
     setDelayed( false );
 
-    connect( popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotFillMenu() ));
-    //connect( popupMenu(), TQT_SIGNAL( aboutToHide() ), TQT_SLOT( slotClearMenu() ));
-    connect( popupMenu(), TQT_SIGNAL( activated( int ) ),
-	     TQT_SLOT( slotActivated(int) ));
+    connect( popupMenu(), TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotFillMenu() ));
+    //connect( popupMenu(), TQ_SIGNAL( aboutToHide() ), TQ_SLOT( slotClearMenu() ));
+    connect( popupMenu(), TQ_SIGNAL( activated( int ) ),
+	     TQ_SLOT( slotActivated(int) ));
     // Need to do all this upfront for a correct initial state
     init();
 }
@@ -380,11 +380,11 @@ void KonqMostOftenURLSAction::parseHistory() // only ever called once
     KonqHistoryManager *mgr = KonqHistoryManager::kself();
     KonqHistoryIterator it( mgr->entries() );
 
-    connect( mgr, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * )),
-             TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * )));
-    connect( mgr, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry * )),
-             TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry * )));
-    connect( mgr, TQT_SIGNAL( cleared() ), TQT_SLOT( slotHistoryCleared() ));
+    connect( mgr, TQ_SIGNAL( entryAdded( const KonqHistoryEntry * )),
+             TQ_SLOT( slotEntryAdded( const KonqHistoryEntry * )));
+    connect( mgr, TQ_SIGNAL( entryRemoved( const KonqHistoryEntry * )),
+             TQ_SLOT( slotEntryRemoved( const KonqHistoryEntry * )));
+    connect( mgr, TQ_SIGNAL( cleared() ), TQ_SLOT( slotHistoryCleared() ));
 
     s_mostEntries = new MostOftenList; // exit() will clean this up for now
     for ( uint i = 0; it.current() && i < s_maxEntries; i++ ) {
diff --git a/konqueror/konq_actions.h b/konqueror/konq_actions.h
index 134c8996f..cf399e986 100644
--- a/konqueror/konq_actions.h
+++ b/konqueror/konq_actions.h
@@ -33,7 +33,7 @@ class TQPopupMenu;
  */
 class KonqBidiHistoryAction : public TDEAction
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
     KonqBidiHistoryAction( const TQString & text, TQObject* parent = 0, const char* name = 0 );
 
@@ -70,7 +70,7 @@ private:
 
 class KonqLogoAction : public TDEAction
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
     KonqLogoAction( const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 );
     KonqLogoAction( const TQString& text, int accel,
@@ -95,7 +95,7 @@ private:
 
 class KonqViewModeAction : public TDERadioAction
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KonqViewModeAction( const TQString &text, const TQString &icon,
                         TQObject *parent, const char *name );
@@ -126,7 +126,7 @@ protected:
 
 class KonqMostOftenURLSAction : public TDEActionMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonqMostOftenURLSAction( const TQString& text, TQObject *parent,
diff --git a/konqueror/konq_browseriface.h b/konqueror/konq_browseriface.h
index 1564a73e2..49f8414d3 100644
--- a/konqueror/konq_browseriface.h
+++ b/konqueror/konq_browseriface.h
@@ -7,7 +7,7 @@ class KonqView;
 
 class KonqBrowserInterface : public KParts::BrowserInterface
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( uint historyLength READ historyLength )
 public:
     KonqBrowserInterface( KonqView *view, const char *name );
diff --git a/konqueror/konq_combo.cpp b/konqueror/konq_combo.cpp
index 850859b58..ef65a5412 100644
--- a/konqueror/konq_combo.cpp
+++ b/konqueror/konq_combo.cpp
@@ -95,7 +95,7 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name )
           : KHistoryCombo( parent, name ),
             m_returnPressed( false ), 
             m_permanent( false ),
-            m_modifier( Qt::NoButton ),
+            m_modifier( TQt::NoButton ),
 	    m_pageSecurity( KonqMainWindow::NotCrypted )
 {
     setInsertionPolicy( NoInsertion );
@@ -122,14 +122,14 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name )
     // Make the lineedit consume the Key_Enter event...
     setTrapReturnKey( true );
 
-    connect( KonqHistoryManager::kself(), TQT_SIGNAL(cleared()), TQT_SLOT(slotCleared()) );
-    connect( this, TQT_SIGNAL(cleared() ), TQT_SLOT(slotCleared()) );
-    connect( this, TQT_SIGNAL(highlighted( int )), TQT_SLOT(slotSetIcon( int )) );
-    connect( this, TQT_SIGNAL(activated( const TQString& )),
-             TQT_SLOT(slotActivated( const TQString& )) );
+    connect( KonqHistoryManager::kself(), TQ_SIGNAL(cleared()), TQ_SLOT(slotCleared()) );
+    connect( this, TQ_SIGNAL(cleared() ), TQ_SLOT(slotCleared()) );
+    connect( this, TQ_SIGNAL(highlighted( int )), TQ_SLOT(slotSetIcon( int )) );
+    connect( this, TQ_SIGNAL(activated( const TQString& )),
+             TQ_SLOT(slotActivated( const TQString& )) );
 
     setHistoryEditorEnabled( true ); 
-    connect( this, TQT_SIGNAL(removed( const TQString&) ), TQT_SLOT(slotRemoved( const TQString& )) );
+    connect( this, TQ_SIGNAL(removed( const TQString&) ), TQ_SLOT(slotRemoved( const TQString& )) );
 
     if ( !kapp->dcopClient()->isAttached() )
         kapp->dcopClient()->attach();
@@ -396,10 +396,10 @@ bool KonqCombo::eventFilter( TQObject *o, TQEvent *ev )
     // Handle Ctrl+Del/Backspace etc better than the Qt widget, which always
     // jumps to the next whitespace.
     TQLineEdit *edit = lineEdit();
-    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(edit) ) {
+    if ( o == edit ) {
         int type = ev->type();
         if ( type == TQEvent::KeyPress ) {
-            TQKeyEvent *e = TQT_TQKEYEVENT( ev );
+            TQKeyEvent *e = static_cast<TQKeyEvent*>( ev );
 
             if ( e->key() == Key_Return || e->key() == Key_Enter ) {
                 m_modifier = e->state();
@@ -537,7 +537,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
 {
     m_dragStart = TQPoint(); // null QPoint
 
-    if ( e->button() == Qt::LeftButton && pixmap( currentItem()) ) {
+    if ( e->button() == TQt::LeftButton && pixmap( currentItem()) ) {
         // check if the pixmap was clicked
         int x = e->pos().x();
         int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
@@ -548,7 +548,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
         }
     }
 
-    if ( e->button() == Qt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) {
+    if ( e->button() == TQt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) {
         // check if the lock icon was clicked
         int x = e->pos().x();
         int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x();
@@ -566,7 +566,7 @@ void KonqCombo::mouseMoveEvent( TQMouseEvent *e )
     if ( m_dragStart.isNull() || currentText().isEmpty() )
         return;
 
-    if ( e->state() & Qt::LeftButton &&
+    if ( e->state() & TQt::LeftButton &&
          (e->pos() - m_dragStart).manhattanLength() >
          TDEGlobalSettings::dndEventDelay() )
     {
@@ -591,7 +591,7 @@ void KonqCombo::slotActivated( const TQString& text )
     applyPermanent();
     m_returnPressed = true;
     emit activated( text, m_modifier );
-    m_modifier = Qt::NoButton;
+    m_modifier = TQt::NoButton;
 }
 
 void KonqCombo::setConfig( TDEConfig *kc )
@@ -731,7 +731,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter )
     if ( !text().isEmpty() ) {
         TQString squeezedText = KStringHandler::rPixelSqueeze( text(), listBox()->fontMetrics(), urlWidth );
         painter->drawText( pmWidth, 0, urlWidth + pmWidth, itemHeight, 
-                           Qt::AlignLeft | Qt::AlignTop, squeezedText );
+                           TQt::AlignLeft | TQt::AlignTop, squeezedText );
 
         //painter->setPen( TDEGlobalSettings::inactiveTextColor() );
         squeezedText = KStringHandler::rPixelSqueeze( title, listBox()->fontMetrics(), titleWidth );
@@ -739,7 +739,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter )
         font.setItalic( true );
         painter->setFont( font );
         painter->drawText( entryWidth - titleWidth, 0, titleWidth,
-                           itemHeight, Qt::AlignLeft | Qt::AlignTop, squeezedText );
+                           itemHeight, TQt::AlignLeft | TQt::AlignTop, squeezedText );
     }
 }
 
diff --git a/konqueror/konq_combo.h b/konqueror/konq_combo.h
index 0bfe76a87..9a46d763f 100644
--- a/konqueror/konq_combo.h
+++ b/konqueror/konq_combo.h
@@ -32,7 +32,7 @@ class TDEConfig;
 // KComboBox would do fine.
 class KonqCombo : public KHistoryCombo
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonqCombo( TQWidget *parent, const char *name );
diff --git a/konqueror/konq_extensionmanager.cpp b/konqueror/konq_extensionmanager.cpp
index b00522252..861fe0fff 100644
--- a/konqueror/konq_extensionmanager.cpp
+++ b/konqueror/konq_extensionmanager.cpp
@@ -52,9 +52,9 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai
 	(new TQVBoxLayout(plainPage(), 0, 0))->setAutoAdd(true);
 	d->pluginSelector = new KPluginSelector(plainPage());
 	setMainWidget(d->pluginSelector);
-	connect(d->pluginSelector, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(setChanged(bool)));
-	connect(d->pluginSelector, TQT_SIGNAL(configCommitted(const TQCString &)),
-	        KSettings::Dispatcher::self(), TQT_SLOT(reparseConfiguration(const TQCString &)));
+	connect(d->pluginSelector, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(setChanged(bool)));
+	connect(d->pluginSelector, TQ_SIGNAL(configCommitted(const TQCString &)),
+	        KSettings::Dispatcher::self(), TQ_SLOT(reparseConfiguration(const TQCString &)));
 
 	d->mainWindow = mainWindow;
 	d->activePart = activePart;
@@ -100,8 +100,8 @@ void KonqExtensionManager::apply()
 		setChanged(false);
 		if( d->mainWindow )
 		{
-			KParts::Plugin::loadPlugins(TQT_TQOBJECT(d->mainWindow), d->mainWindow, TDEGlobal::instance());
-			TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(TQT_TQOBJECT(d->mainWindow));
+			KParts::Plugin::loadPlugins(d->mainWindow, d->mainWindow, TDEGlobal::instance());
+			TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(d->mainWindow);
 			TQPtrListIterator<KParts::Plugin> it(plugins);
 			KParts::Plugin *plugin;
 			while((plugin = it.current()) != 0)
diff --git a/konqueror/konq_extensionmanager.h b/konqueror/konq_extensionmanager.h
index a986b6ab2..b70a2d5db 100644
--- a/konqueror/konq_extensionmanager.h
+++ b/konqueror/konq_extensionmanager.h
@@ -33,7 +33,7 @@ namespace KParts { class ReadOnlyPart; }
  */
 class KonqExtensionManager : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		KonqExtensionManager(TQWidget *parent, KonqMainWindow *mainWindow, KParts::ReadOnlyPart* activePart);
diff --git a/konqueror/konq_factory.cpp b/konqueror/konq_factory.cpp
index d89cbf9a6..0a69c1c8c 100644
--- a/konqueror/konq_factory.cpp
+++ b/konqueror/konq_factory.cpp
@@ -64,17 +64,17 @@ KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const cha
   else
   {
     if ( m_createBrowser )
-      obj = m_factory->create( TQT_TQOBJECT(parentWidget), name, "Browser/View", m_args );
+      obj = m_factory->create( parentWidget, name, "Browser/View", m_args );
 
     if ( !obj )
-      obj = m_factory->create( TQT_TQOBJECT(parentWidget), name, "KParts::ReadOnlyPart", m_args );
+      obj = m_factory->create( parentWidget, name, "KParts::ReadOnlyPart", m_args );
   }
 
   if ( !obj->inherits( "KParts::ReadOnlyPart" ) )
       kdError(1202) << "Part " << obj << " (" << obj->className() << ") doesn't inherit KParts::ReadOnlyPart !" << endl;
 
   KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>( obj );
-  TQFrame* frame = ::tqqt_cast<TQFrame*>( part->widget() );
+  TQFrame* frame = ::tqt_cast<TQFrame*>( part->widget() );
   if (frame)
   {
       frame->setFrameStyle( TQFrame::NoFrame );
diff --git a/konqueror/konq_frame.cpp b/konqueror/konq_frame.cpp
index 0acf39b49..32ca35650 100644
--- a/konqueror/konq_frame.cpp
+++ b/konqueror/konq_frame.cpp
@@ -68,7 +68,7 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name )
     setSizeGripEnabled( false );
 
     m_led = new TQLabel( this );
-    m_led->setAlignment( Qt::AlignCenter );
+    m_led->setAlignment( TQt::AlignCenter );
     m_led->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
     addWidget( m_led, 0, false ); // led (active view indicator)
     m_led->hide();
@@ -80,7 +80,7 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name )
     addWidget( m_pStatusLabel, 1 /*stretch*/, false ); // status label
 
     m_pLinkedViewCheckBox = new KonqCheckBox( this, "m_pLinkedViewCheckBox" );
-    m_pLinkedViewCheckBox->setFocusPolicy(TQ_NoFocus);
+    m_pLinkedViewCheckBox->setFocusPolicy(TQWidget::NoFocus);
     m_pLinkedViewCheckBox->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
     TQWhatsThis::add( m_pLinkedViewCheckBox,
                      i18n("Checking this box on at least two views sets those views as 'linked'. "
@@ -90,8 +90,8 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name )
                           "directory tree with an icon view or detailed view, and possibly a "
                           "terminal emulator window." ) );
     addWidget( m_pLinkedViewCheckBox, 0, true /*permanent->right align*/ );
-    connect( m_pLinkedViewCheckBox, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SIGNAL(linkedViewClicked(bool)) );
+    connect( m_pLinkedViewCheckBox, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SIGNAL(linkedViewClicked(bool)) );
 
     m_progressBar = new KProgress( this );
     m_progressBar->setMaximumHeight(fontMetrics().height());
@@ -151,7 +151,7 @@ void KonqFrameStatusBar::splitFrameMenu()
 
    // We have to ship the remove view action ourselves,
    // since this may not be the active view (passive view)
-   TDEAction actRemoveView(i18n("Close View"), "view_remove", 0, TQT_TQOBJECT(m_pParentKonqFrame), TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview");
+   TDEAction actRemoveView(i18n("Close View"), "view_remove", 0, m_pParentKonqFrame, TQ_SLOT(slotRemoveView()), (TQObject*)0, "removethisview");
    //KonqView * nextView = mw->viewManager()->chooseNextView( m_pParentKonqFrame->childView() );
    actRemoveView.setEnabled( mw->mainViewsCount() > 1 || m_pParentKonqFrame->childView()->isToggleView() || m_pParentKonqFrame->childView()->isPassiveMode() );
 
@@ -173,15 +173,15 @@ void KonqFrameStatusBar::splitFrameMenu()
 
 bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e)
 {
-   if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pStatusLabel) && e->type()==TQEvent::MouseButtonPress)
+   if (o == m_pStatusLabel && e->type()==TQEvent::MouseButtonPress)
    {
       emit clicked();
       update();
-      if ( TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton)
+      if ( static_cast<TQMouseEvent*>(e)->button() == TQt::RightButton)
          splitFrameMenu();
       return true;
    }
-   else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::ApplicationPaletteChange )
+   else if ( o == this && e->type() == TQEvent::ApplicationPaletteChange )
    {
       unsetPalette();
       updateActiveStatus();
@@ -242,7 +242,7 @@ void KonqFrameStatusBar::slotSpeedProgress( int bytesPerSecond )
 void KonqFrameStatusBar::slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *newOne)
 {
    if (newOne!=0)
-      connect(newOne,TQT_SIGNAL(setStatusBarText(const TQString &)),this,TQT_SLOT(slotDisplayStatusText(const TQString&)));
+      connect(newOne,TQ_SIGNAL(setStatusBarText(const TQString &)),this,TQ_SLOT(slotDisplayStatusText(const TQString&)));
    slotDisplayStatusText( TQString::null );
 }
 
@@ -302,8 +302,8 @@ KonqFrame::KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer,
    // the frame statusbar
    m_pStatusBar = new KonqFrameStatusBar( this, "KonquerorFrameStatusBar");
    m_pStatusBar->setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
-   connect(m_pStatusBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStatusBarClicked()));
-   connect( m_pStatusBar, TQT_SIGNAL( linkedViewClicked( bool ) ), this, TQT_SLOT( slotLinkedViewClicked( bool ) ) );
+   connect(m_pStatusBar, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStatusBarClicked()));
+   connect( m_pStatusBar, TQ_SIGNAL( linkedViewClicked( bool ) ), this, TQ_SLOT( slotLinkedViewClicked( bool ) ) );
    m_separator = 0;
    m_pParentContainer = parentContainer;
 }
@@ -397,7 +397,7 @@ bool KonqFrame::eventFilter(TQObject* /*obj*/, TQEvent *ev)
 {
    if (ev->type()==TQEvent::KeyPress)
    {
-      TQKeyEvent * keyEv = TQT_TQKEYEVENT(ev);
+      TQKeyEvent * keyEv = static_cast<TQKeyEvent*>(ev);
       if ((keyEv->key()==Key_Tab) && (keyEv->state()==ControlButton))
       {
          emit ((KonqFrameContainer*)parent())->ctrlTabPressed();
@@ -420,8 +420,8 @@ void KonqFrame::setView( KonqView* child )
    m_pView = child;
    if (m_pView)
    {
-     connect(m_pView,TQT_SIGNAL(sigPartChanged(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)),
-             m_pStatusBar,TQT_SLOT(slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)));
+     connect(m_pView,TQ_SIGNAL(sigPartChanged(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)),
+             m_pStatusBar,TQ_SLOT(slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)));
    }
 }
 
@@ -460,11 +460,7 @@ void KonqFrame::slotLinkedViewClicked( bool mode )
 void
 KonqFrame::paintEvent( TQPaintEvent* )
 {
-#ifdef USE_QT4
-   #warning [INFO] Repaint call disabled in Qt4 to prevent recursive repaint (which otherwise occurs for unknown reasons)
-#else // USE_QT4
    m_pStatusBar->repaint();
-#endif // USE_QT4
 }
 
 void KonqFrame::slotRemoveView()
@@ -534,9 +530,9 @@ void KonqFrameContainer::saveConfig( TDEConfig* config, const TQString &prefix,
 
   //write orientation
   TQString o;
-  if( orientation() == Qt::Horizontal )
+  if( orientation() == TQt::Horizontal )
     o = TQString::fromLatin1("Horizontal");
-  else if( orientation() == Qt::Vertical )
+  else if( orientation() == TQt::Vertical )
     o = TQString::fromLatin1("Vertical");
   config->writeEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ), o );
 
diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h
index e3ae0ba2a..77dd99689 100644
--- a/konqueror/konq_frame.h
+++ b/konqueror/konq_frame.h
@@ -64,7 +64,7 @@ namespace KParts
  */
 class KonqCheckBox : public TQCheckBox
 {
-    Q_OBJECT // for classname
+    TQ_OBJECT // for classname
 public:
     KonqCheckBox(TQWidget *parent=0, const char *name=0)
       :TQCheckBox( parent, name ) {}
@@ -80,7 +80,7 @@ protected:
  */
 class KonqFrameStatusBar : public KStatusBar
 {
-  Q_OBJECT
+  TQ_OBJECT
 
    public:
       KonqFrameStatusBar( KonqFrame *_parent = 0L, const char *_name = 0L );
@@ -198,7 +198,7 @@ protected:
 
 class KonqFrame : public TQWidget, public KonqFrameBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer = 0L,
@@ -346,7 +346,7 @@ protected:
 
 class KonqFrameContainer : public TQSplitter, public KonqFrameContainerBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class KonqFrame; //for emitting ctrlTabPressed() only, aleXXX
 public:
   KonqFrameContainer( Orientation o,
diff --git a/konqueror/konq_guiclients.cpp b/konqueror/konq_guiclients.cpp
index 31647b0c3..2e3703151 100644
--- a/konqueror/konq_guiclients.cpp
+++ b/konqueror/konq_guiclients.cpp
@@ -157,7 +157,7 @@ void PopupMenuGUIClient::addEmbeddingService( TQDomElement &menu, int idx, const
   action.setAttribute( "group", "preview" );
 
   (void)new TDEAction( name, service->pixmap( TDEIcon::Small ), 0,
-                     TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName );
+                     m_mainWindow, TQ_SLOT( slotOpenEmbedded() ), actionCollection(), actName );
 }
 
 ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
@@ -202,8 +202,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
     if ( (*cIt)->icon() != "unknown" )
       action->setIcon( (*cIt)->icon() );
 
-    connect( action, TQT_SIGNAL( toggled( bool ) ),
-             this, TQT_SLOT( slotToggleView( bool ) ) );
+    connect( action, TQ_SIGNAL( toggled( bool ) ),
+             this, TQ_SLOT( slotToggleView( bool ) ) );
 
     m_actions.insert( name, action );
 
@@ -212,10 +212,10 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
     m_mapOrientation.insert( name, horizontal );
   }
 
-  connect( m_mainWindow, TQT_SIGNAL( viewAdded( KonqView * ) ),
-           this, TQT_SLOT( slotViewAdded( KonqView * ) ) );
-  connect( m_mainWindow, TQT_SIGNAL( viewRemoved( KonqView * ) ),
-           this, TQT_SLOT( slotViewRemoved( KonqView * ) ) );
+  connect( m_mainWindow, TQ_SIGNAL( viewAdded( KonqView * ) ),
+           this, TQ_SLOT( slotViewAdded( KonqView * ) ) );
+  connect( m_mainWindow, TQ_SIGNAL( viewRemoved( KonqView * ) ),
+           this, TQ_SLOT( slotViewRemoved( KonqView * ) ) );
 }
 
 ToggleViewGUIClient::~ToggleViewGUIClient()
@@ -235,7 +235,7 @@ TQPtrList<TDEAction> ToggleViewGUIClient::actions() const
 
 void ToggleViewGUIClient::slotToggleView( bool toggle )
 {
-  TQString serviceName = TQString::fromLatin1( TQT_TQOBJECT_CONST(sender())->name() );
+  TQString serviceName = TQString::fromLatin1( sender()->name() );
 
   bool horizontal = m_mapOrientation[ serviceName ];
 
@@ -244,7 +244,7 @@ void ToggleViewGUIClient::slotToggleView( bool toggle )
   if ( toggle )
   {
 
-    KonqView *childView = viewManager->splitWindow( horizontal ? Qt::Vertical : Qt::Horizontal,
+    KonqView *childView = viewManager->splitWindow( horizontal ? TQt::Vertical : TQt::Horizontal,
                                                     TQString::fromLatin1( "Browser/View" ),
                                                     serviceName,
                                                     !horizontal /* vertical = make it first */);
diff --git a/konqueror/konq_guiclients.h b/konqueror/konq_guiclients.h
index 73d9b9a60..3fbaf9388 100644
--- a/konqueror/konq_guiclients.h
+++ b/konqueror/konq_guiclients.h
@@ -71,7 +71,7 @@ private:
 
 class ToggleViewGUIClient : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ToggleViewGUIClient( KonqMainWindow *mainWindow );
   virtual ~ToggleViewGUIClient();
diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp
index 85dd0cf41..01cbf5a52 100644
--- a/konqueror/konq_mainwindow.cpp
+++ b/konqueror/konq_mainwindow.cpp
@@ -186,13 +186,13 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
   KonqExtendedBookmarkOwner *extOwner = new KonqExtendedBookmarkOwner( this );
   m_pBookmarksOwner = extOwner;
   connect( extOwner,
-           TQT_SIGNAL( signalFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ),
+           TQ_SIGNAL( signalFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ),
            extOwner,
-           TQT_SLOT( slotFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ) );
+           TQ_SLOT( slotFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ) );
 
   // init history-manager, load history, get completion object
   if ( !s_pCompletion ) {
-    KonqHistoryManager *mgr = new KonqHistoryManager( TQT_TQOBJECT(kapp), "history mgr" );
+    KonqHistoryManager *mgr = new KonqHistoryManager( kapp, "history mgr" );
     s_pCompletion = mgr->completionObject();
 
 
@@ -201,7 +201,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
     int mode = KonqSettings::settingsCompletionMode();
     s_pCompletion->setCompletionMode( (TDEGlobalSettings::Completion) mode );
   }
-  connect(KParts::HistoryProvider::self(), TQT_SIGNAL(cleared()), TQT_SLOT(slotClearComboHistory()));
+  connect(KParts::HistoryProvider::self(), TQ_SIGNAL(cleared()), TQ_SLOT(slotClearComboHistory()));
 
   KonqPixmapProvider *prov = KonqPixmapProvider::self();
   if ( !s_comboConfig ) {
@@ -210,17 +210,17 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
       s_comboConfig->setGroup( "Location Bar" );
       prov->load( s_comboConfig, "ComboIconCache" );
   }
-  connect( prov, TQT_SIGNAL( changed() ), TQT_SLOT( slotIconsChanged() ) );
+  connect( prov, TQ_SIGNAL( changed() ), TQ_SLOT( slotIconsChanged() ) );
 
   initCombo();
   initActions();
 
   setInstance( TDEGlobal::instance() );
 
-  connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ),
-           this, TQT_SLOT( slotDatabaseChanged() ) );
+  connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ),
+           this, TQ_SLOT( slotDatabaseChanged() ) );
 
-  connect( kapp, TQT_SIGNAL( tdedisplayFontChanged()), TQT_SLOT(slotReconfigure()));
+  connect( kapp, TQ_SIGNAL( tdedisplayFontChanged()), TQ_SLOT(slotReconfigure()));
 
   //load the xmlui file specified in the profile or the default konqueror.rc
   setXMLFile( xmluiFile );
@@ -229,7 +229,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
 
   createGUI( 0L );
 
-  connect(toolBarMenuAction(),TQT_SIGNAL(activated()),this,TQT_SLOT(slotForceSaveMainWindowSettings()) );
+  connect(toolBarMenuAction(),TQ_SIGNAL(activated()),this,TQ_SLOT(slotForceSaveMainWindowSettings()) );
 
   if ( !m_toggleViewGUIClient->empty() )
     plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() );
@@ -255,8 +255,8 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
 
   KonqUndoManager::incRef();
 
-  connect( KonqUndoManager::self(), TQT_SIGNAL( undoAvailable( bool ) ),
-           this, TQT_SLOT( slotUndoAvailable( bool ) ) );
+  connect( KonqUndoManager::self(), TQ_SIGNAL( undoAvailable( bool ) ),
+           this, TQ_SLOT( slotUndoAvailable( bool ) ) );
   m_bNeedApplyKonqMainWindowSettings = true;
 
   if ( !initialURL.isEmpty() )
@@ -360,8 +360,8 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T
         m_bookmarkBarActionCollection = new TDEActionCollection( this );
         m_bookmarkBarActionCollection->setHighlightingEnabled( true );
         connectActionCollection( m_bookmarkBarActionCollection );
-        DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, TQT_TQOBJECT(res) );
-        connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT(initBookmarkBar()) );
+        DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, res );
+        connect( initializer, TQ_SIGNAL( initialize() ), this, TQ_SLOT(initBookmarkBar()) );
     }
   }
 
@@ -370,18 +370,18 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T
 
 void KonqMainWindow::initBookmarkBar()
 {
-  TDEToolBar * bar = static_cast<TDEToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "TDEToolBar" )) );
+  TDEToolBar * bar = static_cast<TDEToolBar *>( child( "bookmarkToolBar", "TDEToolBar" ) );
 
   if (!bar) return;
 
   delete m_paBookmarkBar;
-  m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, TQT_TQOBJECT(this) );
+  m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, this );
   connect( m_paBookmarkBar,
-           TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ),
-           this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) ));
+           TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ),
+           this, TQ_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) ));
   connect( m_paBookmarkBar,
-	   TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ),
-	   this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) ));
+	   TQ_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ),
+	   this, TQ_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) ));
 
   // hide if empty
   if (bar->count() == 0 )
@@ -699,7 +699,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
       if ( view == m_currentView )
         startAnimation();
 
-      connect( run, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotRunFinished() ) );
+      connect( run, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotRunFinished() ) );
   }
 }
 
@@ -979,7 +979,7 @@ void KonqMainWindow::slotOpenURLRequest( const KURL &url, const KParts::URLArgs
 {
   kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl;
 
-  KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( TQT_TQOBJECT_CONST(sender())->parent() );
+  KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() );
   TQString frameName = args.frameName;
 
   if ( !frameName.isEmpty() )
@@ -1060,9 +1060,9 @@ void KonqMainWindow::openURL( KonqView *childView, const KURL &url, const KParts
 TQObject *KonqMainWindow::lastFrame( KonqView *view )
 {
   TQObject *nextFrame, *viewFrame;
-  nextFrame = TQT_TQOBJECT(view->frame());
+  nextFrame = view->frame();
   viewFrame = 0;
-  while ( nextFrame != 0 && ! nextFrame->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) {
+  while ( nextFrame != 0 && ! nextFrame->inherits( "TQWidgetStack" ) ) {
     viewFrame = nextFrame;
     nextFrame = nextFrame->parent();
   }
@@ -1189,9 +1189,9 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
     {
         KParts::BrowserHostExtension *hostExtension = 0;
         KParts::ReadOnlyPart *ro_part = 0L;
-        KParts::BrowserExtension *be = ::tqqt_cast<KParts::BrowserExtension *>(sender());
+        KParts::BrowserExtension *be = ::tqt_cast<KParts::BrowserExtension *>(sender());
         if (be)
-            ro_part = ::tqqt_cast<KParts::ReadOnlyPart *>(be->parent());
+            ro_part = ::tqt_cast<KParts::ReadOnlyPart *>(be->parent());
         if ( findChildView( ro_part, args.frameName, &mainWindow, &hostExtension, &part ) )
         {
             // Found a view. If url isn't empty, we should open it - but this never happens currently
@@ -1310,7 +1310,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
 // well. If the WM has support for _NET_WM_USER_TIME, it will be just set to 0 (=don't focus on show),
 // and the WM should take care of it itself.
     bool wm_usertime_support = false;
-    Time saved_last_input_time = GET_QT_X_USER_TIME();
+    Time saved_last_input_time = get_tqt_x_user_time();
     if ( windowArgs.lowerWindow )
     {
         NETRootInfo wm_info( tqt_xdisplay(), NET::Supported );
@@ -1320,7 +1320,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
         // *sigh*, and I thought nobody would need TQWidget::dontFocusOnShow().
         // Avoid Qt's support for user time by setting it to 0, and
         // set the property ourselves.
-            SET_QT_X_USER_TIME(0);
+            set_tqt_x_user_time(0);
             KWin::setUserTime( mainWindow->winId(), 0 );
         }
         // Put below the current window before showing, in case that actually works with the WM.
@@ -1333,7 +1333,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
 
     if ( windowArgs.lowerWindow )
     {
-        SET_QT_X_USER_TIME(saved_last_input_time);
+        set_tqt_x_user_time(saved_last_input_time);
         if( !wm_usertime_support )
         { // No WM support. Let's try ugly tricks.
             mainWindow->lower();
@@ -1508,7 +1508,7 @@ void KonqMainWindow::slotOpenLocation()
 
 void KonqMainWindow::slotToolFind()
 {
-  kdDebug(1202) << "KonqMainWindow::slotToolFind sender:" << TQT_TQOBJECT_CONST(sender())->className() << endl;
+  kdDebug(1202) << "KonqMainWindow::slotToolFind sender:" << sender()->className() << endl;
 
   if ( m_currentView && m_currentView->part()->inherits("KonqDirPart") )
   {
@@ -1535,10 +1535,10 @@ void KonqMainWindow::slotToolFind()
     findPart->widget()->show();
     findPart->widget()->setFocus();
 
-    connect( dirPart, TQT_SIGNAL( findClosed(KonqDirPart *) ),
-             this, TQT_SLOT( slotFindClosed(KonqDirPart *) ) );
+    connect( dirPart, TQ_SIGNAL( findClosed(KonqDirPart *) ),
+             this, TQ_SLOT( slotFindClosed(KonqDirPart *) ) );
   }
-  else if ( TQT_TQOBJECT_CONST(sender())->inherits( "TDEAction" ) ) // don't go there if called by the singleShot below
+  else if ( sender()->inherits( "TDEAction" ) ) // don't go there if called by the singleShot below
   {
       KURL url;
       if ( m_currentView && m_currentView->url().isLocalFile() )
@@ -1550,7 +1550,7 @@ void KonqMainWindow::slotToolFind()
           "filemanagement", url, KParts::URLArgs(), true /* forbid "use html"*/ );
       mw->m_paFindFiles->setChecked(true);
       // Delay it after the openURL call (hacky!)
-      TQTimer::singleShot( 1, mw, TQT_SLOT(slotToolFind()));
+      TQTimer::singleShot( 1, mw, TQ_SLOT(slotToolFind()));
       m_paFindFiles->setChecked(false);
   }
 }
@@ -1587,7 +1587,7 @@ void KonqMainWindow::slotOpenWith()
   KURL::List lst;
   lst.append( m_currentView->url() );
 
-  TQString serviceName = TQT_TQOBJECT_CONST(sender())->name();
+  TQString serviceName = sender()->name();
 
   TDETrader::OfferList offers = m_currentView->appServiceOffers();
   TDETrader::OfferList::ConstIterator it = offers.begin();
@@ -1605,7 +1605,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
   if ( !toggle )
     return;
 
-  TQString modeName = TQT_TQOBJECT_CONST(sender())->name();
+  TQString modeName = sender()->name();
 
   if ( m_currentView->service()->desktopEntryName() == modeName )
     return;
@@ -1864,14 +1864,14 @@ void KonqMainWindow::slotReloadStop() {
 }
 
 void KonqMainWindow::toggleReloadStopButton(bool isReload) {
-  //m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" );
+  //m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQ_SLOT( slotStop() ), actionCollection(), "stop" );
   if (isReload) {
     m_paReloadStop->setIcon("process-stop");
     m_paReloadStop->setWhatsThis( i18n( "Stop loading the document<p>"
                                         "All network transfers will be stopped and Konqueror will display the content "
                                         "that has been received so far." ) );
     m_paReloadStop->setToolTip( i18n( "Stop loading the document" ) );
-  //m_paReloadStop = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload" );
+  //m_paReloadStop = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQ_SLOT( slotReloadStop() ), actionCollection(), "reload" );
   } else {
     m_paReloadStop->setIcon("reload");
     m_paReloadStop->setWhatsThis( i18n( "Reload the currently displayed document<p>"
@@ -1903,7 +1903,7 @@ void KonqMainWindow::slotHome(TDEAction::ActivationReason, TQt::ButtonState stat
 
     if( state & TQt::ControlButton ) // Ctrl Left/MMB
 	openFilteredURL( homeURL, req);
-    else if( state & Qt::MidButton )
+    else if( state & TQt::MidButton )
     {
         if(KonqSettings::mmbOpensTab())
 	    openFilteredURL( homeURL, req);
@@ -1920,7 +1920,7 @@ void KonqMainWindow::slotHome(TDEAction::ActivationReason, TQt::ButtonState stat
 
 void KonqMainWindow::slotHome()
 {
-    slotHome(TDEAction::UnknownActivation, Qt::LeftButton);
+    slotHome(TDEAction::UnknownActivation, TQt::LeftButton);
 }
 
 void KonqMainWindow::slotGoSystem()
@@ -1978,7 +1978,7 @@ void KonqMainWindow::slotGoHistory()
   // Show the sidebar
   if (!static_cast<TDEToggleAction*>(a)->isChecked()) {
     a->activate();
-    TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistory()));
+    TQTimer::singleShot( 0, this, TQ_SLOT(slotGoHistory()));
     return;
   }
 
@@ -2042,8 +2042,8 @@ void KonqMainWindow::slotConfigureToolbars()
   if ( autoSaveSettings() )
     saveMainWindowSettings( TDEGlobal::config(), "KonqMainWindow" );
   KEditToolbar dlg(factory());
-  connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig()));
-  connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(initBookmarkBar()));
+  connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig()));
+  connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(initBookmarkBar()));
   dlg.exec();
 }
 
@@ -2342,8 +2342,8 @@ void KonqMainWindow::insertChildView( KonqView *childView )
   kdDebug(1202) << "KonqMainWindow::insertChildView " << childView << endl;
   m_mapViews.insert( childView->part(), childView );
 
-  connect( childView, TQT_SIGNAL( viewCompleted( KonqView * ) ),
-           this, TQT_SLOT( slotViewCompleted( KonqView * ) ) );
+  connect( childView, TQ_SIGNAL( viewCompleted( KonqView * ) ),
+           this, TQ_SLOT( slotViewCompleted( KonqView * ) ) );
 
   if ( !m_pViewManager->isLoadingProfile() ) // see KonqViewManager::loadViewProfile
     viewCountChanged();
@@ -2355,8 +2355,8 @@ void KonqMainWindow::removeChildView( KonqView *childView )
 {
   kdDebug(1202) << "KonqMainWindow::removeChildView childView " << childView << endl;
 
-  disconnect( childView, TQT_SIGNAL( viewCompleted( KonqView * ) ),
-              this, TQT_SLOT( slotViewCompleted( KonqView * ) ) );
+  disconnect( childView, TQ_SIGNAL( viewCompleted( KonqView * ) ),
+              this, TQ_SLOT( slotViewCompleted( KonqView * ) ) );
 
 #ifndef NDEBUG
   dumpViewList();
@@ -2642,14 +2642,14 @@ void KonqMainWindow::slotFileNewAboutToShow()
 
 void KonqMainWindow::slotSplitViewHorizontal()
 {
-  KonqView * newView = m_pViewManager->splitView( Qt::Horizontal );
+  KonqView * newView = m_pViewManager->splitView( TQt::Horizontal );
   if (newView == 0L) return;
   newView->openURL( m_currentView->url(), m_currentView->locationBarURL() );
 }
 
 void KonqMainWindow::slotSplitViewVertical()
 {
-  KonqView * newView = m_pViewManager->splitView( Qt::Vertical );
+  KonqView * newView = m_pViewManager->splitView( TQt::Vertical );
   if (newView == 0L) return;
   newView->openURL( m_currentView->url(), m_currentView->locationBarURL() );
 }
@@ -2714,7 +2714,7 @@ void KonqMainWindow::slotBreakOffTabPopup()
 
   //Can't do this safely here as the tabbar may disappear and we're
   //hanging off here.
-  TQTimer::singleShot(0, this, TQT_SLOT( slotBreakOffTabPopupDelayed() ) );
+  TQTimer::singleShot(0, this, TQ_SLOT( slotBreakOffTabPopupDelayed() ) );
 }
 
 void KonqMainWindow::slotBreakOffTabPopupDelayed()
@@ -2858,7 +2858,7 @@ void KonqMainWindow::slotRemoveTabPopup()
   }
 
   //Can't do immediately - may kill the tabbar, and we're in an event path down from it
-  TQTimer::singleShot( 0, this, TQT_SLOT( slotRemoveTabPopupDelayed() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( slotRemoveTabPopupDelayed() ) );
 }
 
 void KonqMainWindow::slotRemoveTabPopupDelayed()
@@ -2896,7 +2896,7 @@ void KonqMainWindow::slotRemoveOtherTabsPopup()
   m_pViewManager->showTab( originalView );
 
   //Can't do immediately - kills the tabbar, and we're in an event path down from it
-  TQTimer::singleShot( 0, this, TQT_SLOT( slotRemoveOtherTabsPopupDelayed() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( slotRemoveOtherTabsPopupDelayed() ) );
 }
 
 void KonqMainWindow::slotRemoveOtherTabsPopupDelayed()
@@ -2945,7 +2945,7 @@ void KonqMainWindow::slotActivatePrevTab()
 
 void KonqMainWindow::slotActivateTab()
 {
-  m_pViewManager->activateTab( TQString( TQT_TQOBJECT_CONST(sender())->name() ).right( 2 ).toInt() -1 );
+  m_pViewManager->activateTab( TQString( sender()->name() ).right( 2 ).toInt() -1 );
 }
 
 void KonqMainWindow::slotDumpDebugInfo()
@@ -3128,13 +3128,13 @@ void KonqMainWindow::slotUpAboutToShow()
 void KonqMainWindow::slotUp(TDEAction::ActivationReason, TQt::ButtonState state)
 {
     m_goState = state;
-    TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( slotUpDelayed() ) );
 }
 
 void KonqMainWindow::slotUp()
 {
-    m_goState = Qt::LeftButton;
-    TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) );
+    m_goState = TQt::LeftButton;
+    TQTimer::singleShot( 0, this, TQ_SLOT( slotUpDelayed() ) );
 }
 
 void KonqMainWindow::slotUpDelayed()
@@ -3151,7 +3151,7 @@ void KonqMainWindow::slotUpDelayed()
     const TQString& url = m_currentView->upURL().url();
     if(m_goState & TQt::ControlButton)
 	openFilteredURL(url, req );
-    else if(m_goState & Qt::MidButton)
+    else if(m_goState & TQt::MidButton)
     {
         if(KonqSettings::mmbOpensTab())
 	    openFilteredURL( url, req);
@@ -3160,7 +3160,7 @@ void KonqMainWindow::slotUpDelayed()
     }
     else
 	openFilteredURL( url, false );
-    m_goState = Qt::LeftButton;
+    m_goState = TQt::LeftButton;
 }
 
 void KonqMainWindow::slotUpActivated( int id )
@@ -3181,7 +3181,7 @@ void KonqMainWindow::slotGoMenuAboutToShow()
 
 void KonqMainWindow::slotGoHistoryActivated( int steps )
 {
-    slotGoHistoryActivated( steps, Qt::LeftButton );
+    slotGoHistoryActivated( steps, TQt::LeftButton );
 }
 
 void KonqMainWindow::slotGoHistoryActivated( int steps, TQt::ButtonState state )
@@ -3192,7 +3192,7 @@ void KonqMainWindow::slotGoHistoryActivated( int steps, TQt::ButtonState state )
     // Only start 1 timer.
     m_goBuffer = steps;
     m_goState = state;
-    TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistoryDelayed()));
+    TQTimer::singleShot( 0, this, TQ_SLOT(slotGoHistoryDelayed()));
   }
 }
 
@@ -3212,7 +3212,7 @@ void KonqMainWindow::slotGoHistoryDelayed()
       if (newView && inFront)
 	  m_pViewManager->showTab( newView );
   }
-  else if(m_goState & Qt::MidButton)
+  else if(m_goState & TQt::MidButton)
   {
       if(mmbOpensTab)
       {
@@ -3230,7 +3230,7 @@ void KonqMainWindow::slotGoHistoryDelayed()
   }
 
   m_goBuffer = 0;
-  m_goState = Qt::LeftButton;
+  m_goState = TQt::LeftButton;
 }
 
 
@@ -3284,10 +3284,10 @@ void KonqMainWindow::initCombo()
 
   m_combo->init( s_pCompletion );
 
-  connect( m_combo, TQT_SIGNAL(activated(const TQString&,int)),
-           this, TQT_SLOT(slotURLEntered(const TQString&,int)) );
-  connect( m_combo, TQT_SIGNAL(showPageSecurity()),
-           this, TQT_SLOT(showPageSecurity()) );
+  connect( m_combo, TQ_SIGNAL(activated(const TQString&,int)),
+           this, TQ_SLOT(slotURLEntered(const TQString&,int)) );
+  connect( m_combo, TQ_SIGNAL(showPageSecurity()),
+           this, TQ_SLOT(showPageSecurity()) );
 
   m_pURLCompletion = new KURLCompletion();
   m_pURLCompletion->setCompletionMode( s_pCompletion->completionMode() );
@@ -3296,18 +3296,18 @@ void KonqMainWindow::initCombo()
   // We do want completion of user names, right?
   //m_pURLCompletion->setReplaceHome( false );  // Leave ~ alone! Will be taken care of by filters!!
 
-  connect( m_combo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
-           TQT_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion )));
-  connect( m_combo, TQT_SIGNAL( completion( const TQString& )),
-           TQT_SLOT( slotMakeCompletion( const TQString& )));
-  connect( m_combo, TQT_SIGNAL( substringCompletion( const TQString& )),
-           TQT_SLOT( slotSubstringcompletion( const TQString& )));
-  connect( m_combo, TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType) ),
-           TQT_SLOT( slotRotation( TDECompletionBase::KeyBindingType )));
-  connect( m_combo, TQT_SIGNAL( cleared() ),
-           TQT_SLOT ( slotClearHistory() ) );
-  connect( m_pURLCompletion, TQT_SIGNAL( match(const TQString&) ),
-           TQT_SLOT( slotMatch(const TQString&) ));
+  connect( m_combo, TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+           TQ_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion )));
+  connect( m_combo, TQ_SIGNAL( completion( const TQString& )),
+           TQ_SLOT( slotMakeCompletion( const TQString& )));
+  connect( m_combo, TQ_SIGNAL( substringCompletion( const TQString& )),
+           TQ_SLOT( slotSubstringcompletion( const TQString& )));
+  connect( m_combo, TQ_SIGNAL( textRotation( TDECompletionBase::KeyBindingType) ),
+           TQ_SLOT( slotRotation( TDECompletionBase::KeyBindingType )));
+  connect( m_combo, TQ_SIGNAL( cleared() ),
+           TQ_SLOT ( slotClearHistory() ) );
+  connect( m_pURLCompletion, TQ_SIGNAL( match(const TQString&) ),
+           TQ_SLOT( slotMatch(const TQString&) ));
 
   m_combo->lineEdit()->installEventFilter(this);
 
@@ -3315,8 +3315,8 @@ void KonqMainWindow::initCombo()
   if ( !bookmarkCompletionInitialized )
   {
       bookmarkCompletionInitialized = true;
-      DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, TQT_TQOBJECT(m_combo->lineEdit()) );
-      connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT( bookmarksIntoCompletion() ) );
+      DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, m_combo->lineEdit() );
+      connect( initializer, TQ_SIGNAL( initialize() ), this, TQ_SLOT( bookmarksIntoCompletion() ) );
   }
 }
 
@@ -3462,11 +3462,11 @@ void KonqMainWindow::slotClearComboHistory()
 bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
 {
   if ( ( ev->type()==TQEvent::FocusIn || ev->type()==TQEvent::FocusOut ) &&
-       m_combo && TQT_BASE_OBJECT(m_combo->lineEdit()) == TQT_BASE_OBJECT(obj) )
+       m_combo && m_combo->lineEdit() == obj )
   {
     //kdDebug(1202) << "KonqMainWindow::eventFilter " << obj << " " << obj->className() << " " << obj->name() << endl;
 
-    TQFocusEvent * focusEv = TQT_TQFOCUSEVENT(ev);
+    TQFocusEvent * focusEv = static_cast<TQFocusEvent*>(ev);
     if (focusEv->reason() == TQFocusEvent::Popup)
     {
       return KParts::MainWindow::eventFilter( obj, ev );
@@ -3504,22 +3504,22 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
           duplicate->setEnabled( false );
 
       if (slotNames.contains("cut()"))
-        disconnect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) );
+        disconnect( m_paCut, TQ_SIGNAL( activated() ), ext, TQ_SLOT( cut() ) );
       if (slotNames.contains("copy()"))
-        disconnect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) );
+        disconnect( m_paCopy, TQ_SIGNAL( activated() ), ext, TQ_SLOT( copy() ) );
       if (slotNames.contains("paste()"))
-        disconnect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) );
+        disconnect( m_paPaste, TQ_SIGNAL( activated() ), ext, TQ_SLOT( paste() ) );
       if (slotNames.contains("del()"))
-        disconnect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) );
-      disconnect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
-                  this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+        disconnect( m_paDelete, TQ_SIGNAL( activated() ), ext, TQ_SLOT( del() ) );
+      disconnect( m_paTrash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
+                  this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
 
-      connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) );
-      connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) );
-      connect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) );
-      connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
-      connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) );
-      connect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) );
+      connect( m_paCut, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( cut() ) );
+      connect( m_paCopy, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( copy() ) );
+      connect( m_paPaste, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( paste() ) );
+      connect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) );
+      connect( m_combo->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckComboSelection()) );
+      connect( m_combo->lineEdit(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotCheckComboSelection()) );
 
       m_paTrash->setEnabled(false);
       m_paDelete->setEnabled(false);
@@ -3545,22 +3545,22 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
           duplicate->setEnabled( actionCollection()->action("new_window")->isEnabled() );
 
       if (slotNames.contains("cut()"))
-        connect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) );
+        connect( m_paCut, TQ_SIGNAL( activated() ), ext, TQ_SLOT( cut() ) );
       if (slotNames.contains("copy()"))
-        connect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) );
+        connect( m_paCopy, TQ_SIGNAL( activated() ), ext, TQ_SLOT( copy() ) );
       if (slotNames.contains("paste()"))
-        connect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) );
+        connect( m_paPaste, TQ_SIGNAL( activated() ), ext, TQ_SLOT( paste() ) );
       if (slotNames.contains("del()"))
-        connect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) );
-      connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
-               this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+        connect( m_paDelete, TQ_SIGNAL( activated() ), ext, TQ_SLOT( del() ) );
+      connect( m_paTrash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
+               this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
 
-      disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) );
-      disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) );
-      disconnect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) );
-      disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
-      disconnect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) );
-      disconnect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) );
+      disconnect( m_paCut, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( cut() ) );
+      disconnect( m_paCopy, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( copy() ) );
+      disconnect( m_paPaste, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( paste() ) );
+      disconnect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) );
+      disconnect( m_combo->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckComboSelection()) );
+      disconnect( m_combo->lineEdit(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotCheckComboSelection()) );
 
       if ( ext )
       {
@@ -3593,8 +3593,8 @@ void KonqMainWindow::slotClipboardDataChanged()
 
 void KonqMainWindow::slotCheckComboSelection()
 {
-  //kdDebug(1202) << "m_combo->lineEdit()->hasMarkedText() : " << hasSelection << endl;
   bool hasSelection = m_combo->lineEdit()->hasSelectedText();
+  //kdDebug(1202) << "m_combo->lineEdit()->hasSelectedText() : " << hasSelection << endl;
   m_paCopy->setEnabled( hasSelection );
   m_paCut->setEnabled( hasSelection );
 }
@@ -3605,7 +3605,7 @@ void KonqMainWindow::slotClearLocationBar( TDEAction::ActivationReason, TQt::But
   slotStop();
   m_combo->clearTemporary();
   focusLocationBar();
-  if ( state & Qt::MidButton )
+  if ( state & TQt::MidButton )
       m_combo->setURL( TQApplication::clipboard()->text( TQClipboard::Selection ) );
 }
 
@@ -3815,77 +3815,77 @@ void KonqMainWindow::initActions()
 
   // File menu
   m_pMenuNew = new KNewMenu ( actionCollection(), this, "new_menu" );
-  TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()),
-                    this, TQT_SLOT(slotFileNewAboutToShow()) );
+  TQObject::connect( m_pMenuNew->popupMenu(), TQ_SIGNAL(aboutToShow()),
+                    this, TQ_SLOT(slotFileNewAboutToShow()) );
 
   (void) new TDEAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" );
   (void) new TDEAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" );
-  (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" );
-  (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" );
-  (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" );
-  (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" );
+  (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, TQ_SLOT( slotNewWindow() ), actionCollection(), "new_window" );
+  (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, TQ_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" );
+  (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, TQ_SLOT( slotSendURL() ), actionCollection(), "sendURL" );
+  (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, this, TQ_SLOT( slotSendFile() ), actionCollection(), "sendPage" );
   if (kapp->authorize("shell_access"))
   {
-     (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" );
+     (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, TQ_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" );
   }
-  (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), TQT_TQOBJECT(this), TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" );
+  (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), this, TQ_SLOT( slotOpenLocation() ), actionCollection(), "open_location" );
 
-  m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this), TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" );
+  m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), this, TQ_SLOT( slotToolFind() ), actionCollection(), "findfile" );
 
   m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" );
-  (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit" );
+  (void) KStdAction::quit( this, TQ_SLOT( close() ), actionCollection(), "quit" );
 
-  m_ptaUseHTML = new TDEToggleAction( i18n( "&Use index.html" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" );
-  m_paLockView = new TDEToggleAction( i18n( "Lock to Current Location"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLockView() ), actionCollection(), "lock" );
-  m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLinkView() ), actionCollection(), "link" );
+  m_ptaUseHTML = new TDEToggleAction( i18n( "&Use index.html" ), 0, this, TQ_SLOT( slotShowHTML() ), actionCollection(), "usehtml" );
+  m_paLockView = new TDEToggleAction( i18n( "Lock to Current Location"), 0, this, TQ_SLOT( slotLockView() ), actionCollection(), "lock" );
+  m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, this, TQ_SLOT( slotLinkView() ), actionCollection(), "link" );
 
   // Go menu
   m_paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "go-up", TDEStdAccel::shortcut(TDEStdAccel::Up), actionCollection(), "up" );
-  connect( m_paUp, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
-	   TQT_SLOT( slotUp(TDEAction::ActivationReason, TQt::ButtonState) ) );
-  connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpAboutToShow() ) );
-  connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotUpActivated( int ) ) );
+  connect( m_paUp, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this,
+	   TQ_SLOT( slotUp(TDEAction::ActivationReason, TQt::ButtonState) ) );
+  connect( m_paUp->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotUpAboutToShow() ) );
+  connect( m_paUp->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotUpActivated( int ) ) );
 
   TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward();
   m_paBack = new TDEToolBarPopupAction( backForward.first, TDEStdAccel::shortcut(TDEStdAccel::Back), 0, "", actionCollection(), "back" );
-  connect( m_paBack, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
-	   TQT_SLOT( slotBack(TDEAction::ActivationReason, TQt::ButtonState) ) );
-  connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotBackAboutToShow() ) );
-  connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotBackActivated( int ) ) );
+  connect( m_paBack, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this,
+	   TQ_SLOT( slotBack(TDEAction::ActivationReason, TQt::ButtonState) ) );
+  connect( m_paBack->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotBackAboutToShow() ) );
+  connect( m_paBack->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotBackActivated( int ) ) );
 
   m_paForward = new TDEToolBarPopupAction( backForward.second, TDEStdAccel::shortcut(TDEStdAccel::Forward), 0, "", actionCollection(), "forward" );
-  connect( m_paForward, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
-	   TQT_SLOT( slotForward(TDEAction::ActivationReason, TQt::ButtonState) ) );
-  connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardAboutToShow() ) );
-  connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardActivated( int ) ) );
+  connect( m_paForward, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this,
+	   TQ_SLOT( slotForward(TDEAction::ActivationReason, TQt::ButtonState) ) );
+  connect( m_paForward->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotForwardAboutToShow() ) );
+  connect( m_paForward->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotForwardActivated( int ) ) );
 
   m_paHistory = new KonqBidiHistoryAction( i18n("History"), actionCollection(), "history" );
-  connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotGoMenuAboutToShow() ) );
-  connect( m_paHistory, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotGoHistoryActivated( int ) ) );
+  connect( m_paHistory, TQ_SIGNAL( menuAboutToShow() ), this, TQ_SLOT( slotGoMenuAboutToShow() ) );
+  connect( m_paHistory, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotGoHistoryActivated( int ) ) );
 
   m_paHome = new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), actionCollection(), "home" );
-  connect( m_paHome, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
-	   TQT_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) );
-
-  (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" );
-  (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" );
-  (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" );
-  (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" );
-  (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" );
-  //(void) new TDEAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" );
-  (void) new TDEAction( i18n( "Trash" ), "trashcan_full", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" );
-  (void) new TDEAction( i18n( "Autostart" ), "launch", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" );
+  connect( m_paHome, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this,
+	   TQ_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) );
+
+  (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, this, TQ_SLOT( slotGoSystem() ), actionCollection(), "go_system" );
+  (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, this, TQ_SLOT( slotGoApplications() ), actionCollection(), "go_applications" );
+  (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, this, TQ_SLOT( slotGoMedia() ), actionCollection(), "go_media" );
+  (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, this, TQ_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" );
+  (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, this, TQ_SLOT( slotGoSettings() ), actionCollection(), "go_settings" );
+  //(void) new TDEAction( i18n( "Sidebar Configuration" ), 0, this, TQ_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" );
+  (void) new TDEAction( i18n( "Trash" ), "trashcan_full", 0, this, TQ_SLOT( slotGoTrash() ), actionCollection(), "go_trash" );
+  (void) new TDEAction( i18n( "Autostart" ), "launch", 0, this, TQ_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" );
   KonqMostOftenURLSAction *mostOften = new KonqMostOftenURLSAction( i18n("Most Often Visited"), actionCollection(), "go_most_often" );
-  connect( mostOften, TQT_SIGNAL( activated( const KURL& )),
-	   TQT_SLOT( slotOpenURL( const KURL& )));
-  (void) new TDEAction( i18n( "History" ), "history", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" );
+  connect( mostOften, TQ_SIGNAL( activated( const KURL& )),
+	   TQ_SLOT( slotOpenURL( const KURL& )));
+  (void) new TDEAction( i18n( "History" ), "history", 0, this, TQ_SLOT( slotGoHistory() ), actionCollection(), "go_history" );
 
   // Settings menu
 
-  m_paSaveViewProfile = new TDEAction( i18n( "&Save View Profile..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" );
-  m_paSaveViewPropertiesLocally = new TDEToggleAction( i18n( "Save View Changes per &Folder" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" );
+  m_paSaveViewProfile = new TDEAction( i18n( "&Save View Profile..." ), 0, this, TQ_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" );
+  m_paSaveViewPropertiesLocally = new TDEToggleAction( i18n( "Save View Changes per &Folder" ), 0, this, TQ_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" );
    // "Remove" ? "Reset" ? The former is more correct, the latter is more kcontrol-like...
-  m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" );
+  m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, this, TQ_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" );
 
 
   m_configureModules << "tde-filebehavior.desktop" << "tde-fileappearance.desktop" <<
@@ -3900,41 +3900,41 @@ void KonqMainWindow::initActions()
 
 
   if (!kapp->authorizeControlModules(configModules()).isEmpty())
-     KStdAction::preferences (TQT_TQOBJECT(this), TQT_SLOT (slotConfigure()), actionCollection() );
+     KStdAction::preferences (this, TQ_SLOT (slotConfigure()), actionCollection() );
 
-  KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
-  KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
+  KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() );
+  KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() );
 
-  m_paConfigureExtensions = new TDEAction( i18n("Configure Extensions..."), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions");
-  m_paConfigureSpellChecking = new TDEAction( i18n("Configure Spell Checking..."), "tools-check-spelling", 0,TQT_TQOBJECT(this), TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck");
+  m_paConfigureExtensions = new TDEAction( i18n("Configure Extensions..."), 0, this, TQ_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions");
+  m_paConfigureSpellChecking = new TDEAction( i18n("Configure Spell Checking..."), "tools-check-spelling", 0,this, TQ_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck");
 
   // Window menu
-  m_paSplitViewHor = new TDEAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" );
-  m_paSplitViewVer = new TDEAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" );
-  m_paAddTab = new TDEAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" );
-  m_paDuplicateTab = new TDEAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" );
-  m_paBreakOffTab = new TDEAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(this), TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" );
-  m_paRemoveView = new TDEAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" );
-  m_paRemoveTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" );
-  m_paRemoveOtherTabs = new TDEAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" );
-
-  m_paActivateNextTab = new TDEAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), TQT_TQOBJECT(this), TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" );
-  m_paActivatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), TQT_TQOBJECT(this), TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" );
+  m_paSplitViewHor = new TDEAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, this, TQ_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" );
+  m_paSplitViewVer = new TDEAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, this, TQ_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" );
+  m_paAddTab = new TDEAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQ_SLOT( slotAddTab() ), actionCollection(), "newtab" );
+  m_paDuplicateTab = new TDEAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, this, TQ_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" );
+  m_paBreakOffTab = new TDEAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, this, TQ_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" );
+  m_paRemoveView = new TDEAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, this, TQ_SLOT( slotRemoveView() ), actionCollection(), "removeview" );
+  m_paRemoveTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, this, TQ_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" );
+  m_paRemoveOtherTabs = new TDEAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, this, TQ_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" );
+
+  m_paActivateNextTab = new TDEAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), this, TQ_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" );
+  m_paActivatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), this, TQ_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" );
 
   TQCString actionname;
   for (int i=1;i<13;i++) {
     actionname.sprintf("activate_tab_%02d", i);
-    new TDEAction(i18n("Activate Tab %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotActivateTab()), actionCollection(), actionname);
+    new TDEAction(i18n("Activate Tab %1").arg(i), 0, this, TQ_SLOT(slotActivateTab()), actionCollection(), actionname);
   }
 
-  m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), "go-previous" , CTRL+SHIFT+Key_Left,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left");
-  m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), "go-next" , CTRL+SHIFT+Key_Right,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right");
+  m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), "go-previous" , CTRL+SHIFT+Key_Left,this, TQ_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left");
+  m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), "go-next" , CTRL+SHIFT+Key_Right,this, TQ_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right");
 
 #ifndef NDEBUG
-  (void) new TDEAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" );
+  (void) new TDEAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, this, TQ_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" );
 #endif
 
-  m_paSaveRemoveViewProfile = new TDEAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQT_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" );
+  m_paSaveRemoveViewProfile = new TDEAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQ_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" );
   m_pamLoadViewProfile = new TDEActionMenu( i18n( "Load &View Profile" ), actionCollection(), "loadviewprofile" );
 
   m_pViewManager->setProfiles( m_pamLoadViewProfile );
@@ -3943,19 +3943,19 @@ void KonqMainWindow::initActions()
   TDEShortcut fullScreenShortcut = m_ptaFullScreen->shortcut();
   fullScreenShortcut.append( KKey( Key_F11 ) );
   m_ptaFullScreen->setShortcut( fullScreenShortcut );
-  connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen( bool )));
+  connect( m_ptaFullScreen, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( slotUpdateFullScreen( bool )));
 
   TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload);
   reloadShortcut.append(KKey(CTRL + Key_R));
-  m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
-  m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );
+  m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQ_SLOT( slotReload() ), actionCollection(), "reload" );
+  m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, TQ_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );
 
-  m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );
+  m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, this, TQ_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );
 
-  m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" );
+  m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQ_SLOT( undo() ), actionCollection(), "undo" );
   //m_paUndo->setEnabled( KonqUndoManager::self()->undoAvailable() );
-  connect( KonqUndoManager::self(), TQT_SIGNAL( undoTextChanged( const TQString & ) ),
-           m_paUndo, TQT_SLOT( setText( const TQString & ) ) );
+  connect( KonqUndoManager::self(), TQ_SIGNAL( undoTextChanged( const TQString & ) ),
+           m_paUndo, TQ_SLOT( setText( const TQString & ) ) );
 
   // Those are connected to the browserextension directly
   m_paCut = KStdAction::cut( 0, 0, actionCollection(), "cut" );
@@ -3965,24 +3965,24 @@ void KonqMainWindow::initActions()
 
   m_paCopy = KStdAction::copy( 0, 0, actionCollection(), "copy" );
   m_paPaste = KStdAction::paste( 0, 0, actionCollection(), "paste" );
-  m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotStop() ), actionCollection(), "stop" );
+  m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQ_SLOT( slotStop() ), actionCollection(), "stop" );
 
   m_paRename = new TDEAction( i18n( "&Rename" ), "edit_rename", Key_F2, actionCollection(), "rename" );
   m_paTrash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" );
-  connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
-           TQT_TQOBJECT(this), TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+  connect( m_paTrash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
+           this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
 
   m_paDelete = new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, actionCollection(), "del" );
   // F5 is the default key binding for Reload.... a la Windows. mc users want F5 for Copy and F6 for move, but I can't make that default.
-  m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, TQT_TQOBJECT(this), TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" );
-  m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, TQT_TQOBJECT(this), TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" );
+  m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, this, TQ_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" );
+  m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, this, TQ_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" );
   // This action doesn't appear in the GUI, it's for the shortcut only. KNewMenu takes care of the GUI stuff.
-  m_paNewDir = new TDEAction( i18n("Create Folder..." ), "konq_create_dir", Key_F10, TQT_TQOBJECT(this), TQT_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" );
-  m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" );
+  m_paNewDir = new TDEAction( i18n("Create Folder..." ), "konq_create_dir", Key_F10, this, TQ_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" );
+  m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, this, TQ_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" );
 
   // Location bar
   m_locationLabel = new KonqDraggableLabel( this, i18n("L&ocation: ") );
-  (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, TQT_TQOBJECT(this), TQT_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" );
+  (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, this, TQ_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" );
   m_locationLabel->setBuddy( m_combo );
 
   KWidgetAction* comboAction = new KWidgetAction( m_combo, i18n( "Location Bar" ), 0,
@@ -3996,8 +3996,8 @@ void KonqMainWindow::initActions()
   TDEAction *clearLocation = new TDEAction( i18n( "Clear Location Bar" ),
 					TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
 					CTRL+Key_L, actionCollection(), "clear_location" );
-  connect( clearLocation, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
-           TQT_SLOT( slotClearLocationBar( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+  connect( clearLocation, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
+           TQ_SLOT( slotClearLocationBar( TDEAction::ActivationReason, TQt::ButtonState ) ) );
   clearLocation->setWhatsThis( i18n( "Clear Location bar<p>"
 				     "Clears the content of the location bar." ) );
 
@@ -4013,21 +4013,21 @@ void KonqMainWindow::initActions()
 
   m_pBookmarkMenu = new KBookmarkMenu( KonqBookmarkManager::self(), m_pBookmarksOwner, m_pamBookmarks->popupMenu(), m_bookmarksActionCollection, true );
   connect( m_pBookmarkMenu,
-           TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ),
-           this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) ));
+           TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ),
+           this, TQ_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) ));
   connect( m_pBookmarkMenu,
-	   TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ),
-	   this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) ));
+	   TQ_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ),
+	   this, TQ_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) ));
 
   TDEAction *addBookmark = actionCollection()->action("add_bookmark");
   if (addBookmark)
      addBookmark->setText(i18n("Bookmark This Location"));
 
-  m_paShowMenuBar = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenuBar() ), actionCollection() );
+  m_paShowMenuBar = KStdAction::showMenubar( this, TQ_SLOT( slotShowMenuBar() ), actionCollection() );
 
-  (void) new TDEAction( i18n( "Kon&queror Introduction" ), "konqui_intro", 0, TQT_TQOBJECT(this), TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" );
+  (void) new TDEAction( i18n( "Kon&queror Introduction" ), "konqui_intro", 0, this, TQ_SLOT( slotIntro() ), actionCollection(), "konqintro" );
 
-  TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT( goURL() ), actionCollection(), "go_url" );
+  TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, this, TQ_SLOT( goURL() ), actionCollection(), "go_url" );
   goUrl->setWhatsThis( i18n( "Go<p>"
 			     "Goes to the page that has been entered into the location bar." ) );
 
@@ -4120,13 +4120,13 @@ void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, TQPopupMenu * pm
     TQValueList<KURL>::Iterator it = list.begin();
     for (; it != list.end(); ++it )
       popupItems.append( new KFileItem( (*it), TQString::null, KFileItem::Unknown) );
-    pm->insertItem( SmallIcon(tab_new_x), i18n( "Open Folder in Tabs" ), this, TQT_SLOT( slotPopupNewTabRight() ) );
+    pm->insertItem( SmallIcon(tab_new_x), i18n( "Open Folder in Tabs" ), this, TQ_SLOT( slotPopupNewTabRight() ) );
   }
   else
   {
     popupItems.append( new KFileItem( bk.url(), TQString::null, KFileItem::Unknown) );
-    pm->insertItem( SmallIcon("window-new"), i18n( "Open in New Window" ), this, TQT_SLOT( slotPopupNewWindow() ) );
-    pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, TQT_SLOT( slotPopupNewTabRight() ) );
+    pm->insertItem( SmallIcon("window-new"), i18n( "Open in New Window" ), this, TQ_SLOT( slotPopupNewWindow() ) );
+    pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, TQ_SLOT( slotPopupNewTabRight() ) );
   }
 }
 
@@ -4143,7 +4143,7 @@ void KonqMainWindow::slotOpenBookmarkURL( const TQString & url, TQt::ButtonState
 
     if( state & TQt::ControlButton ) // Ctrl Left/MMB
 	openFilteredURL( url, req);
-    else if( state & Qt::MidButton )
+    else if( state & TQt::MidButton )
     {
         if(KonqSettings::mmbOpensTab())
 	    openFilteredURL( url, req);
@@ -4345,7 +4345,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext )
       if ( slotNames.contains( it.key()+"()" ) )
       {
           if ( it.key() != "trash" )
-              connect( act, TQT_SIGNAL( activated() ), ext, it.data() /* TQT_SLOT(slot name) */ );
+              connect( act, TQ_SIGNAL( activated() ), ext, it.data() /* TQ_SLOT(slot name) */ );
           act->setEnabled( ext->isActionEnabled( it.key() ) );
           const TQString text = ext->actionText( it.key() );
           if ( !text.isEmpty() )
@@ -4660,7 +4660,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
 {
   KonqView * m_oldView = m_currentView;
 
-  KonqView * currentView = childView( static_cast<KParts::ReadOnlyPart *>( TQT_TQOBJECT_CONST(sender())->parent() ) );
+  KonqView * currentView = childView( static_cast<KParts::ReadOnlyPart *>( sender()->parent() ) );
 
   //kdDebug() << "KonqMainWindow::slotPopupMenu m_oldView=" << m_oldView << " new currentView=" << currentView << " passive:" << currentView->isPassiveMode() << endl;
 
@@ -4701,7 +4701,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
   popupMenuCollection.insert( m_paDelete );
 
   // The pasteto action is used when clicking on a dir, to paste into it.
-  TDEAction *actPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" );
+  TDEAction *actPaste = KStdAction::paste( this, TQ_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" );
   actPaste->setEnabled( m_paPaste->isEnabled() );
   popupMenuCollection.insert( actPaste );
 
@@ -4774,10 +4774,10 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
   if (doTabHandling)
   {
       if (_args.forcesNewWindow()) {
-        actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" );
+        actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, this, TQ_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" );
         actNewWindow->setToolTip( i18n( "Open the document in current window" ) );
       }
-      actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" );
+      actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQ_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" );
       actNewWindow->setToolTip( i18n( "Open the document in a new window" ) );
 
       //Set tab_new_x to point to the correct icon based on NewTabsInFront
@@ -4788,12 +4788,12 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
       else
         tab_new_x = "tab_new_bg" ;
 
-      TDEAction *actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" );
+      TDEAction *actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, this, TQ_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" );
       actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) );
-      TDEAction *actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" );
+      TDEAction *actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQ_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" );
       actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) );
-      actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
-      actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" );
+      actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, this, TQ_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
+      actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQ_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" );
       actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) );
       actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) );
       doTabHandling = true;
@@ -4839,19 +4839,19 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
   if ( client )
     pPopupMenu->factory()->addClient( client );
 
-  KParts::BrowserExtension *be = ::tqqt_cast<KParts::BrowserExtension *>(sender());
+  KParts::BrowserExtension *be = ::tqt_cast<KParts::BrowserExtension *>(sender());
 
   if ( be )
   {
-    TQObject::connect( this, TQT_SIGNAL(popupItemsDisturbed()), pPopupMenu, TQT_SLOT(close()) );
-    TQObject::connect( be, TQT_SIGNAL(itemsRemoved(const KFileItemList &)),
-                      this, TQT_SLOT(slotItemsRemoved(const KFileItemList &)) );
+    TQObject::connect( this, TQ_SIGNAL(popupItemsDisturbed()), pPopupMenu, TQ_SLOT(close()) );
+    TQObject::connect( be, TQ_SIGNAL(itemsRemoved(const KFileItemList &)),
+                      this, TQ_SLOT(slotItemsRemoved(const KFileItemList &)) );
   }
 
-  TQObject::disconnect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()),
-                       this, TQT_SLOT(slotFileNewAboutToShow()) );
+  TQObject::disconnect( m_pMenuNew->popupMenu(), TQ_SIGNAL(aboutToShow()),
+                       this, TQ_SLOT(slotFileNewAboutToShow()) );
 
-  TQGuardedPtr<TQObject> guard(TQT_TQOBJECT(this)); // #149736
+  TQGuardedPtr<TQObject> guard(this); // #149736
   pPopupMenu->exec( _global );
 
   delete pPopupMenu;
@@ -4868,13 +4868,13 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
       return;
   }
 
-  TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()),
-                       this, TQT_SLOT(slotFileNewAboutToShow()) );
+  TQObject::connect( m_pMenuNew->popupMenu(), TQ_SIGNAL(aboutToShow()),
+                       this, TQ_SLOT(slotFileNewAboutToShow()) );
 
   if ( be )
   {
-    TQObject::disconnect( be, TQT_SIGNAL(itemsRemoved(const KFileItemList &)),
-                         this, TQT_SLOT(slotItemsRemoved(const KFileItemList &)) );
+    TQObject::disconnect( be, TQ_SIGNAL(itemsRemoved(const KFileItemList &)),
+                         this, TQ_SLOT(slotItemsRemoved(const KFileItemList &)) );
   }
 
   delete konqyMenuClient;
@@ -4905,7 +4905,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
         }
         // Special case: RMB + renaming in sidebar; setFocus would abort editing.
         TQWidget* fw = focusWidget();
-        if ( !fw || !::tqqt_cast<TQLineEdit*>( fw ) )
+        if ( !fw || !::tqt_cast<TQLineEdit*>( fw ) )
             m_oldView->part()->widget()->setFocus();
     }
   }
@@ -4926,13 +4926,13 @@ void KonqMainWindow::slotItemsRemoved( const KFileItemList &items )
 
 void KonqMainWindow::slotOpenEmbedded()
 {
-  TQCString name = TQT_TQOBJECT_CONST(sender())->name();
+  TQCString name = sender()->name();
 
   m_popupService = m_popupEmbeddingServices[ name.toInt() ]->desktopEntryName();
 
   m_popupEmbeddingServices.clear();
 
-  TQTimer::singleShot( 0, this, TQT_SLOT( slotOpenEmbeddedDoIt() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( slotOpenEmbeddedDoIt() ) );
 }
 
 void KonqMainWindow::slotOpenEmbeddedDoIt()
@@ -5045,8 +5045,8 @@ void KonqMainWindow::updateOpenWithActions()
     TDEAction *action = new TDEAction( i18n( "Open with %1" ).arg( (*it)->name() ), 0, 0, (*it)->desktopEntryName().latin1() );
     action->setIcon( (*it)->icon() );
 
-    connect( action, TQT_SIGNAL( activated() ),
-             this, TQT_SLOT( slotOpenWith() ) );
+    connect( action, TQ_SIGNAL( activated() ),
+             this, TQ_SLOT( slotOpenWith() ) );
 
     m_openWithActions.append( action );
   }
@@ -5099,7 +5099,7 @@ void KonqMainWindow::updateViewModeActions()
   if ( services.count() <= 1 )
     return;
 
-  m_viewModeMenu = new TDEActionMenu( i18n( "&View Mode" ), TQT_TQOBJECT(this) );
+  m_viewModeMenu = new TDEActionMenu( i18n( "&View Mode" ), this );
 
   // a temporary map, just like the m_viewModeToolBarServices map, but
   // mapping to a KonqViewModeAction object. It's just temporary as we
@@ -5132,14 +5132,14 @@ void KonqMainWindow::updateViewModeActions()
       TQString icon = (*it)->icon();
       if ( icon != TQString::fromLatin1( "unknown" ) )
           // we *have* to specify a parent qobject, otherwise the exclusive group stuff doesn't work!(Simon)
-          action = new TDERadioAction( itname, icon, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() );
+          action = new TDERadioAction( itname, icon, 0, this, (*it)->desktopEntryName().ascii() );
       else
-          action = new TDERadioAction( itname, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() );
+          action = new TDERadioAction( itname, 0, this, (*it)->desktopEntryName().ascii() );
 
       action->setExclusiveGroup( "KonqMainWindow_ViewModes" );
 
-      connect( action, TQT_SIGNAL( toggled( bool ) ),
-               this, TQT_SLOT( slotViewModeToggle( bool ) ) );
+      connect( action, TQ_SIGNAL( toggled( bool ) ),
+               this, TQ_SLOT( slotViewModeToggle( bool ) ) );
 
       m_viewModeActions.append( action );
       action->plug( m_viewModeMenu->popupMenu() );
@@ -5186,15 +5186,15 @@ void KonqMainWindow::updateViewModeActions()
 
           KonqViewModeAction *tbAction = new KonqViewModeAction( text,
                                                                  icon,
-                                                                 TQT_TQOBJECT(this),
+                                                                 this,
                                                                  name );
 
           tbAction->setExclusiveGroup( "KonqMainWindow_ToolBarViewModes" );
 
           tbAction->setChecked( action->isChecked() );
 
-          connect( tbAction, TQT_SIGNAL( toggled( bool ) ),
-                   this, TQT_SLOT( slotViewModeToggle( bool ) ) );
+          connect( tbAction, TQ_SIGNAL( toggled( bool ) ),
+                   this, TQ_SLOT( slotViewModeToggle( bool ) ) );
 
           m_toolBarViewModeActions.append( tbAction );
 
@@ -5278,7 +5278,7 @@ KonqMainWindowIface* KonqMainWindow::dcopObject()
 
 void KonqMainWindow::updateBookmarkBar()
 {
-  TDEToolBar * bar = static_cast<TDEToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "TDEToolBar" )) );
+  TDEToolBar * bar = static_cast<TDEToolBar *>( child( "bookmarkToolBar", "TDEToolBar" ) );
 
   if (!bar) return;
 
@@ -5518,18 +5518,18 @@ void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group )
 
 void KonqMainWindow::connectActionCollection( TDEActionCollection *coll )
 {
-    connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ),
-             this, TQT_SLOT( slotActionStatusText( const TQString & ) ) );
-    connect( coll, TQT_SIGNAL( clearStatusText() ),
-             this, TQT_SLOT( slotClearStatusText() ) );
+    connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ),
+             this, TQ_SLOT( slotActionStatusText( const TQString & ) ) );
+    connect( coll, TQ_SIGNAL( clearStatusText() ),
+             this, TQ_SLOT( slotClearStatusText() ) );
 }
 
 void KonqMainWindow::disconnectActionCollection( TDEActionCollection *coll )
 {
-    disconnect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ),
-                this, TQT_SLOT( slotActionStatusText( const TQString & ) ) );
-    disconnect( coll, TQT_SIGNAL( clearStatusText() ),
-                this, TQT_SLOT( slotClearStatusText() ) );
+    disconnect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ),
+                this, TQ_SLOT( slotActionStatusText( const TQString & ) ) );
+    disconnect( coll, TQ_SIGNAL( clearStatusText() ),
+                this, TQ_SLOT( slotClearStatusText() ) );
 }
 
 //
@@ -5812,7 +5812,7 @@ void KonqMainWindow::setPreloadedWindow( KonqMainWindow* window )
     if( window == NULL )
         return;
     window->viewManager()->clear();
-    TDEIO::Scheduler::unregisterWindow( TQT_TQOBJECT(window) );
+    TDEIO::Scheduler::unregisterWindow( window );
 }
 
 // used by preloading - this KonqMainWindow will be reused, reset everything
@@ -5833,7 +5833,7 @@ void KonqMainWindow::resetWindow()
     static Atom atom = XInternAtom( tqt_xdisplay(), "_TDE_NET_WM_USER_CREATION_TIME", False );
     XChangeProperty( tqt_xdisplay(), winId(), atom, XA_CARDINAL, 32,
 		     PropModeReplace, (unsigned char *) &x_time, 1);
-    SET_QT_X_USER_TIME(CurrentTime); // won't have _NET_WM_USER_TIME set
+    set_tqt_x_user_time(CurrentTime); // won't have _NET_WM_USER_TIME set
 #if !KDE_IS_VERSION( 3, 2, 90 ) // _KDE_NET_USER_TIME is obsolete
     static Atom atom2 = XInternAtom( tqt_xdisplay(), "_KDE_NET_USER_TIME", False );
     timeval tv;
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index fd8befe86..281407cf8 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -87,7 +87,7 @@ class KonqExtendedBookmarkOwner;
 
 class KonqMainWindow : public KParts::MainWindow, public KonqFrameContainerBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( int viewCount READ viewCount )
   TQ_PROPERTY( int activeViewsCount READ activeViewsCount )
   TQ_PROPERTY( int linkableViewsCount READ linkableViewsCount )
diff --git a/konqueror/konq_mainwindow_p.h b/konqueror/konq_mainwindow_p.h
index d463ec193..10b6c68c1 100644
--- a/konqueror/konq_mainwindow_p.h
+++ b/konqueror/konq_mainwindow_p.h
@@ -23,7 +23,7 @@
 
 class KonqExtendedBookmarkOwner : public KExtendedBookmarkOwner
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KonqExtendedBookmarkOwner(KonqMainWindow *);
   // for KBookmarkOwner
diff --git a/konqueror/konq_misc.cpp b/konqueror/konq_misc.cpp
index b2f0ad47f..1fbea747e 100644
--- a/konqueror/konq_misc.cpp
+++ b/konqueror/konq_misc.cpp
@@ -225,8 +225,8 @@ KonqDraggableLabel::KonqDraggableLabel( KonqMainWindow* mw, const TQString& text
   , m_mw(mw)
 {
   setBackgroundMode( TQt::PaletteButton );
-  setAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) |
-                 Qt::AlignVCenter | TQt::ShowPrefix );
+  setAlignment( (TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft) |
+                 TQt::AlignVCenter | TQt::ShowPrefix );
   setAcceptDrops(true);
   adjustSize();
   validDrag = false;
@@ -269,7 +269,7 @@ void KonqDraggableLabel::dropEvent( TQDropEvent* ev )
 {
   _savedLst.clear();
   if ( KURLDrag::decode( ev, _savedLst ) ) {
-    TQTimer::singleShot(0, this, TQT_SLOT(delayedOpenURL()));
+    TQTimer::singleShot(0, this, TQ_SLOT(delayedOpenURL()));
   }
 }
 
diff --git a/konqueror/konq_misc.h b/konqueror/konq_misc.h
index 762d72d19..27fe0caa4 100644
--- a/konqueror/konq_misc.h
+++ b/konqueror/konq_misc.h
@@ -111,7 +111,7 @@ public:
 
 class KonqDraggableLabel : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KonqDraggableLabel( KonqMainWindow * mw, const TQString & text );
 
diff --git a/konqueror/konq_profiledlg.cpp b/konqueror/konq_profiledlg.cpp
index f7241713b..6819990a9 100644
--- a/konqueror/konq_profiledlg.cpp
+++ b/konqueror/konq_profiledlg.cpp
@@ -100,8 +100,8 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese
 
   box->setStretchFactor( m_pListView, 1 );
 
-  connect( m_pListView, TQT_SIGNAL( itemRenamed( TQListViewItem * ) ),
-            TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) );
+  connect( m_pListView, TQ_SIGNAL( itemRenamed( TQListViewItem * ) ),
+            TQ_SLOT( slotItemRenamed( TQListViewItem * ) ) );
 
   loadAllProfiles( preselectProfile );
   m_pListView->setMinimumSize( m_pListView->sizeHint() );
@@ -112,11 +112,11 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese
   m_cbSaveSize = new TQCheckBox( i18n("Save &window size in profile"), box );
   m_cbSaveSize->setChecked( KonqSettings::saveWindowSizeInProfile() );
 
-  connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
-           this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
+  connect( m_pListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+           this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
 
-  connect( m_pProfileNameLineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SLOT( slotTextChanged( const TQString & ) ) );
+  connect( m_pProfileNameLineEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SLOT( slotTextChanged( const TQString & ) ) );
 
   enableButton( BTN_RENAME, m_pListView->selectedItem ()!=0 );
   enableButton( BTN_DELETE, m_pListView->selectedItem ()!=0 );
diff --git a/konqueror/konq_profiledlg.h b/konqueror/konq_profiledlg.h
index e0f98a589..cb6db7fcc 100644
--- a/konqueror/konq_profiledlg.h
+++ b/konqueror/konq_profiledlg.h
@@ -46,7 +46,7 @@ public:
 
 class KonqProfileDlg : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KonqProfileDlg( KonqViewManager *manager, const TQString &preselectProfile, TQWidget *parent = 0L );
   ~KonqProfileDlg();
diff --git a/konqueror/konq_run.cpp b/konqueror/konq_run.cpp
index 8c2a91329..01cff73c6 100644
--- a/konqueror/konq_run.cpp
+++ b/konqueror/konq_run.cpp
@@ -148,10 +148,10 @@ void KonqRun::init()
     KParts::BrowserRun::init();
     // Maybe init went to the "let's try stat'ing" part. Then connect to info messages.
     // (in case it goes to scanFile, this will be done below)
-    TDEIO::StatJob *job = tqt_dynamic_cast<TDEIO::StatJob*>( m_job );
+    TDEIO::StatJob *job = dynamic_cast<TDEIO::StatJob*>( m_job );
     if ( job && !job->error() && m_pView ) {
-        connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
-                 m_pView, TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
+        connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+                 m_pView, TQ_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
     }
 }
 
@@ -160,13 +160,13 @@ void KonqRun::scanFile()
     KParts::BrowserRun::scanFile();
     // could be a static cast as of now, but who would notify when
     // BrowserRun changes
-    TDEIO::TransferJob *job = tqt_dynamic_cast<TDEIO::TransferJob*>( m_job );
+    TDEIO::TransferJob *job = dynamic_cast<TDEIO::TransferJob*>( m_job );
     if ( job && !job->error() ) {
-        connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL& )),
-                 TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL& ) ));
+        connect( job, TQ_SIGNAL( redirection( TDEIO::Job *, const KURL& )),
+                 TQ_SLOT( slotRedirection( TDEIO::Job *, const KURL& ) ));
         if ( m_pView && m_pView->service()->desktopEntryName() != "konq_sidebartng") {
-            connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
-                     m_pView, TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
+            connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+                     m_pView, TQ_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
 	}
     }
 }
diff --git a/konqueror/konq_run.h b/konqueror/konq_run.h
index a5539b993..d5876eed2 100644
--- a/konqueror/konq_run.h
+++ b/konqueror/konq_run.h
@@ -30,7 +30,7 @@ class KonqView;
 
 class KonqRun : public KParts::BrowserRun
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Create a KonqRun instance, associated to the main view and an
diff --git a/konqueror/konq_tabs.cpp b/konqueror/konq_tabs.cpp
index 868b8edc9..0506648ff 100644
--- a/konqueror/konq_tabs.cpp
+++ b/konqueror/konq_tabs.cpp
@@ -78,61 +78,61 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon
   m_pActiveChild = 0L;
   m_pViewManager = viewManager;
 
-  connect( this, TQT_SIGNAL( currentChanged ( TQWidget * ) ),
-           this, TQT_SLOT( slotCurrentChanged( TQWidget* ) ) );
+  connect( this, TQ_SIGNAL( currentChanged ( TQWidget * ) ),
+           this, TQ_SLOT( slotCurrentChanged( TQWidget* ) ) );
 
   m_pPopupMenu = new TQPopupMenu( this );
   m_pPopupMenu->insertItem( SmallIcon( "tab_new" ),
                             i18n("&New Tab"),
                             m_pViewManager->mainWindow(),
-                            TQT_SLOT( slotAddTab() ),
+                            TQ_SLOT( slotAddTab() ),
                             m_pViewManager->mainWindow()->action("newtab")->shortcut() );
   m_pPopupMenu->insertItem( SmallIconSet( "reload" ),
                             i18n( "&Reload Tab" ),
                             m_pViewManager->mainWindow(),
-                            TQT_SLOT( slotReloadPopup() ),
+                            TQ_SLOT( slotReloadPopup() ),
                             m_pViewManager->mainWindow()->action("reload")->shortcut(), RELOAD_ID );
   m_pPopupMenu->insertItem( SmallIconSet( "tab_duplicate" ),
                             i18n("&Duplicate Tab"),
                             m_pViewManager->mainWindow(),
-                            TQT_SLOT( slotDuplicateTabPopup() ),
+                            TQ_SLOT( slotDuplicateTabPopup() ),
                             m_pViewManager->mainWindow()->action("duplicatecurrenttab")->shortcut(),
                             DUPLICATE_ID );
   m_pPopupMenu->insertItem( SmallIconSet( "tab_breakoff" ),
                             i18n("D&etach Tab"),
                             m_pViewManager->mainWindow(),
-                            TQT_SLOT( slotBreakOffTabPopup() ),
+                            TQ_SLOT( slotBreakOffTabPopup() ),
                             m_pViewManager->mainWindow()->action("breakoffcurrenttab")->shortcut(),
                             BREAKOFF_ID );
   m_pPopupMenu->insertSeparator();
   m_pPopupMenu->insertItem( SmallIconSet( "tab_move_left" ),
                             i18n("Move Tab &Left"),
                             m_pViewManager->mainWindow(),
-                            TQT_SLOT( slotMoveTabLeft() ),
+                            TQ_SLOT( slotMoveTabLeft() ),
                             m_pViewManager->mainWindow()->action("tab_move_left")->shortcut(),
                             MOVE_LEFT_ID );
   m_pPopupMenu->insertItem( SmallIconSet( "tab_move_right" ),
                             i18n("Move Tab &Right"),
                             m_pViewManager->mainWindow(),
-                            TQT_SLOT( slotMoveTabRight() ),
+                            TQ_SLOT( slotMoveTabRight() ),
                             m_pViewManager->mainWindow()->action("tab_move_right")->shortcut(),
                             MOVE_RIGHT_ID );
   m_pPopupMenu->insertSeparator();
   m_pSubPopupMenuTab = new TQPopupMenu( this );
   m_pPopupMenu->insertItem( i18n("Other Tabs" ), m_pSubPopupMenuTab, OTHERTABS_ID );
-  connect( m_pSubPopupMenuTab, TQT_SIGNAL( activated ( int ) ),
-           this, TQT_SLOT( slotSubPopupMenuTabActivated( int ) ) );
+  connect( m_pSubPopupMenuTab, TQ_SIGNAL( activated ( int ) ),
+           this, TQ_SLOT( slotSubPopupMenuTabActivated( int ) ) );
   m_pPopupMenu->insertSeparator();
   m_pPopupMenu->insertItem( SmallIconSet( "tab_remove" ),
                             i18n("&Close Tab"),
                             m_pViewManager->mainWindow(),
-                            TQT_SLOT( slotRemoveTabPopup() ),
+                            TQ_SLOT( slotRemoveTabPopup() ),
                             m_pViewManager->mainWindow()->action("removecurrenttab")->shortcut(),
                             CLOSETAB_ID );
-  connect( this, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ),
-           TQT_SLOT(slotContextMenu( TQWidget *, const TQPoint & ) ) );
-  connect( this, TQT_SIGNAL( contextMenu( const TQPoint & ) ),
-           TQT_SLOT(slotContextMenu( const TQPoint & ) ) );
+  connect( this, TQ_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ),
+           TQ_SLOT(slotContextMenu( TQWidget *, const TQPoint & ) ) );
+  connect( this, TQ_SIGNAL( contextMenu( const TQPoint & ) ),
+           TQ_SLOT(slotContextMenu( const TQPoint & ) ) );
 
   m_MouseMiddleClickClosesTab = KonqSettings::mouseMiddleClickClosesTab();
 
@@ -146,14 +146,14 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon
   setTabCloseActivatePrevious( KonqSettings::tabCloseActivatePrevious() );
   if (KonqSettings::tabPosition()=="Bottom")
     setTabPosition(TQTabWidget::Bottom);
-  connect( this, TQT_SIGNAL( closeRequest( TQWidget * )), TQT_SLOT(slotCloseRequest( TQWidget * )));
-  connect( this, TQT_SIGNAL( removeTabPopup() ),
-           m_pViewManager->mainWindow(), TQT_SLOT( slotRemoveTabPopup() ) );
+  connect( this, TQ_SIGNAL( closeRequest( TQWidget * )), TQ_SLOT(slotCloseRequest( TQWidget * )));
+  connect( this, TQ_SIGNAL( removeTabPopup() ),
+           m_pViewManager->mainWindow(), TQ_SLOT( slotRemoveTabPopup() ) );
 
   if ( KonqSettings::addTabButton() ) {
     m_leftWidget = new TQToolButton( this );
-    connect( m_leftWidget, TQT_SIGNAL( clicked() ),
-             m_pViewManager->mainWindow(), TQT_SLOT( slotAddTab() ) );
+    connect( m_leftWidget, TQ_SIGNAL( clicked() ),
+             m_pViewManager->mainWindow(), TQ_SLOT( slotAddTab() ) );
     m_leftWidget->setIconSet( SmallIcon( "tab_new" ) );
     m_leftWidget->adjustSize();
     TQToolTip::add(m_leftWidget, i18n("Open a new tab"));
@@ -161,8 +161,8 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon
   }
   if ( KonqSettings::closeTabButton() ) {
     m_rightWidget = new TQToolButton( this );
-    connect( m_rightWidget, TQT_SIGNAL( clicked() ),
-             m_pViewManager->mainWindow(), TQT_SLOT( slotRemoveTab() ) );
+    connect( m_rightWidget, TQ_SIGNAL( clicked() ),
+             m_pViewManager->mainWindow(), TQ_SLOT( slotRemoveTab() ) );
     m_rightWidget->setIconSet( SmallIconSet( "tab_remove" ) );
     m_rightWidget->adjustSize();
     TQToolTip::add(m_rightWidget, i18n("Close the current tab"));
@@ -171,23 +171,23 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon
 
   setAutomaticResizeTabs( true );
   setTabReorderingEnabled( true );
-  connect( this, TQT_SIGNAL( movedTab( int, int ) ),
-           TQT_SLOT( slotMovedTab( int, int ) ) );
-  connect( this, TQT_SIGNAL( mouseMiddleClick() ),
-           TQT_SLOT( slotMouseMiddleClick() ) );
-  connect( this, TQT_SIGNAL( mouseMiddleClick( TQWidget * ) ),
-           TQT_SLOT( slotMouseMiddleClick( TQWidget * ) ) );
-  connect( this, TQT_SIGNAL( mouseDoubleClick() ),
-           m_pViewManager->mainWindow(), TQT_SLOT( slotAddTab() ) );
-
-  connect( this, TQT_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )),
-           TQT_SLOT( slotTestCanDecode(const TQDragMoveEvent *, bool & ) ) );
-  connect( this, TQT_SIGNAL( receivedDropEvent( TQDropEvent * )),
-           TQT_SLOT( slotReceivedDropEvent( TQDropEvent * ) ) );
-  connect( this, TQT_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )),
-           TQT_SLOT( slotReceivedDropEvent( TQWidget *, TQDropEvent * ) ) );
-  connect( this, TQT_SIGNAL( initiateDrag( TQWidget * )),
-           TQT_SLOT( slotInitiateDrag( TQWidget * ) ) );
+  connect( this, TQ_SIGNAL( movedTab( int, int ) ),
+           TQ_SLOT( slotMovedTab( int, int ) ) );
+  connect( this, TQ_SIGNAL( mouseMiddleClick() ),
+           TQ_SLOT( slotMouseMiddleClick() ) );
+  connect( this, TQ_SIGNAL( mouseMiddleClick( TQWidget * ) ),
+           TQ_SLOT( slotMouseMiddleClick( TQWidget * ) ) );
+  connect( this, TQ_SIGNAL( mouseDoubleClick() ),
+           m_pViewManager->mainWindow(), TQ_SLOT( slotAddTab() ) );
+
+  connect( this, TQ_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )),
+           TQ_SLOT( slotTestCanDecode(const TQDragMoveEvent *, bool & ) ) );
+  connect( this, TQ_SIGNAL( receivedDropEvent( TQDropEvent * )),
+           TQ_SLOT( slotReceivedDropEvent( TQDropEvent * ) ) );
+  connect( this, TQ_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )),
+           TQ_SLOT( slotReceivedDropEvent( TQWidget *, TQDropEvent * ) ) );
+  connect( this, TQ_SIGNAL( initiateDrag( TQWidget * )),
+           TQ_SLOT( slotInitiateDrag( TQWidget * ) ) );
 
   setMouseWheelScroll(KonqSettings::tabsCycleWheel());
 }
@@ -339,7 +339,7 @@ void KonqFrameTabs::removeChildFrame( KonqFrameBase * frame )
 void KonqFrameTabs::slotCurrentChanged( TQWidget* newPage )
 {
   setTabColor( newPage, TDEGlobalSettings::textColor() );
-  KonqFrameBase* currentFrame = tqt_dynamic_cast<KonqFrameBase*>(newPage);
+  KonqFrameBase* currentFrame = dynamic_cast<KonqFrameBase*>(newPage);
 
   if (currentFrame && !m_pViewManager->isLoadingProfile()) {
     m_pActiveChild = currentFrame;
@@ -367,7 +367,7 @@ void KonqFrameTabs::slotMovedTab( int from, int to )
   m_pChildFrameList->remove( fromFrame );
   m_pChildFrameList->insert( to, fromFrame );
 
-  KonqFrameBase* currentFrame = tqt_dynamic_cast<KonqFrameBase*>( currentPage() );
+  KonqFrameBase* currentFrame = dynamic_cast<KonqFrameBase*>( currentPage() );
   if ( currentFrame && !m_pViewManager->isLoadingProfile() ) {
     m_pActiveChild = currentFrame;
     currentFrame->activateChild();
@@ -451,11 +451,11 @@ void KonqFrameTabs::slotContextMenu( TQWidget *w, const TQPoint &p )
   m_pPopupMenu->setItemEnabled( OTHERTABS_ID, tabCount>1 );
   m_pSubPopupMenuTab->setItemEnabled( m_closeOtherTabsId, true );
 
-  // Yes, I know this is an unchecked tqt_dynamic_cast - I'm casting sideways in a
+  // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a
   // class hierarchy and it could crash one day, but I haven't checked
   // setWorkingTab so I don't know if it can handle nulls.
 
-  m_pViewManager->mainWindow()->setWorkingTab( tqt_dynamic_cast<KonqFrameBase*>(w) );
+  m_pViewManager->mainWindow()->setWorkingTab( dynamic_cast<KonqFrameBase*>(w) );
   m_pPopupMenu->exec( p );
 }
 
@@ -466,7 +466,7 @@ void KonqFrameTabs::refreshSubPopupMenuTab()
     m_pSubPopupMenuTab->insertItem( SmallIcon( "reload_all_tabs" ),
                                     i18n( "&Reload All Tabs" ),
                                     m_pViewManager->mainWindow(),
-                                    TQT_SLOT( slotReloadAllTabs() ),
+                                    TQ_SLOT( slotReloadAllTabs() ),
                                     m_pViewManager->mainWindow()->action("reload_all_tabs")->shortcut() );
     m_pSubPopupMenuTab->insertSeparator();
     for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next())
@@ -488,15 +488,15 @@ void KonqFrameTabs::refreshSubPopupMenuTab()
       m_pSubPopupMenuTab->insertItem( SmallIconSet( "tab_remove_other" ),
 				      i18n( "Close &Other Tabs" ),
 				      m_pViewManager->mainWindow(),
-				      TQT_SLOT( slotRemoveOtherTabsPopup() ),
+				      TQ_SLOT( slotRemoveOtherTabsPopup() ),
 				      m_pViewManager->mainWindow()->action("removeothertabs")->shortcut() );
 }
 
 void KonqFrameTabs::slotCloseRequest( TQWidget *w )
 {
   if ( m_pChildFrameList->count() > 1 ) {
-    // Yes, I know this is an unchecked tqt_dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls.
-    m_pViewManager->mainWindow()->setWorkingTab( tqt_dynamic_cast<KonqFrameBase*>(w) );
+    // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls.
+    m_pViewManager->mainWindow()->setWorkingTab( dynamic_cast<KonqFrameBase*>(w) );
     emit ( removeTabPopup() );
   }
 }
@@ -523,8 +523,8 @@ void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w )
 {
   if ( m_MouseMiddleClickClosesTab ) {
     if ( m_pChildFrameList->count() > 1 ) {
-      // Yes, I know this is an unchecked tqt_dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls.
-      m_pViewManager->mainWindow()->setWorkingTab( tqt_dynamic_cast<KonqFrameBase*>(w) );
+      // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls.
+      m_pViewManager->mainWindow()->setWorkingTab( dynamic_cast<KonqFrameBase*>(w) );
       emit ( removeTabPopup() );
     }
   }
@@ -532,7 +532,7 @@ void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w )
   TQApplication::clipboard()->setSelectionMode( TQClipboard::Selection );
   KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) );
   if ( !filteredURL.isEmpty() ) {
-    KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>(w);
+    KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w);
     if (frame) {
       m_pViewManager->mainWindow()->openURL( frame->activeChildView(), filteredURL );
     }
@@ -562,7 +562,7 @@ void KonqFrameTabs::slotReceivedDropEvent( TQWidget *w, TQDropEvent *e )
 {
   KURL::List lstDragURLs;
   bool ok = KURLDrag::decode( e, lstDragURLs );
-  KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>(w);
+  KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w);
   if ( ok && lstDragURLs.first().isValid() && frame ) {
     KURL lstDragURL = lstDragURLs.first();
     if ( lstDragURL != frame->activeChildView()->url() )
@@ -572,7 +572,7 @@ void KonqFrameTabs::slotReceivedDropEvent( TQWidget *w, TQDropEvent *e )
 
 void KonqFrameTabs::slotInitiateDrag( TQWidget *w )
 {
-  KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>( w );
+  KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>( w );
   if (frame) {
     KURL::List lst;
     lst.append( frame->activeChildView()->url() );
diff --git a/konqueror/konq_tabs.h b/konqueror/konq_tabs.h
index f21bf82a9..bfc15dbb0 100644
--- a/konqueror/konq_tabs.h
+++ b/konqueror/konq_tabs.h
@@ -43,7 +43,7 @@ class TDEAction;
 
 class KonqFrameTabs : public KTabWidget, public KonqFrameContainerBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class KonqFrame; //for emitting ctrlTabPressed() only, aleXXX
 
 public:
diff --git a/konqueror/konq_view.cpp b/konqueror/konq_view.cpp
index 3a970018b..0f809ccd1 100644
--- a/konqueror/konq_view.cpp
+++ b/konqueror/konq_view.cpp
@@ -127,7 +127,7 @@ KonqView::~KonqView()
   {
     finishedWithCurrentURL();
     if ( isPassiveMode() )
-      disconnect( m_pPart, TQT_SIGNAL( destroyed() ), m_pMainWindow->viewManager(), TQT_SLOT( slotObjectDestroyed() ) );
+      disconnect( m_pPart, TQ_SIGNAL( destroyed() ), m_pMainWindow->viewManager(), TQ_SLOT( slotObjectDestroyed() ) );
 
     delete m_pPart;
   }
@@ -372,16 +372,16 @@ bool KonqView::changeViewMode( const TQString &serviceType,
 void KonqView::connectPart(  )
 {
   //kdDebug(1202) << "KonqView::connectPart" << endl;
-  connect( m_pPart, TQT_SIGNAL( started( TDEIO::Job * ) ),
-           this, TQT_SLOT( slotStarted( TDEIO::Job * ) ) );
-  connect( m_pPart, TQT_SIGNAL( completed() ),
-           this, TQT_SLOT( slotCompleted() ) );
-  connect( m_pPart, TQT_SIGNAL( completed(bool) ),
-           this, TQT_SLOT( slotCompleted(bool) ) );
-  connect( m_pPart, TQT_SIGNAL( canceled( const TQString & ) ),
-           this, TQT_SLOT( slotCanceled( const TQString & ) ) );
-  connect( m_pPart, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
-           this, TQT_SLOT( setCaption( const TQString & ) ) );
+  connect( m_pPart, TQ_SIGNAL( started( TDEIO::Job * ) ),
+           this, TQ_SLOT( slotStarted( TDEIO::Job * ) ) );
+  connect( m_pPart, TQ_SIGNAL( completed() ),
+           this, TQ_SLOT( slotCompleted() ) );
+  connect( m_pPart, TQ_SIGNAL( completed(bool) ),
+           this, TQ_SLOT( slotCompleted(bool) ) );
+  connect( m_pPart, TQ_SIGNAL( canceled( const TQString & ) ),
+           this, TQ_SLOT( slotCanceled( const TQString & ) ) );
+  connect( m_pPart, TQ_SIGNAL( setWindowCaption( const TQString & ) ),
+           this, TQ_SLOT( setCaption( const TQString & ) ) );
 
   KParts::BrowserExtension *ext = browserExtension();
 
@@ -389,8 +389,8 @@ void KonqView::connectPart(  )
   {
       ext->setBrowserInterface( m_browserIface );
 
-      connect( ext, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs &) ),
-               m_pMainWindow, TQT_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) );
+      connect( ext, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs &) ),
+               m_pMainWindow, TQ_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) );
 
       if ( m_bPopupMenuEnabled )
       {
@@ -398,59 +398,59 @@ void KonqView::connectPart(  )
           enablePopupMenu( true );
       }
 
-      connect( ext, TQT_SIGNAL( setLocationBarURL( const TQString & ) ),
-               this, TQT_SLOT( setLocationBarURL( const TQString & ) ) );
+      connect( ext, TQ_SIGNAL( setLocationBarURL( const TQString & ) ),
+               this, TQ_SLOT( setLocationBarURL( const TQString & ) ) );
 
-      connect( ext, TQT_SIGNAL( setIconURL( const KURL & ) ),
-               this, TQT_SLOT( setIconURL( const KURL & ) ) );
+      connect( ext, TQ_SIGNAL( setIconURL( const KURL & ) ),
+               this, TQ_SLOT( setIconURL( const KURL & ) ) );
 
-      connect( ext, TQT_SIGNAL( setPageSecurity( int ) ),
-               this, TQT_SLOT( setPageSecurity( int ) ) );
+      connect( ext, TQ_SIGNAL( setPageSecurity( int ) ),
+               this, TQ_SLOT( setPageSecurity( int ) ) );
 
-      connect( ext, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ),
-               m_pMainWindow, TQT_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs & ) ) );
+      connect( ext, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ),
+               m_pMainWindow, TQ_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs & ) ) );
 
-      connect( ext, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
-               m_pMainWindow, TQT_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ) );
+      connect( ext, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
+               m_pMainWindow, TQ_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ) );
 
-      connect( ext, TQT_SIGNAL( loadingProgress( int ) ),
-               m_pKonqFrame->statusbar(), TQT_SLOT( slotLoadingProgress( int ) ) );
+      connect( ext, TQ_SIGNAL( loadingProgress( int ) ),
+               m_pKonqFrame->statusbar(), TQ_SLOT( slotLoadingProgress( int ) ) );
 
-      connect( ext, TQT_SIGNAL( speedProgress( int ) ),
-               m_pKonqFrame->statusbar(), TQT_SLOT( slotSpeedProgress( int ) ) );
+      connect( ext, TQ_SIGNAL( speedProgress( int ) ),
+               m_pKonqFrame->statusbar(), TQ_SLOT( slotSpeedProgress( int ) ) );
 
-      connect( ext, TQT_SIGNAL( selectionInfo( const KFileItemList & ) ),
-               this, TQT_SLOT( slotSelectionInfo( const KFileItemList & ) ) );
+      connect( ext, TQ_SIGNAL( selectionInfo( const KFileItemList & ) ),
+               this, TQ_SLOT( slotSelectionInfo( const KFileItemList & ) ) );
 
-      connect( ext, TQT_SIGNAL( mouseOverInfo( const KFileItem * ) ),
-               this, TQT_SLOT( slotMouseOverInfo( const KFileItem * ) ) );
+      connect( ext, TQ_SIGNAL( mouseOverInfo( const KFileItem * ) ),
+               this, TQ_SLOT( slotMouseOverInfo( const KFileItem * ) ) );
 
-      connect( ext, TQT_SIGNAL( openURLNotify() ),
-               this, TQT_SLOT( slotOpenURLNotify() ) );
+      connect( ext, TQ_SIGNAL( openURLNotify() ),
+               this, TQ_SLOT( slotOpenURLNotify() ) );
 
-      connect( ext, TQT_SIGNAL( enableAction( const char *, bool ) ),
-               this, TQT_SLOT( slotEnableAction( const char *, bool ) ) );
+      connect( ext, TQ_SIGNAL( enableAction( const char *, bool ) ),
+               this, TQ_SLOT( slotEnableAction( const char *, bool ) ) );
 
-      connect( ext, TQT_SIGNAL( setActionText( const char *, const TQString& ) ),
-               this, TQT_SLOT( slotSetActionText( const char *, const TQString& ) ) );
+      connect( ext, TQ_SIGNAL( setActionText( const char *, const TQString& ) ),
+               this, TQ_SLOT( slotSetActionText( const char *, const TQString& ) ) );
 
-      connect( ext, TQT_SIGNAL( moveTopLevelWidget( int, int ) ),
-               this, TQT_SLOT( slotMoveTopLevelWidget( int, int ) ) );
+      connect( ext, TQ_SIGNAL( moveTopLevelWidget( int, int ) ),
+               this, TQ_SLOT( slotMoveTopLevelWidget( int, int ) ) );
 
-      connect( ext, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ),
-               this, TQT_SLOT( slotResizeTopLevelWidget( int, int ) ) );
+      connect( ext, TQ_SIGNAL( resizeTopLevelWidget( int, int ) ),
+               this, TQ_SLOT( slotResizeTopLevelWidget( int, int ) ) );
 
-      connect( ext, TQT_SIGNAL( requestFocus(KParts::ReadOnlyPart *) ),
-               this, TQT_SLOT( slotRequestFocus(KParts::ReadOnlyPart *) ) );
+      connect( ext, TQ_SIGNAL( requestFocus(KParts::ReadOnlyPart *) ),
+               this, TQ_SLOT( slotRequestFocus(KParts::ReadOnlyPart *) ) );
 
       if (service()->desktopEntryName() != "konq_sidebartng") {
-          connect( ext, TQT_SIGNAL( infoMessage( const TQString & ) ),
-               m_pKonqFrame->statusbar(), TQT_SLOT( message( const TQString & ) ) );
+          connect( ext, TQ_SIGNAL( infoMessage( const TQString & ) ),
+               m_pKonqFrame->statusbar(), TQ_SLOT( message( const TQString & ) ) );
 
           connect( ext,
-                   TQT_SIGNAL( addWebSideBar(const KURL&, const TQString&) ),
+                   TQ_SIGNAL( addWebSideBar(const KURL&, const TQString&) ),
                    m_pMainWindow,
-                   TQT_SLOT( slotAddWebSideBar(const KURL&, const TQString&) ) );
+                   TQ_SLOT( slotAddWebSideBar(const KURL&, const TQString&) ) );
       }
 
       callExtensionBoolMethod( "setSaveViewPropertiesLocally(bool)", m_pMainWindow->saveViewPropertiesLocally() );
@@ -472,7 +472,7 @@ void KonqView::connectPart(  )
 
   m_pPart->widget()->installEventFilter( this );
 
-  if (m_bBackRightClick && m_pPart->widget()->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) )
+  if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") )
   {
     (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
   }
@@ -480,8 +480,8 @@ void KonqView::connectPart(  )
   // KonqDirPart signal
   if ( m_pPart->inherits("KonqDirPart") )
   {
-      connect( m_pPart, TQT_SIGNAL( findOpen( KonqDirPart * ) ),
-               m_pMainWindow, TQT_SLOT( slotFindOpen( KonqDirPart * ) ) );
+      connect( m_pPart, TQ_SIGNAL( findOpen( KonqDirPart * ) ),
+               m_pMainWindow, TQ_SLOT( slotFindOpen( KonqDirPart * ) ) );
   }
 }
 
@@ -532,9 +532,9 @@ void KonqView::slotStarted( TDEIO::Job * job )
         job->setWindow (m_pMainWindow->topLevelWidget ());
       }
 
-      connect( job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) );
-      connect( job, TQT_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( slotSpeed( TDEIO::Job *, unsigned long ) ) );
-      connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQT_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) );
+      connect( job, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQ_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) );
+      connect( job, TQ_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQ_SLOT( slotSpeed( TDEIO::Job *, unsigned long ) ) );
+      connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQ_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) );
   }
 }
 
@@ -1097,7 +1097,7 @@ bool KonqView::callExtensionBoolMethod( const char *methodName, bool value )
     return false;
   TQUObject o[ 2 ];
 
-  static_TQUType_bool.set( o + 1, value );
+  static_QUType_bool.set( o + 1, value );
 
   obj->tqt_invoke( id, o );
   return true;
@@ -1114,7 +1114,7 @@ bool KonqView::callExtensionStringMethod( const char *methodName, TQString value
     return false;
   TQUObject o[ 2 ];
 
-  static_TQUType_TQString.set( o + 1, value );
+  static_QUType_TQString.set( o + 1, value );
 
   obj->tqt_invoke( id, o );
   return true;
@@ -1131,7 +1131,7 @@ bool KonqView::callExtensionURLMethod( const char *methodName, const KURL& value
     return false;
   TQUObject o[ 2 ];
 
-  static_TQUType_ptr.set( o + 1, &value );
+  static_QUType_ptr.set( o + 1, &value );
 
   obj->tqt_invoke( id, o );
   return true;
@@ -1165,39 +1165,39 @@ void KonqView::enablePopupMenu( bool b )
   if ( b ) {
     m_bPopupMenuEnabled = true;
 
-    connect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) );
+    connect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) );
 
-    connect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+    connect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
 
-    connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
+    connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
 
-    connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) );
+    connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) );
 
-    connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+    connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
 
-    connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) );
+    connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) );
   }
   else // disable context popup
   {
     m_bPopupMenuEnabled = false;
 
-    disconnect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) );
+    disconnect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) );
 
-    disconnect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+    disconnect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
 
-    disconnect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
+    disconnect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
 
-    disconnect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+    disconnect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
   }
   enableBackRightClick( m_bBackRightClick );
 }
@@ -1207,11 +1207,11 @@ void KonqView::enableBackRightClick( bool b )
 {
     m_bBackRightClick = b;
     if ( b )
-        connect( this, TQT_SIGNAL( backRightClick() ),
-                 m_pMainWindow, TQT_SLOT( slotBack() ) );
+        connect( this, TQ_SIGNAL( backRightClick() ),
+                 m_pMainWindow, TQ_SLOT( slotBack() ) );
     else
-        disconnect( this, TQT_SIGNAL( backRightClick() ),
-                    m_pMainWindow, TQT_SLOT( slotBack() ) );
+        disconnect( this, TQ_SIGNAL( backRightClick() ),
+                    m_pMainWindow, TQ_SLOT( slotBack() ) );
 }
 
 void KonqView::reparseConfiguration()
@@ -1220,7 +1220,7 @@ void KonqView::reparseConfiguration()
     bool b = KonqSettings::backRightClick();
     if ( m_bBackRightClick != b )
     {
-        if (m_bBackRightClick && m_pPart->widget()->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) )
+        if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") )
         {
             (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
         }
@@ -1256,7 +1256,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
     if ( !m_pPart )
         return false;
 //  kdDebug() << "--" << obj->className() << "--" << e->type() << "--"  << endl;
-    if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) )
+    if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && obj == m_pPart->widget() )
     {
         TQDragEnterEvent *ev = static_cast<TQDragEnterEvent *>( e );
 
@@ -1265,19 +1265,19 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
             KURL::List lstDragURLs;
             bool ok = KURLDrag::decode( ev, lstDragURLs );
 
-            TQObjectList *children = m_pPart->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING );
+            TQObjectList *children = m_pPart->widget()->queryList( "TQWidget" );
 
             if ( ok &&
                  !lstDragURLs.first().url().contains( "javascript:", false ) && // ### this looks like a hack to me
                  ev->source() != m_pPart->widget() &&
                  children &&
-                 children->findRef( TQT_TQOBJECT(ev->source()) ) == -1 )
+                 children->findRef( ev->source() ) == -1 )
                 ev->acceptAction();
 
             delete children;
         }
     }
-    else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) )
+    else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && obj == m_pPart->widget() )
     {
         TQDropEvent *ev = static_cast<TQDropEvent *>( e );
 
@@ -1293,7 +1293,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
     {
         if ( e->type() == TQEvent::ContextMenu )
         {
-            TQContextMenuEvent *ev = TQT_TQCONTEXTMENUEVENT( e );
+            TQContextMenuEvent *ev = static_cast<TQContextMenuEvent*>( e );
             if ( ev->reason() == TQContextMenuEvent::Mouse )
             {
                 return true;
@@ -1301,16 +1301,16 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
         }
         else if ( e->type() == TQEvent::MouseButtonPress )
         {
-            TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
-            if ( ev->button() == Qt::RightButton )
+            TQMouseEvent *ev = static_cast<TQMouseEvent*>( e );
+            if ( ev->button() == TQt::RightButton )
             {
                 return true;
             }
         }
         else if ( e->type() == TQEvent::MouseButtonRelease )
         {
-            TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
-            if ( ev->button() == Qt::RightButton )
+            TQMouseEvent *ev = static_cast<TQMouseEvent*>( e );
+            if ( ev->button() == TQt::RightButton )
             {
                 emit backRightClick();
                 return true;
@@ -1318,8 +1318,8 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
         }
         else if ( e->type() == TQEvent::MouseMove )
         {
-            TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
-            if ( ev->state() == Qt::RightButton )
+            TQMouseEvent *ev = static_cast<TQMouseEvent*>( e );
+            if ( ev->state() == TQt::RightButton )
             {
                 obj->removeEventFilter( this );
                 TQMouseEvent me( TQEvent::MouseButtonPress, ev->pos(), 2, 2 );
diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h
index aa702ff29..2de9fa2c6 100644
--- a/konqueror/konq_view.h
+++ b/konqueror/konq_view.h
@@ -64,7 +64,7 @@ struct HistoryEntry
  */
 class KonqView : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   /**
diff --git a/konqueror/konq_viewmgr.cpp b/konqueror/konq_viewmgr.cpp
index 495d267e8..c7ead1d0b 100644
--- a/konqueror/konq_viewmgr.cpp
+++ b/konqueror/konq_viewmgr.cpp
@@ -55,8 +55,8 @@ KonqViewManager::KonqViewManager( KonqMainWindow *mainWindow )
   m_bLoadingProfile = false;
 
   m_activePartChangedTimer = new TQTimer(this);
-  connect(m_activePartChangedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(emitActivePartChanged()));
-  connect( this, TQT_SIGNAL( activePartChanged ( KParts::Part * ) ), this, TQT_SLOT( slotActivePartChanged ( KParts::Part * ) ) );
+  connect(m_activePartChangedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(emitActivePartChanged()));
+  connect( this, TQ_SIGNAL( activePartChanged ( KParts::Part * ) ), this, TQ_SLOT( slotActivePartChanged ( KParts::Part * ) ) );
 }
 
 KonqView* KonqViewManager::Initialize( const TQString &serviceType, const TQString &serviceName )
@@ -90,7 +90,7 @@ KonqViewManager::~KonqViewManager()
   clear();
 }
 
-KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
+KonqView* KonqViewManager::splitView ( TQt::Orientation orientation,
                                        const TQString &serviceType,
                                        const TQString &serviceName,
                                        bool newOneFirst, bool forceAutoEmbed )
@@ -139,7 +139,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
 
   //kdDebug(1202) << "Create new Container" << endl;
   KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, parentContainer->widget(), parentContainer );
-  connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
+  connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed()));
 
   parentContainer->insertChildFrame( newContainer, index );
   if ( moveNewContainer ) {
@@ -200,7 +200,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
   return newView;
 }
 
-KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
+KonqView* KonqViewManager::splitWindow( TQt::Orientation orientation,
                                         const TQString &serviceType,
                                         const TQString &serviceName,
                                         bool newOneFirst )
@@ -231,7 +231,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
   m_pMainWindow->removeChildFrame( mainFrame );
 
   KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, m_pMainWindow, 0L);
-  connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
+  connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed()));
 
   m_pMainWindow->insertChildFrame( newContainer );
 
@@ -286,7 +286,7 @@ void KonqViewManager::convertDocContainer()
 
   KonqFrameTabs* newContainer = new KonqFrameTabs( parentContainer->widget() , parentContainer, this);
   parentContainer->insertChildFrame( newContainer );
-  connect( newContainer, TQT_SIGNAL(ctrlTabPressed()), m_pMainWindow, TQT_SLOT(slotCtrlTabPressed()) );
+  connect( newContainer, TQ_SIGNAL(ctrlTabPressed()), m_pMainWindow, TQ_SLOT(slotCtrlTabPressed()) );
 
   m_pDocContainer->widget()->reparent( newContainer, pos );
   newContainer->insertChildFrame( m_pDocContainer );
@@ -408,7 +408,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag
 
   KonqFrameBase* currentFrame;
   if ( tab == 0L )
-    currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
+    currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
   else
     currentFrame = tab;
 
@@ -449,7 +449,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag
   else
   tabContainer->setCurrentPage( tabContainer->count() - 1 );
 
-  KonqFrameBase* duplicatedFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
+  KonqFrameBase* duplicatedFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
   if (duplicatedFrame)
     duplicatedFrame->copyHistory( currentFrame );
 
@@ -478,7 +478,7 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab )
 
   KonqFrameBase* currentFrame;
   if ( tab == 0L )
-    currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
+    currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
   else
     currentFrame = tab;
 
@@ -506,7 +506,7 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab )
   if( newDocContainer && newDocContainer->frameType() == "Tabs")
   {
     KonqFrameTabs *kft = static_cast<KonqFrameTabs *>(newDocContainer);
-    KonqFrameBase *newFrame = tqt_dynamic_cast<KonqFrameBase*>(kft->currentPage());
+    KonqFrameBase *newFrame = dynamic_cast<KonqFrameBase*>(kft->currentPage());
     if(newFrame)
       newFrame->copyHistory( currentFrame );
   }
@@ -551,7 +551,7 @@ void KonqViewManager::removeTab( KonqFrameBase* tab )
   if ( tab != 0L ) {
     currentFrame = tab;
   } else {
-    currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
+    currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
     if (!currentFrame) {
       return;
     }
@@ -620,7 +620,7 @@ void KonqViewManager::removeOtherTabs( KonqFrameBase* tab )
   KonqFrameBase *currentFrame;
 
   if ( tab == 0L )
-    currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
+    currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
   else
     currentFrame = tab;
 
@@ -882,7 +882,7 @@ void KonqViewManager::slotPassiveModePartDeleted()
   // Passive mode parts aren't registered to the part manager,
   // so we have to handle suicidal ones ourselves
   KParts::ReadOnlyPart * part = const_cast<KParts::ReadOnlyPart *>( static_cast<const KParts::ReadOnlyPart *>( sender() ) );
-  disconnect( part, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) );
+  disconnect( part, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotPassiveModePartDeleted() ) );
   kdDebug(1202) << "KonqViewManager::slotPassiveModePartDeleted part=" << part << endl;
   KonqView * view = m_pMainWindow->childView( part );
   kdDebug(1202) << "view=" << view << endl;
@@ -1038,8 +1038,8 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
                               m_pMainWindow, service, partServiceOffers, appServiceOffers, sType, passiveMode );
   //kdDebug(1202) << "KonqView created - v=" << v << " v->part()=" << v->part() << endl;
 
-  TQObject::connect( v, TQT_SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ),
-                    m_pMainWindow, TQT_SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) );
+  TQObject::connect( v, TQ_SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ),
+                    m_pMainWindow, TQ_SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) );
 
   m_pMainWindow->insertChildView( v );
 
@@ -1063,7 +1063,7 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
   else
   {
     // Passive views aren't registered, but we still want to detect the suicidal ones
-    connect( v->part(), TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) );
+    connect( v->part(), TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotPassiveModePartDeleted() ) );
   }
 
   //kdDebug(1202) << "KonqViewManager::setupView done" << endl;
@@ -1574,14 +1574,14 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
     //load container config
     TQString ostr = cfg.readEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ) );
     //kdDebug(1202) << "Orientation: " << ostr << endl;
-    Qt::Orientation o;
+    TQt::Orientation o;
     if( ostr == "Vertical" )
-      o = Qt::Vertical;
+      o = TQt::Vertical;
     else if( ostr == "Horizontal" )
-      o = Qt::Horizontal;
+      o = TQt::Horizontal;
     else {
         kdWarning() << "Profile Loading Error: No orientation specified in " << name << endl;
-      o = Qt::Horizontal;
+      o = TQt::Horizontal;
     }
 
     TQValueList<int> sizes =
@@ -1599,7 +1599,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
     else
     {
       KonqFrameContainer *newContainer = new KonqFrameContainer( o, parent->widget(), parent );
-      connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
+      connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed()));
 
       int tabindex = -1;
       if(openAfterCurrentPage && parent->frameType() == "Tabs") // Need to honor it, if possible
@@ -1628,7 +1628,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
     //kdDebug(1202) << "KonqViewManager::loadItem: Item is a Tabs" << endl;
 
     KonqFrameTabs *newContainer = new KonqFrameTabs( parent->widget(), parent, this );
-    connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
+    connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed()));
 
     parent->insertChildFrame( newContainer );
     m_pDocContainer = newContainer;
@@ -1641,7 +1641,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
         loadItem( cfg, newContainer, *it, defaultURL, openURL );
         TQWidget* currentPage = newContainer->currentPage();
         if (currentPage != 0L) {
-          KonqView* activeChildView = tqt_dynamic_cast<KonqFrameBase*>(currentPage)->activeChildView();
+          KonqView* activeChildView = dynamic_cast<KonqFrameBase*>(currentPage)->activeChildView();
           if (activeChildView != 0L) {
             activeChildView->setCaption( activeChildView->caption() );
             activeChildView->setTabIcon( activeChildView->url() );
@@ -1649,7 +1649,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
         }
     }
 
-    newContainer->setActiveChild( tqt_dynamic_cast<KonqFrameBase*>(newContainer->page(index)) );
+    newContainer->setActiveChild( dynamic_cast<KonqFrameBase*>(newContainer->page(index)) );
     newContainer->setCurrentPage( index );
 
     newContainer->show();
@@ -1666,10 +1666,10 @@ void KonqViewManager::setProfiles( TDEActionMenu *profiles )
 
   if ( m_pamProfiles )
   {
-    connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( activated( int ) ),
-             this, TQT_SLOT( slotProfileActivated( int ) ) );
-    connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-             this, TQT_SLOT( slotProfileListAboutToShow() ) );
+    connect( m_pamProfiles->popupMenu(), TQ_SIGNAL( activated( int ) ),
+             this, TQ_SLOT( slotProfileActivated( int ) ) );
+    connect( m_pamProfiles->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+             this, TQ_SLOT( slotProfileListAboutToShow() ) );
   }
   //KonqMainWindow::enableAllActions will call it anyway
   //profileListDirty();
diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h
index 25e55c5cf..829decc86 100644
--- a/konqueror/konq_viewmgr.h
+++ b/konqueror/konq_viewmgr.h
@@ -51,7 +51,7 @@ namespace KParts
 
 class KonqViewManager : public KParts::PartManager
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KonqViewManager( KonqMainWindow *mainWindow );
   ~KonqViewManager();
@@ -68,7 +68,7 @@ public:
    *
    * @param newOneFirst if true, move the new view as the first one (left or top)
    */
-  KonqView* splitView( Qt::Orientation orientation,
+  KonqView* splitView( TQt::Orientation orientation,
                        const TQString & serviceType = TQString::null,
                        const TQString & serviceName = TQString::null,
                        bool newOneFirst = false, bool forceAutoEmbed = false );
@@ -80,7 +80,7 @@ public:
    *
    * @param newOneFirst if true, move the new view as the first one (left or top)
    */
-  KonqView* splitWindow( Qt::Orientation orientation,
+  KonqView* splitWindow( TQt::Orientation orientation,
                          const TQString & serviceType = TQString::null,
                          const TQString & serviceName = TQString::null,
                          bool newOneFirst = false);
diff --git a/konqueror/konqueror.kcfg b/konqueror/konqueror.kcfg
index 4049e8791..041fe4a46 100644
--- a/konqueror/konqueror.kcfg
+++ b/konqueror/konqueror.kcfg
@@ -45,6 +45,12 @@
       <whatsthis>Checking this option will allow files to be renamed by clicking directly on the icon name.</whatsthis>
       <!-- checked -->
     </entry>
+    <entry key="DoubleClickMoveToParent" type="Bool">
+      <default>true</default>
+      <label>Double click on empty area to move to parent folder</label>
+      <whatsthis>When this option is enabled, double clicking an empty area will navigate to the parent folder.</whatsthis>
+      <!-- checked -->
+    </entry>
     <entry key="ShowDeleteCommand" type="Bool">
       <default>true</default> 
       <label>Show 'Delete' menu entries which bypass the trashcan</label>
diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp
index 49d206664..94322e267 100644
--- a/konqueror/kttsplugin/tdehtmlkttsd.cpp
+++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp
@@ -42,7 +42,7 @@ TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, cons
     {
         (void) new TDEAction( i18n("&Speak Text"),
             "kttsd", 0,
-            this, TQT_SLOT(slotReadOut()),
+            this, TQ_SLOT(slotReadOut()),
             actionCollection(), "tools_kttsd" );
     }
     else
diff --git a/konqueror/kttsplugin/tdehtmlkttsd.h b/konqueror/kttsplugin/tdehtmlkttsd.h
index f9e606c16..4c8815fbd 100644
--- a/konqueror/kttsplugin/tdehtmlkttsd.h
+++ b/konqueror/kttsplugin/tdehtmlkttsd.h
@@ -27,7 +27,7 @@ class TDEInstance;
  */
 class TDEHTMLPluginKTTSD : public KParts::Plugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     /**
diff --git a/konqueror/listview/konq_detailedlistview.rc b/konqueror/listview/konq_detailedlistview.rc
index 79059c6d4..06c9bc318 100644
--- a/konqueror/listview/konq_detailedlistview.rc
+++ b/konqueror/listview/konq_detailedlistview.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KonqDetailedListView" version="12">
+<kpartgui name="KonqDetailedListView" version="13">
 <MenuBar>
  <Menu name="edit"><text>&amp;Edit</text>
    <Menu name="selection"><text>Selection</text>
@@ -24,12 +24,14 @@
   </Menu>
   <Separator/>
   <Action name="show_dot"/>
-  <Menu name="sort"><text>Sort</text>
+  <Menu name="sort"><text>&amp;Sort</text>
+    <Action name="order_unicode_based"/>
+    <Action name="order_unicode_based_case_insensitive"/>
+    <Action name="order_locale_based"/>
+    <Separator/>
     <Action name="group_directories_first"/>
     <Action name="group_hidden_first"/>
     <Separator/>
-    <Action name="sort_caseinsensitive"/>
-    <Separator/>
     <Action name="alternate_sort_order"/>
     <Action name="reverse_sort_order"/>
   </Menu>
diff --git a/konqueror/listview/konq_infolistview.rc b/konqueror/listview/konq_infolistview.rc
index 451eb5785..60f511b1f 100644
--- a/konqueror/listview/konq_infolistview.rc
+++ b/konqueror/listview/konq_infolistview.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KonqInfoListView" version="13">
+<kpartgui name="KonqInfoListView" version="14">
 <MenuBar>
  <Menu name="edit"><text>&amp;Edit</text>
    <Menu name="selection"><text>Selection</text>
@@ -24,12 +24,14 @@
   </Menu>
   <Separator/>
   <Action name="show_dot"/>
-  <Menu name="sort"><text>Sort</text>
+  <Menu name="sort"><text>&amp;Sort</text>
+    <Action name="order_unicode_based"/>
+    <Action name="order_unicode_based_case_insensitive"/>
+    <Action name="order_locale_based"/>
+    <Separator/>
     <Action name="group_directories_first"/>
     <Action name="group_hidden_first"/>
     <Separator/>
-    <Action name="sort_caseinsensitive"/>
-    <Separator/>
     <Action name="alternate_sort_order"/>
     <Action name="reverse_sort_order"/>
   </Menu>
diff --git a/konqueror/listview/konq_infolistviewitem.cpp b/konqueror/listview/konq_infolistviewitem.cpp
index 18efb3f8f..f945333b8 100644
--- a/konqueror/listview/konq_infolistviewitem.cpp
+++ b/konqueror/listview/konq_infolistviewitem.cpp
@@ -218,7 +218,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup &
     cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() );
 
     TDEListView *lv = static_cast< TDEListView* >( listView() );
-    const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap());
+    const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap();
     if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() )
     {
         int newWidth = width( lv->fontMetrics(), lv, _column );
diff --git a/konqueror/listview/konq_infolistviewwidget.cpp b/konqueror/listview/konq_infolistviewwidget.cpp
index e835f1cb3..8ec62c79a 100644
--- a/konqueror/listview/konq_infolistviewwidget.cpp
+++ b/konqueror/listview/konq_infolistviewwidget.cpp
@@ -37,8 +37,8 @@ KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent,
 {
     m_metaInfoJob = 0;
 
-    m_mtSelector = new TDESelectAction(i18n("View &As"), 0, TQT_TQOBJECT(this),
-                                     TQT_SLOT(slotSelectMimeType()),
+    m_mtSelector = new TDESelectAction(i18n("View &As"), 0, this,
+                                     TQ_SLOT(slotSelectMimeType()),
                                      parent->actionCollection(), "view_as" );
 
     kdDebug(1203) << "created info list view\n";
@@ -237,10 +237,10 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list)
     else
     {
         m_metaInfoJob = TDEIO::fileMetaInfo(list);
-        connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)),
-             this, TQT_SLOT( slotMetaInfo( const KFileItem*)));
-        connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)),
-             this, TQT_SLOT( slotMetaInfoResult()));
+        connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)),
+             this, TQ_SLOT( slotMetaInfo( const KFileItem*)));
+        connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)),
+             this, TQ_SLOT( slotMetaInfoResult()));
     }
 }
 
@@ -257,10 +257,10 @@ void KonqInfoListViewWidget::slotRefreshItems( const KFileItemList& list)
     else
     {
         m_metaInfoJob = TDEIO::fileMetaInfo(list);
-        connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)),
-             this, TQT_SLOT( slotMetaInfo( const KFileItem*)));
-        connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)),
-             this, TQT_SLOT( slotMetaInfoResult()));
+        connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)),
+             this, TQ_SLOT( slotMetaInfo( const KFileItem*)));
+        connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)),
+             this, TQ_SLOT( slotMetaInfoResult()));
     }
     KonqBaseListViewWidget::slotRefreshItems(list);
 }
@@ -313,10 +313,10 @@ void KonqInfoListViewWidget::slotMetaInfoResult()
     else
     {
         m_metaInfoJob = TDEIO::fileMetaInfo(m_metaInfoTodo);
-        connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)),
-             this, TQT_SLOT( slotMetaInfo( const KFileItem*)));
-        connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)),
-             this, TQT_SLOT( slotMetaInfoResult()));
+        connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)),
+             this, TQ_SLOT( slotMetaInfo( const KFileItem*)));
+        connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)),
+             this, TQ_SLOT( slotMetaInfoResult()));
         m_metaInfoTodo.clear();
     }
 }
diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h
index 258a20090..07cede196 100644
--- a/konqueror/listview/konq_infolistviewwidget.h
+++ b/konqueror/listview/konq_infolistviewwidget.h
@@ -35,7 +35,7 @@ class TDESelectAction;
 class KonqInfoListViewWidget : public KonqBaseListViewWidget
 {
 //   friend class KonqTextViewItem;
-   Q_OBJECT
+   TQ_OBJECT
    public:
       KonqInfoListViewWidget( KonqListView *parent, TQWidget *parentWidget );
       ~KonqInfoListViewWidget();
diff --git a/konqueror/listview/konq_listview.cpp b/konqueror/listview/konq_listview.cpp
index f8307e84c..6a0d58973 100644
--- a/konqueror/listview/konq_listview.cpp
+++ b/konqueror/listview/konq_listview.cpp
@@ -48,6 +48,8 @@
 #include <unistd.h>
 #include <kinstance.h>
 
+#include <konq_sort_constants.h>
+
 KonqListViewFactory::KonqListViewFactory()
 {
   s_instance = 0;
@@ -287,20 +289,20 @@ KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char
    // Note: File Type is in fact the mimetype comment. We use UDS_FILE_TYPE but that's not what we show in fact :/
    m_pListView->confColumns[10].setData(I18N_NOOP("File Type"),"Type",TDEIO::UDS_FILE_TYPE,m_paShowType);
 
-   connect( m_pListView, TQT_SIGNAL( selectionChanged() ),
-            m_extension, TQT_SLOT( updateActions() ) );
-   connect( m_pListView, TQT_SIGNAL( selectionChanged() ),
-            this, TQT_SLOT( slotSelectionChanged() ) );
+   connect( m_pListView, TQ_SIGNAL( selectionChanged() ),
+            m_extension, TQ_SLOT( updateActions() ) );
+   connect( m_pListView, TQ_SIGNAL( selectionChanged() ),
+            this, TQ_SLOT( slotSelectionChanged() ) );
 
-   connect( m_pListView, TQT_SIGNAL( currentChanged(TQListViewItem*) ),
-            m_extension, TQT_SLOT( updateActions() ) );
-   connect(m_pListView->header(),TQT_SIGNAL(indexChange(int,int,int)),this,TQT_SLOT(headerDragged(int,int,int)));
-   connect(m_pListView->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(slotHeaderClicked(int)));
-   connect(m_pListView->header(),TQT_SIGNAL(sizeChange(int,int,int)),TQT_SLOT(slotHeaderSizeChanged()));
+   connect( m_pListView, TQ_SIGNAL( currentChanged(TQListViewItem*) ),
+            m_extension, TQ_SLOT( updateActions() ) );
+   connect(m_pListView->header(),TQ_SIGNAL(indexChange(int,int,int)),this,TQ_SLOT(headerDragged(int,int,int)));
+   connect(m_pListView->header(),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(slotHeaderClicked(int)));
+   connect(m_pListView->header(),TQ_SIGNAL(sizeChange(int,int,int)),TQ_SLOT(slotHeaderSizeChanged()));
 
    // signals from konqdirpart (for BC reasons)
-   connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) );
-   connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) );
+   connect( this, TQ_SIGNAL( findOpened( KonqDirPart * ) ), TQ_SLOT( slotKFindOpened() ) );
+   connect( this, TQ_SIGNAL( findClosed( KonqDirPart * ) ), TQ_SLOT( slotKFindClosed() ) );
 
    loadPlugins( this, this, instance() );
 }
@@ -787,7 +789,7 @@ void KonqListView::headerDragged(int sec, int from, int to)
    kdDebug(1202)<<"section: "<<sec<<" fromIndex: "<<from<<" toIndex "<<to<<endl;
    //at this point the columns aren't moved yet, so I let the listview
    //rearrange the stuff and use a single shot timer
-   TQTimer::singleShot(200,this,TQT_SLOT(slotSaveAfterHeaderDrag()));
+   TQTimer::singleShot(200,this,TQ_SLOT(slotSaveAfterHeaderDrag()));
 }
 
 const KFileItem * KonqListView::currentItem()
@@ -861,7 +863,7 @@ void KonqListView::slotHeaderSizeChanged()
    if ( !m_headerTimer )
    {
       m_headerTimer = new TQTimer( this );
-      connect( m_headerTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSaveColumnWidths() ) );
+      connect( m_headerTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotSaveColumnWidths() ) );
    }
    else
       m_headerTimer->stop();
@@ -883,33 +885,33 @@ void KonqListView::slotKFindClosed()
 
 void KonqListView::setupActions()
 {
-   m_paShowTime=new TDEToggleAction(i18n("Show &Modification Time"), 0,this, TQT_SLOT(slotColumnToggled()), actionCollection(), "show_time" );
+   m_paShowTime=new TDEToggleAction(i18n("Show &Modification Time"), 0,this, TQ_SLOT(slotColumnToggled()), actionCollection(), "show_time" );
    m_paShowTime->setCheckedState(i18n("Hide &Modification Time"));
-   m_paShowType=new TDEToggleAction(i18n("Show &File Type"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_type" );
+   m_paShowType=new TDEToggleAction(i18n("Show &File Type"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_type" );
    m_paShowType->setCheckedState(i18n("Hide &File Type"));
-   m_paShowMimeType=new TDEToggleAction(i18n("Show MimeType"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" );
+   m_paShowMimeType=new TDEToggleAction(i18n("Show MimeType"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" );
    m_paShowMimeType->setCheckedState(i18n("Hide MimeType"));
-   m_paShowAccessTime=new TDEToggleAction(i18n("Show &Access Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" );
+   m_paShowAccessTime=new TDEToggleAction(i18n("Show &Access Time"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" );
    m_paShowAccessTime->setCheckedState(i18n("Hide &Access Time"));
-   m_paShowCreateTime=new TDEToggleAction(i18n("Show &Creation Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" );
+   m_paShowCreateTime=new TDEToggleAction(i18n("Show &Creation Time"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" );
    m_paShowCreateTime->setCheckedState(i18n("Hide &Creation Time"));
-   m_paShowLinkDest=new TDEToggleAction(i18n("Show &Link Destination"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" );
+   m_paShowLinkDest=new TDEToggleAction(i18n("Show &Link Destination"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" );
    m_paShowLinkDest->setCheckedState(i18n("Hide &Link Destination"));
-   m_paShowSize=new TDEToggleAction(i18n("Show Filesize"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_size" );
+   m_paShowSize=new TDEToggleAction(i18n("Show Filesize"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_size" );
    m_paShowSize->setCheckedState(i18n("Hide Filesize"));
-   m_paShowOwner=new TDEToggleAction(i18n("Show Owner"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_owner" );
+   m_paShowOwner=new TDEToggleAction(i18n("Show Owner"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_owner" );
    m_paShowOwner->setCheckedState(i18n("Hide Owner"));
-   m_paShowGroup=new TDEToggleAction(i18n("Show Group"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_group" );
+   m_paShowGroup=new TDEToggleAction(i18n("Show Group"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_group" );
    m_paShowGroup->setCheckedState(i18n("Hide Group"));
-   m_paShowPermissions=new TDEToggleAction(i18n("Show Permissions"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" );
+   m_paShowPermissions=new TDEToggleAction(i18n("Show Permissions"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" );
    m_paShowPermissions->setCheckedState(i18n("Hide Permissions"));
-   m_paShowURL=new TDEToggleAction(i18n("Show URL"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_url" );
+   m_paShowURL=new TDEToggleAction(i18n("Show URL"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_url" );
 
-   m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" );
-  m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" );
-  m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" );
-  m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" );
-  m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" );
+   m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQ_SLOT( slotSelect() ), actionCollection(), "select" );
+  m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQ_SLOT( slotUnselect() ), actionCollection(), "unselect" );
+  m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectall" );
+  m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQ_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" );
+  m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQ_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" );
 
   // These 2 actions are 'fake' actions. They are defined so that the keyboard shortcuts
   // can be set from the 'Configure Shortcuts..." dialog.
@@ -927,21 +929,52 @@ void KonqListView::setupActions()
   m_paRenameMovePrev->setToolTip( i18n("Complete rename operation and move the previous item"));
   m_paRenameMovePrev->setEnabled(false);
 
-  m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" );
+  m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQ_SLOT( slotShowDot() ), actionCollection(), "show_dot" );
 //  m_paShowDot->setCheckedState(i18n("Hide &Hidden Files"));
-  m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" );
+
+  m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQ_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" );
 
   m_paSortAlternate = new TDEAction( i18n( "&Alternate Sort Order" ), CTRL+Key_S, this,
-     TQT_SLOT( slotSortAlternate() ), actionCollection(), "alternate_sort_order");
+    TQ_SLOT( slotSortAlternate() ), actionCollection(), "alternate_sort_order");
+  m_paSortAlternate->setToolTip( i18n( "Sort by PREVIOUS sort column" ) );
   m_paSortReverse = new TDEAction( i18n( "&Reverse Sort Order" ), CTRL+Key_R, this,
-    TQT_SLOT( slotSortReverse() ), actionCollection(), "reverse_sort_order");
-
-  m_paDisplayDirectoriesFirst = new TDEToggleAction( i18n("Group &Directories First"), 0, this,
-    TQT_SLOT(slotToggleDisplayDirectoriesFirst()), actionCollection(), "group_directories_first");
-  m_paDisplayDirectoriesFirst->setChecked(m_pProps->isHiddenFirst());
-
-  m_paDisplayHiddenFirst = new TDEToggleAction( i18n("Group &Hidden First"), 0, this,
-    TQT_SLOT(slotToggleDisplayHiddenFirst()), actionCollection(), "group_hidden_first");
+    TQ_SLOT( slotSortReverse() ), actionCollection(), "reverse_sort_order");
+  m_paSortReverse->setToolTip( i18n( "Reverse sort order of current sort column" ) );
+
+  /*
+     Build View->Sort submenu interface to properties
+     SortOrder, SortDirsFirst & SortHiddenFirst
+  */
+  TextSortOrder initialOrder = m_pProps->getSortOrder();
+
+  m_paOrderUnicodeUnmodified = new TDEToggleAction( i18n( "&Unicode based" ), ALT+Key_1, this,
+    TQ_SLOT( slotOrderUnicodeUnmodified() ), actionCollection(), "order_unicode_based" );
+  m_paOrderUnicodeUnmodified->setToolTip( i18n( "Strict numeric Unicode based order" ) );
+  m_paOrderUnicodeUnmodified->setChecked( initialOrder == UNICODE_UNMODIFIED );
+
+  m_paOrderUnicodeCaseInsensitive = new TDEToggleAction( i18n( "Unicode based, &case insensitive" ), ALT+Key_2, this,
+    TQ_SLOT( slotOrderUnicodeCaseInsensitive() ), actionCollection(), "order_unicode_based_case_insensitive" );
+  m_paOrderUnicodeCaseInsensitive->setToolTip( i18n( "Unicode based order but with lower/upper case ASCII letters adjacent" ) );
+  m_paOrderUnicodeCaseInsensitive->setChecked(initialOrder == UNICODE_CASEINSENSITIVE);
+
+  m_paOrderLocale = new TDEToggleAction( i18n( "&Locale based" ), ALT+Key_3, this,
+    TQ_SLOT( slotOrderLocale() ), actionCollection(), "order_locale_based" );
+  m_paOrderLocale->setToolTip( i18n( "Locale based order, usually \"friendly\"" ) );
+  m_paOrderLocale->setChecked(initialOrder == LOCALE_UNMODIFIED);
+
+  // Convert above 3 checkbox menu items into single 3-way radio button menu item
+  m_paOrderUnicodeUnmodified->setExclusiveGroup( "sortOrder" );
+  m_paOrderUnicodeCaseInsensitive->setExclusiveGroup( "sortOrder" );
+  m_paOrderLocale->setExclusiveGroup( "sortOrder" );
+
+  m_paDisplayDirectoriesFirst = new TDEToggleAction( i18n("Group &Directories First"), CTRL+SHIFT+Key_F, this,
+    TQ_SLOT(slotToggleDisplayDirectoriesFirst()), actionCollection(), "group_directories_first");
+  m_paDisplayDirectoriesFirst->setToolTip( i18n( "Always display directories before non-directories" ) );
+  m_paDisplayDirectoriesFirst->setChecked(m_pProps->isDirsFirst());
+
+  m_paDisplayHiddenFirst = new TDEToggleAction( i18n("Group &Hidden First"), CTRL+SHIFT+Key_H, this,
+    TQ_SLOT(slotToggleDisplayHiddenFirst()), actionCollection(), "group_hidden_first");
+  m_paDisplayHiddenFirst->setToolTip( i18n( "Always display hidden files before non-hidden files" ) );
   m_paDisplayHiddenFirst->setChecked(m_pProps->isHiddenFirst());
 
   newIconSize( TDEIcon::SizeSmall /* default size */ );
@@ -955,6 +988,32 @@ void KonqListView::slotSelectionChanged()
 //  m_paInvertSelection->setEnabled( itemSelected );
 }
 
-#include "konq_listview.moc"
+void KonqListView::slotOrderUnicodeUnmodified()
+{
+  TextSortOrder sortOrder = UNICODE_UNMODIFIED ;
+  kdDebug(1202) << "Setting name order = " << sortOrder << endl;
+  m_pProps->setSortOrder( sortOrder );
+  m_pListView->m_sortOrder = sortOrder;
+  m_pListView->sort();
+}
 
+void KonqListView::slotOrderUnicodeCaseInsensitive()
+{
+  TextSortOrder sortOrder = UNICODE_CASEINSENSITIVE;
+  kdDebug(1202) << "Setting name order = " << sortOrder << endl;
+  m_pProps->setSortOrder( sortOrder );
+  m_pListView->m_sortOrder = sortOrder;
+  m_pListView->sort();
+}
+
+void KonqListView::slotOrderLocale()
+{
+  TextSortOrder sortOrder = LOCALE_UNMODIFIED;
+  kdDebug(1202) << "Setting name order = " << sortOrder << endl;
+  m_pProps->setSortOrder( sortOrder );
+  m_pListView->m_sortOrder = sortOrder;
+  m_pListView->sort();
+}
+
+#include "konq_listview.moc"
 
diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h
index 666ae7743..bcd2ec0a1 100644
--- a/konqueror/listview/konq_listview.h
+++ b/konqueror/listview/konq_listview.h
@@ -64,7 +64,7 @@ class KonqListView : public KonqDirPart
   friend class KonqBaseListViewWidget;
   friend class ListViewBrowserExtension;
 
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( bool supportsUndo READ supportsUndo )
 
 public:
@@ -130,8 +130,12 @@ protected slots:
   void slotSaveColumnWidths();  // delayed
   void slotHeaderClicked(int sec);
 
+  void slotOrderUnicodeUnmodified();
+  void slotOrderUnicodeCaseInsensitive();
+  void slotOrderLocale();
   void slotToggleDisplayDirectoriesFirst();
   void slotToggleDisplayHiddenFirst();
+
   void slotSortAlternate();
   void slotSortReverse();
 
@@ -197,13 +201,17 @@ private:
   TDEToggleAction *m_paShowPermissions;
   TDEToggleAction *m_paShowURL;
 
+  TDEToggleAction *m_paOrderUnicodeUnmodified;
+  TDEToggleAction *m_paOrderUnicodeCaseInsensitive;
+  TDEToggleAction *m_paOrderLocale;
+
   TDEToggleAction *m_paDisplayDirectoriesFirst;
   TDEToggleAction *m_paDisplayHiddenFirst;
 };
 
 class ListViewBrowserExtension : public KonqDirPartBrowserExtension
 {
-   Q_OBJECT
+   TQ_OBJECT
    friend class KonqListView;
    friend class KonqBaseListViewWidget;
    public:
diff --git a/konqueror/listview/konq_listviewitems.cpp b/konqueror/listview/konq_listviewitems.cpp
index cf4322ef0..3910095f9 100644
--- a/konqueror/listview/konq_listviewitems.cpp
+++ b/konqueror/listview/konq_listviewitems.cpp
@@ -19,6 +19,7 @@
 
 #include "konq_listview.h"
 #include <konq_settings.h>
+#include "konq_string_compare.h"
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <assert.h>
@@ -160,7 +161,7 @@ void KonqListViewItem::updateContents()
              const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra );
              if ( tmpColumn->type == TQVariant::DateTime )
              {
-                 TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr, Qt::ISODate ));
+                 TQDateTime dt = TQDateTime::fromString( entryStr, TQt::ISODate );
                  setText(tmpColumn->displayInColumn,
                          TDEGlobal::locale()->formatDateTime(dt));
              }
@@ -291,9 +292,9 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending
             {
                 if ( cInfo->type & TQVariant::DateTime ) {
                     const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra );
-                    TQDateTime dt1 = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr1, Qt::ISODate ));
+                    TQDateTime dt1 = TQDateTime::fromString( entryStr1, TQt::ISODate );
                     const TQString entryStr2 = retrieveExtraEntry( k->m_fileitem, numExtra );
-                    TQDateTime dt2 = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr2, Qt::ISODate ));
+                    TQDateTime dt2 = TQDateTime::fromString( entryStr2, TQt::ISODate );
                     return ( dt1 > dt2 ) ? 1 : ( dt1 < dt2 ) ? -1 : 0;
                 }
             }
@@ -303,11 +304,10 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending
          break;
       }
    }
-   if ( m_pListViewWidget->caseInsensitiveSort() )
-       return text( col ).lower().localeAwareCompare( k->text( col ).lower() );
-   else {
-       return m_pListViewWidget->m_pSettings->caseSensitiveCompare( text( col ), k->text( col ) );
-   }
+
+   /* If we reach here, we are comparing text columns (e.g file name). */
+
+   return stringCompare( m_pListViewWidget->m_sortOrder, text( col ), k->text( col ) );
 }
 
 void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
@@ -322,7 +322,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
     cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() );
 
     TDEListView *lv = static_cast< TDEListView* >( listView() );
-    const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap());
+    const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap();
     if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() )
     {
         int newWidth = width( lv->fontMetrics(), lv, _column );
diff --git a/konqueror/listview/konq_listviewwidget.cpp b/konqueror/listview/konq_listviewwidget.cpp
index 4c89f529d..a41cf6367 100644
--- a/konqueror/listview/konq_listviewwidget.cpp
+++ b/konqueror/listview/konq_listviewwidget.cpp
@@ -100,6 +100,7 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *
    ,m_bAscending(true)
    ,m_itemFound(false)
    ,m_restored(false)
+   ,m_sortOrder(0)
    ,m_filenameColumn(0)
    ,m_itemToGoTo("")
    ,m_backgroundTimer(0)
@@ -120,61 +121,61 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *
 
    initConfig();
 #if 0
-   connect( this, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),
-            this, TQT_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int)));
+   connect( this, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),
+            this, TQ_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int)));
 #endif
-   connect( this, TQT_SIGNAL(returnPressed( TQListViewItem * )),
-            this, TQT_SLOT(slotReturnPressed( TQListViewItem * )) );
-   connect( this, TQT_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )),
-            this, TQT_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) );
-   connect( this, TQT_SIGNAL(executed( TQListViewItem * )),
-            this, TQT_SLOT(slotExecuted( TQListViewItem * )) );
-   connect( this, TQT_SIGNAL(currentChanged( TQListViewItem * )),
-            this, TQT_SLOT(slotCurrentChanged( TQListViewItem * )) );
-   connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )),
-            this, TQT_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) );
-   connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )),
-            this, TQT_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) );
-   connect( this, TQT_SIGNAL(renameNext( TQListViewItem *, int )),
-            this, TQT_SLOT(slotRenameNextItem( TQListViewItem*, int)) );
-   connect( this, TQT_SIGNAL(renamePrev( TQListViewItem *, int )),
-            this, TQT_SLOT(slotRenamePrevItem( TQListViewItem*, int)) );
-   connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) );
-
-   connect( horizontalScrollBar(), TQT_SIGNAL(valueChanged( int )),
-            this, TQT_SIGNAL(viewportAdjusted()) );
-   connect( verticalScrollBar(), TQT_SIGNAL(valueChanged( int )),
-            this, TQT_SIGNAL(viewportAdjusted()) );
+   connect( this, TQ_SIGNAL(returnPressed( TQListViewItem * )),
+            this, TQ_SLOT(slotReturnPressed( TQListViewItem * )) );
+   connect( this, TQ_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )),
+            this, TQ_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) );
+   connect( this, TQ_SIGNAL(executed( TQListViewItem * )),
+            this, TQ_SLOT(slotExecuted( TQListViewItem * )) );
+   connect( this, TQ_SIGNAL(currentChanged( TQListViewItem * )),
+            this, TQ_SLOT(slotCurrentChanged( TQListViewItem * )) );
+   connect( this, TQ_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )),
+            this, TQ_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) );
+   connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )),
+            this, TQ_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) );
+   connect( this, TQ_SIGNAL(renameNext( TQListViewItem *, int )),
+            this, TQ_SLOT(slotRenameNextItem( TQListViewItem*, int)) );
+   connect( this, TQ_SIGNAL(renamePrev( TQListViewItem *, int )),
+            this, TQ_SLOT(slotRenamePrevItem( TQListViewItem*, int)) );
+   connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) );
+
+   connect( horizontalScrollBar(), TQ_SIGNAL(valueChanged( int )),
+            this, TQ_SIGNAL(viewportAdjusted()) );
+   connect( verticalScrollBar(), TQ_SIGNAL(valueChanged( int )),
+            this, TQ_SIGNAL(viewportAdjusted()) );
 
    // Connect the directory lister
-   connect( m_dirLister, TQT_SIGNAL(started( const KURL & )),
-            this, TQT_SLOT(slotStarted()) );
-   connect( m_dirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()) );
-   connect( m_dirLister, TQT_SIGNAL(canceled()), this, TQT_SLOT(slotCanceled()) );
-   connect( m_dirLister, TQT_SIGNAL(clear()), this, TQT_SLOT(slotClear()) );
-   connect( m_dirLister, TQT_SIGNAL(newItems( const KFileItemList & ) ),
-            this, TQT_SLOT(slotNewItems( const KFileItemList & )) );
-   connect( m_dirLister, TQT_SIGNAL(deleteItem( KFileItem * )),
-            this, TQT_SLOT(slotDeleteItem( KFileItem * )) );
-   connect( m_dirLister, TQT_SIGNAL(refreshItems( const KFileItemList & )),
-            this, TQT_SLOT( slotRefreshItems( const KFileItemList & )) );
-   connect( m_dirLister, TQT_SIGNAL(redirection( const KURL & )),
-            this, TQT_SLOT(slotRedirection( const KURL & )) );
-   connect( m_dirLister, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )),
-            m_pBrowserView, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )) );
-
-   connect( m_dirLister, TQT_SIGNAL(infoMessage( const TQString& )),
-            m_pBrowserView->extension(), TQT_SIGNAL(infoMessage( const TQString& )) );
-   connect( m_dirLister, TQT_SIGNAL(percent( int )),
-            m_pBrowserView->extension(), TQT_SIGNAL(loadingProgress( int )) );
-   connect( m_dirLister, TQT_SIGNAL(speed( int )),
-            m_pBrowserView->extension(), TQT_SIGNAL(speedProgress( int )) );
-
-   connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), TQT_SLOT(slotUpdateBackground()) );
+   connect( m_dirLister, TQ_SIGNAL(started( const KURL & )),
+            this, TQ_SLOT(slotStarted()) );
+   connect( m_dirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted()) );
+   connect( m_dirLister, TQ_SIGNAL(canceled()), this, TQ_SLOT(slotCanceled()) );
+   connect( m_dirLister, TQ_SIGNAL(clear()), this, TQ_SLOT(slotClear()) );
+   connect( m_dirLister, TQ_SIGNAL(newItems( const KFileItemList & ) ),
+            this, TQ_SLOT(slotNewItems( const KFileItemList & )) );
+   connect( m_dirLister, TQ_SIGNAL(deleteItem( KFileItem * )),
+            this, TQ_SLOT(slotDeleteItem( KFileItem * )) );
+   connect( m_dirLister, TQ_SIGNAL(refreshItems( const KFileItemList & )),
+            this, TQ_SLOT( slotRefreshItems( const KFileItemList & )) );
+   connect( m_dirLister, TQ_SIGNAL(redirection( const KURL & )),
+            this, TQ_SLOT(slotRedirection( const KURL & )) );
+   connect( m_dirLister, TQ_SIGNAL(itemsFilteredByMime( const KFileItemList & )),
+            m_pBrowserView, TQ_SIGNAL(itemsFilteredByMime( const KFileItemList & )) );
+
+   connect( m_dirLister, TQ_SIGNAL(infoMessage( const TQString& )),
+            m_pBrowserView->extension(), TQ_SIGNAL(infoMessage( const TQString& )) );
+   connect( m_dirLister, TQ_SIGNAL(percent( int )),
+            m_pBrowserView->extension(), TQ_SIGNAL(loadingProgress( int )) );
+   connect( m_dirLister, TQ_SIGNAL(speed( int )),
+            m_pBrowserView->extension(), TQ_SIGNAL(speedProgress( int )) );
+
+   connect( header(), TQ_SIGNAL(sizeChange( int, int, int )), TQ_SLOT(slotUpdateBackground()) );
 
    viewport()->setMouseTracking( true );
-   viewport()->setFocusPolicy( TQ_WheelFocus );
-   setFocusPolicy( TQ_WheelFocus );
+   viewport()->setFocusPolicy( TQWidget::WheelFocus );
+   setFocusPolicy( TQWidget::WheelFocus );
    setAcceptDrops( true );
 
    //looks better with the statusbar
@@ -236,9 +237,9 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
          lstColumns << column;
       const TQString type = (*extraFieldsIt).type; // ## TODO use when sorting
       TQVariant::Type t = TQVariant::Invalid;
-      if ( type.lower() == TQString(TQSTRING_OBJECT_NAME_STRING).lower() )
+      if ( type.lower() == TQString("TQString").lower() )
           t = TQVariant::String;
-      else if ( type.lower() == TQString(TQDATETIME_OBJECT_NAME_STRING).lower() )
+      else if ( type.lower() == TQString("TQDateTime").lower() )
           t = TQVariant::DateTime;
       else
           kdWarning() << "Unsupported ExtraType '" << type << "'" << endl;
@@ -425,13 +426,13 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) {
 		TDEListView::contentsMousePressEvent( e );
 	}
 	else {
-		if ( e->button() == Qt::LeftButton ) {
+		if ( e->button() == TQt::LeftButton ) {
 			m_rubber = new TQRect( e->x(), e->y(), 0, 0 );
 			clearSelection();
 			emit selectionChanged();
 			m_fileTip->setItem( 0 );
 		}
-		if ( e->button() != Qt::RightButton ) {
+		if ( e->button() != TQt::RightButton ) {
 			TQListView::contentsMousePressEvent( e );
 		}
 	}
@@ -452,7 +453,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) {
 	}
 
 	if ( m_scrollTimer ) {
-		disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ) );
+		disconnect( m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() ) );
 		m_scrollTimer->stop();
 		delete m_scrollTimer;
 		m_scrollTimer = 0;
@@ -524,33 +525,37 @@ void KonqBaseListViewWidget::contentsWheelEvent( TQWheelEvent *e )
 
 void KonqBaseListViewWidget::contentsMouseDoubleClickEvent(TQMouseEvent *e)
 {
-	if (m_rubber) {
-		TQRect r(m_rubber->normalize());
-		delete m_rubber;
-		m_rubber = NULL;
-		repaintContents(r, false);
-	}
-		
-	TQPoint vp = contentsToViewport(e->pos());
-	KonqBaseListViewItem* item = isExecuteArea(vp) ?
-		static_cast<KonqBaseListViewItem*>(itemAt(vp)) : NULL;
+  if (m_rubber)
+  {
+    TQRect r(m_rubber->normalize());
+    delete m_rubber;
+    m_rubber = NULL;
+    repaintContents(r, false);
+  }
+
+  TQPoint vp = contentsToViewport(e->pos());
+  KonqBaseListViewItem* item = isExecuteArea(vp) ?
+    static_cast<KonqBaseListViewItem*>(itemAt(vp)) : NULL;
 
-	if (item)	{
+  if (item)
+  {
     TDEListView::contentsMouseDoubleClickEvent(e);
-	}
-	else {
+  }
+  else if (m_pSettings->doubleClickMoveToParent())
+  {
     KParts::URLArgs args;
     args.trustedSource = true;
-	  KURL baseURL(m_dirLister->url().internalReferenceURL());
-	  if (baseURL.isEmpty())
-	  {
-	    baseURL = m_dirLister->url();
-	  }
-	  KURL upURL = baseURL.upURL();
-	  if (!upURL.isEmpty()) {
-	    m_pBrowserView->extension()->openURLRequest(upURL, args);
-	  }
-	}
+    KURL baseURL(m_dirLister->url().internalReferenceURL());
+    if (baseURL.isEmpty())
+    {
+      baseURL = m_dirLister->url();
+    }
+    KURL upURL = baseURL.upURL();
+    if (!upURL.isEmpty())
+    {
+      m_pBrowserView->extension()->openURLRequest(upURL, args);
+    }
+  }
 }
 
 void KonqBaseListViewWidget::leaveEvent( TQEvent *e )
@@ -580,7 +585,7 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p )
 
    TQPoint pt( m_rubber->x(), m_rubber->y() );
    pt = contentsToViewport( pt );
-   style().tqdrawPrimitive( TQStyle::PE_RubberBand, p,
+   style().drawPrimitive( TQStyle::PE_RubberBand, p,
                           TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ),
                           colorGroup(), TQStyle::Style_Default, colorGroup().base() );
 }
@@ -757,15 +762,15 @@ void KonqBaseListViewWidget::slotAutoScroll()
       {
          m_scrollTimer = new TQTimer( this );
 
-         connect( m_scrollTimer, TQT_SIGNAL( timeout() ),
-                  this, TQT_SLOT( slotAutoScroll() ) );
+         connect( m_scrollTimer, TQ_SIGNAL( timeout() ),
+                  this, TQ_SLOT( slotAutoScroll() ) );
          m_scrollTimer->start( 100, false );
       }
    }
    else if ( m_scrollTimer )
    {
-      disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ),
-                  this, TQT_SLOT( slotAutoScroll() ) );
+      disconnect( m_scrollTimer, TQ_SIGNAL( timeout() ),
+                  this, TQ_SLOT( slotAutoScroll() ) );
       m_scrollTimer->stop();
       delete m_scrollTimer;
       m_scrollTimer = 0;
@@ -967,7 +972,7 @@ void KonqBaseListViewWidget::slotSelectionChanged()
 void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button,
       TQListViewItem *_item, const TQPoint& pos, int )
 {
-   if ( _button == Qt::MidButton )
+   if ( _button == TQt::MidButton )
    {
       if ( _item && isExecuteArea( viewport()->mapFromGlobal(pos) ) )
          m_pBrowserView->mmbClicked( static_cast<KonqBaseListViewItem *>(_item)->item() );
@@ -1211,11 +1216,7 @@ bool KonqBaseListViewWidget::openURL( const KURL &url )
    {
       m_pBrowserView->newIconSize( m_pBrowserView->m_pProps->iconSize() );
       m_pBrowserView->m_paShowDot->setChecked( m_pBrowserView->m_pProps->isShowingDotFiles() );
-      if ( m_pBrowserView->m_paCaseInsensitive->isChecked() != m_pBrowserView->m_pProps->isCaseInsensitiveSort() ) {
-          m_pBrowserView->m_paCaseInsensitive->setChecked( m_pBrowserView->m_pProps->isCaseInsensitiveSort() );
-          // This is in case openURL returned all items synchronously.
-          sort();
-      }
+      m_sortOrder = m_pBrowserView->m_pProps->getSortOrder();
 
       // It has to be "viewport()" - this is what KonqDirPart's slots act upon,
       // and otherwise we get a color/pixmap in the square between the scrollbars.
@@ -1489,7 +1490,7 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in
 
 void KonqBaseListViewWidget::paintEmptyArea( TQPainter *p, const TQRect &r )
 {
-   const TQPixmap *pm = TQT_TQPIXMAP_CONST(viewport()->paletteBackgroundPixmap());
+   const TQPixmap *pm = viewport()->paletteBackgroundPixmap();
 
    if (!pm || pm->isNull())
       p->fillRect(r, viewport()->backgroundColor());
@@ -1562,7 +1563,7 @@ void KonqBaseListViewWidget::slotUpdateBackground()
       if ( !m_backgroundTimer )
       {
          m_backgroundTimer = new TQTimer( this );
-         connect( m_backgroundTimer, TQT_SIGNAL( timeout() ), viewport(), TQT_SLOT( update() ) );
+         connect( m_backgroundTimer, TQ_SIGNAL( timeout() ), viewport(), TQ_SLOT( update() ) );
       }
       else
          m_backgroundTimer->stop();
@@ -1571,11 +1572,6 @@ void KonqBaseListViewWidget::slotUpdateBackground()
    }
 }
 
-bool KonqBaseListViewWidget::caseInsensitiveSort() const
-{
-    return m_pBrowserView->m_pProps->isCaseInsensitiveSort();
-}
-
 // based on isExecuteArea from tdelistview.cpp
 int KonqBaseListViewWidget::executeArea( TQListViewItem *_item )
 {
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index 613f012b3..ebae4c389 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -79,7 +79,7 @@ class KonqBaseListViewWidget : public TDEListView
    friend class KonqListView;
    friend class ListViewBrowserExtension;
 
-   Q_OBJECT
+   TQ_OBJECT
    
 public:
    KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget );
@@ -137,7 +137,6 @@ public:
 
    void setAscending( bool b ) { m_bAscending = b; }
    bool ascending() const { return m_bAscending; }
-   bool caseInsensitiveSort() const;
 
    virtual void paintEmptyArea( TQPainter *p, const TQRect &r );
 
@@ -260,6 +259,8 @@ protected:
    bool m_itemFound:1;
    bool m_restored:1;
 
+   TextSortOrder m_sortOrder;
+
    int m_filenameColumn;
    int m_filenameColumnWidth;
 
diff --git a/konqueror/listview/konq_textview.rc b/konqueror/listview/konq_textview.rc
index 20b20f451..e29a0293b 100644
--- a/konqueror/listview/konq_textview.rc
+++ b/konqueror/listview/konq_textview.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KonqTextView" version="6">
+<kpartgui name="KonqTextView" version="7">
 <MenuBar>
  <Menu name="edit"><text>&amp;Edit</text>
     <Menu name="selection"><text>Selection</text>
@@ -13,12 +13,14 @@
 </Menu>
  <Menu name="view"><text>&amp;View</text>
   <Action name="show_dot" />
-  <Menu name="sort"><text>Sort</text>
+  <Menu name="sort"><text>&amp;Sort</text>
+    <Action name="order_unicode_based"/>
+    <Action name="order_unicode_based_case_insensitive"/>
+    <Action name="order_locale_based"/>
+    <Separator/>
     <Action name="group_directories_first"/>
     <Action name="group_hidden_first"/>
     <Separator/>
-    <Action name="sort_caseinsensitive"/>
-    <Separator/>
     <Action name="alternate_sort_order"/>
     <Action name="reverse_sort_order"/>
   </Menu>
diff --git a/konqueror/listview/konq_textviewitem.cpp b/konqueror/listview/konq_textviewitem.cpp
index 1076e10af..625e10f79 100644
--- a/konqueror/listview/konq_textviewitem.cpp
+++ b/konqueror/listview/konq_textviewitem.cpp
@@ -210,7 +210,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
    cg.setColor(TQColorGroup::Text, static_cast<KonqTextViewWidget *>(listView())->colors[type]);
    // Don't do that! Keep things readable whatever the selection background color is
 //   cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]);
-//   cg.setColor(TQColorGroup::Highlight, Qt::darkGray);
+//   cg.setColor(TQColorGroup::Highlight, TQt::darkGray);
 
    TDEListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
 }
@@ -223,7 +223,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
    TQPixmap pix( _r.width(), _r.height() );
    bitBlt( &pix, 0, 0, _p->device(), _r.left(), _r.top(), _r.width(), _r.height() );
    TQImage im = pix.convertToImage();
-   im = KImageEffect::fade( im, 0.25, Qt::black );
+   im = KImageEffect::fade( im, 0.25, TQt::black );
    _p->drawImage( _r.topLeft(), im );
 }*/
 
diff --git a/konqueror/listview/konq_textviewwidget.cpp b/konqueror/listview/konq_textviewwidget.cpp
index ab227899a..d814d2fbc 100644
--- a/konqueror/listview/konq_textviewwidget.cpp
+++ b/konqueror/listview/konq_textviewwidget.cpp
@@ -43,17 +43,17 @@ KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWi
    setAllColumnsShowFocus(TRUE);
    setRootIsDecorated(false);
 
-   colors[KTVI_REGULAR]=Qt::black;
+   colors[KTVI_REGULAR]=TQt::black;
    colors[KTVI_EXEC]=TQColor(0,170,0);
-   colors[KTVI_REGULARLINK]=Qt::black;
-   colors[KTVI_DIR]=Qt::black;
-   colors[KTVI_DIRLINK]=Qt::black;
-   colors[KTVI_BADLINK]=Qt::red;
-   colors[KTVI_SOCKET]=Qt::magenta;
-   colors[KTVI_FIFO]=Qt::magenta;
-   colors[KTVI_UNKNOWN]=Qt::red;
-   colors[KTVI_CHARDEV]=Qt::blue;
-   colors[KTVI_BLOCKDEV]=Qt::blue;
+   colors[KTVI_REGULARLINK]=TQt::black;
+   colors[KTVI_DIR]=TQt::black;
+   colors[KTVI_DIRLINK]=TQt::black;
+   colors[KTVI_BADLINK]=TQt::red;
+   colors[KTVI_SOCKET]=TQt::magenta;
+   colors[KTVI_FIFO]=TQt::magenta;
+   colors[KTVI_UNKNOWN]=TQt::red;
+   colors[KTVI_CHARDEV]=TQt::blue;
+   colors[KTVI_BLOCKDEV]=TQt::blue;
 
    m_showIcons=FALSE;
 }
diff --git a/konqueror/listview/konq_textviewwidget.h b/konqueror/listview/konq_textviewwidget.h
index 06a5cbbb5..d42014ba1 100644
--- a/konqueror/listview/konq_textviewwidget.h
+++ b/konqueror/listview/konq_textviewwidget.h
@@ -32,7 +32,7 @@ class KonqTextViewItem;
 class KonqTextViewWidget : public KonqBaseListViewWidget
 {
    friend class KonqTextViewItem;
-   Q_OBJECT
+   TQ_OBJECT
    public:
       KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget );
       ~KonqTextViewWidget();
diff --git a/konqueror/listview/konq_treeview.rc b/konqueror/listview/konq_treeview.rc
index 711f267be..9ef045785 100644
--- a/konqueror/listview/konq_treeview.rc
+++ b/konqueror/listview/konq_treeview.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KonqTreeView" version="11">
+<kpartgui name="KonqTreeView" version="12">
 <MenuBar>
  <Menu name="edit"><text>&amp;Edit</text>
    <Menu name="selection"><text>Selection</text>
@@ -24,12 +24,14 @@
   </Menu>
   <Separator/>
   <Action name="show_dot"/>
-  <Menu name="sort"><text>Sort</text>
+  <Menu name="sort"><text>&amp;Sort</text>
+    <Action name="order_unicode_based"/>
+    <Action name="order_unicode_based_case_insensitive"/>
+    <Action name="order_locale_based"/>
+    <Separator/>
     <Action name="group_directories_first"/>
     <Action name="group_hidden_first"/>
     <Separator/>
-    <Action name="sort_caseinsensitive"/>
-    <Separator/>
     <Action name="alternate_sort_order"/>
     <Action name="reverse_sort_order"/>
   </Menu>
diff --git a/konqueror/listview/konq_treeviewwidget.cpp b/konqueror/listview/konq_treeviewwidget.cpp
index 77adc4b61..02c297c88 100644
--- a/konqueror/listview/konq_treeviewwidget.cpp
+++ b/konqueror/listview/konq_treeviewwidget.cpp
@@ -35,12 +35,12 @@ KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWi
    setRootIsDecorated( true );
    setTreeStepSize( 20 );
 
-   connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ),
-            this, TQT_SLOT( slotCompleted( const KURL & ) ) );
-   connect( m_dirLister, TQT_SIGNAL( clear( const KURL & ) ),
-            this, TQT_SLOT( slotClear( const KURL & ) ) );
-   connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ),
-            this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) );
+   connect( m_dirLister, TQ_SIGNAL( completed( const KURL & ) ),
+            this, TQ_SLOT( slotCompleted( const KURL & ) ) );
+   connect( m_dirLister, TQ_SIGNAL( clear( const KURL & ) ),
+            this, TQ_SLOT( slotClear( const KURL & ) ) );
+   connect( m_dirLister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ),
+            this, TQ_SLOT( slotRedirection( const KURL &, const KURL & ) ) );
 }
 
 KonqTreeViewWidget::~KonqTreeViewWidget()
diff --git a/konqueror/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h
index 01b85ddf6..0f16240db 100644
--- a/konqueror/listview/konq_treeviewwidget.h
+++ b/konqueror/listview/konq_treeviewwidget.h
@@ -32,7 +32,7 @@ class KonqTreeViewWidget : public KonqBaseListViewWidget
 {
    friend class KonqListViewDir;
 
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget );
    virtual ~KonqTreeViewWidget();
diff --git a/konqueror/preloader/preloader.cpp b/konqueror/preloader/preloader.cpp
index 5d87a8b07..ecc6691da 100644
--- a/konqueror/preloader/preloader.cpp
+++ b/konqueror/preloader/preloader.cpp
@@ -30,10 +30,10 @@ KonqyPreloader::KonqyPreloader( const TQCString& obj )
     : KDEDModule( obj )
     {
     reconfigure();
-    connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& )),
-        TQT_SLOT( appRemoved( const TQCString& )));
-    connect( &check_always_preloaded_timer, TQT_SIGNAL( timeout()),
-	TQT_SLOT( checkAlwaysPreloaded()));
+    connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& )),
+        TQ_SLOT( appRemoved( const TQCString& )));
+    connect( &check_always_preloaded_timer, TQ_SIGNAL( timeout()),
+	TQ_SLOT( checkAlwaysPreloaded()));
     }
 
 KonqyPreloader::~KonqyPreloader()
diff --git a/konqueror/preloader/preloader.h b/konqueror/preloader/preloader.h
index c2767522b..220c0d15f 100644
--- a/konqueror/preloader/preloader.h
+++ b/konqueror/preloader/preloader.h
@@ -26,7 +26,7 @@
 class KonqyPreloader
     : public KDEDModule
     {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
     public:
         KonqyPreloader( const TQCString& obj );
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index 8889861b3..c44aaa342 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -50,16 +50,16 @@ KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent,
 {
   m_menu = new TDEActionMenu(i18n("Select Remote Charset"), "charset",
 			   actionCollection(), "changeremoteencoding");
-  connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()),
-	  this, TQT_SLOT(slotAboutToShow()));
+  connect(m_menu->popupMenu(), TQ_SIGNAL(aboutToShow()),
+	  this, TQ_SLOT(slotAboutToShow()));
   m_menu->setEnabled(false);
   m_menu->setDelayed(false);
 
-  m_part = tqt_dynamic_cast<KonqDirPart*>(parent);
+  m_part = dynamic_cast<KonqDirPart*>(parent);
   if (m_part)
     // if parent is not a KonqDirPart, our menu will never show
-    TQObject::connect(m_part, TQT_SIGNAL(aboutToOpenURL()),
-		     this, TQT_SLOT(slotAboutToOpenURL()));
+    TQObject::connect(m_part, TQ_SIGNAL(aboutToOpenURL()),
+		     this, TQ_SLOT(slotAboutToOpenURL()));
 }
 
 KRemoteEncodingPlugin::~KRemoteEncodingPlugin()
@@ -117,11 +117,11 @@ KRemoteEncodingPlugin::fillMenu()
   TQStringList::ConstIterator it;
   int count = 0;
   for (it = m_encodingDescriptions.begin(); it != m_encodingDescriptions.end(); ++it)
-    menu->insertItem(*it, this, TQT_SLOT(slotItemSelected(int)), 0, ++count);
+    menu->insertItem(*it, this, TQ_SLOT(slotItemSelected(int)), 0, ++count);
   menu->insertSeparator();
 
-  menu->insertItem(i18n("Reload"), this, TQT_SLOT(slotReload()), 0, ++count);
-  menu->insertItem(i18n("Default"), this, TQT_SLOT(slotDefault()), 0, ++count);
+  menu->insertItem(i18n("Reload"), this, TQ_SLOT(slotReload()), 0, ++count);
+  menu->insertItem(i18n("Default"), this, TQ_SLOT(slotDefault()), 0, ++count);
   m_idDefault = count;
 }
 
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.h b/konqueror/remoteencodingplugin/kremoteencodingplugin.h
index d5469cd47..b153c7990 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h
@@ -32,7 +32,7 @@ class KonqDirPart;
 
 class KRemoteEncodingPlugin: public KParts::Plugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KRemoteEncodingPlugin(TQObject * parent, const char *name,
 			const TQStringList &);
diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp
index b4ea0cb5d..80c854fcf 100644
--- a/konqueror/shellcmdplugin/kshellcmddialog.cpp
+++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp
@@ -54,9 +54,9 @@ KShellCommandDialog::KShellCommandDialog(const TQString& title, const TQString&
 
    m_shell->setFocus();
 
-   connect(cancelButton, TQT_SIGNAL(clicked()), m_shell, TQT_SLOT(slotFinished()));
-   connect(m_shell, TQT_SIGNAL(finished()), this, TQT_SLOT(disableStopButton()));
-   connect(closeButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()));
+   connect(cancelButton, TQ_SIGNAL(clicked()), m_shell, TQ_SLOT(slotFinished()));
+   connect(m_shell, TQ_SIGNAL(finished()), this, TQ_SLOT(disableStopButton()));
+   connect(closeButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose()));
 }
 
 KShellCommandDialog::~KShellCommandDialog()
diff --git a/konqueror/shellcmdplugin/kshellcmddialog.h b/konqueror/shellcmdplugin/kshellcmddialog.h
index de6d57fee..814d61857 100644
--- a/konqueror/shellcmdplugin/kshellcmddialog.h
+++ b/konqueror/shellcmdplugin/kshellcmddialog.h
@@ -29,7 +29,7 @@ class KShellCommandExecutor;
 
 class KShellCommandDialog:public KDialog
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       KShellCommandDialog(const TQString& title, const TQString& command, TQWidget* parent=0, bool modal=false);
       virtual ~KShellCommandDialog();
diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
index e5e8dabe4..d4d6f45f9 100644
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
@@ -84,11 +84,11 @@ int KShellCommandExecutor::exec()
       return 0;
    }
 
-   m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, TQT_TQOBJECT(this));
-   m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, TQT_TQOBJECT(this));
+   m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, this);
+   m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, this);
    m_writeNotifier->setEnabled(false);
-   connect (m_readNotifier, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this),TQT_SLOT(readDataFromShell()));
-   connect (m_writeNotifier, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this),TQT_SLOT(writeDataToShell()));
+   connect (m_readNotifier, TQ_SIGNAL(activated(int)), this,TQ_SLOT(readDataFromShell()));
+   connect (m_writeNotifier, TQ_SIGNAL(activated(int)), this,TQ_SLOT(writeDataToShell()));
 
    return 1;
 }
diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.h b/konqueror/shellcmdplugin/kshellcmdexecutor.h
index 616cdbc13..7e2e4b47d 100644
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.h
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.h
@@ -28,7 +28,7 @@ class TQSocketNotifier;
 
 class KShellCommandExecutor:public TQTextView
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       KShellCommandExecutor(const TQString& command, TQWidget* parent=0);
       virtual ~KShellCommandExecutor();
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
index 99e04fce8..1b426da2a 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
@@ -34,12 +34,12 @@ KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name,
        return;
 
     new TDEAction( i18n( "&Execute Shell Command..." ), "system-run", CTRL+Key_E, this,
-                 TQT_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" );
+                 TQ_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" );
 }
 
 void KShellCmdPlugin::slotExecuteShellCommand()
 {
-   KonqDirPart * part = tqt_dynamic_cast<KonqDirPart *>(parent());
+   KonqDirPart * part = dynamic_cast<KonqDirPart *>(parent());
    if ( !part )
    {
       KMessageBox::sorry(0L, "KShellCmdPlugin::slotExecuteShellCommand: Program error, please report a bug.");
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.h b/konqueror/shellcmdplugin/kshellcmdplugin.h
index 16874adc0..df11b7918 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.h
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.h
@@ -24,7 +24,7 @@
 
 class KShellCmdPlugin : public KParts::Plugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KShellCmdPlugin( TQObject* parent, const char* name, const TQStringList & );
     ~KShellCmdPlugin() {}
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index bfff3c8e7..437c7bda9 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -32,13 +32,13 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
 	// this should be your custom internal widget
 	m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() );
 	m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" );
-	connect(m_widget,TQT_SIGNAL(started(TDEIO::Job *)),
-		this, TQT_SIGNAL(started(TDEIO::Job*)));
-	connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
-	connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)),
-		m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&)));
-        TDEAcceleratorManager::setNoAccel(TQT_TQWIDGET(m_widget));
-	setWidget(TQT_TQWIDGET(m_widget));
+	connect(m_widget,TQ_SIGNAL(started(TDEIO::Job *)),
+		this, TQ_SIGNAL(started(TDEIO::Job*)));
+	connect(m_widget,TQ_SIGNAL(completed()),this,TQ_SIGNAL(completed()));
+	connect(m_extension, TQ_SIGNAL(addWebSideBar(const KURL&, const TQString&)),
+		m_widget, TQ_SLOT(addWebSideBar(const KURL&, const TQString&)));
+        TDEAcceleratorManager::setNoAccel(m_widget);
+	setWidget(m_widget);
 }
 
 TDEInstance *KonqSidebar::getInstance()
diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h
index dfdd2e2e0..0e7fbdef5 100644
--- a/konqueror/sidebar/konqsidebar.h
+++ b/konqueror/sidebar/konqsidebar.h
@@ -36,7 +36,7 @@ class KonqSidebarFactory;
 
 class KonqSidebarBrowserExtension : public KParts::BrowserExtension
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 	public:
 	KonqSidebarBrowserExtension(KonqSidebar *part_,Sidebar_Widget *widget_,const char *name):
@@ -73,7 +73,7 @@ class KonqSidebarBrowserExtension : public KParts::BrowserExtension
  */
 class KonqSidebar : public KParts::ReadOnlyPart, public KonqSidebarIface
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
@@ -111,7 +111,7 @@ class TDEAboutData;
 
 class KonqSidebarFactory : public KParts::Factory
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     KonqSidebarFactory();
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index 7540ef398..367e7324d 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -32,7 +32,7 @@ class KonqSidebarPluginPrivate;
 
 class KDE_EXPORT KonqSidebarPlugin : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		KonqSidebarPlugin(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent,TQString &desktopName_, const char* name=0);
 		~KonqSidebarPlugin();
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 8eefa7c34..5fd3f6d7e 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -60,8 +60,8 @@ addBackEnd::addBackEnd(TQWidget *parent, class TQPopupMenu *addmenu,
 	m_universal=universal;
 	m_currentProfile = currentProfile;
 	menu = addmenu;
-	connect(menu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(aboutToShowAddMenu()));
-	connect(menu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activatedAddMenu(int)));
+	connect(menu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(aboutToShowAddMenu()));
+	connect(menu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(activatedAddMenu(int)));
 }
 
 void addBackEnd::aboutToShowAddMenu()
@@ -268,7 +268,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
 	if (splitterWidget) {
 		splitterWidget->setResizeMode(parent, TQSplitter::FollowSizeHint);
 		splitterWidget->setOpaqueResize( false );
-		connect(splitterWidget,TQT_SIGNAL(setRubberbandCalled()),TQT_SLOT(userMovedSplitter()));
+		connect(splitterWidget,TQ_SIGNAL(setRubberbandCalled()),TQ_SLOT(userMovedSplitter()));
 	}
 		
 	m_area = new KDockArea(this);
@@ -292,22 +292,22 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
 	if (!m_universalMode) {
 		m_menu->insertItem(SmallIconSet("remove"),
                                    i18n("Close Navigation Panel"),
-				par, TQT_SLOT(deleteLater()));
+				par, TQ_SLOT(deleteLater()));
 	}
-        connect(m_menu, TQT_SIGNAL(aboutToShow()),
-		this, TQT_SLOT(aboutToShowConfigMenu()));
-	connect(m_menu, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(activatedMenu(int)));
+        connect(m_menu, TQ_SIGNAL(aboutToShow()),
+		this, TQ_SLOT(aboutToShowConfigMenu()));
+	connect(m_menu, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(activatedMenu(int)));
 
 	m_buttonPopup = 0;
 	addBackEnd *ab = new addBackEnd(this, addMenu, universalMode,
                                         currentProfile,
                                         "Sidebar_Widget-addBackEnd");
 
-	connect(ab, TQT_SIGNAL(updateNeeded()),
-		this, TQT_SLOT(updateButtons()));
-	connect(ab, TQT_SIGNAL(initialCopyNeeded()),
-		this, TQT_SLOT(finishRollBack()));
+	connect(ab, TQ_SIGNAL(updateNeeded()),
+		this, TQ_SLOT(updateButtons()));
+	connect(ab, TQ_SIGNAL(initialCopyNeeded()),
+		this, TQ_SLOT(finishRollBack()));
 
 	initialCopy();
 
@@ -327,13 +327,13 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
         m_menu->setItemVisible(2, !m_immutableShowTabsLeft);
         m_menu->setItemVisible(3, !m_immutableShowExtraButtons);
 
-	connect(&m_configTimer, TQT_SIGNAL(timeout()),
-		this, TQT_SLOT(saveConfig()));
+	connect(&m_configTimer, TQ_SIGNAL(timeout()),
+		this, TQ_SLOT(saveConfig()));
 	m_somethingVisible = !m_openViews.isEmpty();
 	doLayout();
-	TQTimer::singleShot(0,this,TQT_SLOT(createButtons()));
-	connect(m_area, TQT_SIGNAL(dockWidgetHasUndocked(KDockWidget*)),
-		this, TQT_SLOT(dockWidgetHasUndocked(KDockWidget*)));
+	TQTimer::singleShot(0,this,TQ_SLOT(createButtons()));
+	connect(m_area, TQ_SIGNAL(dockWidgetHasUndocked(KDockWidget*)),
+		this, TQ_SLOT(dockWidgetHasUndocked(KDockWidget*)));
 }
 
 void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
@@ -373,7 +373,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
 		scf.writeEntry("X-TDE-KonqSidebarModule", "konqsidebar_web");
 		scf.sync();
 
-		TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+		TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 	}
 }
 
@@ -382,7 +382,7 @@ void Sidebar_Widget::finishRollBack()
 {
 	m_path = TDEGlobal::dirs()->saveLocation("data",m_relPath,true);
         initialCopy();
-        TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+        TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 }
 
 
@@ -508,7 +508,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
 				ksc.setGroup("Desktop Entry");
 				ksc.writeEntry("Icon",iconname);
 				ksc.sync();
-			        TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+			        TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 			}
 			break;
 		}
@@ -531,7 +531,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
                                     //ksc.writeEntry("Name",newurl);
                                     ksc.writePathEntry("URL",newurl);
                                     ksc.sync();
-                                    TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+                                    TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
                                 }
 			}
                         delete dlg;
@@ -545,7 +545,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
 				TQFile f(m_path+m_currentButton->file);
 				if (!f.remove())
 					tqDebug("Error, file not deleted");
-				TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+				TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 			}
 			break;
 		}
@@ -566,7 +566,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
 				ksc.sync();
 				
 				// Update the buttons with a TQTimer (why?)
-				TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+				TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 			}
 			break;
 		}
@@ -834,11 +834,11 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
 	{
 	  	m_buttonBar->appendTab(SmallIcon(icon), lastbtn, name);
 		ButtonInfo *bi = new ButtonInfo(desktoppath, ((KonqSidebar*)m_partParent),0, url, lib, name,
-						icon, TQT_TQOBJECT(this));
+						icon, this);
 		/*int id=*/m_buttons.insert(lastbtn, bi);
 		KMultiTabBarTab *tab = m_buttonBar->tab(lastbtn);
 		tab->installEventFilter(this);
-		connect(tab,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(showHidePage(int)));
+		connect(tab,TQ_SIGNAL(clicked(int)),this,TQ_SLOT(showHidePage(int)));
 
 		// Set Whats This help
 		// This uses the comments in the .desktop files
@@ -853,9 +853,9 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
 bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
 {
 	if ( kapp->authorize( "action/konqsidebarmenu" ) ) {
-		if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton)
+		if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton)
 		{
-			KMultiTabBarTab *bt=tqt_dynamic_cast<KMultiTabBarTab*>(obj);
+			KMultiTabBarTab *bt=dynamic_cast<KMultiTabBarTab*>(obj);
 			if (bt)
 			{
 				kdDebug()<<"Request for popup"<<endl;
@@ -882,8 +882,8 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
 						m_buttonPopup->insertItem(SmallIconSet("edit-delete"), i18n("Remove"),3);
 						m_buttonPopup->insertSeparator();
 						m_buttonPopup->insertItem(SmallIconSet("configure"), i18n("Configure Navigation Panel"), m_menu, 4);
-						connect(m_buttonPopup, TQT_SIGNAL(activated(int)),
-							this, TQT_SLOT(buttonPopupActivate(int)));
+						connect(m_buttonPopup, TQ_SIGNAL(activated(int)),
+							this, TQ_SLOT(buttonPopupActivate(int)));
 					}
 					m_buttonPopup->setItemEnabled(2,!m_currentButton->URL.isEmpty());
 						m_buttonPopup->changeTitle(50,SmallIcon(m_currentButton->iconName),
@@ -902,7 +902,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
 void Sidebar_Widget::mousePressEvent(TQMouseEvent *ev)
 {
 	if ( kapp->authorize( "action/konqsidebarmenu" ) ) {
-		if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton) {
+		if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton) {
 			m_menu->exec(TQCursor::pos());
 		}
 	}
@@ -961,11 +961,11 @@ bool Sidebar_Widget::createView( ButtonInfo *data)
 		KDockWidget::DockBottom/*|KDockWidget::DockDesktop*/);
 		data->dock->setDockSite(KDockWidget::DockTop|KDockWidget::DockBottom);
 		connectModule(data->module);
-		connect(this, TQT_SIGNAL(fileSelection(const KFileItemList&)),
-			data->module, TQT_SLOT(openPreview(const KFileItemList&)));
+		connect(this, TQ_SIGNAL(fileSelection(const KFileItemList&)),
+			data->module, TQ_SLOT(openPreview(const KFileItemList&)));
 
-		connect(this, TQT_SIGNAL(fileMouseOver(const KFileItem&)),
-			data->module, TQT_SLOT(openPreviewOnMouseOver(const KFileItem&)));
+		connect(this, TQ_SIGNAL(fileMouseOver(const KFileItem&)),
+			data->module, TQ_SLOT(openPreviewOnMouseOver(const KFileItem&)));
 	}
 
 	delete confFile;
@@ -998,14 +998,14 @@ void Sidebar_Widget::showHidePage(int page)
 			m_buttonBar->setTab(page,true);
 
 			connect(info->module,
-				TQT_SIGNAL(setIcon(const TQString&)),
+				TQ_SIGNAL(setIcon(const TQString&)),
 				m_buttonBar->tab(page),
-				TQT_SLOT(setIcon(const TQString&)));
+				TQ_SLOT(setIcon(const TQString&)));
 
 			connect(info->module,
-				TQT_SIGNAL(setCaption(const TQString&)),
+				TQ_SIGNAL(setCaption(const TQString&)),
 				m_buttonBar->tab(page),
-				TQT_SLOT(setText(const TQString&)));
+				TQ_SLOT(setText(const TQString&)));
 
 			if (m_singleWidgetMode)
 			{
@@ -1144,7 +1144,7 @@ void Sidebar_Widget::createNewWindow( const KURL &url, const KParts::URLArgs &ar
 
 void Sidebar_Widget::enableAction( const char * name, bool enabled )
 {
- 	if (TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo"))
+ 	if (sender()->parent()->isA("ButtonInfo"))
 	{
 		ButtonInfo *btninfo = static_cast<ButtonInfo*>(sender()->parent());
 		if (btninfo)
@@ -1169,7 +1169,7 @@ void Sidebar_Widget::enableAction( const char * name, bool enabled )
 
 bool  Sidebar_Widget::doEnableActions()
 {
- 	if (!(TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo")))
+ 	if (!(sender()->parent()->isA("ButtonInfo")))
 	{
 		kdDebug()<<"Couldn't set active module, aborting"<<endl;
 		return false;
@@ -1217,51 +1217,51 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client,
 void Sidebar_Widget::connectModule(TQObject *mod)
 {
 	if (mod->metaObject()->findSignal("started(TDEIO::Job*)") != -1) {
-		connect(mod,TQT_SIGNAL(started(TDEIO::Job *)),this, TQT_SIGNAL(started(TDEIO::Job*)));
+		connect(mod,TQ_SIGNAL(started(TDEIO::Job *)),this, TQ_SIGNAL(started(TDEIO::Job*)));
 	}
 
 	if (mod->metaObject()->findSignal("completed()") != -1) {
-		connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
+		connect(mod,TQ_SIGNAL(completed()),this,TQ_SIGNAL(completed()));
 	}
 
-	if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) {
-		connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &,
-			const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const
+	if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) {
+		connect(mod,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &,
+			const TQString &, mode_t)),this,TQ_SLOT(popupMenu( const
 			TQPoint &, const KURL&, const TQString &, mode_t)));
 	}
 
-	if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const " TQPOINT_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) {
-		connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &,
+	if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint &,const KURL&,const TQString&,mode_t)") != -1) {
+		connect(mod,TQ_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &,
 			const KURL &,const TQString &, mode_t)),this,
-			TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &,
+			TQ_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &,
 			const KURL &,const TQString &, mode_t)));
 	}
 
-	if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KFileItemList&)") != -1) {
-		connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
-			this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & )));
+	if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) {
+		connect(mod,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
+			this,TQ_SLOT(popupMenu( const TQPoint &, const KFileItemList & )));
 	}
 
 	if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) {
-		connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
-			this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
+		connect(mod,TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
+			this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
 	}
 
-	if (mod->metaObject()->findSignal("submitFormRequest(const char*,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -1) {
+	if (mod->metaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) {
 		connect(mod,
-			TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
+			TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
 			this,
-			TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
+			TQ_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
 	}
 
 	if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) {
-		connect(mod,TQT_SIGNAL(enableAction( const char *, bool)),
-			this,TQT_SLOT(enableAction(const char *, bool)));
+		connect(mod,TQ_SIGNAL(enableAction( const char *, bool)),
+			this,TQ_SLOT(enableAction(const char *, bool)));
 	}
 
 	if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) {
-		connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
-			this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &)));
+		connect(mod,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
+			this,TQ_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &)));
 	}
 }
 
@@ -1323,7 +1323,7 @@ TQSplitter *Sidebar_Widget::splitter() const
 	TQObject *p = parent();
 	if (!p) return 0;
 	p = p->parent();
-	return static_cast<TQSplitter*>(TQT_TQWIDGET(p));
+	return static_cast<TQSplitter*>(p);
 }
 
 void Sidebar_Widget::userMovedSplitter()
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index b45f79b7c..391db5101 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -38,7 +38,7 @@ class TQStringList;
 
 class ButtonInfo: public TQObject, public KonqSidebarIface
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	ButtonInfo(const TQString& file_, class KonqSidebarIface *part, class KDockWidget *dock_,
 			const TQString &url_,const TQString &lib,
@@ -72,7 +72,7 @@ public:
 
 class addBackEnd: public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	addBackEnd(TQWidget *parent,class TQPopupMenu *addmenu, bool universal,
                    const TQString &currentProfile, const char *name=0);
@@ -95,7 +95,7 @@ private:
 
 class KDE_EXPORT Sidebar_Widget: public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	friend class ButtonInfo;
 public:
diff --git a/konqueror/sidebar/test/konqsidebartest.h b/konqueror/sidebar/test/konqsidebartest.h
index c5abab26c..286415557 100644
--- a/konqueror/sidebar/test/konqsidebartest.h
+++ b/konqueror/sidebar/test/konqsidebartest.h
@@ -22,7 +22,7 @@
 
 class SidebarTest : public KonqSidebarPlugin
 	{
-		Q_OBJECT
+		TQ_OBJECT
 		public:
 		SidebarTest(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0):
                    KonqSidebarPlugin(inst,parent,widgetParent,desktopName_,name)
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index 208fe2ee6..f1dd0b953 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -45,39 +45,39 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr
     formats << "text/uri-list" << "application/x-xbel" << "text/plain";
     tree()->setDropFormats(formats);
 
-    connect(tree(), TQT_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)),
-            this,   TQT_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*)));
-    connect(tree(), TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)),
-            this,   TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)));
+    connect(tree(), TQ_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)),
+            this,   TQ_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*)));
+    connect(tree(), TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)),
+            this,   TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)));
 
-    connect(tree(), TQT_SIGNAL(expanded(TQListViewItem*)),
-            this,   TQT_SLOT(slotOpenChange(TQListViewItem*)));
-    connect(tree(), TQT_SIGNAL(collapsed(TQListViewItem*)),
-            this,   TQT_SLOT(slotOpenChange(TQListViewItem*)));
+    connect(tree(), TQ_SIGNAL(expanded(TQListViewItem*)),
+            this,   TQ_SLOT(slotOpenChange(TQListViewItem*)));
+    connect(tree(), TQ_SIGNAL(collapsed(TQListViewItem*)),
+            this,   TQ_SLOT(slotOpenChange(TQListViewItem*)));
 
     m_collection = new TDEActionCollection( this, "bookmark actions" );
     (void) new TDEAction( i18n("&Create New Folder"), "folder-new", 0, this,
-                        TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
+                        TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder");
     (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this,
-                        TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
+                        TQ_SLOT( slotDelete() ), m_collection, "delete_folder");
     (void) new TDEAction( i18n("Delete Bookmark"), "edit-delete", 0, this,
-                        TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark");
+                        TQ_SLOT( slotDelete() ), m_collection, "delete_bookmark");
     (void) new TDEAction( i18n("Properties"), "edit", 0, this,
-                        TQT_SLOT( slotProperties() ), m_collection, "item_properties");
+                        TQ_SLOT( slotProperties() ), m_collection, "item_properties");
     (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this,
-                        TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
+                        TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
     (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this,
-                        TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
+                        TQ_SLOT( slotOpenTab() ), m_collection, "open_tab");
     (void) new TDEAction( i18n("Open Folder in Tabs"), "tab_new", 0, this,
-                        TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs");
+                        TQ_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs");
     (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this,
-                        TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
+                        TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location");
 
-    KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ),
+    KStdAction::editBookmarks( KonqBookmarkManager::self(), TQ_SLOT( slotEditBookmarks() ),
 			       m_collection, "edit_bookmarks" );
 
-    connect( KonqBookmarkManager::self(), TQT_SIGNAL(changed(const TQString &, const TQString &) ),
-             TQT_SLOT( slotBookmarksChanged(const TQString &) ) );
+    connect( KonqBookmarkManager::self(), TQ_SIGNAL(changed(const TQString &, const TQString &) ),
+             TQ_SLOT( slotBookmarksChanged(const TQString &) ) );
 }
 
 KonqSidebarBookmarkModule::~KonqSidebarBookmarkModule()
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h
index ba78a2b96..b39a48601 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h
@@ -34,7 +34,7 @@ class KLineEdit;
  */
 class KonqSidebarBookmarkModule : public TQObject, public KonqSidebarTreeModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KonqSidebarBookmarkModule( KonqSidebarTree * parentTree );
     virtual ~KonqSidebarBookmarkModule();
@@ -77,7 +77,7 @@ private:
 
 class BookmarkEditDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     BookmarkEditDialog( const TQString& title, const TQString& url,
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index b1b6d0563..e6e4a0af3 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -52,8 +52,8 @@ KonqSidebarDirTreeModule::~KonqSidebarDirTreeModule()
     // KDirLister may still emit canceled while being deleted.
     if (m_dirLister)
     {
-       disconnect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ),
-                   this, TQT_SLOT( slotListingStopped( const KURL & ) ) );
+       disconnect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ),
+                   this, TQ_SLOT( slotListingStopped( const KURL & ) ) );
        delete m_dirLister;
     }
 }
@@ -303,18 +303,18 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item )
 //	mimetypes<<TQString("inode/directory");
 //	m_dirLister->setMimeFilter(mimetypes);
 
-        connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ),
-                 this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
-        connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ),
-                 this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) );
-        connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
-                 this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
-        connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ),
-                 this, TQT_SLOT( slotListingStopped( const KURL & ) ) );
-        connect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ),
-                 this, TQT_SLOT( slotListingStopped( const KURL & ) ) );
-        connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ),
-                 this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) );
+        connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ),
+                 this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) );
+        connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ),
+                 this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) );
+        connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ),
+                 this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) );
+        connect( m_dirLister, TQ_SIGNAL( completed( const KURL & ) ),
+                 this, TQ_SLOT( slotListingStopped( const KURL & ) ) );
+        connect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ),
+                 this, TQ_SLOT( slotListingStopped( const KURL & ) ) );
+        connect( m_dirLister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ),
+                 this, TQ_SLOT( slotRedirection( const KURL &, const KURL & ) ) );
     }
 
 
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
index 89b5dcbaf..ccc607a79 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
@@ -33,7 +33,7 @@ class KonqPropsView;
 
 class KonqSidebarDirTreeModule : public TQObject, public KonqSidebarTreeModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KonqSidebarDirTreeModule( KonqSidebarTree * parentTree, bool );
     virtual ~KonqSidebarDirTreeModule();
diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp
index 44389702e..4825cfeda 100644
--- a/konqueror/sidebar/trees/history_module/history_item.cpp
+++ b/konqueror/sidebar/trees/history_module/history_item.cpp
@@ -132,18 +132,18 @@ void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg,
     TQDateTime current = TQDateTime::currentDateTime();
 
     if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS )
-	dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueYoungerThan ));
+	dt = current.addDays( - s_settings->m_valueYoungerThan );
     else
-	dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueYoungerThan * 60) ));
+	dt = current.addSecs( - (s_settings->m_valueYoungerThan * 60) );
 
     if ( m_entry->lastVisited > dt )
 	p->setFont( s_settings->m_fontYoungerThan );
 
     else {
 	if ( s_settings->m_metricOlderThan == KonqSidebarHistorySettings::DAYS )
-	    dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueOlderThan ));
+	    dt = current.addDays( - s_settings->m_valueOlderThan );
 	else
-	    dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueOlderThan * 60) ));
+	    dt = current.addSecs( - (s_settings->m_valueOlderThan * 60) );
 
 	if ( m_entry->lastVisited < dt )
 	    p->setFont( s_settings->m_fontOlderThan );
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 6f051a553..416054cf1 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -51,7 +51,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
 	s_settings->readSettings( true );
     }
 
-    connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() ));
+    connect( s_settings, TQ_SIGNAL( settingsChanged() ), TQ_SLOT( slotSettingsChanged() ));
 
     m_dict.setAutoDelete( true );
     m_currentTime = TQDateTime::currentDateTime();
@@ -63,35 +63,35 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
 
     KonqHistoryManager *manager = KonqHistoryManager::kself();
 
-    connect( manager, TQT_SIGNAL( loadingFinished() ), TQT_SLOT( slotCreateItems() ));
-    connect( manager, TQT_SIGNAL( cleared() ), TQT_SLOT( clear() ));
+    connect( manager, TQ_SIGNAL( loadingFinished() ), TQ_SLOT( slotCreateItems() ));
+    connect( manager, TQ_SIGNAL( cleared() ), TQ_SLOT( clear() ));
 
-    connect( manager, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * ) ),
-	     TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * ) ));
-    connect( manager, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry *) ),
-	     TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry *) ));
+    connect( manager, TQ_SIGNAL( entryAdded( const KonqHistoryEntry * ) ),
+	     TQ_SLOT( slotEntryAdded( const KonqHistoryEntry * ) ));
+    connect( manager, TQ_SIGNAL( entryRemoved( const KonqHistoryEntry *) ),
+	     TQ_SLOT( slotEntryRemoved( const KonqHistoryEntry *) ));
 
-    connect( parentTree, TQT_SIGNAL( expanded( TQListViewItem * )),
-	     TQT_SLOT( slotItemExpanded( TQListViewItem * )));
+    connect( parentTree, TQ_SIGNAL( expanded( TQListViewItem * )),
+	     TQ_SLOT( slotItemExpanded( TQListViewItem * )));
 
     m_collection = new TDEActionCollection( this, "history actions" );
     (void) new TDEAction( i18n("New &Window"), "window-new", 0, this,
- 			TQT_SLOT( slotNewWindow() ), m_collection, "open_new");
+ 			TQ_SLOT( slotNewWindow() ), m_collection, "open_new");
     (void) new TDEAction( i18n("&Remove Entry"), "edit-delete", 0, this,
-			TQT_SLOT( slotRemoveEntry() ), m_collection, "remove");
+			TQ_SLOT( slotRemoveEntry() ), m_collection, "remove");
     (void) new TDEAction( i18n("C&lear History"), "history_clear", 0, this,
-			TQT_SLOT( slotClearHistory() ), m_collection, "clear");
+			TQ_SLOT( slotClearHistory() ), m_collection, "clear");
     (void) new TDEAction( i18n("&Preferences..."), "configure", 0, this,
-			TQT_SLOT( slotPreferences()), m_collection, "preferences");
+			TQ_SLOT( slotPreferences()), m_collection, "preferences");
 
     TDERadioAction *sort;
     sort = new TDERadioAction( i18n("By &Name"), 0, this,
-			     TQT_SLOT( slotSortByName() ), m_collection, "byName");
+			     TQ_SLOT( slotSortByName() ), m_collection, "byName");
     sort->setExclusiveGroup("SortGroup");
     sort->setChecked( m_sortsByName );
 
     sort = new TDERadioAction( i18n("By &Date"), 0, this,
-			     TQT_SLOT( slotSortByDate() ), m_collection, "byDate");
+			     TQ_SLOT( slotSortByDate() ), m_collection, "byDate");
     sort->setExclusiveGroup("SortGroup");
     sort->setChecked( !m_sortsByName );
 
diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h
index 933097455..649f68150 100644
--- a/konqueror/sidebar/trees/history_module/history_module.h
+++ b/konqueror/sidebar/trees/history_module/history_module.h
@@ -38,7 +38,7 @@ class KonqSidebarTreeItem;
 
 class KonqSidebarHistoryModule : public TQObject, public KonqSidebarTreeModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum {
diff --git a/konqueror/sidebar/trees/history_module/history_settings.h b/konqueror/sidebar/trees/history_module/history_settings.h
index 7b7d75006..f4bdebe70 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.h
+++ b/konqueror/sidebar/trees/history_module/history_settings.h
@@ -28,7 +28,7 @@
 class KonqSidebarHistorySettings : public TQObject, public DCOPObject
 {
     K_DCOP
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum { MINUTES, DAYS };
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index 70e42e113..188da9d93 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -75,33 +75,33 @@ HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name,
     dialog->comboOlder->insertItem( i18n("Days"),
                                     KonqSidebarHistorySettings::DAYS );
 
-    connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )),
-	     dialog->spinExpire, TQT_SLOT( setEnabled( bool )));
-    connect( dialog->spinExpire, TQT_SIGNAL( valueChanged( int )),
-	     this, TQT_SLOT( slotExpireChanged( int )));
-
-    connect( dialog->spinNewer, TQT_SIGNAL( valueChanged( int )),
-	     TQT_SLOT( slotNewerChanged( int )));
-    connect( dialog->spinOlder, TQT_SIGNAL( valueChanged( int )),
-	     TQT_SLOT( slotOlderChanged( int )));
-
-    connect( dialog->btnFontNewer, TQT_SIGNAL( clicked() ),
-             TQT_SLOT( slotGetFontNewer() ));
-    connect( dialog->btnFontOlder, TQT_SIGNAL( clicked() ),
-             TQT_SLOT( slotGetFontOlder() ));
-    connect( dialog->btnClearHistory, TQT_SIGNAL( clicked() ),
-             TQT_SLOT( slotClearHistory() ));
-
-    connect( dialog->cbDetailedTips, TQT_SIGNAL( toggled( bool )),
-             TQT_SLOT( configChanged() ));
-    connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )),
-             TQT_SLOT( configChanged() ));
-    connect( dialog->spinEntries, TQT_SIGNAL( valueChanged( int )),
-             TQT_SLOT( configChanged() ));
-    connect( dialog->comboNewer, TQT_SIGNAL( activated( int )),
-             TQT_SLOT( configChanged() ));
-    connect( dialog->comboOlder, TQT_SIGNAL( activated( int )),
-             TQT_SLOT( configChanged() ));
+    connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )),
+	     dialog->spinExpire, TQ_SLOT( setEnabled( bool )));
+    connect( dialog->spinExpire, TQ_SIGNAL( valueChanged( int )),
+	     this, TQ_SLOT( slotExpireChanged( int )));
+
+    connect( dialog->spinNewer, TQ_SIGNAL( valueChanged( int )),
+	     TQ_SLOT( slotNewerChanged( int )));
+    connect( dialog->spinOlder, TQ_SIGNAL( valueChanged( int )),
+	     TQ_SLOT( slotOlderChanged( int )));
+
+    connect( dialog->btnFontNewer, TQ_SIGNAL( clicked() ),
+             TQ_SLOT( slotGetFontNewer() ));
+    connect( dialog->btnFontOlder, TQ_SIGNAL( clicked() ),
+             TQ_SLOT( slotGetFontOlder() ));
+    connect( dialog->btnClearHistory, TQ_SIGNAL( clicked() ),
+             TQ_SLOT( slotClearHistory() ));
+
+    connect( dialog->cbDetailedTips, TQ_SIGNAL( toggled( bool )),
+             TQ_SLOT( configChanged() ));
+    connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )),
+             TQ_SLOT( configChanged() ));
+    connect( dialog->spinEntries, TQ_SIGNAL( valueChanged( int )),
+             TQ_SLOT( configChanged() ));
+    connect( dialog->comboNewer, TQ_SIGNAL( activated( int )),
+             TQ_SLOT( configChanged() ));
+    connect( dialog->comboOlder, TQ_SIGNAL( activated( int )),
+             TQ_SLOT( configChanged() ));
 
     dialog->show();
     topLayout->add(dialog);
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.h b/konqueror/sidebar/trees/history_module/kcmhistory.h
index ac82cdd60..215b78027 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.h
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.h
@@ -29,7 +29,7 @@ class KonqSidebarHistoryDlg;
 
 class HistorySidebarConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   HistorySidebarConfig( TQWidget *parent=0, const char* name=0, const TQStringList &list=TQStringList() );
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 514c28095..6dee8c0dd 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -136,8 +136,8 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg
     m_part = parent;
 
     m_animationTimer = new TQTimer( this );
-    connect( m_animationTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( slotAnimation() ) );
+    connect( m_animationTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( slotAnimation() ) );
 
     m_currentBeforeDropItem = 0;
     m_dropItem = 0;
@@ -148,22 +148,22 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg
     setTreeStepSize(15);
 
     m_autoOpenTimer = new TQTimer( this );
-    connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( slotAutoOpenFolder() ) );
-
-    connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-             this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
-    connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
-             this, TQT_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) );
-    connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ),
-	     this, TQT_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) );
-    connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
-             this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
-    connect( this, TQT_SIGNAL( selectionChanged() ),
-             this, TQT_SLOT( slotSelectionChanged() ) );
-
-    connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)),
-             this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int)));
+    connect( m_autoOpenTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( slotAutoOpenFolder() ) );
+
+    connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+             this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
+    connect( this, TQ_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
+             this, TQ_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) );
+    connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ),
+	     this, TQ_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) );
+    connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ),
+             this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
+    connect( this, TQ_SIGNAL( selectionChanged() ),
+             this, TQ_SLOT( slotSelectionChanged() ) );
+
+    connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)),
+             this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int)));
 
 /*    assert( m_part->getInterfaces()->getInstance()->dirs );
     TQString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */
@@ -483,7 +483,7 @@ void KonqSidebarTree::slotExecuted( TQListViewItem *item )
 void KonqSidebarTree::slotMouseButtonPressed( int _button, TQListViewItem* _item, const TQPoint&, int col )
 {
     KonqSidebarTreeItem * item = static_cast<KonqSidebarTreeItem*>( _item );
-    if (_button == Qt::RightButton)
+    if (_button == TQt::RightButton)
     {
         if ( item && col < 2)
         {
@@ -502,10 +502,10 @@ void KonqSidebarTree::slotSidebarMouseButtonClicked(int _button, TQListViewItem*
     if(_item && col < 2)
     {
         switch( _button ) {
-        case Qt::LeftButton:
+        case TQt::LeftButton:
             slotExecuted( item );
             break;
-        case Qt::MidButton:
+        case TQt::MidButton:
             item->middleButtonClicked();
             break;
         }
@@ -558,7 +558,7 @@ void KonqSidebarTree::FilesAdded( const KURL & dir )
     kdDebug(1201) << "KonqSidebarTree::FilesAdded " << dir.url() << endl;
     if ( m_dirtreeDir.dir.isParentOf( dir ) )
         // We use a timer in case of DCOP re-entrance..
-        TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) );
+        TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) );
 }
 
 void KonqSidebarTree::FilesRemoved( const KURL::List & urls )
@@ -569,7 +569,7 @@ void KonqSidebarTree::FilesRemoved( const KURL::List & urls )
         //kdDebug(1201) <<  "KonqSidebarTree::FilesRemoved " << (*it).prettyURL() << endl;
         if ( m_dirtreeDir.dir.isParentOf( *it ) )
         {
-            TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) );
+            TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) );
             kdDebug(1201) << "KonqSidebarTree::FilesRemoved done" << endl;
             return;
         }
@@ -908,22 +908,22 @@ void KonqSidebarTree::showToplevelContextMenu()
     if (!m_collection)
     {
         m_collection = new TDEActionCollection( this, "bookmark actions" );
-        (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
-        (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
-        (void) new TDEAction( i18n("Rename"), 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotRename() ), m_collection, "rename");
-        (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotDelete() ), m_collection, "delete_link");
-        (void) new TDEAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotProperties() ), m_collection, "item_properties");
-        (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
-        (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
-        (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
+        (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, this,
+                            TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder");
+        (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this,
+                            TQ_SLOT( slotDelete() ), m_collection, "delete_folder");
+        (void) new TDEAction( i18n("Rename"), 0, this,
+                            TQ_SLOT( slotRename() ), m_collection, "rename");
+        (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, this,
+                            TQ_SLOT( slotDelete() ), m_collection, "delete_link");
+        (void) new TDEAction( i18n("Properties"), "edit", 0, this,
+                            TQ_SLOT( slotProperties() ), m_collection, "item_properties");
+        (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this,
+                            TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
+        (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this,
+                            TQ_SLOT( slotOpenTab() ), m_collection, "open_tab");
+        (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this,
+                            TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location");
     }
 
     TQPopupMenu *menu = new TQPopupMenu;
@@ -1012,7 +1012,6 @@ void KonqSidebarTree::slotProperties()
     KPropertiesDialog *dlg = new KPropertiesDialog( url );
     dlg->setFileNameReadOnly(true);
     dlg->exec();
-    delete dlg;
 }
 
 void KonqSidebarTree::slotOpenNewWindow()
diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h
index 703a256c9..f76027481 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.h
+++ b/konqueror/sidebar/trees/konq_sidebartree.h
@@ -75,7 +75,7 @@ typedef enum {
  */
 class KonqSidebarTree : public TDEListView, public KDirNotify
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path );
     virtual ~KonqSidebarTree();
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 1903c2328..4bd91f9f3 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -34,25 +34,25 @@ KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidg
 			TQLabel* slbl = new TQLabel(i18n("Se&arch:"), searchline);
 			TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchline,tree);
 			slbl->setBuddy(listViewSearch);
-			connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear()));
+			connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear()));
 		}
 		else
 			tree=new KonqSidebarTree(this,widget,virt,desktopName_);
 
-    		connect(tree, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)),
-			this,TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)));
+    		connect(tree, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)),
+			this,TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)));
 
-		connect(tree,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
-			this,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)));
+		connect(tree,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
+			this,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)));
 
-		connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )),
-			this,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )));
+		connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )),
+			this,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )));
 
-		connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
-			this,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )));
+		connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
+			this,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )));
 
-		connect(tree,TQT_SIGNAL(enableAction( const char *, bool )),
-			this,TQT_SIGNAL(enableAction( const char *, bool)));
+		connect(tree,TQ_SIGNAL(enableAction( const char *, bool )),
+			this,TQ_SIGNAL(enableAction( const char *, bool)));
 
         }
 
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h
index bdc58ad0c..25b616bd6 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.h
+++ b/konqueror/sidebar/trees/konqsidebar_tree.h
@@ -16,7 +16,7 @@ class TQVBox;
 
 class KonqSidebar_Tree: public KonqSidebarPlugin
         {
-                Q_OBJECT
+                TQ_OBJECT
                 public:
                 KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0);
                 ~KonqSidebar_Tree();
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index 44a94f02c..feb1a6692 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -36,30 +36,30 @@ KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *pare
 	: KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name)
 {
 	_htmlPart = new TDEHTMLSideBar(universalMode());
-	connect(_htmlPart, TQT_SIGNAL(reload()), this, TQT_SLOT(reload()));
-	connect(_htmlPart, TQT_SIGNAL(completed()), this, TQT_SLOT(pageLoaded()));
+	connect(_htmlPart, TQ_SIGNAL(reload()), this, TQ_SLOT(reload()));
+	connect(_htmlPart, TQ_SIGNAL(completed()), this, TQ_SLOT(pageLoaded()));
 	connect(_htmlPart,
-		TQT_SIGNAL(setWindowCaption(const TQString&)),
+		TQ_SIGNAL(setWindowCaption(const TQString&)),
 		this,
-		TQT_SLOT(setTitle(const TQString&)));
+		TQ_SLOT(setTitle(const TQString&)));
 	connect(_htmlPart,
-		TQT_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)),
+		TQ_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)),
 		this,
-		TQT_SLOT(urlClicked(const TQString&, KParts::URLArgs)));
+		TQ_SLOT(urlClicked(const TQString&, KParts::URLArgs)));
 	connect(_htmlPart->browserExtension(),
-		TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
+		TQ_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
 		this,
-		TQT_SLOT(formClicked(const KURL&, const KParts::URLArgs&)));
+		TQ_SLOT(formClicked(const KURL&, const KParts::URLArgs&)));
 	connect(_htmlPart,
-		TQT_SIGNAL(setAutoReload()), this, TQT_SLOT( setAutoReload() ));
+		TQ_SIGNAL(setAutoReload()), this, TQ_SLOT( setAutoReload() ));
 	connect(_htmlPart,
-		TQT_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)),
+		TQ_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)),
 		this,
-		TQT_SLOT(urlNewWindow(const TQString&, KParts::URLArgs)));
+		TQ_SLOT(urlNewWindow(const TQString&, KParts::URLArgs)));
 	connect(_htmlPart,
-		TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
+		TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
 		this,
-		TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
+		TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
 
 	_desktopName = desktopName;
 
@@ -69,7 +69,7 @@ KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *pare
 	_url = ksc.readPathEntry("URL");
 	_htmlPart->openURL(_url );
 	// Must load this delayed
-	TQTimer::singleShot(0, this, TQT_SLOT(loadFavicon()));
+	TQTimer::singleShot(0, this, TQ_SLOT(loadFavicon()));
 }
 
 
@@ -176,7 +176,7 @@ void KonqSideBarWebModule::setTitle(const TQString& title) {
 
 void KonqSideBarWebModule::pageLoaded() {
 	if( reloadTimeout > 0 ) {
-		TQTimer::singleShot( reloadTimeout, this, TQT_SLOT( reload() ) );
+		TQTimer::singleShot( reloadTimeout, this, TQ_SLOT( reload() ) );
 	}
 }
 
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index 938677d8d..072c3d822 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -31,7 +31,7 @@
 // A wrapper for TDEHTMLPart to make it behave the way we want it to.
 class TDEHTMLSideBar : public TDEHTMLPart
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		TDEHTMLSideBar(bool universal) : TDEHTMLPart() {
 			setStatusMessagesEnabled(false);
@@ -41,9 +41,9 @@ class TDEHTMLSideBar : public TDEHTMLPart
 
 			setFormNotification(TDEHTMLPart::Only);
 			connect(this,
-				TQT_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
+				TQ_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
 				this,
-				TQT_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))
+				TQ_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))
 				);
 
 
@@ -51,22 +51,22 @@ class TDEHTMLSideBar : public TDEHTMLPart
 					"link context menu");
 			if (!universal) {
 				_linkMenu->insertItem(i18n("&Open Link"),
-						this, TQT_SLOT(loadPage()));
+						this, TQ_SLOT(loadPage()));
 				_linkMenu->insertItem(i18n("Open in New &Window"),
-						this, TQT_SLOT(loadNewWindow()));
+						this, TQ_SLOT(loadNewWindow()));
 			} else {
 				_linkMenu->insertItem(i18n("Open in New &Window"),
-						this, TQT_SLOT(loadPage()));
+						this, TQ_SLOT(loadPage()));
 			}
 			_menu = new TDEPopupMenu(widget(), "context menu");
 			_menu->insertItem(SmallIcon("reload"), i18n("&Reload"),
-					this, TQT_SIGNAL(reload()));
-			_menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"),                                                  this, TQT_SIGNAL(setAutoReload()));
+					this, TQ_SIGNAL(reload()));
+			_menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"),                                                  this, TQ_SIGNAL(setAutoReload()));
 
 			connect(this,
-				TQT_SIGNAL(popupMenu(const TQString&,const TQPoint&)),
+				TQ_SIGNAL(popupMenu(const TQString&,const TQPoint&)),
 				this,
-				TQT_SLOT(showMenu(const TQString&, const TQPoint&)));
+				TQ_SLOT(showMenu(const TQString&, const TQPoint&)));
 
 		}
 		virtual ~TDEHTMLSideBar() {}
@@ -82,7 +82,7 @@ class TDEHTMLSideBar : public TDEHTMLPart
 		virtual void urlSelected( const TQString &url, int button,
 				int state, const TQString &_target,
 				KParts::URLArgs args = KParts::URLArgs()) {
-			if (button == Qt::LeftButton ){
+			if (button == TQt::LeftButton ){
 				if (_target.lower() == "_self") {
 					openURL(url);
 				} else if (_target.lower() == "_blank") {
@@ -92,7 +92,7 @@ class TDEHTMLSideBar : public TDEHTMLPart
 				}
 				return;
 			}
-			if (button == Qt::MidButton) {
+			if (button == TQt::MidButton) {
 				emit openURLNewWindow(completeURL(url).url(),
 						args);
 				return;
@@ -164,7 +164,7 @@ class TDEHTMLSideBar : public TDEHTMLPart
 
 class KonqSideBarWebModule : public KonqSidebarPlugin
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		KonqSideBarWebModule(TDEInstance *instance, TQObject *parent,
 			       	TQWidget *widgetParent, TQString &desktopName,
diff --git a/konsole/README.konsole_kiosk b/konsole/README.konsole_kiosk
index f769d5baf..c2d6525e9 100644
--- a/konsole/README.konsole_kiosk
+++ b/konsole/README.konsole_kiosk
@@ -50,7 +50,7 @@ action/scrollbar
 action/keyboard
 
 
-So if you don't want the user to toggle his scrollbar settings, you would add:
+So if you don't want the user to toggle their scrollbar settings, you would add:
 
 [KDE Action Restrictions]
 action/scrollbar=false
diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp
index 2148ec03c..fbb152289 100644
--- a/konsole/konsole/TEPty.cpp
+++ b/konsole/konsole/TEPty.cpp
@@ -171,12 +171,12 @@ void TEPty::setWriteable(bool writeable)
 TEPty::TEPty()
 {
   m_bufferFull = false;
-  connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
-	  this, TQT_SLOT(dataReceived(TDEProcess *,char *, int)));
-  connect(this, TQT_SIGNAL(processExited(TDEProcess *)),
-          this, TQT_SLOT(donePty()));
-  connect(this, TQT_SIGNAL(wroteStdin(TDEProcess *)),
-          this, TQT_SLOT(writeReady()));
+  connect(this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+	  this, TQ_SLOT(dataReceived(TDEProcess *,char *, int)));
+  connect(this, TQ_SIGNAL(processExited(TDEProcess *)),
+          this, TQ_SLOT(donePty()));
+  connect(this, TQ_SIGNAL(wroteStdin(TDEProcess *)),
+          this, TQ_SLOT(writeReady()));
 
   setUsePty(All, false); // utmp will be overridden later
 }
diff --git a/konsole/konsole/TEPty.h b/konsole/konsole/TEPty.h
index 21ea3ff94..05a453f31 100644
--- a/konsole/konsole/TEPty.h
+++ b/konsole/konsole/TEPty.h
@@ -31,7 +31,7 @@
 
 class TEPty: public TDEProcess
 {
-Q_OBJECT
+TQ_OBJECT
 
   public:
 
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 52cd1236b..33dcf7f79 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -308,6 +308,19 @@ void TEWidget::fontChange(const TQFont &)
   update();
 }
 
+void TEWidget::biggerFont(void) {
+    TQFont f = getVTFont();
+    f.setPointSize( f.pointSize() + 1 );
+    setVTFont( f );
+}
+
+void TEWidget::smallerFont(void) {
+    TQFont f = getVTFont();
+    if ( f.pointSize() < 6 ) return;      // A minimum size
+    f.setPointSize( f.pointSize() - 1 );
+    setVTFont( f );
+}
+
 void TEWidget::setVTFont(const TQFont& f)
 {
   TQFont font = f;
@@ -397,17 +410,17 @@ TEWidget::TEWidget(TQWidget *parent, const char *name)
   bY = bX = 1;
 
   cb = TQApplication::clipboard();
-  TQObject::connect( (TQObject*)cb, TQT_SIGNAL(selectionChanged()),
-                    this, TQT_SLOT(onClearSelection()) );
+  TQObject::connect( (TQObject*)cb, TQ_SIGNAL(selectionChanged()),
+                    this, TQ_SLOT(onClearSelection()) );
 
   scrollbar = new TQScrollBar(this);
-  scrollbar->setCursor( tqarrowCursor );
-  connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int)));
+  scrollbar->setCursor( TQt::arrowCursor );
+  connect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int)));
 
   blinkT   = new TQTimer(this);
-  connect(blinkT, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkEvent()));
+  connect(blinkT, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkEvent()));
   blinkCursorT   = new TQTimer(this);
-  connect(blinkCursorT, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkCursorEvent()));
+  connect(blinkCursorT, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkCursorEvent()));
 
   setMouseMarks(true);
   setColorTable(base_color_table); // init color table
@@ -419,7 +432,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name)
   setAcceptDrops(true); // attempt
   dragInfo.state = diNone;
 
-  setFocusPolicy( TQ_WheelFocus );
+  setFocusPolicy( TQWidget::WheelFocus );
 
   // im
   setInputMethodEnabled(true);
@@ -594,7 +607,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y,
         }
     }
 
-    paint.drawText(x,y, w, font_h, Qt::AlignHCenter | TQt::DontClip, drawstr, -1);
+    paint.drawText(x,y, w, font_h, TQt::AlignHCenter | TQt::DontClip, drawstr, -1);
     x += w;
   }
 }
@@ -608,7 +621,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
                            TQString& str, const ca *attr, bool pm, bool clear)
 {
   int a = font_a + m_lineSpacing / 2;
-  TQColor fColor = printerFriendly ? Qt::black : attr->f.color(color_table);
+  TQColor fColor = printerFriendly ? TQt::black : attr->f.color(color_table);
   TQColor bColor = attr->b.color(color_table);
   TQString drawstr;
 
@@ -621,13 +634,9 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
     if (attr->isTransparent(color_table))
     {
       if (pm)
-        paint.setBackgroundMode( Qt::TransparentMode );
+        paint.setBackgroundMode( TQt::TransparentMode );
       if (clear || (blinking && (attr->r & RE_BLINK))) {
-#ifdef USE_QT4
-        paint.eraseRect(rect);
-#else // USE_QT4
         erase(rect);
-#endif // USE_QT4
       }
     }
     else
@@ -638,7 +647,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
         // draw background colors with 75% opacity
         if ( draw_translucent_background_colors && argb_visual && tqAlpha(blend_color) < 0xff )
         {
-          QRgb col = bColor.rgb();
+          TQRgb col = bColor.rgb();
 
           TQ_UINT8 salpha = 192;
           TQ_UINT8 dalpha = 255 - salpha;
@@ -667,7 +676,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
         tmpRect.setWidth( tmpRect.width() + font_w );
       }
 
-      paint.fillRect( tmpRect, Qt::darkCyan );  // currently use hard code color
+      paint.fillRect( tmpRect, TQt::darkCyan );  // currently use hard code color
     }
 
     if ( m_isIMSel && !tmpStr.isEmpty() ) { // imput method selection background color
@@ -682,13 +691,13 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
         tmpRect.setWidth( tmpRect.width() + font_w );
       }
 
-      paint.fillRect( tmpRect, Qt::darkGray );   // currently use hard code color
+      paint.fillRect( tmpRect, TQt::darkGray );   // currently use hard code color
     }
   }
 
   // Paint cursor
   if ((attr->r & RE_CURSOR) && !isPrinting) {
-    paint.setBackgroundMode( Qt::TransparentMode );
+    paint.setBackgroundMode( TQt::TransparentMode );
     int h = font_h - m_lineSpacing;
     TQRect r(rect.x(),rect.y()+m_lineSpacing/2,rect.width(),h);
     if (hasFocus())
@@ -731,7 +740,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
       int y = rect.y(); // top of rect
 
       if ( shadow ) {
-        paint.setPen( Qt::black );
+        paint.setPen( TQt::black );
         drawTextFixed(paint, x+1, y+1, str, attr);
         paint.setPen(fColor);
       }
@@ -744,7 +753,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
       int y = rect.y()+a; // baseline
 
       if ( shadow ) {
-        paint.setPen( Qt::black );
+        paint.setPen( TQt::black );
         paint.drawText(x+1,y+1, str, -1, bidiEnabled ? TQPainter::Auto : TQPainter::LTR );
         paint.setPen(fColor);
       }
@@ -762,7 +771,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
     {
       paint.setClipRect(rect);
       // On screen we use overstrike for bold
-      paint.setBackgroundMode( Qt::TransparentMode );
+      paint.setBackgroundMode( TQt::TransparentMode );
       int x = rect.x()+1;
       if(!fixed_font)
       {
@@ -968,7 +977,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
         mResizeWidget->setMinimumWidth(mResizeLabel->fontMetrics().width(i18n("Size: XXX x XXX"))+20);
         mResizeWidget->setMinimumHeight(mResizeLabel->sizeHint().height()+20);
         mResizeTimer = new TQTimer(this);
-        connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide()));
+        connect(mResizeTimer, TQ_SIGNAL(timeout()), mResizeWidget, TQ_SLOT(hide()));
      }
      TQString sizeStr = i18n("Size: %1 x %2").arg(columns).arg(lines);
      mResizeLabel->setText(sizeStr);
@@ -1007,7 +1016,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe )
   TQPainter paint;
   setUpdatesEnabled(false);
   paint.begin( this );
-  paint.setBackgroundMode( Qt::TransparentMode );
+  paint.setBackgroundMode( TQt::TransparentMode );
 
   // Note that the actual widget size can be slightly larger
   // that the image (the size is truncated towards the smaller
@@ -1084,7 +1093,7 @@ void TEWidget::print(TQPainter &paint, bool friendly, bool exact)
      pm.fill();
 
      TQPainter pm_paint;
-     pm_paint.begin(&pm, TQT_TQWIDGET(this));
+     pm_paint.begin(&pm, this);
      paintContents(pm_paint, contentsRect(), true);
      pm_paint.end();
      paint.drawPixmap(0, 0, pm);
@@ -1245,13 +1254,13 @@ void TEWidget::scrollChanged(int)
 void TEWidget::setScroll(int cursor, int slines)
 {
   //kdDebug(1211)<<"TEWidget::setScroll() disconnect()"<<endl;
-  disconnect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int)));
+  disconnect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int)));
   //kdDebug(1211)<<"TEWidget::setScroll() setRange()"<<endl;
   scrollbar->setRange(0,slines);
   //kdDebug(1211)<<"TEWidget::setScroll() setSteps()"<<endl;
   scrollbar->setSteps(1,lines);
   scrollbar->setValue(cursor);
-  connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int)));
+  connect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int)));
   //kdDebug(1211)<<"TEWidget::setScroll() done"<<endl;
 }
 
@@ -1302,7 +1311,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev)
 {
 //printf("press [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button());
 
-  if ( possibleTripleClick && (ev->button()==Qt::LeftButton) ) {
+  if ( possibleTripleClick && (ev->button()==TQt::LeftButton) ) {
     mouseTripleClickEvent(ev);
     return;
   }
@@ -1315,7 +1324,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev)
   TQPoint pos = TQPoint((ev->x()-tLx-bX+(font_w/2))/font_w,(ev->y()-tLy-bY)/font_h);
 
 //printf("press top left [%d,%d] by=%d\n",tLx,tLy, bY);
-  if ( ev->button() == Qt::LeftButton)
+  if ( ev->button() == TQt::LeftButton)
   {
     line_selection_mode = false;
     word_selection_mode = false;
@@ -1352,14 +1361,14 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev)
       }
     }
   }
-  else if ( ev->button() == Qt::MidButton )
+  else if ( ev->button() == TQt::MidButton )
   {
     if ( mouse_marks || (!mouse_marks && (ev->state() & ShiftButton)) )
       emitSelection(true,ev->state() & ControlButton);
     else
       emit mouseSignal( 1, (ev->x()-tLx-bX)/font_w +1, (ev->y()-tLy-bY)/font_h +1 +scrollbar->value() -scrollbar->maxValue() );
   }
-  else if ( ev->button() == Qt::RightButton )
+  else if ( ev->button() == TQt::RightButton )
   {
     if (mouse_marks || (ev->state() & ShiftButton)) {
       configureRequestPoint = TQPoint( ev->x(), ev->y() );
@@ -1373,7 +1382,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev)
 void TEWidget::mouseMoveEvent(TQMouseEvent* ev)
 {
   // for auto-hiding the cursor, we need mouseTracking
-  if (ev->state() == Qt::NoButton ) return;
+  if (ev->state() == TQt::NoButton ) return;
 
   if (dragInfo.state == diPending) {
     // we had a mouse down, but haven't confirmed a drag yet
@@ -1397,7 +1406,7 @@ void TEWidget::mouseMoveEvent(TQMouseEvent* ev)
   if (actSel == 0) return;
 
  // don't extend selection while pasting
-  if (ev->state() & Qt::MidButton) return;
+  if (ev->state() & TQt::MidButton) return;
 
   extendSelection( ev->pos() );
 }
@@ -1591,7 +1600,7 @@ void TEWidget::extendSelection( TQPoint pos )
 void TEWidget::mouseReleaseEvent(TQMouseEvent* ev)
 {
 //printf("release [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button());
-  if ( ev->button() == Qt::LeftButton)
+  if ( ev->button() == TQt::LeftButton)
   {
     emit isBusySelecting(false); // Ok.. we can breath again.
     if(dragInfo.state == diPending)
@@ -1621,8 +1630,8 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev)
     }
     dragInfo.state = diNone;
   }
-  if ( !mouse_marks && ((ev->button() == Qt::RightButton && !(ev->state() & ShiftButton))
-                        || ev->button() == Qt::MidButton) ) {
+  if ( !mouse_marks && ((ev->button() == TQt::RightButton && !(ev->state() & ShiftButton))
+                        || ev->button() == TQt::MidButton) ) {
     TQPoint tL  = contentsRect().topLeft();
     int    tLx = tL.x();
     int    tLy = tL.y();
@@ -1634,7 +1643,7 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev)
 
 void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev)
 {
-  if ( ev->button() != Qt::LeftButton) return;
+  if ( ev->button() != TQt::LeftButton) return;
 
   TQPoint tL  = contentsRect().topLeft();
   int    tLx = tL.x();
@@ -1687,14 +1696,25 @@ void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev)
    }
 
   possibleTripleClick=true;
-  TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout()));
+  TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(tripleClickTimeout()));
 }
 
 void TEWidget::wheelEvent( TQWheelEvent* ev )
 {
-  if (ev->orientation() != Qt::Vertical)
+  if (ev->orientation() != TQt::Vertical)
     return;
 
+  if (ev->state() & ControlButton) {
+      if (ev->delta() > 0) {
+          biggerFont();
+      }
+      else {
+          smallerFont();
+      }
+      ev->accept();
+      return;
+  }
+
   if ( mouse_marks )
   {
 		if (!screen || screen->hasScroll() || (scrollbar->maxValue() == 0 && screen_num == 0))
@@ -1810,7 +1830,7 @@ void TEWidget::setWordCharacters(TQString wc)
 void TEWidget::setMouseMarks(bool on)
 {
   mouse_marks = on;
-  setCursor( mouse_marks ? tqibeamCursor : tqarrowCursor );
+  setCursor( mouse_marks ? TQt::ibeamCursor : TQt::arrowCursor );
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1850,15 +1870,15 @@ void TEWidget::setSelection(const TQString& t)
 {
   // Disconnect signal while WE set the clipboard
   TQClipboard *cb = TQApplication::clipboard();
-  TQObject::disconnect( cb, TQT_SIGNAL(selectionChanged()),
-                     this, TQT_SLOT(onClearSelection()) );
+  TQObject::disconnect( cb, TQ_SIGNAL(selectionChanged()),
+                     this, TQ_SLOT(onClearSelection()) );
 
   cb->setSelectionMode( true );
   cb->setText(t);
   cb->setSelectionMode( false );
 
-  TQObject::connect( cb, TQT_SIGNAL(selectionChanged()),
-                     this, TQT_SLOT(onClearSelection()) );
+  TQObject::connect( cb, TQ_SIGNAL(selectionChanged()),
+                     this, TQ_SLOT(onClearSelection()) );
 }
 
 void TEWidget::copyClipboard()
@@ -1911,14 +1931,14 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e )
   if ( (e->type() == TQEvent::Accel ||
        e->type() == TQEvent::AccelAvailable ) && tqApp->focusWidget() == this )
   {
-      TQT_TQKEYEVENT( e )->ignore();
+      static_cast<TQKeyEvent*>( e )->ignore();
       return false;
   }
-  if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(this) /* when embedded */ && TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(parent()) /* when standalone */ )
+  if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ )
       return false; // not us
   if ( e->type() == TQEvent::KeyPress )
   {
-    TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+    TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
 
     actSel=0; // Key stroke implies a screen update, so TEWidget won't
               // know where the current selection is.
@@ -1936,13 +1956,13 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e )
   }
   if ( e->type() == TQEvent::KeyRelease )
   {
-    TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+    TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
     emit keyReleasedSignal(ke);
     return true;
   }
   if ( e->type() == TQEvent::FocusIn )
   {
-    TQFocusEvent *fe = TQT_TQFOCUSEVENT(e);
+    TQFocusEvent *fe = static_cast<TQFocusEvent*>(e);
     if (fe->gotFocus())
     {
       emit focusInSignal(fe);
@@ -1952,13 +1972,13 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e )
   }
   if ( e->type() == TQEvent::Enter )
   {
-    TQObject::disconnect( (TQObject*)cb, TQT_SIGNAL(dataChanged()),
-      this, TQT_SLOT(onClearSelection()) );
+    TQObject::disconnect( (TQObject*)cb, TQ_SIGNAL(dataChanged()),
+      this, TQ_SLOT(onClearSelection()) );
   }
   if ( e->type() == TQEvent::Leave )
   {
-    TQObject::connect( (TQObject*)cb, TQT_SIGNAL(dataChanged()),
-      this, TQT_SLOT(onClearSelection()) );
+    TQObject::connect( (TQObject*)cb, TQ_SIGNAL(dataChanged()),
+      this, TQ_SLOT(onClearSelection()) );
   }
   return TQFrame::eventFilter( obj, e );
 }
@@ -2030,7 +2050,7 @@ bool TEWidget::event( TQEvent *e )
 {
   if ( e->type() == TQEvent::AccelOverride )
   {
-    TQKeyEvent *ke = TQT_TQKEYEVENT( e );
+    TQKeyEvent *ke = static_cast<TQKeyEvent*>( e );
     KKey key( ke );
     int keyCodeQt = key.keyCodeQt();
 
@@ -2104,7 +2124,7 @@ void TEWidget::Bell(bool visibleSession, TQString message)
     bellTimer.start(BELLVISUAL_DELAY,true);
     
     swapColorTable();
-    TQTimer::singleShot(200,this,TQT_SLOT(swapColorTable()));
+    TQTimer::singleShot(200,this,TQ_SLOT(swapColorTable()));
   }
 }
 
@@ -2250,7 +2270,7 @@ void TEWidget::dropEvent(TQDropEvent* event)
       m_drop->insertItem( "cp", cp );
       m_drop->insertItem( "ln", ln );
       m_drop->insertItem( "mv", mv );
-      connect(m_drop, TQT_SIGNAL(activated(int)), TQT_SLOT(drop_menu_activated(int)));
+      connect(m_drop, TQ_SIGNAL(activated(int)), TQ_SLOT(drop_menu_activated(int)));
    };
     // The current behaviour when url(s) are dropped is
     // * if there is only ONE url and if it's a LOCAL one, ask for paste or cd/cp/ln/mv
diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h
index 967896082..047c04b4b 100644
--- a/konsole/konsole/TEWidget.h
+++ b/konsole/konsole/TEWidget.h
@@ -44,7 +44,7 @@ class TQTimer;
 class TEWidget : public TQFrame
 // a widget representing attributed text
 {
-   Q_OBJECT
+   TQ_OBJECT
    
 
   friend class Konsole;
@@ -53,7 +53,7 @@ public:
     TEWidget(TQWidget *parent=0, const char *name=0);
     virtual ~TEWidget();
 
-    void setBlendColor(const QRgb color) { blend_color = color; }
+    void setBlendColor(const TQRgb color) { blend_color = color; }
 
     void setDefaultBackColor(const TQColor& color);
     TQColor getDefaultBackColor();
@@ -126,6 +126,10 @@ public:
      */
     void setVTFont(const TQFont& font);
 
+    /** Changes font size by 1 point */
+    void biggerFont();
+    void smallerFont();
+
     void setMouseMarks(bool on);
     static void setAntialias( bool enable ) { s_antialias = enable; }
     static bool antialias()                 { return s_antialias;   }
@@ -335,7 +339,7 @@ private:
     bool m_isIMEdit;
     bool m_isIMSel;
 
-    QRgb blend_color;
+    TQRgb blend_color;
  
 private slots:
     void drop_menu_activated(int item);
diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp
index fb38b6e18..1d303089d 100644
--- a/konsole/konsole/TEmuVt102.cpp
+++ b/konsole/konsole/TEmuVt102.cpp
@@ -81,10 +81,10 @@
 TEmuVt102::TEmuVt102(TEWidget* gui) : TEmulation(gui)
 {
   //kdDebug(1211)<<"TEmuVt102 ctor() connecting"<<endl;
-  TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)),
-                   this,TQT_SLOT(onMouse(int,int,int)));
-  TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)),
-		   this, TQT_SLOT(sendString(const char*)));
+  TQObject::connect(gui,TQ_SIGNAL(mouseSignal(int,int,int)),
+                   this,TQ_SLOT(onMouse(int,int,int)));
+  TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)),
+		   this, TQ_SLOT(sendString(const char*)));
   //kdDebug(1211)<<"TEmuVt102 ctor() initToken..."<<endl;
   initTokenizer();
   //kdDebug(1211)<<"TEmuVt102 ctor() reset()"<<endl;
@@ -100,16 +100,16 @@ void TEmuVt102::changeGUI(TEWidget* newgui)
   if (static_cast<TEWidget *>( gui )==newgui) return;
 
   if ( gui ) {
-    TQObject::disconnect(gui,TQT_SIGNAL(mouseSignal(int,int,int)),
-                        this,TQT_SLOT(onMouse(int,int,int)));
-    TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)),
-                        this, TQT_SLOT(sendString(const char*)));
+    TQObject::disconnect(gui,TQ_SIGNAL(mouseSignal(int,int,int)),
+                        this,TQ_SLOT(onMouse(int,int,int)));
+    TQObject::disconnect(gui, TQ_SIGNAL(sendStringToEmu(const char*)),
+                        this, TQ_SLOT(sendString(const char*)));
   }
   TEmulation::changeGUI(newgui);
-  TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)),
-                   this,TQT_SLOT(onMouse(int,int,int)));
-  TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)),
-		   this, TQT_SLOT(sendString(const char*)));
+  TQObject::connect(gui,TQ_SIGNAL(mouseSignal(int,int,int)),
+                   this,TQ_SLOT(onMouse(int,int,int)));
+  TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)),
+		   this, TQ_SLOT(sendString(const char*)));
 }
 
 /*!
@@ -967,17 +967,17 @@ void TEmuVt102::doKeyPress( TQKeyEvent* ev )
   {
     switch(ev->key())
     {
-    case Qt::Key_Down : gui->doScroll(+1); return;
-    case Qt::Key_Up : gui->doScroll(-1); return;
-    case Qt::Key_PageUp : gui->doScroll(-gui->Lines()/2); return;
-    case Qt::Key_PageDown : gui->doScroll(gui->Lines()/2); return;
+    case TQt::Key_Down : gui->doScroll(+1); return;
+    case TQt::Key_Up : gui->doScroll(-1); return;
+    case TQt::Key_PageUp : gui->doScroll(-gui->Lines()/2); return;
+    case TQt::Key_PageDown : gui->doScroll(gui->Lines()/2); return;
     }
   }
   
   // revert to non-history when typing
   if (scr->getHistCursor() != scr->getHistLines() && (!ev->text().isEmpty()
-    || ev->key()==Qt::Key_Down || ev->key()==Qt::Key_Up || ev->key()==Qt::Key_Left || ev->key()==Qt::Key_Right
-    || ev->key()==Qt::Key_PageUp || ev->key()==Qt::Key_PageDown))
+    || ev->key()==TQt::Key_Down || ev->key()==TQt::Key_Up || ev->key()==TQt::Key_Left || ev->key()==TQt::Key_Right
+    || ev->key()==TQt::Key_PageUp || ev->key()==TQt::Key_PageDown))
     scr->setHistCursor(scr->getHistLines());
 
   if (cmd==CMD_send)
@@ -1204,8 +1204,8 @@ void TEmuVt102::setConnect(bool c)
   TEmulation::setConnect(c);
   if (gui)
   {
-    TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)),
-                        this, TQT_SLOT(sendString(const char*)));
+    TQObject::disconnect(gui, TQ_SIGNAL(sendStringToEmu(const char*)),
+                        this, TQ_SLOT(sendString(const char*)));
   }
   if (c)
   { // refresh mouse mode
@@ -1219,8 +1219,8 @@ void TEmuVt102::setConnect(bool c)
     else
       scrolllock_set_off();
 #endif
-    TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)),
-                     this, TQT_SLOT(sendString(const char*)));
+    TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)),
+                     this, TQ_SLOT(sendString(const char*)));
   }
 }
 
@@ -1231,7 +1231,7 @@ char TEmuVt102::getErase()
   int len;
   bool metaspecified;
   
-  if (keytrans->findEntry(Qt::Key_Backspace, 0, &cmd, &txt, &len,
+  if (keytrans->findEntry(TQt::Key_Backspace, 0, &cmd, &txt, &len,
       &metaspecified) && (cmd==CMD_send) && (len == 1))
     return txt[0];
     
diff --git a/konsole/konsole/TEmuVt102.h b/konsole/konsole/TEmuVt102.h
index 8832a73d8..e77fa0ea9 100644
--- a/konsole/konsole/TEmuVt102.h
+++ b/konsole/konsole/TEmuVt102.h
@@ -52,7 +52,7 @@ struct CharCodes
 };
 
 class TEmuVt102 : public TEmulation
-{ Q_OBJECT
+{ TQ_OBJECT
 
 public:
 
diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp
index 943d2f205..4a4c709e4 100644
--- a/konsole/konsole/TEmulation.cpp
+++ b/konsole/konsole/TEmulation.cpp
@@ -110,8 +110,8 @@ TEmulation::TEmulation(TEWidget* w)
   screen[1] = new TEScreen(gui->Lines(),gui->Columns());
   scr = screen[0];
 
-  TQObject::connect(&bulk_timer1, TQT_SIGNAL(timeout()), this, TQT_SLOT(showBulk()) );
-  TQObject::connect(&bulk_timer2, TQT_SIGNAL(timeout()), this, TQT_SLOT(showBulk()) );
+  TQObject::connect(&bulk_timer1, TQ_SIGNAL(timeout()), this, TQ_SLOT(showBulk()) );
+  TQObject::connect(&bulk_timer2, TQ_SIGNAL(timeout()), this, TQ_SLOT(showBulk()) );
   connectGUI();
   setKeymap(0); // Default keymap
 }
@@ -121,28 +121,28 @@ TEmulation::TEmulation(TEWidget* w)
 
 void TEmulation::connectGUI()
 {
-  TQObject::connect(gui,TQT_SIGNAL(changedHistoryCursor(int)),
-                   this,TQT_SLOT(onHistoryCursorChange(int)));
-  TQObject::connect(gui,TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)),
-                   this,TQT_SLOT(onKeyPress(TQKeyEvent*)));
-  TQObject::connect(gui,TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
-                   this,TQT_SLOT(onKeyReleased(TQKeyEvent*)));
-  TQObject::connect(gui,TQT_SIGNAL(focusInSignal(TQFocusEvent*)),
-                   this,TQT_SLOT(onFocusIn(TQFocusEvent*)));
-  TQObject::connect(gui,TQT_SIGNAL(beginSelectionSignal(const int,const int,const bool)),
-		   this,TQT_SLOT(onSelectionBegin(const int,const int,const bool)) );
-  TQObject::connect(gui,TQT_SIGNAL(extendSelectionSignal(const int,const int)),
-		   this,TQT_SLOT(onSelectionExtend(const int,const int)) );
-  TQObject::connect(gui,TQT_SIGNAL(endSelectionSignal(const bool)),
-		   this,TQT_SLOT(setSelection(const bool)) );
-  TQObject::connect(gui,TQT_SIGNAL(copySelectionSignal()),
-		   this,TQT_SLOT(copySelection()) );
-  TQObject::connect(gui,TQT_SIGNAL(clearSelectionSignal()),
-		   this,TQT_SLOT(clearSelection()) );
-  TQObject::connect(gui,TQT_SIGNAL(isBusySelecting(bool)),
-		   this,TQT_SLOT(isBusySelecting(bool)) );
-  TQObject::connect(gui,TQT_SIGNAL(testIsSelected(const int, const int, bool &)),
-		   this,TQT_SLOT(testIsSelected(const int, const int, bool &)) );
+  TQObject::connect(gui,TQ_SIGNAL(changedHistoryCursor(int)),
+                   this,TQ_SLOT(onHistoryCursorChange(int)));
+  TQObject::connect(gui,TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)),
+                   this,TQ_SLOT(onKeyPress(TQKeyEvent*)));
+  TQObject::connect(gui,TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
+                   this,TQ_SLOT(onKeyReleased(TQKeyEvent*)));
+  TQObject::connect(gui,TQ_SIGNAL(focusInSignal(TQFocusEvent*)),
+                   this,TQ_SLOT(onFocusIn(TQFocusEvent*)));
+  TQObject::connect(gui,TQ_SIGNAL(beginSelectionSignal(const int,const int,const bool)),
+		   this,TQ_SLOT(onSelectionBegin(const int,const int,const bool)) );
+  TQObject::connect(gui,TQ_SIGNAL(extendSelectionSignal(const int,const int)),
+		   this,TQ_SLOT(onSelectionExtend(const int,const int)) );
+  TQObject::connect(gui,TQ_SIGNAL(endSelectionSignal(const bool)),
+		   this,TQ_SLOT(setSelection(const bool)) );
+  TQObject::connect(gui,TQ_SIGNAL(copySelectionSignal()),
+		   this,TQ_SLOT(copySelection()) );
+  TQObject::connect(gui,TQ_SIGNAL(clearSelectionSignal()),
+		   this,TQ_SLOT(clearSelection()) );
+  TQObject::connect(gui,TQ_SIGNAL(isBusySelecting(bool)),
+		   this,TQ_SLOT(isBusySelecting(bool)) );
+  TQObject::connect(gui,TQ_SIGNAL(testIsSelected(const int, const int, bool &)),
+		   this,TQ_SLOT(testIsSelected(const int, const int, bool &)) );
 }
 
 /*!
@@ -153,28 +153,28 @@ void TEmulation::changeGUI(TEWidget* newgui)
   if (static_cast<TEWidget *>( gui )==newgui) return;
 
   if ( gui ) {
-    TQObject::disconnect(gui,TQT_SIGNAL(changedHistoryCursor(int)),
-                     this,TQT_SLOT(onHistoryCursorChange(int)));
-    TQObject::disconnect(gui,TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)),
-                     this,TQT_SLOT(onKeyPress(TQKeyEvent*)));
-    TQObject::disconnect(gui,TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
-                     this,TQT_SLOT(onKeyReleased(TQKeyEvent*)));
-    TQObject::disconnect(gui,TQT_SIGNAL(focusInSignal(TQFocusEvent*)),
-                     this,TQT_SLOT(onFocusIn(TQFocusEvent*)));
-    TQObject::disconnect(gui,TQT_SIGNAL(beginSelectionSignal(const int,const int,const bool)),
-                     this,TQT_SLOT(onSelectionBegin(const int,const int,const bool)) );
-    TQObject::disconnect(gui,TQT_SIGNAL(extendSelectionSignal(const int,const int)),
-                     this,TQT_SLOT(onSelectionExtend(const int,const int)) );
-    TQObject::disconnect(gui,TQT_SIGNAL(endSelectionSignal(const bool)),
-                     this,TQT_SLOT(setSelection(const bool)) );
-    TQObject::disconnect(gui,TQT_SIGNAL(copySelectionSignal()),
-                     this,TQT_SLOT(copySelection()) );
-    TQObject::disconnect(gui,TQT_SIGNAL(clearSelectionSignal()),
-                     this,TQT_SLOT(clearSelection()) );
-    TQObject::disconnect(gui,TQT_SIGNAL(isBusySelecting(bool)),
-                     this,TQT_SLOT(isBusySelecting(bool)) );
-    TQObject::disconnect(gui,TQT_SIGNAL(testIsSelected(const int, const int, bool &)),
-                     this,TQT_SLOT(testIsSelected(const int, const int, bool &)) );
+    TQObject::disconnect(gui,TQ_SIGNAL(changedHistoryCursor(int)),
+                     this,TQ_SLOT(onHistoryCursorChange(int)));
+    TQObject::disconnect(gui,TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)),
+                     this,TQ_SLOT(onKeyPress(TQKeyEvent*)));
+    TQObject::disconnect(gui,TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
+                     this,TQ_SLOT(onKeyReleased(TQKeyEvent*)));
+    TQObject::disconnect(gui,TQ_SIGNAL(focusInSignal(TQFocusEvent*)),
+                     this,TQ_SLOT(onFocusIn(TQFocusEvent*)));
+    TQObject::disconnect(gui,TQ_SIGNAL(beginSelectionSignal(const int,const int,const bool)),
+                     this,TQ_SLOT(onSelectionBegin(const int,const int,const bool)) );
+    TQObject::disconnect(gui,TQ_SIGNAL(extendSelectionSignal(const int,const int)),
+                     this,TQ_SLOT(onSelectionExtend(const int,const int)) );
+    TQObject::disconnect(gui,TQ_SIGNAL(endSelectionSignal(const bool)),
+                     this,TQ_SLOT(setSelection(const bool)) );
+    TQObject::disconnect(gui,TQ_SIGNAL(copySelectionSignal()),
+                     this,TQ_SLOT(copySelection()) );
+    TQObject::disconnect(gui,TQ_SIGNAL(clearSelectionSignal()),
+                     this,TQ_SLOT(clearSelection()) );
+    TQObject::disconnect(gui,TQ_SIGNAL(isBusySelecting(bool)),
+                     this,TQ_SLOT(isBusySelecting(bool)) );
+    TQObject::disconnect(gui,TQ_SIGNAL(testIsSelected(const int, const int, bool &)),
+                     this,TQ_SLOT(testIsSelected(const int, const int, bool &)) );
   }
   gui=newgui;
   connectGUI();
diff --git a/konsole/konsole/TEmulation.h b/konsole/konsole/TEmulation.h
index 9ddc2a4c7..e6050a9da 100644
--- a/konsole/konsole/TEmulation.h
+++ b/konsole/konsole/TEmulation.h
@@ -31,8 +31,8 @@
 
 enum { NOTIFYNORMAL=0, NOTIFYBELL=1, NOTIFYACTIVITY=2, NOTIFYSILENCE=3 };
 
-class TEmulation : public QObject
-{ Q_OBJECT
+class TEmulation : public TQObject
+{ TQ_OBJECT
 
 public:
 
diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp
index 3712bb0da..7a2b3f566 100644
--- a/konsole/konsole/keytrans.cpp
+++ b/konsole/konsole/keytrans.cpp
@@ -363,11 +363,11 @@ void KeyTrans::readConfig()
       TQBuffer* newbuf;
       newbuf = new TQBuffer();
       newbuf->setBuffer(txt);
-      buf=TQT_TQIODEVICE(newbuf);
+      buf=newbuf;
    }
    else
    {
-      buf=TQT_TQIODEVICE(new TQFile(m_path));
+      buf=new TQFile(m_path);
    };
    KeytabReader ktr(m_path,*buf);
    ktr.parseTo(this);
@@ -519,143 +519,143 @@ void KeyTransSymbols::defModSyms()
 void KeyTransSymbols::defKeySyms()
 {
   // Grey keys
-  defKeySym("Escape",       Qt::Key_Escape      );
-  defKeySym("Tab",          Qt::Key_Tab         );
-  defKeySym("Backtab",      Qt::Key_Backtab     );
-  defKeySym("Backspace",    Qt::Key_Backspace   );
-  defKeySym("Return",       Qt::Key_Return      );
-  defKeySym("Enter",        Qt::Key_Enter       );
-  defKeySym("Insert",       Qt::Key_Insert      );
-  defKeySym("Delete",       Qt::Key_Delete      );
-  defKeySym("Pause",        Qt::Key_Pause       );
-  defKeySym("Print",        Qt::Key_Print       );
-  defKeySym("SysReq",       Qt::Key_SysReq      );
-  defKeySym("Home",         Qt::Key_Home        );
-  defKeySym("End",          Qt::Key_End         );
-  defKeySym("Left",         Qt::Key_Left        );
-  defKeySym("Up",           Qt::Key_Up          );
-  defKeySym("Right",        Qt::Key_Right       );
-  defKeySym("Down",         Qt::Key_Down        );
+  defKeySym("Escape",       TQt::Key_Escape      );
+  defKeySym("Tab",          TQt::Key_Tab         );
+  defKeySym("Backtab",      TQt::Key_Backtab     );
+  defKeySym("Backspace",    TQt::Key_Backspace   );
+  defKeySym("Return",       TQt::Key_Return      );
+  defKeySym("Enter",        TQt::Key_Enter       );
+  defKeySym("Insert",       TQt::Key_Insert      );
+  defKeySym("Delete",       TQt::Key_Delete      );
+  defKeySym("Pause",        TQt::Key_Pause       );
+  defKeySym("Print",        TQt::Key_Print       );
+  defKeySym("SysReq",       TQt::Key_SysReq      );
+  defKeySym("Home",         TQt::Key_Home        );
+  defKeySym("End",          TQt::Key_End         );
+  defKeySym("Left",         TQt::Key_Left        );
+  defKeySym("Up",           TQt::Key_Up          );
+  defKeySym("Right",        TQt::Key_Right       );
+  defKeySym("Down",         TQt::Key_Down        );
   defKeySym("Prior",        TQt::Key_Prior      );
   defKeySym("Next",         TQt::Key_Next       );
-  defKeySym("Shift",        Qt::Key_Shift       );
-  defKeySym("Control",      Qt::Key_Control     );
-  defKeySym("Meta",         Qt::Key_Meta        );
-  defKeySym("Alt",          Qt::Key_Alt         );
-  defKeySym("CapsLock",     Qt::Key_CapsLock    );
-  defKeySym("NumLock",      Qt::Key_NumLock     );
-  defKeySym("ScrollLock",   Qt::Key_ScrollLock  );
-  defKeySym("F1",           Qt::Key_F1          );
-  defKeySym("F2",           Qt::Key_F2          );
-  defKeySym("F3",           Qt::Key_F3          );
-  defKeySym("F4",           Qt::Key_F4          );
-  defKeySym("F5",           Qt::Key_F5          );
-  defKeySym("F6",           Qt::Key_F6          );
-  defKeySym("F7",           Qt::Key_F7          );
-  defKeySym("F8",           Qt::Key_F8          );
-  defKeySym("F9",           Qt::Key_F9          );
-  defKeySym("F10",          Qt::Key_F10         );
-  defKeySym("F11",          Qt::Key_F11         );
-  defKeySym("F12",          Qt::Key_F12         );
-  defKeySym("F13",          Qt::Key_F13         );
-  defKeySym("F14",          Qt::Key_F14         );
-  defKeySym("F15",          Qt::Key_F15         );
-  defKeySym("F16",          Qt::Key_F16         );
-  defKeySym("F17",          Qt::Key_F17         );
-  defKeySym("F18",          Qt::Key_F18         );
-  defKeySym("F19",          Qt::Key_F19         );
-  defKeySym("F20",          Qt::Key_F20         );
-  defKeySym("F21",          Qt::Key_F21         );
-  defKeySym("F22",          Qt::Key_F22         );
-  defKeySym("F23",          Qt::Key_F23         );
-  defKeySym("F24",          Qt::Key_F24         );
-  defKeySym("F25",          Qt::Key_F25         );
-  defKeySym("F26",          Qt::Key_F26         );
-  defKeySym("F27",          Qt::Key_F27         );
-  defKeySym("F28",          Qt::Key_F28         );
-  defKeySym("F29",          Qt::Key_F29         );
-  defKeySym("F30",          Qt::Key_F30         );
-  defKeySym("F31",          Qt::Key_F31         );
-  defKeySym("F32",          Qt::Key_F32         );
-  defKeySym("F33",          Qt::Key_F33         );
-  defKeySym("F34",          Qt::Key_F34         );
-  defKeySym("F35",          Qt::Key_F35         );
-  defKeySym("Super_L",      Qt::Key_Super_L     );
-  defKeySym("Super_R",      Qt::Key_Super_R     );
-  defKeySym("Menu",         Qt::Key_Menu        );
-  defKeySym("Hyper_L",      Qt::Key_Hyper_L     );
-  defKeySym("Hyper_R",      Qt::Key_Hyper_R     );
+  defKeySym("Shift",        TQt::Key_Shift       );
+  defKeySym("Control",      TQt::Key_Control     );
+  defKeySym("Meta",         TQt::Key_Meta        );
+  defKeySym("Alt",          TQt::Key_Alt         );
+  defKeySym("CapsLock",     TQt::Key_CapsLock    );
+  defKeySym("NumLock",      TQt::Key_NumLock     );
+  defKeySym("ScrollLock",   TQt::Key_ScrollLock  );
+  defKeySym("F1",           TQt::Key_F1          );
+  defKeySym("F2",           TQt::Key_F2          );
+  defKeySym("F3",           TQt::Key_F3          );
+  defKeySym("F4",           TQt::Key_F4          );
+  defKeySym("F5",           TQt::Key_F5          );
+  defKeySym("F6",           TQt::Key_F6          );
+  defKeySym("F7",           TQt::Key_F7          );
+  defKeySym("F8",           TQt::Key_F8          );
+  defKeySym("F9",           TQt::Key_F9          );
+  defKeySym("F10",          TQt::Key_F10         );
+  defKeySym("F11",          TQt::Key_F11         );
+  defKeySym("F12",          TQt::Key_F12         );
+  defKeySym("F13",          TQt::Key_F13         );
+  defKeySym("F14",          TQt::Key_F14         );
+  defKeySym("F15",          TQt::Key_F15         );
+  defKeySym("F16",          TQt::Key_F16         );
+  defKeySym("F17",          TQt::Key_F17         );
+  defKeySym("F18",          TQt::Key_F18         );
+  defKeySym("F19",          TQt::Key_F19         );
+  defKeySym("F20",          TQt::Key_F20         );
+  defKeySym("F21",          TQt::Key_F21         );
+  defKeySym("F22",          TQt::Key_F22         );
+  defKeySym("F23",          TQt::Key_F23         );
+  defKeySym("F24",          TQt::Key_F24         );
+  defKeySym("F25",          TQt::Key_F25         );
+  defKeySym("F26",          TQt::Key_F26         );
+  defKeySym("F27",          TQt::Key_F27         );
+  defKeySym("F28",          TQt::Key_F28         );
+  defKeySym("F29",          TQt::Key_F29         );
+  defKeySym("F30",          TQt::Key_F30         );
+  defKeySym("F31",          TQt::Key_F31         );
+  defKeySym("F32",          TQt::Key_F32         );
+  defKeySym("F33",          TQt::Key_F33         );
+  defKeySym("F34",          TQt::Key_F34         );
+  defKeySym("F35",          TQt::Key_F35         );
+  defKeySym("Super_L",      TQt::Key_Super_L     );
+  defKeySym("Super_R",      TQt::Key_Super_R     );
+  defKeySym("Menu",         TQt::Key_Menu        );
+  defKeySym("Hyper_L",      TQt::Key_Hyper_L     );
+  defKeySym("Hyper_R",      TQt::Key_Hyper_R     );
 
   // Regular keys
-  defKeySym("Space",        Qt::Key_Space       );
-  defKeySym("Exclam",       Qt::Key_Exclam      );
-  defKeySym("QuoteDbl",     Qt::Key_QuoteDbl    );
-  defKeySym("NumberSign",   Qt::Key_NumberSign  );
-  defKeySym("Dollar",       Qt::Key_Dollar      );
-  defKeySym("Percent",      Qt::Key_Percent     );
-  defKeySym("Ampersand",    Qt::Key_Ampersand   );
-  defKeySym("Apostrophe",   Qt::Key_Apostrophe  );
-  defKeySym("ParenLeft",    Qt::Key_ParenLeft   );
-  defKeySym("ParenRight",   Qt::Key_ParenRight  );
-  defKeySym("Asterisk",     Qt::Key_Asterisk    );
-  defKeySym("Plus",         Qt::Key_Plus        );
-  defKeySym("Comma",        Qt::Key_Comma       );
-  defKeySym("Minus",        Qt::Key_Minus       );
-  defKeySym("Period",       Qt::Key_Period      );
-  defKeySym("Slash",        Qt::Key_Slash       );
-  defKeySym("0",            Qt::Key_0           );
-  defKeySym("1",            Qt::Key_1           );
-  defKeySym("2",            Qt::Key_2           );
-  defKeySym("3",            Qt::Key_3           );
-  defKeySym("4",            Qt::Key_4           );
-  defKeySym("5",            Qt::Key_5           );
-  defKeySym("6",            Qt::Key_6           );
-  defKeySym("7",            Qt::Key_7           );
-  defKeySym("8",            Qt::Key_8           );
-  defKeySym("9",            Qt::Key_9           );
-  defKeySym("Colon",        Qt::Key_Colon       );
-  defKeySym("Semicolon",    Qt::Key_Semicolon   );
-  defKeySym("Less",         Qt::Key_Less        );
-  defKeySym("Equal",        Qt::Key_Equal       );
-  defKeySym("Greater",      Qt::Key_Greater     );
-  defKeySym("Question",     Qt::Key_Question    );
-  defKeySym("At",           Qt::Key_At          );
-  defKeySym("A",            Qt::Key_A           );
-  defKeySym("B",            Qt::Key_B           );
-  defKeySym("C",            Qt::Key_C           );
-  defKeySym("D",            Qt::Key_D           );
-  defKeySym("E",            Qt::Key_E           );
-  defKeySym("F",            Qt::Key_F           );
-  defKeySym("G",            Qt::Key_G           );
-  defKeySym("H",            Qt::Key_H           );
-  defKeySym("I",            Qt::Key_I           );
-  defKeySym("J",            Qt::Key_J           );
-  defKeySym("K",            Qt::Key_K           );
-  defKeySym("L",            Qt::Key_L           );
-  defKeySym("M",            Qt::Key_M           );
-  defKeySym("N",            Qt::Key_N           );
-  defKeySym("O",            Qt::Key_O           );
-  defKeySym("P",            Qt::Key_P           );
-  defKeySym("Q",            Qt::Key_Q           );
-  defKeySym("R",            Qt::Key_R           );
-  defKeySym("S",            Qt::Key_S           );
-  defKeySym("T",            Qt::Key_T           );
-  defKeySym("U",            Qt::Key_U           );
-  defKeySym("V",            Qt::Key_V           );
-  defKeySym("W",            Qt::Key_W           );
-  defKeySym("X",            Qt::Key_X           );
-  defKeySym("Y",            Qt::Key_Y           );
-  defKeySym("Z",            Qt::Key_Z           );
-  defKeySym("BracketLeft",  Qt::Key_BracketLeft );
-  defKeySym("Backslash",    Qt::Key_Backslash   );
-  defKeySym("BracketRight", Qt::Key_BracketRight);
-  defKeySym("AsciiCircum",  Qt::Key_AsciiCircum );
-  defKeySym("Underscore",   Qt::Key_Underscore  );
-  defKeySym("QuoteLeft",    Qt::Key_QuoteLeft   );
-  defKeySym("BraceLeft",    Qt::Key_BraceLeft   );
-  defKeySym("Bar",          Qt::Key_Bar         );
-  defKeySym("BraceRight",   Qt::Key_BraceRight  );
-  defKeySym("AsciiTilde",   Qt::Key_AsciiTilde  );
+  defKeySym("Space",        TQt::Key_Space       );
+  defKeySym("Exclam",       TQt::Key_Exclam      );
+  defKeySym("QuoteDbl",     TQt::Key_QuoteDbl    );
+  defKeySym("NumberSign",   TQt::Key_NumberSign  );
+  defKeySym("Dollar",       TQt::Key_Dollar      );
+  defKeySym("Percent",      TQt::Key_Percent     );
+  defKeySym("Ampersand",    TQt::Key_Ampersand   );
+  defKeySym("Apostrophe",   TQt::Key_Apostrophe  );
+  defKeySym("ParenLeft",    TQt::Key_ParenLeft   );
+  defKeySym("ParenRight",   TQt::Key_ParenRight  );
+  defKeySym("Asterisk",     TQt::Key_Asterisk    );
+  defKeySym("Plus",         TQt::Key_Plus        );
+  defKeySym("Comma",        TQt::Key_Comma       );
+  defKeySym("Minus",        TQt::Key_Minus       );
+  defKeySym("Period",       TQt::Key_Period      );
+  defKeySym("Slash",        TQt::Key_Slash       );
+  defKeySym("0",            TQt::Key_0           );
+  defKeySym("1",            TQt::Key_1           );
+  defKeySym("2",            TQt::Key_2           );
+  defKeySym("3",            TQt::Key_3           );
+  defKeySym("4",            TQt::Key_4           );
+  defKeySym("5",            TQt::Key_5           );
+  defKeySym("6",            TQt::Key_6           );
+  defKeySym("7",            TQt::Key_7           );
+  defKeySym("8",            TQt::Key_8           );
+  defKeySym("9",            TQt::Key_9           );
+  defKeySym("Colon",        TQt::Key_Colon       );
+  defKeySym("Semicolon",    TQt::Key_Semicolon   );
+  defKeySym("Less",         TQt::Key_Less        );
+  defKeySym("Equal",        TQt::Key_Equal       );
+  defKeySym("Greater",      TQt::Key_Greater     );
+  defKeySym("Question",     TQt::Key_Question    );
+  defKeySym("At",           TQt::Key_At          );
+  defKeySym("A",            TQt::Key_A           );
+  defKeySym("B",            TQt::Key_B           );
+  defKeySym("C",            TQt::Key_C           );
+  defKeySym("D",            TQt::Key_D           );
+  defKeySym("E",            TQt::Key_E           );
+  defKeySym("F",            TQt::Key_F           );
+  defKeySym("G",            TQt::Key_G           );
+  defKeySym("H",            TQt::Key_H           );
+  defKeySym("I",            TQt::Key_I           );
+  defKeySym("J",            TQt::Key_J           );
+  defKeySym("K",            TQt::Key_K           );
+  defKeySym("L",            TQt::Key_L           );
+  defKeySym("M",            TQt::Key_M           );
+  defKeySym("N",            TQt::Key_N           );
+  defKeySym("O",            TQt::Key_O           );
+  defKeySym("P",            TQt::Key_P           );
+  defKeySym("Q",            TQt::Key_Q           );
+  defKeySym("R",            TQt::Key_R           );
+  defKeySym("S",            TQt::Key_S           );
+  defKeySym("T",            TQt::Key_T           );
+  defKeySym("U",            TQt::Key_U           );
+  defKeySym("V",            TQt::Key_V           );
+  defKeySym("W",            TQt::Key_W           );
+  defKeySym("X",            TQt::Key_X           );
+  defKeySym("Y",            TQt::Key_Y           );
+  defKeySym("Z",            TQt::Key_Z           );
+  defKeySym("BracketLeft",  TQt::Key_BracketLeft );
+  defKeySym("Backslash",    TQt::Key_Backslash   );
+  defKeySym("BracketRight", TQt::Key_BracketRight);
+  defKeySym("AsciiCircum",  TQt::Key_AsciiCircum );
+  defKeySym("Underscore",   TQt::Key_Underscore  );
+  defKeySym("QuoteLeft",    TQt::Key_QuoteLeft   );
+  defKeySym("BraceLeft",    TQt::Key_BraceLeft   );
+  defKeySym("Bar",          TQt::Key_Bar         );
+  defKeySym("BraceRight",   TQt::Key_BraceRight  );
+  defKeySym("AsciiTilde",   TQt::Key_AsciiTilde  );
 }
 
 KeyTransSymbols::KeyTransSymbols()
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 4faef5239..dae5b834c 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -290,16 +290,16 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
 ,m_filterData(0)
 {
   isRestored = b_inRestore;
-  connect( &m_closeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCouldNotClose()));
+  connect( &m_closeTimeout, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCouldNotClose()));
 
   no2command.setAutoDelete(true);
   menubar = menuBar();
 
   TDEAcceleratorManager::setNoAccel( menubar );
 
-  sessionNumberMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
-  connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ),
-          this, TQT_SLOT( newSessionTabbar( int ) ) );
+  sessionNumberMapper = new TQSignalMapper( this );
+  connect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ),
+          this, TQ_SLOT( newSessionTabbar( int ) ) );
 
   colors = new ColorSchemaList();
   colors->checkSchemas();
@@ -359,7 +359,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
     if (te) te->setScrollbarLocation(TEWidget::SCRNONE);
   }
 
-//  connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), this, TQT_SLOT(slotFontChanged()));
+//  connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotFontChanged()));
 
   kapp->dcopClient()->setDefaultObject( "konsole" );
 }
@@ -476,29 +476,29 @@ void Konsole::makeGUI()
    if (m_menuCreated) return;
 
    if (m_tabbarSessionsCommands)
-      disconnect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
-   disconnect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+      disconnect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
+   disconnect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
    if (m_options)
-      disconnect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+      disconnect(m_options,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
    if (m_help)
-      disconnect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+      disconnect(m_help,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
    if (m_rightButton)
-      disconnect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
-   disconnect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
-   disconnect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+      disconnect(m_rightButton,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
+   disconnect(m_edit,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
+   disconnect(m_view,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
    if (m_bookmarks)
-      disconnect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+      disconnect(m_bookmarks,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
    if (m_bookmarksSession)
-      disconnect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+      disconnect(m_bookmarksSession,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
    if (m_tabbarSessionsCommands)
-      connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions()));
-   connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions()));
+      connect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(loadScreenSessions()));
+   connect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(loadScreenSessions()));
    m_menuCreated=true;
 
    // Remove the empty separator Qt inserts if the menu is empty on popup,
    // not sure if this will be "fixed" in Qt, for now use this hack (malte)
    if(!(isRestored)) {
-     if (sender() && sender()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) &&
+     if (sender() && sender()->inherits("TQPopupMenu") &&
        static_cast<const TQPopupMenu *>(sender())->count() == 1)
        const_cast<TQPopupMenu *>(static_cast<const TQPopupMenu *>(sender()))->removeItemAt(0);
        }
@@ -517,7 +517,7 @@ void Konsole::makeGUI()
       m_signals->insertItem( i18n( "&Kill Task" )      + " (KILL)", SIGKILL);
       m_signals->insertItem( i18n( "User Signal &1")   + " (USR1)", SIGUSR1);
       m_signals->insertItem( i18n( "User Signal &2")   + " (USR2)", SIGUSR2);
-      connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int)));
+      connect(m_signals, TQ_SIGNAL(activated(int)), TQ_SLOT(sendSignal(int)));
       TDEAcceleratorManager::manage( m_signals );
    }
 
@@ -571,28 +571,28 @@ void Konsole::makeGUI()
 
    //bookmarks menu
    if (bookmarkHandler)
-      connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString&, const TQString& )),
-            TQT_SLOT( enterURL( const TQString&, const TQString& )));
+      connect( bookmarkHandler, TQ_SIGNAL( openURL( const TQString&, const TQString& )),
+            TQ_SLOT( enterURL( const TQString&, const TQString& )));
    if (bookmarkHandlerSession)
-      connect( bookmarkHandlerSession, TQT_SIGNAL( openURL( const TQString&, const TQString& )),
-            TQT_SLOT( newSession( const TQString&, const TQString& )));
+      connect( bookmarkHandlerSession, TQ_SIGNAL( openURL( const TQString&, const TQString& )),
+            TQ_SLOT( newSession( const TQString&, const TQString& )));
    if (m_bookmarks)
-      connect(m_bookmarks, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check()));
+      connect(m_bookmarks, TQ_SIGNAL(aboutToShow()), TQ_SLOT(bookmarks_menu_check()));
    if (m_bookmarksSession)
-      connect(m_bookmarksSession, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check()));
+      connect(m_bookmarksSession, TQ_SIGNAL(aboutToShow()), TQ_SLOT(bookmarks_menu_check()));
 
    // Schema Options Menu -----------------------------------------------------
    m_schema = new TDEPopupMenu(this);
    m_schema->setCheckable(true);
    TDEAcceleratorManager::manage( m_schema );
-   connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int)));
-   connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check()));
+   connect(m_schema, TQ_SIGNAL(activated(int)), TQ_SLOT(schema_menu_activated(int)));
+   connect(m_schema, TQ_SIGNAL(aboutToShow()), TQ_SLOT(schema_menu_check()));
 
    // Keyboard Options Menu ---------------------------------------------------
    m_keytab = new TDEPopupMenu(this);
    m_keytab->setCheckable(true);
    TDEAcceleratorManager::manage( m_keytab );
-   connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int)));
+   connect(m_keytab, TQ_SIGNAL(activated(int)), TQ_SLOT(keytab_menu_activated(int)));
 
    //options menu
    if (m_options)
@@ -601,16 +601,16 @@ void Konsole::makeGUI()
       showMenubar->plug ( m_options );
 
       // Tabbar
-      selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, TQT_TQOBJECT(this),
-                                       TQT_SLOT(slotSelectTabbar()), actions, "tabbar" );
+      selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, this,
+                                       TQ_SLOT(slotSelectTabbar()), actions, "tabbar" );
       TQStringList tabbaritems;
       tabbaritems << i18n("&Hide") << i18n("&Top") << i18n("&Bottom");
       selectTabbar->setItems(tabbaritems);
       selectTabbar->plug(m_options);
 
       // Scrollbar
-      selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, TQT_TQOBJECT(this),
-                                       TQT_SLOT(slotSelectScrollbar()), actions, "scrollbar" );
+      selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, this,
+                                       TQ_SLOT(slotSelectScrollbar()), actions, "scrollbar" );
       TQStringList scrollitems;
       scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right");
       selectScrollbar->setItems(scrollitems);
@@ -625,8 +625,8 @@ void Konsole::makeGUI()
       }
 
       // Select Bell
-      selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , TQT_TQOBJECT(this),
-                                  TQT_SLOT(slotSelectBell()), actions, "bell");
+      selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this,
+                                  TQ_SLOT(slotSelectBell()), actions, "bell");
       TQStringList bellitems;
       bellitems << i18n("System &Bell")
                 << i18n("System &Notification")
@@ -640,28 +640,28 @@ void Konsole::makeGUI()
                                                   SmallIconSet( "text" ),
                                                   actions, 0L );
       m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ),
-                           SmallIconSet( "fontsizeup" ), 0, TQT_TQOBJECT(this),
-                           TQT_SLOT( biggerFont() ), actions,
+                           SmallIconSet( "fontsizeup" ), 0, this,
+                           TQ_SLOT( biggerFont() ), actions,
                            "enlarge_font" ) );
       m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ),
-                           SmallIconSet( "fontsizedown" ), 0, TQT_TQOBJECT(this),
-                           TQT_SLOT( smallerFont() ), actions,
+                           SmallIconSet( "fontsizedown" ), 0, this,
+                           TQ_SLOT( smallerFont() ), actions,
                            "shrink_font" ) );
       m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ),
-                           SmallIconSet( "font-x-generic" ), 0, TQT_TQOBJECT(this),
-                           TQT_SLOT( slotSelectFont() ), actions,
+                           SmallIconSet( "font-x-generic" ), 0, this,
+                           TQ_SLOT( slotSelectFont() ), actions,
                            "select_font" ) );
       if ( b_installBitmapFonts )
       {
          m_fontsizes->insert( new TDEAction( i18n( "&Install Bitmap..." ),
-                              SmallIconSet( "font-x-generic" ), 0, TQT_TQOBJECT(this),
-                              TQT_SLOT( slotInstallBitmapFonts() ), actions,
+                              SmallIconSet( "font-x-generic" ), 0, this,
+                              TQ_SLOT( slotInstallBitmapFonts() ), actions,
                               "install_fonts" ) );
       }
       m_fontsizes->plug(m_options);
 
       // encoding menu, start with default checked !
-      selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetEncoding()), actions, "set_encoding" );
+      selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, this, TQ_SLOT(slotSetEncoding()), actions, "set_encoding" );
       TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames();
       list.prepend( i18n( "Default" ) );
       selectSetEncoding->setItems(list);
@@ -678,8 +678,8 @@ void Konsole::makeGUI()
       // Select size
       if (!b_fixedSize)
       {
-         selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, TQT_TQOBJECT(this),
-                                  TQT_SLOT(slotSelectSize()), actions, "size");
+         selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, this,
+                                  TQ_SLOT(slotSelectSize()), actions, "size");
          TQStringList sizeitems;
          sizeitems << i18n("40x15 (&Small)")
             << i18n("80x24 (&VT100)")
@@ -692,14 +692,14 @@ void Konsole::makeGUI()
          selectSize->plug(m_options);
       }
 
-      TDEAction *historyType = new TDEAction(i18n("Hist&ory..."), "history", 0, TQT_TQOBJECT(this),
-                                      TQT_SLOT(slotHistoryType()), actions, "history");
+      TDEAction *historyType = new TDEAction(i18n("Hist&ory..."), "history", 0, this,
+                                      TQ_SLOT(slotHistoryType()), actions, "history");
       historyType->plug(m_options);
 
       m_options->insertSeparator();
 
-      TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "document-save", 0, TQT_TQOBJECT(this),
-                                        TQT_SLOT(slotSaveSettings()), actions, "save_default");
+      TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "document-save", 0, this,
+                                        TQ_SLOT(slotSaveSettings()), actions, "save_default");
       save_settings->plug(m_options);
 
       m_options->insertSeparator();
@@ -708,9 +708,9 @@ void Konsole::makeGUI()
 
       m_options->insertSeparator();
 
-      KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options);
-      KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options);
-      TDEAction *configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actions);
+      KStdAction::configureNotifications(this, TQ_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options);
+      KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options);
+      TDEAction *configure = KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actions);
       configure->plug(m_options);
 
       if (TDEGlobalSettings::insertTearOffHandle())
@@ -722,21 +722,21 @@ void Konsole::makeGUI()
    {
       m_help->insertSeparator(1);
       m_help->insertItem(SmallIcon( "idea" ), i18n("&Tip of the Day"),
-            this, TQT_SLOT(showTip()), 0, -1, 2);
+            this, TQ_SLOT(showTip()), 0, -1, 2);
    }
 
    //the different session menus
    buildSessionMenus();
 
-   connect(m_session, TQT_SIGNAL(activated(int)), TQT_SLOT(newSession(int)));
+   connect(m_session, TQ_SIGNAL(activated(int)), TQ_SLOT(newSession(int)));
 
    // Right mouse button menu
    if (m_rightButton)
    {
       updateRMBMenu(); // show menubar / exit fullscreen
 
-      TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(this),
-                               TQT_SLOT(slotSetSelectionEnd()), actions, "selection_end");
+      TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, this,
+                               TQ_SLOT(slotSetSelectionEnd()), actions, "selection_end");
       selectionEnd->plug(m_rightButton);
 
       m_copyClipboard->plug(m_rightButton);
@@ -744,7 +744,7 @@ void Konsole::makeGUI()
 
       m_openSelection = new TDEPopupMenu(this);
       m_rightButton->insertItem( i18n("&Open.."), m_openSelection );
-      connect(m_openSelection, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotOpenSelection()));
+      connect(m_openSelection, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotOpenSelection()));
 
       if (m_signals)
          m_rightButton->insertItem(i18n("&Send Signal"), m_signals);
@@ -821,57 +821,58 @@ void Konsole::makeGUI()
 
    if (!m_detachSession)
    {
-     m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this),
-                                     TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session");
+     m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this,
+                                     TQ_SLOT(slotDetachSession()), m_shortcuts, "detach_session");
    }
    m_detachSession->plug(m_tabPopupMenu);
 
-   m_tabPopupMenu->insertItem( i18n("&Rename Session..."), TQT_TQOBJECT(this),
-                         TQT_SLOT(slotTabRenameSession()) );
+   m_tabPopupMenu->insertItem( i18n("&Rename Session..."), this,
+                         TQ_SLOT(slotTabRenameSession()) );
    m_tabPopupMenu->insertSeparator();
 
    m_tabMonitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ),
-      SmallIconSet("activity"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) );
+      SmallIconSet("activity"), 0, this, TQ_SLOT( slotTabToggleMonitor() ), this );
    m_tabMonitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) );
    m_tabMonitorActivity->plug(m_tabPopupMenu);
 
    m_tabMonitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ),
-      SmallIconSet("silence"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) );
+      SmallIconSet("silence"), 0, this, TQ_SLOT( slotTabToggleMonitor() ), this );
    m_tabMonitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) );
    m_tabMonitorSilence->plug(m_tabPopupMenu);
 
-   m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this),
-                                    TQT_SLOT( slotTabToggleMasterMode() ), TQT_TQOBJECT(this));
+   m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this,
+                                    TQ_SLOT( slotTabToggleMasterMode() ), this);
    m_tabMasterMode->plug(m_tabPopupMenu);
 
    m_tabPopupMenu->insertSeparator();
    if (!m_moveSessionLeft)
    {
      m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back",
-                                       TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this),
-                                       TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
+                                       TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this,
+                                       TQ_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
    }
    m_moveSessionLeft->plug(m_tabPopupMenu);
    if (!m_moveSessionRight)
    {
      m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward",
-                                        TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this),
-                                        TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
+                                        TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this,
+                                        TQ_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
    }
    m_moveSessionRight->plug(m_tabPopupMenu);
 
    m_tabPopupMenu->insertSeparator();
-   m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), TQT_TQOBJECT(this), TQT_SLOT(slotTabSelectColor()) );
+   m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, TQ_SLOT(slotTabSelectColor()) );
+   m_tabPopupMenu->insertItem( i18n("Reset Tab Color"), this, TQ_SLOT(slotTabResetColor()) );
 
    m_tabPopupMenu->insertSeparator();
    m_tabPopupTabsMenu = new TDEPopupMenu( m_tabPopupMenu );
    m_tabPopupMenu->insertItem( i18n("Switch to Tab" ), m_tabPopupTabsMenu );
-   connect( m_tabPopupTabsMenu, TQT_SIGNAL( activated ( int ) ),
-            TQT_SLOT( activateSession( int ) ) );
+   connect( m_tabPopupTabsMenu, TQ_SIGNAL( activated ( int ) ),
+            TQ_SLOT( activateSession( int ) ) );
 
    m_tabPopupMenu->insertSeparator();
-   m_tabPopupMenu->insertItem( SmallIcon("window-close"), i18n("C&lose Session"), TQT_TQOBJECT(this),
-                          TQT_SLOT(slotTabCloseSession()) );
+   m_tabPopupMenu->insertItem( SmallIcon("window-close"), i18n("C&lose Session"), this,
+                          TQ_SLOT(slotTabCloseSession()) );
 
    if (m_options) {
       // Fill tab bar context menu
@@ -879,23 +880,23 @@ void Konsole::makeGUI()
       TDEAcceleratorManager::manage( m_tabbarPopupMenu );
       selectTabbar->plug(m_tabbarPopupMenu);
 
-      TDESelectAction *viewOptions = new TDESelectAction(TQT_TQOBJECT(this));
+      TDESelectAction *viewOptions = new TDESelectAction(this);
       viewOptions->setText(i18n("Tab &Options"));
       TQStringList options;
       options << i18n("&Text && Icons") << i18n("Text &Only") << i18n("&Icons Only");
       viewOptions->setItems(options);
       viewOptions->setCurrentItem(m_tabViewMode);
       viewOptions->plug(m_tabbarPopupMenu);
-      connect(viewOptions, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotTabSetViewOptions(int)));
+      connect(viewOptions, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTabSetViewOptions(int)));
       slotTabSetViewOptions(m_tabViewMode);
 
-      TDEToggleAction *dynamicTabHideOption = new TDEToggleAction ( i18n( "&Dynamic Hide" ), 0, TQT_TQOBJECT(this),
-                                       TQT_SLOT( slotTabbarToggleDynamicHide() ), TQT_TQOBJECT(this));
+      TDEToggleAction *dynamicTabHideOption = new TDEToggleAction ( i18n( "&Dynamic Hide" ), 0, this,
+                                       TQ_SLOT( slotTabbarToggleDynamicHide() ), this);
       dynamicTabHideOption->setChecked(b_dynamicTabHide);
       dynamicTabHideOption->plug(m_tabbarPopupMenu);
 
       TDEToggleAction *m_autoResizeTabs = new TDEToggleAction( i18n("&Auto Resize Tabs"),
-                 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleAutoResizeTabs() ), TQT_TQOBJECT(this));
+                 0, this, TQ_SLOT( slotToggleAutoResizeTabs() ), this);
       m_autoResizeTabs->setChecked(b_autoResizeTabs);
       m_autoResizeTabs->plug(m_tabbarPopupMenu);
     }
@@ -951,23 +952,23 @@ void Konsole::makeTabWidget()
 
   TDEAcceleratorManager::setNoAccel( tabwidget );
 
-  connect(tabwidget, TQT_SIGNAL(movedTab(int,int)), TQT_SLOT(slotMovedTab(int,int)));
-  connect(tabwidget, TQT_SIGNAL(mouseDoubleClick(TQWidget*)), TQT_SLOT(slotRenameSession()));
-  connect(tabwidget, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(activateSession(TQWidget*)));
-  connect(tabwidget, TQT_SIGNAL(contextMenu(TQWidget*, const TQPoint &)),
-                     TQT_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &)));
-  connect(tabwidget, TQT_SIGNAL(contextMenu(const TQPoint &)),
-                     TQT_SLOT(slotTabbarContextMenu(const TQPoint &)));
+  connect(tabwidget, TQ_SIGNAL(movedTab(int,int)), TQ_SLOT(slotMovedTab(int,int)));
+  connect(tabwidget, TQ_SIGNAL(mouseDoubleClick(TQWidget*)), TQ_SLOT(slotRenameSession()));
+  connect(tabwidget, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(activateSession(TQWidget*)));
+  connect(tabwidget, TQ_SIGNAL(contextMenu(TQWidget*, const TQPoint &)),
+                     TQ_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &)));
+  connect(tabwidget, TQ_SIGNAL(contextMenu(const TQPoint &)),
+                     TQ_SLOT(slotTabbarContextMenu(const TQPoint &)));
 
   if (kapp->authorize("shell_access")) {
-    connect(tabwidget, TQT_SIGNAL(mouseDoubleClick()), TQT_SLOT(newSession()));
+    connect(tabwidget, TQ_SIGNAL(mouseDoubleClick()), TQ_SLOT(newSession()));
 
     m_newSessionButton = new TQToolButton( tabwidget );
     TQToolTip::add(m_newSessionButton,i18n("Click for new standard session\nClick and hold for session menu"));
     m_newSessionButton->setIconSet( SmallIcon( "tab_new" ) );
     m_newSessionButton->adjustSize();
     m_newSessionButton->setPopup( m_tabbarSessionsCommands );
-    connect(m_newSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(newSession()));
+    connect(m_newSessionButton, TQ_SIGNAL(clicked()), TQ_SLOT(newSession()));
     tabwidget->setCornerWidget( m_newSessionButton, BottomLeft );
     m_newSessionButton->installEventFilter(this);
 
@@ -976,7 +977,7 @@ void Konsole::makeTabWidget()
     m_removeSessionButton->setIconSet( SmallIconSet( "tab_remove" ) );
     m_removeSessionButton->adjustSize();
     m_removeSessionButton->setEnabled(false);
-    connect(m_removeSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(confirmCloseCurrentSession()));
+    connect(m_removeSessionButton, TQ_SIGNAL(clicked()), TQ_SLOT(confirmCloseCurrentSession()));
     tabwidget->setCornerWidget( m_removeSessionButton, BottomRight );
 
   }
@@ -984,18 +985,18 @@ void Konsole::makeTabWidget()
 
 bool Konsole::eventFilter( TQObject *o, TQEvent *ev )
 {
-  if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_newSessionButton))
+  if (o == m_newSessionButton)
   {
     // Popup the menu when the left mousebutton is pressed and the mouse
     // is moved by a small distance.
     if (ev->type() == TQEvent::MouseButtonPress)
     {
-      TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
+      TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
       m_newSessionButtonMousePressPos = mev->pos();
     }
     else if (ev->type() == TQEvent::MouseMove)
     {
-      TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
+      TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
       if ((mev->pos() - m_newSessionButtonMousePressPos).manhattanLength()
             > TDEGlobalSettings::dndEventDelay())
       {
@@ -1005,7 +1006,7 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev )
     }
     else if (ev->type() == TQEvent::ContextMenu)
     {
-      TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
+      TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
       slotTabbarContextMenu(mev->globalPos());
       return true;
     }
@@ -1018,7 +1019,7 @@ void Konsole::makeBasicGUI()
   if (kapp->authorize("shell_access")) {
     m_tabbarSessionsCommands = new TDEPopupMenu( this );
     TDEAcceleratorManager::manage( m_tabbarSessionsCommands );
-    connect(m_tabbarSessionsCommands, TQT_SIGNAL(activated(int)), TQT_SLOT(newSessionTabbar(int)));
+    connect(m_tabbarSessionsCommands, TQ_SIGNAL(activated(int)), TQ_SLOT(newSessionTabbar(int)));
   }
 
   m_session = new TDEPopupMenu(this);
@@ -1061,20 +1062,20 @@ void Konsole::makeBasicGUI()
   // programs.
 
   if (m_tabbarSessionsCommands)
-     connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
-  connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+     connect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
+  connect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
   if (m_options)
-     connect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+     connect(m_options,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
   if (m_help)
-     connect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+     connect(m_help,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
   if (m_rightButton)
-     connect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
-  connect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
-  connect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+     connect(m_rightButton,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
+  connect(m_edit,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
+  connect(m_view,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
   if (m_bookmarks)
-     connect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+     connect(m_bookmarks,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
   if (m_bookmarksSession)
-     connect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+     connect(m_bookmarksSession,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
 
   m_session_id=menubar->insertItem(m_session_string , m_session);
   m_edit_id=menubar->insertItem(m_edit_string, m_edit);
@@ -1088,79 +1089,79 @@ void Konsole::makeBasicGUI()
 
   m_shortcuts = new TDEActionCollection(this);
 
-  m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, TQT_TQOBJECT(this),
-                                 TQT_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy");
-  m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this),
-                                 TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste");
-  m_pasteSelection = new TDEAction(i18n("Paste Selection"), Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this),
-                                 TQT_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection");
-
-  m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, TQT_TQOBJECT(this),
-                                TQT_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal");
-  m_resetClearTerminal = new TDEAction(i18n("&Reset && Clear Terminal"), 0, TQT_TQOBJECT(this),
-                                     TQT_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal");
-  m_findHistory = new TDEAction(i18n("&Find in History..."), "edit-find", 0, TQT_TQOBJECT(this),
-                              TQT_SLOT(slotFindHistory()), m_shortcuts, "find_history");
+  m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, this,
+                                 TQ_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy");
+  m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", TQt::SHIFT+TQt::Key_Insert, this,
+                                 TQ_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste");
+  m_pasteSelection = new TDEAction(i18n("Paste Selection"), TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, this,
+                                 TQ_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection");
+
+  m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, this,
+                                TQ_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal");
+  m_resetClearTerminal = new TDEAction(i18n("&Reset && Clear Terminal"), 0, this,
+                                     TQ_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal");
+  m_findHistory = new TDEAction(i18n("&Find in History..."), "edit-find", 0, this,
+                              TQ_SLOT(slotFindHistory()), m_shortcuts, "find_history");
   m_findHistory->setEnabled(b_histEnabled);
 
-  m_findNext = new TDEAction(i18n("Find &Next"), "go-next", 0, TQT_TQOBJECT(this),
-                           TQT_SLOT(slotFindNext()), m_shortcuts, "find_next");
+  m_findNext = new TDEAction(i18n("Find &Next"), "go-next", 0, this,
+                           TQ_SLOT(slotFindNext()), m_shortcuts, "find_next");
   m_findNext->setEnabled(b_histEnabled);
 
-  m_findPrevious = new TDEAction(i18n("Find Pre&vious"), "go-previous", 0, TQT_TQOBJECT(this),
-                               TQT_SLOT(slotFindPrevious()), m_shortcuts, "find_previous");
+  m_findPrevious = new TDEAction(i18n("Find Pre&vious"), "go-previous", 0, this,
+                               TQ_SLOT(slotFindPrevious()), m_shortcuts, "find_previous");
   m_findPrevious->setEnabled( b_histEnabled );
 
-  m_saveHistory = new TDEAction(i18n("S&ave History As..."), "document-save-as", 0, TQT_TQOBJECT(this),
-                              TQT_SLOT(slotSaveHistory()), m_shortcuts, "save_history");
+  m_saveHistory = new TDEAction(i18n("S&ave History As..."), "document-save-as", 0, this,
+                              TQ_SLOT(slotSaveHistory()), m_shortcuts, "save_history");
   m_saveHistory->setEnabled(b_histEnabled );
 
-  m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", 0, TQT_TQOBJECT(this),
-                               TQT_SLOT(slotClearHistory()), m_shortcuts, "clear_history");
+  m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", 0, this,
+                               TQ_SLOT(slotClearHistory()), m_shortcuts, "clear_history");
   m_clearHistory->setEnabled(b_histEnabled);
 
   m_clearAllSessionHistories = new TDEAction(i18n("Clear All H&istories"), "history_clear", 0,
-    TQT_TQOBJECT(this), TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories");
+    this, TQ_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories");
 
   if (!m_detachSession)
   {
-    m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this),
-                                    TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session");
+    m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this,
+                                    TQ_SLOT(slotDetachSession()), m_shortcuts, "detach_session");
   }
   m_detachSession->setEnabled(false);
 
-  m_renameSession = new TDEAction(i18n("&Rename Session..."), Qt::CTRL+Qt::SHIFT+Qt::Key_R, TQT_TQOBJECT(this),
-                                TQT_SLOT(slotRenameSession()), m_shortcuts, "rename_session");
+  m_renameSession = new TDEAction(i18n("&Rename Session..."), TQt::CTRL+TQt::SHIFT+TQt::Key_R, this,
+                                TQ_SLOT(slotRenameSession()), m_shortcuts, "rename_session");
 
   if (kapp->authorizeTDEAction("zmodem_upload"))
     m_zmodemUpload = new TDEAction( i18n( "&ZModem Upload..." ),
-                                  Qt::CTRL+Qt::ALT+Qt::Key_U, TQT_TQOBJECT(this),
-                                  TQT_SLOT( slotZModemUpload() ),
+                                  TQt::CTRL+TQt::ALT+TQt::Key_U, this,
+                                  TQ_SLOT( slotZModemUpload() ),
                                   m_shortcuts, "zmodem_upload" );
 
   monitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ),
-      SmallIconSet("activity"), 0, TQT_TQOBJECT(this),
-      TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" );
+      SmallIconSet("activity"), 0, this,
+      TQ_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" );
   monitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) );
 
   monitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ),
-      SmallIconSet("silence"), 0, TQT_TQOBJECT(this),
-      TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" );
+      SmallIconSet("silence"), 0, this,
+      TQ_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" );
   monitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) );
 
-  masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this),
-                                   TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" );
+  masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this,
+                                   TQ_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" );
 
-  showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this),
-                                    TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" );
+  showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_M, this,
+                                    TQ_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" );
   showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) );
 
   m_fullscreen = KStdAction::fullScreen(0, 0, m_shortcuts, this );
-  connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this),TQT_SLOT(updateFullScreen(bool)));
+  connect( m_fullscreen,TQ_SIGNAL(toggled(bool)), this,TQ_SLOT(updateFullScreen(bool)));
   m_fullscreen->setChecked(b_fullscreen);
 
-  m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("document-save-as"), 0, TQT_TQOBJECT(this),
-                         TQT_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" );
+  m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("document-save-as"), 0, this,
+                         TQ_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" );
 
   //help menu
   if (m_help)
@@ -1168,43 +1169,43 @@ void Konsole::makeBasicGUI()
      // Don't steal F1 (handbook) accel (esp. since it not visible in
      // "Configure Shortcuts").
 
-  m_closeSession = new TDEAction(i18n("C&lose Session"), "window-close", 0, TQT_TQOBJECT(this),
-                               TQT_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session");
-  m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), m_shortcuts, "file_print");
-  m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, TQT_TQOBJECT(this), TQT_SLOT( close() ), m_shortcuts, "file_quit");
+  m_closeSession = new TDEAction(i18n("C&lose Session"), "window-close", 0, this,
+                               TQ_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session");
+  m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, this, TQ_SLOT( slotPrint() ), m_shortcuts, "file_print");
+  m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, this, TQ_SLOT( close() ), m_shortcuts, "file_quit");
 
-  TDEShortcut shortcut(Qt::CTRL+Qt::ALT+Qt::Key_N);
-  shortcut.append(TDEShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_N));
-  new TDEAction(i18n("New Session"), shortcut, TQT_TQOBJECT(this), TQT_SLOT(newSession()), m_shortcuts, "new_session");
-  new TDEAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu");
-  new TDEAction(i18n("List Sessions"), 0, TQT_TQOBJECT(this), TQT_SLOT(listSessions()), m_shortcuts, "list_sessions");
+  TDEShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N);
+  shortcut.append(TDEShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N));
+  new TDEAction(i18n("New Session"), shortcut, this, TQ_SLOT(newSession()), m_shortcuts, "new_session");
+  new TDEAction(i18n("Activate Menu"), TQt::CTRL+TQt::ALT+TQt::Key_M, this, TQ_SLOT(activateMenu()), m_shortcuts, "activate_menu");
+  new TDEAction(i18n("List Sessions"), 0, this, TQ_SLOT(listSessions()), m_shortcuts, "list_sessions");
 
   if (!m_moveSessionLeft)
   {
     m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back",
-                                      TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this),
-                                      TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
+                                      TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this,
+                                      TQ_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
   }
   if (!m_moveSessionRight)
   {
     m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward",
-                                       TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this),
-                                       TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
+                                       TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this,
+                                       TQ_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
   }
 
-  new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left,
-              TQT_TQOBJECT(this), TQT_SLOT(prevSession()), m_shortcuts, "previous_session");
-  new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Left : Qt::SHIFT+Qt::Key_Right,
-              TQT_TQOBJECT(this), TQT_SLOT(nextSession()), m_shortcuts, "next_session");
+  new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left,
+              this, TQ_SLOT(prevSession()), m_shortcuts, "previous_session");
+  new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right,
+              this, TQ_SLOT(nextSession()), m_shortcuts, "next_session");
 
   for (int i=1;i<13;i++) { // Due to 12 function keys?
-     new TDEAction(i18n("Switch to Session %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1());
+     new TDEAction(i18n("Switch to Session %1").arg(i), 0, this, TQ_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1());
   }
 
-  new TDEAction(i18n("Enlarge Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font");
-  new TDEAction(i18n("Shrink Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font");
+  new TDEAction(i18n("Enlarge Font"), 0, this, TQ_SLOT(biggerFont()), m_shortcuts, "bigger_font");
+  new TDEAction(i18n("Shrink Font"), 0, this, TQ_SLOT(smallerFont()), m_shortcuts, "smaller_font");
 
-  new TDEAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi");
+  new TDEAction(i18n("Toggle Bidi"), TQt::CTRL+TQt::ALT+TQt::Key_B, this, TQ_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi");
 
   // Should we load all *.desktop files now?  Required for Session shortcuts.
   if ( TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) {
@@ -1216,7 +1217,7 @@ void Konsole::makeBasicGUI()
 
   m_sessionList = new TDEPopupMenu(this);
   TDEAcceleratorManager::manage( m_sessionList );
-  connect(m_sessionList, TQT_SIGNAL(activated(int)), TQT_SLOT(activateSession(int)));
+  connect(m_sessionList, TQ_SIGNAL(activated(int)), TQ_SLOT(activateSession(int)));
 }
 
 /**
@@ -1379,10 +1380,16 @@ void Konsole::slotTabRenameSession() {
 void Konsole::slotTabSelectColor()
 {
   TQColor color = tabwidget->tabColor( m_contextMenuSession->widget() );
-  int result = KColorDialog::getColor( color );
+  int result = KColorDialog::getColor( color, tabwidget->colorGroup().foreground() );
 
-  if ( result == KColorDialog::Accepted )
+  if ( result == KColorDialog::Accepted ) {
     tabwidget->setTabColor(m_contextMenuSession->widget(), color);
+  }
+}
+
+void Konsole::slotTabResetColor()
+{
+  tabwidget->resetTabColor(m_contextMenuSession->widget());
 }
 
 void Konsole::slotTabToggleMonitor()
@@ -1625,7 +1632,7 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo
        // Signal that we want to be transparent to the desktop, not to windows behind us...
        XChangeProperty(tqt_xdisplay(), winId(), kde_wm_transparent_to_desktop, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
      }
- 
+
      TQPtrList<TEWidget> tes = activeTEs();
      for (TEWidget *_te = tes.first(); _te; _te = tes.next()) {
        _te->setWordCharacters(s_word_seps);
@@ -1652,10 +1659,6 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo
      config->setGroup("UTMP");
      b_addToUtmp = config->readBoolEntry("AddToUtmp",true);
      config->setDesktopGroup();
-
-     // Do not set a default value; this allows the System-wide Scheme
-     // to set the tab text color.
-     m_tabColor = config->readColorEntry("TabColor");
    }
 
    if (!globalConfigOnly)
@@ -1730,7 +1733,7 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo
       // profile scrollbar entry differs from the konsolerc scrollbar entry.
       TQPtrList<TEWidget> tes = activeTEs();
       for (TEWidget *_te = tes.first(); _te; _te = tes.next()) {
-        if (_te->getScrollbarLocation() != n_scroll) 
+        if (_te->getScrollbarLocation() != n_scroll)
            _te->setScrollbarLocation(n_scroll);
       }
    }
@@ -1987,7 +1990,7 @@ void Konsole::slotToggleMenubar() {
   }
   if (!showMenubar->isChecked()) {
     setCaption(i18n("Use the right mouse button to bring back the menu"));
-    TQTimer::singleShot(5000,this,TQT_SLOT(updateTitle()));
+    TQTimer::singleShot(5000,this,TQ_SLOT(updateTitle()));
   }
   updateRMBMenu();
 }
@@ -2025,8 +2028,6 @@ void Konsole::createSessionTab(TEWidget *widget, const TQIconSet &iconSet,
     tabwidget->insertTab(widget, iconSet, TQString::null, index);
     break;
   }
-  if ( m_tabColor.isValid() )
-    tabwidget->setTabColor(widget, m_tabColor);
 }
 
 TQIconSet Konsole::iconSetForSession(TESession *session) const
@@ -2141,12 +2142,12 @@ void Konsole::reparseConfiguration()
   b_sessionShortcutsMapped = false;
 
   // Mappings may have to be changed...get a fresh mapper.
-  disconnect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ),
-          this, TQT_SLOT( newSessionTabbar( int ) ) );
+  disconnect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ),
+          this, TQ_SLOT( newSessionTabbar( int ) ) );
   delete sessionNumberMapper;
-  sessionNumberMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
-  connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ),
-          this, TQT_SLOT( newSessionTabbar( int ) ) );
+  sessionNumberMapper = new TQSignalMapper( this );
+  connect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ),
+          this, TQ_SLOT( newSessionTabbar( int ) ) );
 
   sl_sessionShortCuts.clear();
   buildSessionMenus();
@@ -2297,7 +2298,7 @@ void Konsole::updateTitle(TESession* _se)
   TDERadioAction *ra = session2action.find(_se);
   if (ra && (ra->icon() != icon))
     ra->setIcon(icon);
-  if (m_tabViewMode == ShowIconOnly) 
+  if (m_tabViewMode == ShowIconOnly)
     tabwidget->changeTab( _se->widget(), TQString::null );
   else if (b_matchTabWinTitle)
     tabwidget->setTabLabel( _se->widget(), _se->fullTitle().replace('&',"&&"));
@@ -2379,12 +2380,12 @@ void Konsole::disableMasterModeConnections()
         TESession *to = to_it.current();
         if (to!=from)
         {
-          disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)),
-                     to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*)));
-          disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
-                     to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*)));
-          disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)),
-                     to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); 
+          disconnect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)),
+                     to->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*)));
+          disconnect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
+                     to->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*)));
+          disconnect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)),
+                     to->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*)));
         }
       }
     }
@@ -2402,12 +2403,12 @@ void Konsole::enableMasterModeConnections()
         TESession *to = to_it.current();
         if (to!=from)
         {
-          connect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)),
-                  to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*)));
-          connect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
-                  to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*)));
-          connect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)),
-                  to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); 
+          connect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)),
+                  to->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*)));
+          connect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
+                  to->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*)));
+          connect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)),
+                  to->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*)));
         }
       }
     }
@@ -2502,7 +2503,7 @@ void Konsole::runSession(TESession* s)
 
     // give some time to get through the
     // resize events before starting up.
-    TQTimer::singleShot(100,s,TQT_SLOT(run()));
+    TQTimer::singleShot(100,s,TQ_SLOT(run()));
 }
 
 void Konsole::addSession(TESession* s)
@@ -2535,8 +2536,8 @@ void Konsole::addSession(TESession* s)
   TDERadioAction *ra = new TDERadioAction(newTitle.replace('&',"&&"),
                                       s->IconName(),
                                       0,
-                                      TQT_TQOBJECT(this),
-                                      TQT_SLOT(activateSession()),
+                                      this,
+                                      TQ_SLOT(activateSession()),
                                       m_shortcuts);
   ra->setExclusiveGroup("sessions");
   ra->setChecked(true);
@@ -2591,7 +2592,7 @@ void Konsole::listSessions()
 
 void Konsole::switchToSession()
 {
-  activateSession( TQString( TQT_TQOBJECT_CONST(sender())->name() ).right( 2 ).toInt() -1 );
+  activateSession( TQString( sender()->name() ).right( 2 ).toInt() -1 );
 }
 
 void Konsole::activateSession(int position)
@@ -2664,8 +2665,8 @@ void Konsole::activateSession(TESession *s)
   pmPath = cs->imagePath();
   n_render = cs->alignment();
 
-// BR 106464 temporary fix... 
-//  only 2 sessions opened, 2nd session viewable, right-click on 1st tab and 
+// BR 106464 temporary fix...
+//  only 2 sessions opened, 2nd session viewable, right-click on 1st tab and
 //  select 'Detach', close original Konsole window... crash
 //  s is not set properly on original Konsole window
   TDERadioAction *ra = session2action.find(se);
@@ -2675,7 +2676,7 @@ void Konsole::activateSession(TESession *s)
   }
   ra->setChecked(true);
 
-  TQTimer::singleShot(1,this,TQT_SLOT(allowPrevNext())); // hack, hack, hack
+  TQTimer::singleShot(1,this,TQ_SLOT(allowPrevNext())); // hack, hack, hack
 
   tabwidget->showPage( se->widget() );
   te = se->widget();
@@ -2749,7 +2750,7 @@ void Konsole::setSessionEncoding( const TQString &encoding, TESession *session )
 
     while ( it != encodingNames.end() && !found_encoding )
     {
-      if ( TQString::compare( TDEGlobal::charsets()->encodingForName(*it), 
+      if ( TQString::compare( TDEGlobal::charsets()->encodingForName(*it),
                              t_encoding ) == 0 ) {
          found_encoding = true;
       }
@@ -2952,8 +2953,8 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis
   TEWidget* te_old = te;
   te=new TEWidget(tabwidget);
 
-  connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)),
-           this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) );
+  connect( te, TQ_SIGNAL(configureRequest(TEWidget*, int, int, int)),
+           this, TQ_SLOT(configureRequest(TEWidget*,int,int,int)) );
   if (te_old) {
     initTEWidget(te, te_old);
   }
@@ -2972,40 +2973,40 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis
   s->setMonitorSilenceSeconds(monitorSilenceSeconds);
   s->enableFullScripting(b_fullScripting);
   s->setMetaAsAltMode(b_metaAsAlt);
-  
+
   // If you add any new signal-slot connection below, think about doing it in konsolePart too
-  connect( s,TQT_SIGNAL(done(TESession*)),
-           this,TQT_SLOT(doneSession(TESession*)));
-  connect( s, TQT_SIGNAL(updateTitle(TESession*)),
-           this, TQT_SLOT(updateTitle(TESession*)));
-  connect( s, TQT_SIGNAL(notifySessionState(TESession*, int)),
-           this, TQT_SLOT(notifySessionState(TESession*, int)));
-  connect( s, TQT_SIGNAL(disableMasterModeConnections()),
-           this, TQT_SLOT(disableMasterModeConnections()));
-  connect( s, TQT_SIGNAL(enableMasterModeConnections()),
-           this, TQT_SLOT(enableMasterModeConnections()));
-  connect( s, TQT_SIGNAL(renameSession(TESession*,const TQString&)),
-           this, TQT_SLOT(slotRenameSession(TESession*, const TQString&)));
-  connect( s->getEmulation(), TQT_SIGNAL(changeColumns(int)),
-           this, TQT_SLOT(changeColumns(int)) );
-  connect( s->getEmulation(), TQT_SIGNAL(changeColLin(int,int)),
-           this, TQT_SLOT(changeColLin(int,int)));
-  connect( s->getEmulation(), TQT_SIGNAL(ImageSizeChanged(int,int)),
-           this, TQT_SLOT(notifySize(int,int)));
-  connect( s, TQT_SIGNAL(zmodemDetected(TESession*)),
-           this, TQT_SLOT(slotZModemDetected(TESession*)));
-  connect( s, TQT_SIGNAL(updateSessionConfig(TESession*)),
-           this, TQT_SLOT(slotUpdateSessionConfig(TESession*)));
-  connect( s, TQT_SIGNAL(resizeSession(TESession*, TQSize)),
-           this, TQT_SLOT(slotResizeSession(TESession*, TQSize)));
-  connect( s, TQT_SIGNAL(setSessionEncoding(TESession*, const TQString &)),
-           this, TQT_SLOT(slotSetSessionEncoding(TESession*, const TQString &)));
-  connect( s, TQT_SIGNAL(getSessionSchema(TESession*, TQString &)),
-           this, TQT_SLOT(slotGetSessionSchema(TESession*, TQString &)));
-  connect( s, TQT_SIGNAL(setSessionSchema(TESession*, const TQString &)),
-           this, TQT_SLOT(slotSetSessionSchema(TESession*, const TQString &)));
-  connect( s, TQT_SIGNAL(changeTabTextColor(TESession*, int)),
-           this,TQT_SLOT(changeTabTextColor(TESession*, int)));
+  connect( s,TQ_SIGNAL(done(TESession*)),
+           this,TQ_SLOT(doneSession(TESession*)));
+  connect( s, TQ_SIGNAL(updateTitle(TESession*)),
+           this, TQ_SLOT(updateTitle(TESession*)));
+  connect( s, TQ_SIGNAL(notifySessionState(TESession*, int)),
+           this, TQ_SLOT(notifySessionState(TESession*, int)));
+  connect( s, TQ_SIGNAL(disableMasterModeConnections()),
+           this, TQ_SLOT(disableMasterModeConnections()));
+  connect( s, TQ_SIGNAL(enableMasterModeConnections()),
+           this, TQ_SLOT(enableMasterModeConnections()));
+  connect( s, TQ_SIGNAL(renameSession(TESession*,const TQString&)),
+           this, TQ_SLOT(slotRenameSession(TESession*, const TQString&)));
+  connect( s->getEmulation(), TQ_SIGNAL(changeColumns(int)),
+           this, TQ_SLOT(changeColumns(int)) );
+  connect( s->getEmulation(), TQ_SIGNAL(changeColLin(int,int)),
+           this, TQ_SLOT(changeColLin(int,int)));
+  connect( s->getEmulation(), TQ_SIGNAL(ImageSizeChanged(int,int)),
+           this, TQ_SLOT(notifySize(int,int)));
+  connect( s, TQ_SIGNAL(zmodemDetected(TESession*)),
+           this, TQ_SLOT(slotZModemDetected(TESession*)));
+  connect( s, TQ_SIGNAL(updateSessionConfig(TESession*)),
+           this, TQ_SLOT(slotUpdateSessionConfig(TESession*)));
+  connect( s, TQ_SIGNAL(resizeSession(TESession*, TQSize)),
+           this, TQ_SLOT(slotResizeSession(TESession*, TQSize)));
+  connect( s, TQ_SIGNAL(setSessionEncoding(TESession*, const TQString &)),
+           this, TQ_SLOT(slotSetSessionEncoding(TESession*, const TQString &)));
+  connect( s, TQ_SIGNAL(getSessionSchema(TESession*, TQString &)),
+           this, TQ_SLOT(slotGetSessionSchema(TESession*, TQString &)));
+  connect( s, TQ_SIGNAL(setSessionSchema(TESession*, const TQString &)),
+           this, TQ_SLOT(slotSetSessionSchema(TESession*, const TQString &)));
+  connect( s, TQ_SIGNAL(changeTabTextColor(TESession*, int)),
+           this,TQ_SLOT(changeTabTextColor(TESession*, int)));
 
   s->widget()->setVTFont(defaultFont);// Hack to set font again after newSession
   s->setSchemaNo(schmno);
@@ -3148,7 +3149,7 @@ void Konsole::doneSession(TESession* s)
       //       Since the timer approach only works at good weather,
       //       the whole construction is not suited to what it
       //       should do. Affected is the TEEmulation::setConnect.
-      TQTimer::singleShot(1,this,TQT_SLOT(activateSession()));
+      TQTimer::singleShot(1,this,TQ_SLOT(activateSession()));
     }
     else
       close();
@@ -3221,16 +3222,16 @@ void Konsole::moveSessionLeft()
   ra->plug(m_view,(m_view->count()-sessions.count()+1)+position-1);
 
   TQColor oldcolor = tabwidget->tabColor(se->widget());
-  
+
   tabwidget->blockSignals(true);
   tabwidget->removePage(se->widget());
   tabwidget->blockSignals(false);
   TQString title = se->Title();
-  createSessionTab(se->widget(), iconSetForSession(se), 
+  createSessionTab(se->widget(), iconSetForSession(se),
                    title.replace('&', "&&"), position-1);
   tabwidget->showPage(se->widget());
   tabwidget->setTabColor(se->widget(),oldcolor);
-  
+
   if (!m_menuCreated)
     makeGUI();
   m_moveSessionLeft->setEnabled(position-1>0);
@@ -3254,16 +3255,16 @@ void Konsole::moveSessionRight()
   ra->plug(m_view,(m_view->count()-sessions.count()+1)+position+1);
 
   TQColor oldcolor = tabwidget->tabColor(se->widget());
-  
+
   tabwidget->blockSignals(true);
   tabwidget->removePage(se->widget());
   tabwidget->blockSignals(false);
   TQString title = se->Title();
-  createSessionTab(se->widget(), iconSetForSession(se), 
+  createSessionTab(se->widget(), iconSetForSession(se),
                    title.replace('&', "&&"), position+1);
   tabwidget->showPage(se->widget());
   tabwidget->setTabColor(se->widget(),oldcolor);
-  
+
   if (!m_menuCreated)
     makeGUI();
   m_moveSessionLeft->setEnabled(true);
@@ -3479,9 +3480,9 @@ void Konsole::addSessionCommand(const TQString &path)
   if ( m_shortcuts->action( name.latin1() ) ) {
     sessionAction = m_shortcuts->action( name.latin1() );
   } else {
-    sessionAction = new TDEAction( comment, 0, TQT_TQOBJECT(this), 0, m_shortcuts, name.latin1() );
+    sessionAction = new TDEAction( comment, 0, this, 0, m_shortcuts, name.latin1() );
   }
-  connect( sessionAction, TQT_SIGNAL( activated() ), sessionNumberMapper, TQT_SLOT( map() ) );
+  connect( sessionAction, TQ_SIGNAL( activated() ), sessionNumberMapper, TQ_SLOT( map() ) );
   sessionNumberMapper->setMapping( sessionAction, cmd_serial );
 
 }
@@ -3751,31 +3752,31 @@ void Konsole::detachSession(TESession* _se) {
       TESession *from = from_it.current();
       if(from->isMasterMode())
       {
-        disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)),
-	            _se->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*)));
-        disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
-              _se->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*)));
-        disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)),
-              _se->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*)));
+        disconnect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)),
+	            _se->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*)));
+        disconnect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
+              _se->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*)));
+        disconnect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)),
+              _se->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*)));
       }
     }
   }
 
   TQColor se_tabtextcolor = tabwidget->tabColor( _se->widget() );
 
-  disconnect( _se,TQT_SIGNAL(done(TESession*)),
-              this,TQT_SLOT(doneSession(TESession*)) );
+  disconnect( _se,TQ_SIGNAL(done(TESession*)),
+              this,TQ_SLOT(doneSession(TESession*)) );
 
-  disconnect( _se->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int)));
-  disconnect( _se->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) );
-  disconnect( _se->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) );
-  disconnect( _se, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) );
+  disconnect( _se->getEmulation(),TQ_SIGNAL(ImageSizeChanged(int,int)), this,TQ_SLOT(notifySize(int,int)));
+  disconnect( _se->getEmulation(),TQ_SIGNAL(changeColLin(int, int)), this,TQ_SLOT(changeColLin(int,int)) );
+  disconnect( _se->getEmulation(),TQ_SIGNAL(changeColumns(int)), this,TQ_SLOT(changeColumns(int)) );
+  disconnect( _se, TQ_SIGNAL(changeTabTextColor(TESession*, int)), this, TQ_SLOT(changeTabTextColor(TESession*, int)) );
 
-  disconnect( _se,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) );
-  disconnect( _se,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) );
-  disconnect( _se,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) );
-  disconnect( _se,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) );
-  disconnect( _se,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) );
+  disconnect( _se,TQ_SIGNAL(updateTitle(TESession*)), this,TQ_SLOT(updateTitle(TESession*)) );
+  disconnect( _se,TQ_SIGNAL(notifySessionState(TESession*,int)), this,TQ_SLOT(notifySessionState(TESession*,int)) );
+  disconnect( _se,TQ_SIGNAL(disableMasterModeConnections()), this,TQ_SLOT(disableMasterModeConnections()) );
+  disconnect( _se,TQ_SIGNAL(enableMasterModeConnections()), this,TQ_SLOT(enableMasterModeConnections()) );
+  disconnect( _se,TQ_SIGNAL(renameSession(TESession*,const TQString&)), this,TQ_SLOT(slotRenameSession(TESession*,const TQString&)) );
 
   // TODO: "type" isn't passed properly
   Konsole* konsole = new Konsole(name(), b_histEnabled, !menubar->isHidden(), n_tabbar != TabNone, b_framevis,
@@ -3799,7 +3800,7 @@ void Konsole::detachSession(TESession* _se) {
     else
       se = sessions.at(sessionIndex ? sessionIndex - 1 : 0);
     session2action.find(se)->setChecked(true);
-    TQTimer::singleShot(1,this,TQT_SLOT(activateSession()));
+    TQTimer::singleShot(1,this,TQ_SLOT(activateSession()));
   }
 
   if (sessions.count()==1)
@@ -3827,8 +3828,8 @@ void Konsole::attachSession(TESession* session)
 
   te=new TEWidget(tabwidget);
 
-  connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)),
-           this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) );
+  connect( te, TQ_SIGNAL(configureRequest(TEWidget*, int, int, int)),
+           this, TQ_SLOT(configureRequest(TEWidget*,int,int,int)) );
 
   te->resize(se_widget->size());
   te->setSize(se_widget->Columns(), se_widget->Lines());
@@ -3844,7 +3845,7 @@ void Konsole::attachSession(TESession* session)
 
   TQString title=session->Title();
   TDERadioAction *ra = new TDERadioAction(title.replace('&',"&&"), session->IconName(),
-                                      0, TQT_TQOBJECT(this), TQT_SLOT(activateSession()), m_shortcuts);
+                                      0, this, TQ_SLOT(activateSession()), m_shortcuts);
 
   ra->setExclusiveGroup("sessions");
   ra->setChecked(true);
@@ -3858,20 +3859,20 @@ void Konsole::attachSession(TESession* session)
   if (m_menuCreated)
     ra->plug(m_view);
 
-  connect( session,TQT_SIGNAL(done(TESession*)),
-           this,TQT_SLOT(doneSession(TESession*)) );
+  connect( session,TQ_SIGNAL(done(TESession*)),
+           this,TQ_SLOT(doneSession(TESession*)) );
 
-  connect( session,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) );
-  connect( session,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) );
+  connect( session,TQ_SIGNAL(updateTitle(TESession*)), this,TQ_SLOT(updateTitle(TESession*)) );
+  connect( session,TQ_SIGNAL(notifySessionState(TESession*,int)), this,TQ_SLOT(notifySessionState(TESession*,int)) );
 
-  connect( session,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) );
-  connect( session,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) );
-  connect( session,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) );
-  connect( session->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int)));
-  connect( session->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) );
-  connect( session->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) );
+  connect( session,TQ_SIGNAL(disableMasterModeConnections()), this,TQ_SLOT(disableMasterModeConnections()) );
+  connect( session,TQ_SIGNAL(enableMasterModeConnections()), this,TQ_SLOT(enableMasterModeConnections()) );
+  connect( session,TQ_SIGNAL(renameSession(TESession*,const TQString&)), this,TQ_SLOT(slotRenameSession(TESession*,const TQString&)) );
+  connect( session->getEmulation(),TQ_SIGNAL(ImageSizeChanged(int,int)), this,TQ_SLOT(notifySize(int,int)));
+  connect( session->getEmulation(),TQ_SIGNAL(changeColumns(int)), this,TQ_SLOT(changeColumns(int)) );
+  connect( session->getEmulation(),TQ_SIGNAL(changeColLin(int, int)), this,TQ_SLOT(changeColLin(int,int)) );
 
-  connect( session, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) );
+  connect( session, TQ_SIGNAL(changeTabTextColor(TESession*, int)), this, TQ_SLOT(changeTabTextColor(TESession*, int)) );
 
   activateSession(session);
 }
@@ -3933,7 +3934,7 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType,
   TQHBoxLayout *hb = new TQHBoxLayout(mainFrame);
 
   m_btnEnable    = new TQCheckBox(i18n("&Enable"), mainFrame);
-  connect(m_btnEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotHistEnable(bool)));
+  connect(m_btnEnable, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotHistEnable(bool)));
 
   m_label = new TQLabel(i18n("&Number of lines: "), mainFrame);
 
@@ -3944,7 +3945,7 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType,
   m_label->setBuddy( m_size );
 
   m_setUnlimited = new TQPushButton(i18n("&Set Unlimited"), mainFrame);
-  connect( m_setUnlimited,TQT_SIGNAL(clicked()), this,TQT_SLOT(slotSetUnlimited()) );
+  connect( m_setUnlimited,TQ_SIGNAL(clicked()), this,TQ_SLOT(slotSetUnlimited()) );
 
   hb->addWidget(m_btnEnable);
   hb->addSpacing(10);
@@ -4038,8 +4039,8 @@ void Konsole::slotFindHistory()
 {
   if( !m_finddialog ) {
     m_finddialog = new KonsoleFind( this, "konsolefind", false);
-    connect(m_finddialog,TQT_SIGNAL(search()),this,TQT_SLOT(slotFind()));
-    connect(m_finddialog,TQT_SIGNAL(done()),this,TQT_SLOT(slotFindDone()));
+    connect(m_finddialog,TQ_SIGNAL(search()),this,TQ_SLOT(slotFind()));
+    connect(m_finddialog,TQ_SIGNAL(done()),this,TQ_SLOT(slotFindDone()));
   }
 
   TQString string;
@@ -4058,7 +4059,7 @@ void Konsole::slotOpenSelection()
   delete m_filterData;
 
   m_openSelection->clear();
-  disconnect(m_openSelection, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenURI(int)));
+  disconnect(m_openSelection, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOpenURI(int)));
 
   TQString selection = se->getEmulation()->getSelection();
   TQString curdir = baseURL().path();
@@ -4073,7 +4074,7 @@ void Konsole::slotOpenSelection()
   KURIFilter::self()->filterURI( *(m_filterData) );
   m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).arg(m_filterData->uri().url()), 1 );
 
-  connect(m_openSelection, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenURI(int)));
+  connect(m_openSelection, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOpenURI(int)));
 }
 
 void Konsole::slotOpenURI(int)
@@ -4344,8 +4345,8 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ )
 
   if (!TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()) {
     m_editRegExp = new TQPushButton( i18n("&Edit..."), row, "editRegExp" );
-    connect( m_asRegExp, TQT_SIGNAL( toggled(bool) ), m_editRegExp, TQT_SLOT( setEnabled(bool) ) );
-    connect( m_editRegExp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditRegExp() ) );
+    connect( m_asRegExp, TQ_SIGNAL( toggled(bool) ), m_editRegExp, TQ_SLOT( setEnabled(bool) ) );
+    connect( m_editRegExp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditRegExp() ) );
     m_editRegExp->setEnabled( false );
   }
 }
@@ -4353,7 +4354,7 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ )
 void KonsoleFind::slotEditRegExp()
 {
   if ( m_editorDialog == 0 )
-    m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+    m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
 
   assert( m_editorDialog );
 
@@ -4387,20 +4388,13 @@ void Konsole::slotFontChanged()
 
 void Konsole::biggerFont(void) {
     if ( !se ) return;
-
-    TQFont f = te->getVTFont();
-    f.setPointSize( f.pointSize() + 1 );
-    te->setVTFont( f );
+    te->biggerFont();
     activateSession();
 }
 
 void Konsole::smallerFont(void) {
     if ( !se ) return;
-
-    TQFont f = te->getVTFont();
-    if ( f.pointSize() < 6 ) return;      // A minimum size
-    f.setPointSize( f.pointSize() - 1 );
-    te->setVTFont( f );
+    te->smallerFont();
     activateSession();
 }
 
@@ -4483,7 +4477,7 @@ void Konsole::setMenuAcceleratos()
     if (m_help)
       menubar->changeItem(m_help_id, m_help_string);
   }
-  else  
+  else
   {
     menubar->changeItem(m_session_id, TQString(m_session_string).replace(TQRegExp("&([^&])"), "\\1"));
     menubar->changeItem(m_edit_id, TQString(m_edit_string).replace(TQRegExp("&([^&])"), "\\1"));
@@ -4496,5 +4490,5 @@ void Konsole::setMenuAcceleratos()
       menubar->changeItem(m_help_id, TQString(m_help_string).replace(TQRegExp("&([^&])"), "\\1"));
   }
 }
-  
+
 #include "konsole.moc"
diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h
index fff364eb7..b5e1f926b 100644
--- a/konsole/konsole/konsole.h
+++ b/konsole/konsole/konsole.h
@@ -68,7 +68,7 @@ const char *konsole_shell(TQStrList &args);
 
 class Konsole : public TDEMainWindow, virtual public KonsoleIface
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class KonsoleSessionManaged;
 public:
@@ -245,6 +245,7 @@ private slots:
   void slotTabDetachSession();
   void slotTabRenameSession();
   void slotTabSelectColor();
+  void slotTabResetColor();
   void slotTabCloseSession();
   void slotTabToggleMonitor();
   void slotTabToggleMasterMode();
@@ -297,7 +298,7 @@ private:
   TQPtrDict<TDERadioAction> session2action;
   TQPtrList<TESession> sessions;
 
-  TQIntDict<KSimpleConfig> no2command;     //QT4 - convert to QList
+  TQIntDict<KSimpleConfig> no2command;
 
   KSimpleConfig* m_defaultSession;
   TQString m_defaultSessionFilename;
@@ -469,7 +470,7 @@ class TQSpinBox;
 
 class HistoryTypeDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
   HistoryTypeDialog(const HistoryType& histType,
                     unsigned int histSize,
@@ -493,7 +494,7 @@ protected:
 
 class SizeDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
   SizeDialog(unsigned int const columns,
              unsigned int const lines,
@@ -512,7 +513,7 @@ protected:
 
 class KonsoleFind : public KEdFind
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
   KonsoleFind( TQWidget *parent = 0, const char *name=0, bool modal=true );
   bool reg_exp() const;
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index 64fdfb700..b5879d45c 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -151,10 +151,10 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje
   te = new TEWidget(parentWidget,widgetName);
   te->setMinimumSize(150,70);    // allow resizing, cause resize in TEWidget
 
-  setWidget(TQT_TQWIDGET(te));
+  setWidget(te);
   te->setFocus();
-  connect( te,TQT_SIGNAL(configureRequest(TEWidget*,int,int,int)),
-           this,TQT_SLOT(configureRequest(TEWidget*,int,int,int)) );
+  connect( te,TQ_SIGNAL(configureRequest(TEWidget*,int,int,int)),
+           this,TQ_SLOT(configureRequest(TEWidget*,int,int,int)) );
 
   colors = new ColorSchemaList();
   colors->checkSchemas();
@@ -214,7 +214,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje
 
   applySettingsToGUI();
 
-  TQTimer::singleShot( 0, this, TQT_SLOT( autoShowShell() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( autoShowShell() ) );
 }
 
 void konsolePart::autoShowShell()
@@ -240,10 +240,10 @@ void konsolePart::doneSession(TESession*)
   if (se && b_autoDestroy)
   {
 //    kdDebug(1211) << "doneSession - disconnecting done" << endl;
-    disconnect( se,TQT_SIGNAL(done(TESession*)),
-                this,TQT_SLOT(doneSession(TESession*)) );
+    disconnect( se,TQ_SIGNAL(done(TESession*)),
+                this,TQ_SLOT(doneSession(TESession*)) );
     se->setConnect(false);
-    //TQTimer::singleShot(100,se,TQT_SLOT(terminate()));
+    //TQTimer::singleShot(100,se,TQ_SLOT(terminate()));
 //    kdDebug(1211) << "se->terminate()" << endl;
     se->terminate();
   }
@@ -252,7 +252,7 @@ void konsolePart::doneSession(TESession*)
 void konsolePart::sessionDestroyed()
 {
 //  kdDebug(1211) << "sessionDestroyed()" << endl;
-  disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) );
+  disconnect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) );
   se = 0;
   if (b_autoDestroy)
       delete this;
@@ -275,7 +275,7 @@ konsolePart::~konsolePart()
     while(se && TDEProcessController::theTDEProcessController->waitForProcessExit(1))
         ;
 
-    disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) );
+    disconnect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) );
 //    kdDebug(1211) << "Deleting se session" << endl;
     delete se;
     se=0;
@@ -343,7 +343,7 @@ void konsolePart::makeGUI()
      m_signals->insertItem( i18n( "&Kill Task" )      + " (KILL)",  SIGKILL);
      m_signals->insertItem( i18n( "User Signal &1")   + " (USR1)", SIGUSR1);
      m_signals->insertItem( i18n( "User Signal &2")   + " (USR2)", SIGUSR2);
-     connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int)));
+     connect(m_signals, TQ_SIGNAL(activated(int)), TQ_SLOT(sendSignal(int)));
   }
 
   // Settings Menu ----------------------------------------------------------------
@@ -353,7 +353,7 @@ void konsolePart::makeGUI()
 
      // Scrollbar
      selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, this,
-                                      TQT_SLOT(slotSelectScrollbar()), settingsActions);
+                                      TQ_SLOT(slotSelectScrollbar()), settingsActions);
 
      TQStringList scrollitems;
      scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right");
@@ -363,7 +363,7 @@ void konsolePart::makeGUI()
      // Select Bell
      m_options->insertSeparator();
      selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this,
-                                 TQT_SLOT(slotSelectBell()), settingsActions, "bell");
+                                 TQ_SLOT(slotSelectBell()), settingsActions, "bell");
 
      TQStringList bellitems;
      bellitems << i18n("System &Bell")
@@ -374,13 +374,13 @@ void konsolePart::makeGUI()
      selectBell->plug(m_options);
 
       m_fontsizes = new TDEActionMenu( i18n( "Font" ), SmallIconSet( "text" ), settingsActions, 0L );
-      m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "zoom-in" ), 0, this, TQT_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) );
-      m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "zoom-out" ), 0, this, TQT_SLOT( smallerFont() ), settingsActions, "shrink_font" ) );
-      m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, TQT_SLOT( slotSelectFont() ), settingsActions, "select_font" ) );
+      m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "zoom-in" ), 0, this, TQ_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) );
+      m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "zoom-out" ), 0, this, TQ_SLOT( smallerFont() ), settingsActions, "shrink_font" ) );
+      m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, TQ_SLOT( slotSelectFont() ), settingsActions, "select_font" ) );
       m_fontsizes->plug(m_options);
 
       // encoding menu, start with default checked !
-      selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQT_SLOT(slotSetEncoding()), settingsActions, "set_encoding" );
+      selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQ_SLOT(slotSetEncoding()), settingsActions, "set_encoding" );
       TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames();
       list.prepend( i18n( "Default" ) );
       selectSetEncoding->setItems(list);
@@ -392,7 +392,7 @@ void konsolePart::makeGUI()
      {
         m_keytab = new TDEPopupMenu((TDEMainWindow*)parentWidget);
         m_keytab->setCheckable(true);
-        connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int)));
+        connect(m_keytab, TQ_SIGNAL(activated(int)), TQ_SLOT(keytab_menu_activated(int)));
         m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab );
      }
 
@@ -401,21 +401,21 @@ void konsolePart::makeGUI()
      {
         m_schema = new TDEPopupMenu((TDEMainWindow*)parentWidget);
         m_schema->setCheckable(true);
-        connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int)));
-        connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check()));
+        connect(m_schema, TQ_SIGNAL(activated(int)), TQ_SLOT(schema_menu_activated(int)));
+        connect(m_schema, TQ_SIGNAL(aboutToShow()), TQ_SLOT(schema_menu_check()));
         m_options->insertItem( SmallIconSet( "colorize" ), i18n( "Sch&ema" ), m_schema);
      }
 
 
      TDEAction *historyType = new TDEAction(i18n("&History..."), "history", 0, this,
-                                        TQT_SLOT(slotHistoryType()), settingsActions, "history");
+                                        TQ_SLOT(slotHistoryType()), settingsActions, "history");
      historyType->plug(m_options);
      m_options->insertSeparator();
 
      // Select line spacing
      selectLineSpacing = new TDESelectAction(i18n("Li&ne Spacing"),
         SmallIconSet("format-justify-left"), 0, this,
-        TQT_SLOT(slotSelectLineSpacing()), settingsActions );
+        TQ_SLOT(slotSelectLineSpacing()), settingsActions );
 
      TQStringList lineSpacingList;
      lineSpacingList
@@ -433,35 +433,35 @@ void konsolePart::makeGUI()
 
      // Blinking Cursor
      blinkingCursor = new TDEToggleAction (i18n("Blinking &Cursor"),
-                                      0, this,TQT_SLOT(slotBlinkingCursor()), settingsActions);
+                                      0, this,TQ_SLOT(slotBlinkingCursor()), settingsActions);
      blinkingCursor->plug(m_options);
 
      // Frame on/off
      showFrame = new TDEToggleAction(i18n("Show Fr&ame"), 0,
-                                this, TQT_SLOT(slotToggleFrame()), settingsActions);
+                                this, TQ_SLOT(slotToggleFrame()), settingsActions);
      showFrame->setCheckedState(i18n("Hide Fr&ame"));
      showFrame->plug(m_options);
 
      // Meta key as Alt key
      metaAsAlt = new TDEToggleAction(i18n("Me&ta key as Alt key"), 0,
-                                this, TQT_SLOT(slotToggleMetaAsAltMode()), settingsActions);
+                                this, TQ_SLOT(slotToggleMetaAsAltMode()), settingsActions);
      metaAsAlt->plug(m_options);
 
      // Word Connectors
      TDEAction *WordSeps = new TDEAction(i18n("Wor&d Connectors..."), 0, this,
-                                  TQT_SLOT(slotWordSeps()), settingsActions);
+                                  TQ_SLOT(slotWordSeps()), settingsActions);
      WordSeps->plug(m_options);
 
      // Use Konsole's Settings
      m_options->insertSeparator();
      m_useKonsoleSettings = new TDEToggleAction( i18n("&Use Konsole's Settings"),
-                          0, this, TQT_SLOT(slotUseKonsoleSettings()), 0, "use_konsole_settings" );
+                          0, this, TQ_SLOT(slotUseKonsoleSettings()), 0, "use_konsole_settings" );
      m_useKonsoleSettings->plug(m_options);
 
      // Save Settings
      m_options->insertSeparator();
      TDEAction *saveSettings = new TDEAction(i18n("&Save as Default"), "document-save", 0, this, 
-                    TQT_SLOT(saveProperties()), actions, "save_default");
+                    TQ_SLOT(saveProperties()), actions, "save_default");
      saveSettings->plug(m_options);
      if (TDEGlobalSettings::insertTearOffHandle())
         m_options->insertTearOffHandle();
@@ -469,16 +469,16 @@ void konsolePart::makeGUI()
 
   // Popup Menu -------------------------------------------------------------------
   m_popupMenu = new TDEPopupMenu((TDEMainWindow*)parentWidget);
-  TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(te),
-                               TQT_SLOT(setSelectionEnd()), actions, "selection_end");
+  TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, te,
+                               TQ_SLOT(setSelectionEnd()), actions, "selection_end");
   selectionEnd->plug(m_popupMenu);
 
   TDEAction *copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0,
-                                        TQT_TQOBJECT(te), TQT_SLOT(copyClipboard()), actions, "edit_copy");
+                                        te, TQ_SLOT(copyClipboard()), actions, "edit_copy");
   copyClipboard->plug(m_popupMenu);
 
   TDEAction *pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", 0,
-                                        TQT_TQOBJECT(te), TQT_SLOT(pasteClipboard()), actions, "edit_paste");
+                                        te, TQ_SLOT(pasteClipboard()), actions, "edit_paste");
   pasteClipboard->plug(m_popupMenu);
 
   if (m_signals)
@@ -494,7 +494,7 @@ void konsolePart::makeGUI()
   }
 
   TDEAction *closeSession = new TDEAction(i18n("&Close Terminal Emulator"), "window-close", 0, this,
-                                      TQT_SLOT(closeCurrentSession()), actions, "close_session");
+                                      TQ_SLOT(closeCurrentSession()), actions, "close_session");
   closeSession->plug(m_popupMenu);
   if (TDEGlobalSettings::insertTearOffHandle())
     m_popupMenu->insertTearOffHandle();
@@ -608,7 +608,7 @@ void konsolePart::readProperties()
   if (sch->useTransparency()) {
     if (!argb_visual) {
       if (!rootxpm)
-        rootxpm = new KRootPixmap(TQT_TQWIDGET(te));
+        rootxpm = new KRootPixmap(te);
       rootxpm->setFadeEffect(sch->tr_x(), TQColor(sch->tr_r(), sch->tr_g(), sch->tr_b()));
       rootxpm->start();
       rootxpm->repaint(true);
@@ -705,19 +705,12 @@ void konsolePart::slotSelectFont() {
 
 void konsolePart::biggerFont(void) {
     if ( !se ) return;
-
-    TQFont f = te->getVTFont();
-    f.setPointSize( f.pointSize() + 1 );
-    te->setVTFont( f );
+    te->biggerFont();
 }
 
 void konsolePart::smallerFont(void) {
     if ( !se ) return;
-
-    TQFont f = te->getVTFont();
-    if ( f.pointSize() < 6 ) return;      // A minimum size
-    f.setPointSize( f.pointSize() - 1 );
-    te->setVTFont( f );
+    te->smallerFont();
 }
 
 void konsolePart::updateKeytabMenu()
@@ -803,7 +796,7 @@ void konsolePart::setSchema(ColorSchema* s)
   if (s->useTransparency()) {
     if (!argb_visual) {
       if (!rootxpm)
-        rootxpm = new KRootPixmap(TQT_TQWIDGET(te));
+        rootxpm = new KRootPixmap(te);
       rootxpm->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b()));
       rootxpm->start();
       rootxpm->repaint(true);
@@ -1018,15 +1011,15 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType,
 
   m_btnEnable    = new TQCheckBox(i18n("&Enable"), mainFrame);
 
-  TQObject::connect(m_btnEnable, TQT_SIGNAL(toggled(bool)),
-                   this,      TQT_SLOT(slotHistEnable(bool)));
+  TQObject::connect(m_btnEnable, TQ_SIGNAL(toggled(bool)),
+                   this,      TQ_SLOT(slotHistEnable(bool)));
 
   m_size = new TQSpinBox(0, 10 * 1000 * 1000, 100, mainFrame);
   m_size->setValue(histSize);
   m_size->setSpecialValueText(i18n("Unlimited (number of lines)", "Unlimited"));
 
   m_setUnlimited = new TQPushButton(i18n("&Set Unlimited"), mainFrame);
-  connect( m_setUnlimited,TQT_SIGNAL(clicked()), this,TQT_SLOT(slotSetUnlimited()) );
+  connect( m_setUnlimited,TQ_SIGNAL(clicked()), this,TQ_SLOT(slotSetUnlimited()) );
 
   hb->addWidget(m_btnEnable);
   hb->addSpacing(10);
@@ -1128,42 +1121,42 @@ void konsolePart::newSession()
   {
     se = new TESession(te, "xterm", parentWidget->winId());
   }
-  connect( se,TQT_SIGNAL(done(TESession*)),
-           this,TQT_SLOT(doneSession(TESession*)) );
-  connect( se,TQT_SIGNAL(openURLRequest(const TQString &)),
-           this,TQT_SLOT(emitOpenURLRequest(const TQString &)) );
-  connect( se, TQT_SIGNAL( updateTitle(TESession*) ),
-           this, TQT_SLOT( updateTitle(TESession*) ) );
-  connect( se, TQT_SIGNAL(enableMasterModeConnections()),
-           this, TQT_SLOT(enableMasterModeConnections()) );
-  connect( se, TQT_SIGNAL( processExited(TDEProcess *) ),
-           this, TQT_SIGNAL( processExited(TDEProcess *) ) );
-  connect( se, TQT_SIGNAL( receivedData( const TQString& ) ),
-           this, TQT_SIGNAL( receivedData( const TQString& ) ) );
-  connect( se, TQT_SIGNAL( forkedChild() ),
-           this, TQT_SIGNAL( forkedChild() ));
-  connect( se, TQT_SIGNAL(getSessionSchema(TESession*, TQString &)),
-           this, TQT_SLOT(slotGetSessionSchema(TESession*, TQString &)));
-  connect( se, TQT_SIGNAL(setSessionSchema(TESession*, const TQString &)),
-           this, TQT_SLOT(slotSetSessionSchema(TESession*, const TQString &)));
-  connect( se, TQT_SIGNAL(setSessionEncoding(TESession*, const TQString &)),
-           this, TQT_SLOT(slotSetSessionEncoding(TESession*, const TQString &)));
-  connect( se, TQT_SIGNAL(updateSessionKeytab(TESession *, const TQString &)),
-           this, TQT_SLOT(slotUpdateSessionKeytab(TESession *, const TQString &)));
+  connect( se,TQ_SIGNAL(done(TESession*)),
+           this,TQ_SLOT(doneSession(TESession*)) );
+  connect( se,TQ_SIGNAL(openURLRequest(const TQString &)),
+           this,TQ_SLOT(emitOpenURLRequest(const TQString &)) );
+  connect( se, TQ_SIGNAL( updateTitle(TESession*) ),
+           this, TQ_SLOT( updateTitle(TESession*) ) );
+  connect( se, TQ_SIGNAL(enableMasterModeConnections()),
+           this, TQ_SLOT(enableMasterModeConnections()) );
+  connect( se, TQ_SIGNAL( processExited(TDEProcess *) ),
+           this, TQ_SIGNAL( processExited(TDEProcess *) ) );
+  connect( se, TQ_SIGNAL( receivedData( const TQString& ) ),
+           this, TQ_SIGNAL( receivedData( const TQString& ) ) );
+  connect( se, TQ_SIGNAL( forkedChild() ),
+           this, TQ_SIGNAL( forkedChild() ));
+  connect( se, TQ_SIGNAL(getSessionSchema(TESession*, TQString &)),
+           this, TQ_SLOT(slotGetSessionSchema(TESession*, TQString &)));
+  connect( se, TQ_SIGNAL(setSessionSchema(TESession*, const TQString &)),
+           this, TQ_SLOT(slotSetSessionSchema(TESession*, const TQString &)));
+  connect( se, TQ_SIGNAL(setSessionEncoding(TESession*, const TQString &)),
+           this, TQ_SLOT(slotSetSessionEncoding(TESession*, const TQString &)));
+  connect( se, TQ_SIGNAL(updateSessionKeytab(TESession *, const TQString &)),
+           this, TQ_SLOT(slotUpdateSessionKeytab(TESession *, const TQString &)));
 
   // We ignore the following signals
-  //connect( se, TQT_SIGNAL(renameSession(TESession*,const TQString&)),
-  //         this, TQT_SLOT(slotRenameSession(TESession*, const TQString&)) );
-  //connect( se->getEmulation(), TQT_SIGNAL(changeColumns(int)),
-  //         this, TQT_SLOT(changeColumns(int)) );
-  //connect( se, TQT_SIGNAL(disableMasterModeConnections()),
-  //        this, TQT_SLOT(disableMasterModeConnections()) );
+  //connect( se, TQ_SIGNAL(renameSession(TESession*,const TQString&)),
+  //         this, TQ_SLOT(slotRenameSession(TESession*, const TQString&)) );
+  //connect( se->getEmulation(), TQ_SIGNAL(changeColumns(int)),
+  //         this, TQ_SLOT(changeColumns(int)) );
+  //connect( se, TQ_SIGNAL(disableMasterModeConnections()),
+  //        this, TQ_SLOT(disableMasterModeConnections()) );
 
   applyProperties();
 
   se->setConnect(true);
   // se->run();
-  connect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) );
+  connect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) );
 //  setFont( n_font ); // we do this here, to make TEWidget recalculate
                      // its geometry..
 }
diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h
index 5f6ed9772..aeb3ddca0 100644
--- a/konsole/konsole/konsole_part.h
+++ b/konsole/konsole/konsole_part.h
@@ -47,7 +47,7 @@ namespace KParts { class GUIActivateEvent; }
 
 class konsoleFactory : public KParts::Factory
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     konsoleFactory();
     virtual ~konsoleFactory();
@@ -68,7 +68,7 @@ public:
 
 class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public ExtTerminalInterface
 {
-    Q_OBJECT
+    TQ_OBJECT
 	public:
     konsolePart(TQWidget *parentWidget, const char *widgetName, TQObject * parent, const char *name,
                 const char *classname = 0, const TQString &title = TQString::null);
@@ -217,7 +217,7 @@ public:
 
 class HistoryTypeDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
   HistoryTypeDialog(const HistoryType& histType,
                     unsigned int histSize,
@@ -241,7 +241,7 @@ protected:
 
 class konsoleBrowserExtension : public KParts::BrowserExtension
 {
-    Q_OBJECT
+    TQ_OBJECT
 	friend class konsolePart;
  public:
     konsoleBrowserExtension(konsolePart *parent);
diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp
index 13af12ca5..16f8afb63 100644
--- a/konsole/konsole/konsolebookmarkhandler.cpp
+++ b/konsole/konsole/konsolebookmarkhandler.cpp
@@ -59,8 +59,8 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel
     manager->setUpdate( true );
     manager->setShowNSBookmarks( false );
     
-    connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
-             TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) );
+    connect( manager, TQ_SIGNAL( changed(const TQString &, const TQString &) ),
+             TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) );
 
     if (toplevel) {
         m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu,
diff --git a/konsole/konsole/konsolebookmarkhandler.h b/konsole/konsole/konsolebookmarkhandler.h
index 66680e095..0837a2b87 100644
--- a/konsole/konsole/konsolebookmarkhandler.h
+++ b/konsole/konsole/konsolebookmarkhandler.h
@@ -30,7 +30,7 @@ class KBookmarkManager;
 
 class KonsoleBookmarkHandler : public TQObject, public KBookmarkOwner
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonsoleBookmarkHandler( Konsole *konsole, bool toplevel );
diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp
index 0afe6a693..d199808df 100644
--- a/konsole/konsole/konsolebookmarkmenu.cpp
+++ b/konsole/konsole/konsolebookmarkmenu.cpp
@@ -36,14 +36,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
     /*
      * First, we disconnect KBookmarkMenu::slotAboutToShow()
      * Then,  we connect    KonsoleBookmarkMenu::slotAboutToShow().
-     * They are named differently because the TQT_SLOT() macro thinks we want
+     * They are named differently because the TQ_SLOT() macro thinks we want
      * KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow()
      * Could this be solved if slotAboutToShow() is virtual in KBookmarMenu?
      */
-    disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this,
-                TQT_SLOT( slotAboutToShow() ) );
-    connect( _parentMenu, TQT_SIGNAL( aboutToShow() ),
-             TQT_SLOT( slotAboutToShow2() ) );
+    disconnect( _parentMenu, TQ_SIGNAL( aboutToShow() ), this,
+                TQ_SLOT( slotAboutToShow() ) );
+    connect( _parentMenu, TQ_SIGNAL( aboutToShow() ),
+             TQ_SLOT( slotAboutToShow2() ) );
 }
 
 /*
@@ -113,7 +113,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
         // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl;
         // create a normal URL item, with ID as a name
         TDEAction * action = new TDEAction( text, bm.icon(), 0,
-                                        this, TQT_SLOT( slotBookmarkSelected() ),
+                                        this, TQ_SLOT( slotBookmarkSelected() ),
                                         m_actionCollection, bm.url().url().utf8() );
 
         action->setStatusText( bm.url().prettyURL() );
@@ -149,7 +149,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
 void KonsoleBookmarkMenu::slotBookmarkSelected()
 {
     if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
-    m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */
+    m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */
                                ( (TDEAction *)sender() )->text() /* Title */ );
 }
 
diff --git a/konsole/konsole/konsolebookmarkmenu.h b/konsole/konsole/konsolebookmarkmenu.h
index e1dfdacba..547802fe8 100644
--- a/konsole/konsole/konsolebookmarkmenu.h
+++ b/konsole/konsole/konsolebookmarkmenu.h
@@ -38,7 +38,7 @@ class KonsoleBookmarkMenu;
 
 class KonsoleBookmarkMenu : public KBookmarkMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonsoleBookmarkMenu( KBookmarkManager* mgr,
diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp
index 9eef57954..9e70e4c1a 100644
--- a/konsole/konsole/kwrited.cpp
+++ b/konsole/konsole/kwrited.cpp
@@ -72,15 +72,15 @@ KWrited::KWrited() : TQTextEdit()
   setMinimumWidth(pref_width);
   setMinimumHeight(pref_height);
   setReadOnly(true);
-  setFocusPolicy(TQ_NoFocus);
+  setFocusPolicy(TQWidget::NoFocus);
   setWordWrap(TQTextEdit::WidgetWidth);
   setTextFormat(TQt::PlainText);
 
   pty = new KPty();
   pty->open();
   pty->login(KUser().loginName().local8Bit().data(), getenv("DISPLAY"));
-  TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, TQT_TQOBJECT(this));
-  connect(sn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(block_in(int)));
+  TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, this);
+  connect(sn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(block_in(int)));
 
   TQString txt = i18n("KWrited - Listening on Device %1").arg(pty->ttyName());
   setCaption(txt);
@@ -116,7 +116,7 @@ TQPopupMenu *KWrited::createPopupMenu( const TQPoint &pos )
    TQPopupMenu *menu = TQTextEdit::createPopupMenu( pos );
 
    menu->insertItem( i18n( "Clear Messages" ),
-                     this, TQT_SLOT( clearText() ), 
+                     this, TQ_SLOT( clearText() ), 
                      0, -1, 0 );
 
    return menu;
diff --git a/konsole/konsole/kwrited.h b/konsole/konsole/kwrited.h
index 7c051c51a..5021b04c3 100644
--- a/konsole/konsole/kwrited.h
+++ b/konsole/konsole/kwrited.h
@@ -29,7 +29,7 @@
 class KPty;
 
 class KWrited : public TQTextEdit
-{ Q_OBJECT
+{ TQ_OBJECT
 public:
   KWrited();
  ~KWrited();
@@ -44,7 +44,7 @@ private:
 
 class KWritedModule : public KDEDModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 public:
   KWritedModule( const TQCString& obj );
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index 4039362e3..76db9e9cc 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -46,7 +46,7 @@
 
 #include "konsole.h"
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
diff --git a/konsole/konsole/printsettings.h b/konsole/konsole/printsettings.h
index 1e5a0c23d..393d777d3 100644
--- a/konsole/konsole/printsettings.h
+++ b/konsole/konsole/printsettings.h
@@ -27,7 +27,7 @@ class TQCheckBox;
 
 class PrintSettings : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	PrintSettings(TQWidget *parent = 0, const char *name = 0);
 	~PrintSettings();
diff --git a/konsole/konsole/schema.h b/konsole/konsole/schema.h
index 618683c17..c32f26221 100644
--- a/konsole/konsole/schema.h
+++ b/konsole/konsole/schema.h
@@ -187,10 +187,6 @@ public:
 	uint count() const { return TQPtrList<ColorSchema>::count(); } ;
 	const ColorSchema *at(unsigned int i)
 		{ return TQPtrList<ColorSchema>::at(i); } ;
-#ifdef USE_QT4
-	const ColorSchema *at(unsigned int i)
-		{ return at(i); } ;
-#endif // USE_QT4
 
    void sort() {TQPtrList<ColorSchema>::sort();};
 
diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp
index dcfe9fee4..d613a23e4 100644
--- a/konsole/konsole/session.cpp
+++ b/konsole/konsole/session.cpp
@@ -78,10 +78,10 @@ TESession::TESession(TEWidget* _te, const TQString &_term, ulong _winId, const T
   em = new TEmuVt102(te);
   font_h = te-> fontHeight();
   font_w = te-> fontWidth();
-  TQObject::connect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)),
-                   this,TQT_SLOT(onContentSizeChange(int,int)));
-  TQObject::connect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)),
-                   this,TQT_SLOT(onFontMetricChange(int,int)));
+  TQObject::connect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)),
+                   this,TQ_SLOT(onContentSizeChange(int,int)));
+  TQObject::connect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)),
+                   this,TQ_SLOT(onFontMetricChange(int,int)));
 
   term = _term;
   winId = _winId;
@@ -89,17 +89,17 @@ TESession::TESession(TEWidget* _te, const TQString &_term, ulong _winId, const T
 
   setPty( new TEPty() );
 
-  connect( em, TQT_SIGNAL( changeTitle( int, const TQString & ) ),
-           this, TQT_SLOT( setUserTitle( int, const TQString & ) ) );
-  connect( em, TQT_SIGNAL( notifySessionState(int) ),
-           this, TQT_SLOT( notifySessionState(int) ) );
+  connect( em, TQ_SIGNAL( changeTitle( int, const TQString & ) ),
+           this, TQ_SLOT( setUserTitle( int, const TQString & ) ) );
+  connect( em, TQ_SIGNAL( notifySessionState(int) ),
+           this, TQ_SLOT( notifySessionState(int) ) );
   monitorTimer = new TQTimer(this);
-  connect(monitorTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(monitorTimerDone()));
+  connect(monitorTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(monitorTimerDone()));
 
-  connect( em, TQT_SIGNAL( zmodemDetected() ), this, TQT_SLOT(slotZModemDetected()));
+  connect( em, TQ_SIGNAL( zmodemDetected() ), this, TQ_SLOT(slotZModemDetected()));
 
-  connect( em, TQT_SIGNAL( changeTabTextColor( int ) ),
-           this, TQT_SLOT( changeTabTextColor( int ) ) );
+  connect( em, TQ_SIGNAL( changeTabTextColor( int ) ),
+           this, TQ_SLOT( changeTabTextColor( int ) ) );
 
   //kdDebug(1211)<<"TESession ctor() done"<<endl;
 }
@@ -110,23 +110,23 @@ void TESession::setPty(TEPty *_sh)
     delete sh;
   }
   sh = _sh;
-  connect( sh, TQT_SIGNAL( forkedChild() ),
-           this, TQT_SIGNAL( forkedChild() ));
+  connect( sh, TQ_SIGNAL( forkedChild() ),
+           this, TQ_SIGNAL( forkedChild() ));
 
   //kdDebug(1211)<<"TESession ctor() sh->setSize()"<<endl;
   sh->setSize(te->Lines(),te->Columns()); // not absolutely nessesary
   sh->useUtf8(em->utf8());
   //kdDebug(1211)<<"TESession ctor() connecting"<<endl;
-  connect( sh,TQT_SIGNAL(block_in(const char*,int)),this,TQT_SLOT(onRcvBlock(const char*,int)) );
+  connect( sh,TQ_SIGNAL(block_in(const char*,int)),this,TQ_SLOT(onRcvBlock(const char*,int)) );
 
-  connect( em,TQT_SIGNAL(sndBlock(const char*,int)),sh,TQT_SLOT(send_bytes(const char*,int)) );
-  connect( em,TQT_SIGNAL(lockPty(bool)),sh,TQT_SLOT(lockPty(bool)) );
-  connect( em,TQT_SIGNAL(useUtf8(bool)),sh,TQT_SLOT(useUtf8(bool)) );
+  connect( em,TQ_SIGNAL(sndBlock(const char*,int)),sh,TQ_SLOT(send_bytes(const char*,int)) );
+  connect( em,TQ_SIGNAL(lockPty(bool)),sh,TQ_SLOT(lockPty(bool)) );
+  connect( em,TQ_SIGNAL(useUtf8(bool)),sh,TQ_SLOT(useUtf8(bool)) );
 
-  connect( sh,TQT_SIGNAL(done(int)), this,TQT_SLOT(done(int)) );
+  connect( sh,TQ_SIGNAL(done(int)), this,TQ_SLOT(done(int)) );
 
   if (!sh->error().isEmpty())
-     TQTimer::singleShot(0, this, TQT_SLOT(ptyError()));
+     TQTimer::singleShot(0, this, TQ_SLOT(ptyError()));
 }
 
 void TESession::ptyError()
@@ -143,10 +143,10 @@ void TESession::ptyError()
 
 void TESession::changeWidget(TEWidget* w)
 {
-  TQObject::disconnect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)),
-                     this,TQT_SLOT(onContentSizeChange(int,int)));
-  TQObject::disconnect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)),
-                     this,TQT_SLOT(onFontMetricChange(int,int)));
+  TQObject::disconnect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)),
+                     this,TQ_SLOT(onContentSizeChange(int,int)));
+  TQObject::disconnect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)),
+                     this,TQ_SLOT(onFontMetricChange(int,int)));
   te=w;
   em->changeGUI(w);
   font_h = te->fontHeight();
@@ -155,10 +155,10 @@ void TESession::changeWidget(TEWidget* w)
 
   te->setDefaultBackColor(modifiedBackground);
 
-  TQObject::connect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)),
-                   this,TQT_SLOT(onContentSizeChange(int,int)));
-  TQObject::connect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)),
-                   this,TQT_SLOT(onFontMetricChange(int,int)));
+  TQObject::connect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)),
+                   this,TQ_SLOT(onContentSizeChange(int,int)));
+  TQObject::connect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)),
+                   this,TQ_SLOT(onFontMetricChange(int,int)));
 }
 
 void TESession::setProgram( const TQString &_pgm, const TQStrList &_args )
@@ -177,7 +177,7 @@ void TESession::run()
   TQString pexec = TDEGlobal::dirs()->findExe(exec);
   if ( pexec.isEmpty() ) {
     kdError()<<"can not execute "<<exec<<endl;
-    TQTimer::singleShot(1, this, TQT_SLOT(done()));
+    TQTimer::singleShot(1, this, TQ_SLOT(done()));
     return;
   }
 
@@ -194,7 +194,7 @@ void TESession::run()
           ("DCOPRef("+appId+","+sessionId+")").latin1());
   if (result < 0) {     // Error in opening pseudo teletype
     kdWarning()<<"Unable to open a pseudo teletype!"<<endl;
-    TQTimer::singleShot(0, this, TQT_SLOT(ptyError()));
+    TQTimer::singleShot(0, this, TQ_SLOT(ptyError()));
   }
   sh->setErase(em->getErase());
 
@@ -311,7 +311,7 @@ bool TESession::closeSession()
   if (!sh->isRunning() || !sendSignal(SIGHUP))
   {
      // Forced close.
-     TQTimer::singleShot(1, this, TQT_SLOT(done()));
+     TQTimer::singleShot(1, this, TQ_SLOT(done()));
   }
   return true;
 }
@@ -341,8 +341,8 @@ void TESession::renameSession(const TQString &name)
 TESession::~TESession()
 {
  //kdDebug(1211) << "disconnnecting..." << endl;
-  TQObject::disconnect( sh, TQT_SIGNAL( done(int) ),
-                       this, TQT_SLOT( done(int) ) );
+  TQObject::disconnect( sh, TQ_SIGNAL( done(int) ),
+                       this, TQ_SLOT( done(int) ) );
   delete em;
   delete sh;
 
@@ -605,7 +605,7 @@ void TESession::slotZModemDetected()
 {
   if (!zmodemBusy)
   {
-    TQTimer::singleShot(10, this, TQT_SLOT(emitZModemDetected()));
+    TQTimer::singleShot(10, this, TQ_SLOT(emitZModemDetected()));
     zmodemBusy = true;
   }
 }
@@ -639,23 +639,23 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T
   zmodemProc->start(KProcIO::NotifyOnExit, false);
 
   // Override the read-processing of KProcIO
-  disconnect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), 0, 0);
-  connect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
-          this, TQT_SLOT(zmodemSendBlock(TDEProcess *, char *, int)));
-  connect(zmodemProc,TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
-          this, TQT_SLOT(zmodemStatus(TDEProcess *, char *, int)));
-  connect(zmodemProc,TQT_SIGNAL (processExited(TDEProcess *)),
-          this, TQT_SLOT(zmodemDone()));
-
-  disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) );
-  connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(zmodemRcvBlock(const char*,int)) );
-  connect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue()));
+  disconnect(zmodemProc,TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), 0, 0);
+  connect(zmodemProc,TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
+          this, TQ_SLOT(zmodemSendBlock(TDEProcess *, char *, int)));
+  connect(zmodemProc,TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
+          this, TQ_SLOT(zmodemStatus(TDEProcess *, char *, int)));
+  connect(zmodemProc,TQ_SIGNAL (processExited(TDEProcess *)),
+          this, TQ_SLOT(zmodemDone()));
+
+  disconnect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(onRcvBlock(const char*,int)) );
+  connect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(zmodemRcvBlock(const char*,int)) );
+  connect( sh,TQ_SIGNAL(buffer_empty()), this, TQ_SLOT(zmodemContinue()));
 
   zmodemProgress = new ZModemDialog(te->topLevelWidget(), false,
                                     i18n("ZModem Progress"));
 
-  connect(zmodemProgress, TQT_SIGNAL(user1Clicked()),
-          this, TQT_SLOT(zmodemDone()));
+  connect(zmodemProgress, TQ_SIGNAL(user1Clicked()),
+          this, TQ_SLOT(zmodemDone()));
 
   zmodemProgress->show();
 }
@@ -720,9 +720,9 @@ void TESession::zmodemDone()
     zmodemProc = 0;
     zmodemBusy = false;
 
-    disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this ,TQT_SLOT(zmodemRcvBlock(const char*,int)) );
-    disconnect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue()));
-    connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) );
+    disconnect( sh,TQ_SIGNAL(block_in(const char*,int)), this ,TQ_SLOT(zmodemRcvBlock(const char*,int)) );
+    disconnect( sh,TQ_SIGNAL(buffer_empty()), this, TQ_SLOT(zmodemContinue()));
+    connect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(onRcvBlock(const char*,int)) );
 
     sh->send_bytes("\030\030\030\030", 4); // Abort
     sh->send_bytes("\001\013\n", 3); // Try to get prompt back
diff --git a/konsole/konsole/session.h b/konsole/konsole/session.h
index 03b5941dd..3b5f211fa 100644
--- a/konsole/konsole/session.h
+++ b/konsole/konsole/session.h
@@ -36,7 +36,7 @@ class TDEProcess;
 class ZModemDialog;
 
 class TESession : public TQObject, virtual public SessionIface
-{ Q_OBJECT
+{ TQ_OBJECT
 
 public:
 
@@ -208,7 +208,7 @@ private:
   bool           xon_xoff;
   bool           fullScripting;
 
-  QString	 stateIconName;
+  TQString	 stateIconName;
 
   TQString        pgm;
   TQStrList       args;
diff --git a/konsole/konsole/zmodem_dialog.cpp b/konsole/konsole/zmodem_dialog.cpp
index b4f16dd49..230fc7f9a 100644
--- a/konsole/konsole/zmodem_dialog.cpp
+++ b/konsole/konsole/zmodem_dialog.cpp
@@ -32,7 +32,7 @@ ZModemDialog::ZModemDialog(TQWidget *parent, bool modal, const TQString &caption
   textEdit = new TQTextEdit(this);
   textEdit->setMinimumSize(400, 100);
   setMainWidget(textEdit);
-  connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClose()));
+  connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotClose()));
 }
 
 void ZModemDialog::addProgressText(const TQString &txt)
diff --git a/konsole/konsole/zmodem_dialog.h b/konsole/konsole/zmodem_dialog.h
index 5487fba50..93b50ee18 100644
--- a/konsole/konsole/zmodem_dialog.h
+++ b/konsole/konsole/zmodem_dialog.h
@@ -25,7 +25,7 @@ class TQTextEdit;
 
 class ZModemDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ZModemDialog(TQWidget *parent, bool modal, const TQString &caption);
   
diff --git a/konsole/other/README.KeyTab b/konsole/other/README.KeyTab
index 75d6cfd79..4e23851bb 100644
--- a/konsole/other/README.KeyTab
+++ b/konsole/other/README.KeyTab
@@ -14,7 +14,7 @@ The syntax is that each entry has the form :
   "key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
 
 Keynames are those defined in <qnamespace.h> with the
-"Qt::Key_" prefix removed.
+"TQt::Key_" prefix removed.
 
 Mode names are: 
 
diff --git a/konsole/other/linux.keytab b/konsole/other/linux.keytab
index d5149c3c8..aafbdd97f 100644
--- a/konsole/other/linux.keytab
+++ b/konsole/other/linux.keytab
@@ -15,7 +15,7 @@ keyboard "linux console"
 #   "key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
 #
 # Keynames are those defined in <qnamespace.h> with the
-# "Qt::Key_" removed. (We'd better insert the list here)
+# "TQt::Key_" removed. (We'd better insert the list here)
 #
 # Mode names are : 
 #
diff --git a/konsole/other/solaris.keytab b/konsole/other/solaris.keytab
index cb0626be9..e671cb13b 100644
--- a/konsole/other/solaris.keytab
+++ b/konsole/other/solaris.keytab
@@ -13,7 +13,7 @@ keyboard "Solaris"
 #   "key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
 #
 # Keynames are those defined in <qnamespace.h> with the
-# "Qt::Key_" removed. (We'd better insert the list here)
+# "TQt::Key_" removed. (We'd better insert the list here)
 #
 # Mode names are :
 #
diff --git a/konsole/other/vt100.keytab b/konsole/other/vt100.keytab
index dec49baac..fa57934bc 100644
--- a/konsole/other/vt100.keytab
+++ b/konsole/other/vt100.keytab
@@ -14,7 +14,7 @@ keyboard "vt100 (historical)"
 #   "key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
 #
 # Keynames are those defined in <qnamespace.h> with the
-# "Qt::Key_" removed. (We'd better insert the list here)
+# "TQt::Key_" removed. (We'd better insert the list here)
 #
 # Mode names are : 
 #
diff --git a/konsole/other/vt420pc.keytab b/konsole/other/vt420pc.keytab
index d132797b1..376ce8d13 100644
--- a/konsole/other/vt420pc.keytab
+++ b/konsole/other/vt420pc.keytab
@@ -29,7 +29,7 @@ keyboard "VT420PC"
 #   "key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
 #
 # Keynames are those defined in <qnamespace.h> with the
-# "Qt::Key_" removed. (We'd better insert the list here)
+# "TQt::Key_" removed. (We'd better insert the list here)
 #
 # Mode names are : 
 #
diff --git a/kpager/config.cpp b/kpager/config.cpp
index 0c022d4bb..29d0470a0 100644
--- a/kpager/config.cpp
+++ b/kpager/config.cpp
@@ -48,20 +48,20 @@ KPagerConfigDialog::KPagerConfigDialog (TQWidget *parent)
     TQVBox *box = new TQVBox( this );
     m_chkWindowDragging=new TQCheckBox(i18n("Enable window dragging"),box,0);
     (void ) new KSeparator( box );
-    connect(m_chkWindowDragging, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableWindowDragging(bool)));
+    connect(m_chkWindowDragging, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableWindowDragging(bool)));
 
     TQHBox *page = new TQHBox( box );
     TQVBox *lpage = new TQVBox( page );
     setMainWidget(box);
 
     m_chkShowName=new TQCheckBox(i18n("Show name"),lpage,0);
-    connect(m_chkShowName, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowName(bool)));
+    connect(m_chkShowName, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowName(bool)));
     m_chkShowNumber=new TQCheckBox(i18n("Show number"),lpage,0);
-    connect(m_chkShowNumber, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowNumber(bool)));
+    connect(m_chkShowNumber, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowNumber(bool)));
     m_chkShowBackground=new TQCheckBox(i18n("Show background"),lpage,0);
-    connect(m_chkShowBackground, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowBackground(bool)));
+    connect(m_chkShowBackground, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowBackground(bool)));
     m_chkShowWindows=new TQCheckBox(i18n("Show windows"),lpage,0);
-    connect(m_chkShowWindows, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowWindows(bool)));
+    connect(m_chkShowWindows, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowWindows(bool)));
 
     m_grpWindowDrawMode=new TQButtonGroup(i18n("Type of Window"),page);
     m_grpWindowDrawMode->setExclusive(true);
@@ -75,7 +75,7 @@ KPagerConfigDialog::KPagerConfigDialog (TQWidget *parent)
 //    rbpix->setEnabled(false);
     vbox->addWidget(rbpix);
 
-    connect(m_grpWindowDrawMode, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setWindowDrawMode(int)));
+    connect(m_grpWindowDrawMode, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(setWindowDrawMode(int)));
 
     m_grpLayoutType=new TQButtonGroup(i18n("Layout"),page);
     m_grpLayoutType->setExclusive(true);
@@ -85,8 +85,8 @@ KPagerConfigDialog::KPagerConfigDialog (TQWidget *parent)
     vbox->addWidget(new TQRadioButton(i18n("Horizontal"),m_grpLayoutType));
     vbox->addWidget(new TQRadioButton(i18n("Vertical"),m_grpLayoutType));
 
-    connect(m_grpLayoutType, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setLayout(int)));
-    connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotOk()));
+    connect(m_grpLayoutType, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(setLayout(int)));
+    connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotOk()));
     loadConfiguration();
     setMinimumSize(360, 160);
 }
diff --git a/kpager/config.h b/kpager/config.h
index 2b8b095d3..e3e172808 100644
--- a/kpager/config.h
+++ b/kpager/config.h
@@ -30,7 +30,7 @@ class TQButtonGroup;
 
 class KPagerConfigDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KPagerConfigDialog(TQWidget *parent);
diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp
index 74ead587f..c731f5353 100644
--- a/kpager/desktop.cpp
+++ b/kpager/desktop.cpp
@@ -78,7 +78,7 @@ void Desktop::mouseMoveEvent( TQMouseEvent *ev )
 {
     if ( !KPagerConfigDialog::m_windowDragging )
 	return;
-    if ( (ev->state() & Qt::LeftButton) == 0 )
+    if ( (ev->state() & TQt::LeftButton) == 0 )
 	return;
     TQPoint p( ev->pos() - pressPos );
     if ( p.manhattanLength() >= tqApp->startDragDistance() )
@@ -88,12 +88,12 @@ void Desktop::mouseMoveEvent( TQMouseEvent *ev )
 void Desktop::mousePressEvent( TQMouseEvent * ev)
 {
     bool showWindows= KPagerConfigDialog::m_showWindows;
-    if (ev->button()==Qt::LeftButton){
+    if (ev->button()==TQt::LeftButton){
 	pressPos = ev->pos();
     }
-    else if ((ev->button()==Qt::MidButton)&&(showWindows))
+    else if ((ev->button()==TQt::MidButton)&&(showWindows))
 	startDrag(ev->pos());
-    else if (ev->button()==Qt::RightButton) {
+    else if (ev->button()==TQt::RightButton) {
 	TQPoint pos;
 	KWin::WindowInfo *info = windowAtPosition(ev->pos(), &pos);
 	if ( info && showWindows )
@@ -107,7 +107,7 @@ void Desktop::mouseReleaseEvent( TQMouseEvent *ev )
 {
 /** Note that mouseReleaseEvent is not called when releasing the mouse
  to drop a window in this desktop */
-  if (ev->button()==Qt::LeftButton)
+  if (ev->button()==TQt::LeftButton)
   {
     bool showWindows= KPagerConfigDialog::m_showWindows;
     TQPoint pos;
@@ -257,7 +257,7 @@ void Desktop::loadBgPixmap(void)
   if (!m_bgPixmap)
   {
      m_bgPixmap = new TDESharedPixmap;
-     connect(m_bgPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(backgroundLoaded(bool)));
+     connect(m_bgPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(backgroundLoaded(bool)));
   }
 
   retval = m_bgPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_isCommon?1:m_desk));
@@ -426,7 +426,7 @@ void Desktop::paintEvent( TQPaintEvent * )
   p.begin(&pixmap);
 //  p.setFont(font());
 //  p.fillRect(rect(), colorGroup().brush(TQColorGroup::Dark));
-//  p.setPen(Qt::black);
+//  p.setPen(TQt::black);
 //  p.drawRect(rect());
 
   if (KPagerConfigDialog::m_showBackground )
@@ -447,7 +447,7 @@ void Desktop::paintEvent( TQPaintEvent * )
 
       p.drawPixmap(0,0,tmp);
     }
-     else pixmap.fill(Qt::gray);
+     else pixmap.fill(TQt::gray);
   }
   else
     p.fillRect(rect(), colorGroup().brush(TQColorGroup::Mid));
@@ -528,7 +528,7 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool
 
   if ( m_transparentMode==AllWindows
       || (m_transparentMode==MaximizedWindows && ( info->state() & NET::Max )) )
-    brush.setStyle(Qt::Dense4Pattern);
+    brush.setStyle(TQt::Dense4Pattern);
 
   if ( isActive )
   {
diff --git a/kpager/desktop.h b/kpager/desktop.h
index cff05594a..1954c45fb 100644
--- a/kpager/desktop.h
+++ b/kpager/desktop.h
@@ -37,7 +37,7 @@ class TQPoint;
 
 class Desktop : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
   Desktop( int desk, TQString desktopName, TQWidget *parent=0,
diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp
index 4775576ee..68f73982a 100644
--- a/kpager/kpager.cpp
+++ b/kpager/kpager.cpp
@@ -111,7 +111,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name)
     XFree(reinterpret_cast<char *>(hints));
 
     timeout=new TQTimer(this,"timeoutToQuit");
-    connect(timeout,TQT_SIGNAL(timeout()),this, TQT_SLOT(reallyClose()));
+    connect(timeout,TQ_SIGNAL(timeout()),this, TQ_SLOT(reallyClose()));
 }
 
 KPagerMainWindow::~KPagerMainWindow()
@@ -187,11 +187,11 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
     m_windows.setAutoDelete(true); // delete windows info after removal
 
     setBackgroundColor( black );
-    m_winmodule=new KWinModule(TQT_TQOBJECT(this));
+    m_winmodule=new KWinModule(this);
     m_currentDesktop=m_winmodule->currentDesktop();
 
     m_grabWinTimer=new TQTimer(this,"grabWinTimer");
-    connect(m_grabWinTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotGrabWindows()));
+    connect(m_grabWinTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotGrabWindows()));
 
     KPagerConfigDialog::initConfiguration();
 
@@ -208,31 +208,31 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
 
     m_layoutType=static_cast<enum KPager::LayoutTypes>( KPagerConfigDialog::m_layoutType );
 
-    connect( m_winmodule, TQT_SIGNAL( activeWindowChanged(WId)),
-             TQT_SLOT(slotActiveWindowChanged(WId)));
-    connect( m_winmodule, TQT_SIGNAL( windowAdded(WId) ),
-             TQT_SLOT( slotWindowAdded(WId) ) );
-    connect( m_winmodule, TQT_SIGNAL( windowRemoved(WId) ),
-             TQT_SLOT( slotWindowRemoved(WId) ) );
-    connect( m_winmodule, TQT_SIGNAL( windowChanged(WId,unsigned int) ),
-             TQT_SLOT( slotWindowChanged(WId,unsigned int) ) );
-    connect( m_winmodule, TQT_SIGNAL( stackingOrderChanged() ),
-             TQT_SLOT( slotStackingOrderChanged() ) );
-    connect( m_winmodule, TQT_SIGNAL( desktopNamesChanged() ),
-             TQT_SLOT( slotDesktopNamesChanged() ) );
-    connect( m_winmodule, TQT_SIGNAL( numberOfDesktopsChanged(int) ),
-             TQT_SLOT( slotNumberOfDesktopsChanged(int) ) );
-    connect( m_winmodule, TQT_SIGNAL( currentDesktopChanged(int)),
-             TQT_SLOT( slotCurrentDesktopChanged(int) ) );
-    connect(kapp, TQT_SIGNAL(backgroundChanged(int)),
-            TQT_SLOT(slotBackgroundChanged(int)));
+    connect( m_winmodule, TQ_SIGNAL( activeWindowChanged(WId)),
+             TQ_SLOT(slotActiveWindowChanged(WId)));
+    connect( m_winmodule, TQ_SIGNAL( windowAdded(WId) ),
+             TQ_SLOT( slotWindowAdded(WId) ) );
+    connect( m_winmodule, TQ_SIGNAL( windowRemoved(WId) ),
+             TQ_SLOT( slotWindowRemoved(WId) ) );
+    connect( m_winmodule, TQ_SIGNAL( windowChanged(WId,unsigned int) ),
+             TQ_SLOT( slotWindowChanged(WId,unsigned int) ) );
+    connect( m_winmodule, TQ_SIGNAL( stackingOrderChanged() ),
+             TQ_SLOT( slotStackingOrderChanged() ) );
+    connect( m_winmodule, TQ_SIGNAL( desktopNamesChanged() ),
+             TQ_SLOT( slotDesktopNamesChanged() ) );
+    connect( m_winmodule, TQ_SIGNAL( numberOfDesktopsChanged(int) ),
+             TQ_SLOT( slotNumberOfDesktopsChanged(int) ) );
+    connect( m_winmodule, TQ_SIGNAL( currentDesktopChanged(int)),
+             TQ_SLOT( slotCurrentDesktopChanged(int) ) );
+    connect(kapp, TQ_SIGNAL(backgroundChanged(int)),
+            TQ_SLOT(slotBackgroundChanged(int)));
 
     TQFont defFont(TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold);
     defFont = cfg->readFontEntry("Font", &defFont);
     setFont(defFont);
 
-    m_prefs_action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configureDialog()), parent->actionCollection());
-    m_quit_action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), parent->actionCollection());
+    m_prefs_action = KStdAction::preferences(this, TQ_SLOT(configureDialog()), parent->actionCollection());
+    m_quit_action = KStdAction::quit(kapp, TQ_SLOT(quit()), parent->actionCollection());
 
     updateLayout();
 }
@@ -323,13 +323,13 @@ void KPager::showPopupMenu( WId wid, TQPoint pos)
 
             m_mnu->insertTitle( TQString::fromUtf8("KPager"), 1);
             m_mnu->setCheckable(true);
-            connect(m_mnu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(clientPopupAboutToShow()));
-            connect(m_mnu, TQT_SIGNAL(activated(int)), TQT_SLOT(clientPopupActivated(int)));
+            connect(m_mnu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(clientPopupAboutToShow()));
+            connect(m_mnu, TQ_SIGNAL(activated(int)), TQ_SLOT(clientPopupActivated(int)));
 
             m_dmnu = new TQPopupMenu(m_mnu);
             m_dmnu->setCheckable(true);
-            connect(m_dmnu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(desktopPopupAboutToShow()));
-            connect(m_dmnu, TQT_SIGNAL(activated(int)), TQT_SLOT(sendToDesktop(int)));
+            connect(m_dmnu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(desktopPopupAboutToShow()));
+            connect(m_dmnu, TQ_SIGNAL(activated(int)), TQ_SLOT(sendToDesktop(int)));
 
             m_mnu->insertItem( i18n("Mi&nimize"), IconifyOp );
             m_mnu->insertItem( i18n("Ma&ximize"), MaximizeOp );
diff --git a/kpager/kpager.h b/kpager/kpager.h
index 4a3d2ef8f..7fdd7d573 100644
--- a/kpager/kpager.h
+++ b/kpager/kpager.h
@@ -36,7 +36,7 @@ class TQPopupMenu;
 
 class KPagerMainWindow : public TDEMainWindow, public virtual KPagerIface
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KPagerMainWindow(TQWidget *parent=0, const char *name=0);
@@ -59,7 +59,7 @@ protected:
 
 class KPager : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class KPagerMainWindow;
 
diff --git a/kpersonalizer/CMakeLists.txt b/kpersonalizer/CMakeLists.txt
index 19c3a6698..6fe020c82 100644
--- a/kpersonalizer/CMakeLists.txt
+++ b/kpersonalizer/CMakeLists.txt
@@ -40,6 +40,6 @@ tde_add_executable( kpersonalizer AUTOMOC
     kpersonalizer.cpp main.cpp kfindlanguage.cpp
     kcountrypagedlg.ui kospagedlg.ui keyecandypagedlg.ui
     tdestylepagedlg.ui krefinepagedlg.ui ksysinfo.cpp
-  LINK tdeio-shared
+  LINK tdeio-shared ${KSTAT_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kpersonalizer/README b/kpersonalizer/README
index b93d9d15d..14cbb63ca 100644
--- a/kpersonalizer/README
+++ b/kpersonalizer/README
@@ -39,8 +39,8 @@ that don't require much background-knowledge and tries to guess a set
 of configuration-settings which fit the users needs best.
 
 Layout: KPersonalizer consists of a window which is not set fullscreen.
-This has the advantage that the user sees on the fly which settings he has
-changed and can step back as he sees that something doesn't fit.
+This has the advantage that the user sees on the fly which settings they
+have changed and can step back as they see that something doesn't fit.
 On the left of each dialog there is a decorative 170x430-pixel-bitmap which
 sort of describes the step in a graphical manner.
 
@@ -204,7 +204,7 @@ There is a preview for each theme.
 
 Step 5: Refinement
 ==============
-The user is told how he can start KPersonalizer again if the user changes his
+The user is told how they can start KPersonalizer again if they change their
 mind on a certain setting later and the advanced user may launch kcontrol to
 refine certain settings.
 
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index cec71bae8..0384ff2b8 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -37,8 +37,8 @@ KCountryPage::KCountryPage(TQWidget *parent, const char *name ) : KCountryPageDl
 
 	px_introSidebar->setPixmap(UserIcon("step1.png"));
 
-	connect(cb_country, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLangForCountry(const TQString &)));
-	connect(cb_language, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLanguageChanged()));
+	connect(cb_country, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(setLangForCountry(const TQString &)));
+	connect(cb_language, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(setLanguageChanged()));
 
 	// naturally, the language is not changed on startup
 	b_savedLanguageChanged = false;
diff --git a/kpersonalizer/kcountrypage.h b/kpersonalizer/kcountrypage.h
index 758decbb3..083937fd6 100644
--- a/kpersonalizer/kcountrypage.h
+++ b/kpersonalizer/kcountrypage.h
@@ -29,7 +29,7 @@ class KFindLanguage;
   */
 
 class KCountryPage : public KCountryPageDlg  {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KCountryPage(TQWidget *parent=0, const char *name=0);
 	~KCountryPage();
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index fb0f446d7..9c1fb7765 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -689,7 +689,7 @@ void KEyeCandyPage::getUserDefaults(){
 	st_UserWallpaper.CommonDesktop = kdesktopconf->readBoolEntry("CommonDesktop", true);
 	kdesktopconf->setGroup("Desktop0"); // we only need to set one desktop
 	st_UserWallpaper.MultiWallpaperMode = kdesktopconf->readEntry("MultiWallpaperMode", "NoMulti");
-	st_UserWallpaper.WallpaperMode = kdesktopconf->readEntry("WallpaperMode", "Scaled");
+	st_UserWallpaper.WallpaperMode = kdesktopconf->readEntry("WallpaperMode", "ScaledAndCrop");
 	st_UserWallpaper.Wallpaper = kdesktopconf->readPathEntry("Wallpaper", "NoWallpaper");
 	deskbgimage = kdesktopconf->readPathEntry("Wallpaper", DEFAULT_WALLPAPER);
 	// Wallpaper-User-Defaults (END)
diff --git a/kpersonalizer/keyecandypage.h b/kpersonalizer/keyecandypage.h
index 63889a67c..0601a6736 100644
--- a/kpersonalizer/keyecandypage.h
+++ b/kpersonalizer/keyecandypage.h
@@ -29,7 +29,7 @@ class KSysInfo;
   */
 
 class KEyeCandyPage : public KEyeCandyPageDlg {
-	Q_OBJECT
+	TQ_OBJECT
 public: 
 	KEyeCandyPage(TQWidget *parent=0, const char *name=0);
 	~KEyeCandyPage();
diff --git a/kpersonalizer/keyecandypagedlg.ui b/kpersonalizer/keyecandypagedlg.ui
index 1a9c7e570..79835faf4 100644
--- a/kpersonalizer/keyecandypagedlg.ui
+++ b/kpersonalizer/keyecandypagedlg.ui
@@ -251,10 +251,10 @@ If you have a fast, new processor, you might want to turn them all on, but for t
         <slot>slotEyeCandySliderMoved(int)</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot>slotEyeCandyShowDetails(bool)</slot>
     <slot>slotEyeCandySliderMoved(int)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">tdelistview.h</include>
diff --git a/kpersonalizer/kospage.h b/kpersonalizer/kospage.h
index 2797f4572..8d3d35142 100644
--- a/kpersonalizer/kospage.h
+++ b/kpersonalizer/kospage.h
@@ -26,7 +26,7 @@
   */
 
 class KOSPage : public KOSPageDlg  {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KOSPage(TQWidget *parent=0, const char *name=0);
 	~KOSPage();
diff --git a/kpersonalizer/kospagedlg.ui b/kpersonalizer/kospagedlg.ui
index 30edfeea9..45e2de8b5 100644
--- a/kpersonalizer/kospagedlg.ui
+++ b/kpersonalizer/kospagedlg.ui
@@ -207,12 +207,12 @@ Trinity allows you to customize its behavior according to your needs.</string>
         <slot>slotMacDescription()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot>slotWindowsDescription()</slot>
     <slot>slotKDEDescription()</slot>
     <slot>slotMacDescription()</slot>
     <slot>slotUnixDescription()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index 86b0a5b4a..cef8619ea 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -90,9 +90,9 @@ KPersonalizer::KPersonalizer(TQWidget *parent, const char *name)
 	locale = new TDELocale("kpersonalizer");
 	locale->setLanguage(TDELocale::defaultLanguage());
 
-	connect(ospage, TQT_SIGNAL(selectedOS(const TQString&)), stylepage, TQT_SLOT(presetStyle(const TQString&)));
-	connect(ospage, TQT_SIGNAL(selectedOS(const TQString&)), eyecandy, TQT_SLOT(slotPresetSlider(const TQString&)));
-	connect(refinepage->pb_kcontrol, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
+	connect(ospage, TQ_SIGNAL(selectedOS(const TQString&)), stylepage, TQ_SLOT(presetStyle(const TQString&)));
+	connect(ospage, TQ_SIGNAL(selectedOS(const TQString&)), eyecandy, TQ_SLOT(slotPresetSlider(const TQString&)));
+	connect(refinepage->pb_kcontrol, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
 
 	setPosition();
 
@@ -125,7 +125,7 @@ void KPersonalizer::next() {
 	else if(currentPage()==eyecandy){
 		eye_dirty=true;  // set the dirty flag, changes done that need reverting
 		eyecandy->save();
-		TQTimer::singleShot(0, this, TQT_SLOT(slotNext()));
+		TQTimer::singleShot(0, this, TQ_SLOT(slotNext()));
 	}
 	else if(currentPage()==stylepage){
 		style_dirty=true;  // set the dirty flag, changes done that need reverting
@@ -215,7 +215,7 @@ void KPersonalizer::slotRestart() {
 }
 
 void KPersonalizer::delayedRestart() {
-	TQTimer::singleShot(0, this, TQT_SLOT(slotRestart()));
+	TQTimer::singleShot(0, this, TQ_SLOT(slotRestart()));
 }
 
 /** this session is restarted, so we want to start with ospage */
diff --git a/kpersonalizer/kpersonalizer.h b/kpersonalizer/kpersonalizer.h
index 78ff71ee4..76faaae0f 100644
--- a/kpersonalizer/kpersonalizer.h
+++ b/kpersonalizer/kpersonalizer.h
@@ -37,7 +37,7 @@ class KRefinePage;
 
 /** KPersonalizer is the base class of the project */
 class KPersonalizer : public KWizard {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/** construtor */
 	KPersonalizer(TQWidget* parent=0, const char *name=0);
diff --git a/kpersonalizer/krefinepage.cpp b/kpersonalizer/krefinepage.cpp
index 568967690..32c7370ae 100644
--- a/kpersonalizer/krefinepage.cpp
+++ b/kpersonalizer/krefinepage.cpp
@@ -28,7 +28,7 @@
 
 KRefinePage::KRefinePage(TQWidget *parent, const char *name ) : KRefinePageDlg(parent,name) {
    px_finishSidebar->setPixmap(UserIcon("step5.png"));
-   connect( pb_kcontrol, TQT_SIGNAL(clicked()), TQT_SLOT(startKControl()) );
+   connect( pb_kcontrol, TQ_SIGNAL(clicked()), TQ_SLOT(startKControl()) );
    if( KPersonalizer::beforeSession()) {
        pb_kcontrol->hide();
        lb_kcontrol->hide();
diff --git a/kpersonalizer/krefinepage.h b/kpersonalizer/krefinepage.h
index 4065b5a28..e0442f88b 100644
--- a/kpersonalizer/krefinepage.h
+++ b/kpersonalizer/krefinepage.h
@@ -25,7 +25,7 @@
   */
 
 class KRefinePage : public KRefinePageDlg  {
-   Q_OBJECT
+   TQ_OBJECT
 public: 
 	KRefinePage(TQWidget *parent=0, const char *name=0);
 	~KRefinePage();
diff --git a/kpersonalizer/ksysinfo.cpp b/kpersonalizer/ksysinfo.cpp
index 20a089b8f..551dad3f8 100644
--- a/kpersonalizer/ksysinfo.cpp
+++ b/kpersonalizer/ksysinfo.cpp
@@ -235,8 +235,36 @@ TQFont KSysInfo::getFixedWidthFont(){
 ///////////////////
 
 ///////////////////
-//#elif defined(__svr4__) && defined(sun)
+#elif defined(Q_OS_SOLARIS)
 ///////////////////
+#include <kstat.h>
+
+	void KSysInfo::initHWInfo() {
+		kstat_ctl_t	*kctl;
+		kstat_t		*ksp;
+		kstat_named_t	*kdata;
+
+		m_cpu_speed = 0;
+		/* cpu_info:0:cpu_info0:current_clock_Hz */
+
+		kctl = kstat_open();
+		if (kctl == NULL)
+			return;
+		if (kstat_chain_update(kctl) != 0)
+			goto out;
+		ksp = kstat_lookup(kctl, "cpu_info", 0, "cpu_info0");
+		if (ksp == NULL)
+			goto out;
+		if (kstat_read(kctl, ksp, NULL) == -1 )
+			goto out;
+
+		kdata = (kstat_named_t *)kstat_data_lookup(ksp,
+			"clock_Hz");
+		if (kdata != NULL)
+			m_cpu_speed = kdata->value.ui64;
+		out:
+		kstat_close(kctl);
+	}
 
 ///////////////////
 //#elif __svr4__
diff --git a/kpersonalizer/stylepreview.ui b/kpersonalizer/stylepreview.ui
index 7e132c4c7..628241ac7 100644
--- a/kpersonalizer/stylepreview.ui
+++ b/kpersonalizer/stylepreview.ui
@@ -176,10 +176,10 @@
     <include location="local" impldecl="in implementation">stylepreview.ui.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>init()</slot>
     <slot returnType="bool">eventFilter( TQObject * obj, TQEvent * ev )</slot>
-</Q_SLOTS>
+</slots>
 
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kpersonalizer/stylepreview.ui.h b/kpersonalizer/stylepreview.ui.h
index a36023fd0..b4c626221 100644
--- a/kpersonalizer/stylepreview.ui.h
+++ b/kpersonalizer/stylepreview.ui.h
@@ -41,14 +41,14 @@ void StylePreview::init()
 {
     // Ensure that the user can't toy with the child widgets.
     // Method borrowed from Qt's qtconfig.
-    TQObjectList* l = queryList(TQWIDGET_OBJECT_NAME_STRING);
+    TQObjectList* l = queryList("TQWidget");
     TQObjectListIt it(*l);
     TQObject* obj;
     while ((obj = it.current()) != 0)
     {
         ++it;
         obj->installEventFilter(this);
-        ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus);
+        ((TQWidget*)obj)->setFocusPolicy(TQWidget::NoFocus);
     }
     delete l;
 }
diff --git a/kpersonalizer/tdestylepage.cpp b/kpersonalizer/tdestylepage.cpp
index 5c85f402c..2fd4a8419 100644
--- a/kpersonalizer/tdestylepage.cpp
+++ b/kpersonalizer/tdestylepage.cpp
@@ -75,8 +75,8 @@ TDEStylePage::TDEStylePage(TQWidget *parent, const char *name ) : TDEStylePageDl
 	platinum->setText( 0, i18n( "Platinum" ) );
 	platinum->setText( 1, i18n( "The platinum style" ) );
 
-	connect(klv_styles, TQT_SIGNAL(selectionChanged()),
-			this, TQT_SLOT(slotCurrentChanged()));
+	connect(klv_styles, TQ_SIGNAL(selectionChanged()),
+			this, TQ_SLOT(slotCurrentChanged()));
 
 	// Note: if the default is changed here it needs to be changed in tdebase/twin/plugins.cpp
 	//       and tdebase/twin/kcmtwin/twindecoration/twindecoration.cpp as well.
diff --git a/kpersonalizer/tdestylepage.h b/kpersonalizer/tdestylepage.h
index 30b907094..af529d8f8 100644
--- a/kpersonalizer/tdestylepage.h
+++ b/kpersonalizer/tdestylepage.h
@@ -27,7 +27,7 @@
 class TQListViewItem;
 
 class TDEStylePage : public TDEStylePageDlg  {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDEStylePage(TQWidget *parent=0, const char *name=0);
diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp
index 9d1ef9e32..71c6588d9 100644
--- a/krootbacking/krootbacking.cpp
+++ b/krootbacking/krootbacking.cpp
@@ -45,7 +45,7 @@ class KRootBackingData
 {
 public:
     TQWidget *toplevel;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWinModule *twin;
 #endif
 };
@@ -68,10 +68,10 @@ void KRootBacking::init()
     m_bInit = false;
     m_bActive = false;
 
-    connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)));
-    connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint()));
-#ifdef Q_WS_X11
-    connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool)));
+    connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)));
+    connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(repaint()));
+#ifdef TQ_WS_X11
+    connect(m_pPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool)));
 
     d->twin = new KWinModule( this );
 #endif
@@ -88,7 +88,7 @@ KRootBacking::~KRootBacking()
 
 int KRootBacking::currentDesktop() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETRootInfo rinfo( tqt_xdisplay(), NET::CurrentDesktop );
     rinfo.activate();
     return rinfo.currentDesktop();
@@ -107,7 +107,7 @@ void KRootBacking::start()
 	// We should get a KIPC message when the shared pixmap is available...
 	enableExports();
 	if (m_timeout < 50) {
-		TQTimer::singleShot( 100, this, SLOT(show()) );	// ...but it doesn't always work!
+		TQTimer::singleShot( 100, this, TQ_SLOT(show()) );	// ...but it doesn't always work!
 		m_timeout++;
 		return;
 	}
@@ -153,7 +153,7 @@ void KRootBacking::repaint(bool force)
 	return;
 
     m_Rect = TQRect(p1, p2);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     m_Desk = currentDesktop();
 
     // TDESharedPixmap will correctly generate a tile for us.
@@ -172,7 +172,7 @@ void KRootBacking::repaint(bool force)
 
 bool KRootBacking::isAvailable() const
 {
-// #ifdef Q_WS_X11
+// #ifdef TQ_WS_X11
 //     return m_pPixmap->isAvailable(pixmapName(m_Desk));
 // #else
     return m_pPixmap->isNull();
@@ -181,7 +181,7 @@ bool KRootBacking::isAvailable() const
 
 TQString KRootBacking::pixmapName(int desk) {
     TQString pattern = TQString("DESKTOP%1");
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     int screen_number = DefaultScreen(tqt_xdisplay());
     if (screen_number) {
         pattern = TQString("SCREEN%1-DESKTOP").arg(screen_number) + "%1";
@@ -193,7 +193,7 @@ TQString KRootBacking::pixmapName(int desk) {
 
 void KRootBacking::enableExports()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdDebug(270) << k_lineinfo << "activating background exports.\n";
     DCOPClient *client = kapp->dcopClient();
     if (!client->isAttached())
@@ -218,7 +218,7 @@ void KRootBacking::slotDone(bool success)
     {
 	kdWarning(270) << k_lineinfo << "loading of desktop background failed.\n";
 	if (m_timeout < 50) {
-		TQTimer::singleShot( 100, this, SLOT(show()) );
+		TQTimer::singleShot( 100, this, TQ_SLOT(show()) );
 		m_timeout++;
 		return;
 	}
diff --git a/krootbacking/krootbacking.h b/krootbacking/krootbacking.h
index 731e64362..a430d3c45 100644
--- a/krootbacking/krootbacking.h
+++ b/krootbacking/krootbacking.h
@@ -27,7 +27,7 @@
 #include <tqcolor.h>
 #include <tdelibs_export.h>
 
-#ifndef Q_WS_QWS //FIXME
+#ifndef TQ_WS_QWS //FIXME
 
 class TQRect;
 class TQWidget;
@@ -42,7 +42,7 @@ class KRootBackingData;
  */
 class KRootBacking: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -174,6 +174,6 @@ private:
     void init();
 };
 
-#endif // ! Q_WS_QWS
+#endif // ! TQ_WS_QWS
 
 #endif // KROOTBACKING_H
diff --git a/krootbacking/main.cpp b/krootbacking/main.cpp
index 5691d736d..f29666d02 100644
--- a/krootbacking/main.cpp
+++ b/krootbacking/main.cpp
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
 
 	TQObject* mainWin = new KRootBacking();
 	TQTimer *timer = new TQTimer( mainWin );
-        TQObject::connect( timer, SIGNAL(timeout()), mainWin, SLOT(start()) );
+        TQObject::connect( timer, TQ_SIGNAL(timeout()), mainWin, TQ_SLOT(start()) );
         timer->start( 100, TRUE ); // 100ms single shot timer
 
 	app.exec();
diff --git a/ksmserver/global.h b/ksmserver/global.h
index b76a8b363..326587ac6 100644
--- a/ksmserver/global.h
+++ b/ksmserver/global.h
@@ -10,8 +10,4 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #define KSMVendorString "KDE"
 #define KSMReleaseString "1.0"
 
-#ifdef USE_QT4
-#define NO_QT3_DBUS_SUPPORT
-#endif
-
 #endif
diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp
index 80f4e0984..1fbba6c3b 100644
--- a/ksmserver/legacy.cpp
+++ b/ksmserver/legacy.cpp
@@ -151,7 +151,7 @@ void KSMServer::performLegacySessionSave()
             ev.xclient.message_type = wm_protocols;
             ev.xclient.format = 32;
             ev.xclient.data.l[0] = wm_save_yourself;
-            ev.xclient.data.l[1] = GET_QT_X_TIME();
+            ev.xclient.data.l[1] = get_tqt_x_time();
             XSelectInput(newdisplay, w, PropertyChangeMask|StructureNotifyMask);
             XSendEvent(newdisplay, w, False, 0, &ev);
         }
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index aee40fcaa..be5ed0bcc 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -603,9 +603,9 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
     hwDevices = TDEGlobal::hardwareDevices();
 #endif
 
-    connect( &knotifyTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( knotifyTimeout()));
-    connect( &startupSuspendTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( startupSuspendTimeout()));
-    connect( &pendingShutdown, TQT_SIGNAL( timeout()), TQT_SLOT( pendingShutdownTimeout()));
+    connect( &knotifyTimeoutTimer, TQ_SIGNAL( timeout()), TQ_SLOT( knotifyTimeout()));
+    connect( &startupSuspendTimeoutTimer, TQ_SIGNAL( timeout()), TQ_SLOT( startupSuspendTimeout()));
+    connect( &pendingShutdown, TQ_SIGNAL( timeout()), TQ_SLOT( pendingShutdownTimeout()));
 
     only_local = _only_local;
 #ifdef HAVE__ICETRANSNOLISTEN
@@ -676,7 +676,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
     for ( int i = 0; i < numTransports; i++) {
         con = new KSMListener( listenObjs[i] );
         listener.append( con );
-        connect( con, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( newConnection(int) ) );
+        connect( con, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( newConnection(int) ) );
     }
 
     signal(SIGHUP, sighandler);
@@ -684,11 +684,11 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
     signal(SIGINT, sighandler);
     signal(SIGPIPE, SIG_IGN);
 
-    connect( &notificationTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( notificationTimeout() ) );
-    connect( &protectionTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( protectionTimerTick() ) );
-    connect( &restoreTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( tryRestoreNext() ) );
-    connect( &shutdownTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( timeoutQuit() ) );
-    connect( kapp, TQT_SIGNAL( shutDown() ), this, TQT_SLOT( cleanUp() ) );
+    connect( &notificationTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( notificationTimeout() ) );
+    connect( &protectionTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( protectionTimerTick() ) );
+    connect( &restoreTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( tryRestoreNext() ) );
+    connect( &shutdownTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timeoutQuit() ) );
+    connect( kapp, TQ_SIGNAL( shutDown() ), this, TQ_SLOT( cleanUp() ) );
 }
 
 KSMServer::~KSMServer()
@@ -742,7 +742,7 @@ void KSMServer::cleanUp()
 void* KSMServer::watchConnection( IceConn iceConn )
 {
     KSMConnection* conn = new KSMConnection( iceConn );
-    connect( conn, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( processData(int) ) );
+    connect( conn, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( processData(int) ) );
     return (void*) conn;
 }
 
diff --git a/ksmserver/server.h b/ksmserver/server.h
index add28fb71..fdf08cded 100644
--- a/ksmserver/server.h
+++ b/ksmserver/server.h
@@ -49,7 +49,7 @@ typedef TQMap<WId,SMData> WindowMap;
 
 class KSMServer : public TQObject, public KSMServerInterface
 {
-Q_OBJECT
+TQ_OBJECT
 K_DCOP
 k_dcop:
     void notifySlot(TQString,TQString,TQString,TQString,TQString,int,int,int,int);
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index e2699a578..f62894d72 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -272,8 +272,8 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
 	if (showLogoutStatusDlg) {
 		shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
 		if (shutdownNotifierIPDlg) {
-			connect(shutdownNotifierIPDlg, SIGNAL(abortLogoutClicked()), this, SLOT(cancelShutdown()));
-			connect(shutdownNotifierIPDlg, SIGNAL(skipNotificationClicked()), this, SLOT(forceSkipSaveYourself()));
+			connect(shutdownNotifierIPDlg, TQ_SIGNAL(abortLogoutClicked()), this, TQ_SLOT(cancelShutdown()));
+			connect(shutdownNotifierIPDlg, TQ_SIGNAL(skipNotificationClicked()), this, TQ_SLOT(forceSkipSaveYourself()));
 			static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Notifying applications of logout request..."));
 			notificationTimer.start( KSMSERVER_NOTIFICATION_MANUAL_OPTIONS_TIMEOUT, true );
 		}
@@ -289,7 +289,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
         // Set the real desktop background to black so that exit looks
         // clean regardless of what was on "our" desktop.
         if (!showLogoutStatusDlg) {
-            TQT_TQWIDGET(kapp->desktop())->setBackgroundColor( Qt::black );
+            kapp->desktop()->setBackgroundColor( TQt::black );
         }
         state = Shutdown;
         wmPhase1WaitingCount = 0;
@@ -764,8 +764,8 @@ void KSMServer::completeShutdownOrCheckpoint()
         if (!shutdownNotifierIPDlg) {
             shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
             if (shutdownNotifierIPDlg) {
-                connect(shutdownNotifierIPDlg, SIGNAL(abortLogoutClicked()), this, SLOT(cancelShutdown()));
-                connect(shutdownNotifierIPDlg, SIGNAL(skipNotificationClicked()), this, SLOT(forceSkipSaveYourself()));
+                connect(shutdownNotifierIPDlg, TQ_SIGNAL(abortLogoutClicked()), this, TQ_SLOT(cancelShutdown()));
+                connect(shutdownNotifierIPDlg, TQ_SIGNAL(skipNotificationClicked()), this, TQ_SLOT(forceSkipSaveYourself()));
             }
         }
         while (!KSMShutdownIPFeedback::ispainted()) {
@@ -963,7 +963,7 @@ void KSMServer::killWM()
     }
     if( iswm ) {
         completeKillingWM();
-        TQTimer::singleShot( 5000, this, TQT_SLOT( timeoutWMQuit() ) );
+        TQTimer::singleShot( 5000, this, TQ_SLOT( timeoutWMQuit() ) );
     }
     else {
         killingCompleted();
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index 97287ede0..64bf4a407 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -105,7 +105,7 @@ KSMShutdownFeedback::KSMShutdownFeedback()
 	m_unfadedImage = m_grayImage;
 	resize(0, 0);
 	setShown(true);
-	TQTimer::singleShot( 500, this, TQT_SLOT( slotPaintEffect() ) );
+	TQTimer::singleShot( 500, this, TQ_SLOT( slotPaintEffect() ) );
 }
 
 // called after stopping shutdown-feedback -> smooth fade-back to color-mode
@@ -243,7 +243,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 				bitBlt( this, 0, start_y1, &img );
 			}
 
-			TQTimer::singleShot( 5, this, TQT_SLOT( slotPaintEffect() ) );
+			TQTimer::singleShot( 5, this, TQ_SLOT( slotPaintEffect() ) );
 		}
 		else {
 			// if slotPaintEffect() is called first time, we have to initialize the gray image
@@ -370,7 +370,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 				bitBlt( this, 0, start_y1, &img );
 			}
 
-			TQTimer::singleShot( 5, this, TQT_SLOT( slotPaintEffect() ) );
+			TQTimer::singleShot( 5, this, TQ_SLOT( slotPaintEffect() ) );
 		}
 	}
 	else {
@@ -486,7 +486,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 					bitBlt( this, 0, start_y1, &img );
 				}
 
-				TQTimer::singleShot( 1, this, TQT_SLOT( slotPaintEffect() ) );
+				TQTimer::singleShot( 1, this, TQ_SLOT( slotPaintEffect() ) );
 			 }
 			 else {
 				if ( m_currentY >= height() ) {
@@ -511,13 +511,13 @@ void KSMShutdownFeedback::slotPaintEffect()
 				KPixmap pixmap;
 				pixmap = TQPixmap(TQPixmap::grabWindow( tqt_xrootwin(), 0, m_currentY, width(), 10 ));
 				TQImage image = pixmap.convertToImage();
-				KImageEffect::blend( Qt::black, image, 0.4 );
+				KImageEffect::blend( TQt::black, image, 0.4 );
 				KImageEffect::toGray( image, true );
 				pixmap.convertFromImage( image );
 				bitBlt( this, 0, m_currentY, &pixmap );
 				bitBlt( &m_root, 0, m_currentY, &pixmap );
 				m_currentY += 10;
-				TQTimer::singleShot( 1, this, TQT_SLOT( slotPaintEffect() ) );
+				TQTimer::singleShot( 1, this, TQ_SLOT( slotPaintEffect() ) );
 			}
 		}
 	}
@@ -529,7 +529,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 KSMShutdownIPFeedback * KSMShutdownIPFeedback::s_pSelf = 0L;
 
 KSMShutdownIPFeedback::KSMShutdownIPFeedback()
-: TQWidget( 0L, "systemmodaldialogclass", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_paintedFromSharedRootPixmap(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
+: TQWidget( 0L, "systemmodaldialogclass", TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_paintedFromSharedRootPixmap(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
 
 {
 	setShown(false);
@@ -539,7 +539,7 @@ KSMShutdownIPFeedback::KSMShutdownIPFeedback()
 
 	m_sharedRootPixmap = new KRootPixmap(this);
 	m_sharedRootPixmap->setCustomPainting(true);
-	connect(m_sharedRootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotSetBackgroundPixmap(const TQPixmap &)));
+	connect(m_sharedRootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQ_SLOT(slotSetBackgroundPixmap(const TQPixmap &)));
 
 	if (TQPaintDevice::x11AppDepth() == 32) {
 		// The shared pixmap is 24 bits, but we are 32 bits
@@ -571,13 +571,13 @@ void KSMShutdownIPFeedback::showNow()
 
 	if (!m_isPainted) {
 		setGeometry( TQApplication::desktop()->geometry() );
-		TQTimer::singleShot( 0, this, SLOT(slotPaintEffect()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(slotPaintEffect()) );
 	}
 }
 
 void KSMShutdownIPFeedback::enableExports()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	kdDebug(270) << k_lineinfo << "activating background exports.\n";
 	DCOPClient *client = kapp->dcopClient();
 	if (!client->isAttached()) {
@@ -632,7 +632,7 @@ void KSMShutdownIPFeedback::slotPaintEffect()
 			m_sharedRootPixmap->start();
 		}
 
-		TQTimer::singleShot( 100, this, SLOT(slotPaintEffect()) );
+		TQTimer::singleShot( 100, this, TQ_SLOT(slotPaintEffect()) );
 		mPixmapTimeout++;
 		return;
 	}
@@ -647,13 +647,13 @@ void KSMShutdownIPFeedback::slotPaintEffect()
 	}
 	if ((pm.isNull()) || (pm.width() != kapp->desktop()->width()) || (pm.height() != kapp->desktop()->height())) {
 		if (mPixmapTimeout < 10) {
-			TQTimer::singleShot( 100, this, SLOT(slotPaintEffect()) );
+			TQTimer::singleShot( 100, this, TQ_SLOT(slotPaintEffect()) );
 			mPixmapTimeout++;
 			return;
 		}
 		else {
 			pm = TQPixmap(kapp->desktop()->width(), kapp->desktop()->height());
-			pm.fill(Qt::black);
+			pm.fill(TQt::black);
 			m_paintedFromSharedRootPixmap = false;
 		}
 	}
@@ -757,7 +757,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 	{
 		// first line of buttons
 		hbuttonbox = new TQHBoxLayout( hbox, factor * KDialog::spacingHint() );
-		hbuttonbox->setAlignment( Qt::AlignHCenter );
+		hbuttonbox->setAlignment( TQt::AlignHCenter );
 		// End session
 		FlatButton* btnLogout = new FlatButton( frame );
 		btnLogout->setTextLabel( TQString("&") + i18n("Log out"), false );
@@ -766,7 +766,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 		int i = btnLogout->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
 		btnLogout->setAccel( "ALT+" + btnLogout->textLabel().lower()[i+1] ) ;
 		hbuttonbox->addWidget ( btnLogout );
-		connect(btnLogout, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogout()));
+		connect(btnLogout, TQ_SIGNAL(clicked()), TQ_SLOT(slotLogout()));
 	}
 	else
 	{
@@ -776,7 +776,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 		hbox->addWidget( lfrm, AlignCenter );
 
 		buttonlay = new TQVBoxLayout( hbox, factor * KDialog::spacingHint() );
-		buttonlay->setAlignment( Qt::AlignHCenter );
+		buttonlay->setAlignment( TQt::AlignHCenter );
 
 		TQLabel* icon = new TQLabel( lfrm );
 		if (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doNotUseKonqyPicture", false)) {
@@ -794,7 +794,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 		TQToolTip::add( btnLogout, i18n( "<qt><p>Log out of the current session to login as a different user.</p></qt>" ) );
 		btnFont = btnLogout->font();
 		buttonlay->addWidget( btnLogout );
-		connect(btnLogout, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogout()));
+		connect(btnLogout, TQ_SIGNAL(clicked()), TQ_SLOT(slotLogout()));
 	}
 
 	if ((maysd) || (mayrb)) {
@@ -841,7 +841,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				int i = btnFreeze->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
 				btnFreeze->setAccel( "ALT+" + btnFreeze->textLabel().lower()[i+1] ) ;
 				hbuttonbox->addWidget ( btnFreeze );
-				connect(btnFreeze, TQT_SIGNAL(clicked()), TQT_SLOT(slotFreeze()));
+				connect(btnFreeze, TQ_SIGNAL(clicked()), TQ_SLOT(slotFreeze()));
 			}
 
 			if (canSuspend && !disableSuspend)
@@ -857,7 +857,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				int i = btnSuspend->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
 				btnSuspend->setAccel( "ALT+" + btnSuspend->textLabel().lower()[i+1] ) ;
 				hbuttonbox->addWidget ( btnSuspend );
-				connect(btnSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotSuspend()));
+				connect(btnSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotSuspend()));
 			}
 
 			if (canHibernate && !disableHibernate)
@@ -872,7 +872,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				int i = btnHibernate->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
 				btnHibernate->setAccel( "ALT+" + btnHibernate->textLabel().lower()[i+1] ) ;
 				hbuttonbox->addWidget ( btnHibernate );
-				connect(btnHibernate, TQT_SIGNAL(clicked()), TQT_SLOT(slotHibernate()));
+				connect(btnHibernate, TQ_SIGNAL(clicked()), TQ_SLOT(slotHibernate()));
 			}
 
 			if (canHybridSuspend && !disableSuspend && !disableHibernate)
@@ -890,7 +890,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				int i = btnHybridSuspend->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
 				btnHybridSuspend->setAccel( "ALT+" + btnHybridSuspend->textLabel().lower()[i+1] ) ;
 				hbuttonbox->addWidget ( btnHybridSuspend );
-				connect(btnHybridSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotHybridSuspend()));
+				connect(btnHybridSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotHybridSuspend()));
 			}
 			
 			// Separator (within buttonlay)
@@ -898,7 +898,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 
 			// bottom buttons
 			TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
-			hbuttonbox2->setAlignment( Qt::AlignHCenter );
+			hbuttonbox2->setAlignment( TQt::AlignHCenter );
 
 			if (mayrb) {
 				// Reboot
@@ -909,7 +909,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
 				btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ;
 				hbuttonbox2->addWidget ( btnReboot);
-				connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
+				connect(btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot()));
 				if ( sdtype == TDEApplication::ShutdownTypeReboot ) {
 					btnReboot->setFocus();
 				}
@@ -936,7 +936,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 					}
 
 					btnReboot->setPopup(targets);
-					connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) );
+					connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) );
 				}
 				// BAD KARMA .. this code is copied line by line from standard konqy dialog [EOF]
 			}
@@ -950,7 +950,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				int i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
 				btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ;
 				hbuttonbox2->addWidget ( btnHalt );
-				connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
+				connect(btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt()));
 				if ( sdtype == TDEApplication::ShutdownTypeHalt ) {
 					btnHalt->setFocus();
 				}
@@ -958,12 +958,12 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 
 			// cancel buttonbox
 			TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
-			hbuttonbox3->setAlignment( Qt::AlignRight );
+			hbuttonbox3->setAlignment( TQt::AlignRight );
 
 			// Back to Desktop
 			KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
 			hbuttonbox3->addWidget( btnBack );
-			connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+			connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 
 		}
 		else
@@ -975,7 +975,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				TQToolTip::add( btnHalt, i18n( "<qt><p>Log out of the current session and turn off the computer.</p></qt>" ) );
 				btnHalt->setFont( btnFont );
 				buttonlay->addWidget( btnHalt );
-				connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
+				connect(btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt()));
 				if ( sdtype == TDEApplication::ShutdownTypeHalt || getenv("TDM_AUTOLOGIN") ) {
 					btnHalt->setFocus();
 				}
@@ -988,7 +988,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				btnReboot->setFont( btnFont );
 				buttonlay->addWidget( btnReboot );
 
-				connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
+				connect(btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot()));
 				if ( sdtype == TDEApplication::ShutdownTypeReboot ) {
 					btnReboot->setFocus();
 				}
@@ -1014,7 +1014,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 					}
 
 					btnReboot->setPopup(targets);
-					connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) );
+					connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) );
 				}
 			}
 
@@ -1026,7 +1026,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				" almost instantly.</p><p>This correspond to ACPI S0 mode.</p></qt>"));
 				btnFreeze->setFont( btnFont );
 				buttonlay->addWidget( btnFreeze );
-				connect(btnFreeze, TQT_SIGNAL(clicked()), TQT_SLOT(slotFreeze()));
+				connect(btnFreeze, TQ_SIGNAL(clicked()), TQ_SLOT(slotFreeze()));
 			}
 
 			if (canSuspend && !disableSuspend)
@@ -1038,7 +1038,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				"<p>Also known as Suspend-to-RAM mode.</p></qt>"));
 				btnSuspend->setFont( btnFont );
 				buttonlay->addWidget( btnSuspend );
-				connect(btnSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotSuspend()));
+				connect(btnSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotSuspend()));
 			}
 
 			if (canHibernate && !disableHibernate)
@@ -1049,7 +1049,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				" considerable time is required to reactivate the system again.</p><p>This correspond to ACPI S4 mode.</p><p>Also known as Suspend-to-Disk mode.</p></qt>"));
 				btnHibernate->setFont( btnFont );
 				buttonlay->addWidget( btnHibernate );
-				connect(btnHibernate, TQT_SIGNAL(clicked()), TQT_SLOT(slotHibernate()));
+				connect(btnHibernate, TQ_SIGNAL(clicked()), TQ_SLOT(slotHibernate()));
 			}
 
 			if (canHybridSuspend && !disableSuspend && !disableHibernate)
@@ -1063,7 +1063,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				"<p>Also known as Suspend-to-RAM + Suspend-to-Disk mode.</p></qt>"));
 				btnHybridSuspend->setFont( btnFont );
 				buttonlay->addWidget( btnHybridSuspend );
-				connect(btnHybridSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotHybridSuspend()));
+				connect(btnHybridSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotHybridSuspend()));
 			}
 			
 			buttonlay->addStretch( 1 );
@@ -1074,7 +1074,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 			// Back to Desktop
 			KPushButton* btnBack = new KPushButton( KStdGuiItem::cancel(), frame );
 			buttonlay->addWidget( btnBack );
-			connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+			connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 		}
 	}
 	else {
@@ -1083,13 +1083,13 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 		{
 			// cancel buttonbox
 			TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
-			hbuttonbox3->setAlignment( Qt::AlignRight );
+			hbuttonbox3->setAlignment( TQt::AlignRight );
 
 			// Back to Desktop
 			KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
 			hbuttonbox3->addWidget( btnBack );
 
-			connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+			connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 		}
 		else
 		{
@@ -1100,7 +1100,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 			KPushButton* btnBack = new KPushButton( KStdGuiItem::cancel(), frame );
 			buttonlay->addWidget( btnBack );
 
-			connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+			connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 		}
 	}
 }
@@ -1246,8 +1246,8 @@ KSMShutdownIPDlg::KSMShutdownIPDlg(TQWidget* parent)
 
 	setNotificationActionButtonsSkipText(i18n("Skip Notification"));
 	m_button2->setText(i18n("Abort Logout"));
-	connect(m_button1, SIGNAL(clicked()), this, SIGNAL(skipNotificationClicked()));
-	connect(m_button2, SIGNAL(clicked()), this, SIGNAL(abortLogoutClicked()));
+	connect(m_button1, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(skipNotificationClicked()));
+	connect(m_button2, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(abortLogoutClicked()));
 
 	show();
 	setActiveWindow();
@@ -1264,10 +1264,10 @@ KSMDelayedPushButton::KSMDelayedPushButton( const KGuiItem &item,
 						const char *name)
   : KPushButton( item, parent, name), pop(0), popt(0)
 {
-  connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()));
-  connect(this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()));
+  connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotPressed()));
+  connect(this, TQ_SIGNAL(released()), TQ_SLOT(slotReleased()));
   popt = new TQTimer(this);
-  connect(popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+  connect(popt, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
 }
 
 void KSMDelayedPushButton::setPopup(TQPopupMenu *p)
@@ -1329,7 +1329,7 @@ KSMDelayedMessageBox::KSMDelayedMessageBox( TDEApplication::ShutdownType sdtype,
 	}
 	TQTimer *timer = new TQTimer( this );
 	timer->start( 1000 );
-	connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateText() ) );
+	connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateText() ) );
 	KDialog::centerOnScreen(this);
 }
 
@@ -1436,7 +1436,7 @@ void FlatButton::init()
 	setUsesBigPixmap(true);
 	setAutoRaise(true);
 	setTextPosition( TQToolButton::Under );
-	setFocusPolicy(TQ_StrongFocus);
+	setFocusPolicy(TQWidget::StrongFocus);
  }
 
 
diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h
index e92b6c3cd..7539fd75b 100644
--- a/ksmserver/shutdowndlg.h
+++ b/ksmserver/shutdowndlg.h
@@ -48,7 +48,7 @@ enum SuspendType {
 // The (singleton) widget that makes/fades the desktop gray.
 class KSMShutdownFeedback : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	static void start() { s_pSelf = new KSMShutdownFeedback(); }
@@ -82,7 +82,7 @@ private:
 // The (singleton) widget that shows either pretty pictures or a black screen during logout
 class KSMShutdownIPFeedback : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	static void start() { s_pSelf = new KSMShutdownIPFeedback(); }
@@ -125,7 +125,7 @@ private:
 // The confirmation dialog
 class KSMShutdownDlg : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	static bool confirmShutdown( bool maysd, bool mayrb, TDEApplication::ShutdownType& sdtype, TQString& bopt, int* selection=0 );
@@ -156,7 +156,7 @@ private:
 // The shutdown-in-progress dialog
 class KSMShutdownIPDlg : public KSMModalDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	static TQWidget* showShutdownIP();
@@ -182,7 +182,7 @@ private:
 
 class KSMDelayedPushButton : public KPushButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -201,7 +201,7 @@ private:
 
 class KSMPushButton : public KPushButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -221,7 +221,7 @@ private:
 
 class FlatButton : public TQToolButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  public:
 
@@ -250,7 +250,7 @@ class TQLabel;
 
 class  KSMDelayedMessageBox : public TimedLogoutDlg
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KSMDelayedMessageBox( TDEApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay );
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index fb9e696ec..f3b0012ab 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -145,7 +145,7 @@ void KSMServer::restoreSession( TQString sessionName )
         if ((showFancyLogin) && (!startupNotifierIPDlg)) {
             startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP();
         }
-        TQTimer::singleShot( 4000, this, TQT_SLOT( autoStart0() ) );
+        TQTimer::singleShot( 4000, this, TQ_SLOT( autoStart0() ) );
     } else {
         if ((showFancyLogin) && (!startupNotifierIPDlg)) {
             startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP();
@@ -192,7 +192,7 @@ void KSMServer::startDefaultSession()
     if ((showFancyLogin) && (!startupNotifierIPDlg)) {
         startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP();
     }
-    TQTimer::singleShot( 4000, this, TQT_SLOT( autoStart0() ) );
+    TQTimer::singleShot( 4000, this, TQ_SLOT( autoStart0() ) );
 }
 
 
@@ -226,7 +226,7 @@ void KSMServer::autoStart0Done()
     connectDCOPSignal( "kcminit", "kcminit", "phase1Done()",
                        "kcmPhase1Done()", true);
     state = KcmInitPhase1;
-    TQTimer::singleShot( 10000, this, TQT_SLOT( kcmPhase1Timeout())); // protection
+    TQTimer::singleShot( 10000, this, TQ_SLOT( kcmPhase1Timeout())); // protection
     DCOPRef( "kcminit", "kcminit" ).send( "runPhase1" );
 }
 
@@ -333,7 +333,7 @@ void KSMServer::autoStart2()
     DCOPRef( "kdesktop", "KDesktopIface" ).send( "runAutoStart" );
     connectDCOPSignal( "kcminit", "kcminit", "phase2Done()",
                        "kcmPhase2Done()", true);
-    TQTimer::singleShot( 10000, this, TQT_SLOT( kcmPhase2Timeout())); // protection
+    TQTimer::singleShot( 10000, this, TQ_SLOT( kcmPhase2Timeout())); // protection
     DCOPRef( "kcminit", "kcminit" ).send( "runPhase2" );
     if( !defaultSession())
         restoreLegacySession( TDEGlobal::config());
diff --git a/ksmserver/startupdlg.h b/ksmserver/startupdlg.h
index a18a121d6..bc9327a09 100644
--- a/ksmserver/startupdlg.h
+++ b/ksmserver/startupdlg.h
@@ -34,7 +34,7 @@ class TDEAction;
 // The startup-in-progress dialog
 class KSMStartupIPDlg : public KSMModalDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	static TQWidget* showStartupIP();
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp
index 7ee681907..c790000b0 100644
--- a/ksplashml/kcmksplash/installer.cpp
+++ b/ksplashml/kcmksplash/installer.cpp
@@ -36,8 +36,8 @@ ThemeListBox::ThemeListBox(TQWidget *parent)
   : TDEListBox(parent)
 {
    setAcceptDrops(true);
-   connect(this, TQT_SIGNAL(mouseButtonPressed(int, TQListBoxItem *, const TQPoint &)),
-           this, TQT_SLOT(slotMouseButtonPressed(int, TQListBoxItem *, const TQPoint &)));
+   connect(this, TQ_SIGNAL(mouseButtonPressed(int, TQListBoxItem *, const TQPoint &)),
+           this, TQ_SLOT(slotMouseButtonPressed(int, TQListBoxItem *, const TQPoint &)));
 }
 
 void ThemeListBox::dragEnterEvent(TQDragEnterEvent* event)
@@ -56,7 +56,7 @@ void ThemeListBox::dropEvent(TQDropEvent* event)
 
 void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &p)
 {
-   if ((button & Qt::LeftButton) == 0) return;
+   if ((button & TQt::LeftButton) == 0) return;
    mOldPos = p;
    mDragFile = TQString::null;
    int cur = index(item);
@@ -66,7 +66,7 @@ void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const
 
 void ThemeListBox::mouseMoveEvent(TQMouseEvent *e)
 {
-   if (((e->state() & Qt::LeftButton) != 0) && !mDragFile.isEmpty())
+   if (((e->state() & TQt::LeftButton) != 0) && !mDragFile.isEmpty())
    {
       int delay = TDEGlobalSettings::dndEventDelay();
       TQPoint newPos = e->globalPos();
@@ -100,21 +100,21 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn
 
   mThemesList = new ThemeListBox(this);
   mThemesList->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
-  connect(mThemesList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSetTheme(int)));
-  connect(mThemesList, TQT_SIGNAL(filesDropped(const KURL::List&)), TQT_SLOT(slotFilesDropped(const KURL::List&)));
+  connect(mThemesList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotSetTheme(int)));
+  connect(mThemesList, TQ_SIGNAL(filesDropped(const KURL::List&)), TQ_SLOT(slotFilesDropped(const KURL::List&)));
   leftbox->addWidget(mThemesList);
 
   mBtnAdd = new KPushButton( i18n("Add..."), this );
   leftbox->addWidget( mBtnAdd );
-  connect(mBtnAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()));
+  connect(mBtnAdd, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()));
 
   mBtnRemove = new KPushButton( i18n("Remove"), this );
   leftbox->addWidget( mBtnRemove );
-  connect(mBtnRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
+  connect(mBtnRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()));
 
   mBtnTest = new KPushButton( i18n("Test"), this );
   leftbox->addWidget( mBtnTest );
-  connect(mBtnTest, TQT_SIGNAL(clicked()), TQT_SLOT(slotTest()));
+  connect(mBtnTest, TQ_SIGNAL(clicked()), TQ_SLOT(slotTest()));
 
   TQVBoxLayout* rightbox = new TQVBoxLayout( hbox, KDialog::spacingHint() );
   hbox->setStretchFactor( rightbox, 3 );
@@ -123,7 +123,7 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn
   mPreview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
   mPreview->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
   mPreview->setMinimumSize(TQSize(320,240));
-  mPreview->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
+  mPreview->setAlignment(TQt::AlignHCenter|TQt::AlignVCenter);
   rightbox->addWidget(mPreview);
   rightbox->setStretchFactor( mPreview, 3 );
 
diff --git a/ksplashml/kcmksplash/installer.h b/ksplashml/kcmksplash/installer.h
index 7a46e368b..5ede31d1f 100644
--- a/ksplashml/kcmksplash/installer.h
+++ b/ksplashml/kcmksplash/installer.h
@@ -24,7 +24,7 @@ class ThemeListBox;
 
 class SplashInstaller : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   SplashInstaller(TQWidget *parent=0, const char *aName=0, bool aInit=FALSE);
   ~SplashInstaller();
@@ -62,7 +62,7 @@ private:
 
 class ThemeListBox: public TDEListBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ThemeListBox(TQWidget *parent);
   TQMap<TQString, TQString> text2path;
diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp
index f0b5d1f52..4a2f9cf5c 100644
--- a/ksplashml/kcmksplash/main.cpp
+++ b/ksplashml/kcmksplash/main.cpp
@@ -59,7 +59,7 @@ KSplashThemeMgr::KSplashThemeMgr( TQWidget *parent, const char *name, const TQSt
   TQHBoxLayout *box = new TQHBoxLayout(this, 0, 0);
   box->addWidget(mInstaller);
 #endif
-  connect( mInstaller, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
+  connect( mInstaller, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
   TDEAboutData *about = new TDEAboutData( "kcmksplash"
                                       ,I18N_NOOP("TDE splash screen theme manager")
                                       ,"0.1"
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index 0e1242120..1c311ed8b 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -71,7 +71,7 @@ ThemeDefault::ThemeDefault( TQWidget *parent, const char *name, const TQStringLi
   if( mIconsFlashing )
   {
     mFlashTimer = new TQTimer( this );
-    connect( mFlashTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(flash()) );
+    connect( mFlashTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(flash()) );
     mFlashPixmap1 = new TQPixmap();
     mFlashPixmap2 = new TQPixmap();
 
@@ -120,19 +120,19 @@ void ThemeDefault::_initUi()
   if (mActivePixmap->isNull())
   {
     mActivePixmap->resize(200,100);
-    mActivePixmap->fill(Qt::blue);
+    mActivePixmap->fill(TQt::blue);
   }
   if (mInactivePixmap->isNull())
   {
     mInactivePixmap->resize(200,100);
-    mInactivePixmap->fill(Qt::black);
+    mInactivePixmap->fill(TQt::black);
   }
 
   TQPixmap tlimage( _findPicture(TQString("splash_top.png")) );
   if (tlimage.isNull())
   {
     tlimage.resize(200,100);
-    tlimage.fill(Qt::blue);
+    tlimage.fill(TQt::blue);
   }
   TQLabel *top_label = new TQLabel( vbox );
   top_label->setPixmap( tlimage );
@@ -147,7 +147,7 @@ void ThemeDefault::_initUi()
   if (blimage.isNull())
   {
     blimage.resize(200,100);
-    blimage.fill(Qt::black);
+    blimage.fill(TQt::black);
   }
   TQLabel *bottom_label = new TQLabel( vbox );
   bottom_label->setPaletteBackgroundPixmap( blimage );
@@ -212,7 +212,7 @@ void ThemeDefault::_readSettings()
   cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) );
 
   mIconsFlashing = cfg->readBoolEntry( "Icons Flashing", true );
-  TQColor df(Qt::white);
+  TQColor df(TQt::white);
   mLabelForeground = cfg->readColorEntry( "Label Foreground", &df );
   TQValueList<int> io_list=cfg->readIntListEntry("Icon Offsets");
   if (io_list.size() == MAX_ICONS)
diff --git a/ksplashml/themeengine/default/themelegacy.h b/ksplashml/themeengine/default/themelegacy.h
index 1f56d05b0..0e99d69f7 100644
--- a/ksplashml/themeengine/default/themelegacy.h
+++ b/ksplashml/themeengine/default/themelegacy.h
@@ -29,7 +29,7 @@ class TQCheckBox;
 
 class DefaultConfig: public ThemeEngineConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   DefaultConfig( TQWidget *, TDEConfig * );
   void save();
@@ -43,7 +43,7 @@ protected:
 class ObjKsTheme;
 class KDE_EXPORT ThemeDefault : public ThemeEngine
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ThemeDefault( TQWidget *, const char *, const TQStringList& );
    virtual ~ThemeDefault();
diff --git a/ksplashml/themeengine/objkstheme.h b/ksplashml/themeengine/objkstheme.h
index 8959c5537..f6884b46f 100644
--- a/ksplashml/themeengine/objkstheme.h
+++ b/ksplashml/themeengine/objkstheme.h
@@ -26,9 +26,9 @@ class TDEConfig;
  * of KSplash completely, and offers a friendlier way
  * of installing custom splash screens.
  */
-class KDE_EXPORT ObjKsTheme : public QObject
+class KDE_EXPORT ObjKsTheme : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   explicit ObjKsTheme( const TQString& );
   virtual ~ObjKsTheme();
diff --git a/ksplashml/themeengine/redmond/previewredmond.cpp b/ksplashml/themeengine/redmond/previewredmond.cpp
index 29bfa4b66..5f759686c 100644
--- a/ksplashml/themeengine/redmond/previewredmond.cpp
+++ b/ksplashml/themeengine/redmond/previewredmond.cpp
@@ -33,10 +33,10 @@ PreviewRedmond::PreviewRedmond( TQWidget* parent )
     m_userFont (TQFont( "Arial", 16 )),
     m_statusFont (TQFont( "Arial", 12, TQFont::Bold )),
 
-    m_welcomeColor (Qt::white),
-    m_welcomeShadowColor (Qt::darkGray),
-    m_userColor (Qt::darkGray),
-    m_statusColor (Qt::white),
+    m_welcomeColor (TQt::white),
+    m_welcomeShadowColor (TQt::darkGray),
+    m_userColor (TQt::darkGray),
+    m_statusColor (TQt::white),
 
     m_icon (DesktopIcon("kmenu")),
 
@@ -71,7 +71,7 @@ void PreviewRedmond::_updateCache()
   TQPainter p;
   p.begin( &m_cache );
 
-  p.fillRect( rect(), Qt::gray );
+  p.fillRect( rect(), TQt::gray );
 
   m_welcomeFont.setItalic( true );
   p.setFont( m_welcomeFont );
diff --git a/ksplashml/themeengine/redmond/previewredmond.h b/ksplashml/themeengine/redmond/previewredmond.h
index 5fc5558c2..fdaf6418e 100644
--- a/ksplashml/themeengine/redmond/previewredmond.h
+++ b/ksplashml/themeengine/redmond/previewredmond.h
@@ -27,7 +27,7 @@
  */
 class PreviewRedmond: public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   PreviewRedmond( TQWidget* );
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index b0e81ba72..3792d6057 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -52,7 +52,7 @@ CfgRedmond::CfgRedmond( TQWidget *p, TDEConfig *c )
   TQFont defaultUsernameFont( "Arial", 16, TQFont::Bold );
   TQFont defaultActionFont( "Arial", 12, TQFont::Bold );
   TQColor defaultDarkColor( 3, 47, 156 );
-  TQColor defaultWhiteColor( Qt::white );
+  TQColor defaultWhiteColor( TQt::white );
 
   TQHBox *hbox = new TQHBox( vbox );
   hbox->setFrameStyle( TQFrame::WinPanel );
@@ -356,7 +356,7 @@ void ThemeRedmond::_readSettings()
   mActionFont        = cfg->readFontEntry( "Action Font", &defaultActionFont );
 
   TQColor defaultDarkColor( 3, 47, 156 );
-  TQColor defaultWhiteColor( Qt::white );
+  TQColor defaultWhiteColor( TQt::white );
 
   mWelcomeTextColor       = cfg->readColorEntry( "Welcome Text Color", &defaultWhiteColor );
   mWelcomeTextShadowColor = cfg->readColorEntry( "Welcome Shadow Color", &defaultDarkColor );
diff --git a/ksplashml/themeengine/redmond/themeredmond.h b/ksplashml/themeengine/redmond/themeredmond.h
index d68e004da..1fbb7c57a 100644
--- a/ksplashml/themeengine/redmond/themeredmond.h
+++ b/ksplashml/themeengine/redmond/themeredmond.h
@@ -23,7 +23,7 @@ class TQCheckBox;
 
 class CfgRedmond: public ThemeEngineConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   CfgRedmond( TQWidget *, TDEConfig * );
 
@@ -39,7 +39,7 @@ protected:
 class ObjKsTheme;
 class ThemeRedmond: public ThemeEngine
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ThemeRedmond( TQWidget *, const char *, const TQStringList& );
 
diff --git a/ksplashml/themeengine/standard/themestandard.h b/ksplashml/themeengine/standard/themestandard.h
index a1fb61ccf..3e9aabc63 100644
--- a/ksplashml/themeengine/standard/themestandard.h
+++ b/ksplashml/themeengine/standard/themestandard.h
@@ -42,7 +42,7 @@
  */
 class ThemeStandard: public ThemeEngine
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ThemeStandard( TQWidget *, const char*, const TQStringList& );
   //inline const ThemeEngineConfig *config( TQWidget *p, TDEConfig *kc ) { return 0L; }
diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp
index 856547895..c6c16170c 100644
--- a/ksplashml/themeengine/standard/wndicon.cpp
+++ b/ksplashml/themeengine/standard/wndicon.cpp
@@ -70,7 +70,7 @@ WndIcon::WndIcon(
   if( mIconJumping )
   {
     TQTimer *t = new TQTimer( this );
-    connect(t, TQT_SIGNAL(timeout()), TQT_SLOT(slotJump()));
+    connect(t, TQ_SIGNAL(timeout()), TQ_SLOT(slotJump()));
     t->start( 50, false );
   }
 }
diff --git a/ksplashml/themeengine/standard/wndicon.h b/ksplashml/themeengine/standard/wndicon.h
index 5338835a4..62f7d16ab 100644
--- a/ksplashml/themeengine/standard/wndicon.h
+++ b/ksplashml/themeengine/standard/wndicon.h
@@ -28,7 +28,7 @@
 class WndIcon:
       public TQHBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   enum Position
diff --git a/ksplashml/themeengine/standard/wndstatus.h b/ksplashml/themeengine/standard/wndstatus.h
index bc908779d..795181a09 100644
--- a/ksplashml/themeengine/standard/wndstatus.h
+++ b/ksplashml/themeengine/standard/wndstatus.h
@@ -27,7 +27,7 @@ class KProgress;
 class WndStatus:
       public TQHBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   WndStatus( TQPalette,
              int, // Xinerama screen
diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp
index 9a7d3aba5..7458abefd 100644
--- a/ksplashml/themeengine/themeengine.cpp
+++ b/ksplashml/themeengine/themeengine.cpp
@@ -77,7 +77,7 @@ ThemeEngine::~ThemeEngine()
 bool ThemeEngine::eventFilter( TQObject* o, TQEvent* e )
 {
     if( e->type() == TQEvent::Show && o->isWidgetType())
-        addSplashWindow( TQT_TQWIDGET( o ));
+        addSplashWindow( static_cast<TQWidget*>( o ));
     return false;
 }
 
@@ -101,13 +101,13 @@ void ThemeEngine::addSplashWindow( TQWidget* w )
         XChangeWindowAttributes( tqt_xdisplay(), w->winId(), CWOverrideRedirect, &attrs );
     }
     d->mSplashWindows.prepend( w->winId());
-    connect( w, TQT_SIGNAL( destroyed( TQObject* )), TQT_SLOT( splashWindowDestroyed( TQObject* )));
+    connect( w, TQ_SIGNAL( destroyed( TQObject* )), TQ_SLOT( splashWindowDestroyed( TQObject* )));
     w->raise();
 }
 
 void ThemeEngine::splashWindowDestroyed( TQObject* obj )
 {
-    d->mSplashWindows.remove( TQT_TQWIDGET( obj )->winId());
+    d->mSplashWindows.remove( static_cast<TQWidget*>( obj )->winId());
 }
 
 bool ThemeEngine::x11Event( XEvent* e )
diff --git a/ksplashml/themeengine/themeengine.h b/ksplashml/themeengine/themeengine.h
index fa2f15a65..27ae5ec11 100644
--- a/ksplashml/themeengine/themeengine.h
+++ b/ksplashml/themeengine/themeengine.h
@@ -27,7 +27,7 @@ class TQMouseEvent;
  */
 class KDE_EXPORT ThemeEngineConfig: public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   ThemeEngineConfig( TQWidget *p, TDEConfig *c )
@@ -50,7 +50,7 @@ protected:
  */
 class KDE_EXPORT ThemeEngine: public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ThemeEngine( TQWidget *parent, const char *name, const TQStringList &args );
   virtual ~ThemeEngine() = 0;
diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp
index 0a2eb6343..e0ba8fb9e 100644
--- a/ksplashml/themeengine/unified/themeunified.cpp
+++ b/ksplashml/themeengine/unified/themeunified.cpp
@@ -97,7 +97,7 @@ void ThemeUnified::_readSettings()
 
   cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) );
 
-  TQColor df(Qt::white);
+  TQColor df(TQt::white);
   mLabelForeground = cfg->readColorEntry( "Label Foreground", &df );
 }
 
diff --git a/ksplashml/themeengine/unified/themeunified.h b/ksplashml/themeengine/unified/themeunified.h
index cd6a1d1ca..e2930943c 100644
--- a/ksplashml/themeengine/unified/themeunified.h
+++ b/ksplashml/themeengine/unified/themeunified.h
@@ -28,7 +28,7 @@ class TQCheckBox;
 
 class UnifiedConfig: public ThemeEngineConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   UnifiedConfig( TQWidget *, TDEConfig * );
   void save();
@@ -42,7 +42,7 @@ protected:
 class ObjKsTheme;
 class KDE_EXPORT ThemeUnified : public ThemeEngine
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ThemeUnified( TQWidget *, const char *, const TQStringList& );
    virtual ~ThemeUnified();
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index c37c6e214..3c07e5191 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -58,23 +58,23 @@ KSplash::KSplash(const char *name)
   if ( config->readBoolEntry( "CloseOnClick", TRUE ) )
     mThemeEngine->installEventFilter( this );
 
-  connect( mThemeEngine, TQT_SIGNAL(destroyed()), this, TQT_SLOT(close()) );
-  connect( this, TQT_SIGNAL(stepsChanged(int)), TQT_SLOT(slotUpdateSteps(int)) );
-  connect( this, TQT_SIGNAL(progressChanged(int)), TQT_SLOT(slotUpdateProgress(int)) );
+  connect( mThemeEngine, TQ_SIGNAL(destroyed()), this, TQ_SLOT(close()) );
+  connect( this, TQ_SIGNAL(stepsChanged(int)), TQ_SLOT(slotUpdateSteps(int)) );
+  connect( this, TQ_SIGNAL(progressChanged(int)), TQ_SLOT(slotUpdateProgress(int)) );
 
   if( mKsTheme->testing() )
   {
     slotUpdateSteps(7);
-    TQTimer::singleShot( 1000, this, TQT_SLOT(slotExec()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(slotExec()));
   }
   else
-    TQTimer::singleShot( 100, this, TQT_SLOT(initDcop()));
+    TQTimer::singleShot( 100, this, TQ_SLOT(initDcop()));
 
   // Make sure we don't stay up forever.
   if (!mKsTheme->managedMode())
   {
     close_timer = new TQTimer( this );
-    connect( close_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( close() ) );
+    connect( close_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( close() ) );
     close_timer->start( 60000, TRUE );
   }
 }
@@ -133,14 +133,14 @@ void KSplash::slotInsertAction( const TQString& pix, const TQString& msg )
 
 void KSplash::slotExec()
 {
-  TQTimer::singleShot( 200, this, TQT_SLOT(nextIcon()));
+  TQTimer::singleShot( 200, this, TQ_SLOT(nextIcon()));
 }
 
 void KSplash::nextIcon()
 {
   if( !mCurrentAction || mTimeToGo )
   {
-    TQTimer::singleShot( 1000, this, TQT_SLOT(close()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(close()));
     return;
   }
 
@@ -155,12 +155,12 @@ void KSplash::nextIcon()
   }
 
   if( mKsTheme->testing() )
-    TQTimer::singleShot( 1000, this, TQT_SLOT(nextIcon()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(nextIcon()));
 }
 
 void KSplash::initDcop()
 {
-  disconnect( kapp->dcopClient(), TQT_SIGNAL( attachFailed(const TQString&) ), kapp, TQT_SLOT( dcopFailure(const TQString&) ) );
+  disconnect( kapp->dcopClient(), TQ_SIGNAL( attachFailed(const TQString&) ), kapp, TQ_SLOT( dcopFailure(const TQString&) ) );
 
   if ( kapp->dcopClient()->isAttached() )
     return;
@@ -174,7 +174,7 @@ void KSplash::initDcop()
   }
   else
   {
-    TQTimer::singleShot( 100, this, TQT_SLOT(initDcop()) );
+    TQTimer::singleShot( 100, this, TQ_SLOT(initDcop()) );
   }
 }
 
@@ -247,7 +247,7 @@ void KSplash::upAndRunning( TQString s )
     //if(!mSessMgrCalled) emit nextIcon();
     mTimeToGo = true;
     close_timer->stop();
-    TQTimer::singleShot( 1000, this, TQT_SLOT(close()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(close()));
   }
   else
   {
@@ -307,15 +307,12 @@ void KSplash::setStartupItemCount( int count )
 void KSplash::startupComplete()
 {
   mTimeToGo = true;
-  TQTimer::singleShot( 1000, this, TQT_SLOT(close()));
+  TQTimer::singleShot( 1000, this, TQ_SLOT(close()));
 }
 
 void KSplash::close()
 {
   TQWidget::close();
-#ifdef USE_QT4
-  exit(0);
-#endif // USE_QT4
 }
 
 void KSplash::hide()
@@ -386,7 +383,7 @@ ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQStri
   {
     TQStringList themeTitle;
     themeTitle << theme;
-    return static_cast<ThemeEngine *>(TQT_TQWIDGET(factory->create(TQT_TQOBJECT(this), "theme", objName.latin1(), themeTitle)));
+    return static_cast<ThemeEngine *>(factory->create(this, "theme", objName.latin1(), themeTitle));
   }
   else
     return 0L;
@@ -427,9 +424,9 @@ TQPtrList<Action> KSplash::actionList()
 
 bool KSplash::eventFilter( TQObject *o, TQEvent *e )
 {
-  if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mThemeEngine) ) )
+  if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( o == mThemeEngine ) )
   {
-    TQTimer::singleShot( 0, this, TQT_SLOT(close()));
+    TQTimer::singleShot( 0, this, TQ_SLOT(close()));
     return TRUE;
   }
   else
diff --git a/ksplashml/wndmain.h b/ksplashml/wndmain.h
index 563598c64..a5ad616b2 100644
--- a/ksplashml/wndmain.h
+++ b/ksplashml/wndmain.h
@@ -38,7 +38,7 @@ class TDEConfig;
 
 class KSplash: public TQWidget, virtual public KSplashIface
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
@@ -56,17 +56,7 @@ public:
   ASYNC startupComplete();
   ASYNC show();
   ASYNC hide();
-
-  // [FIXME] How can I more easily let Qt know about these slots?  moc-tqt perhaps?
-  // More importantly, how was this code even running under Qt3?
-  // Was it somehow running the TQWidget::close() slot instead of the KSplash::close() non-slot method?
-  // Either way it looks like accidental/undefined behaviour to me...
-#ifndef Q_MOC_RUN
   ASYNC close();
-#else // Q_MOC_RUN
-public slots:
-  void close();
-#endif // Q_MOC_RUN
 
 signals:
   void stepsChanged(int);
diff --git a/kstart/Makefile.am b/kstart/Makefile.am
index c182fb28c..9e261bae9 100644
--- a/kstart/Makefile.am
+++ b/kstart/Makefile.am
@@ -1,6 +1,6 @@
 ####### Fiddle here
 
-AM_CPPFLAGS = -DTQT_NO_CAST_ASCII -DTQT_NO_COMPAT
+AM_CPPFLAGS = -DTQT_NO_CAST_ASCII
 
 INCLUDES = $(all_includes)
 
diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp
index bcbc6d846..bcf915b07 100644
--- a/kstart/kstart.cpp
+++ b/kstart/kstart.cpp
@@ -55,7 +55,7 @@ KStart::KStart()
         sendRule();
     else {
         // connect to window add to get the NEW windows
-        connect(twinmodule, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)));
+        connect(twinmodule, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(windowAdded(WId)));
         if (windowtitle != 0)
     	    twinmodule->doNotManage( windowtitle );
     }
@@ -76,7 +76,7 @@ KStart::KStart()
     else
         TDEStartupInfo::sendFinish( id ); // failed to start
 
-  TQTimer::singleShot( useRule ? 0 : 120 * 1000, kapp, TQT_SLOT( quit()));
+  TQTimer::singleShot( useRule ? 0 : 120 * 1000, kapp, TQ_SLOT( quit()));
 }
 
 void KStart::sendRule() {
diff --git a/kstart/kstart.h b/kstart/kstart.h
index c35d460d3..adfaf53c6 100644
--- a/kstart/kstart.h
+++ b/kstart/kstart.h
@@ -16,7 +16,7 @@
 class KWinModule;
 
 class KStart: public TQObject {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KStart();
diff --git a/ksysguard/gui/KSysGuardApplet.cpp b/ksysguard/gui/KSysGuardApplet.cpp
index ae31d4a60..d5ae18b46 100644
--- a/ksysguard/gui/KSysGuardApplet.cpp
+++ b/ksysguard/gui/KSysGuardApplet.cpp
@@ -120,9 +120,9 @@ void KSysGuardApplet::preferences()
   }
   mSettingsDlg = new KSGAppletSettings( this );
 
-  connect( mSettingsDlg, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) );
-  connect( mSettingsDlg, TQT_SIGNAL( okClicked() ), TQT_SLOT( applySettings() ) );
-  connect( mSettingsDlg, TQT_SIGNAL( finished() ), TQT_SLOT( preferencesFinished() ) );
+  connect( mSettingsDlg, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) );
+  connect( mSettingsDlg, TQ_SIGNAL( okClicked() ), TQ_SLOT( applySettings() ) );
+  connect( mSettingsDlg, TQ_SIGNAL( finished() ), TQ_SLOT( preferencesFinished() ) );
 
   mSettingsDlg->setNumDisplay( mDockCount );
   mSettingsDlg->setSizeRatio( (int) ( mSizeRatio * 100.0 + 0.5 ) );
@@ -142,7 +142,7 @@ void KSysGuardApplet::applySettings()
   resizeDocks( mSettingsDlg->numDisplay() );
 
   for ( uint i = 0; i < mDockCount; ++i )
-    if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) )
+    if ( !mDockList[ i ]->isA( "TQFrame" ) )
       ((KSGRD::SensorDisplay*)mDockList[ i ])->setUpdateInterval( updateInterval() );
 
   save();
@@ -156,7 +156,7 @@ void KSysGuardApplet::sensorDisplayModified( bool modified )
 
 void KSysGuardApplet::layout()
 {
-  if ( orientation() == Qt::Horizontal ) {
+  if ( orientation() == TQt::Horizontal ) {
     int h = height();
     int w = (int) ( h * mSizeRatio + 0.5 );
     for ( uint i = 0; i < mDockCount; ++i )
@@ -173,7 +173,7 @@ void KSysGuardApplet::layout()
 
 int KSysGuardApplet::findDock( const TQPoint& point )
 {
-  if ( orientation() == Qt::Horizontal )
+  if ( orientation() == TQt::Horizontal )
     return ( point.x() / (int) ( height() * mSizeRatio + 0.5 ) );
   else
     return ( point.y() / (int) ( width() * mSizeRatio + 0.5 ) );
@@ -201,7 +201,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e )
       return;
 
     int dock = findDock( e->pos() );
-    if ( mDockList[ dock ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) {
+    if ( mDockList[ dock ]->isA( "TQFrame" ) ) {
       if ( sensorType == "integer" || sensorType == "float" ) {
         TDEPopupMenu popup;
         TQWidget *wdg = 0;
@@ -232,8 +232,8 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e )
           mDockList[ dock ] = wdg;
           layout();
 
-          connect( wdg, TQT_SIGNAL( modified( bool ) ),
-                   TQT_SLOT( sensorDisplayModified( bool ) ) );
+          connect( wdg, TQ_SIGNAL( modified( bool ) ),
+                   TQ_SLOT( sensorDisplayModified( bool ) ) );
 
           mDockList[ dock ]->show();
         }
@@ -246,7 +246,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e )
       }
     }
 
-    if ( !mDockList[ dock ]->isA( TQFRAME_OBJECT_NAME_STRING ) )
+    if ( !mDockList[ dock ]->isA( "TQFrame" ) )
       ((KSGRD::SensorDisplay*)mDockList[ dock ])->
                   addSensor( hostName, sensorName, sensorType, sensorDescr );
   }
@@ -405,8 +405,8 @@ bool KSysGuardApplet::load()
     delete mDockList[ dock ];
     mDockList[ dock ] = newDisplay;
 
-    connect( newDisplay, TQT_SIGNAL( modified( bool ) ),
-             TQT_SLOT( sensorDisplayModified( bool ) ) );
+    connect( newDisplay, TQ_SIGNAL( modified( bool ) ),
+             TQ_SLOT( sensorDisplayModified( bool ) ) );
   }
 
   return true;
@@ -429,7 +429,7 @@ bool KSysGuardApplet::save()
   TQStringList hosts;
   uint i;
   for ( i = 0; i < mDockCount; ++i )
-    if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) )
+    if ( !mDockList[ i ]->isA( "TQFrame" ) )
       ((KSGRD::SensorDisplay*)mDockList[ i ])->hosts( hosts );
 
   // save host information (name, shell, etc.)
@@ -449,7 +449,7 @@ bool KSysGuardApplet::save()
   }
 
   for ( i = 0; i < mDockCount; ++i )
-    if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) {
+    if ( !mDockList[ i ]->isA( "TQFrame" ) ) {
       TQDomElement element = doc.createElement( "display" );
       ws.appendChild( element );
       element.setAttribute( "dock", i );
diff --git a/ksysguard/gui/KSysGuardApplet.h b/ksysguard/gui/KSysGuardApplet.h
index 43027b05c..06ab1d5ec 100644
--- a/ksysguard/gui/KSysGuardApplet.h
+++ b/ksysguard/gui/KSysGuardApplet.h
@@ -40,7 +40,7 @@ class KSGAppletSettings;
 
 class KSysGuardApplet : public KPanelApplet, public KSGRD::SensorBoard
 {
-	Q_OBJECT
+	TQ_OBJECT
 
   public:
     KSysGuardApplet( const TQString& configFile, Type type = Normal,
diff --git a/ksysguard/gui/SensorBrowser.cpp b/ksysguard/gui/SensorBrowser.cpp
index 801091d98..575389bac 100644
--- a/ksysguard/gui/SensorBrowser.cpp
+++ b/ksysguard/gui/SensorBrowser.cpp
@@ -68,11 +68,11 @@ SensorBrowser::SensorBrowser( TQWidget* parent, KSGRD::SensorManager* sm,
 {
   mHostInfoList.setAutoDelete(true);
 
-  connect( mSensorManager, TQT_SIGNAL( update() ), TQT_SLOT( update() ) );
-  connect( this, TQT_SIGNAL( clicked( TQListViewItem* ) ),
-           TQT_SLOT( newItemSelected( TQListViewItem* ) ) );
-  connect( this, TQT_SIGNAL( returnPressed( TQListViewItem* ) ),
-           TQT_SLOT( newItemSelected( TQListViewItem* ) ) );
+  connect( mSensorManager, TQ_SIGNAL( update() ), TQ_SLOT( update() ) );
+  connect( this, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+           TQ_SLOT( newItemSelected( TQListViewItem* ) ) );
+  connect( this, TQ_SIGNAL( returnPressed( TQListViewItem* ) ),
+           TQ_SLOT( newItemSelected( TQListViewItem* ) ) );
 
   addColumn( i18n( "Sensor Browser" ) );
   addColumn( i18n( "Sensor Type" ) );
@@ -240,7 +240,7 @@ void SensorBrowser::viewportMouseMoveEvent( TQMouseEvent *e )
    * mouse tracking cannot be turned off. So we have to check each event
    * whether the LMB is really pressed. */
 
-  if ( !( e->state() & Qt::LeftButton ) )
+  if ( !( e->state() & TQt::LeftButton ) )
     return;
 
   TQListViewItem* item = itemAt( e->pos() );
diff --git a/ksysguard/gui/SensorBrowser.h b/ksysguard/gui/SensorBrowser.h
index aec4f343d..f2aa98302 100644
--- a/ksysguard/gui/SensorBrowser.h
+++ b/ksysguard/gui/SensorBrowser.h
@@ -45,7 +45,7 @@ class HostInfo;
  */
 class SensorBrowser : public TDEListView, public KSGRD::SensorClient
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     SensorBrowser( TQWidget* parent, KSGRD::SensorManager* sm, const char* name = 0 );
diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cpp b/ksysguard/gui/SensorDisplayLib/BarGraph.cpp
index 8d2b5e302..1a1608b6c 100644
--- a/ksysguard/gui/SensorDisplayLib/BarGraph.cpp
+++ b/ksysguard/gui/SensorDisplayLib/BarGraph.cpp
@@ -161,10 +161,10 @@ void BarGraph::paintEvent( TQPaintEvent* )
 
       if ( showLabels ) {
         p.drawText( b * barWidth + 3, h - ( 2 * fm.lineSpacing() ) - 2,
-                    barWidth - 2 * 3, fm.lineSpacing(), Qt::AlignCenter,
+                    barWidth - 2 * 3, fm.lineSpacing(), TQt::AlignCenter,
                     footers[ b ] );
         p.drawText( b * barWidth + 3, h - fm.lineSpacing() - 2,
-                    barWidth - 2 * 3, fm.lineSpacing(), Qt::AlignCenter,
+                    barWidth - 2 * 3, fm.lineSpacing(), TQt::AlignCenter,
                     TQString( "%1" ).arg( samples[ b ] ) );
       }
     }
diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.h b/ksysguard/gui/SensorDisplayLib/BarGraph.h
index 1a1262594..2c5e7ffad 100644
--- a/ksysguard/gui/SensorDisplayLib/BarGraph.h
+++ b/ksysguard/gui/SensorDisplayLib/BarGraph.h
@@ -30,7 +30,7 @@
 
 class BarGraph : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class DancingBars;
 
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cpp b/ksysguard/gui/SensorDisplayLib/DancingBars.cpp
index 5b09addc0..43fbe549f 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBars.cpp
+++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cpp
@@ -104,7 +104,7 @@ void DancingBars::configureSettings()
   }
   mSettingsDialog->setSensors( list );
 
-  connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) );
+  connect( mSettingsDialog, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) );
 
   if ( mSettingsDialog->exec() )
     applySettings();
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.h b/ksysguard/gui/SensorDisplayLib/DancingBars.h
index 3ccc03f86..4e917dabf 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBars.h
+++ b/ksysguard/gui/SensorDisplayLib/DancingBars.h
@@ -38,7 +38,7 @@ class DancingBarsSettings;
 
 class DancingBars : public KSGRD::SensorDisplay
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     DancingBars( TQWidget *parent = 0, const char *name = 0,
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp
index ee03f9e94..b754791f8 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp
+++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp
@@ -47,7 +47,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
   TQFrame *page = addPage( i18n( "Range" ) );
   TQGridLayout *pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() );
 
-  TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page );
+  TQGroupBox *groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Title" ), page );
   TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 1, 1 );
 
   mTitle = new KLineEdit( groupBox );
@@ -56,7 +56,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
 
   pageLayout->addWidget( groupBox, 0, 0 );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Display Range" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Display Range" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 1, 5 );
   boxLayout->setColStretch( 2, 1 );
 
@@ -84,7 +84,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
   page = addPage( i18n( "Alarms" ) );
   pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Minimum Value" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Alarm for Minimum Value" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 );
   boxLayout->setColStretch( 1, 1 );
 
@@ -102,7 +102,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
 
   pageLayout->addWidget( groupBox, 0, 0 );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Maximum Value" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Alarm for Maximum Value" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 );
   boxLayout->setColStretch( 1, 1 );
 
@@ -181,15 +181,15 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
   TQWhatsThis::add( mRemoveButton, i18n( "Push this button to delete the sensor." ) );
   pageLayout->addWidget( mRemoveButton, 1, 1 );
 
-  connect( mUseLowerLimit, TQT_SIGNAL( toggled( bool ) ),
-           mLowerLimit, TQT_SLOT( setEnabled( bool ) ) );
-  connect( mUseUpperLimit, TQT_SIGNAL( toggled( bool ) ),
-           mUpperLimit, TQT_SLOT( setEnabled( bool ) ) );
+  connect( mUseLowerLimit, TQ_SIGNAL( toggled( bool ) ),
+           mLowerLimit, TQ_SLOT( setEnabled( bool ) ) );
+  connect( mUseUpperLimit, TQ_SIGNAL( toggled( bool ) ),
+           mUpperLimit, TQ_SLOT( setEnabled( bool ) ) );
 
-  connect( mSensorView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
-           TQT_SLOT( selectionChanged( TQListViewItem* ) ) );
-  connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensor() ) );
-  connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSensor() ) );
+  connect( mSensorView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+           TQ_SLOT( selectionChanged( TQListViewItem* ) ) );
+  connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editSensor() ) );
+  connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSensor() ) );
 
   TDEAcceleratorManager::manage( this );
 
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h
index aa9d580bd..08c02d293 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h
@@ -38,7 +38,7 @@ class TQPushButton;
 
 class DancingBarsSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     DancingBarsSettings( TQWidget* parent = 0, const char* name = 0 );
diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp
index 13696c502..a9b8d21c0 100644
--- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp
+++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp
@@ -49,7 +49,7 @@ void DummyDisplay::resizeEvent( TQResizeEvent* )
 bool DummyDisplay::eventFilter( TQObject* object, TQEvent* event )
 {
   if ( event->type() == TQEvent::MouseButtonRelease &&
-       ( (TQMouseEvent*)event)->button() == Qt::LeftButton )
+       ( (TQMouseEvent*)event)->button() == TQt::LeftButton )
     setFocus();
 
 	return TQWidget::eventFilter( object, event );
diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.h b/ksysguard/gui/SensorDisplayLib/DummyDisplay.h
index cd00a6fd6..b600205b3 100644
--- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.h
+++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.h
@@ -28,7 +28,7 @@
 
 class DummyDisplay : public KSGRD::SensorDisplay
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     DummyDisplay( TQWidget* parent = 0, const char* name = 0,
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp
index 22894afea..eccf470c2 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp
@@ -58,7 +58,7 @@ FancyPlotter::FancyPlotter( TQWidget* parent, const char* name,
    * SensorDisplay::eventFilter. */
 	mPlotter->installEventFilter( this );
 
-  setPlotterWidget( TQT_TQWIDGET(mPlotter) );
+  setPlotterWidget( mPlotter );
 
   setModified( false );
 }
@@ -111,9 +111,9 @@ void FancyPlotter::configureSettings()
   }
   mSettingsDialog->setSensors( list );
 
-  connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) );
-  connect( mSettingsDialog, TQT_SIGNAL( okClicked() ), TQT_SLOT( applySettings() ) );
-  connect( mSettingsDialog, TQT_SIGNAL( finished() ), TQT_SLOT( killDialog() ) );
+  connect( mSettingsDialog, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) );
+  connect( mSettingsDialog, TQ_SIGNAL( okClicked() ), TQ_SLOT( applySettings() ) );
+  connect( mSettingsDialog, TQ_SIGNAL( finished() ), TQ_SLOT( killDialog() ) );
 
   mSettingsDialog->show(); 
 }
@@ -242,8 +242,8 @@ bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name,
                                    .arg( sensors().at( mBeams - i - 1  )->name() );
   }
 
-  TQToolTip::remove( TQT_TQWIDGET(mPlotter) );
-  TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip );
+  TQToolTip::remove( mPlotter );
+  TQToolTip::add( mPlotter, tooltip );
 
   return true;
 }
@@ -267,8 +267,8 @@ bool FancyPlotter::removeSensor( uint pos )
                                    .arg( sensors().at( mBeams - i - 1  )->name() );
   }
 
-  TQToolTip::remove( TQT_TQWIDGET(mPlotter) );
-  TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip );
+  TQToolTip::remove( mPlotter );
+  TQToolTip::add( mPlotter, tooltip );
 
   return true;
 }
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h
index 2f0e36c60..3ed63e3c2 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h
@@ -48,7 +48,7 @@ class FPSensorProperties : public KSGRD::SensorProperties
 
 class FancyPlotter : public KSGRD::SensorDisplay
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     FancyPlotter( TQWidget* parent = 0, const char* name = 0,
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
index ef53bab75..7e7e15d7d 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
@@ -65,7 +65,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   pageLayout->addWidget( mTitle, 0, 1 );
   label->setBuddy( mTitle );
 
-  TQButtonGroup *buttonBox = new TQButtonGroup( 2, Qt::Vertical,
+  TQButtonGroup *buttonBox = new TQButtonGroup( 2, TQt::Vertical,
                                               i18n( "Graph Drawing Style" ), page );
 
   mUsePolygonStyle = new TQRadioButton( i18n( "Basic polygons" ), buttonBox );
@@ -78,7 +78,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   page = addPage( i18n( "Scales" ) );
   pageLayout = new TQGridLayout( page, 2, 1, 0, spacingHint() );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Vertical Scale" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Vertical Scale" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() );
   boxLayout->setColStretch( 2, 1 );
 
@@ -108,7 +108,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
 
   pageLayout->addWidget( groupBox, 0, 0 );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Horizontal Scale" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Horizontal Scale" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 2, 2, spacingHint() );
   boxLayout->setRowStretch( 1, 1 );
 
@@ -126,7 +126,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   page = addPage( i18n( "Grid" ) );
   pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Lines" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Lines" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() );
   boxLayout->setColStretch( 1, 1 );
 
@@ -165,7 +165,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
 
   pageLayout->addMultiCellWidget( groupBox, 0, 0, 0, 1 );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Text" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Text" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 3, 4, spacingHint() );
   boxLayout->setColStretch( 1, 1 );
 
@@ -190,7 +190,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
 
   pageLayout->addWidget( groupBox, 1, 0 );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Colors" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Colors" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 4, 2, spacingHint() );
 
   label = new TQLabel( i18n( "Vertical lines:" ), groupBox );
@@ -257,30 +257,30 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   mMoveDownButton->setEnabled( false );
   pageLayout->addWidget( mMoveDownButton, 4, 1 );
 
-  connect( mUseAutoRange, TQT_SIGNAL( toggled( bool ) ), mMinValue,
-           TQT_SLOT( setDisabled( bool ) ) );
-  connect( mUseAutoRange, TQT_SIGNAL( toggled( bool ) ), mMaxValue,
-           TQT_SLOT( setDisabled( bool ) ) );
-  connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesDistance,
-           TQT_SLOT( setEnabled( bool ) ) );
-  connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesScroll,
-           TQT_SLOT( setEnabled( bool ) ) );
-  connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesColor,
-           TQT_SLOT( setEnabled( bool ) ) );
-  connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mHorizontalLinesCount,
-           TQT_SLOT( setEnabled( bool ) ) );
-  connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mHorizontalLinesColor,
-           TQT_SLOT( setEnabled( bool ) ) );
-  connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mShowLabels,
-           TQT_SLOT( setEnabled( bool ) ) );
-  connect( mSensorView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
-           TQT_SLOT( selectionChanged( TQListViewItem* ) ) );
-
-  connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensor() ) );
-  connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSensor() ) );
-  connect( mMoveUpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( moveUpSensor() ) );
-  connect( mMoveDownButton, TQT_SIGNAL( clicked() ), TQT_SLOT( moveDownSensor() ) );
-  connect ( mSensorView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), TQT_SLOT(editSensor()));
+  connect( mUseAutoRange, TQ_SIGNAL( toggled( bool ) ), mMinValue,
+           TQ_SLOT( setDisabled( bool ) ) );
+  connect( mUseAutoRange, TQ_SIGNAL( toggled( bool ) ), mMaxValue,
+           TQ_SLOT( setDisabled( bool ) ) );
+  connect( mShowVerticalLines, TQ_SIGNAL( toggled( bool ) ), mVerticalLinesDistance,
+           TQ_SLOT( setEnabled( bool ) ) );
+  connect( mShowVerticalLines, TQ_SIGNAL( toggled( bool ) ), mVerticalLinesScroll,
+           TQ_SLOT( setEnabled( bool ) ) );
+  connect( mShowVerticalLines, TQ_SIGNAL( toggled( bool ) ), mVerticalLinesColor,
+           TQ_SLOT( setEnabled( bool ) ) );
+  connect( mShowHorizontalLines, TQ_SIGNAL( toggled( bool ) ), mHorizontalLinesCount,
+           TQ_SLOT( setEnabled( bool ) ) );
+  connect( mShowHorizontalLines, TQ_SIGNAL( toggled( bool ) ), mHorizontalLinesColor,
+           TQ_SLOT( setEnabled( bool ) ) );
+  connect( mShowHorizontalLines, TQ_SIGNAL( toggled( bool ) ), mShowLabels,
+           TQ_SLOT( setEnabled( bool ) ) );
+  connect( mSensorView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+           TQ_SLOT( selectionChanged( TQListViewItem* ) ) );
+
+  connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editSensor() ) );
+  connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSensor() ) );
+  connect( mMoveUpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( moveUpSensor() ) );
+  connect( mMoveDownButton, TQ_SIGNAL( clicked() ), TQ_SLOT( moveDownSensor() ) );
+  connect ( mSensorView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), TQ_SLOT(editSensor()));
 
   TDEAcceleratorManager::manage( this );
 }
@@ -531,7 +531,7 @@ TQValueList< TQStringList > FancyPlotterSettings::sensors() const
     entry << it.current()->text( 2 );
     entry << it.current()->text( 3 );
     entry << it.current()->text( 4 );
-    QRgb rgb = it.current()->pixmap( 2 )->convertToImage().pixel( 1, 1 );
+    TQRgb rgb = it.current()->pixmap( 2 )->convertToImage().pixel( 1, 1 );
     TQColor color( tqRed( rgb ), tqGreen( rgb ), tqBlue( rgb ) );
     entry << ( color.name() );
 
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h
index 010b4938b..d4e02a25d 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h
@@ -38,7 +38,7 @@ class TQRadioButton;
 
 class FancyPlotterSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     FancyPlotterSettings( TQWidget* parent = 0, const char* name = 0 );
diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cpp b/ksysguard/gui/SensorDisplayLib/ListView.cpp
index 5b748e9c0..828832668 100644
--- a/ksysguard/gui/SensorDisplayLib/ListView.cpp
+++ b/ksysguard/gui/SensorDisplayLib/ListView.cpp
@@ -329,7 +329,7 @@ ListView::configureSettings()
 {
 	lvs = new ListViewSettings(this, "ListViewSettings");
 	TQ_CHECK_PTR(lvs);
-	connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings()));
+	connect(lvs, TQ_SIGNAL(applyClicked()), TQ_SLOT(applySettings()));
 
 	TQColorGroup colorGroup = monitor->colorGroup();
 	lvs->setGridColor(colorGroup.color(TQColorGroup::Link));
diff --git a/ksysguard/gui/SensorDisplayLib/ListView.h b/ksysguard/gui/SensorDisplayLib/ListView.h
index 643df8747..d9bb1c828 100644
--- a/ksysguard/gui/SensorDisplayLib/ListView.h
+++ b/ksysguard/gui/SensorDisplayLib/ListView.h
@@ -37,7 +37,7 @@ class ListViewSettings;
 
 class PrivateListView : public TQListView
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
   enum ColumnType { Text, Int, Float, Time, DiskStat };
 
@@ -74,7 +74,7 @@ private:
 
 class ListView : public KSGRD::SensorDisplay
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	ListView(TQWidget* parent = 0, const char* name = 0,
 			const TQString& = TQString::null, int min = 0, int max = 0);
diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettings.h b/ksysguard/gui/SensorDisplayLib/ListViewSettings.h
index 7fe1f4884..0d2d007c9 100644
--- a/ksysguard/gui/SensorDisplayLib/ListViewSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/ListViewSettings.h
@@ -30,7 +30,7 @@ class ListViewSettingsWidget;
 
 class ListViewSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cpp b/ksysguard/gui/SensorDisplayLib/LogFile.cpp
index a8b22569d..c92594fa6 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.cpp
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.cpp
@@ -92,16 +92,16 @@ void LogFile::configureSettings(void)
 	lfs->ruleList->insertStringList(filterRules);
 	lfs->title->setText(title());
 
-	connect(lfs->okButton, TQT_SIGNAL(clicked()), lfs, TQT_SLOT(accept()));
-	connect(lfs->applyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(applySettings()));
-	connect(lfs->cancelButton, TQT_SIGNAL(clicked()), lfs, TQT_SLOT(reject()));
+	connect(lfs->okButton, TQ_SIGNAL(clicked()), lfs, TQ_SLOT(accept()));
+	connect(lfs->applyButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(applySettings()));
+	connect(lfs->cancelButton, TQ_SIGNAL(clicked()), lfs, TQ_SLOT(reject()));
 
-	connect(lfs->fontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsFontSelection()));
-	connect(lfs->addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsAddRule()));
-	connect(lfs->deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsDeleteRule()));
-	connect(lfs->changeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsChangeRule()));
-	connect(lfs->ruleList, TQT_SIGNAL(selected(int)), this, TQT_SLOT(settingsRuleListSelected(int)));
-	connect(lfs->ruleText, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(settingsAddRule()));
+	connect(lfs->fontButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsFontSelection()));
+	connect(lfs->addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsAddRule()));
+	connect(lfs->deleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsDeleteRule()));
+	connect(lfs->changeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsChangeRule()));
+	connect(lfs->ruleList, TQ_SIGNAL(selected(int)), this, TQ_SLOT(settingsRuleListSelected(int)));
+	connect(lfs->ruleText, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(settingsAddRule()));
 
 	if (lfs->exec()) {
 		applySettings();
@@ -181,8 +181,8 @@ LogFile::restoreSettings(TQDomElement& element)
 	TQFont font;
 	TQColorGroup cgroup = monitor->colorGroup();
 
-	cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green));
-	cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black));
+	cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", TQt::green));
+	cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", TQt::black));
 	monitor->setPalette(TQPalette(cgroup, cgroup, cgroup));
 
 	addSensor(element.attribute("hostName"), element.attribute("sensorName"), (element.attribute("sensorType").isEmpty() ? "logfile" : element.attribute("sensorType")), element.attribute("title"));
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.h b/ksysguard/gui/SensorDisplayLib/LogFile.h
index 786cf7e60..1976fa717 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.h
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.h
@@ -37,7 +37,7 @@ class TQListBox;
 
 class LogFile : public KSGRD::SensorDisplay
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	LogFile(TQWidget *parent = 0, const char *name = 0, const TQString& title = 0);
 	~LogFile(void);
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp b/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp
index 111c4787b..382b6cb13 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp
@@ -202,7 +202,7 @@ MultiMeter::configureSettings()
 	mms->setAlarmDigitColor(alarmDigitColor);
 	mms->setMeterBackgroundColor(lcd->backgroundColor());
 
-	connect(mms, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings()));
+	connect(mms, TQ_SIGNAL(applyClicked()), TQ_SLOT(applySettings()));
 
 	if (mms->exec())
 		applySettings();
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.h b/ksysguard/gui/SensorDisplayLib/MultiMeter.h
index 49a97dbd7..9e0f8cdc5 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeter.h
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.h
@@ -33,7 +33,7 @@ class MultiMeterSettings;
 
 class MultiMeter : public KSGRD::SensorDisplay
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	MultiMeter(TQWidget* parent = 0, const char* name = 0,
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h
index 9eebaf56a..65c633fc6 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h
@@ -30,7 +30,7 @@ class MultiMeterSettingsWidget;
 
 class MultiMeterSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
index fb265df74..c6c16eff7 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
@@ -445,9 +445,9 @@
     <include location="global" impldecl="in implementation">knumvalidator.h</include>
     <include location="local"  impldecl="in implementation">MultiMeterSettingsWidget.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>setMeterBackgroundColor( const TQColor &amp; c )</slot>
-</Q_SLOTS>
+</slots>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
     <function specifier="non virtual" returnType="TQString">title()</function>
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
index fe88f292f..e97fabffc 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
@@ -9,8 +9,8 @@
 
 void MultiMeterSettingsWidget::init()
 {
-  m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit)));
-  m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit)));
+  m_lowerLimit->setValidator(new KDoubleValidator(m_lowerLimit));
+  m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit));
 
   m_title->setFocus();
 }
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cpp b/ksysguard/gui/SensorDisplayLib/ProcessController.cpp
index 91851d113..cb4579031 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.cpp
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cpp
@@ -81,12 +81,12 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 	pListSearchLine = new TDEListViewSearchLineWidget(pList, this, "process_list_search_line");
 	gmSearch->addWidget(pListSearchLine, 1);
 
-	connect(pList, TQT_SIGNAL(killProcess(int, int)),
-			this, TQT_SLOT(killProcess(int, int)));
-	connect(pList, TQT_SIGNAL(reniceProcess(const TQValueList<int> &, int)),
-			this, TQT_SLOT(reniceProcess(const TQValueList<int> &, int)));
-	connect(pList, TQT_SIGNAL(listModified(bool)),
-			this, TQT_SLOT(setModified(bool)));
+	connect(pList, TQ_SIGNAL(killProcess(int, int)),
+			this, TQ_SLOT(killProcess(int, int)));
+	connect(pList, TQ_SIGNAL(reniceProcess(const TQValueList<int> &, int)),
+			this, TQ_SLOT(reniceProcess(const TQValueList<int> &, int)));
+	connect(pList, TQ_SIGNAL(listModified(bool)),
+			this, TQ_SLOT(setModified(bool)));
 
 	/* Create the combo box to configure the process filter. The
 	 * cbFilter must be created prior to constructing pList as the
@@ -103,27 +103,27 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 	xbTreeView = new TQCheckBox(i18n("&Tree View"), this, "xbTreeView");
 	TQ_CHECK_PTR(xbTreeView);
 	xbTreeView->setMinimumSize(xbTreeView->sizeHint());
-	connect(xbTreeView, TQT_SIGNAL(toggled(bool)),
-			this, TQT_SLOT(setTreeView(bool)));
+	connect(xbTreeView, TQ_SIGNAL(toggled(bool)),
+			this, TQ_SLOT(setTreeView(bool)));
 
 
 	/* When the both cbFilter and pList are constructed we can connect the
 	 * missing link. */
-	connect(cbFilter, TQT_SIGNAL(activated(int)),
-			this, TQT_SLOT(filterModeChanged(int)));
+	connect(cbFilter, TQ_SIGNAL(activated(int)),
+			this, TQ_SLOT(filterModeChanged(int)));
 
 	// Create the 'Refresh' button.
 	bRefresh = new KPushButton( KGuiItem(  i18n( "&Refresh" ), "reload" ),
             this, "bRefresh" );
 	TQ_CHECK_PTR(bRefresh);
 	bRefresh->setMinimumSize(bRefresh->sizeHint());
-	connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList()));
+	connect(bRefresh, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateList()));
 
 	// Create the 'Kill' button.
 	bKill = new KPushButton(i18n("&Kill"), this, "bKill");
 	TQ_CHECK_PTR(bKill);
 	bKill->setMinimumSize(bKill->sizeHint());
-	connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess()));
+	connect(bKill, TQ_SIGNAL(clicked()), this, TQ_SLOT(killProcess()));
 	/* Disable the kill button until we know that the daemon supports the
 	 * kill command. */
 	bKill->setEnabled(false);
@@ -154,7 +154,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 void ProcessController::setSearchFocus() {
 	//stupid search line widget.  See rant in fixTabOrder
 	if(!pListSearchLine->searchLine())
-		TQTimer::singleShot(100, this, TQT_SLOT(setSearchFocus()));
+		TQTimer::singleShot(100, this, TQ_SLOT(setSearchFocus()));
 	else {
 		pListSearchLine->searchLine()->setFocus();
 	}
@@ -167,7 +167,7 @@ void ProcessController::fixTabOrder() {
 	//
 	//Did i mention I hate this?
 	if(!pListSearchLine->searchLine())
-		TQTimer::singleShot(100, this, TQT_SLOT(fixTabOrder()));
+		TQTimer::singleShot(100, this, TQ_SLOT(fixTabOrder()));
 	else {
 		setTabOrder(pListSearchLine->searchLine(), cbFilter);
 		setTabOrder(cbFilter, pList);
@@ -224,7 +224,7 @@ ProcessController::killProcess(int pid, int sig)
 
 	if ( !timerOn() )
 	    // give ksysguardd time to update its proccess list
-	    TQTimer::singleShot(3000, this, TQT_SLOT(updateList()));
+	    TQTimer::singleShot(3000, this, TQ_SLOT(updateList()));
 	else
 	    updateList();
 }
@@ -274,7 +274,7 @@ ProcessController::killProcess()
 
 	if ( !timerOn())
 		// give ksysguardd time to update its proccess list
-		TQTimer::singleShot(3000, this, TQT_SLOT(updateList()));
+		TQTimer::singleShot(3000, this, TQ_SLOT(updateList()));
 	else
 		updateList();
 }
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.h b/ksysguard/gui/SensorDisplayLib/ProcessController.h
index 848d77294..e9c81e6c3 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.h
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.h
@@ -51,7 +51,7 @@ extern TDEApplication* Kapp;
  */
 class ProcessController : public KSGRD::SensorDisplay
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	ProcessController(TQWidget* parent = 0, const char* name = 0, const TQString &title = TQString::null, bool nf = false);
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cpp b/ksysguard/gui/SensorDisplayLib/ProcessList.cpp
index 9293ef6a0..b7e8b0c72 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.cpp
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cpp
@@ -221,19 +221,19 @@ ProcessList::ProcessList(TQWidget *parent, const char* name)
 
 	/* The filter mode is controlled by a combo box of the parent. If
 	 * the mode is changed we get a signal. */
-	connect(parent, TQT_SIGNAL(setFilterMode(int)),
-			this, TQT_SLOT(setFilterMode(int)));
+	connect(parent, TQ_SIGNAL(setFilterMode(int)),
+			this, TQ_SLOT(setFilterMode(int)));
 
 	/* We need to catch this signal to show various popup menues. */
 	connect(this,
-			TQT_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)),
+			TQ_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)),
 			this,
-			TQT_SLOT(handleRMBPressed(TQListViewItem*, const TQPoint&, int)));
+			TQ_SLOT(handleRMBPressed(TQListViewItem*, const TQPoint&, int)));
 
 	/* Since Qt does not tell us the sorting details we have to do our
 	 * own bookkeping, so we can save and restore the sorting
 	 * settings. */
-	connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(sortingChanged(int)));
+	connect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(sortingChanged(int)));
 
 	ctrlKeyDown = false;
 	shiftKeyDown = false;
@@ -260,10 +260,10 @@ ProcessList::ProcessList(TQWidget *parent, const char* name)
 	headerPM->insertItem(i18n("Add Column"), HEADER_ADD);
 	headerPM->insertItem(i18n("Help on Column"), HEADER_HELP);
 
-	connect(header(), TQT_SIGNAL(sizeChange(int, int, int)),
-			this, TQT_SLOT(sizeChanged(int, int, int)));
-	connect(header(), TQT_SIGNAL(indexChange(int, int, int)),
-			this, TQT_SLOT(indexChanged(int, int, int)));
+	connect(header(), TQ_SIGNAL(sizeChange(int, int, int)),
+			this, TQ_SLOT(sizeChanged(int, int, int)));
+	connect(header(), TQ_SIGNAL(indexChange(int, int, int)),
+			this, TQ_SLOT(indexChanged(int, int, int)));
 
 	killSupported = false;
 	setModified(false);
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.h b/ksysguard/gui/SensorDisplayLib/ProcessList.h
index 51ac510e2..ccabce745 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.h
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.h
@@ -59,7 +59,7 @@ class TQPopupMenu;
  */
 class ProcessList : public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 	// possible values for the filter mode
diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.h b/ksysguard/gui/SensorDisplayLib/ReniceDlg.h
index a9d506eb7..6ef09c175 100644
--- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.h
+++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.h
@@ -40,7 +40,7 @@ class KIntNumInput;
  */
 class ReniceDlg : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	ReniceDlg(TQWidget* parent, const char* name, int currentPPrio, int pid);
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
index 4dfff7957..ac029e5e2 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
+++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
@@ -64,9 +64,9 @@ SensorDisplay::SensorDisplay( TQWidget *parent, const char *name,
   TQWhatsThis::add( this, "dummy" );
   
   if(!nf) {
-    mFrame = new TQGroupBox( 2, Qt::Vertical, "", this, "displayFrame");
+    mFrame = new TQGroupBox( 2, TQt::Vertical, "", this, "displayFrame");
     mFrame->setFlat(true);
-    mFrame->setAlignment(Qt::AlignHCenter);
+    mFrame->setAlignment(TQt::AlignHCenter);
     mFrame->setInsideMargin(2);
 
     setTitle( title );
@@ -156,7 +156,7 @@ void SensorDisplay::resizeEvent( TQResizeEvent* )
 bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event )
 {
   if ( event->type() == TQEvent::MouseButtonPress &&
-     ( (TQMouseEvent*)event)->button() == Qt::RightButton ) {
+     ( (TQMouseEvent*)event)->button() == TQt::RightButton ) {
     TQPopupMenu pm;
     if ( mIsApplet ) {
       pm.insertItem( i18n( "Launch &System Guard"), 1 );
@@ -200,7 +200,7 @@ bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event )
 
     return true;
   } else if ( event->type() == TQEvent::MouseButtonRelease &&
-            ( ( TQMouseEvent*)event)->button() == Qt::LeftButton ) {
+            ( ( TQMouseEvent*)event)->button() == TQt::LeftButton ) {
     setFocus();
   }
 
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.h b/ksysguard/gui/SensorDisplayLib/SensorDisplay.h
index c59f17468..27933dd6b 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.h
@@ -50,7 +50,7 @@ class SensorProperties;
  */
 class SensorDisplay : public TQWidget, public SensorClient
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
index 88083fca1..63cee160b 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
@@ -117,8 +117,8 @@ LogSensor::answerReceived(int id, const TQString& answer)
 				KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName));
 				timerOn();
 			}
-			TQDate date = TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().date());
-			TQTime time = TQT_TQTIME_OBJECT(TQDateTime::currentDateTime().time());
+			TQDate date = TQDateTime::currentDateTime().date();
+			TQTime time = TQDateTime::currentDateTime().time();
 
 			stream << TQString("%1 %2 %3 %4 %5: %6\n").arg(date.shortMonthName(date.month())).arg(date.day()).arg(time.toString()).arg(hostName).arg(sensorName).arg(value);
 		}
@@ -146,7 +146,7 @@ SensorLogger::SensorLogger(TQWidget *parent, const char *name, const TQString& t
 	monitor->setPalette(TQPalette(cgroup, cgroup, cgroup));
 	monitor->setSelectionMode(TQListView::NoSelection);
 
-	connect(monitor, TQT_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(RMBClicked(TQListViewItem*, const TQPoint&, int)));
+	connect(monitor, TQ_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(RMBClicked(TQListViewItem*, const TQPoint&, int)));
 
 	setTitle(i18n("Sensor Logger"));
 
@@ -237,7 +237,7 @@ SensorLogger::configureSettings()
 	sls = new SensorLoggerSettings(this, "SensorLoggerSettings");
 	TQ_CHECK_PTR(sls);
 
-	connect( sls, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) );
+	connect( sls, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) );
 
 	sls->setTitle(title());
 	sls->setForegroundColor(cgroup.text());
@@ -284,9 +284,9 @@ SensorLogger::restoreSettings(TQDomElement& element)
 {
 	TQColorGroup cgroup = monitor->colorGroup();
 
-	cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green));
-	cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black));
-	cgroup.setColor(TQColorGroup::Foreground, restoreColor(element, "alarmColor", Qt::red));
+	cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", TQt::green));
+	cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", TQt::black));
+	cgroup.setColor(TQColorGroup::Foreground, restoreColor(element, "alarmColor", TQt::red));
 	monitor->setPalette(TQPalette(cgroup, cgroup, cgroup));
 
 	logSensors.clear();
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.h b/ksysguard/gui/SensorDisplayLib/SensorLogger.h
index 6630d57e1..354d9ed5b 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.h
@@ -59,7 +59,7 @@ private:
 
 class LogSensor : public TQObject, public KSGRD::SensorClient
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	LogSensor(TQListView *parent);
 	~LogSensor(void);
@@ -141,7 +141,7 @@ private:
 
 class SensorLogger : public KSGRD::SensorDisplay
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	SensorLogger(TQWidget *parent = 0, const char *name = 0, const TQString& title = 0);
 	~SensorLogger(void);
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h
index fece0abc4..3a1d239ca 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h
@@ -30,7 +30,7 @@ class SensorLoggerDlgWidget;
 
 class SensorLoggerDlg : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
index 515cb13f6..ad1f2687b 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
@@ -9,8 +9,8 @@
 
 void SensorLoggerDlgWidget::init()
 {
-  m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit)));
-  m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit)));
+  m_lowerLimit->setValidator(new KDoubleValidator(m_lowerLimit));
+  m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit));
   m_timerInterval->setRange(1, 99, 1, true);
 
   m_fileName->setFocus();
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h
index db90fbd83..38b19a8c4 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h
@@ -30,7 +30,7 @@ class SensorLoggerSettingsWidget;
 
 class SensorLoggerSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp
index bcb0b821b..1568eab17 100644
--- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp
+++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp
@@ -445,7 +445,7 @@ void SignalPlotter::paintEvent( TQPaintEvent* )
     top = p.fontMetrics().height();
     h -= top;
     int h0 = top - 2; // h0 is our new top.  It's at least 5 pixels high
-    p.drawText(0, 0, x0, top - 2, Qt::AlignCenter, mTitle );
+    p.drawText(0, 0, x0, top - 2, TQt::AlignCenter, mTitle );
 
     p.drawLine( x0 - 1, 1, x0 - 1, h0 );
     p.drawLine( 0, top - 1, w - 2, top - 1 );
diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.h b/ksysguard/gui/SensorDisplayLib/SignalPlotter.h
index cc632ac94..7f7bcdcb3 100644
--- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.h
+++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.h
@@ -36,7 +36,7 @@ class TQColor;
 
 class SignalPlotter : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     SignalPlotter( TQWidget *parent = 0, const char *name = 0 );
diff --git a/ksysguard/gui/WorkSheet.cpp b/ksysguard/gui/WorkSheet.cpp
index d465a998d..2b0bc76dd 100644
--- a/ksysguard/gui/WorkSheet.cpp
+++ b/ksysguard/gui/WorkSheet.cpp
@@ -518,10 +518,10 @@ void WorkSheet::replaceDisplay( uint row, uint column, KSGRD::SensorDisplay* new
     mDisplayList[ row ][ column ] = newDisplay;
     if ( mDisplayList[ row ][ column ]->useGlobalUpdateInterval() )
       mDisplayList[ row ][ column ]->setUpdateInterval( updateInterval() );
-    connect( newDisplay, TQT_SIGNAL( showPopupMenu( KSGRD::SensorDisplay* ) ),
-             TQT_SLOT( showPopupMenu( KSGRD::SensorDisplay* ) ) );
-    connect( newDisplay, TQT_SIGNAL( modified( bool ) ),
-             TQT_SLOT( setModified( bool ) ) );
+    connect( newDisplay, TQ_SIGNAL( showPopupMenu( KSGRD::SensorDisplay* ) ),
+             TQ_SLOT( showPopupMenu( KSGRD::SensorDisplay* ) ) );
+    connect( newDisplay, TQ_SIGNAL( modified( bool ) ),
+             TQ_SLOT( setModified( bool ) ) );
   }
 
 
diff --git a/ksysguard/gui/WorkSheet.h b/ksysguard/gui/WorkSheet.h
index 37bafbda3..e2293c243 100644
--- a/ksysguard/gui/WorkSheet.h
+++ b/ksysguard/gui/WorkSheet.h
@@ -44,7 +44,7 @@ class TQStringList;
  */
 class WorkSheet : public TQWidget, public KSGRD::SensorBoard
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     WorkSheet( TQWidget* parent, const char *name = 0 );
diff --git a/ksysguard/gui/WorkSheetSettings.cpp b/ksysguard/gui/WorkSheetSettings.cpp
index 703be57d5..e985cfafa 100644
--- a/ksysguard/gui/WorkSheetSettings.cpp
+++ b/ksysguard/gui/WorkSheetSettings.cpp
@@ -45,24 +45,24 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
 
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
-  TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page );
+  TQGroupBox *group = new TQGroupBox( 0, TQt::Vertical, i18n( "Title" ), page );
   group->layout()->setMargin( marginHint() );
   group->layout()->setSpacing( spacingHint() );
 
   TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 1, 1 );
-  groupLayout->setAlignment( Qt::AlignTop );
+  groupLayout->setAlignment( TQt::AlignTop );
 
   mSheetTitle = new KLineEdit( group );
   groupLayout->addWidget( mSheetTitle, 0, 0 );
 
   topLayout->addWidget( group );
 
-  group = new TQGroupBox( 0, Qt::Vertical, i18n( "Properties" ), page );
+  group = new TQGroupBox( 0, TQt::Vertical, i18n( "Properties" ), page );
   group->layout()->setMargin( marginHint() );
   group->layout()->setSpacing( spacingHint() );
 
   groupLayout = new TQGridLayout( group->layout(), 3, 2 );
-  groupLayout->setAlignment( Qt::AlignTop );
+  groupLayout->setAlignment( TQt::AlignTop );
 
   TQLabel *label = new TQLabel( i18n( "Rows:" ), group );
   groupLayout->addWidget( label, 0, 0 );
diff --git a/ksysguard/gui/WorkSheetSettings.h b/ksysguard/gui/WorkSheetSettings.h
index 5f7d8da0c..9c58502cf 100644
--- a/ksysguard/gui/WorkSheetSettings.h
+++ b/ksysguard/gui/WorkSheetSettings.h
@@ -31,7 +31,7 @@ class KIntNumInput;
 
 class WorkSheetSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     WorkSheetSettings( TQWidget* parent = 0, const char* name = 0 );
diff --git a/ksysguard/gui/Workspace.cpp b/ksysguard/gui/Workspace.cpp
index c5e622248..9aa511884 100644
--- a/ksysguard/gui/Workspace.cpp
+++ b/ksysguard/gui/Workspace.cpp
@@ -47,8 +47,8 @@ Workspace::Workspace( TQWidget* parent, const char* name )
   mSheetList.setAutoDelete( true );
   mAutoSave = true;
 
-  connect( this, TQT_SIGNAL( currentChanged( TQWidget* ) ),
-           TQT_SLOT( updateCaption( TQWidget* ) ) );
+  connect( this, TQ_SIGNAL( currentChanged( TQWidget* ) ),
+           TQ_SLOT( updateCaption( TQWidget* ) ) );
 
   TQWhatsThis::add( this, i18n( "This is your work space. It holds your worksheets. You need "
                                "to create a new worksheet (Menu File->New) before "
@@ -62,8 +62,8 @@ Workspace::~Workspace()
    * administration data is already deleted but slots are still
    * being triggered. TODO: I need to ask the Trolls about this. */
 
-  disconnect( this, TQT_SIGNAL( currentChanged( TQWidget* ) ), this,
-              TQT_SLOT( updateCaption( TQWidget* ) ) );
+  disconnect( this, TQ_SIGNAL( currentChanged( TQWidget* ) ), this,
+              TQ_SLOT( updateCaption( TQWidget* ) ) );
 }
 
 void Workspace::saveProperties( TDEConfig *cfg )
@@ -148,10 +148,10 @@ void Workspace::newWorkSheet()
     insertTab( sheet, dlg.sheetTitle() );
     mSheetList.append( sheet );
     showPage( sheet );
-    connect( sheet, TQT_SIGNAL( sheetModified( TQWidget* ) ),
-             TQT_SLOT( updateCaption( TQWidget* ) ) );
-    connect( sheet, TQT_SIGNAL( titleChanged( TQWidget* ) ),
-             TQT_SLOT( updateSheetTitle( TQWidget* ) ) );
+    connect( sheet, TQ_SIGNAL( sheetModified( TQWidget* ) ),
+             TQ_SLOT( updateCaption( TQWidget* ) ) );
+    connect( sheet, TQ_SIGNAL( titleChanged( TQWidget* ) ),
+             TQ_SLOT( updateSheetTitle( TQWidget* ) ) );
   }
 }
 
@@ -370,8 +370,8 @@ WorkSheet *Workspace::restoreWorkSheet( const TQString &fileName, const TQString
   }
   
   mSheetList.append( sheet );
-  connect( sheet, TQT_SIGNAL( sheetModified( TQWidget* ) ),
-           TQT_SLOT( updateCaption( TQWidget* ) ) );
+  connect( sheet, TQ_SIGNAL( sheetModified( TQWidget* ) ),
+           TQ_SLOT( updateCaption( TQWidget* ) ) );
 
   /* Force the file name to be the new name. This also sets the modified
    * flag, so that the file will get saved on exit. */
diff --git a/ksysguard/gui/Workspace.h b/ksysguard/gui/Workspace.h
index 40302ac4a..64a522a65 100644
--- a/ksysguard/gui/Workspace.h
+++ b/ksysguard/gui/Workspace.h
@@ -34,7 +34,7 @@ class WorkSheet;
 
 class Workspace : public TQTabWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     Workspace( TQWidget* parent, const char* name = 0 );
diff --git a/ksysguard/gui/ksgrd/HostConnector.cpp b/ksysguard/gui/ksgrd/HostConnector.cpp
index b6e85b795..9ff979965 100644
--- a/ksysguard/gui/ksgrd/HostConnector.cpp
+++ b/ksysguard/gui/ksgrd/HostConnector.cpp
@@ -57,11 +57,11 @@ HostConnector::HostConnector( TQWidget *parent, const char *name )
   mHostNameLabel->hide();
   layout->addWidget( mHostNameLabel, 0, 1 );
 
-  TQButtonGroup *group = new TQButtonGroup( 0, Qt::Vertical,
+  TQButtonGroup *group = new TQButtonGroup( 0, TQt::Vertical,
                                           i18n( "Connection Type" ), page );
   TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 4, 4,
       spacingHint() );
-  groupLayout->setAlignment( Qt::AlignTop );
+  groupLayout->setAlignment( TQt::AlignTop );
 
   mUseSsh = new TQRadioButton( i18n( "ssh" ), group );
   mUseSsh->setEnabled( true );
@@ -111,12 +111,12 @@ HostConnector::HostConnector( TQWidget *parent, const char *name )
 
   layout->addMultiCellWidget( group, 1, 1, 0, 1 );
 
-  connect( mUseCustom, TQT_SIGNAL( toggled( bool ) ),
-           mCommands, TQT_SLOT( setEnabled( bool ) ) );
-  connect( mUseDaemon, TQT_SIGNAL( toggled( bool ) ),
-           mPort, TQT_SLOT( setEnabled( bool ) ) );
-  connect( mHostNames->lineEdit(),  TQT_SIGNAL( textChanged ( const TQString & ) ),
-           this, TQT_SLOT(  slotHostNameChanged( const TQString & ) ) );
+  connect( mUseCustom, TQ_SIGNAL( toggled( bool ) ),
+           mCommands, TQ_SLOT( setEnabled( bool ) ) );
+  connect( mUseDaemon, TQ_SIGNAL( toggled( bool ) ),
+           mPort, TQ_SLOT( setEnabled( bool ) ) );
+  connect( mHostNames->lineEdit(),  TQ_SIGNAL( textChanged ( const TQString & ) ),
+           this, TQ_SLOT(  slotHostNameChanged( const TQString & ) ) );
   enableButtonOK( !mHostNames->lineEdit()->text().isEmpty() );
   TDEAcceleratorManager::manage( this );
 }
diff --git a/ksysguard/gui/ksgrd/HostConnector.h b/ksysguard/gui/ksgrd/HostConnector.h
index dbf654b7e..c4d873ffe 100644
--- a/ksysguard/gui/ksgrd/HostConnector.h
+++ b/ksysguard/gui/ksgrd/HostConnector.h
@@ -31,7 +31,7 @@ class TQSpinBox;
 
 class HostConnector : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     HostConnector( TQWidget *parent, const char *name = 0 );
diff --git a/ksysguard/gui/ksgrd/SensorAgent.h b/ksysguard/gui/ksgrd/SensorAgent.h
index 36c44095c..14b9bc014 100644
--- a/ksysguard/gui/ksgrd/SensorAgent.h
+++ b/ksysguard/gui/ksgrd/SensorAgent.h
@@ -43,9 +43,9 @@ class SensorRequest;
   ksysguardd. The current implementation only allowes one pending
   requests. Incoming requests are queued in an input FIFO.
 */
-class KDE_EXPORT SensorAgent : public QObject
+class KDE_EXPORT SensorAgent : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     SensorAgent( SensorManager *sm );
diff --git a/ksysguard/gui/ksgrd/SensorManager.cpp b/ksysguard/gui/ksgrd/SensorManager.cpp
index 237e73b23..1412df7d7 100644
--- a/ksysguard/gui/ksgrd/SensorManager.cpp
+++ b/ksysguard/gui/ksgrd/SensorManager.cpp
@@ -219,8 +219,8 @@ bool SensorManager::engage( const TQString &hostName, const TQString &shell,
     }
 
     mAgents.insert( hostName, agent );
-    connect( agent, TQT_SIGNAL( reconfigure( const SensorAgent* ) ),
-             TQT_SLOT( reconfigure( const SensorAgent* ) ) );
+    connect( agent, TQ_SIGNAL( reconfigure( const SensorAgent* ) ),
+             TQ_SLOT( reconfigure( const SensorAgent* ) ) );
 
 		emit update();
     return true;
diff --git a/ksysguard/gui/ksgrd/SensorManager.h b/ksysguard/gui/ksgrd/SensorManager.h
index 1e859c638..906358c0d 100644
--- a/ksysguard/gui/ksgrd/SensorManager.h
+++ b/ksysguard/gui/ksgrd/SensorManager.h
@@ -43,9 +43,9 @@ class SensorManagerIterator;
   connection yet or the hostname is empty, a dialog will be shown to
   enter the connections details.
  */
-class KDE_EXPORT SensorManager : public QObject
+class KDE_EXPORT SensorManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class SensorManagerIterator;
 
diff --git a/ksysguard/gui/ksgrd/SensorShellAgent.cpp b/ksysguard/gui/ksgrd/SensorShellAgent.cpp
index 7e137ad56..c398be32f 100644
--- a/ksysguard/gui/ksgrd/SensorShellAgent.cpp
+++ b/ksysguard/gui/ksgrd/SensorShellAgent.cpp
@@ -55,14 +55,14 @@ bool SensorShellAgent::start( const TQString &host, const TQString &shell,
   mShell = shell;
   mCommand = command;
 
-  connect( mDaemon, TQT_SIGNAL( processExited( TDEProcess* ) ),
-           TQT_SLOT( daemonExited( TDEProcess* ) ) );
-  connect( mDaemon, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
-           TQT_SLOT( msgRcvd( TDEProcess*, char*, int ) ) );
-  connect( mDaemon, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
-           TQT_SLOT( errMsgRcvd( TDEProcess*, char*, int ) ) );
-  connect( mDaemon, TQT_SIGNAL( wroteStdin( TDEProcess* ) ),
-           TQT_SLOT( msgSent( TDEProcess* ) ) );
+  connect( mDaemon, TQ_SIGNAL( processExited( TDEProcess* ) ),
+           TQ_SLOT( daemonExited( TDEProcess* ) ) );
+  connect( mDaemon, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
+           TQ_SLOT( msgRcvd( TDEProcess*, char*, int ) ) );
+  connect( mDaemon, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
+           TQ_SLOT( errMsgRcvd( TDEProcess*, char*, int ) ) );
+  connect( mDaemon, TQ_SIGNAL( wroteStdin( TDEProcess* ) ),
+           TQ_SLOT( msgSent( TDEProcess* ) ) );
 
   TQString cmd;
   if ( !command.isEmpty() )
diff --git a/ksysguard/gui/ksgrd/SensorShellAgent.h b/ksysguard/gui/ksgrd/SensorShellAgent.h
index 2befd346b..eaa932dfc 100644
--- a/ksysguard/gui/ksgrd/SensorShellAgent.h
+++ b/ksysguard/gui/ksgrd/SensorShellAgent.h
@@ -45,7 +45,7 @@ class SensorManager;
  */
 class SensorShellAgent : public SensorAgent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     SensorShellAgent( SensorManager *sm );
diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.cpp b/ksysguard/gui/ksgrd/SensorSocketAgent.cpp
index 30c0cc7e9..ed52a5bd4 100644
--- a/ksysguard/gui/ksgrd/SensorSocketAgent.cpp
+++ b/ksysguard/gui/ksgrd/SensorSocketAgent.cpp
@@ -34,10 +34,10 @@ using namespace KSGRD;
 SensorSocketAgent::SensorSocketAgent( SensorManager *sm )
   : SensorAgent( sm )
 {
-  connect( &mSocket, TQT_SIGNAL( gotError( int ) ), TQT_SLOT( error( int ) ) );
-  connect( &mSocket, TQT_SIGNAL( bytesWritten( int ) ), TQT_SLOT( msgSent( int ) ) );
-  connect( &mSocket, TQT_SIGNAL( readyRead() ), TQT_SLOT( msgRcvd() ) );
-  connect( &mSocket, TQT_SIGNAL( closed() ), TQT_SLOT( connectionClosed() ) );
+  connect( &mSocket, TQ_SIGNAL( gotError( int ) ), TQ_SLOT( error( int ) ) );
+  connect( &mSocket, TQ_SIGNAL( bytesWritten( int ) ), TQ_SLOT( msgSent( int ) ) );
+  connect( &mSocket, TQ_SIGNAL( readyRead() ), TQ_SLOT( msgRcvd() ) );
+  connect( &mSocket, TQ_SIGNAL( closed() ), TQ_SLOT( connectionClosed() ) );
 }
 
 SensorSocketAgent::~SensorSocketAgent()
diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.h b/ksysguard/gui/ksgrd/SensorSocketAgent.h
index 7b9062f17..f937562ff 100644
--- a/ksysguard/gui/ksgrd/SensorSocketAgent.h
+++ b/ksysguard/gui/ksgrd/SensorSocketAgent.h
@@ -41,7 +41,7 @@ class SensorClient;
  */
 class SensorSocketAgent : public SensorAgent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     SensorSocketAgent( SensorManager *sm );
diff --git a/ksysguard/gui/ksgrd/StyleEngine.cpp b/ksysguard/gui/ksgrd/StyleEngine.cpp
index ce3e3bd6b..0e7330741 100644
--- a/ksysguard/gui/ksgrd/StyleEngine.cpp
+++ b/ksysguard/gui/ksgrd/StyleEngine.cpp
@@ -143,8 +143,8 @@ void StyleEngine::configure()
   mSettingsDialog->setFontSize( mFontSize );
   mSettingsDialog->setSensorColors( mSensorColors );
 
-  connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ),
-           this, TQT_SLOT( applyToWorksheet() ) );
+  connect( mSettingsDialog, TQ_SIGNAL( applyClicked() ),
+           this, TQ_SLOT( applyToWorksheet() ) );
 
   if ( mSettingsDialog->exec() )
     apply();
diff --git a/ksysguard/gui/ksgrd/StyleEngine.h b/ksysguard/gui/ksgrd/StyleEngine.h
index 50ec06e0b..15a968eb6 100644
--- a/ksysguard/gui/ksgrd/StyleEngine.h
+++ b/ksysguard/gui/ksgrd/StyleEngine.h
@@ -38,9 +38,9 @@ class StyleSettings;
 
 namespace KSGRD {
 
-class KDE_EXPORT StyleEngine : public QObject
+class KDE_EXPORT StyleEngine : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     StyleEngine();
diff --git a/ksysguard/gui/ksgrd/StyleSettings.cpp b/ksysguard/gui/ksgrd/StyleSettings.cpp
index b84d3e407..f70a387b4 100644
--- a/ksysguard/gui/ksgrd/StyleSettings.cpp
+++ b/ksysguard/gui/ksgrd/StyleSettings.cpp
@@ -90,14 +90,14 @@ StyleSettings::StyleSettings( TQWidget *parent, const char *name )
 
   mEditColorButton = new TQPushButton( i18n( "Change Color..." ), page );
   mEditColorButton->setEnabled( false );
-  layout->addWidget( mEditColorButton, 0, 1, Qt::AlignTop );
-
-  connect( mColorListBox, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ),
-           TQT_SLOT( selectionChanged( TQListBoxItem* ) ) );
-  connect( mColorListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ),
-           TQT_SLOT( editSensorColor() ) );
-  connect( mEditColorButton, TQT_SIGNAL( clicked() ),
-           TQT_SLOT( editSensorColor() ) );
+  layout->addWidget( mEditColorButton, 0, 1, TQt::AlignTop );
+
+  connect( mColorListBox, TQ_SIGNAL( selectionChanged( TQListBoxItem* ) ),
+           TQ_SLOT( selectionChanged( TQListBoxItem* ) ) );
+  connect( mColorListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ),
+           TQ_SLOT( editSensorColor() ) );
+  connect( mEditColorButton, TQ_SIGNAL( clicked() ),
+           TQ_SLOT( editSensorColor() ) );
 
   TDEAcceleratorManager::manage( this );
 }
diff --git a/ksysguard/gui/ksgrd/StyleSettings.h b/ksysguard/gui/ksgrd/StyleSettings.h
index c3b3d362c..5868b9123 100644
--- a/ksysguard/gui/ksgrd/StyleSettings.h
+++ b/ksysguard/gui/ksgrd/StyleSettings.h
@@ -35,7 +35,7 @@ class TQPushButton;
 
 class StyleSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     StyleSettings( TQWidget *parent = 0, const char *name = 0 );
diff --git a/ksysguard/gui/ksgrd/TimerSettings.cpp b/ksysguard/gui/ksgrd/TimerSettings.cpp
index 43e73ab90..4fa165f99 100644
--- a/ksysguard/gui/ksgrd/TimerSettings.cpp
+++ b/ksysguard/gui/ksgrd/TimerSettings.cpp
@@ -53,8 +53,8 @@ TimerSettings::TimerSettings( TQWidget *parent, const char *name )
   mLabel->setBuddy( mInterval );
   TQWhatsThis::add( mInterval, i18n( "All displays of the sheet are updated at the rate specified here." ) );
 
-  connect( mUseGlobalUpdate, TQT_SIGNAL( toggled( bool ) ),
-           TQT_SLOT( globalUpdateChanged( bool ) ) );
+  connect( mUseGlobalUpdate, TQ_SIGNAL( toggled( bool ) ),
+           TQ_SLOT( globalUpdateChanged( bool ) ) );
 
   mUseGlobalUpdate->setChecked( true );
 
diff --git a/ksysguard/gui/ksgrd/TimerSettings.h b/ksysguard/gui/ksgrd/TimerSettings.h
index 64c49959b..8a2ba9588 100644
--- a/ksysguard/gui/ksgrd/TimerSettings.h
+++ b/ksysguard/gui/ksgrd/TimerSettings.h
@@ -32,7 +32,7 @@ class TQSpinBox;
 
 class KDE_EXPORT TimerSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     TimerSettings( TQWidget *parent, const char *name = 0 );
diff --git a/ksysguard/gui/ksysguard.cpp b/ksysguard/gui/ksysguard.cpp
index 937c5fdd1..65326d826 100644
--- a/ksysguard/gui/ksysguard.cpp
+++ b/ksysguard/gui/ksysguard.cpp
@@ -76,23 +76,23 @@ TopLevel::TopLevel( const char *name )
   mTimerId = -1;
 
   mSplitter = new TQSplitter( this );
-  mSplitter->setOrientation( Qt::Horizontal );
+  mSplitter->setOrientation( TQt::Horizontal );
   mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
   setCentralWidget( mSplitter );
 
   mSensorBrowser = new SensorBrowser( mSplitter, KSGRD::SensorMgr );
   
   mServiceBrowser = new DNSSD::ServiceBrowser("_ksysguard._tcp", 0, true);
-  connect(mServiceBrowser,TQT_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this,
-  	TQT_SLOT(serviceAdded(DNSSD::RemoteService::Ptr)));
+  connect(mServiceBrowser,TQ_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this,
+  	TQ_SLOT(serviceAdded(DNSSD::RemoteService::Ptr)));
 
   mWorkSpace = new Workspace( mSplitter );
-  connect( mWorkSpace, TQT_SIGNAL( announceRecentURL( const KURL& ) ),
-           TQT_SLOT( registerRecentURL( const KURL& ) ) );
-  connect( mWorkSpace, TQT_SIGNAL( setCaption( const TQString&, bool ) ),
-           TQT_SLOT( setCaption( const TQString&, bool ) ) );
-  connect( KSGRD::Style, TQT_SIGNAL( applyStyleToWorksheet() ), mWorkSpace,
-           TQT_SLOT( applyStyle() ) );
+  connect( mWorkSpace, TQ_SIGNAL( announceRecentURL( const KURL& ) ),
+           TQ_SLOT( registerRecentURL( const KURL& ) ) );
+  connect( mWorkSpace, TQ_SIGNAL( setCaption( const TQString&, bool ) ),
+           TQ_SLOT( setCaption( const TQString&, bool ) ) );
+  connect( KSGRD::Style, TQ_SIGNAL( applyStyleToWorksheet() ), mWorkSpace,
+           TQ_SLOT( applyStyle() ) );
 
   /* Create the status bar. It displays some information about the
    * number of processes and the memory consumption of the local
@@ -105,40 +105,40 @@ TopLevel::TopLevel( const char *name )
   statusBar()->hide();
 
   // create actions for menue entries
-  new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, TQT_TQOBJECT(mWorkSpace),
-		   TQT_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" );
+  new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, mWorkSpace,
+		   TQ_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" );
   
-  new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, TQT_TQOBJECT(mWorkSpace),
-		   TQT_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" );
+  new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, mWorkSpace,
+		   TQ_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" );
   
   mActionOpenRecent = new TDERecentFilesAction( i18n( "&Import Recent Worksheet" ),"document-open", 0,
-		   TQT_TQOBJECT(mWorkSpace), TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" );	
+		   mWorkSpace, TQ_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" );	
   
-  new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, TQT_TQOBJECT(mWorkSpace),
-		   TQT_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" );
+  new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, mWorkSpace,
+		   TQ_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" );
 
-  new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, TQT_TQOBJECT(mWorkSpace),
-		   TQT_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" );
+  new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, mWorkSpace,
+		   TQ_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" );
    
-  KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+  KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() );
 
-  new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, TQT_TQOBJECT(this),
-               TQT_SLOT( connectHost() ), actionCollection(), "connect_host" );
-  new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, TQT_TQOBJECT(this),
-               TQT_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" );
+  new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, this,
+               TQ_SLOT( connectHost() ), actionCollection(), "connect_host" );
+  new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, this,
+               TQ_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" );
 
-//  KStdAction::cut( mWorkSpace, TQT_SLOT( cut() ), actionCollection() );
-//  KStdAction::copy( mWorkSpace, TQT_SLOT( copy() ), actionCollection() );
-//  KStdAction::paste( mWorkSpace, TQT_SLOT( paste() ), actionCollection() );
-  new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, TQT_TQOBJECT(mWorkSpace),
-               TQT_SLOT( configure() ), actionCollection(), "configure_sheet" );
+//  KStdAction::cut( mWorkSpace, TQ_SLOT( cut() ), actionCollection() );
+//  KStdAction::copy( mWorkSpace, TQ_SLOT( copy() ), actionCollection() );
+//  KStdAction::paste( mWorkSpace, TQ_SLOT( paste() ), actionCollection() );
+  new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, mWorkSpace,
+               TQ_SLOT( configure() ), actionCollection(), "configure_sheet" );
 
   new TDEAction( i18n( "Load Standard Sheets" ), "document-revert",
-               0, TQT_TQOBJECT(this), TQT_SLOT( resetWorkSheets() ),
+               0, this, TQ_SLOT( resetWorkSheets() ),
                actionCollection(), "revert_all_worksheets"  );
 
-  new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, TQT_TQOBJECT(this),
-               TQT_SLOT( editStyle() ), actionCollection(), "configure_style" );
+  new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, this,
+               TQ_SLOT( editStyle() ), actionCollection(), "configure_style" );
 
   // TODO remove resize and fix so sizeHints() determines default size.
   if (!initialGeometrySet())
@@ -293,7 +293,7 @@ void TopLevel::initStatusBar()
   
   TDEToggleAction *sb = dynamic_cast<TDEToggleAction*>(action("options_show_statusbar"));
   if (sb)
-     connect(sb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateStatusBar()));
+     connect(sb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateStatusBar()));
 }
 
 void TopLevel::updateStatusBar()
@@ -319,8 +319,8 @@ void TopLevel::editToolbars()
 {
   saveMainWindowSettings( kapp->config() );
   KEditToolbar dlg( actionCollection() );
-  connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), this,
-           TQT_SLOT( slotNewToolbarConfig() ) );
+  connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), this,
+           TQ_SLOT( slotNewToolbarConfig() ) );
 
   dlg.exec();
 }
diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h
index df1c2e0c5..b1579bf65 100644
--- a/ksysguard/gui/ksysguard.h
+++ b/ksysguard/gui/ksysguard.h
@@ -43,7 +43,7 @@ class Workspace;
 
 class TopLevel : public TDEMainWindow, public KSGRD::SensorClient, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
   public:
diff --git a/ksysguard/ksysguardd/CMakeLists.txt b/ksysguard/ksysguardd/CMakeLists.txt
index f90bdadb0..16019bdc1 100644
--- a/ksysguard/ksysguardd/CMakeLists.txt
+++ b/ksysguard/ksysguardd/CMakeLists.txt
@@ -21,6 +21,8 @@ elseif( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" )
   set( OS_SPECIFIC_DIR FreeBSD )
 elseif( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" )
   set( OS_SPECIFIC_DIR NetBSD )
+elseif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+  set( OS_SPECIFIC_DIR Solaris )
 else()
   tde_message_fatal( "Your operating system (${CMAKE_SYSTEM_NAME}) is not supported yet." )
 endif()
diff --git a/ksysguard/ksysguardd/FreeBSD/ProcessList.c b/ksysguard/ksysguardd/FreeBSD/ProcessList.c
index f8d2c3ba6..dbb330efb 100644
--- a/ksysguard/ksysguardd/FreeBSD/ProcessList.c
+++ b/ksysguard/ksysguardd/FreeBSD/ProcessList.c
@@ -98,18 +98,12 @@ typedef struct
 	 * The total amount of memory the process uses. This includes shared and
 	 * swapped memory.
 	 */
-	unsigned int vmSize;
+	size_t vmSize;
 
 	/*
 	 * The amount of physical memory the process currently uses.
 	 */
-	unsigned int vmRss;
-
-	/*
-	 * The amount of memory (shared/swapped/etc) the process shares with
-	 * other processes.
-	 */
-	unsigned int vmLib;
+	size_t vmRss;
 
 	/*
 	 * The number of 1/100 of a second the process has spend in user space.
@@ -264,20 +258,20 @@ updateProcess(int pid)
 #if __FreeBSD_version >= 500015
 		ps->userLoad = 100.0 * (double) p.ki_pctcpu / fscale;
 	ps->vmSize   = p.ki_size;
-	ps->vmRss    = p.ki_rssize * getpagesize();
+	ps->vmRss    = (size_t)(p.ki_rssize) * (size_t)(getpagesize());
 	strlcpy(ps->name,p.ki_comm? p.ki_comm:"????",sizeof(ps->name));
 	strcpy(ps->status,(p.ki_stat>=1)&&(p.ki_stat<=5)? statuses[p.ki_stat-1]:"????");
 #elif defined (__DragonFly__) && __DragonFly_version >= 190000
 		ps->userLoad = 100.0 * (double) p.kp_lwp.kl_pctcpu / fscale;
 	ps->vmSize   = p.kp_vm_map_size;
-	ps->vmRss    = p.kp_vm_rssize * getpagesize();
+	ps->vmRss    = (size_t)(p.kp_vm_rssize) * (size_t)(getpagesize());
 	strlcpy(ps->name,p.kp_comm ? p.kp_comm : "????", 
 		sizeof(ps->name));
 	strcpy(ps->status,(p.kp_stat>=1)&&(p.kp_stat<=5)? statuses[p.kp_stat-1]:"????");
 #else
 	ps->userLoad = 100.0 * (double) p.kp_proc.p_pctcpu / fscale;
 	ps->vmSize   = p.kp_eproc.e_vm.vm_map.size;
-	ps->vmRss    = p.kp_eproc.e_vm.vm_rssize * getpagesize();
+	ps->vmRss    = (size_t)(p.kp_eproc.e_vm.vm_rssize) * (size_t)(getpagesize());
 #if defined (__DragonFly__)
 	strlcpy(ps->name,p.kp_thread.td_comm ? p.kp_thread.td_comm : "????",
 		sizeof(ps->name));
@@ -417,7 +411,7 @@ printProcessList(const char* cmd)
 	ps = first_ctnr(ProcessList); /* skip 'kernel' entry */
 	for (ps = next_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList))
 	{
-		fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%d\t%d\t%s\t%s\n",
+		fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%zu\t%zu\t%s\t%s\n",
 			   ps->name, (long)ps->pid, (long)ps->ppid,
 			   (long)ps->uid, (long)ps->gid, ps->status,
 			   ps->userLoad, ps->sysLoad, ps->niceLevel,
diff --git a/ksysguard/ksysguardd/Linux/ProcessList.c b/ksysguard/ksysguardd/Linux/ProcessList.c
index 2708664bd..8582aae56 100644
--- a/ksysguard/ksysguardd/Linux/ProcessList.c
+++ b/ksysguard/ksysguardd/Linux/ProcessList.c
@@ -84,10 +84,10 @@ typedef struct {
     The total amount of memory the process uses. This includes shared and
     swapped memory.
    */
-  unsigned int vmSize;
+  size_t vmSize;
 
 	/* The amount of physical memory the process currently uses. */
-  unsigned int vmRss;
+  size_t vmRss;
 
 	/**
     The number of 1/100 of a second the process has spend in user space.
@@ -215,7 +215,7 @@ static int updateProcess( int pid )
     return -1;
 
   if ( fscanf( fd, "%*d %*s %c %d %d %*d %d %*d %*u %*u %*u %*u %*u %d %d"
-                   "%*d %*d %*d %d %*u %*u %*d %u %u",
+                   "%*d %*d %*d %d %*u %*u %*d %zu %zu",
                    &status, (int*)&ps->ppid, (int*)&ps->gid, &ps->ttyNo,
                    &userTime, &sysTime, &ps->niceLevel, &ps->vmSize,
                    &ps->vmRss) != 9 ) {
@@ -419,7 +419,7 @@ void printProcessList( const char* cmd )
   (void)cmd;
 
   for ( ps = first_ctnr( ProcessList ); ps; ps = next_ctnr( ProcessList ) ) {
-    fprintf( CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%d\t%d"
+    fprintf( CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%zu\t%zu"
              "\t%s\t%s\n", ps->name, (long)ps->pid, (long)ps->ppid,
              (long)ps->uid, (long)ps->gid, ps->status, ps->userLoad,
              ps->sysLoad, ps->niceLevel, ps->vmSize / 1024, ps->vmRss / 1024,
diff --git a/ksysguard/ksysguardd/NetBSD/ProcessList.c b/ksysguard/ksysguardd/NetBSD/ProcessList.c
index 13c65053d..a23af4cf3 100644
--- a/ksysguard/ksysguardd/NetBSD/ProcessList.c
+++ b/ksysguard/ksysguardd/NetBSD/ProcessList.c
@@ -91,18 +91,12 @@ typedef struct
 	 * The total amount of memory the process uses. This includes shared and
 	 * swapped memory.
 	 */
-	unsigned int vmSize;
+	size_t vmSize;
 
 	/*
 	 * The amount of physical memory the process currently uses.
 	 */
-	unsigned int vmRss;
-
-	/*
-	 * The amount of memory (shared/swapped/etc) the process shares with
-	 * other processes.
-	 */
-	unsigned int vmLib;
+	size_t vmRss;
 
 	/*
 	 * The number of 1/100 of a second the process has spend in user space.
@@ -200,10 +194,10 @@ updateProcess(int pid, struct kinfo_proc2 *p)
 	ps->userName[sizeof(ps->userName)-1]='\0';
 
         ps->userLoad = 100.0 * ((double)(p->p_pctcpu) /FSCALE);
-	ps->vmSize   = (p->p_vm_tsize +
-			p->p_vm_dsize +
-			p->p_vm_ssize) * getpagesize();
-	ps->vmRss    = p->p_vm_rssize * getpagesize();
+	ps->vmSize   = ((size_t)(p->p_vm_tsize) +
+			(size_t)(p->p_vm_dsize) +
+			(size_t)(p->p_vm_ssize)) * (size_t)(getpagesize());
+	ps->vmRss    = (size_t)(p->p_vm_rssize) * (size_t)(getpagesize());
 	strlcpy(ps->name,p->p_comm ? p->p_comm : "????", sizeof(ps->name));
 	strlcpy(ps->status,(p->p_stat<=7)? statuses[p->p_stat]:"????", sizeof(ps->status));
 
@@ -316,7 +310,7 @@ printProcessList(const char* cmd)
 	ps = first_ctnr(ProcessList); /* skip 'kernel' entry */
 	for (ps = next_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList))
 	{
-		fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%d\t%d\t%d\t%d\t%s\t%s\n",
+		fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%d\t%d\t%zu\t%zu\t%s\t%s\n",
 			   ps->name, (long)ps->pid, (long)ps->ppid,
 			   (long)ps->uid, (long)ps->gid, ps->status,
 			   ps->userLoad, ps->priority, ps->niceLevel,
diff --git a/ksysguard/ksysguardd/OpenBSD/ProcessList.c b/ksysguard/ksysguardd/OpenBSD/ProcessList.c
index ccdcc2313..f84ff0b2d 100644
--- a/ksysguard/ksysguardd/OpenBSD/ProcessList.c
+++ b/ksysguard/ksysguardd/OpenBSD/ProcessList.c
@@ -88,18 +88,12 @@ typedef struct
 	 * The total amount of memory the process uses. This includes shared and
 	 * swapped memory.
 	 */
-	unsigned int vmSize;
+	size_t vmSize;
 
 	/*
 	 * The amount of physical memory the process currently uses.
 	 */
-	unsigned int vmRss;
-
-	/*
-	 * The amount of memory (shared/swapped/etc) the process shares with
-	 * other processes.
-	 */
-	unsigned int vmLib;
+	size_t vmRss;
 
 	/*
 	 * The number of 1/100 of a second the process has spend in user space.
@@ -245,10 +239,10 @@ updateProcess(struct kinfo_proc *p)
 	ps->userName[sizeof(ps->userName)-1]='\0';
 
         ps->userLoad = p->p_pctcpu / 100;
-	ps->vmSize   = (p->p_vm_tsize +
-			p->p_vm_dsize +
-			p->p_vm_ssize) * getpagesize();
-	ps->vmRss    = p->p_vm_rssize * getpagesize();
+	ps->vmSize   = ((size_t)(p->p_vm_tsize) +
+			(size_t)(p->p_vm_dsize) +
+			(size_t)(p->p_vm_ssize)) * (size_t)(getpagesize());
+	ps->vmRss    = (size_t)(p->p_vm_rssize) * (size_t)(getpagesize());
 	strlcpy(ps->name,p->p_comm ? p->p_comm : "????", sizeof(ps->name));
 	strlcpy(ps->status,(p->p_stat>=1)&&(p->p_stat<=5)? statuses[p->p_stat-1]:"????", sizeof(ps->status));
 
@@ -362,7 +356,7 @@ printProcessList(const char* cmd)
 
 	for (ps = first_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList))
 	{
-		fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%d\t%d\t%s\t%s\n",
+		fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%zu\t%zu\t%s\t%s\n",
 			   ps->name, (long)ps->pid, (long)ps->ppid,
 			   (long)ps->uid, (long)ps->gid, ps->status,
 			   ps->userLoad, ps->sysLoad, ps->niceLevel,
diff --git a/ksysguard/ksysguardd/Solaris/CMakeLists.txt b/ksysguard/ksysguardd/Solaris/CMakeLists.txt
new file mode 100644
index 000000000..aeeda9ac3
--- /dev/null
+++ b/ksysguard/ksysguardd/Solaris/CMakeLists.txt
@@ -0,0 +1,25 @@
+#################################################
+#
+#  (C) 2023 Denis Kozadaev
+#  denis (AT) tambov (DOT) ru
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/ksysguard/CContLib
+  ${CMAKE_SOURCE_DIR}/ksysguard/ksysguardd
+)
+
+
+##### ksysguardd (static) #######################
+
+tde_add_library( ksysguardd STATIC
+  SOURCES
+    Memory.c LoadAvg.c ProcessList.c NetDev.c
+)
diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h
index fe66ad537..6130f2a83 100644
--- a/ksysguard/ksysguardd/modules.h
+++ b/ksysguard/ksysguardd/modules.h
@@ -68,7 +68,7 @@
 #include "netdev.h"
 #endif /* OSTYPE_NetBSD */
 
-#ifdef OSTYPE_Solaris
+#if defined(OSTYPE_Solaris) || defined(OSTYPE_SunOS)
 #include "LoadAvg.h"
 #include "Memory.h"
 #include "NetDev.h"
@@ -146,7 +146,7 @@ struct SensorModul SensorModulList[] = {
   { "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev, 0, NULLTIME },
 #endif /* OSTYPE_NetBSD */
 
-#ifdef OSTYPE_Solaris
+#if defined(OSTYPE_Solaris) || defined(OSTYPE_SunOS)
   { "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC, 0, NULLTIME },
   { "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC, 0, NULLTIME },
   { "NetDev", initNetDev, exitNetDev, updateNetDev, NULLVVFUNC, 0, NULLTIME },
diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp
index 5f9264c8c..404e2a472 100644
--- a/ksystraycmd/ksystraycmd.cpp
+++ b/ksystraycmd/ksystraycmd.cpp
@@ -26,7 +26,7 @@ KSysTrayCmd::KSysTrayCmd()
     win(0), client(0), twinmodule(0), top(0), left(0)
 {
   setAlignment( AlignCenter );
-  twinmodule = new KWinModule( TQT_TQOBJECT(this) );
+  twinmodule = new KWinModule( this );
   refresh();
 }
 
@@ -114,8 +114,8 @@ void KSysTrayCmd::setTargetWindow( WId w )
 
 void KSysTrayCmd::setTargetWindow( const KWin::WindowInfo &info )
 {
-  disconnect( twinmodule, TQT_SIGNAL(windowAdded(WId)), this, TQT_SLOT(windowAdded(WId)) );
-  connect( twinmodule, TQT_SIGNAL(windowChanged(WId)), TQT_SLOT(windowChanged(WId)) );
+  disconnect( twinmodule, TQ_SIGNAL(windowAdded(WId)), this, TQ_SLOT(windowAdded(WId)) );
+  connect( twinmodule, TQ_SIGNAL(windowChanged(WId)), TQ_SLOT(windowChanged(WId)) );
   win = info.win();
   KWin::setSystemTrayWindowFor( winId(), win );
   refresh();
@@ -179,9 +179,9 @@ bool KSysTrayCmd::startClient()
 {
   client = new KShellProcess();
   *client << command;
-  connect( twinmodule, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)) );
-  connect( client, TQT_SIGNAL( processExited(TDEProcess *) ),
-	   this, TQT_SLOT( clientExited() ) );
+  connect( twinmodule, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(windowAdded(WId)) );
+  connect( client, TQ_SIGNAL( processExited(TDEProcess *) ),
+	   this, TQ_SLOT( clientExited() ) );
 
   return client->start();
 }
@@ -292,7 +292,7 @@ void KSysTrayCmd::windowChanged( WId w )
 
 void KSysTrayCmd::mousePressEvent( TQMouseEvent *e )
 {
-  if ( e->button() == Qt::RightButton )
+  if ( e->button() == TQt::RightButton )
     execContextMenu( e->globalPos() );
   else if ( lazyStart && ( !hasRunningClient() ) )
   {
diff --git a/ksystraycmd/ksystraycmd.h b/ksystraycmd/ksystraycmd.h
index 826aa8118..20ebd0b25 100644
--- a/ksystraycmd/ksystraycmd.h
+++ b/ksystraycmd/ksystraycmd.h
@@ -14,7 +14,7 @@ class KWinModule;
  */
 class KSysTrayCmd : public TQLabel
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KSysTrayCmd();
   ~KSysTrayCmd();
diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp
index 0240b3d1b..c4cfb2383 100644
--- a/ktip/ktipwindow.cpp
+++ b/ktip/ktipwindow.cpp
@@ -46,14 +46,14 @@ int main(int argc, char *argv[])
 
 	KTipDialog *tipDialog = new KTipDialog(new KTipDatabase(locate("data", TQString("tdewizard/tips"))));
 	TQ_CHECK_PTR(tipDialog);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	KWin::setState(tipDialog->winId(), NET::StaysOnTop);
 #endif
 	tipDialog->setCaption(i18n("Useful Tips"));
 	app.dcopClient()->send("ksplash", "ksplash", "close()", TQByteArray()); // Close splash screen
 	tipDialog->show();
 
-	TQObject::connect(tqApp, TQT_SIGNAL(lastWindowClosed()), tqApp, TQT_SLOT(quit()));
+	TQObject::connect(tqApp, TQ_SIGNAL(lastWindowClosed()), tqApp, TQ_SLOT(quit()));
 
 	app.setMainWidget(tipDialog);
 
diff --git a/ktip/tips b/ktip/tips
index 235ba4e33..292441f76 100644
--- a/ktip/tips
+++ b/ktip/tips
@@ -704,7 +704,7 @@ href="help:/konqueror/enhanced-browsing.html">the Konqueror Handbook</a>.</p>
 <tip category="Win2Unix">
 <html>
 <p>
-Each UNIX user has a so-called Home folder in which his or her
+Each UNIX user has a so-called Home folder in which their
 files as well as user-dependent configuration files are saved. If you
 work in a Konsole window, you can easily change to your home folder
 by entering the <b>cd</b> command without any parameters.
@@ -1006,6 +1006,8 @@ or in Konqueror file manager to change icon size.</li>
 
 <li>Shift+Mouse-Wheel for fast scrolling in all TDE applications.</li>
 
+<li>Mouse-Wheel on the speaker icon on the TDE system tray for quick adjustment of sound volume.</li>
+
 <li>Mouse-Wheel over the taskbar in Kicker to quickly alternate between
 different windows.</li>
 
@@ -1117,11 +1119,13 @@ Open the Control Center, select Peripherals->Keyboard and make your
 <p>Do you already know the <i>TDE IRC channel</i>?</p>
 
 <p>
-<b>network:</b> chat.freenode.net
+<b>network:</b> irc.libera.chat
 <br />
 <b>channel:</b> #trinity-desktop
 <p>
 
+<p>Important to note that we have moved from Freenode to Libera Chat as of <b>May 9th, 2021</b>, so be sure to update any outdated links.</p>
+
 <p>You can join if you have some questions or want to meet some other people from the TDE community.</p>
 
 <p>There is a small but friendly group of people always there. Sometimes you can also meet the developers there and give them your feedback or ask other users for help. It is also the place where you can ask about ways to start contributing to TDE.</p>
diff --git a/kxkb/CMakeL10n.txt b/kxkb/CMakeL10n.txt
index 0238bd7e3..66ed038d9 100644
--- a/kxkb/CMakeL10n.txt
+++ b/kxkb/CMakeL10n.txt
@@ -27,3 +27,9 @@ tde_l10n_create_template(
     SOURCES *.desktop
     DESTINATION "${CMAKE_SOURCE_DIR}/translations"
 )
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/kxkb-eventsrc/"
+    SOURCES eventsrc
+    DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
\ No newline at end of file
diff --git a/kxkb/CMakeLists.txt b/kxkb/CMakeLists.txt
index b8bb14912..cb0d4b9db 100644
--- a/kxkb/CMakeLists.txt
+++ b/kxkb/CMakeLists.txt
@@ -33,6 +33,12 @@ tde_create_translated_desktop(
   PO_DIR kxkb-desktops
 )
 
+tde_create_translated_desktop(
+  SOURCE eventsrc
+  DESTINATION ${DATA_INSTALL_DIR}/kxkb
+  PO_DIR kxkb-eventsrc
+)
+
 install( FILES kxkb_groups DESTINATION ${CONFIG_INSTALL_DIR} )
 
 tde_create_translated_desktop(
diff --git a/kxkb/eventsrc b/kxkb/eventsrc
new file mode 100644
index 000000000..ce25f3979
--- /dev/null
+++ b/kxkb/eventsrc
@@ -0,0 +1,8 @@
+[!Global!]
+IconName=kxkb
+Comment=TDE Keyboard Tool
+
+[LayoutChange]
+Name=Keyboard layout switch
+Comment=The keyboard layout was switched
+default_presentation=16
\ No newline at end of file
diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp
index 616167944..870ee7eb4 100644
--- a/kxkb/extension.cpp
+++ b/kxkb/extension.cpp
@@ -15,26 +15,18 @@
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 #include <X11/extensions/XKBfile.h>
+#include <X11/extensions/XKBrules.h>
 #include <X11/extensions/XKBgeom.h>
 #include <X11/extensions/XKM.h>
 
 #include "extension.h"
 
 
-TQMap<TQString, FILE*> XKBExtension::fileCache;	//TODO: move to class?
-
-
 static TQString getLayoutKey(const TQString& layout, const TQString& variant)
 {
 	return layout + "." + variant;
 }
 
-TQString XKBExtension::getPrecompiledLayoutFilename(const TQString& layoutKey)
-{
-	TQString compiledLayoutFileName = m_tempDir + layoutKey + ".xkm";
-	return compiledLayoutFileName;
-}
-
 XKBExtension::XKBExtension(Display *d)
 {
 	if ( d == NULL )
@@ -76,16 +68,11 @@ bool XKBExtension::init()
     // Do it, or face horrible memory corrupting bugs
     ::XkbInitAtoms(NULL);
 
-    return true;
-}
+    // watch group change events
+    XkbSelectEventDetails(m_dpy, XkbUseCoreKbd, XkbStateNotify,
+                          XkbAllStateComponentsMask, XkbGroupStateMask);
 
-void XKBExtension::reset()
-{
-	for(TQMap<TQString, FILE*>::ConstIterator it = fileCache.begin(); it != fileCache.end(); it++) {
-		fclose(*it);
-//		remove( TQFile::encodeName(getPrecompiledLayoutFileName(*it)) );
-	}
-	fileCache.clear();
+    return true;
 }
 
 XKBExtension::~XKBExtension()
@@ -94,106 +81,77 @@ XKBExtension::~XKBExtension()
 		deletePrecompiledLayouts();*/
 }
 
-bool XKBExtension::setXkbOptions(const TQString& options, bool resetOld)
+bool XKBExtension::setXkbOptions(const XkbOptions options)
 {
-    if (options.isEmpty())
-        return true;
-
-    TQString exe = TDEGlobal::dirs()->findExe("setxkbmap");
-    if (exe.isEmpty())
-        return false;
-
-    TDEProcess p;
-    p << exe;
-    if( resetOld )
-        p << "-option";
-    p << "-option" << options;
+	TQString exe = TDEGlobal::dirs()->findExe("setxkbmap");
+	if (exe.isEmpty())
+		return false;
 
-    p.start(TDEProcess::Block);
+	TDEProcess p;
+	p << exe;
 
-    return p.normalExit() && (p.exitStatus() == 0);
-}
+	if (!options.layouts.isEmpty())
+	{
+		p << "-layout";
+		p << options.layouts;
+	}
 
-bool XKBExtension::setLayout(const TQString& model,
-		const TQString& layout, const TQString& variant,
-		const TQString& includeGroup, bool useCompiledLayouts)
-{
-	if( useCompiledLayouts == false ) {
-		return setLayoutInternal( model, layout, variant, includeGroup );
+	if (!options.variants.isEmpty())
+	{
+		p << "-variant";
+		p << options.variants;
 	}
 	
-	const TQString layoutKey = getLayoutKey(layout, variant);
-	
-	bool res;
-	if( fileCache.contains(layoutKey) ) {
-		res = setCompiledLayout( layoutKey );
-		kdDebug() << "[kxkb-extension] setCompiledLayout " << layoutKey << ": " << res << endl;
-
-		if( res )
-			return res;
+	if (!options.model.isEmpty()) {
+		p << "-model";
+		p << options.model;
 	}
-//	else {
-		res = setLayoutInternal( model, layout, variant, includeGroup );
-		kdDebug() << "[kxkb-extension] setRawLayout " << layoutKey << ": " << res << endl;
-		if( res )
-			compileCurrentLayout( layoutKey );
-		
-//	}
-	return res;
-}
 
-// private
-bool XKBExtension::setLayoutInternal(const TQString& model,
-		const TQString& layout, const TQString& variant,
-		const TQString& includeGroup)
-{
-    if ( layout.isEmpty() )
-        return false;
+	if (options.resetOld) {
+		p << "-option";
+	}
 
-	TQString exe = TDEGlobal::dirs()->findExe("setxkbmap");
-	if( exe.isEmpty() ) {
-		kdError() << "[kxkb-extension] Can't find setxkbmap" << endl;
-		return false;
+	if (!options.options.isEmpty()) {
+		if (options.resetOld)
+		{
+			p << "-option" << options.options;
+		}
+		else
+		{
+			// Avoid duplication of options in Append mode
+			TQStringList srvOptions = TQStringList::split(",", XKBExtension::getServerOptions());
+			TQStringList kxkbOptions = TQStringList::split(",", options.options);
+			TQStringList newOptions;
+			for (TQStringList::Iterator it = kxkbOptions.begin(); it != kxkbOptions.end(); ++it)
+			{
+				TQString option(*it);
+				if (!srvOptions.contains(option))
+				{
+					newOptions << option;
+				}
+			}
+			if (!newOptions.isEmpty()) {
+				p <<  "-option" <<  newOptions.join(",");
+			}
+		}
 	}
 
-    TQString fullLayout = layout;
-    TQString fullVariant = variant;
-	if( includeGroup.isEmpty() == false ) {
-        fullLayout = includeGroup;
-        fullLayout += ",";
-        fullLayout += layout;
-		
-//    fullVariant = baseVar;
-        fullVariant = ",";
-        fullVariant += variant;
-    }
- 
-    TDEProcess p;
-    p << exe;
-//  p << "-rules" << rule;
-	if( model.isEmpty() == false )
-		p << "-model" << model;
-    p << "-layout" << fullLayout;
-    if( !fullVariant.isNull() && !fullVariant.isEmpty() )
-        p << "-variant" << fullVariant;
+	kdDebug() << "[setXkbOptions] Command: " << p.args() << endl;
 
-    p.start(TDEProcess::Block); 
+	p.start(TDEProcess::Block);
 
-    // reload system-wide hotkey-setup keycode -> keysym maps
-    TQString modmapFileName = TDEGlobal::dirs()->findResource( "data", "kxkb/system.xmodmap" );
-    if ( TQFile::exists( modmapFileName ) ) {
-        TDEProcess pXmodmap;
-        pXmodmap << "xmodmap" << modmapFileName;
-        pXmodmap.start(TDEProcess::Block);
-    }
+	return p.normalExit() && (p.exitStatus() == 0);
+}
 
-    if ( TQFile::exists( TQDir::home().path() + "/.Xmodmap" ) ) {
-        TDEProcess pXmodmapHome;
-        pXmodmapHome << "xmodmap" << TQDir::home().path() + "/.Xmodmap";
-        pXmodmapHome.start(TDEProcess::Block);
+TQString XKBExtension::getServerOptions()
+{
+    XkbRF_VarDefsRec vd;
+    if (XkbRF_GetNamesProp(tqt_xdisplay(), nullptr, &vd) && vd.options)
+    {
+        kdDebug() << "[kxkb-extension] Got server options " << vd.options << endl;
+        return TQString(vd.options);
     }
-
-    return p.normalExit() && (p.exitStatus() == 0);
+    return TQString::null;
 }
 
 bool XKBExtension::setGroup(unsigned int group)
@@ -209,130 +167,13 @@ unsigned int XKBExtension::getGroup() const
 	return xkbState.group;
 }
 
-/**
- * @brief Gets the current layout in its binary compiled form
- *		and write it to the file specified by 'fileName'
- * @param[in] fileName file to store compiled layout to
- * @return true if no problem, false otherwise
- */
-bool XKBExtension::compileCurrentLayout(const TQString &layoutKey)
-{
-    XkbFileInfo result;
-    memset(&result, 0, sizeof(result));
-    result.type = XkmKeymapFile;
-    XkbReadFromServer(m_dpy, XkbAllMapComponentsMask, XkbAllMapComponentsMask, &result);
-	 
-	const TQString fileName = getPrecompiledLayoutFilename(layoutKey);
-
-	kdDebug() << "[kxkb-extension] compiling layout " << this << " cache size: " << fileCache.count() << endl;
-	if( fileCache.contains(layoutKey) ) {
-		kdDebug() << "[kxkb-extension] trashing old compiled layout for " << fileName << endl;
-		if( fileCache[ layoutKey ] != NULL )
-			fclose( fileCache[ layoutKey ] );	// recompiling - trash the old file
-		fileCache.remove(fileName);
-	}
-
-	FILE *output = fopen(TQFile::encodeName(fileName), "w");
-		
-    if ( output == NULL )
-    {
-		kdWarning() << "[kxkb-extension] Could not open " << fileName << " to precompile: " << strerror(errno) << endl;
-        XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
-        return false;
-    }
-
-	if( !XkbWriteXKMFile(output, &result) ) {
-		kdWarning() << "[kxkb-extension] Could not write compiled layout to " << fileName << endl;
-		fclose(output);
-        return false;
-	}
-	
-	fclose(output);	// TODO: can we change mode w/out reopening?
-	FILE *input = fopen(TQFile::encodeName(fileName), "r");
-	fileCache[ layoutKey ] = input;
-
-	XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
-    return true;
-}
-
-/**
- * @brief takes layout from its compiled binary snapshot in file 
- *	and sets it as current
- * TODO: cache layout in memory rather than in file
- */
-bool XKBExtension::setCompiledLayout(const TQString &layoutKey)
-{
-	FILE *input = NULL;
-	
-	if( fileCache.contains(layoutKey) ) {
-		input = fileCache[ layoutKey ];
-	}
-	
-	if( input == NULL ) {
-		kdWarning() << "[kxkb-extension] setCompiledLayout trying to reopen xkb file" << endl;	// should never happen
-		const TQString fileName = getPrecompiledLayoutFilename(layoutKey);
-		input = fopen(TQFile::encodeName(fileName), "r");
-		
-		// 	FILE *input = fopen(TQFile::encodeName(fileName), "r");
-		if ( input == NULL ) {
-			kdDebug() << "[kxkb-extension] Unable to open " << fileName << ": " << strerror(errno) << endl;
-			fileCache.remove(layoutKey);
-			return false;
-		}
-	}
-	else {
-		rewind(input);
-	}
-
-    XkbFileInfo result;
-    memset(&result, 0, sizeof(result));
-	if ((result.xkb = XkbAllocKeyboard())==NULL) {
-		kdWarning() << "[kxkb-extension] Unable to allocate memory for keyboard description" << endl;
-//      fclose(input);
-//		fileCache.remove(layoutKey);
-    	return false;
-	}
-	
-    unsigned retVal = XkmReadFile(input, 0, XkmKeymapLegal, &result);
-    if (retVal == XkmKeymapLegal)
-    {
-        // this means reading the Xkm didn't manage to read any section
-        kdWarning() << "[kxkb-extension] Unable to load map from file" << endl;
-        XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
-        fclose(input);
-		fileCache.remove(layoutKey);
-		return false;
+/** Examines an X Event passed to it and takes actions if the event is of
+  * interest to KXkb */
+void XKBExtension::processXEvent(XEvent *event) {
+	XkbEvent* xkb_event = (XkbEvent*)event;
+    if (xkb_event->any.xkb_type == XkbStateNotify) {
+		emit groupChanged(xkb_event->state.group);
     }
-
-	//    fclose(input);	// don't close - goes in cache
-
-    if (XkbChangeKbdDisplay(m_dpy, &result) == Success)
-    {
-        if (!XkbWriteToServer(&result))
-        {
-            kdWarning() << "[kxkb-extension] Unable to write the keyboard layout to X display" << endl;
-            XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
-            return false;
-        }
-    }
-    else
-    {
-        kdWarning() << "[kxkb-extension] Unable prepare the keyboard layout for X display" << endl;
-    }
-
-    XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
-    return true;
 }
 
-
-// Deletes the precompiled layouts stored in temporary files
-// void XKBExtension::deletePrecompiledLayouts()
-// {
-// 	TQMapConstIterator<LayoutUnit, TQString> it, end;
-// 	end = m_compiledLayoutFileNames.end();
-// 	for (it = m_compiledLayoutFileNames.begin(); it != end; ++it)
-// 	{
-// 		unlink(TQFile::encodeName(it.data()));
-// 	}
-// 	m_compiledLayoutFileNames.clear();
-// }
+#include "extension.moc"
diff --git a/kxkb/extension.h b/kxkb/extension.h
index bf4293d2b..9a3d2da8e 100644
--- a/kxkb/extension.h
+++ b/kxkb/extension.h
@@ -2,36 +2,33 @@
 #define __EXTENSION_H__
 
 #include <X11/Xlib.h>
+#include <tqobject.h>
 
+#include "kxkbconfig.h"
 
-class XKBExtension
+class XKBExtension : public TQObject
 {
+    TQ_OBJECT
+
 public:
 	XKBExtension(Display *display=NULL);
 	~XKBExtension();
 	bool init();
-	void reset();
 
-	static bool setXkbOptions(const TQString& options, bool resetOldOptions);
-	bool setLayout(const TQString& model,
-					const TQString& layout, const TQString& variant,
-					const TQString& includeGroup, bool useCompiledLayouts=true);
+	static bool setXkbOptions(const XkbOptions options);
+	static TQString getServerOptions();
 	bool setGroup(unsigned int group);
 	unsigned int getGroup() const;
+	void processXEvent(XEvent *ev);
 
 private:
     Display *m_dpy;
 	TQString m_tempDir;
+	int m_keycode;
 	static TQMap<TQString, FILE*> fileCache;
-	
-	bool setLayoutInternal(const TQString& model,
-				   const TQString& layout, const TQString& variant,
-				   const TQString& includeGroup);
-	bool compileCurrentLayout(const TQString& layoutKey);
-	bool setCompiledLayout(const TQString& layoutKey);
-	
-	TQString getPrecompiledLayoutFilename(const TQString& layoutKey);
-//	void deletePrecompiledLayouts();
+
+signals:
+	void groupChanged(uint group);
 };
 
 #endif
diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp
index a022b6389..73a500e21 100644
--- a/kxkb/kcmlayout.cpp
+++ b/kxkb/kcmlayout.cpp
@@ -13,6 +13,7 @@
 #include <tqlistview.h>
 #include <tqbuttongroup.h>
 #include <tqspinbox.h>
+#include <tqvbox.h>
 
 #include <tdefontrequester.h>
 #include <kcolorbutton.h>
@@ -24,6 +25,8 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
+#include <tdemessagebox.h>
+#include <kglobalaccel.h>
 #include <dcopref.h>
 #include <dcopclient.h>
 
@@ -33,6 +36,7 @@
 #include "pixmap.h"
 #include "kcmmisc.h"
 #include "kcmlayoutwidget.h"
+#include "x11helper.h"
 
 #include "kcmlayout.h"
 #include "kcmlayout.moc"
@@ -43,8 +47,7 @@ enum {
  LAYOUT_COLUMN_NAME = 1,
  LAYOUT_COLUMN_MAP = 2,
  LAYOUT_COLUMN_VARIANT = 3,
- LAYOUT_COLUMN_INCLUDE = 4,
- LAYOUT_COLUMN_DISPLAY_NAME = 5,
+ LAYOUT_COLUMN_DISPLAY_NAME = 4,
  SRC_LAYOUT_COLUMN_COUNT = 3,
  DST_LAYOUT_COLUMN_COUNT = 6
 };
@@ -100,65 +103,67 @@ static TQListViewItem* copyLVI(const TQListViewItem* src, TQListView* parent)
 
 LayoutConfig::LayoutConfig(TQWidget *parent, const char *name)
   : TDECModule(parent, name),
-    m_rules(NULL)
+    m_rules(NULL),
+    m_forceGrpOverwrite(false)
 {
+  X11Helper::initializeTranslations();
   TQVBoxLayout *main = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
   widget = new LayoutConfigWidget(this, "widget");
-  main->addWidget(TQT_TQWIDGET(widget));
+  main->addWidget(widget);
 
-  connect( TQT_TQOBJECT(widget->chkEnable), TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( TQT_TQOBJECT(widget->chkShowSingle), TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+  connect( widget->chkEnable, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT(changed()));
+  connect( widget->chkShowSingle, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT(changed()));
 
-  connect( TQT_TQOBJECT(widget->comboModel), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+  connect( widget->comboHotkey, TQ_SIGNAL(activated(int)), this, TQ_SLOT(hotkeyComboChanged()));
+  connect( widget->comboHotkey, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateOptionsCommand()));
+  connect( widget->comboHotkey, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
+  connect( widget->comboModel, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
 
-  connect( TQT_TQOBJECT(widget->listLayoutsSrc), TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&, int)),
-									TQT_TQOBJECT(this), TQT_SLOT(add()));
-  connect( TQT_TQOBJECT(widget->btnAdd), TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(add()));
-  connect( TQT_TQOBJECT(widget->btnRemove), TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(remove()));
+  connect( widget->listLayoutsSrc, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&, int)),
+									this, TQ_SLOT(add()));
+  connect( widget->btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(add()));
+  connect( widget->btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(remove()));
 
-  connect( TQT_TQOBJECT(widget->comboVariant), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( TQT_TQOBJECT(widget->comboVariant), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(variantChanged()));
-  connect( TQT_TQOBJECT(widget->listLayoutsDst), TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-		TQT_TQOBJECT(this), TQT_SLOT(layoutSelChanged(TQListViewItem *)));
+  connect( widget->comboVariant, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
+  connect( widget->comboVariant, TQ_SIGNAL(activated(int)), this, TQ_SLOT(variantChanged()));
+  connect( widget->listLayoutsDst, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+		this, TQ_SLOT(layoutSelChanged(TQListViewItem *)));
 
-  connect( widget->editDisplayName, TQT_SIGNAL(textChanged(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(displayNameChanged(const TQString&)));
-
-  connect( widget->chkLatin, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->chkLatin, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(latinChanged()));
+  connect( widget->editDisplayName, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(displayNameChanged(const TQString&)));
 
   widget->btnUp->setIconSet(SmallIconSet("1uparrow"));
-  connect( widget->btnUp, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->btnUp, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(moveUp()));
+  connect( widget->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+  connect( widget->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveUp()));
   widget->btnDown->setIconSet(SmallIconSet("1downarrow"));
-  connect( widget->btnDown, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->btnDown, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(moveDown()));
+  connect( widget->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+  connect( widget->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveDown()));
+
+  connect( widget->grpStyle, TQ_SIGNAL( clicked( int ) ), TQ_SLOT(changed()));
+  connect( widget->grpSwitching, TQ_SIGNAL( clicked( int ) ), TQ_SLOT(changed()));
+  connect( widget->grpLabel, TQ_SIGNAL( clicked( int ) ), TQ_SLOT(changed()));
 
-  connect( widget->grpStyle, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed()));
-  connect( widget->grpSwitching, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed()));
-  connect( widget->grpLabel, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed()));
+  connect( widget->bgColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT(changed()));
+  connect( widget->fgColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT(changed()));
+  connect( widget->chkBgTransparent, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(changed()));
+  connect( widget->labelFont, TQ_SIGNAL( fontSelected(const TQFont&) ), this, TQ_SLOT(changed()));
+  connect( widget->chkLabelShadow, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT(changed()));
+  connect( widget->shColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT(changed()));
 
-  connect( widget->bgColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->fgColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->labelFont, TQT_SIGNAL( fontSelected(const TQFont&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->chkLabelShadow, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->shColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+  connect( widget->chkEnableSticky, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+  connect( widget->spinStickyDepth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
 
-  connect( widget->chkEnableSticky, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->spinStickyDepth, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+  connect(widget->chkEnableNotify,       TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(widget->chkNotifyUseKMilo,     TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
 
   widget->listLayoutsSrc->setColumnText(LAYOUT_COLUMN_FLAG, "");
   widget->listLayoutsDst->setColumnText(LAYOUT_COLUMN_FLAG, "");
-  widget->listLayoutsDst->setColumnText(LAYOUT_COLUMN_INCLUDE, "");
 //  widget->listLayoutsDst->setColumnText(LAYOUT_COLUMN_DISPLAY_NAME, "");
 
   widget->listLayoutsSrc->setColumnWidth(LAYOUT_COLUMN_FLAG, 28);
   widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_FLAG, 28);
 
-  widget->listLayoutsDst->header()->setResizeEnabled(FALSE, LAYOUT_COLUMN_INCLUDE);
   widget->listLayoutsDst->header()->setResizeEnabled(FALSE, LAYOUT_COLUMN_DISPLAY_NAME);
-  widget->listLayoutsDst->setColumnWidthMode(LAYOUT_COLUMN_INCLUDE, TQListView::Manual);
-  widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_INCLUDE, 0);
 //  widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_DISPLAY_NAME, 0);
 
   widget->listLayoutsDst->setSorting(-1);
@@ -171,9 +176,14 @@ LayoutConfig::LayoutConfig(TQWidget *parent, const char *name)
   //Read rules - we _must_ read _before_ creating xkb-options comboboxes
   loadRules();
 
-  makeOptionsTab();
+  // Load global shortcuts
+#define NOSLOTS
+  keys = new TDEGlobalAccel(this);
+#include "kxkbbindings.cpp"
 
+  makeOptionsTab();
   load();
+  makeShortcutsTab();
 }
 
 
@@ -187,6 +197,8 @@ void LayoutConfig::load()
 {
 	m_kxkbConfig.load(KxkbConfig::LOAD_ALL);
 
+	keys->readSettings();
+
 	initUI();
 }
 
@@ -212,7 +224,6 @@ void LayoutConfig::initUI() {
 				TQListViewItem* newItem = copyLVI(srcItem, widget->listLayoutsDst);
 
 				newItem->setText(LAYOUT_COLUMN_VARIANT, layoutUnit.variant);
-				newItem->setText(LAYOUT_COLUMN_INCLUDE, layoutUnit.includeGroup);
 				newItem->setText(LAYOUT_COLUMN_DISPLAY_NAME, layoutUnit.displayName);
 				widget->listLayoutsDst->insertItem(newItem);
 				newItem->moveItem(widget->listLayoutsDst->lastItem());
@@ -222,6 +233,25 @@ void LayoutConfig::initUI() {
 		}
 	}
 
+	// initialize hotkey combo
+	TQDict<char> allOptions = m_rules->options();
+
+	TQStringList commonHotkeys;
+	commonHotkeys << "alt_shift_toggle" << "ctrl_shift_toggle"
+	              << "win_space_toggle" << "alt_space_toggle"
+	              << "caps_toggle" << "menu_toggle"
+	              << "lwin_toggle" << "rwin_toggle";
+
+	for (TQStringList::ConstIterator hk = commonHotkeys.begin(); hk != commonHotkeys.end(); ++hk ) {
+		const char *hkOpt  = tqstrdup(TQString("grp:" + (*hk)).ascii());
+		const char *hkDesc = allOptions[hkOpt];
+		if (hkDesc != 0) { // the option exists
+			widget->comboHotkey->insertItem(XkbRules::trOpt(hkDesc));
+		}
+	}
+	widget->comboHotkey->insertItem(i18n("None"));
+	widget->comboHotkey->insertItem(i18n("Other..."));
+
 	// display KXKB switching options
 	widget->chkShowSingle->setChecked(m_kxkbConfig.m_showSingle);
 
@@ -231,8 +261,7 @@ void LayoutConfig::initUI() {
 	widget->radFlagOnly->setChecked( showFlag && !showLabel );
 	widget->radLabelOnly->setChecked( !showFlag && showLabel );
 
-	widget->chkEnableOptions->setChecked( m_kxkbConfig.m_enableXkbOptions );
-	widget->checkResetOld->setChecked(m_kxkbConfig.m_resetOldOptions);
+	widget->xkbOptsMode->setButton(m_kxkbConfig.m_resetOldOptions ? 0 : 1);
 
 	widget->grpLabel->setButton( ( m_kxkbConfig.m_useThemeColors ? 0 : 1 )  );
 	widget->bgColor->setColor( m_kxkbConfig.m_colorBackground );
@@ -265,20 +294,30 @@ void LayoutConfig::initUI() {
 	widget->spinStickyDepth->setEnabled(m_kxkbConfig.m_stickySwitching);
 	widget->spinStickyDepth->setValue( m_kxkbConfig.m_stickySwitchingDepth);
 
+	widget->chkEnableNotify->setChecked(m_kxkbConfig.m_enableNotify);
+	widget->chkNotifyUseKMilo->setChecked(m_kxkbConfig.m_notifyUseKMilo);
+
 	updateStickyLimit();
 
 	widget->chkEnable->setChecked( m_kxkbConfig.m_useKxkb );
 	widget->grpLayouts->setEnabled( m_kxkbConfig.m_useKxkb );
-	widget->optionsFrame->setEnabled( m_kxkbConfig.m_useKxkb );
+	widget->swOptsFrame->setEnabled( m_kxkbConfig.m_useKxkb );
+	widget->indOptsFrame->setEnabled( m_kxkbConfig.m_useKxkb );
 
 	// display xkb options
-	TQStringList options = TQStringList::split(',', m_kxkbConfig.m_options);
-	for (TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
+	TQStringList activeOptions = TQStringList::split(',', m_kxkbConfig.m_options);
+	bool foundGrp = false;
+	for (TQStringList::ConstIterator it = activeOptions.begin(); it != activeOptions.end(); ++it)
 	{
 		TQString option = *it;
 		TQString optionKey = option.mid(0, option.find(':'));
 		TQString optionName = m_rules->options()[option];
-		OptionListItem *item = m_optionGroups[i18n(optionKey.latin1())];
+
+		if (optionKey == "grp") {
+			foundGrp = true;
+		}
+
+		OptionListItem *item = m_optionGroups[optionKey];
 
 		if (item != NULL) {
 			OptionListItem *child = item->findChildItem( option );
@@ -293,7 +332,15 @@ void LayoutConfig::initUI() {
 		}
 	}
 
+	if (!foundGrp) {
+		OptionListItem *grpNone = itemForOption("grp:none");
+		if (grpNone) {
+			grpNone->setOn(true);
+		}
+	}
+
 	updateOptionsCommand();
+	updateHotkeyCombo(true);
 	emit TDECModule::changed( false );
 }
 
@@ -303,8 +350,7 @@ void LayoutConfig::save()
 	TQString model = lookupLocalized(m_rules->models(), widget->comboModel->currentText());
 	m_kxkbConfig.m_model = model;
 
-	m_kxkbConfig.m_enableXkbOptions = widget->chkEnableOptions->isChecked();
-	m_kxkbConfig.m_resetOldOptions = widget->checkResetOld->isChecked();
+	m_kxkbConfig.m_resetOldOptions = widget->radXkbOverwrite->isOn();
 	m_kxkbConfig.m_options = createOptionString();
 
 	m_kxkbConfig.m_useThemeColors = widget->radLabelUseTheme->isChecked();
@@ -320,17 +366,14 @@ void LayoutConfig::save()
 	while (item) {
 		TQString layout = item->text(LAYOUT_COLUMN_MAP);
 		TQString variant = item->text(LAYOUT_COLUMN_VARIANT);
-		TQString includes = item->text(LAYOUT_COLUMN_INCLUDE);
 		TQString displayName = item->text(LAYOUT_COLUMN_DISPLAY_NAME);
 
 		LayoutUnit layoutUnit(layout, variant);
-		layoutUnit.includeGroup = includes;
 		layoutUnit.displayName = displayName;
 		layouts.append( layoutUnit );
 
 		item = item->nextSibling();
 		kdDebug() << "To save: layout " << layoutUnit.toPair()
-				<< ", inc: " << layoutUnit.includeGroup
 				<< ", disp: " << layoutUnit.displayName << endl;
 	}
 	m_kxkbConfig.m_layouts = layouts;
@@ -363,8 +406,44 @@ void LayoutConfig::save()
 	m_kxkbConfig.m_stickySwitching = widget->chkEnableSticky->isChecked();
 	m_kxkbConfig.m_stickySwitchingDepth = widget->spinStickyDepth->value();
 
+	m_kxkbConfig.m_enableNotify = widget->chkEnableNotify->isChecked();
+	m_kxkbConfig.m_notifyUseKMilo = widget->chkNotifyUseKMilo->isChecked();
+
 	m_kxkbConfig.save();
 
+	// We might need to unset previous hotkey options
+	if (m_forceGrpOverwrite)
+	{
+		// First get all the server's options
+		TQStringList srvOptions = TQStringList::split(",", XKBExtension::getServerOptions());
+		TQStringList newOptions;
+
+		// Then remove all grp: options
+		for (TQStringList::Iterator it = srvOptions.begin(); it != srvOptions.end(); ++it)
+		{
+			TQString opt(*it);
+			if (!opt.startsWith("grp:"))
+			{
+				newOptions << opt;
+			}
+		}
+
+		XkbOptions xkbOptions;
+		xkbOptions.options = newOptions.join(",");
+		xkbOptions.resetOld = true;
+
+		if (!XKBExtension::setXkbOptions(xkbOptions))
+		{
+			kdWarning() << "[LayoutConfig::save] Could not overwrite previous grp: options!" << endl;
+		}
+
+		m_forceGrpOverwrite = false;
+	}
+
+	// Save and apply global shortcuts
+	m_keyChooser->commitChanges();
+	keys->writeSettings(0, true);
+
 	// Get current layout from Kxkb
 	if (!kapp->dcopClient()->isAttached())
 		kapp->dcopClient()->attach();
@@ -397,6 +476,8 @@ void LayoutConfig::save()
 		}
 	}
 
+	updateHotkeyCombo();
+
 	emit TDECModule::changed( false );
 }
 
@@ -439,9 +520,6 @@ void LayoutConfig::add()
     // than one time, with different variants.
     TQListViewItem* toadd = copyLVI(sel, widget->listLayoutsDst);
 
-    // Turn on "Include Latin layout" for new language by default (bnc:204402)
-    toadd->setText(LAYOUT_COLUMN_INCLUDE, "us");
-
     widget->listLayoutsDst->insertItem(toadd);
     if( widget->listLayoutsDst->childCount() > 1 )
 		toadd->moveItem(widget->listLayoutsDst->lastItem());
@@ -513,6 +591,7 @@ void LayoutConfig::variantChanged()
 	if( selectedVariant == DEFAULT_VARIANT_NAME )
 		selectedVariant = "";
 	selLayout->setText(LAYOUT_COLUMN_VARIANT, selectedVariant);
+	updateLayoutCommand();
 }
 
 // helper
@@ -551,33 +630,10 @@ void LayoutConfig::updateIndicator(TQListViewItem* selLayout)
 {
 }
 
-
-void LayoutConfig::latinChanged()
-{
-    TQListViewItem* selLayout = widget->listLayoutsDst->selectedItem();
-    if (  !selLayout ) {
-      widget->chkLatin->setChecked( false );
-      widget->chkLatin->setEnabled( false );
-      return;
-    }
-
-	TQString include;
-	if( widget->chkLatin->isChecked() )
-		include = "us";
-    else
-		include = "";
-	selLayout->setText(LAYOUT_COLUMN_INCLUDE, include);
-
- 	LayoutUnit layoutUnitKey = getLayoutUnitKey(selLayout);
-	kdDebug() << "layout " << layoutUnitKey.toPair() << ", inc: " << include << endl;
-}
-
 void LayoutConfig::layoutSelChanged(TQListViewItem *sel)
 {
     widget->comboVariant->clear();
     widget->comboVariant->setEnabled( sel != NULL );
-    widget->chkLatin->setChecked( false );
-    widget->chkLatin->setEnabled( sel != NULL );
 
     if( sel == NULL ) {
         updateLayoutCommand();
@@ -588,21 +644,6 @@ void LayoutConfig::layoutSelChanged(TQListViewItem *sel)
 	LayoutUnit layoutUnitKey = getLayoutUnitKey(sel);
 	TQString kbdLayout = layoutUnitKey.layout;
 
-	// TODO: need better algorithm here for determining if needs us group
-    if (  ! m_rules->isSingleGroup(kbdLayout)
-	    		|| kbdLayout.startsWith("us") || kbdLayout.startsWith("en") ) {
-        widget->chkLatin->setEnabled( false );
-    }
-    else {
-		TQString inc = sel->text(LAYOUT_COLUMN_INCLUDE);
-		if ( inc.startsWith("us") || inc.startsWith("en") ) {
-            widget->chkLatin->setChecked(true);
-        }
-        else {
-            widget->chkLatin->setChecked(false);
-        }
-    }
-
 	TQStringList vars = m_rules->getAvailableVariants(kbdLayout);
 	kdDebug() << "layout " << kbdLayout << " has " << vars.count() << " variants" << endl;
 
@@ -630,13 +671,13 @@ TQWidget* LayoutConfig::makeOptionsTab()
   listView->setColumnText( 0, i18n( "Options" ) );
   listView->clear();
 
-  connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(changed()));
-  connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(updateOptionsCommand()));
-
-  connect(widget->chkEnableOptions, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+  connect(listView, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(changed()));
+  connect(listView, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(resolveConflicts(TQListViewItem *)));
+  connect(listView, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(updateHotkeyCombo()));
 
-  connect(widget->checkResetOld, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(widget->checkResetOld, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateOptionsCommand()));
+  connect(widget->xkbOptsMode, TQ_SIGNAL(released(int)), TQ_SLOT(changed()));
+  connect(widget->xkbOptsMode, TQ_SIGNAL(released(int)), TQ_SLOT(updateOptionsCommand()));
+  connect(widget->xkbOptsMode, TQ_SIGNAL(released(int)), TQ_SLOT(updateHotkeyCombo()));
 
   //Create controllers for all options
   TQDictIterator<char> it(m_rules->options());
@@ -646,19 +687,26 @@ TQWidget* LayoutConfig::makeOptionsTab()
     if (!it.currentKey().contains(':'))
     {
       if( it.currentKey() == "ctrl" || it.currentKey() == "caps"
-          || it.currentKey() == "altwin" ) {
-        parent = new OptionListItem(listView, i18n( it.current() ),
+          || it.currentKey() == "altwin") {
+        parent = new OptionListItem(listView, XkbRules::trOpt( it.current() ),
             TQCheckListItem::RadioButtonController, it.currentKey());
         OptionListItem *item = new OptionListItem(parent, i18n( "None" ),
             TQCheckListItem::RadioButton, "none");
         item->setState(TQCheckListItem::On);
       }
+      else if (it.currentKey() == "grp") {
+        parent = new OptionListItem(listView, XkbRules::trOpt(it.current()),
+            TQCheckListItem::RadioButtonController, it.currentKey());
+        parent->setSelectable(false);
+        OptionListItem *item = new OptionListItem(parent, i18n("None"),
+            TQCheckListItem::CheckBox, "grp:none");
+      }
       else {
-        parent = new OptionListItem(listView, i18n( it.current() ),
+        parent = new OptionListItem(listView, XkbRules::trOpt( it.current() ),
             TQCheckListItem::CheckBoxController, it.currentKey());
       }
       parent->setOpen(true);
-      m_optionGroups.insert(i18n(it.currentKey().local8Bit()), parent);
+      m_optionGroups.insert(it.currentKey(), parent);
     }
   }
 
@@ -676,12 +724,13 @@ TQWidget* LayoutConfig::makeOptionsTab()
       // workaroung for mistake in rules file for xkb options in XFree 4.2.0
         TQString text(it.current());
         text = text.replace( "Cap$", "Caps." );
-        if( parent->type() == TQCheckListItem::RadioButtonController )
-            new OptionListItem(parent, i18n(text.utf8()),
-                TQCheckListItem::RadioButton, key);
-        else
-            new OptionListItem(parent, i18n(text.utf8()),
+        if ( parent->type() == TQCheckListItem::CheckBoxController
+             || key.startsWith("grp:"))
+            new OptionListItem(parent, XkbRules::trOpt(text),
                 TQCheckListItem::CheckBox, key);
+        else
+            new OptionListItem(parent, XkbRules::trOpt(text),
+                TQCheckListItem::RadioButton, key);
       }
     }
   }
@@ -691,68 +740,368 @@ TQWidget* LayoutConfig::makeOptionsTab()
   return listView;
 }
 
+TQWidget* LayoutConfig::makeShortcutsTab() {
+  m_keyChooser = new KKeyChooser(keys, widget->tabShortcuts, false, false);
+  connect(m_keyChooser, TQ_SIGNAL(keyChange()), this, TQ_SLOT(changed()));
+  widget->tabShortcuts->layout()->add(m_keyChooser);
+  return m_keyChooser;
+}
+
 void LayoutConfig::updateOptionsCommand()
 {
   TQString setxkbmap;
   TQString options = createOptionString();
+  bool overwrite = widget->radXkbOverwrite->isOn();
 
   if( !options.isEmpty() ) {
     setxkbmap = "setxkbmap -option "; //-rules " + m_rule
-    if( widget->checkResetOld->isChecked() )
+    if (overwrite)
       setxkbmap += "-option ";
     setxkbmap += options;
   }
+  else if (overwrite) {
+    setxkbmap = "setxkbmap -option";
+  }
   widget->editCmdLineOpt->setText(setxkbmap);
+  widget->editCmdLineOpt->setDisabled(setxkbmap.isEmpty());
 }
 
 void LayoutConfig::updateLayoutCommand()
 {
-  TQString setxkbmap;
-  TQString layoutDisplayName;
-  TQListViewItem* sel = widget->listLayoutsDst->selectedItem();
-
-  if( sel != NULL ) {
-    TQString kbdLayout = sel->text(LAYOUT_COLUMN_MAP);
-    TQString variant = widget->comboVariant->currentText();
-	if( variant == DEFAULT_VARIANT_NAME )
-		variant = "";
-
-    setxkbmap = "setxkbmap"; //-rules " + m_rule
-    setxkbmap += " -model " + lookupLocalized(m_rules->models(), widget->comboModel->currentText())
-      + " -layout ";
-    setxkbmap += kbdLayout;
-    if( widget->chkLatin->isChecked() )
-      setxkbmap += ",us";
-
-/*	LayoutUnit layoutUnitKey = getLayoutUnitKey(sel);
-	layoutDisplayName = m_kxkbConfig.getLayoutDisplayName( *m_kxkbConfig.m_layouts.find(layoutUnitKey) );*/
-	layoutDisplayName = sel->text(LAYOUT_COLUMN_DISPLAY_NAME);
-	if( layoutDisplayName.isEmpty() ) {
-		int count = 0;
-		TQListViewItem *item = widget->listLayoutsDst->firstChild();
-		while (item) {
-			TQString layout_ = item->text(LAYOUT_COLUMN_MAP);
-			if( layout_ == kbdLayout )
-				++count;
-			item = item->nextSibling();
-		}
-		bool single = count < 2;
-		layoutDisplayName = m_kxkbConfig.getDefaultDisplayName(LayoutUnit(kbdLayout, variant), single);
-	}
-	kdDebug() << "disp: '" << layoutDisplayName << "'" << endl;
-
-    if( !variant.isEmpty() ) {
-      setxkbmap += " -variant ";
-      if( widget->chkLatin->isChecked() )
-        setxkbmap += ",";
-      setxkbmap += variant;
+  TQString setxkbmap = "setxkbmap";
+  setxkbmap += " -model " + lookupLocalized(m_rules->models(),
+                                            widget->comboModel->currentText());
+  TQStringList layoutCodes;
+  TQStringList layoutVariants;
+  TQListViewItem *item = widget->listLayoutsDst->firstChild();
+  while (item) {
+    layoutCodes << item->text(LAYOUT_COLUMN_MAP);
+
+    TQString layoutVariant = item->text(LAYOUT_COLUMN_VARIANT);
+    if (layoutVariant == DEFAULT_VARIANT_NAME) {
+      layoutVariant = "";
     }
+    layoutVariants << layoutVariant;
+
+    item = item->nextSibling();
+  }
+
+  setxkbmap += " -layout " + layoutCodes.join(",");
+
+  if( !layoutVariants.isEmpty() ) {
+    setxkbmap += " -variant " + layoutVariants.join(",");
   }
 
   widget->editCmdLine->setText(setxkbmap);
 
+  /* update display name field */
+  TQListViewItem *sel = widget->listLayoutsDst->selectedItem();
+  if (!sel) {
+    return;
+  }
+  TQString selLayoutCode = sel->text(LAYOUT_COLUMN_MAP);
+  TQString selLayoutVariant = widget->comboVariant->currentText();
+  TQString selDisplayName = sel->text(LAYOUT_COLUMN_DISPLAY_NAME);
+  if (selDisplayName.isEmpty()) {
+    int count = 0;
+    TQListViewItem *item = widget->listLayoutsDst->firstChild();
+    while (item) {
+      TQString layoutCode_ = item->text(LAYOUT_COLUMN_MAP);
+      if (layoutCode_ == selLayoutCode) {
+        ++count;
+      }
+      item = item->nextSibling();
+    }
+    bool single = count < 2;
+    selDisplayName = m_kxkbConfig.getDefaultDisplayName(LayoutUnit(selLayoutCode, selLayoutVariant), single);
+  }
+
   widget->editDisplayName->setEnabled( sel != NULL );
-  widget->editDisplayName->setText(layoutDisplayName);
+  widget->editDisplayName->setText(selDisplayName);
+}
+
+void LayoutConfig::checkConflicts(OptionListItem *current,
+                                  TQStringList conflicting,
+                                  TQStringList &conflicts)
+{
+    if (!current || conflicting.count() < 2 ||
+        !conflicting.contains(current->optionName()))
+    {
+        return;
+    }
+    TQStringList::Iterator it;
+    for (it = conflicting.begin(); it != conflicting.end(); ++it) {
+        TQString option(*it);
+        if (option == current->optionName()) {
+            continue;
+        }
+
+        OptionListItem *item = itemForOption(option);
+        if (item && item->isOn()) {
+            conflicts << item->text();
+        }
+    }
+}
+
+void LayoutConfig::resolveConflicts(TQListViewItem *lvi) {
+    OptionListItem *current = (OptionListItem*)lvi;
+
+    kdDebug() << "resolveConflicts : " << current->optionName() << endl;
+
+    if (current->optionName().startsWith("grp:")) {
+        OptionListItem *grpItem = m_optionGroups["grp"];
+        if (grpItem == NULL) {
+            kdWarning() << "LayoutConfig: cannot find grp item group" << endl;
+            return;
+        }
+
+        OptionListItem *noneItem = grpItem->findChildItem("grp:none");
+        if (!noneItem) {
+            kdDebug() << "LayoutConfig: unable to find None item for grp!" << endl;
+        }
+        else {
+            // Option "none" selected, uncheck all other options immediately
+            if (current->optionName() == "grp:none") {
+                if (current->isOn()) {
+                    OptionListItem *child = (OptionListItem*)grpItem->firstChild();
+                    while (child) {
+                        if (child != current) {
+                            child->setOn(false);
+                        }
+                        child = (OptionListItem*)child->nextSibling();
+                    }
+                }
+                else {
+                    current->setOn(true);
+                }
+                updateOptionsCommand();
+                return;
+            }
+
+            // If no options are selected then select "none"
+            bool notNone = false;
+            OptionListItem *child = (OptionListItem*)grpItem->firstChild();
+            while (child) {
+                if (child->isOn() && child->optionName() != "none") {
+                    notNone = true;
+                    break;
+                }
+                child = (OptionListItem*)child->nextSibling();
+            }
+
+            noneItem->setOn(!notNone);
+        }
+    }
+
+    TQStringList conflicts;
+    OptionListItem *conflict;
+
+    TQStringList conflicting;
+    /* Might be incomplete */
+    // Space
+    conflicting << "grp:win_space_toggle"
+                << "grp:alt_space_toggle"
+                << "grp:ctrl_space_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Shift
+    conflicting.clear();
+    conflicting << "grp:ctrl_shift_toggle"
+                << "grp:alt_shift_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Control
+    conflicting.clear();
+    conflicting << "grp:ctrl_select"
+                << "grp:ctrl_alt_toggle"
+                << "grp:ctrl_shift_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Left Ctrl
+    conflicting.clear();
+    conflicting << "grp:lctrl_toggle"
+                << "grp:lctrl_lshift_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Right Ctrl
+    conflicting.clear();
+    conflicting << "grp:rctrl_toggle"
+                << "grp:rctrl_rshift_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Win
+    conflicting.clear();
+    conflicting << "grp:win_space_toggle"
+                << "grp:win_switch"
+                << "win_menu_select";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Left Alt
+    conflicting.clear();
+    conflicting << "grp:lalt_toggle"
+                << "grp:lalt_lshift_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Right Alt
+    conflicting.clear();
+    conflicting << "grp:ralt_toggle"
+                << "grp:ralt_rshift_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Caps Lock
+    conflicting.clear();
+    conflicting << "grp:caps_toggle"
+                << "grp:caps_select"
+                << "grp:caps_switch"
+                << "grp:alt_caps_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    if (conflicts.count()) {
+        TQString curText = current->text();
+        int confirm = KMessageBox::warningYesNoList(this,
+                          i18n("<qt>The option <b>%1</b> might conflict with "
+                               "other options that you have already enabled.<br>"
+                               "Are you sure that you really want to enable "
+                               "<b>%2</b>?</qt>")
+                               .arg(curText).arg(curText),
+                          conflicts,
+                          i18n("Conflicting options"));
+        if (confirm == KMessageBox::No) {
+            current->setOn(false);
+        }
+    }
+    updateOptionsCommand();
+}
+
+// Synchronizes Xkb grp options --> hotkeys combobox
+void LayoutConfig::updateHotkeyCombo() {
+    updateHotkeyCombo(false);
+}
+
+void LayoutConfig::updateHotkeyCombo(bool initial) {
+    OptionListItem *grpItem = m_optionGroups["grp"];
+    if (grpItem == NULL) {
+        kdWarning() << "LayoutConfig: cannot find grp item group" << endl;
+        return;
+    }
+
+    TQStringList hotkeys;
+
+    // Get server options first
+    if (initial || widget->xkbOptsMode->selectedId() == 1)
+    {
+        TQStringList opts = TQStringList::split(",", XKBExtension::getServerOptions());
+        for (TQStringList::Iterator it = opts.begin(); it != opts.end(); ++it)
+        {
+            TQString option(*it);
+
+            if (!option.startsWith("grp:"))
+            {
+                continue;
+            }
+
+            // Get description from existing item
+            // This spares us the trouble of querying Xkb rules second time
+            OptionListItem *item = itemForOption(option);
+            if (!item)
+            {
+                kdWarning() << "[updateHotkeyCombo] server has set unknown option: "
+                            << option << endl;
+                continue;
+            }
+
+            TQString optionName = item->text();
+            if (!hotkeys.contains(optionName) && option != "grp:none")
+            {
+                hotkeys << optionName;
+            }
+        }
+    }
+
+    OptionListItem *child = (OptionListItem*)grpItem->firstChild();
+    while (child) {
+        TQString optionText = child->text();
+        if (child->isOn() && !hotkeys.contains(optionText) && child->optionName() != "grp:none") {
+            hotkeys << optionText;
+        }
+        child = (OptionListItem*)child->nextSibling();
+    }
+
+    if (!hotkeys.count()) {
+        OptionListItem *noneItem = itemForOption("grp:none");
+        if (noneItem)
+        {
+            hotkeys << noneItem->text();
+        }
+        else
+        {
+            kdWarning() << "[updateHotkeyCombo] cannot find grp:none item!" << endl;
+            hotkeys << widget->comboHotkey->text(0); // fallback
+        }
+    }
+
+    int other = widget->comboHotkey->count() - 1;
+    widget->comboHotkey->changeItem(i18n("Custom..."), other);
+    if (hotkeys.count() < 2) {
+        bool found = false;
+        for (int i = 0; i < widget->comboHotkey->count(); ++i) {
+            if (hotkeys[0] == widget->comboHotkey->text(i)) {
+                widget->comboHotkey->setCurrentItem(i);
+                found = true;
+            }
+        }
+        if (!found) {
+            widget->comboHotkey->changeItem(i18n("Other (%1)").arg(hotkeys[0]),
+                                            other);
+            widget->comboHotkey->setCurrentItem(other);
+        }
+    }
+    else {
+        widget->comboHotkey->changeItem(i18n("Multiple (%1)").arg(hotkeys.join("; ")),
+                                        other);
+        widget->comboHotkey->setCurrentItem(other);
+    }
+}
+
+// Synchronizes hotkeys combobox --> Xkb grp options
+void LayoutConfig::hotkeyComboChanged() {
+    TQStringList hotkeys;
+    int other = widget->comboHotkey->count() - 1;
+
+    if (widget->comboHotkey->currentItem() != other) {
+        hotkeys << widget->comboHotkey->currentText();
+    }
+    else {
+        TQString otherStr = widget->comboHotkey->text(other);
+        int i1 = otherStr.find("(");
+        if (i1 != -1) { // custom hotkey(s) set
+            ++i1;
+            int i2 = otherStr.findRev(")");
+            if (i2 != -1) {
+                hotkeys = TQStringList::split("; ", otherStr.mid(i1, i2-i1));
+            }
+        }
+    }
+
+    OptionListItem *grpItem = m_optionGroups["grp"];
+    if (grpItem == NULL) {
+        kdWarning() << "LayoutConfig: cannot find grp item group" << endl;
+        return;
+    }
+
+    OptionListItem *child = (OptionListItem*)grpItem->firstChild();
+    while (child) {
+        child->setOn(hotkeys.contains(child->text()));
+        child = (OptionListItem*)child->nextSibling();
+    }
+
+    if (widget->comboHotkey->currentItem() == other) {
+        widget->tabWidget->setCurrentPage(4);
+        widget->listOptions->ensureItemVisible(grpItem);
+        widget->listOptions->setFocus();
+    }
+
+    m_forceGrpOverwrite = true;
 }
 
 void LayoutConfig::changed()
@@ -802,6 +1151,20 @@ void LayoutConfig::loadRules()
 	//TODO: reset options and xkb options
 }
 
+OptionListItem* LayoutConfig::itemForOption(TQString option) {
+    if (!option.contains(':')) {
+        return nullptr;
+    }
+
+    TQString optionKey = option.mid(0, option.find(':'));
+    OptionListItem *item = m_optionGroups[optionKey];
+
+    if( !item ) {
+        kdDebug() << "WARNING: skipping empty group for " << option << endl;
+        return nullptr;
+    }
+    return (OptionListItem*)item->findChildItem(option);
+}
 
 TQString LayoutConfig::createOptionString()
 {
@@ -809,32 +1172,17 @@ TQString LayoutConfig::createOptionString()
   for (TQDictIterator<char> it(m_rules->options()); it.current(); ++it)
   {
     TQString option(it.currentKey());
-
-    if (option.contains(':')) {
-
-      TQString optionKey = option.mid(0, option.find(':'));
-      OptionListItem *item = m_optionGroups[optionKey];
-
-      if( !item ) {
-        kdDebug() << "WARNING: skipping empty group for " << it.currentKey()
-          << endl;
-        continue;
-      }
-
-      OptionListItem *child = item->findChildItem( option );
-
-      if ( child ) {
-        if ( child->state() == TQCheckListItem::On ) {
-          TQString selectedName = child->optionName();
-          if ( !selectedName.isEmpty() && selectedName != "none" ) {
-            if (!options.isEmpty())
-              options.append(',');
-            options.append(selectedName);
-          }
-        }
+    OptionListItem *child = itemForOption(option);
+    if (!child) {
+      continue;
+    }
+    if ( child->state() == TQCheckListItem::On ) {
+      TQString selectedName = child->optionName();
+      if ( !selectedName.isEmpty() && selectedName != "none" ) {
+        if (!options.isEmpty())
+          options.append(',');
+        options.append(selectedName);
       }
-      else
-        kdDebug() << "Empty option button for group " << it.currentKey() << endl;
     }
   }
   return options;
@@ -902,12 +1250,8 @@ extern "C"
 			kapp->startServiceByDesktopName("kxkb");
 		}
 		else {
-		// Even if the layouts have been disabled we still want to set Xkb options
-		// user can always switch them off now in the "Options" tab
-			if( m_kxkbConfig.m_enableXkbOptions ) {
-				if( !XKBExtension::setXkbOptions(m_kxkbConfig.m_options, m_kxkbConfig.m_resetOldOptions) ) {
-					kdDebug() << "Setting XKB options failed!" << endl;
-				}
+			if (!XKBExtension::setXkbOptions(m_kxkbConfig.getKXkbOptions())) {
+				kdDebug() << "Setting XKB options failed!" << endl;
 			}
 		}
 	}
@@ -991,7 +1335,7 @@ extern "C"
 
 //these seem to be new in XFree86 4.4.0
  I18N_NOOP("Shift with numpad keys works as in MS Windows.");
- I18N_NOOP("Special keys (Ctrl+Alt+<key>) handled in a server.");
+ I18N_NOOP("Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.");
  I18N_NOOP("Miscellaneous compatibility options");
  I18N_NOOP("Right Control key works as Right Alt");
 
diff --git a/kxkb/kcmlayout.h b/kxkb/kcmlayout.h
index 987fff2b0..db0f89690 100644
--- a/kxkb/kcmlayout.h
+++ b/kxkb/kcmlayout.h
@@ -16,7 +16,7 @@ class XkbRules;
 
 class LayoutConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   LayoutConfig(TQWidget *parent = 0L, const char *name = 0L);
@@ -27,23 +27,27 @@ public:
   void defaults();
   void initUI();
   virtual TQString handbookDocPath() const;
-  
+
 protected:
   TQString createOptionString();
   void updateIndicator(TQListViewItem* selLayout);
+  OptionListItem* itemForOption(TQString option);
 
 protected slots:
   void moveUp();
   void moveDown();
+  void hotkeyComboChanged();
   void variantChanged();
   void displayNameChanged(const TQString& name);
-  void latinChanged();
   void layoutSelChanged(TQListViewItem *);
   void loadRules();
   void updateLayoutCommand();
   void updateOptionsCommand();
+  void updateHotkeyCombo();
+  void updateHotkeyCombo(bool initial);
   void add();
   void remove();
+  void resolveConflicts(TQListViewItem *lvi);
 
   void changed();
 
@@ -53,10 +57,16 @@ private:
   XkbRules *m_rules;
   KxkbConfig m_kxkbConfig;
   TQDict<OptionListItem> m_optionGroups;
+  bool m_forceGrpOverwrite;
+  KKeyChooser *m_keyChooser;
+  TDEGlobalAccel *keys;
 
   TQWidget* makeOptionsTab();
+  TQWidget* makeShortcutsTab();
   void updateStickyLimit();
   static LayoutUnit getLayoutUnitKey(TQListViewItem *sel);
+  void checkConflicts(OptionListItem *current, TQStringList conflicting,
+                      TQStringList &conflicts);
 };
 
 
diff --git a/kxkb/kcmlayoutwidget.ui b/kxkb/kcmlayoutwidget.ui
index e8dcc3a9e..11d147211 100644
--- a/kxkb/kcmlayoutwidget.ui
+++ b/kxkb/kcmlayoutwidget.ui
@@ -76,7 +76,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>textLabel1_4</cstring>
                                 </property>
@@ -86,7 +86,7 @@
                             </widget>
                             <widget class="TQLabel" row="2" column="2" rowspan="1" colspan="3">
                                 <property name="name">
-                                    <cstring>textLabel1_4_2</cstring>
+                                    <cstring>labelLayouts</cstring>
                                 </property>
                                 <property name="text">
                                     <string>Active layouts:</string>
@@ -94,7 +94,7 @@
                             </widget>
                             <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="3">
                                 <property name="name">
-                                    <cstring>textLabel1_2</cstring>
+                                    <cstring>labelModel</cstring>
                                 </property>
                                 <property name="text">
                                     <string>Keyboard &amp;model:</string>
@@ -167,17 +167,6 @@
                                 </column>
                                 <column>
                                     <property name="text">
-                                        <string>5</string>
-                                    </property>
-                                    <property name="clickable">
-                                        <bool>false</bool>
-                                    </property>
-                                    <property name="resizable">
-                                        <bool>false</bool>
-                                    </property>
-                                </column>
-                                <column>
-                                    <property name="text">
                                         <string>Label</string>
                                     </property>
                                     <property name="clickable">
@@ -266,7 +255,7 @@
                                     <cstring>editCmdLine</cstring>
                                 </property>
                             </widget>
-                            <widget class="TQListView" row="3" column="0" rowspan="5" colspan="2">
+                            <widget class="TQListView" row="1" column="0" rowspan="6" colspan="2">
                                 <column>
                                     <property name="text">
                                         <string></string>
@@ -327,20 +316,6 @@
                                     <string>This is the command which is executed when switching to the selected layout. It may help you if you want to debug layout switching, or if you want to switch layouts without the help of TDE.</string>
                                 </property>
                             </widget>
-                            <widget class="TQCheckBox" row="7" column="2" rowspan="1" colspan="3">
-                                <property name="name">
-                                    <cstring>chkLatin</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>false</bool>
-                                </property>
-                                <property name="text">
-                                    <string>Include latin layout</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>If after you switch to this layout some keyboard shortcuts based on latin keys do not work try to enable this option.</string>
-                                </property>
-                            </widget>
                             <widget class="TQLabel" row="6" column="2">
                                 <property name="name">
                                     <cstring>textLabel1_6</cstring>
@@ -423,18 +398,259 @@
             </widget>
             <widget class="TQWidget">
                 <property name="name">
+                    <cstring>tabShortcuts</cstring>
+                </property>
+                <attribute name="title">
+                    <string>Keyboard Shortcuts</string>
+                </attribute>
+                <vbox>
+                    <widget class="TQLabel">
+                        <property name="name">
+                            <cstring>labelHotkey</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&lt;qt&gt;&lt;b&gt;Key combination to switch layout (X11):&lt;/b&gt;&lt;/qt&gt;</string>
+                        </property>
+                        <property name="buddy" stdset="0">
+                            <cstring>comboHotkey</cstring>
+                        </property>
+                    </widget>
+                    <widget class="TQComboBox">
+                        <property name="name">
+                            <cstring>comboHotkey</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>7</hsizetype>
+                                <vsizetype>0</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="whatsThis" stdset="0">
+                            <string>Here you can choose the key combination you want to use to switch to the next layout. This list includes only the most common variants. If you choose "Other...", then you will be redirected to the "Options" tab where you can pick from all the available variants. Note that if you have selected Append Mode in the Xkb Options tab this option is not available; you have to use the Xkb Options tab instead.</string>
+                        </property>
+                    </widget>
+                    <widget class="KSeparator">
+                        <property name="name">
+                            <cstring>switchingGrpSeparator</cstring>
+                        </property>
+                    </widget>
+                    <widget class="TQLabel">
+                        <property name="name">
+                            <cstring>labelHotkey</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&lt;qt&gt;&lt;b&gt;TDE shortcuts to switch layout:&lt;/b&gt;&lt;/qt&gt;</string>
+                        </property>
+                        <property name="buddy" stdset="0">
+                            <cstring>comboHotkey</cstring>
+                        </property>
+                    </widget>
+                </vbox>
+            </widget>
+            <widget class="TQWidget">
+                <property name="name">
                     <cstring>tab</cstring>
                 </property>
                 <attribute name="title">
                     <string>Switching Options</string>
                 </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="1" column="0">
+                <vbox>
+                    <widget class="TQFrame">
                         <property name="name">
-                            <cstring>spacer1</cstring>
+                            <cstring>swOptsFrame</cstring>
+                        </property>
+                        <property name="frameShape">
+                            <enum>StyledPanel</enum>
+                        </property>
+                        <property name="frameShadow">
+                            <enum>Raised</enum>
+                        </property>
+                        <property name="lineWidth">
+                            <number>0</number>
+                        </property>
+                        <vbox>
+                            <widget class="TQButtonGroup">
+                                <property name="name">
+                                    <cstring>grpSwitching</cstring>
+                                </property>
+                                <property name="title">
+                                    <string>Switching Policy</string>
+                                </property>
+                                <property name="exclusive">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>If you select "Application" or "Window" switching policy, changing the keyboard layout will only affect the current application or window.</string>
+                                </property>
+                                <vbox>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <widget class="TQRadioButton">
+                                        <property name="name">
+                                            <cstring>radioButton1</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>&amp;Global</string>
+                                        </property>
+                                        <property name="checked">
+                                            <bool>true</bool>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQRadioButton">
+                                        <property name="name">
+                                            <cstring>radioButton1_3</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Application</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQRadioButton">
+                                        <property name="name">
+                                            <cstring>radioButton1_2</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>&amp;Window</string>
+                                        </property>
+                                    </widget>
+                                </vbox>
+                            </widget>
+                            <widget class="TQGroupBox">
+                                <property name="name">
+                                    <cstring>grpBoxStickySwitching</cstring>
+                                </property>
+                                <property name="title">
+                                    <string>Sticky Switching</string>
+                                </property>
+                                <grid>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
+                                        <property name="name">
+                                            <cstring>chkEnableSticky</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Enable sticky switching</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>If you have more than two layouts and turn this option on, switching with the keyboard shortcut or clicking on the kxkb indicator will only cycle through the last few layouts. You can specify the number of layouts to rotate below. You can still access all layouts by right-clicking on the kxkb indicator.</string>
+                                        </property>
+                                    </widget>
+                                    <spacer row="1" column="0">
+                                        <property name="name">
+                                            <cstring>spacer2</cstring>
+                                        </property>
+                                        <property name="orientation">
+                                            <enum>Horizontal</enum>
+                                        </property>
+                                        <property name="sizeType">
+                                            <enum>Fixed</enum>
+                                        </property>
+                                        <property name="sizeHint">
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                    <spacer row="1" column="3">
+                                        <property name="name">
+                                            <cstring>spacer2</cstring>
+                                        </property>
+                                        <property name="orientation">
+                                            <enum>Horizontal</enum>
+                                        </property>
+                                        <property name="sizeType">
+                                            <enum>Expanding</enum>
+                                        </property>
+                                        <property name="sizeHint">
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                    <widget class="TQLabel" row="1" column="1">
+                                        <property name="name">
+                                            <cstring>textLabel1_5</cstring>
+                                        </property>
+                                        <property name="enabled">
+                                            <bool>false</bool>
+                                        </property>
+                                        <property name="text">
+                                            <string>Number of layouts to rotate:</string>
+                                        </property>
+                                        <property name="buddy" stdset="0">
+                                            <cstring>spinBox1</cstring>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQSpinBox" row="1" column="2">
+                                        <property name="name">
+                                            <cstring>spinStickyDepth</cstring>
+                                        </property>
+                                        <property name="enabled">
+                                            <bool>false</bool>
+                                        </property>
+                                        <property name="maxValue">
+                                            <number>10</number>
+                                        </property>
+                                        <property name="minValue">
+                                            <number>2</number>
+                                        </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>5</hsizetype>
+                                                <vsizetype>0</vsizetype>
+                                                <horstretch>0</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
+                                        </property>
+                                    </widget>
+                                </grid>
+                            </widget>
+                            <widget class="TQGroupBox">
+                                <property name="name">
+                                    <cstring>grpBoxNotifications</cstring>
+                                </property>
+                                <property name="title">
+                                    <string>Notifications</string>
+                                </property>
+                                <vbox>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <widget class="TQCheckBox">
+                                        <property name="name">
+                                            <cstring>chkEnableNotify</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Enable keyboard layout notification</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>If this option is enabled, a little notification will pop up on the screen displaying the name of the currently selected layout whenever it changes.</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQCheckBox">
+                                        <property name="name">
+                                            <cstring>chkNotifyUseKMilo</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Use KMilo for notifications, if available</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>If this option is enabled and KMilo is available, it will be used to display the notifications instead of the standard notification system. If KMilo is not available, notifications will be showed via the standard TDE notification system.</string>
+                                        </property>
+                                    </widget>
+                                </vbox>
+                            </widget>
+                        </vbox>
+                    </widget>
+                    <spacer>
+                        <property name="name">
+                            <cstring>spacer2</cstring>
                         </property>
                         <property name="orientation">
                             <enum>Vertical</enum>
@@ -449,9 +665,19 @@
                             </size>
                         </property>
                     </spacer>
-                    <widget class="TQFrame" row="0" column="0">
+                </vbox>
+            </widget>
+            <widget class="TQWidget">
+                <property name="name">
+                    <cstring>tab</cstring>
+                </property>
+                <attribute name="title">
+                    <string>Indicator Options</string>
+                </attribute>
+                <vbox>
+                    <widget class="TQFrame">
                         <property name="name">
-                            <cstring>optionsFrame</cstring>
+                            <cstring>indOptsFrame</cstring>
                         </property>
                         <property name="frameShape">
                             <enum>StyledPanel</enum>
@@ -463,10 +689,7 @@
                             <number>0</number>
                         </property>
                         <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="TQButtonGroup" row="1" column="0">
+                            <widget class="TQButtonGroup" row="0" column="0">
                                 <property name="name">
                                     <cstring>grpStyle</cstring>
                                 </property>
@@ -512,7 +735,7 @@
                                     </widget>
                                 </vbox>
                             </widget>
-                            <widget class="TQButtonGroup" row="1" column="1">
+                            <widget class="TQButtonGroup" row="1" column="0" colspan="2">
                                 <property name="name">
                                     <cstring>grpLabel</cstring>
                                 </property>
@@ -556,6 +779,9 @@
                                             <enum>Plain</enum>
                                         </property>
                                         <grid>
+                                            <property name="margin">
+                                                <number>0</number>
+                                            </property>
                                             <spacer row="0" column="0">
                                                 <property name="name">
                                                     <cstring>spacer2</cstring>
@@ -591,7 +817,32 @@
                                                 <property name="whatsThis" stdset="0">
                                                     <string>This color will be used as the indicator's background unless the indicator was set to display a flag.</string>
                                                 </property>
+                                                <property name="sizePolicy">
+                                                    <sizepolicy>
+                                                        <hsizetype>4</hsizetype>
+                                                        <vsizetype>0</vsizetype>
+                                                        <horstretch>0</horstretch>
+                                                        <verstretch>0</verstretch>
+                                                    </sizepolicy>
+                                                </property>
                                             </widget>
+                                            <spacer row="0" column="3">
+                                                <property name="name">
+                                                    <cstring>spacer23</cstring>
+                                                </property>
+                                                <property name="orientation">
+                                                    <enum>Horizontal</enum>
+                                                </property>
+                                                <property name="sizeType">
+                                                    <enum>Expanding</enum>
+                                                </property>
+                                                <property name="sizeHint">
+                                                    <size>
+                                                        <width>20</width>
+                                                        <height>20</height>
+                                                    </size>
+                                                </property>
+                                            </spacer>
                                             <spacer row="1" column="0">
                                                 <property name="name">
                                                     <cstring>spacer2</cstring>
@@ -624,29 +875,71 @@
                                                 <property name="name">
                                                     <cstring>fgColor</cstring>
                                                 </property>
-                                              <property name="whatsThis" stdset="0">
-                                                  <string>This color will be used to draw the language label on the indicator.</string>
-                                              </property>
+                                                <property name="whatsThis" stdset="0">
+                                                    <string>This color will be used to draw the language label on the indicator.</string>
+                                                </property>
+                                                <property name="sizePolicy">
+                                                    <sizepolicy>
+                                                        <hsizetype>4</hsizetype>
+                                                        <vsizetype>0</vsizetype>
+                                                        <horstretch>0</horstretch>
+                                                        <verstretch>0</verstretch>
+                                                    </sizepolicy>
+                                                </property>
+                                            </widget>
+                                            <spacer row="1" column="3">
+                                                <property name="name">
+                                                    <cstring>spacer23</cstring>
+                                                </property>
+                                                <property name="orientation">
+                                                    <enum>Horizontal</enum>
+                                                </property>
+                                                <property name="sizeType">
+                                                    <enum>Expanding</enum>
+                                                </property>
+                                                <property name="sizeHint">
+                                                    <size>
+                                                        <width>20</width>
+                                                        <height>20</height>
+                                                    </size>
+                                                </property>
+                                            </spacer>
+                                            <spacer row="4" column="0">
+                                                <property name="name">
+                                                    <cstring>spacer22</cstring>
+                                                </property>
+                                                <property name="orientation">
+                                                    <enum>Horizontal</enum>
+                                                </property>
+                                                <property name="sizeType">
+                                                    <enum>Fixed</enum>
+                                                </property>
+                                                <property name="sizeHint">
+                                                    <size>
+                                                        <width>20</width>
+                                                        <height>20</height>
+                                                    </size>
+                                                </property>
+                                            </spacer>
+                                            <widget class="TQCheckBox" row="4" column="1" rowspan="1" colspan="3">
+                                                <property name="name">
+                                                    <cstring>chkBgTransparent</cstring>
+                                                </property>
+                                                <property name="text">
+                                                    <string>Transparent background</string>
+                                                </property>
+                                                <property name="whatsThis" stdset="0">
+                                                    <string>Check this to remove the indicator's background. Only applicable in "Label only" mode.</string>
+                                                </property>
                                             </widget>
                                         </grid>
                                     </widget>
-                                    <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3">
-                                        <property name="name">
-                                            <cstring>chkBgTransparent</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Transparent background</string>
-                                        </property>
-                                        <property name="whatsThis" stdset="0">
-                                            <string>Check this to remove the indicator's background. Only applicable in "Label only" mode.</string>
-                                        </property>
-                                    </widget>
                                     <widget class="KSeparator" row="5" column="0" rowspan="1" colspan="3">
                                         <property name="name">
                                             <cstring>separator1</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="TQLabel" row="6" column="0" rowspan="1">
+                                    <widget class="TQLabel" row="6" column="0">
                                         <property name="name">
                                             <cstring>labelFontRequester</cstring>
                                         </property>
@@ -657,12 +950,12 @@
                                             <string>This is the font which will be used by the layout indicator to draw the label.</string>
                                         </property>
                                     </widget>
-                                    <widget class="TDEFontRequester" row="6" column="2">
+                                    <widget class="TDEFontRequester" row="6" column="1" colspan="2">
                                         <property name="name">
                                             <cstring>labelFont</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="2">
+                                    <widget class="TQCheckBox" row="7" column="0">
                                         <property name="name">
                                             <cstring>chkLabelShadow</cstring>
                                         </property>
@@ -672,8 +965,16 @@
                                         <property name="whatsThis" stdset="0">
                                             <string>Draw a drop shadow behind the language label. In some cases this option can improve readability.</string>
                                         </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>4</hsizetype>
+                                                <vsizetype>0</vsizetype>
+                                                <horstretch>0</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
+                                        </property>
                                     </widget>
-                                    <widget class="KColorButton" row="7" column="2">
+                                    <widget class="KColorButton" row="7" column="1">
                                         <property name="name">
                                             <cstring>shColor</cstring>
                                         </property>
@@ -683,86 +984,23 @@
                                         <property name="enabled">
                                             <bool>false</bool>
                                         </property>
-                                    </widget>
-                                </grid>
-                            </widget>
-                            <widget class="TQButtonGroup" row="2" column="0">
-                                <property name="name">
-                                    <cstring>grpSwitching</cstring>
-                                </property>
-                                <property name="title">
-                                    <string>Switching Policy</string>
-                                </property>
-                                <property name="exclusive">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>If you select "Application" or "Window" switching policy, changing the keyboard layout will only affect the current application or window.</string>
-                                </property>
-                                <vbox>
-                                    <property name="name">
-                                        <cstring>unnamed</cstring>
-                                    </property>
-                                    <widget class="TQRadioButton">
-                                        <property name="name">
-                                            <cstring>radioButton1</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>&amp;Global</string>
-                                        </property>
-                                        <property name="checked">
-                                            <bool>true</bool>
-                                        </property>
-                                    </widget>
-                                    <widget class="TQRadioButton">
-                                        <property name="name">
-                                            <cstring>radioButton1_3</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Application</string>
-                                        </property>
-                                    </widget>
-                                    <widget class="TQRadioButton">
-                                        <property name="name">
-                                            <cstring>radioButton1_2</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>&amp;Window</string>
-                                        </property>
-                                    </widget>
-                                </vbox>
-                            </widget>
-                            <widget class="TQGroupBox" row="2" column="1">
-                                <property name="name">
-                                    <cstring>grpBoxStickySwitching</cstring>
-                                </property>
-                                <property name="title">
-                                    <string>Sticky Switching</string>
-                                </property>
-                                <grid>
-                                    <property name="name">
-                                        <cstring>unnamed</cstring>
-                                    </property>
-                                    <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
-                                        <property name="name">
-                                            <cstring>chkEnableSticky</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Enable sticky switching</string>
-                                        </property>
-                                        <property name="whatsThis" stdset="0">
-                                            <string>If you have more than two layouts and turn this option on, switching with the keyboard shortcut or clicking on the kxkb indicator will only cycle through the last few layouts. You can specify the number of layouts to rotate below. You can still access all layouts by right-clicking on the kxkb indicator.</string>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>4</hsizetype>
+                                                <vsizetype>0</vsizetype>
+                                                <horstretch>0</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
                                         </property>
-                                    </widget>
-                                    <spacer row="1" column="0">
+                                    </widget>                                           <spacer row="7" column="2">
                                         <property name="name">
-                                            <cstring>spacer2</cstring>
+                                            <cstring>spacer23</cstring>
                                         </property>
                                         <property name="orientation">
                                             <enum>Horizontal</enum>
                                         </property>
                                         <property name="sizeType">
-                                            <enum>Fixed</enum>
+                                            <enum>Expanding</enum>
                                         </property>
                                         <property name="sizeHint">
                                             <size>
@@ -771,55 +1009,46 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="TQLabel" row="1" column="1">
-                                        <property name="name">
-                                            <cstring>textLabel1_5</cstring>
-                                        </property>
-                                        <property name="enabled">
-                                            <bool>false</bool>
-                                        </property>
-                                        <property name="text">
-                                            <string>Number of layouts to rotate:</string>
-                                        </property>
-                                        <property name="buddy" stdset="0">
-                                            <cstring>spinBox1</cstring>
-                                        </property>
-                                    </widget>
-                                    <widget class="TQSpinBox" row="1" column="2">
-                                        <property name="name">
-                                            <cstring>spinStickyDepth</cstring>
-                                        </property>
-                                        <property name="enabled">
-                                            <bool>false</bool>
-                                        </property>
-                                        <property name="maxValue">
-                                            <number>10</number>
-                                        </property>
-                                        <property name="minValue">
-                                            <number>2</number>
-                                        </property>
-                                        <property name="sizePolicy">
-                                            <sizepolicy>
-                                                <hsizetype>7</hsizetype>
-                                                <vsizetype>0</vsizetype>
-                                                <horstretch>0</horstretch>
-                                                <verstretch>0</verstretch>
-                                            </sizepolicy>
-                                        </property>
-                                    </widget>
                                 </grid>
                             </widget>
-                            <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
+                            <widget class="TQButtonGroup" row="0" column="1">
                                 <property name="name">
-                                    <cstring>chkShowSingle</cstring>
+                                    <cstring>grpMisc</cstring>
                                 </property>
-                                <property name="text">
-                                    <string>Show indicator for single layout</string>
+                                <property name="title">
+                                    <string>Miscellaneous</string>
                                 </property>
+                                <vbox>
+                                    <widget class="TQCheckBox">
+                                        <property name="name">
+                                            <cstring>chkShowSingle</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Show indicator for single layout</string>
+                                        </property>
+                                    </widget>
+                                </vbox>
                             </widget>
                         </grid>
                     </widget>
-                </grid>
+                    <spacer>
+                        <property name="name">
+                            <cstring>spacer1</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>20</width>
+                                <height>40</height>
+                            </size>
+                        </property>
+                    </spacer>
+                </vbox>
             </widget>
             <widget class="TQWidget">
                 <property name="name">
@@ -832,17 +1061,6 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="TQCheckBox">
-                        <property name="name">
-                            <cstring>chkEnableOptions</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Enable xkb options</string>
-                        </property>
-                        <property name="checked">
-                            <bool>true</bool>
-                        </property>
-                    </widget>
                     <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox3_2</cstring>
@@ -857,15 +1075,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>checkResetOld</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;Reset old options</string>
-                                </property>
-                            </widget>
-                            <widget class="TQLabel" row="2" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>textLabel1_3_2</cstring>
                                 </property>
@@ -873,7 +1083,7 @@
                                     <string>Command:</string>
                                 </property>
                             </widget>
-                            <widget class="TQLineEdit" row="2" column="1">
+                            <widget class="TQLineEdit" row="1" column="1">
                                 <property name="name">
                                     <cstring>editCmdLineOpt</cstring>
                                 </property>
@@ -881,7 +1091,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="TQListView" row="1" column="0" rowspan="1" colspan="2">
+                            <widget class="TQListView" row="0" column="0" rowspan="1" colspan="2">
                                 <column>
                                     <property name="text">
                                         <string>Options</string>
@@ -899,6 +1109,41 @@
                             </widget>
                         </grid>
                     </widget>
+                    <widget class="TQButtonGroup">
+                        <property name="name">
+                            <cstring>xkbOptsMode</cstring>
+                        </property>
+                        <property name="title">
+                            <string>Options Mode</string>
+                        </property>
+                        <property name="whatsThis" stdset="0">
+                            <string>Here you can choose how the options you select here will be applied: in addition to, or instead of existing options.</string>
+                        </property>
+                        <vbox>
+                            <widget class="TQRadioButton">
+                                <property name="name">
+                                    <cstring>radXkbOverwrite</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Overwrite existing options (recommended)</string>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Overwrite any existing Xkb options that might have been previously set by another program or from a script (e.g. via setxkbmap). This is the recommended option.</string>
+                                </property>
+                            </widget>
+                            <widget class="TQRadioButton">
+                                <property name="name">
+                                    <cstring>radXkbAppend</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Append to existing options</string>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Append the selected options to any existing Xkb options that might have been previously set by another program or from a script (e.g. via setxkbmap). Only use this if you really need to.</string>
+                                </property>
+                            </widget>
+                        </vbox>
+                    </widget>
                 </vbox>
             </widget>
         </widget>
@@ -912,9 +1157,15 @@
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
-        <sender>chkEnableOptions</sender>
+        <sender>chkEnable</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>swOptsFrame</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>chkEnable</sender>
         <signal>toggled(bool)</signal>
-        <receiver>groupBox3_2</receiver>
+        <receiver>indOptsFrame</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
@@ -942,12 +1193,6 @@
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
-        <sender>chkEnable</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>optionsFrame</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
         <sender>radFlagOnly</sender>
         <signal>toggled(bool)</signal>
         <receiver>grpLabel</receiver>
@@ -983,6 +1228,12 @@
         <receiver>labelBgColor</receiver>
         <slot>setDisabled(bool)</slot>
     </connection>
+    <connection>
+        <sender>chkEnableNotify</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>chkNotifyUseKMilo</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">kiconloader.h</include>
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
index 358d10450..c23b3cf6c 100644
--- a/kxkb/kcmmisc.cpp
+++ b/kxkb/kcmmisc.cpp
@@ -48,6 +48,7 @@
 
 #include "kcmmisc.h"
 #include "kcmmiscwidget.h"
+#include "x11helper.h"
 #include <X11/Xlib.h>
 
 KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *)
@@ -71,14 +72,14 @@ KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *)
   ui->rateSlider->setSteps(50, 500);
   ui->rateSlider->setTickInterval(500);
 
-  connect(ui->repeatBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-  connect(ui->delay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(delaySpinboxChanged(int)));
-  connect(ui->delaySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(delaySliderChanged(int)));
-  connect(ui->rate, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(rateSpinboxChanged(double)));
-  connect(ui->rateSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rateSliderChanged(int)));
+  connect(ui->repeatBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+  connect(ui->delay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(delaySpinboxChanged(int)));
+  connect(ui->delaySlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(delaySliderChanged(int)));
+  connect(ui->rate, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(rateSpinboxChanged(double)));
+  connect(ui->rateSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rateSliderChanged(int)));
 
-  connect(ui->click, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-  connect(ui->numlockGroup, TQT_SIGNAL(released(int)), this, TQT_SLOT(changed()));
+  connect(ui->click, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+  connect(ui->numlockGroup, TQ_SIGNAL(released(int)), this, TQ_SLOT(changed()));
 
 #if !defined(HAVE_XTEST) && !defined(HAVE_XKB)
   ui->numlockGroup->setDisabled( true );
diff --git a/kxkb/kcmmisc.h b/kxkb/kcmmisc.h
index d57714295..db4dad84d 100644
--- a/kxkb/kcmmisc.h
+++ b/kxkb/kcmmisc.h
@@ -32,7 +32,7 @@ class KeyboardConfigWidget;
 
 class KeyboardConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KeyboardConfig( TQWidget *parent=0, const char* name=0);
 
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp
index 6a37dbf3a..34ed19334 100644
--- a/kxkb/kxkb.cpp
+++ b/kxkb/kxkb.cpp
@@ -47,6 +47,9 @@ DESCRIPTION
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
+#include <knotifyclient.h>
+#include <dcopclient.h>
+#include <dcopref.h>
 
 #include "x11helper.h"
 #include "kxkb.h"
@@ -63,59 +66,52 @@ KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled)
     m_prevWinId(X11Helper::UNKNOWN_WINDOW_ID),
     m_rules(NULL),
     m_tray(NULL),
-    kWinModule(NULL),
-    m_forceSetXKBMap( false )
+    kWinModule(NULL)
 {
+    X11Helper::initializeTranslations();
 	m_extension = new XKBExtension();
     if( !m_extension->init() ) {
 		kdDebug() << "xkb initialization failed, exiting..." << endl;
 		::exit(1);
     }
-	
-    // keep in sync with kcmlayout.cpp
-    keys = new TDEGlobalAccel(TQT_TQOBJECT(this));
-#include "kxkbbindings.cpp"
-    keys->updateConnections();
+    connect(m_extension, TQ_SIGNAL(groupChanged(uint)), this, TQ_SLOT(slotGroupChanged(uint)));
 
 	m_layoutOwnerMap = new LayoutMap(kxkbConfig);
 
-    connect( this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)) );
+	// keep in sync with kcmlayout.cpp
+	keys = new TDEGlobalAccel(this);
+#include "kxkbbindings.cpp"
+
+    connect( this, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)) );
     addKipcEventMask( KIPC::SettingsChanged );
 }
 
 
 KXKBApp::~KXKBApp()
 {
-//    deletePrecompiledLayouts();
-
-    delete keys;
-    delete m_tray;
-    delete m_rules;
-    delete m_extension;
+	delete m_tray;
+	delete m_rules;
+	delete m_extension;
 	delete m_layoutOwnerMap;
 	delete kWinModule;
+	delete keys;
 }
 
 int KXKBApp::newInstance()
 {
-	m_extension->reset();
-	
-    if( settingsRead() )
-		layoutApply();
-	
+    if (settingsRead()) {
+        layoutApply();
+    }
+
     return 0;
 }
 
 bool KXKBApp::settingsRead()
 {
-	kxkbConfig.load( KxkbConfig::LOAD_ACTIVE_OPTIONS );
-
-    if( kxkbConfig.m_enableXkbOptions ) {
-		kdDebug() << "Setting XKB options " << kxkbConfig.m_options << endl;
-		if( !m_extension->setXkbOptions(kxkbConfig.m_options, kxkbConfig.m_resetOldOptions) ) {
-            kdDebug() << "Setting XKB options failed!" << endl;
-        }
-    }
+	XkbOptions options = kxkbConfig.getKXkbOptions();
+	if( !m_extension->setXkbOptions(options) ) {
+		kdDebug() << "Setting XKB options failed!" << endl;
+	}
 
     if ( kxkbConfig.m_useKxkb == false ) {
         kapp->quit();
@@ -137,7 +133,7 @@ bool KXKBApp::settingsRead()
 		
 		if( kWinModule == NULL ) {
 			kWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP);
-			connect(kWinModule, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(windowChanged(WId)));
+			connect(kWinModule, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(windowChanged(WId)));
 		}
 		m_prevWinId = kWinModule->activeWindow();
 		kdDebug() << "Active window " << m_prevWinId << endl;
@@ -151,32 +147,15 @@ bool KXKBApp::settingsRead()
 	
 	for(int ii=0; ii<(int)kxkbConfig.m_layouts.count(); ii++) {
 		LayoutUnit& layoutUnit = kxkbConfig.m_layouts[ii];
-		layoutUnit.defaultGroup = m_rules->getDefaultGroup(layoutUnit.layout, layoutUnit.includeGroup);
-		kdDebug() << "default group for " << layoutUnit.toPair() << " is " << layoutUnit.defaultGroup << endl;
 	}
 	
-	m_currentLayout = kxkbConfig.getDefaultLayout();
-	
-	if( kxkbConfig.m_layouts.count() == 1 ) {
-		TQString layoutName = m_currentLayout.layout;
-		TQString variantName = m_currentLayout.variant;
-		TQString includeName = m_currentLayout.includeGroup;
-		int group = m_currentLayout.defaultGroup;
-		
-		if( !m_extension->setLayout(kxkbConfig.m_model, layoutName, variantName, includeName, false) 
-				   || !m_extension->setGroup( group ) ) {
-			kdDebug() << "Error switching to single layout " << m_currentLayout.toPair() << endl;
-			// TODO: alert user
-		}
+	m_currentLayout = kxkbConfig.m_layouts[0];
+	kdDebug() << "default layout is " << m_currentLayout.toPair() << endl;
 	
-		if( kxkbConfig.m_showSingle == false ) {
-			kapp->quit();
-			return false;
-		}
+	if( kxkbConfig.m_layouts.count() == 1 && !kxkbConfig.m_showSingle) {
+		kapp->quit();
+		return false;
  	}
-	else {
-//		initPrecompiledLayouts();
-	}
 
 	initTray();
 	
@@ -196,8 +175,8 @@ void KXKBApp::initTray()
 	//	popupMenu->insertTitle( kapp->miniIcon(), kapp->caption() );
 
 		m_tray = new KxkbLabelController(sysTray, popupMenu);
- 		connect(popupMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuActivated(int)));
-		connect(sysTray, TQT_SIGNAL(toggled()), this, TQT_SLOT(toggled()));
+ 		connect(popupMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuActivated(int)));
+		connect(sysTray, TQ_SIGNAL(toggled()), this, TQ_SLOT(nextLayout()));
 	}
 	
 	m_tray->setShowFlag(kxkbConfig.m_showFlag);
@@ -223,40 +202,57 @@ bool KXKBApp::setLayout(const TQString& layoutPair)
 	return false;
 }
 
-
 // Activates the keyboard layout specified by 'layoutUnit'
-bool KXKBApp::setLayout(const LayoutUnit& layoutUnit, int group)
+bool KXKBApp::setLayout(const LayoutUnit& layoutUnit)
 {
-	bool res = false;
-
-	if( group == -1 )
-		group = layoutUnit.defaultGroup;
-	
-	res = m_extension->setLayout(kxkbConfig.m_model, 
- 					layoutUnit.layout, layoutUnit.variant, 
- 					layoutUnit.includeGroup);
-	if( res )
-		m_extension->setGroup(group); // not checking for ret - not important
-	
-    if( res )
-        m_currentLayout = layoutUnit;
+	uint group = kxkbConfig.m_layouts.findIndex(layoutUnit);
+	bool res = m_extension->setGroup(group);
+	if (res) {
+		m_currentLayout = layoutUnit;
+		maybeShowLayoutNotification();
+	}
 
-    if (m_tray) {
-		if( res )
+	if (m_tray) {
+		if (res) {
 			m_tray->setCurrentLayout(layoutUnit);
-		else  
+		} else {
 			m_tray->setError(layoutUnit.toPair());
+		}
 	}
 
-    return res;
+	return res;
 }
+// Activates the keyboard layout specified by group number
+bool KXKBApp::setLayout(const uint group)
+{
+	bool res = m_extension->setGroup(group);
+	if (res) {
+		m_currentLayout = kxkbConfig.m_layouts[group];
+	}
 
-void KXKBApp::toggled()
+	if (m_tray) {
+		if (res)
+			m_tray->setCurrentLayout(m_currentLayout);
+		else
+			m_tray->setError(m_currentLayout.toPair());
+	}
+
+	return res;
+}
+
+
+void KXKBApp::nextLayout()
 {
 	const LayoutUnit& layout = m_layoutOwnerMap->getNextLayout().layoutUnit;
 	setLayout(layout);
 }
 
+void KXKBApp::prevLayout()
+{
+	const LayoutUnit& layout = m_layoutOwnerMap->getPrevLayout().layoutUnit;
+	setLayout(layout);
+}
+
 void KXKBApp::menuActivated(int id)
 {
 	if( KxkbLabelController::START_MENU_ID <= id 
@@ -282,6 +278,54 @@ void KXKBApp::menuActivated(int id)
 //	}
 }
 
+void KXKBApp::slotGroupChanged(uint group)
+{
+	if (group >= kxkbConfig.m_layouts.count())
+	{
+		group = 0;
+	}
+	m_currentLayout = kxkbConfig.m_layouts[group];
+	m_tray->setCurrentLayout(m_currentLayout);
+	maybeShowLayoutNotification();
+}
+
+void KXKBApp::maybeShowLayoutNotification() {
+	if (!kxkbConfig.m_enableNotify) return;
+
+	TQString layoutName(m_rules->getLayoutName(m_currentLayout));
+	bool useKMilo = kxkbConfig.m_notifyUseKMilo;
+	bool notificationSent = false;
+
+	// Query KDED whether KMiloD is loaded
+	if (useKMilo) {
+		QCStringList modules;
+		TQCString replyType;
+		TQByteArray replyData;
+		if (kapp->dcopClient()->call("kded", "kded", "loadedModules()",
+			TQByteArray(), replyType, replyData))
+		{
+			if (replyType == "QCStringList") {
+				TQDataStream reply(replyData, IO_ReadOnly);
+				reply >> modules;
+
+				if (!modules.contains("kmilod")) {
+					useKMilo = false;
+				}
+			}
+		}
+	}
+
+	if (useKMilo) {
+		DCOPRef kmilo("kded", "kmilod");
+		if (kmilo.send("displayText(TQString,TQPixmap)", layoutName, kapp->miniIcon()))
+			notificationSent = true;
+	}
+
+	if (!notificationSent) {
+		KNotifyClient::event(m_tray->winId(), "LayoutChange", layoutName);
+	}
+}
+
 // TODO: we also have to handle deleted windows
 void KXKBApp::windowChanged(WId winId)
 {
@@ -291,15 +335,11 @@ void KXKBApp::windowChanged(WId winId)
 		return;
 	}
 
-	int group = m_extension->getGroup();
-
 	kdDebug() << "old WinId: " << m_prevWinId << ", new WinId: " << winId << endl;
 	
-	if( m_prevWinId != X11Helper::UNKNOWN_WINDOW_ID ) {	// saving layout/group from previous window
-// 		kdDebug() << "storing " << m_currentLayout.toPair() << ":" << group << " for " << m_prevWinId << endl;
+	if( m_prevWinId != X11Helper::UNKNOWN_WINDOW_ID ) {	// saving layout from previous window
 // 		m_layoutOwnerMap->setCurrentWindow(m_prevWinId);
 		m_layoutOwnerMap->setCurrentLayout(m_currentLayout);
-		m_layoutOwnerMap->setCurrentGroup(group);
 	}
  
 	m_prevWinId = winId;
@@ -309,11 +349,8 @@ void KXKBApp::windowChanged(WId winId)
 		const LayoutState& layoutState = m_layoutOwnerMap->getCurrentLayout();
 		
 		if( layoutState.layoutUnit != m_currentLayout ) {
-			kdDebug() << "switching to " << layoutState.layoutUnit.toPair() << ":" << group << " for "  << winId << endl;
-			setLayout( layoutState.layoutUnit, layoutState.group );
-		}
-		else if( layoutState.group != group ) {	// we need to change only the group
-			m_extension->setGroup(layoutState.group);
+			kdDebug() << "switching to " << layoutState.layoutUnit.toPair() << " for "  << winId << endl;
+			setLayout(layoutState.layoutUnit);
 		}
 	}
 }
@@ -321,56 +358,20 @@ void KXKBApp::windowChanged(WId winId)
 
 void KXKBApp::slotSettingsChanged(int category)
 {
-    if ( category != TDEApplication::SETTINGS_SHORTCUTS)
-		return;
-
-    TDEGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
-    keys->readSettings();
-    keys->updateConnections();
+	if (category == TDEApplication::SETTINGS_SHORTCUTS) {
+		TDEGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
+		keys->readSettings();
+		keys->updateConnections();
+    }
 }
 
-/*
- Viki (onscreen keyboard) has problems determining some modifiers states
- when kxkb uses precompiled layouts instead of setxkbmap. Probably a bug
- in the xkb functions used for the precompiled layouts *shrug*.
-*/
-void KXKBApp::forceSetXKBMap( bool set )
-{
-    if( m_forceSetXKBMap == set )
-        return;
-    m_forceSetXKBMap = set;
-    layoutApply();
+bool KXKBApp::x11EventFilter(XEvent *e) {
+    // let the extension process the event and emit signals if necessary
+    m_extension->processXEvent(e);
+    return TDEApplication::x11EventFilter(e);
 }
 
-/*Precompiles the keyboard layouts for faster activation later.
-This is done by loading each one of them and then dumping the compiled
-map from the X server into our local buffer.*/
-// void KXKBApp::initPrecompiledLayouts()
-// {
-//     TQStringList dirs = TDEGlobal::dirs()->findDirs ( "tmp", "" );
-//     TQString tempDir = dirs.count() == 0 ? "/tmp/" : dirs[0]; 
-// 
-// 	TQValueList<LayoutUnit>::ConstIterator end = kxkbConfig.m_layouts.end();
-// 
-// 	for (TQValueList<LayoutUnit>::ConstIterator it = kxkbConfig.m_layouts.begin(); it != end; ++it)
-//     {
-// 		LayoutUnit layoutUnit(*it);
-// //	const char* baseGr = m_includes[layout]; 
-// //	int group = m_rules->getGroup(layout, baseGr);
-// //    	if( m_extension->setLayout(m_model, layout, m_variants[layout], group, baseGr) ) {
-// 		TQString compiledLayoutFileName = tempDir + layoutUnit.layout + "." + layoutUnit.variant + ".xkm";
-// //    	    if( m_extension->getCompiledLayout(compiledLayoutFileName) )
-// 		m_compiledLayoutFileNames[layoutUnit.toPair()] = compiledLayoutFileName;
-// //	}
-// //	else {
-// //    	    kdDebug() << "Error precompiling layout " << layout << endl;
-// //	}
-//     }
-// }
-
-
-const char * DESCRIPTION =
-  I18N_NOOP("A utility to switch keyboard maps");
+const char *DESCRIPTION = I18N_NOOP("A utility to switch keyboard maps");
 
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
diff --git a/kxkb/kxkb.h b/kxkb/kxkb.h
index 18949ba75..ddde9a6c4 100644
--- a/kxkb/kxkb.h
+++ b/kxkb/kxkb.h
@@ -49,44 +49,50 @@ class LayoutMap;
 
 class KXKBApp : public KUniqueApplication
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 public:
-	KXKBApp(bool allowStyles=true, bool GUIenabled=true);
-	~KXKBApp();
+    KXKBApp(bool allowStyles=true, bool GUIenabled=true);
+    ~KXKBApp();
 
-	virtual int newInstance();
+    virtual int newInstance();
 
-	bool setLayout(const LayoutUnit& layoutUnit, int group=-1);
+    bool setLayout(const LayoutUnit& layoutUnit);
+    bool setLayout(const uint group);
 k_dcop:
-	bool setLayout(const TQString& layoutPair);
-	TQString getCurrentLayout() { return m_currentLayout.toPair(); }
-	TQStringList getLayoutsList() { return kxkbConfig.getLayoutStringList(); }
-	void forceSetXKBMap( bool set );
+    bool setLayout(const TQString& layoutPair);
+    TQString getCurrentLayout() { return m_currentLayout.toPair(); }
+    TQStringList getLayoutsList() { return kxkbConfig.getLayoutStringList(); }
+
+public slots:
+    void nextLayout();
+    void prevLayout();
 
 protected slots:
     void menuActivated(int id);
-    void toggled();
     void windowChanged(WId winId);
+    void layoutApply();
+    void slotGroupChanged(uint group);
 
     void slotSettingsChanged(int category);
+    void maybeShowLayoutNotification();
 
 protected:
     // Read settings, and apply them.
     bool settingsRead();
-    void layoutApply();
-    
+
 private:
-	void initTray();
+    void initTray();
+    bool x11EventFilter(XEvent *e);
 
 private:
-	KxkbConfig kxkbConfig;
+    KxkbConfig kxkbConfig;
 
     WId m_prevWinId;	// for tricky part of saving xkb group
     LayoutMap* m_layoutOwnerMap;
 
-	LayoutUnit m_currentLayout;
+    LayoutUnit m_currentLayout;
 
     XKBExtension *m_extension;
     XkbRules *m_rules;
diff --git a/kxkb/kxkbbindings.cpp b/kxkb/kxkbbindings.cpp
index fad480f7c..02da8a4ea 100644
--- a/kxkb/kxkbbindings.cpp
+++ b/kxkb/kxkbbindings.cpp
@@ -1,12 +1,13 @@
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
 #else
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4 )
+   keys->insert( name, i18n(name), TQString(), key3, key4, 0, 0 )
 #endif
 
-	keys->insert( "Program:kxkb", i18n("Keyboard") );
-	DEF( I18N_NOOP("Switch to Next Keyboard Layout"), ALT+CTRL+Qt::Key_K, KKey::QtWIN+CTRL+Qt::Key_K, toggled() );
+    keys->insert( "Program:kxkb", i18n("Keyboard") );
+    DEF( I18N_NOOP("Switch to Next Keyboard Layout"), TDEShortcut(), TDEShortcut(), nextLayout() );
+    DEF( I18N_NOOP("Switch to Previous Keyboard Layout"), TDEShortcut(), TDEShortcut(), prevLayout() );
 
-#undef DEF
+#undef DEF
\ No newline at end of file
diff --git a/kxkb/kxkbconfig.cpp b/kxkb/kxkbconfig.cpp
index 8e6890161..0c3dc9e0a 100644
--- a/kxkb/kxkbconfig.cpp
+++ b/kxkb/kxkbconfig.cpp
@@ -30,27 +30,14 @@ static const char* switchModes[SWITCH_POLICY_COUNT] = {
 const LayoutUnit DEFAULT_LAYOUT_UNIT = LayoutUnit("us", "");
 const char* DEFAULT_MODEL = "pc104";
 
-LayoutUnit KxkbConfig::getDefaultLayout()
-{
-	if( m_layouts.size() == 0 )
-		return DEFAULT_LAYOUT_UNIT;
-
-	return m_layouts[0];
-}
-
 bool KxkbConfig::load(int loadMode)
 {
 	TDEConfig *config = new TDEConfig("kxkbrc", true, false);
 	config->setGroup("Layout");
 
-// Even if the layouts have been disabled we still want to set Xkb options
-// user can always switch them off now in the "Options" tab
-	m_enableXkbOptions = config->readBoolEntry("EnableXkbOptions", false);
-
-	if( m_enableXkbOptions == true || loadMode == LOAD_ALL ) {
-		m_resetOldOptions = config->readBoolEntry("ResetOldOptions", false);
+	if( loadMode == LOAD_ALL ) {
+		m_resetOldOptions = config->readBoolEntry("ResetOldOptions", true);
 		m_options = config->readEntry("Options", "");
-		kdDebug() << "Xkb options (enabled=" << m_enableXkbOptions << "): " << m_options << endl;
 	}
 
 	m_useKxkb = config->readBoolEntry("Use", false);
@@ -81,7 +68,7 @@ bool KxkbConfig::load(int loadMode)
 		kdDebug() << " layout " << LayoutUnit(*it).toPair() << " in list: " << m_layouts.contains( LayoutUnit(*it) ) << endl;
 	}
 
-	kdDebug() << "Found " << m_layouts.count() << " layouts, default is " << getDefaultLayout().toPair() << endl;
+	kdDebug() << "Found " << m_layouts.count() << " layouts" << endl;
 
 	TQStringList displayNamesList = config->readListEntry("DisplayNames", ',');
 	for(TQStringList::ConstIterator it = displayNamesList.begin(); it != displayNamesList.end() ; ++it) {
@@ -94,37 +81,6 @@ bool KxkbConfig::load(int loadMode)
 		}
 	}
 
-// 	m_includes.clear();
-	if( X11Helper::areSingleGroupsSupported() ) {
-		if( config->hasKey("IncludeGroups") ) {
-			TQStringList includeList = config->readListEntry("IncludeGroups", ',');
-			for(TQStringList::ConstIterator it = includeList.begin(); it != includeList.end() ; ++it) {
-				TQStringList includePair = TQStringList::split(':', *it );
-				if( includePair.count() == 2 ) {
-					LayoutUnit layoutUnit( includePair[0] );
-					if( m_layouts.contains( layoutUnit ) ) {
-						m_layouts[m_layouts.findIndex(layoutUnit)].includeGroup = includePair[1];
-						kdDebug() << "Got inc group: " << includePair[0] << ": " << includePair[1] << endl;
-					}
-				}
-			}
-		}
-		else { //old includes format
-			kdDebug() << "Old includes..." << endl;
-			TQStringList includeList = config->readListEntry("Includes");
-			for(TQStringList::ConstIterator it = includeList.begin(); it != includeList.end() ; ++it) {
-				TQString layoutName = LayoutUnit::parseLayout( *it );
-				LayoutUnit layoutUnit( layoutName, "" );
-				kdDebug() << "old layout for inc: " << layoutUnit.toPair() << " included " << m_layouts.contains( layoutUnit ) << endl;
-				if( m_layouts.contains( layoutUnit ) ) {
-					TQString variantName = LayoutUnit::parseVariant(*it);
-					m_layouts[m_layouts.findIndex(layoutUnit)].includeGroup = variantName;
-					kdDebug() << "Got inc group: " << layoutUnit.toPair() << ": " <<  variantName << endl;
-				}
-			}
-		}
-	}
-
 	m_showSingle = config->readBoolEntry("ShowSingle", false);
 	m_showFlag = config->readBoolEntry("ShowFlag", true);
 	m_showLabel = config->readBoolEntry("ShowLabel", true);
@@ -173,6 +129,10 @@ bool KxkbConfig::load(int loadMode)
 		}
 	}
 
+	config->setGroup("Notifications");
+	m_enableNotify = config->readBoolEntry("Enable", false);
+	m_notifyUseKMilo = config->readBoolEntry("UseKMilo", true);
+
 	delete config;
 
 	return true;
@@ -185,12 +145,10 @@ void KxkbConfig::save()
 
 	config->writeEntry("Model", m_model);
 
-	config->writeEntry("EnableXkbOptions", m_enableXkbOptions );
 	config->writeEntry("ResetOldOptions", m_resetOldOptions);
 	config->writeEntry("Options", m_options );
 
 	TQStringList layoutList;
-	TQStringList includeList;
 	TQStringList displayNamesList;
 
 	TQValueList<LayoutUnit>::ConstIterator it;
@@ -199,11 +157,6 @@ void KxkbConfig::save()
 
 		layoutList.append( layoutUnit.toPair() );
 
-		if( layoutUnit.includeGroup.isEmpty() == false ) {
-			TQString incGroupUnit = TQString("%1:%2").arg(layoutUnit.toPair(), layoutUnit.includeGroup);
-			includeList.append( incGroupUnit );
-		}
-
 		TQString displayName( layoutUnit.displayName );
 		kdDebug() << " displayName " << layoutUnit.toPair() << " : " << displayName << endl;
 		if( displayName.isEmpty() == false && displayName != layoutUnit.layout ) {
@@ -215,9 +168,6 @@ void KxkbConfig::save()
 	config->writeEntry("LayoutList", layoutList);
 	kdDebug() << "Saving Layouts: " << layoutList << endl;
 
-	config->writeEntry("IncludeGroups", includeList);
- 	kdDebug() << "Saving includeGroups: " << includeList << endl;
-
 //	if( displayNamesList.empty() == false )
 		config->writeEntry("DisplayNames", displayNamesList);
 // 	else
@@ -250,6 +200,10 @@ void KxkbConfig::save()
 	config->deleteEntry("Additional");
 	config->deleteEntry("Layout");
 
+	config->setGroup("Notifications");
+	config->writeEntry("Enable", m_enableNotify);
+	config->writeEntry("UseKMilo", m_notifyUseKMilo);
+
 	config->sync();
 
 	delete config;
@@ -259,8 +213,7 @@ void KxkbConfig::setDefaults()
 {
 	m_model = DEFAULT_MODEL;
 
-	m_enableXkbOptions = false;
-	m_resetOldOptions = false;
+	m_resetOldOptions = true;
 	m_options = "";
 
 	m_layouts.clear();
@@ -321,6 +274,26 @@ TQString KxkbConfig::getDefaultDisplayName(const LayoutUnit& layoutUnit, bool si
 	return displayName;
 }
 
+const XkbOptions KxkbConfig::getKXkbOptions() {
+	load(LOAD_ALL);
+
+	XkbOptions options;
+	TQStringList layouts;
+	TQStringList variants;
+	for(TQValueList<LayoutUnit>::ConstIterator it = m_layouts.begin(); it != m_layouts.end(); ++it) {
+		const LayoutUnit& layoutUnit = *it;
+		layouts << layoutUnit.layout;
+		variants << layoutUnit.variant;
+	}
+	options.layouts  = layouts.join(",");
+	options.variants = variants.join(",");
+	options.model    = m_model;
+	options.options  = m_options;
+	kdDebug() << "[getKXkbOptions] options: " << m_options << endl;
+	options.resetOld = m_resetOldOptions;
+	return options;
+}
+
 /**
  * @brief Gets the single layout part of a layout(variant) string
  * @param[in] layvar String in form layout(variant) to parse
@@ -356,4 +329,4 @@ const TQString LayoutUnit::parseVariant(const TQString &layvar)
 	if( pos < 2 || len < 2 )
 		return "";
 	return varLine.mid(pos+1, len-2);
-}
+}
\ No newline at end of file
diff --git a/kxkb/kxkbconfig.h b/kxkb/kxkbconfig.h
index a4dc83e5a..4e424102a 100644
--- a/kxkb/kxkbconfig.h
+++ b/kxkb/kxkbconfig.h
@@ -19,6 +19,15 @@
 #include <tqptrqueue.h>
 #include <tqmap.h>
 
+#include "layoutunit.h"
+
+struct XkbOptions {
+	TQString layouts;
+	TQString variants;
+	TQString model;
+	TQString options;
+	bool resetOld;
+};
 
 /* Utility classes for per-window/per-application layout implementation
 */
@@ -29,61 +38,6 @@ enum SwitchingPolicy {
 	SWITCH_POLICY_COUNT = 3
 };
 
-
-
-inline TQString createPair(TQString key, TQString value)
-{
-	if( value.isEmpty() )
-		return key;
-	return TQString("%1(%2)").arg(key, value);
-}
-
-struct LayoutUnit {
-	TQString layout;
-	TQString variant;
-	TQString includeGroup;
-	TQString displayName;
- 	int defaultGroup;
-
-	LayoutUnit() {}
-
-	LayoutUnit(TQString layout_, TQString variant_):
-		layout(layout_),
-		variant(variant_)
-	{}
-
-	LayoutUnit(TQString pair) {
-		setFromPair( pair );
-	}
-
-	void setFromPair(const TQString& pair) {
-		layout = parseLayout(pair);
-		variant = parseVariant(pair);
-	}
-
-	TQString toPair() const {
-		return createPair(layout, variant);
-	}
-
-	bool operator<(const LayoutUnit& lu) const {
-		return layout<lu.layout ||
-				(layout==lu.layout && variant<lu.variant);
-	}
-
-	bool operator!=(const LayoutUnit& lu) const {
-		return layout!=lu.layout || variant!=lu.variant;
-	}
-
-	bool operator==(const LayoutUnit& lu) const {
-// 		kdDebug() << layout << "==" << lu.layout << "&&" << variant << "==" << lu.variant << endl;
-		return layout==lu.layout && variant==lu.variant;
-	}
-
-//private:
-	static const TQString parseLayout(const TQString &layvar);
-	static const TQString parseVariant(const TQString &layvar);
-};
-
 extern const LayoutUnit DEFAULT_LAYOUT_UNIT;
 extern const char* DEFAULT_MODEL;
 
@@ -102,6 +56,8 @@ public:
 	SwitchingPolicy m_switchingPolicy;
 	bool m_stickySwitching;
 	int m_stickySwitchingDepth;
+	bool m_enableNotify;
+	bool m_notifyUseKMilo;
 
 	bool m_useThemeColors;
 	TQColor m_colorBackground;
@@ -115,8 +71,6 @@ public:
 	TQString m_options;
 	TQValueList<LayoutUnit> m_layouts;
 
-	LayoutUnit getDefaultLayout();
-
 	bool load(int loadMode);
 	void save();
 	void setDefaults();
@@ -125,6 +79,8 @@ public:
 	static TQString getDefaultDisplayName(const TQString& code_);
 	static TQString getDefaultDisplayName(const LayoutUnit& layoutUnit, bool single=false);
 
+	const XkbOptions getKXkbOptions();
+
 private:
 	static const TQMap<TQString, TQString> parseIncludesMap(const TQStringList& pairList);
 };
diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp
index 46b03da15..573b0b4ef 100644
--- a/kxkb/kxkbtraywindow.cpp
+++ b/kxkb/kxkbtraywindow.cpp
@@ -90,13 +90,15 @@ void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts,
 		const TQString layoutName = (*it).layout;
 		const TQString variantName = (*it).variant;
 
-		const TQPixmap& layoutPixmap = LayoutIcon::getInstance().findPixmap(layoutName, PIXMAP_STYLE_CONTEXTMENU, (*it).displayName);
-        const TQPixmap pix = iconeffect.apply(layoutPixmap, TDEIcon::Small, TDEIcon::DefaultState);
+		const TQPixmap& layoutPixmap = LayoutIcon::getInstance().findPixmap(
+			(*it).layout, PIXMAP_STYLE_CONTEXTMENU, (*it).displayName);
+		const TQPixmap pix = iconeffect.apply(layoutPixmap, TDEIcon::Small,
+			TDEIcon::DefaultState);
+
+		TQString fullName = rules.getLayoutName((*it));
+		contextMenu->insertItem(pix, fullName, START_MENU_ID + cnt,
+			m_menuStartIndex + cnt);
 
-		TQString fullName = i18n((rules.layouts()[layoutName]));
-		if( variantName.isEmpty() == false )
-			fullName += " (" + variantName + ")";
-		contextMenu->insertItem(pix, fullName, START_MENU_ID + cnt, m_menuStartIndex + cnt);
 		m_descriptionMap.insert((*it).toPair(), fullName);
 
 		cnt++;
@@ -114,7 +116,7 @@ void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts,
 
 /*    if( index != -1 ) { //not first start
 		menu->insertSeparator();
-		TDEAction* quitAction = KStdAction::quit(this, TQT_SIGNAL(quitSelected()), actionCollection());
+		TDEAction* quitAction = KStdAction::quit(this, TQ_SIGNAL(quitSelected()), actionCollection());
         if (quitAction)
     	    quitAction->plug(menu);
     }*/
diff --git a/kxkb/kxkbtraywindow.h b/kxkb/kxkbtraywindow.h
index f451f6473..46d66c44b 100644
--- a/kxkb/kxkbtraywindow.h
+++ b/kxkb/kxkbtraywindow.h
@@ -28,9 +28,9 @@ class XkbRules;
     catching keyboard/mouse events and displaying menu when selected
 */
 
-class KxkbLabelController: public QObject
+class KxkbLabelController: public TQObject
 {
-// 	Q_OBJECT
+// 	TQ_OBJECT
 			
 public:
 	enum { START_MENU_ID = 100, CONFIG_MENU_ID = 130, HELP_MENU_ID = 131 };
@@ -43,6 +43,8 @@ public:
 	void setError(const TQString& layoutInfo="");
     void setShowFlag(bool showFlag) { m_showFlag = showFlag; }
 	void show() { label->show(); }
+
+	WId winId() { return label->winId(); }
 	
 // signals:
 // 
@@ -69,7 +71,7 @@ private:
 
 class KxkbSystemTray : public KSystemTray
 {
-	Q_OBJECT 
+	TQ_OBJECT 
 			
 	public:
 	KxkbSystemTray():
@@ -78,7 +80,7 @@ class KxkbSystemTray : public KSystemTray
 	
 	void mouseReleaseEvent(TQMouseEvent *ev)
 	{
-		if (ev->button() == Qt::LeftButton)
+		if (ev->button() == TQt::LeftButton)
 			emit toggled();
 		KSystemTray::mouseReleaseEvent(ev);
 	}
diff --git a/kxkb/layoutmap.cpp b/kxkb/layoutmap.cpp
index 106f70950..62b44da10 100644
--- a/kxkb/layoutmap.cpp
+++ b/kxkb/layoutmap.cpp
@@ -88,19 +88,28 @@ LayoutState& LayoutMap::getNextLayout() {
 	layoutQueue.enqueue(layoutState);
 	
 	kdDebug() << "map: Next layout: " << layoutQueue.head()->layoutUnit.toPair() 
-			<< " group: " << layoutQueue.head()->layoutUnit.defaultGroup << " for " << m_currentWinId << endl;
+	          << " for " << m_currentWinId << endl;
 	
 	return *layoutQueue.head();
 }
 
-void LayoutMap::setCurrentGroup(int group) {
-	getCurrentLayout().group = group;
+LayoutState& LayoutMap::getPrevLayout() {
+	LayoutQueue& layoutQueue = getCurrentLayoutQueue(m_currentWinId);
+	for (int i = 1; i < layoutQueue.count(); ++i) {
+		LayoutState* layoutState = layoutQueue.dequeue();
+		layoutQueue.enqueue(layoutState);
+	}
+
+	kdDebug() << "map: Next layout: " << layoutQueue.head()->layoutUnit.toPair()
+	          << " for " << m_currentWinId << endl;
+
+	return *layoutQueue.head();
 }
 
 void LayoutMap::setCurrentLayout(const LayoutUnit& layoutUnit) {
 	LayoutQueue& layoutQueue = getCurrentLayoutQueue(m_currentWinId);
 	kdDebug() << "map: Storing layout: " << layoutUnit.toPair() 
-			<< " group: " << layoutUnit.defaultGroup << " for " << m_currentWinId << endl;
+	          << " for " << m_currentWinId << endl;
 	
 	int queueSize = (int)layoutQueue.count();
 	for(int ii=0; ii<queueSize; ii++) {
diff --git a/kxkb/layoutmap.h b/kxkb/layoutmap.h
index 7b0ebad61..812814fff 100644
--- a/kxkb/layoutmap.h
+++ b/kxkb/layoutmap.h
@@ -27,13 +27,11 @@
 // LayoutInfo is used for sticky switching and per-window/application switching policy
 struct LayoutState {
 	const LayoutUnit& layoutUnit;
-	int group;
 	
 	LayoutState(const LayoutUnit& layoutUnit_):
-		layoutUnit(layoutUnit_),
-		group(layoutUnit_.defaultGroup)
+		layoutUnit(layoutUnit_)
 	{
-// 		kdDebug() << "new LayoutState " << layoutUnit.toPair() << " group: " << group << endl;
+// 		kdDebug() << "new LayoutState " << layoutUnit.toPair() << endl;
 	}
 };
 
@@ -49,8 +47,8 @@ public:
 //	void setConfig(const KxkbConfig& kxkbConfig);
 	
 	void setCurrentLayout(const LayoutUnit& layoutUnit);
-	void setCurrentGroup(int group);
 	LayoutState& getNextLayout();
+	LayoutState& getPrevLayout();
 	LayoutState& getCurrentLayout();
 	
 	void setCurrentWindow(WId winId);
diff --git a/kxkb/layoutunit.h b/kxkb/layoutunit.h
new file mode 100644
index 000000000..f4d82f73f
--- /dev/null
+++ b/kxkb/layoutunit.h
@@ -0,0 +1,64 @@
+//
+//
+// Author: Andriy Rysin <rysin@kde.org>, (C) 2006
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+
+#ifndef _LAYOUTUNIT_H
+#define _LAYOUTUNIT_H
+
+#include <tqstring.h>
+
+inline TQString createPair(TQString key, TQString value)
+{
+	if (value.isEmpty()) return key;
+	return TQString("%1(%2)").arg(key, value);
+}
+
+struct LayoutUnit {
+	TQString layout;
+	TQString variant;
+	TQString displayName;
+
+	LayoutUnit() {}
+
+	LayoutUnit(TQString layout_, TQString variant_):
+		layout(layout_),
+		variant(variant_)
+	{}
+
+	LayoutUnit(TQString pair) {
+		setFromPair( pair );
+	}
+
+	void setFromPair(const TQString& pair) {
+		layout = parseLayout(pair);
+		variant = parseVariant(pair);
+	}
+
+	TQString toPair() const {
+		return createPair(layout, variant);
+	}
+
+	bool operator<(const LayoutUnit& lu) const {
+		return layout<lu.layout ||
+				(layout==lu.layout && variant<lu.variant);
+	}
+
+	bool operator!=(const LayoutUnit& lu) const {
+		return layout!=lu.layout || variant!=lu.variant;
+	}
+
+	bool operator==(const LayoutUnit& lu) const {
+// 		kdDebug() << layout << "==" << lu.layout << "&&" << variant << "==" << lu.variant << endl;
+		return layout==lu.layout && variant==lu.variant;
+	}
+
+//private:
+	static const TQString parseLayout(const TQString &layvar);
+	static const TQString parseVariant(const TQString &layvar);
+};
+
+#endif // _LAYOUTUNIT_H
\ No newline at end of file
diff --git a/kxkb/pixmap.cpp b/kxkb/pixmap.cpp
index c7e08a741..63fc4f1db 100644
--- a/kxkb/pixmap.cpp
+++ b/kxkb/pixmap.cpp
@@ -141,11 +141,11 @@ LayoutIcon::findPixmap(const TQString& code_, int pixmapStyle, const TQString& d
 
 		if( m_labelShadow ) {
 			p.setPen(m_shColor);
-			p.drawText(1, 1, pm->width(), pm->height(), Qt::AlignCenter, displayName);
+			p.drawText(1, 1, pm->width(), pm->height(), TQt::AlignCenter, displayName);
 		}
 
 		p.setPen(m_fgColor);
-		p.drawText(0, 0, pm->width(), pm->height(), Qt::AlignCenter, displayName);
+		p.drawText(0, 0, pm->width(), pm->height(), TQt::AlignCenter, displayName);
 
 		if( m_bgTransparent && !m_showFlag )
 		{
@@ -156,10 +156,10 @@ LayoutIcon::findPixmap(const TQString& code_, int pixmapStyle, const TQString& d
 			maskp.setPen(TQt::black);
 			maskp.setFont(m_labelFont);
 
-			maskp.drawText(0, 0, maskpix.width(), maskpix.height(), Qt::AlignCenter, displayName);
+			maskp.drawText(0, 0, maskpix.width(), maskpix.height(), TQt::AlignCenter, displayName);
 			if( m_labelShadow )
 			{
-				maskp.drawText(1, 1, maskpix.width(), maskpix.height(), Qt::AlignCenter, displayName);
+				maskp.drawText(1, 1, maskpix.width(), maskpix.height(), TQt::AlignCenter, displayName);
 			}
 
 			TQBitmap mask;
@@ -292,8 +292,8 @@ void LayoutIcon::dimPixmap(TQPixmap& pm)
 	for (int y=0; y<image.height(); y++)
 		for(int x=0; x<image.width(); x++)
 	{
-		QRgb rgb = image.pixel(x,y);
-		QRgb dimRgb(tqRgb(tqRed(rgb)*3/4, tqGreen(rgb)*3/4, tqBlue(rgb)*3/4));
+		TQRgb rgb = image.pixel(x,y);
+		TQRgb dimRgb(tqRgb(tqRed(rgb)*3/4, tqGreen(rgb)*3/4, tqBlue(rgb)*3/4));
 		image.setPixel(x, y, dimRgb);
 	}
 	pm.convertFromImage(image);
@@ -305,15 +305,15 @@ static const char* ERROR_LABEL = "err";
 TQPixmap* LayoutIcon::createErrorPixmap()
 {
 	TQPixmap* pm = new TQPixmap(21, 14);
-	pm->fill(Qt::white);
+	pm->fill(TQt::white);
 
 	TQPainter p(pm);
 
 	p.setFont(m_labelFont);
-	p.setPen(Qt::red);
-	p.drawText(1, 1, pm->width(), pm->height()-2, Qt::AlignCenter, ERROR_LABEL);
-	p.setPen(Qt::blue);
-	p.drawText(0, 0, pm->width(), pm->height()-2, Qt::AlignCenter, ERROR_LABEL);
+	p.setPen(TQt::red);
+	p.drawText(1, 1, pm->width(), pm->height()-2, TQt::AlignCenter, ERROR_LABEL);
+	p.setPen(TQt::blue);
+	p.drawText(0, 0, pm->width(), pm->height()-2, TQt::AlignCenter, ERROR_LABEL);
 	m_pixmapCache.insert(ERROR_CODE, pm);
 
 	return pm;
diff --git a/kxkb/rules.cpp b/kxkb/rules.cpp
index 20f817602..ab89b4f17 100644
--- a/kxkb/rules.cpp
+++ b/kxkb/rules.cpp
@@ -35,8 +35,6 @@ XkbRules::XkbRules(bool layoutsOnly):
 	}
 
 	loadRules(rulesFile, layoutsOnly);
-	loadOldLayouts(rulesFile);
-	loadGroups(::locate("config", "kxkb_groups"));
 }
 
 
@@ -58,84 +56,6 @@ void XkbRules::loadRules(TQString file, bool layoutsOnly)
 	//  fixLayouts();
 }
 
-// void XkbRules::fixLayouts() {
-// // THIS IS TEMPORARY!!!
-// // This should be fixed in XFree86 (and actually is fixed in XFree 4.2)
-// // some handcoded ones, because the X11 rule file doesn't get them correctly, or in case
-// // the rule file wasn't found
-// 	static struct {
-// 		const char * locale;
-// 		const char * layout;
-// 	} fixedLayouts[] = {
-// 		{ "ben", "Bengali" },
-// 		{ "ar", "Arabic" },
-// 		{ "ir", "Farsi" },
-// 		{ 0, 0 }
-// 	};
-// 	
-// 	for(int i=0; fixedLayouts[i].layout != 0; i++ ) {
-// 		if( m_layouts.find(fixedLayouts[i].locale) == 0 )
-// 			m_layouts.insert(fixedLayouts[i].locale, fixedLayouts[i].layout);
-// 	}
-// }
-
-bool XkbRules::isSingleGroup(const TQString& layout)
-{
-	  return X11Helper::areSingleGroupsSupported()
-			  && !m_oldLayouts.contains(layout)
-			  && !m_nonLatinLayouts.contains(layout);
-}
-
-
-// check $oldlayouts and $nonlatin groups for XFree 4.3 and later
-void XkbRules::loadOldLayouts(TQString rulesFile)
-{
-	OldLayouts* oldLayoutsStruct = X11Helper::loadOldLayouts( rulesFile );
-	m_oldLayouts = oldLayoutsStruct->oldLayouts;
-	m_nonLatinLayouts = oldLayoutsStruct->nonLatinLayouts;
-}
-
-// for multi-group layouts in XFree 4.2 and older
-//    or if layout is present in $oldlayout or $nonlatin groups
-void XkbRules::loadGroups(TQString file)
-{
-  TQFile f(file);
-  if (f.open(IO_ReadOnly))
-    {
-      TQTextStream ts(&f);
-      TQString locale;
-      unsigned int grp;
-
-      while (!ts.eof()) {
-         ts >> locale >> grp;
-	 locale.simplifyWhiteSpace();
-
-	 if (locale[0] == '#' || locale.left(2) == "//" || locale.isEmpty())
-	    continue;
-
-    	 m_initialGroups.insert(locale, grp);
-      }
-      
-      f.close();
-    }
-}
-
-unsigned int 
-XkbRules::getDefaultGroup(const TQString& layout, const TQString& includeGroup)
-{
-// check for new one-group layouts in XFree 4.3 and older
-    if( isSingleGroup(layout) ) {
-		if( includeGroup.isEmpty() == false )
-			return 1;
-		else
-			return 0;
-    }
-    
-    TQMap<TQString, unsigned int>::iterator it = m_initialGroups.find(layout);
-    return it == m_initialGroups.end() ? 0 : it.data();
-}
-
-
 TQStringList
 XkbRules::getAvailableVariants(const TQString& layout)
 {
@@ -146,11 +66,24 @@ XkbRules::getAvailableVariants(const TQString& layout)
     if( result1 )
         return *result1;
 
-    bool oldLayouts = m_oldLayouts.contains(layout);
-    TQStringList* result = X11Helper::getVariants(layout, X11_DIR, oldLayouts);
+    TQStringList* result = X11Helper::getVariants(layout, X11_DIR);
 
     m_varLists.insert(layout, result);
 
     return *result;
 }
 
+TQString XkbRules::getLayoutName(LayoutUnit layout) const {
+	TQString fullName = i18n(m_layouts[layout.layout]);
+	if (!layout.variant.isEmpty()) {
+		fullName += " (" + layout.variant + ")";
+	}
+	return fullName;
+}
+
+TQString XkbRules::trOpt(TQString opt) {
+    // xkeyboard-config's translation is generated directly from the xml and has some querks
+    // like sustitution for the '<' and '>'. We will have to workaroung those manually:
+    TQString translated = i18n(opt.replace("<", "&lt;").replace(">", "&gt;").utf8());
+    return translated.replace("&lt;", "<").replace("&gt;", ">");
+}
diff --git a/kxkb/rules.h b/kxkb/rules.h
index a4955317e..0a68f3dbf 100644
--- a/kxkb/rules.h
+++ b/kxkb/rules.h
@@ -3,8 +3,10 @@
 
 #include <tqstring.h>
 #include <tqdict.h>
+#include <tqstringlist.h>
 #include <tqmap.h>
 
+#include "layoutunit.h"
 
 class XkbRules
 {
@@ -15,30 +17,26 @@ public:
   const TQDict<char> &models() const { return m_models; };
   const TQDict<char> &layouts() const { return m_layouts; };
   const TQDict<char> &options() const { return m_options; };
-  
+
   TQStringList getAvailableVariants(const TQString& layout);
-  unsigned int getDefaultGroup(const TQString& layout, const TQString& includeGroup);
 
-  bool isSingleGroup(const TQString& layout);
+  TQString getLayoutName(LayoutUnit layout) const;
 
-protected:
+  /// A helper to translate option description
+  static TQString trOpt(TQString opt);
 
+protected:
   void loadRules(TQString filename, bool layoutsOnly=false);
-  void loadGroups(TQString filename);
-  void loadOldLayouts(TQString filename);
 
 private:
 
   TQDict<char> m_models;
   TQDict<char> m_layouts;
   TQDict<char> m_options;
-  TQMap<TQString, unsigned int> m_initialGroups;
   TQDict<TQStringList> m_varLists;
-  TQStringList m_oldLayouts;
-  TQStringList m_nonLatinLayouts;
-  
+
   TQString X11_DIR;	// pseudo-constant
-  
+
 //  void fixLayouts();
 };
 
diff --git a/kxkb/x11helper.cpp b/kxkb/x11helper.cpp
index 1c8db4a4a..90e29d9e2 100644
--- a/kxkb/x11helper.cpp
+++ b/kxkb/x11helper.cpp
@@ -1,3 +1,4 @@
+#include <tqdom.h>
 #include <tqdir.h>
 #include <tqstring.h>
 #include <tqwindowdefs.h>
@@ -7,6 +8,8 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
+#include <kstandarddirs.h>
+#include <tdelocale.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -119,13 +122,12 @@ X11Helper::findXkbRulesFile(TQString x11Dir, Display *dpy)
 		    }
     	}
     }
-	
+
 	return rulesFile;
 }
 
 RulesInfo*
-X11Helper::loadRules(const TQString& file, bool layoutsOnly) 
-{
+X11Helper::loadRules(const TQString& file, bool layoutsOnly) {
 	XkbRF_RulesPtr xkbRules = XkbRF_Load(TQFile::encodeName(file).data(), "", true, true);
 
 	if (xkbRules == NULL) {
@@ -151,32 +153,87 @@ X11Helper::loadRules(const TQString& file, bool layoutsOnly)
 		XkbRF_Free(xkbRules, true);
 		return rulesInfo;
 	}
-  
+
   for (int i = 0; i < xkbRules->models.num_desc; ++i)
       rulesInfo->models.replace(xkbRules->models.desc[i].name, tqstrdup( xkbRules->models.desc[i].desc ) );
-  for (int i = 0; i < xkbRules->options.num_desc; ++i)
-      rulesInfo->options.replace(xkbRules->options.desc[i].name, tqstrdup( xkbRules->options.desc[i].desc ) );
 
-  XkbRF_Free(xkbRules, true);
+  // Prefer XML file for Xkb options
+  if (TQFile(file + ".xml").exists()) {
+      XkbRF_Free(xkbRules, true);
+
+      TQDomDocument xmlrules("xkbrules");
+      TQFile xmlfile(file + ".xml");
+      if (!xmlfile.open(IO_ReadOnly)) {
+          return NULL;
+      }
+      if (!xmlrules.setContent(&xmlfile)) {
+          xmlfile.close();
+          return NULL;
+      }
+      xmlfile.close();
+
+      TQDomElement options = xmlrules.documentElement().namedItem("optionList").toElement();
+      TQDomNode optGroupNode = options.firstChild();
+      while (!optGroupNode.isNull()) {
+          TQDomElement optGroupElem = optGroupNode.toElement();
+          if (optGroupElem.tagName() == "group") {
+              TQDomNode optNode = optGroupElem.firstChild();
+              while (!optNode.isNull()) {
+                TQDomElement optElem = optNode.toElement();
+                if (!optElem.isNull()) {
+                    // This might be either a configItem (group) or an option tag
+                    // If it is an option tag, it contains a configItem that describes
+                    // the option
+                    if (optElem.tagName() == "option") {
+                        optElem = optElem.namedItem("configItem").toElement();
+                    }
+
+                    TQString optName = optElem.namedItem("name").toElement().text();
+                    TQString optDesc = optElem.namedItem("description").toElement().text();
+                    if (optDesc.isEmpty()) {
+                        optDesc = optName;
+                    }
+                    // Items from these 'meta' groups fall into other groups
+                    // Admittedly not the best way to handle this
+                    if (optName == "currencysign" || optName == "compat") break;
+
+                    // HACK this should be called "compose" or else the code breaks
+                    if (optName == "Compose key") optName = "compose";
+
+                    rulesInfo->options.replace(optName.ascii(), tqstrdup(optDesc.ascii()));
+                }
+                optNode = optNode.nextSibling();
+              }
+          }
+          optGroupNode = optGroupNode.nextSibling();
+      }
+  }
+  else {
+      for (int i = 0; i < xkbRules->options.num_desc; ++i)
+          rulesInfo->options.replace(xkbRules->options.desc[i].name, tqstrdup( xkbRules->options.desc[i].desc ) );
+
+      XkbRF_Free(xkbRules, true);
+
+      // workaround for empty 'compose' options group description
+      if( rulesInfo->options.find("compose:menu") && !rulesInfo->options.find("compose") ) {
+          rulesInfo->options.replace("compose", I18N_NOOP("Compose Key Position"));
+      }
+  }
 
-// workaround for empty 'compose' options group description
-   if( rulesInfo->options.find("compose:menu") && !rulesInfo->options.find("compose") ) {
-     rulesInfo->options.replace("compose", "Compose Key Position");
-   }
 
   for(TQDictIterator<char> it(rulesInfo->options) ; it.current() != NULL; ++it ) {
-	  TQString option(it.currentKey());
-	  int columnPos = option.find(":");
-	  
-	  if( columnPos != -1 ) {
-		  TQString group = option.mid(0, columnPos);
-		  if( rulesInfo->options.find(group) == NULL ) {
-			  rulesInfo->options.replace(group, group.latin1());
-			  kdDebug() << "Added missing option group: " << group << endl;
-		  }
-	  }
+      // Add missing option groups
+      TQString option(it.currentKey());
+      int columnPos = option.find(":");
+
+      if( columnPos != -1 ) {
+          TQString group = option.mid(0, columnPos);
+          if( rulesInfo->options.find(group) == NULL ) {
+              rulesInfo->options.replace(group, group.latin1());
+              kdDebug() << "Added missing option group: " << group << endl;
+          }
+      }
   }
-  
 //   // workaround for empty misc options group description in XFree86 4.4.0
 //   if( rulesInfo->options.find("numpad:microsoft") && !rulesInfo->options.find("misc") ) {
 //     rulesInfo->options.replace("misc", "Miscellaneous compatibility options" );
@@ -335,3 +392,13 @@ bool X11Helper::areSingleGroupsSupported()
 {
 	return true; //TODO:
 }
+
+void X11Helper::initializeTranslations() {
+    // TDE is usually installed into some non-standard prefix and by default system-wide locale
+    // dirs are not considered when searching for gettext message catalogues, so we have to add
+    // it explicitly.
+#ifdef WITH_XKB_TRANSLATIONS
+    TDEGlobal::dirs()->addResourceDir("locale", XKB_CONFIG_LOCALE_DIR);
+    TDEGlobal::locale()->insertCatalogue("xkeyboard-config");
+#endif
+}
diff --git a/kxkb/x11helper.h b/kxkb/x11helper.h
index 042fb4ce5..8315dc446 100644
--- a/kxkb/x11helper.h
+++ b/kxkb/x11helper.h
@@ -3,6 +3,7 @@
 
 #include <tqdict.h>
 #include <tqstringlist.h>
+#include <tqwindowdefs.h>
 
 
 struct RulesInfo {
@@ -36,6 +37,7 @@ public:
 	
 	static bool areLayoutsClean() { return m_layoutsClean; }
 	static bool areSingleGroupsSupported();
+	static void initializeTranslations();
 };
 
 #endif /*X11HELPER_H_*/
diff --git a/l10n/hr/entry.desktop b/l10n/hr/entry.desktop
index 034e4e334..6fae771fe 100644
--- a/l10n/hr/entry.desktop
+++ b/l10n/hr/entry.desktop
@@ -4,7 +4,7 @@ Region=southeurope
 Languages=hr
 DecimalSymbol=,
 ThousandsSeparator=
-CurrencySymbol=Kn
+CurrencySymbol=€
 MonetaryDecimalSymbol=,
 MonetaryThousandsSeparator=$0 $0
 PositiveSign=
diff --git a/l10n/lt/entry.desktop b/l10n/lt/entry.desktop
index 3eeef4b8e..1059a08af 100644
--- a/l10n/lt/entry.desktop
+++ b/l10n/lt/entry.desktop
@@ -4,7 +4,7 @@ Region=northeurope
 Languages=lt
 DecimalSymbol=,
 ThousandsSeparator=$0 $0
-CurrencySymbol=Lt
+CurrencySymbol=€
 MonetaryDecimalSymbol=,
 MonetaryThousandsSeparator=$0 $0
 PositiveSign=
diff --git a/l10n/lv/entry.desktop b/l10n/lv/entry.desktop
index 07b09e394..8f4713f11 100644
--- a/l10n/lv/entry.desktop
+++ b/l10n/lv/entry.desktop
@@ -4,7 +4,7 @@ Region=northeurope
 Languages=lv
 DecimalSymbol=,
 ThousandsSeparator=.
-CurrencySymbol=Ls
+CurrencySymbol=€
 MonetaryDecimalSymbol=,
 MonetaryThousandsSeparator=.
 PositiveSign=
diff --git a/libkonq/CMakeLists.txt b/libkonq/CMakeLists.txt
index e774a81bb..c1780780d 100644
--- a/libkonq/CMakeLists.txt
+++ b/libkonq/CMakeLists.txt
@@ -43,6 +43,7 @@ install( FILES
     konq_historymgr.h konq_historycomm.h konq_pixmapprovider.h
     kivdirectoryoverlay.h kivfreespaceoverlay.h konq_faviconmgr.h
     konq_xmlguiclient.h konqbookmarkmanager.h konq_filetip.h
+    konq_sort_constants.h konq_string_compare.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
diff --git a/libkonq/Makefile.am b/libkonq/Makefile.am
index 3290c3e85..3c3897155 100644
--- a/libkonq/Makefile.am
+++ b/libkonq/Makefile.am
@@ -52,7 +52,8 @@ include_HEADERS = konq_popupmenu.h knewmenu.h \
     konq_pixmapprovider.h \
     kivdirectoryoverlay.h \
     kivfreespaceoverlay.h \
-    konq_faviconmgr.h konq_xmlguiclient.h konqbookmarkmanager.h konq_filetip.h
+    konq_faviconmgr.h konq_xmlguiclient.h konqbookmarkmanager.h konq_filetip.h \
+    konq_sort_constants.h konq_string_compare.h
 
 
 if include_ARTS
diff --git a/libkonq/PLUGINS b/libkonq/PLUGINS.md
index 4eb535a59..f89ca70ef 100644
--- a/libkonq/PLUGINS
+++ b/libkonq/PLUGINS.md
@@ -1,13 +1,20 @@
+Menu Plugins
+============
+
 Thus file explains how to add plugins into the konqpopupmenu
 used by konqueror and kdesktop.
 
-Why?
+Why
+---
+
 Why do we need this kind of functionality? We do have SERVICEMENUS.
 A plugin can be much more dynamic. If you want to add features that
 are runtime specific or need some interaction with different things
-a plugin comes in handy
+a plugin comes in handy.
+
+How
+---
 
-How?
-Please look at ?no_location? to get the latest plugin template
+Please look at *no_location* to get the latest plugin template.
 
-Holger Freyther 30th October 2001 
\ No newline at end of file
+Holger Freyther 30th October 2001
diff --git a/libkonq/SERVICEMENUS b/libkonq/SERVICEMENUS
deleted file mode 100644
index 12035388c..000000000
--- a/libkonq/SERVICEMENUS
+++ /dev/null
@@ -1,52 +0,0 @@
-This file explains how to add an item in the popupmenu (for both
-konqueror and kdesktop), without using the file associations.
-
-Why
-===
-One reason for doing this is being able to associate
-some action with all files without this action becoming a default handler
-(called on left click).
-Another is that for text-based programs and tools (e.g. gzip) it's faster
-than defining a desktop file for the application, making it hidden, and
-associate it with the relevant file types.
-
-How
-===
-Create a file ~/.trinity/share/apps/konqueror/servicemenus/something.desktop
-and write into it something like (without the comments) :
-
-[Desktop Entry]
-ServiceTypes=text/html,text/plain # use all/all for all entries
-                                  # all/allfiles for files only
-                                  # and use inode/directory for dirs only
-                                  # you can also do things like image/* for all
-                                  # image mimetypes
-Actions=gzip;mail                 # those are ';' separated, per the standard !
-X-TDE-Submenu=Menuname            # this optional entry allows grouping the 
-                                  # entries in this servicemenu file into a
-                                  # common submenu, in this case "Menuname"
-TryExec=gzip			  # Find if executable exist, if it doesn't exist
-				  # menu entry is not displaying
-ExcludeServiceTypes=application/x-zip # This entry is used to avoid to display menu
-				      # when it's a specific servicetype
-				      # for exemple when we use all/allfiles and zip
-				      # them, we don't want to zip a zip file
-
-
-[Desktop Action gzip]            # One "Desktop Action <name>" group per Action
-Name=GZip this file
-Name[fr]=...
-Icon=tgz
-Exec=gzip %f
-
-[Desktop Action mail]
-Name=Mail this file
-Name[fr]=...
-Icon=kmail
-Exec=kmail --there-is-no-such-option-yet %f
-
-
-See also the "desktop entry standard", which defines more formally the same
-concept of actions but for desktop files (e.g. eject on a device desktop file,
-etc.)
-
diff --git a/libkonq/SERVICEMENUS.md b/libkonq/SERVICEMENUS.md
new file mode 100644
index 000000000..bcd7ae1f7
--- /dev/null
+++ b/libkonq/SERVICEMENUS.md
@@ -0,0 +1,55 @@
+Service Menus
+=============
+
+This file explains how to add an item in the popupmenu (for both
+konqueror and kdesktop), without using the file associations.
+
+Why
+---
+
+One reason for doing this is being able to associate
+some action with all files without this action becoming a default handler
+(called on left click).
+
+Another is that for text-based programs and tools (e.g. gzip) it's faster
+than defining a desktop file for the application, making it hidden, and
+associate it with the relevant file types.
+
+How
+---
+
+Create a file `~/.trinity/share/apps/konqueror/servicemenus/something.desktop`
+and write into it something like (without the comments):
+
+    [Desktop Entry]
+    ServiceTypes=text/html,text/plain # use all/all for all entries
+                                      # all/allfiles for files only
+                                      # and use inode/directory for dirs only
+                                      # you can also do things like image/* for all
+                                      # image mimetypes
+    Actions=gzip;mail                 # those are ';' separated, per the standard !
+    X-TDE-Submenu=Menuname            # this optional entry allows grouping the 
+                                      # entries in this servicemenu file into a
+                                      # common submenu, in this case "Menuname"
+    TryExec=gzip                      # Find if executable exist, if it doesn't exist
+                                      # menu entry is not displaying
+    ExcludeServiceTypes=application/x-zip # This entry is used to avoid to display menu
+                                      # when it's a specific servicetype
+                                      # for exemple when we use all/allfiles and zip
+                                      # them, we don't want to zip a zip file
+
+    [Desktop Action gzip]             # One "Desktop Action <name>" group per Action
+    Name=GZip this file
+    Name[fr]=...
+    Icon=tgz
+    Exec=gzip %f
+
+    [Desktop Action mail]
+    Name=Mail this file
+    Name[fr]=...
+    Icon=kmail
+    Exec=kmail --there-is-no-such-option-yet %f
+
+See also the *desktop entry standard*, which defines more formally the same
+concept of actions but for desktop files (e.g. eject on a device desktop file,
+etc.).
diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp
index 05bddec1e..c0d5a4f38 100644
--- a/libkonq/favicons/favicons.cpp
+++ b/libkonq/favicons/favicons.cpp
@@ -186,9 +186,9 @@ void FaviconsModule::startDownload(const TQString &hostOrURL, bool isHost, const
 
     TDEIO::Job *job = TDEIO::get(iconURL, false, false);
     job->addMetaData(d->metaData);
-    connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
-    connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
-    connect(job, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), TQT_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &)));
+    connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+    connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *)));
+    connect(job, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), TQ_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &)));
     FaviconsModulePrivate::DownloadInfo download;
     download.hostOrURL = hostOrURL;
     download.isHost = isHost;
@@ -202,7 +202,7 @@ void FaviconsModule::slotData(TDEIO::Job *job, const TQByteArray &data)
     if (oldSize > 0x10000)
     {
         d->killJobs.append(job);
-        TQTimer::singleShot(0, this, TQT_SLOT(slotKill()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotKill()));
     }
     download.iconData.resize(oldSize + data.size());
     memcpy(download.iconData.data() + oldSize, data.data(), data.size());
@@ -219,7 +219,7 @@ void FaviconsModule::slotResult(TDEIO::Job *job)
         TQBuffer buffer(download.iconData);
         buffer.open(IO_ReadOnly);
         TQImageIO io;
-        io.setIODevice(TQT_TQIODEVICE(&buffer));
+        io.setIODevice(&buffer);
         io.setParameters("size=16");
         // Check here too, the job might have had no error, but the downloaded
         // file contains just a 404 message sent with a 200 status.
diff --git a/libkonq/favicons/favicons.h b/libkonq/favicons/favicons.h
index 41802c9bc..61480e5b9 100644
--- a/libkonq/favicons/favicons.h
+++ b/libkonq/favicons/favicons.h
@@ -44,7 +44,7 @@ namespace TDEIO { class Job; }
  */
 class FaviconsModule : public KDEDModule
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 public:
     FaviconsModule(const TQCString &obj);
diff --git a/libkonq/kivdirectoryoverlay.cpp b/libkonq/kivdirectoryoverlay.cpp
index bb1b0d6c2..590747b9c 100644
--- a/libkonq/kivdirectoryoverlay.cpp
+++ b/libkonq/kivdirectoryoverlay.cpp
@@ -43,8 +43,8 @@ KIVDirectoryOverlay::KIVDirectoryOverlay(KFileIVI* directory)
     {
         m_lister = new KDirLister;
         m_lister->setAutoErrorHandlingEnabled(false, 0);
-        connect(m_lister, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted()));
-        connect(m_lister, TQT_SIGNAL(newItems( const KFileItemList& )), TQT_SLOT(slotNewItems( const KFileItemList& )));
+        connect(m_lister, TQ_SIGNAL(completed()), TQ_SLOT(slotCompleted()));
+        connect(m_lister, TQ_SIGNAL(newItems( const KFileItemList& )), TQ_SLOT(slotNewItems( const KFileItemList& )));
         m_lister->setShowingDotFiles(false);
     }
     m_directory = directory;
diff --git a/libkonq/kivdirectoryoverlay.h b/libkonq/kivdirectoryoverlay.h
index 1734f8108..0aa7e912e 100644
--- a/libkonq/kivdirectoryoverlay.h
+++ b/libkonq/kivdirectoryoverlay.h
@@ -30,7 +30,7 @@ class KFileIVI;
 
 class LIBKONQ_EXPORT KIVDirectoryOverlay : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     KIVDirectoryOverlay(KFileIVI* directory);
diff --git a/libkonq/kivfreespaceoverlay.cpp b/libkonq/kivfreespaceoverlay.cpp
index 0343a4ab6..d0cd82e7d 100644
--- a/libkonq/kivfreespaceoverlay.cpp
+++ b/libkonq/kivfreespaceoverlay.cpp
@@ -63,7 +63,7 @@ void KIVFreeSpaceOverlay::start()
     if ( !m_freespace->item()->isReadable() ) {
         emit finished();
     }
-    TQTimer::singleShot(0, this, TQT_SLOT(slotDisplay()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotDisplay()));
 }
 
 void KIVFreeSpaceOverlay::timerEvent(TQTimerEvent *)
diff --git a/libkonq/kivfreespaceoverlay.h b/libkonq/kivfreespaceoverlay.h
index 6527ccd29..a31d66b92 100644
--- a/libkonq/kivfreespaceoverlay.h
+++ b/libkonq/kivfreespaceoverlay.h
@@ -31,7 +31,7 @@ class KFileIVI;
 
 class LIBKONQ_EXPORT KIVFreeSpaceOverlay : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     KIVFreeSpaceOverlay(KFileIVI* freespace);
diff --git a/libkonq/knewmenu.cpp b/libkonq/knewmenu.cpp
index 621b1f614..4dc1070cb 100644
--- a/libkonq/knewmenu.cpp
+++ b/libkonq/knewmenu.cpp
@@ -238,7 +238,7 @@ void KNewMenu::fillMenu()
                 // The best way to identify the "Create Directory", "Link to Location", "Link to Application" was the template
                 if ( (*templ).templatePath.endsWith( "emptydir" ) )
                 {
-                    TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewDir() ),
+                    TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQ_SLOT( slotNewDir() ),
                                      d->m_actionCollection, TQCString().sprintf("newmenu%d", i ) );
                     act->setGroup( "KNewMenu" );
                     act->plug( popupMenu() );
@@ -248,7 +248,7 @@ void KNewMenu::fillMenu()
                 }
                 else
                 {
-                    TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewFile() ),
+                    TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQ_SLOT( slotNewFile() ),
                                              d->m_actionCollection, TQCString().sprintf("newmenu%d", i ) );
                     act->setGroup( "KNewMenu" );
 
@@ -302,12 +302,12 @@ void KNewMenu::slotFillTemplates()
             //kdDebug(1203) << "Templates resource dir: " << *it << endl;
             s_pDirWatch->addDir( *it );
         }
-        connect ( s_pDirWatch, TQT_SIGNAL( dirty( const TQString & ) ),
-                  this, TQT_SLOT ( slotFillTemplates() ) );
-        connect ( s_pDirWatch, TQT_SIGNAL( created( const TQString & ) ),
-                  this, TQT_SLOT ( slotFillTemplates() ) );
-        connect ( s_pDirWatch, TQT_SIGNAL( deleted( const TQString & ) ),
-                  this, TQT_SLOT ( slotFillTemplates() ) );
+        connect ( s_pDirWatch, TQ_SIGNAL( dirty( const TQString & ) ),
+                  this, TQ_SLOT ( slotFillTemplates() ) );
+        connect ( s_pDirWatch, TQ_SIGNAL( created( const TQString & ) ),
+                  this, TQ_SLOT ( slotFillTemplates() ) );
+        connect ( s_pDirWatch, TQ_SIGNAL( deleted( const TQString & ) ),
+                  this, TQ_SLOT ( slotFillTemplates() ) );
         // Ok, this doesn't cope with new dirs in TDEDIRS, but that's another story
     }
     s_templatesVersion++;
@@ -368,11 +368,11 @@ void KNewMenu::slotNewDir()
 
 void KNewMenu::slotNewFile()
 {
-    int id = TQString( TQT_TQOBJECT_CONST(sender())->name() + 7 ).toInt(); // skip "newmenu"
+    int id = TQString( sender()->name() + 7 ).toInt(); // skip "newmenu"
     if (id == 0)
     {
 	// run the command for the templates
-	KRun::runCommand(TQString(TQT_TQOBJECT_CONST(sender())->name()));
+	KRun::runCommand(TQString(sender()->name()));
 	return;
     }
 
@@ -468,11 +468,11 @@ void KNewMenu::slotNewFile()
         //kdDebug(1203) << "KNewMenu : TDEIO::copyAs( " << uSrc.url() << ", " << dest.url() << ")" << endl;
         TDEIO::CopyJob * job = TDEIO::copyAs( uSrc, dest );
         job->setDefaultPermissions( true );
-        connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-                TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+        connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+                TQ_SLOT( slotResult( TDEIO::Job * ) ) );
         if ( m_isURLDesktopFile )
-		connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL&, const KURL& ) ),
-        	     TQT_SLOT( slotRenamed( TDEIO::Job *, const KURL&, const KURL& ) ) );
+		connect( job, TQ_SIGNAL( renamed( TDEIO::Job *, const KURL&, const KURL& ) ),
+        	     TQ_SLOT( slotRenamed( TDEIO::Job *, const KURL&, const KURL& ) ) );
     	KURL::List lst;
     	lst.append( uSrc );
     	(void)new KonqCommandRecorder( KonqCommand::COPY, lst, dest, job );
@@ -549,8 +549,8 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin
     label->setBuddy(m_leFileName);  // please "scheck" style
     m_leFileName->setText( defaultName );
     m_leFileName->setSelection(0, m_leFileName->text().length()); // autoselect
-    connect( m_leFileName, TQT_SIGNAL(textChanged(const TQString&)),
-             TQT_SLOT(slotNameTextChanged(const TQString&)) );
+    connect( m_leFileName, TQ_SIGNAL(textChanged(const TQString&)),
+             TQ_SLOT(slotNameTextChanged(const TQString&)) );
 
     // Second line: url
     TQHBox * urlBox = new TQHBox( plainPage() );
@@ -560,13 +560,13 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin
     m_urlRequester->setMode( KFile::File | KFile::Directory );
 
     m_urlRequester->setMinimumWidth( m_urlRequester->sizeHint().width() * 3 );
-    connect( m_urlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)),
-             TQT_SLOT(slotURLTextChanged(const TQString&)) );
+    connect( m_urlRequester->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)),
+             TQ_SLOT(slotURLTextChanged(const TQString&)) );
     label->setBuddy(m_urlRequester);  // please "scheck" style
 
     m_urlRequester->setFocus();
     enableButtonOK( !defaultName.isEmpty() && !defaultUrl.isEmpty() );
-    connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClear()) );
+    connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotClear()) );
     m_fileNameEdited = false;
 }
 
diff --git a/libkonq/knewmenu.h b/libkonq/knewmenu.h
index a0ea38f44..5d28e58cb 100644
--- a/libkonq/knewmenu.h
+++ b/libkonq/knewmenu.h
@@ -51,7 +51,7 @@ class TQPopupMenu;
  */
 class LIBKONQ_EXPORT KNewMenu : public TDEActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
     /**
@@ -184,7 +184,7 @@ private:
  */
 class KURLDesktopFileDlg : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KURLDesktopFileDlg( const TQString& textFileName, const TQString& textUrl );
     KURLDesktopFileDlg( const TQString& textFileName, const TQString& textUrl, TQWidget *parent );
diff --git a/libkonq/konq_bgnddlg.cpp b/libkonq/konq_bgnddlg.cpp
index 60f3aa63d..04a95f3b0 100644
--- a/libkonq/konq_bgnddlg.cpp
+++ b/libkonq/konq_bgnddlg.cpp
@@ -47,15 +47,15 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
     TQVBoxLayout* mainLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
 
     m_buttonGroup = new TQButtonGroup( i18n("Background"), page );
-    m_buttonGroup->setColumnLayout( 0, Qt::Vertical );
+    m_buttonGroup->setColumnLayout( 0, TQt::Vertical );
     m_buttonGroup->layout()->setMargin( KDialog::marginHint() );
     m_buttonGroup->layout()->setSpacing( KDialog::spacingHint() );
     TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->layout() );
-    groupLayout->setAlignment( Qt::AlignTop );
+    groupLayout->setAlignment( TQt::AlignTop );
     mainLayout->addWidget( m_buttonGroup );
 
-    connect( m_buttonGroup, TQT_SIGNAL( clicked(int) ),
-             this, TQT_SLOT( slotBackgroundModeChanged() ) );
+    connect( m_buttonGroup, TQ_SIGNAL( clicked(int) ),
+             this, TQ_SLOT( slotBackgroundModeChanged() ) );
 
     // color
     m_radioColor = new TQRadioButton( i18n("Co&lor:"), m_buttonGroup );
@@ -65,8 +65,8 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
                                 TQSizePolicy::Minimum );
     groupLayout->addWidget( m_buttonColor, 0, 1 );
 
-    connect( m_buttonColor, TQT_SIGNAL( changed( const TQColor& ) ),
-             this, TQT_SLOT( slotColorChanged() ) );
+    connect( m_buttonColor, TQ_SIGNAL( changed( const TQColor& ) ),
+             this, TQ_SLOT( slotColorChanged() ) );
 
     // picture
     m_radioPicture = new TQRadioButton( i18n("&Picture:"), m_buttonGroup );
@@ -75,10 +75,10 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
     groupLayout->addMultiCellWidget( m_comboPicture, 1, 1, 1, 2 );
     initPictures();
 
-    connect( m_comboPicture->comboBox(), TQT_SIGNAL( activated( int ) ),
-	     this, TQT_SLOT( slotPictureChanged() ) );
-    connect( m_comboPicture, TQT_SIGNAL( urlSelected(const TQString &) ),
-             this, TQT_SLOT( slotPictureChanged() ) );
+    connect( m_comboPicture->comboBox(), TQ_SIGNAL( activated( int ) ),
+	     this, TQ_SLOT( slotPictureChanged() ) );
+    connect( m_comboPicture, TQ_SIGNAL( urlSelected(const TQString &) ),
+             this, TQ_SLOT( slotPictureChanged() ) );
 
     TQSpacerItem* spacer1 = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding,
                                             TQSizePolicy::Minimum );
diff --git a/libkonq/konq_bgnddlg.h b/libkonq/konq_bgnddlg.h
index a5e179b6f..68667e316 100644
--- a/libkonq/konq_bgnddlg.h
+++ b/libkonq/konq_bgnddlg.h
@@ -37,7 +37,7 @@ class TQRadioButton;
  */
 class KonqBgndDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
diff --git a/libkonq/konq_dirpart.cpp b/libkonq/konq_dirpart.cpp
index 030cc90a9..c4d90d5b7 100644
--- a/libkonq/konq_dirpart.cpp
+++ b/libkonq/konq_dirpart.cpp
@@ -121,7 +121,7 @@ int KonqDirPart::KonqDirPartPrivate::findNearestIconSize(int preferred)
 
 int KonqDirPart::KonqDirPartPrivate::nearestIconSizeError(int size)
 {
-    return QABS(size - findNearestIconSize(size));
+    return TQABS(size - findNearestIconSize(size));
 }
 
 KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
@@ -133,12 +133,12 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
     resetCount();
     //m_bMultipleItemsSelected = false;
 
-    connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
+    connect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) );
 
     actionCollection()->setHighlightingEnabled( true );
 
-    m_paIncIconSize = new TDEAction( i18n( "Enlarge Icons" ), "zoom-in", 0, this, TQT_SLOT( slotIncIconSize() ), actionCollection(), "incIconSize" );
-    m_paDecIconSize = new TDEAction( i18n( "Shrink Icons" ), "zoom-out", 0, this, TQT_SLOT( slotDecIconSize() ), actionCollection(), "decIconSize" );
+    m_paIncIconSize = new TDEAction( i18n( "Enlarge Icons" ), "zoom-in", 0, this, TQ_SLOT( slotIncIconSize() ), actionCollection(), "incIconSize" );
+    m_paDecIconSize = new TDEAction( i18n( "Shrink Icons" ), "zoom-out", 0, this, TQ_SLOT( slotDecIconSize() ), actionCollection(), "decIconSize" );
 
     m_paDefaultIcons = new TDERadioAction( i18n( "&Default Size" ), 0, actionCollection(), "modedefault" );
     d->aEnormousIcons = new TDERadioAction( i18n( "&Huge" ), 0,
@@ -158,17 +158,17 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
     d->aSmallMediumIcons->setExclusiveGroup( "ViewMode" );
     m_paSmallIcons->setExclusiveGroup( "ViewMode" );
 
-    connect( m_paDefaultIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
-    connect( d->aEnormousIcons, TQT_SIGNAL( toggled( bool ) ),
-	    this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
-    connect( m_paHugeIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
-    connect( m_paLargeIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
-    connect( m_paMediumIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
-    connect( d->aSmallMediumIcons, TQT_SIGNAL( toggled( bool ) ),
-	    this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
-    connect( m_paSmallIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
-
-    connect( kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int)) );
+    connect( m_paDefaultIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+    connect( d->aEnormousIcons, TQ_SIGNAL( toggled( bool ) ),
+	    this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+    connect( m_paHugeIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+    connect( m_paLargeIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+    connect( m_paMediumIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+    connect( d->aSmallMediumIcons, TQ_SIGNAL( toggled( bool ) ),
+	    this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+    connect( m_paSmallIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+
+    connect( kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) );
 #if 0
     // Extract 6 icon sizes from the icon theme.
     // Use 16,22,32,48,64,128 as default.
@@ -219,7 +219,7 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
     m_iIconSize[4] = TDEIcon::SizeHuge;
     // ... up to here
 
-    TDEAction *a = new TDEAction( i18n( "Configure Background..." ), "background", 0, this, TQT_SLOT( slotBackgroundSettings() ),
+    TDEAction *a = new TDEAction( i18n( "Configure Background..." ), "background", 0, this, TQ_SLOT( slotBackgroundSettings() ),
                               actionCollection(), "bgsettings" );
 
     a->setToolTip( i18n( "Allows choosing of background settings for this view" ) );
@@ -665,25 +665,25 @@ void KonqDirPart::setFindPart( KParts::ReadOnlyPart * part )
 {
     assert(part);
     m_findPart = part;
-    connect( m_findPart, TQT_SIGNAL( started() ),
-             this, TQT_SLOT( slotStarted() ) );
-    connect( m_findPart, TQT_SIGNAL( started() ),
-             this, TQT_SLOT( slotStartAnimationSearching() ) );
-    connect( m_findPart, TQT_SIGNAL( clear() ),
-             this, TQT_SLOT( slotClear() ) );
-    connect( m_findPart, TQT_SIGNAL( newItems( const KFileItemList & ) ),
-             this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
-    connect( m_findPart, TQT_SIGNAL( finished() ), // can't name it completed, it conflicts with a KROP signal
-             this, TQT_SLOT( slotCompleted() ) );
-    connect( m_findPart, TQT_SIGNAL( finished() ),
-             this, TQT_SLOT( slotStopAnimationSearching() ) );
-    connect( m_findPart, TQT_SIGNAL( canceled() ),
-             this, TQT_SLOT( slotCanceled() ) );
-    connect( m_findPart, TQT_SIGNAL( canceled() ),
-             this, TQT_SLOT( slotStopAnimationSearching() ) );
-
-    connect( m_findPart, TQT_SIGNAL( findClosed() ),
-             this, TQT_SLOT( slotFindClosed() ) );
+    connect( m_findPart, TQ_SIGNAL( started() ),
+             this, TQ_SLOT( slotStarted() ) );
+    connect( m_findPart, TQ_SIGNAL( started() ),
+             this, TQ_SLOT( slotStartAnimationSearching() ) );
+    connect( m_findPart, TQ_SIGNAL( clear() ),
+             this, TQ_SLOT( slotClear() ) );
+    connect( m_findPart, TQ_SIGNAL( newItems( const KFileItemList & ) ),
+             this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) );
+    connect( m_findPart, TQ_SIGNAL( finished() ), // can't name it completed, it conflicts with a KROP signal
+             this, TQ_SLOT( slotCompleted() ) );
+    connect( m_findPart, TQ_SIGNAL( finished() ),
+             this, TQ_SLOT( slotStopAnimationSearching() ) );
+    connect( m_findPart, TQ_SIGNAL( canceled() ),
+             this, TQ_SLOT( slotCanceled() ) );
+    connect( m_findPart, TQ_SIGNAL( canceled() ),
+             this, TQ_SLOT( slotStopAnimationSearching() ) );
+
+    connect( m_findPart, TQ_SIGNAL( findClosed() ),
+             this, TQ_SLOT( slotFindClosed() ) );
 
     emit findOpened( this );
 
diff --git a/libkonq/konq_dirpart.h b/libkonq/konq_dirpart.h
index 4a8d82cca..1b71eb125 100644
--- a/libkonq/konq_dirpart.h
+++ b/libkonq/konq_dirpart.h
@@ -38,7 +38,7 @@ class KonqDirPartBrowserExtension;
 
 class LIBKONQ_EXPORT KonqDirPart: public KParts::ReadOnlyPart
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class KonqDirPartBrowserExtension;
 
diff --git a/libkonq/konq_drag.h b/libkonq/konq_drag.h
index c30bbe49b..e2a75133c 100644
--- a/libkonq/konq_drag.h
+++ b/libkonq/konq_drag.h
@@ -37,7 +37,7 @@
 // Clipboard/dnd data for: Icons + URLS + isCut
 class LIBKONQ_EXPORT KonqIconDrag : public TQIconDrag
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonqIconDrag( TQWidget * dragSource, const char* name = 0 );
@@ -65,7 +65,7 @@ protected: // KDE4: private. And d pointer...
  */
 class LIBKONQ_EXPORT KonqIconDrag2 : public KonqIconDrag
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonqIconDrag2( TQWidget * dragSource );
diff --git a/libkonq/konq_faviconmgr.h b/libkonq/konq_faviconmgr.h
index 48c345bcd..083c7e7df 100644
--- a/libkonq/konq_faviconmgr.h
+++ b/libkonq/konq_faviconmgr.h
@@ -30,7 +30,7 @@
  */
 class LIBKONQ_EXPORT KonqFavIconMgr : public TQObject, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 public:
     /**
diff --git a/libkonq/konq_filetip.cpp b/libkonq/konq_filetip.cpp
index 8ad1e0d6f..5bc3de86b 100644
--- a/libkonq/konq_filetip.cpp
+++ b/libkonq/konq_filetip.cpp
@@ -114,7 +114,7 @@ void KonqFileTip::setItem( KFileItem *item, const TQRect &rect, const TQPixmap *
         // Don't start immediately, because the user could move the mouse over another item
         // This avoids a quick sequence of started preview-jobs
         m_timer->disconnect( this );
-        connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(startDelayed()));
+        connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(startDelayed()));
         m_timer->start( 300, true );
     }
 }
@@ -234,7 +234,7 @@ void KonqFileTip::showTip()
     if ( text.isEmpty() ) return;
 
     m_timer->disconnect( this );
-    connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hideTip()));
+    connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hideTip()));
     m_timer->start( 15000, true );
 
     m_textLabel->setText( text );
@@ -261,14 +261,14 @@ void KonqFileTip::startDelayed()
         oneItem.append( m_item );
 
         m_previewJob = TDEIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0);
-        connect( m_previewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
-                 this, TQT_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) );
-        connect( m_previewJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-                 this, TQT_SLOT( gotPreviewResult() ) );
+        connect( m_previewJob, TQ_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
+                 this, TQ_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) );
+        connect( m_previewJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+                 this, TQ_SLOT( gotPreviewResult() ) );
     }
 
     m_timer->disconnect( this );
-    connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showTip()));
+    connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showTip()));
     m_timer->start( 400, true );
 }
 
diff --git a/libkonq/konq_filetip.h b/libkonq/konq_filetip.h
index 4bbc9d0e2..7a418510f 100644
--- a/libkonq/konq_filetip.h
+++ b/libkonq/konq_filetip.h
@@ -37,7 +37,7 @@ class TQTimer;
 
 class LIBKONQ_EXPORT KonqFileTip : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KonqFileTip( TQScrollView *parent );
diff --git a/libkonq/konq_historymgr.cpp b/libkonq/konq_historymgr.cpp
index 25cfef345..ac6916c81 100644
--- a/libkonq/konq_historymgr.cpp
+++ b/libkonq/konq_historymgr.cpp
@@ -61,7 +61,7 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name )
     // and load the history
     loadHistory();
 
-    connect( m_updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotEmitUpdated() ));
+    connect( m_updateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotEmitUpdated() ));
 }
 
 
diff --git a/libkonq/konq_historymgr.h b/libkonq/konq_historymgr.h
index c4cc6a9b1..ad704868d 100644
--- a/libkonq/konq_historymgr.h
+++ b/libkonq/konq_historymgr.h
@@ -74,7 +74,7 @@ protected:
 class LIBKONQ_EXPORT KonqHistoryManager : public KParts::HistoryProvider,
 			   public KonqHistoryComm
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static KonqHistoryManager *kself() {
diff --git a/libkonq/konq_iconviewwidget.cpp b/libkonq/konq_iconviewwidget.cpp
index 995b51ebc..09ed599fd 100644
--- a/libkonq/konq_iconviewwidget.cpp
+++ b/libkonq/konq_iconviewwidget.cpp
@@ -121,17 +121,17 @@ KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WF
       m_bSetGridX( !kdesktop ) /* No line breaking on the desktop */
 {
     d = new KonqIconViewWidgetPrivate;
-    connect( this, TQT_SIGNAL( dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ),
-             this, TQT_SLOT( slotDropped( TQDropEvent*, const TQValueList<TQIconDragItem> & ) ) );
+    connect( this, TQ_SIGNAL( dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ),
+             this, TQ_SLOT( slotDropped( TQDropEvent*, const TQValueList<TQIconDragItem> & ) ) );
 
-    connect( this, TQT_SIGNAL( selectionChanged() ),
-             this, TQT_SLOT( slotSelectionChanged() ) );
+    connect( this, TQ_SIGNAL( selectionChanged() ),
+             this, TQ_SLOT( slotSelectionChanged() ) );
 
     kapp->addKipcEventMask( KIPC::IconChanged );
-    connect( kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int)) );
-    connect( this, TQT_SIGNAL(onItem(TQIconViewItem *)), TQT_SLOT(slotOnItem(TQIconViewItem *)) );
-    connect( this, TQT_SIGNAL(onViewport()), TQT_SLOT(slotOnViewport()) );
-    connect( this, TQT_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)), TQT_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
+    connect( kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) );
+    connect( this, TQ_SIGNAL(onItem(TQIconViewItem *)), TQ_SLOT(slotOnItem(TQIconViewItem *)) );
+    connect( this, TQ_SIGNAL(onViewport()), TQ_SLOT(slotOnViewport()) );
+    connect( this, TQ_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)), TQ_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
 
     m_pSettings = KonqFMSettings::settings();  // already needed in setItemTextPos(), calculateGridX()
     d->bBoostPreview = boostPreview();
@@ -284,7 +284,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
                     else {
                         kdDebug(1203) << "we go ahead.." << endl;
                         d->m_movieBlocked++;
-                        TQTimer::singleShot(300, this, TQT_SLOT(slotReenableAnimation()));
+                        TQTimer::singleShot(300, this, TQ_SLOT(slotReenableAnimation()));
                         d->m_movie->restart();
                         d->m_movie->unpause();
                     }
@@ -307,8 +307,8 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
                         }
                         if (!hasPixmap && backgroundMode() != NoBackground)
                            d->m_movie->setBackgroundColor( viewport()->backgroundColor() );
-                        d->m_movie->connectUpdate( this, TQT_SLOT( slotMovieUpdate(const TQRect &) ) );
-                        d->m_movie->connectStatus( TQT_TQOBJECT(this), TQT_SLOT( slotMovieStatus(int) ) );
+                        d->m_movie->connectUpdate( this, TQ_SLOT( slotMovieUpdate(const TQRect &) ) );
+                        d->m_movie->connectStatus( this, TQ_SLOT( slotMovieStatus(int) ) );
                         d->movieFileName = d->pActiveItem->mouseOverAnimation();
                         d->pActiveItem->setAnimated( true );
                     }
@@ -356,7 +356,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
         if (!d->pSoundTimer)
         {
             d->pSoundTimer = new TQTimer(this);
-            connect(d->pSoundTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotStartSoundPreview()));
+            connect(d->pSoundTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotStartSoundPreview()));
         }
         if (d->pSoundTimer->isActive())
             d->pSoundTimer->stop();
@@ -394,7 +394,7 @@ void KonqIconViewWidget::slotOnViewport()
             d->m_movie->pause();
             d->m_movieBlocked++;
             kdDebug(1203) << "on viewport, blocking" << endl;
-            TQTimer::singleShot(300, this, TQT_SLOT(slotReenableAnimation()));
+            TQTimer::singleShot(300, this, TQ_SLOT(slotReenableAnimation()));
         }
 #endif
         d->pActiveItem->refreshIcon( true );
@@ -561,7 +561,7 @@ bool KonqIconViewWidget::initConfig( bool bInit )
       if ( itemTextBg.isValid() )
           setItemTextBackground( itemTextBg );
       else
-          setItemTextBackground( Qt::NoBrush );
+          setItemTextBackground( TQt::NoBrush );
     }
 
     bool on = m_pSettings->showFileTips() && TQToolTip::isGloballyEnabled();
@@ -840,7 +840,7 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force )
       KLibFactory *factory = KLibLoader::self()->factory("konq_sound");
       if (factory)
         d->pSoundPlayer = static_cast<KonqSoundPlayer *>(
-          factory->create(TQT_TQOBJECT(this), 0, "KonqSoundPlayer"));
+          factory->create(this, 0, "KonqSoundPlayer"));
       d->bSoundPreviews = (d->pSoundPlayer != 0L);
     }
 
@@ -874,10 +874,10 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force )
     d->pPreviewJob = TDEIO::filePreview( items, size, size, iconSize,
         m_pSettings->textPreviewIconTransparency(), true /* scale */,
         true /* save */, &(d->previewSettings) );
-    connect( d->pPreviewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
-             this, TQT_SLOT( slotPreview( const KFileItem *, const TQPixmap & ) ) );
-    connect( d->pPreviewJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             this, TQT_SLOT( slotPreviewResult() ) );
+    connect( d->pPreviewJob, TQ_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
+             this, TQ_SLOT( slotPreview( const KFileItem *, const TQPixmap & ) ) );
+    connect( d->pPreviewJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             this, TQ_SLOT( slotPreviewResult() ) );
 }
 
 void KonqIconViewWidget::stopImagePreview()
@@ -1300,7 +1300,7 @@ void KonqIconViewWidget::doubleClickTimeout()
             if ( url.isLocalFile() && (url.directory(false) == TDEGlobalSettings::trashPath() || url.path(1).startsWith(TDEGlobalSettings::trashPath())))
                 brenameTrash = true;
 
-            if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == Qt::LeftButton && item->textRect( false ).contains(e.pos()))
+            if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == TQt::LeftButton && item->textRect( false ).contains(e.pos()))
             {
                 if( d->pActivateDoubleClick->isActive () )
                     d->pActivateDoubleClick->stop();
@@ -1378,7 +1378,7 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e )
          bool brenameTrash =false;
          if ( url.isLocalFile() && (url.directory(false) == TDEGlobalSettings::trashPath() || url.path(1).startsWith(TDEGlobalSettings::trashPath())))
              brenameTrash = true;
-         if ( !brenameTrash && !TDEGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == Qt::LeftButton && item->textRect( false ).contains(e->pos())&& !d->firstClick &&  url.isLocalFile() && (!url.protocol().find("device", 0, false)==0))
+         if ( !brenameTrash && !TDEGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == TQt::LeftButton && item->textRect( false ).contains(e->pos())&& !d->firstClick &&  url.isLocalFile() && (!url.protocol().find("device", 0, false)==0))
          {
              d->firstClick = true;
              d->mousePos = e->pos();
@@ -1386,7 +1386,7 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e )
              if (!d->pActivateDoubleClick)
              {
                  d->pActivateDoubleClick = new TQTimer(this);
-                 connect(d->pActivateDoubleClick, TQT_SIGNAL(timeout()), this, TQT_SLOT(doubleClickTimeout()));
+                 connect(d->pActivateDoubleClick, TQ_SIGNAL(timeout()), this, TQ_SLOT(doubleClickTimeout()));
              }
              if( d->pActivateDoubleClick->isActive () )
                  d->pActivateDoubleClick->stop();
diff --git a/libkonq/konq_iconviewwidget.h b/libkonq/konq_iconviewwidget.h
index d4adf7ed5..9f00e3aee 100644
--- a/libkonq/konq_iconviewwidget.h
+++ b/libkonq/konq_iconviewwidget.h
@@ -41,7 +41,7 @@ namespace TDEIO { class Job; }
  */
 class LIBKONQ_EXPORT KonqIconViewWidget : public TDEIconView
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool sortDirectoriesFirst READ sortDirectoriesFirst WRITE setSortDirectoriesFirst )
     TQ_PROPERTY( TQRect iconArea READ iconArea WRITE setIconArea )
     TQ_PROPERTY( int lineupMode READ lineupMode WRITE setLineupMode )
diff --git a/libkonq/konq_operations.cpp b/libkonq/konq_operations.cpp
index 4f754681e..0897cc2c1 100644
--- a/libkonq/konq_operations.cpp
+++ b/libkonq/konq_operations.cpp
@@ -221,8 +221,8 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm
             delete this;
             return;
         }
-        connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-                 TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+        connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+                 TQ_SLOT( slotResult( TDEIO::Job * ) ) );
     } else
         delete this;
 }
@@ -231,8 +231,8 @@ void KonqOperations::_restoreTrashedItems( const KURL::List& urls )
 {
     m_method = RESTORE;
     KonqMultiRestoreJob* job = new KonqMultiRestoreJob( urls, true );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             TQ_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
 bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int method, ConfirmationType confirmation, TQWidget* widget )
@@ -376,7 +376,7 @@ void KonqOperations::doDrop( const KFileItem * destItem, const KURL & dest, TQDr
         else
         {
             // we need to stat to get it.
-            op->_statURL( dest, op, TQT_SLOT( asyncDrop( const KFileItem * ) ) );
+            op->_statURL( dest, op, TQ_SLOT( asyncDrop( const KFileItem * ) ) );
         }
         // In both cases asyncDrop will delete op when done
 
@@ -458,7 +458,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem )
                     bool ro = desktopFile.readBoolEntry( "ReadOnly", false );
                     TQString fstype = desktopFile.readEntry( "FSType" );
                     KAutoMount* am = new KAutoMount( ro, fstype, dev, point, m_destURL.path(), false );
-                    connect( am, TQT_SIGNAL( finished() ), this, TQT_SLOT( doFileCopy() ) );
+                    connect( am, TQ_SIGNAL( finished() ), this, TQ_SLOT( doFileCopy() ) );
                 }
                 return;
             }
@@ -543,7 +543,7 @@ void KonqOperations::doFileCopy()
               linkOnly )
     {
         // Neither control nor shift are pressed => show popup menu
-        KonqIconViewWidget *iconView = tqt_dynamic_cast<KonqIconViewWidget*>(parent());
+        KonqIconViewWidget *iconView = dynamic_cast<KonqIconViewWidget*>(parent());
         bool bSetWallpaper = false;
         if ( iconView && iconView->maySetWallpaper() && lst.count() == 1 )
 	{
@@ -579,7 +579,7 @@ void KonqOperations::doFileCopy()
         if (bSetWallpaper)
             popup.insertItem(SmallIconSet("background"), i18n( "Set as &Wallpaper" ), 4 );
         popup.insertSeparator();
-        popup.insertItem(SmallIconSet("cancel"), i18n( "C&ancel" ) + "\t" + KKey( Qt::Key_Escape ).toString(), 5);
+        popup.insertItem(SmallIconSet("cancel"), i18n( "C&ancel" ) + "\t" + KKey( TQt::Key_Escape ).toString(), 5);
 
         int result = popup.exec( m_info->mousePos );
 
@@ -658,16 +658,16 @@ void KonqOperations::setOperation( TDEIO::Job * job, int method, const KURL::Lis
     m_destURL = dest;
     if ( job )
     {
-        connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-                 TQT_SLOT( slotResult( TDEIO::Job * ) ) );
-        TDEIO::CopyJob *copyJob = tqt_dynamic_cast<TDEIO::CopyJob*>(job);
-        KonqIconViewWidget *iconView = tqt_dynamic_cast<KonqIconViewWidget*>(parent());
+        connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+                 TQ_SLOT( slotResult( TDEIO::Job * ) ) );
+        TDEIO::CopyJob *copyJob = dynamic_cast<TDEIO::CopyJob*>(job);
+        KonqIconViewWidget *iconView = dynamic_cast<KonqIconViewWidget*>(parent());
         if (copyJob && iconView)
         {
-            connect(copyJob, TQT_SIGNAL(aboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)),
-                 this, TQT_SLOT(slotAboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)));
-            connect(this, TQT_SIGNAL(aboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)),
-                 iconView, TQT_SLOT(slotAboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)));
+            connect(copyJob, TQ_SIGNAL(aboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)),
+                 this, TQ_SLOT(slotAboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)));
+            connect(this, TQ_SIGNAL(aboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)),
+                 iconView, TQ_SLOT(slotAboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)));
         }
     }
     else // for link
@@ -688,10 +688,10 @@ void KonqOperations::statURL( const KURL & url, const TQObject *receiver, const
 
 void KonqOperations::_statURL( const KURL & url, const TQObject *receiver, const char *member )
 {
-    connect( this, TQT_SIGNAL( statFinished( const KFileItem * ) ), receiver, member );
+    connect( this, TQ_SIGNAL( statFinished( const KFileItem * ) ), receiver, member );
     TDEIO::StatJob * job = TDEIO::stat( url /*, false?*/ );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             TQT_SLOT( slotStatResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             TQ_SLOT( slotStatResult( TDEIO::Job * ) ) );
 }
 
 void KonqOperations::slotStatResult( TDEIO::Job * job )
@@ -763,7 +763,7 @@ KonqMultiRestoreJob::KonqMultiRestoreJob( const KURL::List& urls, bool showProgr
       m_urls( urls ), m_urlsIterator( m_urls.begin() ),
       m_progress( 0 )
 {
-  TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
+  TQTimer::singleShot(0, this, TQ_SLOT(slotStart()));
 }
 
 void KonqMultiRestoreJob::slotStart()
diff --git a/libkonq/konq_operations.h b/libkonq/konq_operations.h
index c6cef7431..ebc127189 100644
--- a/libkonq/konq_operations.h
+++ b/libkonq/konq_operations.h
@@ -36,7 +36,7 @@ class KonqMainWindow;
  */
 class LIBKONQ_EXPORT KonqOperations : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 protected:
     KonqOperations( TQWidget * parent );
     virtual ~KonqOperations();
@@ -197,7 +197,7 @@ private:
 /// Restore multiple trashed files
 class KonqMultiRestoreJob : public TDEIO::Job
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonqMultiRestoreJob( const KURL::List& urls, bool showProgressInfo );
diff --git a/libkonq/konq_pixmapprovider.cpp b/libkonq/konq_pixmapprovider.cpp
index 28d5a9992..b814af2f3 100644
--- a/libkonq/konq_pixmapprovider.cpp
+++ b/libkonq/konq_pixmapprovider.cpp
@@ -32,7 +32,7 @@ KonqPixmapProvider * KonqPixmapProvider::s_self = 0L;
 KonqPixmapProvider * KonqPixmapProvider::self()
 {
     if ( !s_self )
-	s_self = new KonqPixmapProvider( TQT_TQOBJECT(kapp), "KonqPixmapProvider" );
+	s_self = new KonqPixmapProvider( kapp, "KonqPixmapProvider" );
 
     return s_self;
 }
@@ -186,7 +186,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon
  	if ( big.mask() ) {
  	    TQBitmap mask = *big.mask();
  	    bitBlt( &mask, x, y,
-            small.mask() ? TQT_TQPIXMAP(const_cast<TQBitmap *>(small.mask())) : &small, 0, 0,
+            small.mask() ? const_cast<TQBitmap *>(small.mask()) : &small, 0, 0,
  		    small.width(), small.height(),
  		    small.mask() ? OrROP : SetROP );
  	    big.setMask( mask );
diff --git a/libkonq/konq_popupmenu.cpp b/libkonq/konq_popupmenu.cpp
index adaffe9e3..1728e83f4 100644
--- a/libkonq/konq_popupmenu.cpp
+++ b/libkonq/konq_popupmenu.cpp
@@ -287,7 +287,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list,
             name.setNum( id );
             name.prepend( isBuiltin ? "builtinservice_" : "userservice_" );
             TDEAction * act = new TDEAction( TQString((*it).m_strName).replace('&',"&&"), 0,
-                                         TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ),
+                                         this, TQ_SLOT( slotRunService() ),
                                          &m_ownActions, name );
 
             if ( !(*it).m_strIcon.isEmpty() )
@@ -430,8 +430,8 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         d->localURLSlotFired = false;
         TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(m_sViewURL);
         if (localURLJob) {
-            connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool)));
-            connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed()));
+            connect(localURLJob, TQ_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQ_SLOT(slotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool)));
+            connect(localURLJob, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotLocalURLKIODestroyed()));
             while (!d->localURLSlotFired) {
                 kapp->eventLoop()->enterLoop();
             }
@@ -501,7 +501,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
     if ( ((kpf & ShowNewWindow) != 0) && sReading  && !isEncryptedMediaFile)
     {
         TQString openStr = isKDesktop ? i18n( "&Open" ) : i18n( "Open in New &Window" );
-        TDEAction *actNewWindow = new TDEAction( openStr, "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" );
+        TDEAction *actNewWindow = new TDEAction( openStr, "window-new", 0, this, TQ_SLOT( slotPopupNewView() ), &m_ownActions, "newview" );
         actNewWindow->setToolTip( i18n( "Open item in a new window" ) );
         addAction( actNewWindow );
         addSeparator();
@@ -523,14 +523,14 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         {
             if (d->m_itemFlags & KParts::BrowserExtension::ShowCreateDirectory)
             {
-                TDEAction *actNewDir = new TDEAction( i18n( "Create &Folder..." ), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
+                TDEAction *actNewDir = new TDEAction( i18n( "Create &Folder..." ), "folder-new", 0, this, TQ_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
                 addAction( actNewDir );
                 addSeparator();
             }
         }
     } else if ( isIntoTrash ) {
         // Trashed item, offer restoring
-        act = new TDEAction( i18n( "&Restore" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" );
+        act = new TDEAction( i18n( "&Restore" ), 0, this, TQ_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" );
         addAction( act );
     }
 
@@ -598,7 +598,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
     }
     if ( isCurrentTrash )
     {
-        act = new TDEAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" );
+        act = new TDEAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, TQ_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" );
         KSimpleConfig trashConfig( "trashrc", true );
         trashConfig.setGroup( "Status" );
         act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) );
@@ -631,7 +631,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         else
            caption = i18n("&Bookmark This File");
 
-        act = new TDEAction( caption, "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" );
+        act = new TDEAction( caption, "bookmark_add", 0, this, TQ_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" );
         if (m_lstItems.count() > 1)
             act->setEnabled(false);
         if (kapp->authorizeTDEAction("bookmarks"))
@@ -915,7 +915,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                         actionName = i18n( "Open with %1" ).arg( actionName );
 
                     act = new TDEAction( actionName, (*it)->pixmap( TDEIcon::Small ), 0,
-                                       TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ),
+                                       this, TQ_SLOT( slotRunService() ),
                                        &m_ownActions, nam.prepend( "appservice_" ) );
                     addAction( act, menu );
 
@@ -932,12 +932,12 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                 {
                     openWithActionName = i18n( "&Open With..." );
                 }
-                TDEAction *openWithAct = new TDEAction( openWithActionName, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
+                TDEAction *openWithAct = new TDEAction( openWithActionName, 0, this, TQ_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
                 addAction( openWithAct, menu );
             }
             else // no app offers -> Open With...
             {
-                act = new TDEAction( i18n( "&Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
+                act = new TDEAction( i18n( "&Open With..." ), 0, this, TQ_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
                 addAction( act );
             }
 
@@ -991,7 +991,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
 
     if ( KPropertiesDialog::canDisplay( m_lstItems ) && (kpf & ShowProperties) )
     {
-        act = new TDEAction( i18n( "&Properties" ), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupProperties() ),
+        act = new TDEAction( i18n( "&Properties" ), "edit", 0, this, TQ_SLOT( slotPopupProperties() ),
                            &m_ownActions, "properties" );
         addAction( act );
     }
@@ -1005,7 +1005,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         if ( KFileShare::authorization() == KFileShare::Authorized )
         {
             addSeparator();
-            act = new TDEAction( i18n("Share"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenShareFileDialog() ),
+            act = new TDEAction( i18n("Share"), 0, this, TQ_SLOT( slotOpenShareFileDialog() ),
                                &m_ownActions, "sharefile" );
             addAction( act );
         }
@@ -1087,7 +1087,7 @@ void KonqPopupMenu::slotPopupAddToBookmark()
 
 void KonqPopupMenu::slotRunService()
 {
-  TQCString senderName = TQT_TQOBJECT_CONST(sender())->name();
+  TQCString senderName = sender()->name();
   int id = senderName.mid( senderName.find( '_' ) + 1 ).toInt();
 
   // Is it a usual service (application)
@@ -1185,7 +1185,7 @@ void KonqPopupMenu::addPlugins()
         KonqPopupMenuPlugin *plugin =
             KParts::ComponentFactory::
             createInstanceFromLibrary<KonqPopupMenuPlugin>( TQFile::encodeName( (*iterator)->library() ),
-                                                            TQT_TQOBJECT(this),
+                                                            this,
                                                             (*iterator)->name().latin1() );
         if ( !plugin )
             continue;
diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h
index 5785d53ab..d50142c2f 100644
--- a/libkonq/konq_popupmenu.h
+++ b/libkonq/konq_popupmenu.h
@@ -55,7 +55,7 @@ class KBookmarkManager;
  */
 class LIBKONQ_EXPORT KonqPopupMenu : public TQPopupMenu, public KonqXMLGUIClient
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   /**
@@ -210,7 +210,7 @@ private:
 };
 
 class LIBKONQ_EXPORT KonqPopupMenuPlugin : public TQObject, public KonqXMLGUIClient {
-	Q_OBJECT
+	TQ_OBJECT
 public:
   /**
   * Constructor
diff --git a/libkonq/konq_propsview.cpp b/libkonq/konq_propsview.cpp
index af7a65eae..f72aee191 100644
--- a/libkonq/konq_propsview.cpp
+++ b/libkonq/konq_propsview.cpp
@@ -34,6 +34,8 @@
 
 #include <ksimpleconfig.h>
 
+#include "konq_sort_constants.h"
+
 static TQPixmap wallpaperPixmap( const TQString & _wallpaper )
 {
     TQString key = "wallpapers/";
@@ -65,10 +67,11 @@ static TQPixmap wallpaperPixmap( const TQString & _wallpaper )
 struct KonqPropsView::Private
 {
    TQStringList* previewsToShow;
+   TextSortOrder textSortOrder;
    bool previewsEnabled:1;
    bool caseInsensitiveSort:1;
-   bool hiddenfirst:1;
    bool dirsfirst:1;
+   bool hiddenfirst:1;
    bool descending:1;
    TQString sortcriterion;
 };
@@ -91,6 +94,7 @@ KonqPropsView::KonqPropsView( TDEInstance * instance, KonqPropsView * defaultPro
   m_iIconSize = config->readNumEntry( "IconSize", 0 );
   m_iItemTextPos = config->readNumEntry( "ItemTextPos", TQIconView::Bottom );
   d->sortcriterion = config->readEntry( "SortingCriterion", "sort_nci" );
+  d->textSortOrder = (TextSortOrder) config->readNumEntry( "TextSortOrder", 1 );
   d->dirsfirst = config->readBoolEntry( "SortDirsFirst", true );
   d->hiddenfirst = config->readBoolEntry( "SortHiddenFirst", true );
   d->descending = config->readBoolEntry( "SortDescending", false );
@@ -140,6 +144,11 @@ bool KonqPropsView::isCaseInsensitiveSort() const
    return d->caseInsensitiveSort;
 }
 
+TextSortOrder KonqPropsView::getSortOrder() const
+{
+   return d->textSortOrder;
+}
+
 bool KonqPropsView::isDirsFirst() const
 {
    return d->dirsfirst;
@@ -206,6 +215,7 @@ bool KonqPropsView::enterDir( const KURL & dir )
     m_iIconSize = m_defaultProps->iconSize();
     m_iItemTextPos = m_defaultProps->itemTextPos();
     d->sortcriterion = m_defaultProps->sortCriterion();
+    d->textSortOrder = m_defaultProps->getSortOrder();
     d->dirsfirst = m_defaultProps->isDirsFirst();
     d->hiddenfirst = m_defaultProps->isHiddenFirst();
     d->descending = m_defaultProps->isDescending();
@@ -226,6 +236,7 @@ bool KonqPropsView::enterDir( const KURL & dir )
     m_iIconSize = config->readNumEntry( "IconSize", m_iIconSize );
     m_iItemTextPos = config->readNumEntry( "ItemTextPos", m_iItemTextPos );
     d->sortcriterion = config->readEntry( "SortingCriterion" , d->sortcriterion );
+    d->textSortOrder = (TextSortOrder) config->readNumEntry( "TextSortOrder", d->textSortOrder );
     d->dirsfirst = config->readBoolEntry( "SortDirsFirst", d->dirsfirst );
     d->hiddenfirst = config->readBoolEntry( "SortHiddenFirst", d->hiddenfirst );
     d->descending = config->readBoolEntry( "SortDescending", d->descending );
@@ -324,6 +335,20 @@ void KonqPropsView::setSortCriterion( const TQString &criterion )
     }
 }
 
+void KonqPropsView::setSortOrder( TextSortOrder order)
+{
+    d->textSortOrder = order;
+    if ( m_defaultProps && !m_bSaveViewPropertiesLocally ) {
+        m_defaultProps->setSortOrder( order );
+    }
+    else if (currentConfig())
+    {
+        TDEConfigGroupSaver cgs(currentConfig(), currentGroup());
+        currentConfig()->writeEntry( "TextSortOrder", d->textSortOrder );
+        currentConfig()->sync();
+    }
+}
+
 void KonqPropsView::setDirsFirst( bool first)
 {
     d->dirsfirst = first;
diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h
index 84ffcf029..132c53a55 100644
--- a/libkonq/konq_propsview.h
+++ b/libkonq/konq_propsview.h
@@ -26,6 +26,8 @@
 #include <kurl.h>
 #include <libkonq_export.h>
 
+#include "konq_sort_constants.h"
+
 class TDEInstance;
 class TDEConfigBase;
 class TDEConfig;
@@ -90,6 +92,9 @@ public:
   void setSortCriterion( const TQString &criterion );
   const TQString& sortCriterion() const;
 
+  void setSortOrder( TextSortOrder order);
+  TextSortOrder getSortOrder() const;
+
   void setDirsFirst ( bool first );
   bool isDirsFirst() const;
 
diff --git a/libkonq/konq_settings.cpp b/libkonq/konq_settings.cpp
index 41460e8ae..fe61d150a 100644
--- a/libkonq/konq_settings.cpp
+++ b/libkonq/konq_settings.cpp
@@ -121,6 +121,8 @@ void KonqFMSettings::init( TDEConfig * config )
 
   /// true if TQString::localeAwareCompare is case sensitive (it usually isn't, when LC_COLLATE is set)
   d->localeAwareCompareIsCaseSensitive = TQString( "a" ).localeAwareCompare( "B" ) > 0; // see #40131
+
+  m_doubleClickMoveToParent = config->readBoolEntry("DoubleClickMoveToParent", true);
 }
 
 bool KonqFMSettings::shouldEmbed( const TQString & serviceType ) const
diff --git a/libkonq/konq_settings.h b/libkonq/konq_settings.h
index daca8babe..52e9ac3b6 100644
--- a/libkonq/konq_settings.h
+++ b/libkonq/konq_settings.h
@@ -81,12 +81,13 @@ public:
   bool underlineLink() const { return m_underlineLink; }
   bool fileSizeInBytes() const { return m_fileSizeInBytes; }
   bool alwaysNewWin() const { return m_alwaysNewWin; }
+  bool doubleClickMoveToParent() const { return m_doubleClickMoveToParent; }
   const TQString & homeURL() const { return m_homeURL; }
 
   bool showFileTips() const {return m_showFileTips; }
   bool showPreviewsInFileTips() const;
   int numFileTips() const {return m_numFileTips; }
-    bool renameIconDirectly() const;
+  bool renameIconDirectly() const;
 
   // Font settings
   const TQFont& standardFont() const { return m_standardFont; }
@@ -107,7 +108,7 @@ private:
   bool m_underlineLink;
   bool m_fileSizeInBytes;
   bool m_alwaysNewWin;
-  bool m_bTreeFollow;
+  bool m_doubleClickMoveToParent;
 
   TQMap<TQString, TQString> m_embedMap;
 
diff --git a/libkonq/konq_sort_constants.h b/libkonq/konq_sort_constants.h
new file mode 100644
index 000000000..f6c695b19
--- /dev/null
+++ b/libkonq/konq_sort_constants.h
@@ -0,0 +1,13 @@
+#ifndef KONQ_SORT_CONSTANTS_H
+#define KONQ_SORT_CONSTANTS_H
+
+typedef unsigned short TextSortOrder;
+  // Can't use name 'SortOrder' because that's part of TQt
+
+enum {
+  UNICODE_UNMODIFIED      = 0,
+  LOCALE_UNMODIFIED       = 1,
+  UNICODE_CASEINSENSITIVE = 2,
+} TextSortOrders;
+
+#endif // KONQ_SORT_CONSTANTS_H
diff --git a/libkonq/konq_sound.cpp b/libkonq/konq_sound.cpp
index b40c33858..a0c95c19b 100644
--- a/libkonq/konq_sound.cpp
+++ b/libkonq/konq_sound.cpp
@@ -115,14 +115,14 @@ public:
 
 protected:
 	virtual TQObject *createObject(TQObject * = 0, const char * = 0,
-		const char *className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+		const char *className = "TQObject", const TQStringList &args = TQStringList());
 };
 
 TQObject *KonqSoundFactory::createObject(TQObject *, const char *,
 	const char *className, const TQStringList &)
 {
 	if (qstrcmp(className, "KonqSoundPlayer") == 0)
-		return TQT_TQOBJECT(new KonqSoundPlayerImpl());
+		return new KonqSoundPlayerImpl();
 	return 0;
 }
 
diff --git a/libkonq/konq_string_compare.h b/libkonq/konq_string_compare.h
new file mode 100644
index 000000000..8d17d409f
--- /dev/null
+++ b/libkonq/konq_string_compare.h
@@ -0,0 +1,51 @@
+#ifndef KONQ_STRING_COMPARE_H
+#define KONQ_STRING_COMPARE_H
+
+#include "konq_sort_constants.h"
+
+static inline int stringCompare(
+  const TextSortOrder sortorder,
+  const TQString& a,
+  const TQString& b
+)
+{
+  // Our caller probably determined sortorder from KonqPropsView::getSortOrder()
+  // but we have a reasonable fallback position for bogus values.
+
+  switch(sortorder) {
+
+    case UNICODE_UNMODIFIED:
+      /*
+       * Strictly character code(point) numeric comparison as defined
+       * by the Unicode Standard that is backward compatible with the
+       * the ASCII standard.
+   . */
+      return a.compare( b );
+      break;
+
+    case UNICODE_CASEINSENSITIVE:
+      /*
+       * This is the traditional "case-insensitive" variation on character
+       * code order that ensures that ASCII lowercase and uppercase alphabetic
+       * characters are are grouped together instead of being separated by
+       * non-alphabetic ASCII characters [ \ ] ^ _ `
+      */
+      return a.lower().compare( b.lower() );
+      break;
+
+    case LOCALE_UNMODIFIED:
+      /*
+       * This is the pure locale-aware comparison as defined by ICU.
+       * Note: if LC_COLLATE == 'C' or 'Posix', this will produce same
+       * result as UNICODE_UNMODIFIED.
+      */
+      return a.localeAwareCompare( b );
+      break;
+
+    default: // Treat as UNICODE_UNMODIFIED
+      return a.compare( b );
+      break;
+  }
+}
+
+#endif // KONQ_STRING_COMPARE_H
diff --git a/libkonq/konq_undo.cpp b/libkonq/konq_undo.cpp
index 51d85587d..9272bbf5c 100644
--- a/libkonq/konq_undo.cpp
+++ b/libkonq/konq_undo.cpp
@@ -93,14 +93,14 @@ KonqCommandRecorder::KonqCommandRecorder( KonqCommand::Type op, const KURL::List
   d->m_cmd.m_valid = true;
   d->m_cmd.m_src = src;
   d->m_cmd.m_dst = dst;
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
 
   if ( op != KonqCommand::MKDIR ) {
-      connect( job, TQT_SIGNAL( copyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ),
-               this, TQT_SLOT( slotCopyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ) );
-      connect( job, TQT_SIGNAL( copyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ),
-               this, TQT_SLOT( slotCopyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ) );
+      connect( job, TQ_SIGNAL( copyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ),
+               this, TQ_SLOT( slotCopyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ) );
+      connect( job, TQ_SIGNAL( copyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ),
+               this, TQ_SLOT( slotCopyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ) );
   }
 
   KonqUndoManager::incRef();
@@ -411,8 +411,8 @@ void KonqUndoManager::undoStep()
       undoRemovingDirectories();
 
   if ( d->m_currentJob )
-    connect( d->m_currentJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+    connect( d->m_currentJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
 void KonqUndoManager::undoMakingDirectories()
diff --git a/libkonq/konq_undo.h b/libkonq/konq_undo.h
index fa908de67..17af645b5 100644
--- a/libkonq/konq_undo.h
+++ b/libkonq/konq_undo.h
@@ -70,7 +70,7 @@ struct KonqCommand
 
 class KonqCommandRecorder : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KonqCommandRecorder( KonqCommand::Type op, const KURL::List &src, const KURL &dst, TDEIO::Job *job );
   virtual ~KonqCommandRecorder();
@@ -88,7 +88,7 @@ private:
 
 class LIBKONQ_EXPORT KonqUndoManager : public TQObject, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
   friend class KonqUndoJob;
 public:
diff --git a/libkonq/libkonq_export.h b/libkonq/libkonq_export.h
index 4e10a4ec0..7f489e84f 100644
--- a/libkonq/libkonq_export.h
+++ b/libkonq/libkonq_export.h
@@ -27,7 +27,7 @@
 /* needed, because e.g. Q_OS_UNIX is so frequently used */
 #include <tqglobal.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 
 #else /* Q_OS_UNIX */
 
diff --git a/nsplugins/README b/nsplugins/README
index d465ddc24..769b3ee08 100644
--- a/nsplugins/README
+++ b/nsplugins/README
@@ -79,11 +79,11 @@ it can be resized, focused and unfocused with standard X11 functions
 as long as we know its' window ID.
 
 PluginPart gets a NSPluginInstance (from NSPluginLoader::newInstance),
-which it sees as a regular QWidget. e.g. it can resize the QWidget and
+which it sees as a regular TQWidget. e.g. it can resize the TQWidget and
 nspluginviewer's window will resize.
 
 This magic happens thanks to KJavaEmbed which NSPluginInstance inherits.
-KJavaEmbed inherits QWidget and hooks up to QWidget's events, mapping
+KJavaEmbed inherits TQWidget and hooks up to TQWidget's events, mapping
 those events to the appropriate X11 window operations.
 Resizing, focusing in and out is about all PluginPart could ever do
 with the nspluginviewer.
diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp
index 037798cb2..da6c5d780 100644
--- a/nsplugins/kcm_nsplugins.cpp
+++ b/nsplugins/kcm_nsplugins.cpp
@@ -69,9 +69,9 @@ static bool checkSearchPathTimestamps( TQStringList paths, TQStringList timestam
         TQDateTime current = lastChanged( *it );
         // store non-existent directory as "N" string rather than empty string, TDEConfig
         // has a bug with storing a list of empty items
-        if( *t == "N" ? !current.isNull() : current != TQDateTime::fromString( *t, Qt::ISODate ))
+        if( *t == "N" ? !current.isNull() : current != TQDateTime::fromString( *t, TQt::ISODate ))
             changed = true;
-        currentTimestamps.append( current.isNull() ? "N" : current.toString( Qt::ISODate ));
+        currentTimestamps.append( current.isNull() ? "N" : current.toString( TQt::ISODate ));
     }
     if( changed )
     {
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index 4a19140b5..2df8ed163 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -69,7 +69,7 @@ void NSPluginInstance::init(const TQCString& app, const TQCString& obj)
     if (cfg.readBoolEntry("demandLoad", false)) {
         _button = new TQPushButton(i18n("Start Plugin"), dynamic_cast<EMBEDCLASS*>(this));
         _layout->addWidget(_button, 0, 0);
-        connect(_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadPlugin()));
+        connect(_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(loadPlugin()));
         show();
     } else {
         _button = 0L;
@@ -80,7 +80,7 @@ void NSPluginInstance::init(const TQCString& app, const TQCString& obj)
         // and use 'resize_count' to wait for that one more resize to come (plus a timer
         // for a possible timeout). Only then flash is actually initialized ('inited' is true).
         resize_count = 1;
-        TQTimer::singleShot( 1000, this, TQT_SLOT( doLoadPlugin()));
+        TQTimer::singleShot( 1000, this, TQ_SLOT( doLoadPlugin()));
     }
 }
 
@@ -203,8 +203,8 @@ NSPluginLoader::NSPluginLoader()
   // trap dcop register events
   kapp->dcopClient()->setNotifications(true);
   TQObject::connect(kapp->dcopClient(),
-                   TQT_SIGNAL(applicationRegistered(const TQCString&)),
-                   this, TQT_SLOT(applicationRegistered(const TQCString&)));
+                   TQ_SIGNAL(applicationRegistered(const TQCString&)),
+                   this, TQ_SLOT(applicationRegistered(const TQCString&)));
 
   // load configuration
   TDEConfig cfg("kcmnspluginrc", false);
@@ -337,8 +337,8 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType)
    int pid = (int)getpid();
    _dcopid.sprintf("nspluginviewer-%d", pid);
 
-   connect( _process, TQT_SIGNAL(processExited(TDEProcess*)),
-            this, TQT_SLOT(processTerminated(TDEProcess*)) );
+   connect( _process, TQ_SIGNAL(processExited(TDEProcess*)),
+            this, TQ_SLOT(processTerminated(TDEProcess*)) );
 
    // find the external viewer process
    TQString viewer = TDEGlobal::dirs()->findExe("nspluginviewer");
diff --git a/nsplugins/nspluginloader.h b/nsplugins/nspluginloader.h
index 988697848..a0c55c00a 100644
--- a/nsplugins/nspluginloader.h
+++ b/nsplugins/nspluginloader.h
@@ -45,7 +45,7 @@ class TQGridLayout;
 
 class NSPluginInstance : public EMBEDCLASS
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
     NSPluginInstance(TQWidget *parent);
@@ -80,7 +80,7 @@ private: // wrappers
 
 class NSPluginLoader : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   NSPluginLoader();
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index 99cbc780f..3e5530f3a 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -217,7 +217,7 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject
     // Only create this if we have no parent since the parent part is
     // responsible for "Save As" then
     if (!parent || !parent->inherits("Part")) {
-        new TDEAction(i18n("&Save As..."), CTRL+Key_S, this, TQT_SLOT(saveAs()), actionCollection(), "saveDocument");
+        new TDEAction(i18n("&Save As..."), CTRL+Key_S, this, TQ_SLOT(saveAs()), actionCollection(), "saveDocument");
         setXMLFile("nspluginpart.rc");
     }
 
@@ -228,12 +228,12 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject
     // create a canvas to insert our widget
     _canvas = new PluginCanvasWidget( parentWidget, widgetName );
     //_canvas->setFocusPolicy( TQWidget::ClickFocus );
-    _canvas->setFocusPolicy( TQ_WheelFocus );
+    _canvas->setFocusPolicy( TQWidget::WheelFocus );
     _canvas->setBackgroundMode( TQWidget::NoBackground );
     setWidget(_canvas);
     _canvas->show();
-    TQObject::connect( _canvas, TQT_SIGNAL(resized(int,int)),
-                      this, TQT_SLOT(pluginResized(int,int)) );
+    TQObject::connect( _canvas, TQ_SIGNAL(resized(int,int)),
+                      this, TQ_SLOT(pluginResized(int,int)) );
 }
 
 
diff --git a/nsplugins/plugin_part.h b/nsplugins/plugin_part.h
index f3fa68984..e124aabd0 100644
--- a/nsplugins/plugin_part.h
+++ b/nsplugins/plugin_part.h
@@ -61,7 +61,7 @@ private:
 
 class PluginFactory : public KParts::Factory
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   PluginFactory();
@@ -84,7 +84,7 @@ private:
 
 class PluginCanvasWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   PluginCanvasWidget(TQWidget *parent=0, const char *name=0)
@@ -100,7 +100,7 @@ signals:
 
 class PluginPart: public KParts::ReadOnlyPart
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
              const char *name, const TQStringList &args = TQStringList());
@@ -137,7 +137,7 @@ private:
 
 class PluginLiveConnectExtension : public KParts::LiveConnectExtension
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     PluginLiveConnectExtension(PluginPart* part);
     virtual ~PluginLiveConnectExtension();
diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp
index daccd1bcf..7ac24ee2c 100644
--- a/nsplugins/test/testnsplugin.cpp
+++ b/nsplugins/test/testnsplugin.cpp
@@ -44,9 +44,9 @@ TestNSPlugin::TestNSPlugin()
    m_layout = new TQHBoxLayout( m_client );
 
    // file menu
-   KStdAction::openNew( this, TQT_SLOT(newView()), actionCollection());
-   KStdAction::close( this, TQT_SLOT(closeView()), actionCollection());
-   KStdAction::quit( kapp, TQT_SLOT(quit()), actionCollection());
+   KStdAction::openNew( this, TQ_SLOT(newView()), actionCollection());
+   KStdAction::close( this, TQ_SLOT(closeView()), actionCollection());
+   KStdAction::quit( kapp, TQ_SLOT(quit()), actionCollection());
 
    createGUI( "testnspluginui.rc" );
 }
@@ -88,8 +88,8 @@ void TestNSPlugin::newView()
    if ( win )
    {
       m_plugins.append( win );
-      connect( win, TQT_SIGNAL(destroyed(NSPluginInstance *)),
-               this, TQT_SLOT(viewDestroyed(NSPluginInstance *)) );
+      connect( win, TQ_SIGNAL(destroyed(NSPluginInstance *)),
+               this, TQ_SLOT(viewDestroyed(NSPluginInstance *)) );
       m_layout->addWidget( win );
       win->show();
    } else
diff --git a/nsplugins/test/testnsplugin.h b/nsplugins/test/testnsplugin.h
index 252cea2c8..3c1b2bdc3 100644
--- a/nsplugins/test/testnsplugin.h
+++ b/nsplugins/test/testnsplugin.h
@@ -34,7 +34,7 @@ class NSPluginInstance;
 
 class TestNSPlugin : public TDEMainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TestNSPlugin();
diff --git a/nsplugins/viewer/glibevents.cpp b/nsplugins/viewer/glibevents.cpp
index fe059d1ee..e8bc766a1 100644
--- a/nsplugins/viewer/glibevents.cpp
+++ b/nsplugins/viewer/glibevents.cpp
@@ -24,7 +24,7 @@
 GlibEvents::GlibEvents()
     {
     g_main_context_ref( g_main_context_default());
-    connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( process()));
+    connect( &timer, TQ_SIGNAL( timeout()), TQ_SLOT( process()));
     // TODO Poll for now
     timer.start( 10 );
     }
diff --git a/nsplugins/viewer/glibevents.h b/nsplugins/viewer/glibevents.h
index 396273a85..379fc4722 100644
--- a/nsplugins/viewer/glibevents.h
+++ b/nsplugins/viewer/glibevents.h
@@ -26,9 +26,9 @@
 #include <glib.h>
 
 class GlibEvents
-    : public QWidget
+    : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         GlibEvents();
         virtual ~GlibEvents();
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 5b6b9267f..2495556e4 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -616,7 +616,7 @@ NSPluginInstance::NSPluginInstance(NPP privateData, NPPluginFuncs *pluginFuncs,
    memcpy(&_pluginFuncs, pluginFuncs, sizeof(_pluginFuncs));
 
    _timer = new TQTimer( this );
-   connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(timer()) );
+   connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(timer()) );
 
    kdDebug(1431) << "NSPluginInstance::NSPluginInstance" << endl;
    kdDebug(1431) << "pdata = " << _npp->pdata << endl;
@@ -809,8 +809,8 @@ void NSPluginInstance::timer()
                 if (req.post) {
                     // create stream
                     NSPluginStream *s = new NSPluginStream( this );
-                    connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)),
-                             TQT_SLOT(streamFinished(NSPluginStreamBase*)) );
+                    connect( s, TQ_SIGNAL(finished(NSPluginStreamBase*)),
+                             TQ_SLOT(streamFinished(NSPluginStreamBase*)) );
                     _streams.append( s );
 
                     kdDebug() << "posting to " << url << endl;
@@ -828,8 +828,8 @@ void NSPluginInstance::timer()
                 } else {
                     // create stream
                     NSPluginStream *s = new NSPluginStream( this );
-                    connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)),
-                             TQT_SLOT(streamFinished(NSPluginStreamBase*)) );
+                    connect( s, TQ_SIGNAL(finished(NSPluginStreamBase*)),
+                             TQ_SLOT(streamFinished(NSPluginStreamBase*)) );
                     _streams.append( s );
 
                     kdDebug() << "getting " << url << endl;
@@ -1026,8 +1026,8 @@ void NSPluginInstance::javascriptResult(TQ_INT32 id, TQString result) {
         Request *req = i.data();
         _jsrequests.remove( i );
         NSPluginStream *s = new NSPluginStream( this );
-        connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)),
-                 TQT_SLOT(streamFinished(NSPluginStreamBase*)) );
+        connect( s, TQ_SIGNAL(finished(NSPluginStreamBase*)),
+                 TQ_SLOT(streamFinished(NSPluginStreamBase*)) );
         _streams.append( s );
 
         int len = result.length();
@@ -1254,9 +1254,9 @@ NSPluginViewer::NSPluginViewer( TQCString dcopId,
 {
     _classes.setAutoDelete( true );
     connect(TDEApplication::dcopClient(),
-            TQT_SIGNAL(applicationRemoved(const TQCString&)),
+            TQ_SIGNAL(applicationRemoved(const TQCString&)),
             this,
-            TQT_SLOT(appUnregistered(const TQCString&)));
+            TQ_SLOT(appUnregistered(const TQCString&)));
 }
 
 
@@ -1348,7 +1348,7 @@ NSPluginClass::NSPluginClass( const TQString &library,
     _NP_Shutdown = 0;
 
     _timer = new TQTimer( this );
-    connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(timer()) );
+    connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(timer()) );
 
     // check lib handle
     if (!_handle) {
@@ -1832,7 +1832,7 @@ NSPluginBufStream::NSPluginBufStream( class NSPluginInstance *instance )
     : NSPluginStreamBase( instance )
 {
     _timer = new TQTimer( this );
-    connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timer()) );
+    connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timer()) );
 }
 
 
@@ -1878,7 +1878,7 @@ NSPluginStream::NSPluginStream( NSPluginInstance *instance )
     : NSPluginStreamBase( instance ), _job(0)
 {
    _resumeTimer = new TQTimer( this );
-   connect(_resumeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(resume()));
+   connect(_resumeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(resume()));
 }
 
 
@@ -1902,15 +1902,15 @@ bool NSPluginStream::get( const TQString& url, const TQString& mimeType,
         if (reload) {
             _job->addMetaData("cache", "reload");
         }
-        connect(_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-                TQT_SLOT(data(TDEIO::Job *, const TQByteArray &)));
-        connect(_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(result(TDEIO::Job *)));
-        connect(_job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
-                TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
-        connect(_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
-                TQT_SLOT(mimetype(TDEIO::Job *, const TQString &)));
-        connect(_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
-                TQT_SLOT(redirection(TDEIO::Job *, const KURL&)));
+        connect(_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+                TQ_SLOT(data(TDEIO::Job *, const TQByteArray &)));
+        connect(_job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(result(TDEIO::Job *)));
+        connect(_job, TQ_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
+                TQ_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
+        connect(_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+                TQ_SLOT(mimetype(TDEIO::Job *, const TQString &)));
+        connect(_job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
+                TQ_SLOT(redirection(TDEIO::Job *, const KURL&)));
     }
 
     return false;
@@ -1928,15 +1928,15 @@ bool NSPluginStream::post( const TQString& url, const TQByteArray& data,
         _job->addMetaData("errorPage", "false");
         _job->addMetaData("PropagateHttpHeader", "true");
         _job->addMetaData("AllowCompressedPage", "false");
-        connect(_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-                TQT_SLOT(data(TDEIO::Job *, const TQByteArray &)));
-        connect(_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(result(TDEIO::Job *)));
-        connect(_job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
-                TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
-        connect(_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
-                TQT_SLOT(mimetype(TDEIO::Job *, const TQString &)));
-        connect(_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
-                TQT_SLOT(redirection(TDEIO::Job *, const KURL&)));
+        connect(_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+                TQ_SLOT(data(TDEIO::Job *, const TQByteArray &)));
+        connect(_job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(result(TDEIO::Job *)));
+        connect(_job, TQ_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
+                TQ_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
+        connect(_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+                TQ_SLOT(mimetype(TDEIO::Job *, const TQString &)));
+        connect(_job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
+                TQ_SLOT(redirection(TDEIO::Job *, const KURL&)));
     }
 
     return false;
diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h
index 96bb1da15..ead4a07e3 100644
--- a/nsplugins/viewer/nsplugin.h
+++ b/nsplugins/viewer/nsplugin.h
@@ -65,7 +65,7 @@ class TQTimer;
 
 class NSPluginStreamBase : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 friend class NSPluginInstance;
 public:
   NSPluginStreamBase( class NSPluginInstance *instance );
@@ -115,7 +115,7 @@ private:
 
 class NSPluginStream : public NSPluginStreamBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   NSPluginStream( class NSPluginInstance *instance );
@@ -140,7 +140,7 @@ protected:
 
 class NSPluginBufStream : public NSPluginStreamBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   NSPluginBufStream( class NSPluginInstance *instance );
@@ -159,7 +159,7 @@ protected:
 
 class NSPluginInstance : public TQObject, public virtual NSPluginInstanceIface
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -275,7 +275,7 @@ private:
 
 class NSPluginClass : public TQObject, virtual public NSPluginClassIface
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   NSPluginClass( const TQString &library, TQObject *parent, const char *name=0 );
@@ -325,7 +325,7 @@ private:
 
 class NSPluginViewer : public TQObject, virtual public NSPluginViewerIface
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
    NSPluginViewer( TQCString dcopId, TQObject *parent, const char *name=0 );
    virtual ~NSPluginViewer();
diff --git a/nsplugins/viewer/qxteventloop.h b/nsplugins/viewer/qxteventloop.h
index 230c8a32c..55c5b8698 100644
--- a/nsplugins/viewer/qxteventloop.h
+++ b/nsplugins/viewer/qxteventloop.h
@@ -49,7 +49,7 @@ class QXtEventLoopPrivate;
 
 class QXtEventLoop : public TQEventLoop
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
 public:
diff --git a/r14-xdg-update b/r14-xdg-update
index 623e69606..f51a81df6 100644
--- a/r14-xdg-update
+++ b/r14-xdg-update
@@ -3,7 +3,7 @@
 # A script to perform R14.0.0 XDG compliance updates.
 
 SCRIPT_NAME="$(basename -- "$0")"
-SCRIPT_VERSION=202202130
+SCRIPT_VERSION=202307100
 
 # This script should be needed to run only once, but corner cases
 # and file/directory permissions could cause incomplete updates.
@@ -731,7 +731,7 @@ if [ "$R14_VERSION" -lt "201310190" ]; then
     mv $PROFILE_DIR/share/config/kwinrulesrc $PROFILE_DIR/share/config/twinrulesrc 2>/dev/null
     mv $PROFILE_DIR/share/config/kwin_rules_dialogrc $PROFILE_DIR/share/config/twin_rules_dialogrc 2>/dev/null
     sed -i 's|PluginLib=kwin_|PluginLib=twin_|' $PROFILE_DIR/share/config/twinrc
-    sed -i 's|PluginLib=kwin3_|PluginLib=twin3_|' $PROFILE_DIR/share/config/twinrc
+    sed -i 's|PluginLib=kwin3_|PluginLib=twin_|' $PROFILE_DIR/share/config/twinrc
   fi
 fi
 if [ "$R14_VERSION" -lt "201309150" ]; then
@@ -1010,12 +1010,22 @@ fi
 
 # Remove Konqueror's icon cache entry for / (issue TDE/tdebase#1)
 if [ "$R14_VERSION" -lt "202103280" ]; then
-  if [ "`grep \"\([=,]\)/,[^,\n]*[,]*\" ${TDEHOME}/share/config/konq_history`" ]; then
-    sed -i "s|\([=,]\)/,[^,\n]*[,]*|\1|" ${TDEHOME}/share/config/konq_history
+  if [ "`grep \"\([=,]\)/,[^,\n]*[,]*\" ${PROFILE_DIR}/share/config/konq_history`" ]; then
+    sed -i "s|\([=,]\)/,[^,\n]*[,]*|\1|" ${PROFILE_DIR}/share/config/konq_history
     Log "  Removed icon cache entry for root directory (Gitea issue TDE/tdebase#1)"
   fi
 fi
 
+# Rename twin3_ to twin_ in theme config files
+if [ "$R14_VERSION" -lt "202307100" ]; then
+  find "${PROFILE_DIR}/share/apps/tdestyle/themes/" -type f -iname "*.xml" -print0 2>/dev/null | \
+    xargs -r0 sed -ri "s|twin3_|twin_|g"
+  if [ -f $PROFILE_DIR/share/config/twinrc ]; then
+    sed -i 's|PluginLib=twin3_|PluginLib=twin_|' $PROFILE_DIR/share/config/twinrc
+  fi
+  Log "  Renamed twin3_ to twin_ in theme files"
+fi
+
 # Perform some nominal update validations.
 # First clean house from any previous failures.
 if [ "$CACHE_DIR" = "" ]; then
diff --git a/tde_release_notes b/tde_release_notes
index bd4e27e0d..b1cb54f5d 100644
--- a/tde_release_notes
+++ b/tde_release_notes
@@ -19,17 +19,18 @@ fi
 
 RELEASE_VERSION="$( ${TDEDIR}/bin/tde-config --version | sed -n 's|^TDE: ||p' )"
 RELEASE_NOTES="$( ${TDEDIR}/bin/kreadconfig --file ${TDEHOME}/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" )"
+RELEASE_SERIES="$( ${TDEDIR}/bin/tde-config --version | sed -n 's|^TDE: \([^\.]*\.[^\.]*\).*|\l\1.x|p' )"
 
 if [ "$RELEASE_NOTES" = "" ] || [ "$RELEASE_NOTES" != "true" ]; then
   echo "[release_notes] Release version: $RELEASE_VERSION"
   echo "[release_notes] Release notes: $RELEASE_NOTES"
-  if ${TDEDIR}/bin/khelpcenter help:/khelpcenter/releasenotes ; then
+  if ${TDEDIR}/bin/khelpcenter help:/khelpcenter/releasenotes/${RELEASE_SERIES} ; then
     ${TDEDIR}/bin/kwriteconfig --file ${TDEHOME}/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" --type bool "true"
   fi
   RELEASE_NOTES="$( ${TDEDIR}/bin/kreadconfig --file ${TDEHOME}/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" )"
   echo "[release_notes] Release notes: $RELEASE_NOTES"
 fi
 
-unset RELEASE_NOTES RELEASE_VERSION
+unset RELEASE_NOTES RELEASE_VERSION RELEASE_SERIES
 exit 0
 
diff --git a/tde_show_license_info b/tde_show_license_info
new file mode 100644
index 000000000..212845f53
--- /dev/null
+++ b/tde_show_license_info
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# A script to open/autostart the dialog showing the licenses
+# under which TDE components are provided.
+# The dialog will be shown once for each TDE minor releases (R14.x.0)
+
+# As this script is run as a global TDE autostart app, all
+# environment variables should already be set.
+
+if [ "$TDEDIR" = "" ] || [ "$TDEHOME" = "" ]; then
+  exit 1
+fi
+
+RELEASE_MINOR_VERSION="$( ${TDEDIR}/bin/tde-config --version | sed -n  's|^TDE: \(R[0-9]\+\.[0-9]\+\)\.[0-9]\+[^0-9]*|\1|p' )"
+LICENSE_INFO="$( ${TDEDIR}/bin/kreadconfig --file ${TDEHOME}/share/config/kdeglobals --group "License Info" --key "${RELEASE_MINOR_VERSION}" )"
+
+if [ "$LICENSE_INFO" = "" ] || [ "$LICENSE_INFO" != "true" ]; then
+  echo "[tde_license_info] Release minor version: $RELEASE_MINOR_VERSION"
+  echo "[tde_license_info] License info: $LICENSE_INFO"
+  ${TDEDIR}/bin/tde_license_info
+  ${TDEDIR}/bin/kwriteconfig --file ${TDEHOME}/share/config/kdeglobals --group "License Info" --key "$RELEASE_MINOR_VERSION" --type bool "true"
+  LICENSE_INFO="$( ${TDEDIR}/bin/kreadconfig --file ${TDEHOME}/share/config/kdeglobals --group "License Info" --key "$RELEASE_MINOR_VERSION" )"
+  echo "[tde_license_info] License info: $LICENSE_INFO"
+fi
+
+unset LICENSE_INFO RELEASE_MINOR_VERSION
+exit 0
+
diff --git a/tdedebugdialog/kabstractdebugdialog.cpp b/tdedebugdialog/kabstractdebugdialog.cpp
index 10c0c2a00..d7c84a499 100644
--- a/tdedebugdialog/kabstractdebugdialog.cpp
+++ b/tdedebugdialog/kabstractdebugdialog.cpp
@@ -64,10 +64,10 @@ void KAbstractDebugDialog::buildButtons( TQVBoxLayout * topLayout )
   pApplyButton->setFixedWidth( w4 );
   pCancelButton->setFixedWidth( w4 );
 
-  connect( pHelpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotShowHelp() ) );
-  connect( pOKButton, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) );
-  connect( pApplyButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotApply() ) );
-  connect( pCancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) );
+  connect( pHelpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotShowHelp() ) );
+  connect( pOKButton, TQ_SIGNAL( clicked() ), TQ_SLOT( accept() ) );
+  connect( pApplyButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotApply() ) );
+  connect( pCancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) );
 }
 
 void KAbstractDebugDialog::slotShowHelp()
diff --git a/tdedebugdialog/kabstractdebugdialog.h b/tdedebugdialog/kabstractdebugdialog.h
index 6e3655973..fea7da42c 100644
--- a/tdedebugdialog/kabstractdebugdialog.h
+++ b/tdedebugdialog/kabstractdebugdialog.h
@@ -28,7 +28,7 @@ class KPushButton;
 
 class KAbstractDebugDialog : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KAbstractDebugDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
 
diff --git a/tdedebugdialog/tdedebugdialog.cpp b/tdedebugdialog/tdedebugdialog.cpp
index d63fac78b..6a1043345 100644
--- a/tdedebugdialog/tdedebugdialog.cpp
+++ b/tdedebugdialog/tdedebugdialog.cpp
@@ -60,7 +60,7 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c
 
   TQGridLayout *gbox = new TQGridLayout( 2, 2, KDialog::marginHint() );
   if( gbox == 0 ) { return; }
-  topLayout->addLayout( TQT_TQLAYOUT(gbox) );
+  topLayout->addLayout( gbox );
 
   TQStringList destList;
   destList.append( i18n("File") );
@@ -79,8 +79,8 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c
   pInfoLabel1 = new TQLabel( i18n("Output to:"), pInfoGroup );
   vbox->addWidget( pInfoLabel1 );
   pInfoCombo = new TQComboBox( false, pInfoGroup );
-  connect(pInfoCombo, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(slotDestinationChanged(int)));
+  connect(pInfoCombo, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(slotDestinationChanged(int)));
   vbox->addWidget( pInfoCombo );
   pInfoCombo->insertStringList( destList );
   pInfoLabel2 = new TQLabel( i18n("Filename:"), pInfoGroup );
@@ -104,8 +104,8 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c
   pWarnLabel1 = new TQLabel( i18n("Output to:"), pWarnGroup );
   vbox->addWidget( pWarnLabel1 );
   pWarnCombo = new TQComboBox( false, pWarnGroup );
-  connect(pWarnCombo, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(slotDestinationChanged(int)));
+  connect(pWarnCombo, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(slotDestinationChanged(int)));
   vbox->addWidget( pWarnCombo );
   pWarnCombo->insertStringList( destList );
   pWarnLabel2 = new TQLabel( i18n("Filename:"), pWarnGroup );
@@ -129,8 +129,8 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c
   pErrorLabel1 = new TQLabel( i18n("Output to:"), pErrorGroup );
   vbox->addWidget( pErrorLabel1 );
   pErrorCombo = new TQComboBox( false, pErrorGroup );
-  connect(pErrorCombo, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(slotDestinationChanged(int)));
+  connect(pErrorCombo, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(slotDestinationChanged(int)));
   vbox->addWidget( pErrorCombo );
   pErrorCombo->insertStringList( destList );
   pErrorLabel2 = new TQLabel( i18n("Filename:"), pErrorGroup );
@@ -154,8 +154,8 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c
   pFatalLabel1 = new TQLabel( i18n("Output to:"), pFatalGroup );
   vbox->addWidget( pFatalLabel1 );
   pFatalCombo = new TQComboBox( false, pFatalGroup );
-  connect(pFatalCombo, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(slotDestinationChanged(int)));
+  connect(pFatalCombo, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(slotDestinationChanged(int)));
   vbox->addWidget( pFatalCombo );
   pFatalCombo->insertStringList( destList );
   pFatalLabel2 = new TQLabel( i18n("Filename:"), pFatalGroup );
@@ -179,8 +179,8 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c
 
   buildButtons( topLayout );
 
-  connect( pDebugAreas, TQT_SIGNAL( activated( const TQString &) ),
-           TQT_SLOT( slotDebugAreaChanged( const TQString & ) ) );
+  connect( pDebugAreas, TQ_SIGNAL( activated( const TQString &) ),
+           TQ_SLOT( slotDebugAreaChanged( const TQString & ) ) );
 
   // Get initial values ("initial" is understood by the slot)
   slotDebugAreaChanged( "0 initial" );
diff --git a/tdedebugdialog/tdedebugdialog.h b/tdedebugdialog/tdedebugdialog.h
index dec300018..d970b4a5d 100644
--- a/tdedebugdialog/tdedebugdialog.h
+++ b/tdedebugdialog/tdedebugdialog.h
@@ -39,7 +39,7 @@ class TDEConfig;
  */
 class TDEDebugDialog : public KAbstractDebugDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDEDebugDialog( TQStringList areaList, TQWidget *parent=0, const char *name=0, bool modal=true );
diff --git a/tdedebugdialog/tdelistdebugdialog.cpp b/tdedebugdialog/tdelistdebugdialog.cpp
index d447b3747..4c3bb9f0e 100644
--- a/tdedebugdialog/tdelistdebugdialog.cpp
+++ b/tdedebugdialog/tdelistdebugdialog.cpp
@@ -40,8 +40,8 @@ TDEListDebugDialog::TDEListDebugDialog( TQStringList areaList, TQWidget *parent,
 
   m_incrSearch = new KLineEdit( this );
   lay->addWidget( m_incrSearch );
-  connect( m_incrSearch, TQT_SIGNAL( textChanged( const TQString& ) ),
-           TQT_SLOT( generateCheckBoxes( const TQString& ) ) );
+  connect( m_incrSearch, TQ_SIGNAL( textChanged( const TQString& ) ),
+           TQ_SLOT( generateCheckBoxes( const TQString& ) ) );
 
   TQScrollView * scrollView = new TQScrollView( this );
   scrollView->setResizePolicy( TQScrollView::AutoOneFit );
@@ -58,8 +58,8 @@ TDEListDebugDialog::TDEListDebugDialog( TQStringList areaList, TQWidget *parent,
   selectButs->addWidget( all );
   selectButs->addWidget( none );
 
-  connect( all, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectAll() ) );
-  connect( none, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deSelectAll() ) );
+  connect( all, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selectAll() ) );
+  connect( none, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deSelectAll() ) );
 
   buildButtons( lay );
   resize( 350, 400 );
diff --git a/tdedebugdialog/tdelistdebugdialog.h b/tdedebugdialog/tdelistdebugdialog.h
index 92e68d2be..51059f7e6 100644
--- a/tdedebugdialog/tdelistdebugdialog.h
+++ b/tdedebugdialog/tdelistdebugdialog.h
@@ -37,7 +37,7 @@ class KLineEdit;
  */
 class TDEListDebugDialog : public KAbstractDebugDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDEListDebugDialog( TQStringList areaList, TQWidget *parent=0, const char *name=0, bool modal=true );
diff --git a/tdeioslave/CMakeLists.txt b/tdeioslave/CMakeLists.txt
index 56b05c852..5b0f0c155 100644
--- a/tdeioslave/CMakeLists.txt
+++ b/tdeioslave/CMakeLists.txt
@@ -23,7 +23,6 @@ add_subdirectory( nfs )
 add_subdirectory( nntp )
 add_subdirectory( pop3 )
 add_subdirectory( smtp )
-add_subdirectory( sftp )
 add_subdirectory( tar )
 add_subdirectory( finger )
 add_subdirectory( thumbnail )
@@ -35,3 +34,4 @@ add_subdirectory( home )
 add_subdirectory( system )
 tde_conditional_add_subdirectory( WITH_LDAP ldap )
 tde_conditional_add_subdirectory( WITH_SAMBA smb )
+tde_conditional_add_subdirectory( WITH_SFTP sftp )
diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
index a4297969e..456c9d45f 100644
--- a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
@@ -48,7 +48,7 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name)
 
   TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
-  TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Paths to Local CGI Programs"), this );
+  TQGroupBox *topBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Paths to Local CGI Programs"), this );
   topLayout->addWidget( topBox );
 
   mListBox = new TQListBox( topBox );
@@ -57,11 +57,11 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name)
   buttonBox->setSpacing( KDialog::spacingHint() );
 
   mAddButton = new TQPushButton( i18n("Add..."), buttonBox );
-  connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addPath() ) );
+  connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addPath() ) );
 
   mRemoveButton = new TQPushButton( i18n("Remove"), buttonBox );
-  connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removePath() ) );
-  connect( mListBox, TQT_SIGNAL( clicked ( TQListBoxItem * )),this, TQT_SLOT( slotItemSelected( TQListBoxItem *)));
+  connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removePath() ) );
+  connect( mListBox, TQ_SIGNAL( clicked ( TQListBoxItem * )),this, TQ_SLOT( slotItemSelected( TQListBoxItem *)));
 
   mConfig = new TDEConfig("kcmcgirc");
 
diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.h b/tdeioslave/cgi/kcmcgi/kcmcgi.h
index ccd2f2f3d..0522fa24a 100644
--- a/tdeioslave/cgi/kcmcgi/kcmcgi.h
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.h
@@ -27,7 +27,7 @@ class TDEConfig;
 
 class KCMCgi : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     KCMCgi( TQWidget *parent = 0, const char *name = 0 );
     ~KCMCgi();
diff --git a/tdeioslave/finger/tdeio_finger.cpp b/tdeioslave/finger/tdeio_finger.cpp
index 643a699f0..621d33301 100644
--- a/tdeioslave/finger/tdeio_finger.cpp
+++ b/tdeioslave/finger/tdeio_finger.cpp
@@ -126,10 +126,10 @@ void FingerProtocol::get(const KURL& url )
 	      << *myFingerPath << *myFingerCSSFile
 	      << refreshRate << myURL->host() << myURL->user() ;
 
-  connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-	  this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
-  //connect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-  //	  this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+  connect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+	  this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+  //connect(myTDEProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+  //	  this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 
   myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
 
diff --git a/tdeioslave/finger/tdeio_finger.h b/tdeioslave/finger/tdeio_finger.h
index 3d083d2ed..079c82305 100644
--- a/tdeioslave/finger/tdeio_finger.h
+++ b/tdeioslave/finger/tdeio_finger.h
@@ -30,7 +30,7 @@
 
 class FingerProtocol : public TQObject, public TDEIO::SlaveBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -46,12 +46,12 @@ private slots:
 private:
   KURL                  *myURL;
 
-  QString	        *myPerlPath;
+  TQString	        *myPerlPath;
   TQString               *myFingerPath;
   TQString               *myFingerPerlScript;
   TQString               *myFingerCSSFile;
 
-  QString		*myStdStream;
+  TQString		*myStdStream;
 
 
   TDEProcess	        *myTDEProcess;
diff --git a/tdeioslave/fish/fish.cpp b/tdeioslave/fish/fish.cpp
index 98c11a712..6f6cd93c6 100644
--- a/tdeioslave/fish/fish.cpp
+++ b/tdeioslave/fish/fish.cpp
@@ -570,7 +570,9 @@ int fishProtocol::establishConnection(char *buffer, TDEIO::fileoffset_t len) {
             infoMessage(i18n("Initiating protocol..."));
             if (!connectionAuth.password.isEmpty()) {
                 connectionAuth.password = connectionAuth.password.left(connectionAuth.password.length()-1);
-                cacheAuthentication(connectionAuth);
+                if (connectionAuth.keepPassword) {
+                    cacheAuthentication(connectionAuth);
+                }
             }
             isLoggedIn = true;
             return 0;
@@ -774,7 +776,7 @@ int fishProtocol::handleResponse(const TQString &str){
 
 int fishProtocol::makeTimeFromLs(const TQString &monthStr, const TQString &dayStr, const TQString &timeyearStr)
 {
-    TQDateTime dt(TQDate::currentDate(Qt::UTC));
+    TQDateTime dt(TQDate::currentDate(TQt::UTC));
     int year = dt.date().year();
     int month = dt.date().month();
     int currentMonth = month;
diff --git a/tdeioslave/home/homeimpl.cpp b/tdeioslave/home/homeimpl.cpp
index ea3dad520..8967e5ea4 100644
--- a/tdeioslave/home/homeimpl.cpp
+++ b/tdeioslave/home/homeimpl.cpp
@@ -193,8 +193,8 @@ TDEIO::UDSEntry HomeImpl::extractUrlInfos(const KURL &url)
 	m_entryBuffer.clear();
 
 	TDEIO::StatJob *job = TDEIO::stat(url, false);
-	connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
-	         this, TQT_SLOT( slotStatResult(TDEIO::Job *) ) );
+	connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+	         this, TQ_SLOT( slotStatResult(TDEIO::Job *) ) );
 	tqApp->eventLoop()->enterLoop();
 
 	TDEIO::UDSEntry::iterator it = m_entryBuffer.begin();
diff --git a/tdeioslave/home/homeimpl.h b/tdeioslave/home/homeimpl.h
index 5884d8ab7..abc106bcb 100644
--- a/tdeioslave/home/homeimpl.h
+++ b/tdeioslave/home/homeimpl.h
@@ -27,9 +27,9 @@
 
 #include <tqstring.h>
 
-class HomeImpl : public QObject
+class HomeImpl : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	HomeImpl();
diff --git a/tdeioslave/mac/TODO b/tdeioslave/mac/TODO
index 69fcb0d2e..469a616be 100644
--- a/tdeioslave/mac/TODO
+++ b/tdeioslave/mac/TODO
@@ -5,7 +5,7 @@ grep TODO tdeio_mac.cpp
         //TODO this means dev=foo must be the last argument in the query
         //TODO this error interrupts the user when typing ?dev=foo on each letter of foo
         //TODO are there any more characters to escape?
-        QString theSize(fileRE.group(4)); //TODO: this is data size, what about  resource size?
+        TQString theSize(fileRE.group(4)); //TODO: this is data size, what about  resource size?
 
 Future things:
 	- maybe make it work with plain old hfs partitions
diff --git a/tdeioslave/mac/tdeio_mac.cpp b/tdeioslave/mac/tdeio_mac.cpp
index caef50784..d116ef909 100644
--- a/tdeioslave/mac/tdeio_mac.cpp
+++ b/tdeioslave/mac/tdeio_mac.cpp
@@ -105,8 +105,8 @@ void MacProtocol::get(const KURL& url) {
     *myTDEProcess << "hpcopy" << mode << path << "-";
 
     //data is now sent directly from the slot
-    connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-            this, TQT_SLOT(slotSetDataStdOutput(TDEProcess *, char *, int)));
+    connect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+            this, TQ_SLOT(slotSetDataStdOutput(TDEProcess *, char *, int)));
 
     myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
 
@@ -134,8 +134,8 @@ void MacProtocol::listDir(const KURL& url) {
         *myTDEProcess << "hpls" << "-la" << filename;
 
         standardOutputStream = TQString::null;
-        connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-                this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+        connect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+                this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 
         myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
 
@@ -146,8 +146,8 @@ void MacProtocol::listDir(const KURL& url) {
 
         //clean up
         delete myTDEProcess; myTDEProcess = 0;
-        disconnect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-                this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+        disconnect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+                this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 
         UDSEntry entry;
         if (!standardOutputStream.isEmpty()) {
@@ -191,8 +191,8 @@ TQValueList<TDEIO::UDSAtom> MacProtocol::doStat(const KURL& url) {
         *myTDEProcess << "hpls" << "-ld" << filename;
 
         standardOutputStream = TQString::null;
-        connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-                this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+        connect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+                this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 
         myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
 
@@ -203,8 +203,8 @@ TQValueList<TDEIO::UDSAtom> MacProtocol::doStat(const KURL& url) {
 
         //clean up
         delete myTDEProcess; myTDEProcess = 0;
-        disconnect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-                this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+        disconnect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+                this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 
         if (standardOutputStream.isEmpty()) {
             filename.replace("\\ ", " "); //get rid of escapes
@@ -257,8 +257,8 @@ TQString MacProtocol::prepareHP(const KURL& url) {
     myTDEProcess = new TDEProcess();
     *myTDEProcess << "hpmount";
     standardOutputStream = TQString::null;
-    connect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-            this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+    connect(myTDEProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+            this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 
     myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
 
@@ -269,8 +269,8 @@ TQString MacProtocol::prepareHP(const KURL& url) {
     }
 
     delete myTDEProcess; myTDEProcess = 0;
-    disconnect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-            this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+    disconnect(myTDEProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+            this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 
     //now mount the drive
     myTDEProcess = new TDEProcess();
diff --git a/tdeioslave/mac/tdeio_mac.h b/tdeioslave/mac/tdeio_mac.h
index e497e9918..ca4f8b95a 100644
--- a/tdeioslave/mac/tdeio_mac.h
+++ b/tdeioslave/mac/tdeio_mac.h
@@ -28,7 +28,7 @@
 
 class MacProtocol : public TQObject, public TDEIO::SlaveBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MacProtocol(const TQCString &pool, const TQCString &app);
     ~MacProtocol();
diff --git a/tdeioslave/man/kmanpart.cpp b/tdeioslave/man/kmanpart.cpp
index 556b287e4..703ec2202 100644
--- a/tdeioslave/man/kmanpart.cpp
+++ b/tdeioslave/man/kmanpart.cpp
@@ -95,8 +95,8 @@ bool KManPart::openFile()
    url.setPath( m_file );
 
    m_job = TDEIO::get( url, true, false );
-   connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) );
-   connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( jobDone( TDEIO::Job * ) ) );
+   connect( m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQ_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) );
+   connect( m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( jobDone( TDEIO::Job * ) ) );
    return true;
 }
 
diff --git a/tdeioslave/man/kmanpart.h b/tdeioslave/man/kmanpart.h
index 908cca538..4fdb45733 100644
--- a/tdeioslave/man/kmanpart.h
+++ b/tdeioslave/man/kmanpart.h
@@ -39,7 +39,7 @@ class TDEAboutData;
  */
 class KManPartFactory: public KParts::Factory
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       KManPartFactory( TQObject * parent = 0, const char * name = 0 );
       virtual ~KManPartFactory();
@@ -58,7 +58,7 @@ class KManPartFactory: public KParts::Factory
 
 class KManPart : public TDEHTMLPart
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       KManPart( TQWidget * parent, const char * name = 0L );
       KParts::BrowserExtension * extension() {return m_extension;}
diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
index a8c5751c0..3f27feb68 100644
--- a/tdeioslave/man/man2html.cpp
+++ b/tdeioslave/man/man2html.cpp
@@ -330,7 +330,7 @@ static void InitNumberDefinitions( void )
 {
     // As the date number registers are more for end-users, better choose local time.
     // Groff seems to support Gregorian dates only
-    TQDate today( TQDate::currentDate( Qt::LocalTime ) );
+    TQDate today( TQDate::currentDate( TQt::LocalTime ) );
     s_numberDefinitionMap.insert( "year", today.year() ); // Y2K-correct year
     s_numberDefinitionMap.insert( "yr", today.year() - 1900 ); // Y2K-incorrect year
     s_numberDefinitionMap.insert( "mo", today.month() );
@@ -4190,13 +4190,13 @@ static char *scan_request(char *c)
                         if (mode)
                         {
                             // .rm ReMove
-                            s_stringDefinitionMap.remove(name); // ### QT4: removeAll
+                            s_stringDefinitionMap.remove(name);
                         }
                         else
                         {
                             // .rn ReName
                             StringDefinition def=(*it);
-                            s_stringDefinitionMap.remove(name); // ### QT4: removeAll
+                            s_stringDefinitionMap.remove(name);
                             s_stringDefinitionMap.insert(name2,def);
                         }
                     }
@@ -5152,7 +5152,7 @@ static char *scan_request(char *c)
                     else
                     {
                         NumberDefinition def=(*it);
-                        s_numberDefinitionMap.remove(name); // ### QT4: removeAll
+                        s_numberDefinitionMap.remove(name);
                         s_numberDefinitionMap.insert(name2,def);
                     }
                     kdDebug(7107) << "end .rnn" << endl;
diff --git a/tdeioslave/man/tdeio_man.cpp b/tdeioslave/man/tdeio_man.cpp
index 13fc3b4d5..cd04f702e 100644
--- a/tdeioslave/man/tdeio_man.cpp
+++ b/tdeioslave/man/tdeio_man.cpp
@@ -204,8 +204,8 @@ TQMap<TQString, TQString> MANProtocol::buildIndexMap(const TQString &section)
                 TDEProcess proc;
                 proc << "whatis" << "-M" << (*it_dir) << "-w" << "*";
                 myStdStream = TQString::null;
-                connect( &proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ),
-                         TQT_SLOT( slotGetStdOutput( TDEProcess *, char *, int ) ) );
+                connect( &proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ),
+                         TQ_SLOT( slotGetStdOutput( TDEProcess *, char *, int ) ) );
                 proc.start( TDEProcess::Block, TDEProcess::Stdout );
                 TQTextStream t( &myStdStream, IO_ReadOnly );
                 parseWhatIs( i, t, mark );
@@ -555,8 +555,8 @@ char *MANProtocol::readManPage(const char *_filename)
 	getProgramPath();
 	proc << mySgml2RoffPath << filename;
 
-	TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
-			      this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+	TQApplication::connect(&proc, TQ_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
+			      this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 	proc.start(TDEProcess::Block, TDEProcess::All);
 
         const TQCString cstr=myStdStream.latin1();
@@ -589,8 +589,8 @@ char *MANProtocol::readManPage(const char *_filename)
 
             proc << "man" << "--recode" << "UTF-8" << filename;
 
-            TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
-                                   this, TQT_SLOT(slotGetStdOutputUtf8(TDEProcess *, char *, int)));
+            TQApplication::connect(&proc, TQ_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
+                                   this, TQ_SLOT(slotGetStdOutputUtf8(TDEProcess *, char *, int)));
             proc.start(TDEProcess::Block, TDEProcess::All);
 
             const TQCString cstr=myStdStream.utf8();
diff --git a/tdeioslave/man/tdeio_man.h b/tdeioslave/man/tdeio_man.h
index e621a7fbf..89c1d29c4 100644
--- a/tdeioslave/man/tdeio_man.h
+++ b/tdeioslave/man/tdeio_man.h
@@ -34,7 +34,7 @@
 
 class MANProtocol : public TQObject, public TDEIO::SlaveBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/tdeioslave/man/tdeio_man_test.cpp b/tdeioslave/man/tdeio_man_test.cpp
index 131e03541..898a18eaa 100644
--- a/tdeioslave/man/tdeio_man_test.cpp
+++ b/tdeioslave/man/tdeio_man_test.cpp
@@ -11,7 +11,7 @@
 
 class tdeio_man_test : public  MANProtocol
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   tdeio_man_test(const TQCString &pool_socket, const TQCString &app_socket);
diff --git a/tdeioslave/media/mediaimpl.cpp b/tdeioslave/media/mediaimpl.cpp
index aacbcc5e2..510437072 100644
--- a/tdeioslave/media/mediaimpl.cpp
+++ b/tdeioslave/media/mediaimpl.cpp
@@ -242,10 +242,10 @@ bool MediaImpl::ensureMediumMounted(Medium &medium)
 		                           medium.deviceNode(),
 		                           medium.mountPoint());
 		job->setAutoWarningHandlingEnabled(false);
-		connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-		         this, TQT_SLOT( slotMountResult( TDEIO::Job * ) ) );
-		connect( job, TQT_SIGNAL( warning( TDEIO::Job *, const TQString & ) ),
-		         this, TQT_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) );
+		connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+		         this, TQ_SLOT( slotMountResult( TDEIO::Job * ) ) );
+		connect( job, TQ_SIGNAL( warning( TDEIO::Job *, const TQString & ) ),
+		         this, TQ_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) );
 		*/
 		kapp->dcopClient()
 		->connectDCOPSignal("kded", "mediamanager",
@@ -365,10 +365,10 @@ TDEIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url)
 
 	TDEIO::StatJob *job = TDEIO::stat(url, false);
 	job->setAutoWarningHandlingEnabled( false );
-	connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
-	         this, TQT_SLOT( slotStatResult(TDEIO::Job *) ) );
-	connect( job, TQT_SIGNAL( warning( TDEIO::Job *, const TQString & ) ),
-	         this, TQT_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) );
+	connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+	         this, TQ_SLOT( slotStatResult(TDEIO::Job *) ) );
+	connect( job, TQ_SIGNAL( warning( TDEIO::Job *, const TQString & ) ),
+	         this, TQ_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) );
 	tqApp->eventLoop()->enterLoop();
 
 	TDEIO::UDSEntry::iterator it = m_entryBuffer.begin();
diff --git a/tdeioslave/media/mediaimpl.h b/tdeioslave/media/mediaimpl.h
index 1080d6783..a7416f0e5 100644
--- a/tdeioslave/media/mediaimpl.h
+++ b/tdeioslave/media/mediaimpl.h
@@ -32,7 +32,7 @@
 
 class MediaImpl : public TQObject, public DCOPObject
 {
-Q_OBJECT
+TQ_OBJECT
 K_DCOP
 public:
 	MediaImpl();
diff --git a/tdeioslave/media/mediamanager/dialog.cpp b/tdeioslave/media/mediamanager/dialog.cpp
index b2e9ff5f5..ddfd041a0 100644
--- a/tdeioslave/media/mediamanager/dialog.cpp
+++ b/tdeioslave/media/mediamanager/dialog.cpp
@@ -37,7 +37,7 @@ Dialog::Dialog(TQString url, TQString iconName) :
 	TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, TDEIcon::SizeLarge);
 	unlockDialog->encryptedIcon->setPixmap( pixmap );
 
-	connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
+	connect(unlockDialog->passwordEdit, TQ_SIGNAL (textChanged(const TQString &)), this, TQ_SLOT (slotPasswordChanged(const TQString &)));
 
 	setMainWidget(unlockDialog);
 }
diff --git a/tdeioslave/media/mediamanager/dialog.h b/tdeioslave/media/mediamanager/dialog.h
index 8444ec7dd..1e3dd145c 100644
--- a/tdeioslave/media/mediamanager/dialog.h
+++ b/tdeioslave/media/mediamanager/dialog.h
@@ -41,7 +41,7 @@ class KryptoMedia;
 class Dialog : public KDialogBase
 {
 
-Q_OBJECT	
+TQ_OBJECT	
 
 public:
 	Dialog(TQString url, TQString iconName);
diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp
index 6549723fe..2bd528c19 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.cpp
+++ b/tdeioslave/media/mediamanager/fstabbackend.cpp
@@ -61,8 +61,8 @@ FstabBackend::FstabBackend(MediaList &list, bool networkSharesOnly)
 	KDirWatch::self()->addFile(MTAB);
 	KDirWatch::self()->addFile(FSTAB);
 
-	connect( KDirWatch::self(), TQT_SIGNAL( dirty(const TQString&) ),
-	         this, TQT_SLOT( slotDirty(const TQString&) ) );
+	connect( KDirWatch::self(), TQ_SIGNAL( dirty(const TQString&) ),
+	         this, TQ_SLOT( slotDirty(const TQString&) ) );
 
 	handleFstabChange(false);
 	handleMtabChange(false);
@@ -70,8 +70,8 @@ FstabBackend::FstabBackend(MediaList &list, bool networkSharesOnly)
 	KDirWatch::self()->startScan();
 
 #if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
-	connect( &m_mtabTimer, TQT_SIGNAL( timeout() ),
-	         this, TQT_SLOT( handleMtabChange() ) );
+	connect( &m_mtabTimer, TQ_SIGNAL( timeout() ),
+	         this, TQ_SLOT( handleMtabChange() ) );
 	m_mtabTimer.start(250);
 #endif
 }
diff --git a/tdeioslave/media/mediamanager/fstabbackend.h b/tdeioslave/media/mediamanager/fstabbackend.h
index 0aed11333..0f4b3b85e 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.h
+++ b/tdeioslave/media/mediamanager/fstabbackend.h
@@ -31,7 +31,7 @@
 
 class FstabBackend : public TQObject, public BackendBase
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	FstabBackend(MediaList &list, bool networkSharesOnly = false);
diff --git a/tdeioslave/media/mediamanager/linuxcdpolling.cpp b/tdeioslave/media/mediamanager/linuxcdpolling.cpp
index eccdf1f34..66074f40e 100644
--- a/tdeioslave/media/mediamanager/linuxcdpolling.cpp
+++ b/tdeioslave/media/mediamanager/linuxcdpolling.cpp
@@ -176,19 +176,19 @@ private:
 LinuxCDPolling::LinuxCDPolling(MediaList &list)
 	: TQObject(), BackendBase(list)
 {
-	connect(&m_mediaList, TQT_SIGNAL(mediumAdded(const TQString &,
+	connect(&m_mediaList, TQ_SIGNAL(mediumAdded(const TQString &,
 	                                        const TQString &, bool)),
-	        this, TQT_SLOT(slotMediumAdded(const TQString &)) );
+	        this, TQ_SLOT(slotMediumAdded(const TQString &)) );
 
-	connect(&m_mediaList, TQT_SIGNAL(mediumRemoved(const TQString &,
+	connect(&m_mediaList, TQ_SIGNAL(mediumRemoved(const TQString &,
 	                                          const TQString &, bool)),
-	        this, TQT_SLOT(slotMediumRemoved(const TQString &)) );
+	        this, TQ_SLOT(slotMediumRemoved(const TQString &)) );
 
-	connect(&m_mediaList, TQT_SIGNAL(mediumStateChanged(const TQString &,
+	connect(&m_mediaList, TQ_SIGNAL(mediumStateChanged(const TQString &,
 	                                               const TQString &, bool, bool)),
-	        this, TQT_SLOT(slotMediumStateChanged(const TQString &)) );
+	        this, TQ_SLOT(slotMediumStateChanged(const TQString &)) );
 
-	connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
+	connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()));
 }
 
 LinuxCDPolling::~LinuxCDPolling()
@@ -514,7 +514,7 @@ bool LinuxCDPolling::hasDirectory(const TQCString &devNode, const TQCString &dir
 		close(fd);
 		return false;
 	}
-	if (Q_BYTE_ORDER != Q_LITTLE_ENDIAN)
+	if (TQ_BYTE_ORDER != TQ_LITTLE_ENDIAN)
 		bs = ((bs << 8) & 0xFF00) | ((bs >> 8) & 0xFF);
 
 	// read in size of path table
@@ -524,7 +524,7 @@ bool LinuxCDPolling::hasDirectory(const TQCString &devNode, const TQCString &dir
 		close(fd);
 		return false;
 	}
-	if (Q_BYTE_ORDER != Q_LITTLE_ENDIAN)
+	if (TQ_BYTE_ORDER != TQ_LITTLE_ENDIAN)
 		ts = ((ts << 8) & 0xFF00) | ((ts >> 8) & 0xFF);
 
 	// read in which block path table is in
@@ -534,7 +534,7 @@ bool LinuxCDPolling::hasDirectory(const TQCString &devNode, const TQCString &dir
 		close(fd);
 		return false;
 	}
-	if (Q_BYTE_ORDER != Q_LITTLE_ENDIAN)
+	if (TQ_BYTE_ORDER != TQ_LITTLE_ENDIAN)
 		tl = ((tl << 24) & 0xFF000000) | ((tl << 8) & 0xFF0000) |
 		     ((tl >> 8) & 0xFF00) | ((tl >> 24) & 0xFF);
 
@@ -559,7 +559,7 @@ bool LinuxCDPolling::hasDirectory(const TQCString &devNode, const TQCString &dir
 			ret = false;
 			break;
 		}
-		if (Q_BYTE_ORDER != Q_LITTLE_ENDIAN)
+		if (TQ_BYTE_ORDER != TQ_LITTLE_ENDIAN)
 			parent = ((parent << 8) & 0xFF00) | ((parent >> 8) & 0xFF);
 
 		// read the name
diff --git a/tdeioslave/media/mediamanager/linuxcdpolling.h b/tdeioslave/media/mediamanager/linuxcdpolling.h
index fc4947470..070ad5eea 100644
--- a/tdeioslave/media/mediamanager/linuxcdpolling.h
+++ b/tdeioslave/media/mediamanager/linuxcdpolling.h
@@ -49,7 +49,7 @@ class PollingThread;
 
 class LinuxCDPolling : public TQObject, public BackendBase
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 
diff --git a/tdeioslave/media/mediamanager/medialist.h b/tdeioslave/media/mediamanager/medialist.h
index f4b088526..a92d1b6c0 100644
--- a/tdeioslave/media/mediamanager/medialist.h
+++ b/tdeioslave/media/mediamanager/medialist.h
@@ -23,9 +23,9 @@
 
 #include "medium.h"
 
-class MediaList : public QObject
+class MediaList : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	MediaList();
diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp
index f8c2a574b..66c456a24 100644
--- a/tdeioslave/media/mediamanager/mediamanager.cpp
+++ b/tdeioslave/media/mediamanager/mediamanager.cpp
@@ -43,15 +43,15 @@
 MediaManager::MediaManager(const TQCString &obj)
     : KDEDModule(obj), m_dirNotify(m_mediaList)
 {
-    connect( &m_mediaList, TQT_SIGNAL(mediumAdded(const TQString&, const TQString&, bool)),
-             TQT_SLOT(slotMediumAdded(const TQString&, const TQString&, bool)) );
-    connect( &m_mediaList, TQT_SIGNAL(mediumRemoved(const TQString&, const TQString&, bool)),
-             TQT_SLOT(slotMediumRemoved(const TQString&, const TQString&, bool)) );
+    connect( &m_mediaList, TQ_SIGNAL(mediumAdded(const TQString&, const TQString&, bool)),
+             TQ_SLOT(slotMediumAdded(const TQString&, const TQString&, bool)) );
+    connect( &m_mediaList, TQ_SIGNAL(mediumRemoved(const TQString&, const TQString&, bool)),
+             TQ_SLOT(slotMediumRemoved(const TQString&, const TQString&, bool)) );
     connect( &m_mediaList,
-             TQT_SIGNAL(mediumStateChanged(const TQString&, const TQString&, bool, bool)),
-             TQT_SLOT(slotMediumChanged(const TQString&, const TQString&, bool, bool)) );
+             TQ_SIGNAL(mediumStateChanged(const TQString&, const TQString&, bool, bool)),
+             TQ_SLOT(slotMediumChanged(const TQString&, const TQString&, bool, bool)) );
 
-    TQTimer::singleShot( 10, this, TQT_SLOT( loadBackends() ) );
+    TQTimer::singleShot( 10, this, TQ_SLOT( loadBackends() ) );
 }
 
 MediaManager::~MediaManager()
diff --git a/tdeioslave/media/mediamanager/mediamanager.h b/tdeioslave/media/mediamanager/mediamanager.h
index 7bc67b24c..1fe873f98 100644
--- a/tdeioslave/media/mediamanager/mediamanager.h
+++ b/tdeioslave/media/mediamanager/mediamanager.h
@@ -34,7 +34,7 @@ class FstabBackend;
 
 class MediaManager : public KDEDModule
 {
-Q_OBJECT
+TQ_OBJECT
 K_DCOP
 public:
 	MediaManager(const TQCString &obj);
diff --git a/tdeioslave/media/mediamanager/removablebackend.cpp b/tdeioslave/media/mediamanager/removablebackend.cpp
index dacb9b704..a9207cd92 100644
--- a/tdeioslave/media/mediamanager/removablebackend.cpp
+++ b/tdeioslave/media/mediamanager/removablebackend.cpp
@@ -37,8 +37,8 @@ RemovableBackend::RemovableBackend(MediaList &list)
 {
 	KDirWatch::self()->addFile(MTAB);
 
-	connect( KDirWatch::self(), TQT_SIGNAL( dirty(const TQString&) ),
-	         this, TQT_SLOT( slotDirty(const TQString&) ) );
+	connect( KDirWatch::self(), TQ_SIGNAL( dirty(const TQString&) ),
+	         this, TQ_SLOT( slotDirty(const TQString&) ) );
 	KDirWatch::self()->startScan();
 }
 
diff --git a/tdeioslave/media/mediamanager/removablebackend.h b/tdeioslave/media/mediamanager/removablebackend.h
index fa16a391b..256497d9a 100644
--- a/tdeioslave/media/mediamanager/removablebackend.h
+++ b/tdeioslave/media/mediamanager/removablebackend.h
@@ -26,7 +26,7 @@
 
 class RemovableBackend : public TQObject, public BackendBase
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	RemovableBackend(MediaList &list);
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index 0e6eb4ad8..a5900c883 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -55,9 +55,9 @@ TDEBackend::TDEBackend(MediaList &list, TQObject* parent)
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 
 	// Connect device monitoring signals/slots
-	connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(AddDeviceHandler(TDEGenericDevice*)));
-	connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(RemoveDeviceHandler(TDEGenericDevice*)));
-	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(ModifyDeviceHandler(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(AddDeviceHandler(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(RemoveDeviceHandler(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(ModifyDeviceHandler(TDEGenericDevice*)));
 
 	// List devices at startup
 	ListDevices();
@@ -484,6 +484,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 	if (useDefaultLabel) {
 		diskLabel = i18n("%1 Removable Device").arg(sdevice->deviceFriendlySize());
 	}
+	diskLabel += " (" + sdevice->deviceNode() + ")";
 
 	TQString mimeType;
 
@@ -519,7 +520,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 		// Default
 		mimeType = "media/cdrom" + MOUNT_MEDIA_SUFFIX;
 		if (useDefaultLabel) {
-			diskLabel = i18n("%1 Removable Device").arg(sdevice->deviceFriendlySize());
+			diskLabel = i18n("%1 Removable Disk (%2)").arg(sdevice->deviceFriendlySize(), sdevice->deviceNode());
 		}
 
 		if (sdevice->isDiskOfType(TDEDiskDeviceType::CDROM)) {
@@ -770,12 +771,11 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			diskLabel = i18n("%1 Fixed Disk (%2)").arg(sdevice->deviceFriendlySize(), sdevice->deviceNode());
 		}
 
-		if (sdevice->isDiskOfType(TDEDiskDeviceType::USB)
-		    || sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)
-		    || sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) {
+		if (sdevice->isDiskOfType(TDEDiskDeviceType::USB) ||
+		    sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) {
 			mimeType = "media/removable" + MOUNT_MEDIA_SUFFIX;
 			if (useDefaultLabel) {
-				diskLabel = i18n("%1 Removable Device").arg(sdevice->deviceFriendlySize());
+				diskLabel = i18n("%1 Removable Disk (%2)").arg(sdevice->deviceFriendlySize(), sdevice->deviceNode());
 			}
 		}
 
@@ -882,7 +882,7 @@ bool TDEBackend::setFloppyProperties(Medium* medium)
 		// Set label
 		TQString diskLabel = sdevice->diskLabel();
 		if (diskLabel.isNull()) {
-			diskLabel = i18n("%1 Zip Disk").arg(sdevice->deviceFriendlySize());
+			diskLabel = i18n("%1 Zip Disk (%2)").arg(sdevice->deviceFriendlySize(), sdevice->deviceNode());
 		}
 		medium->setLabel(diskLabel);
 	}
@@ -1034,7 +1034,7 @@ TQStringList TDEBackend::mountoptions(const TQString &name)
 
 	bool removable = false;
 	if (!drive_udi.isNull()) {
-		removable = ((sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) || (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)));
+		removable = sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable);
 	}
 
 	TQString tmp;
@@ -1234,7 +1234,7 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
 		data.medium = medium;
 
 		TDEIO::Job *job = TDEIO::mount(false, 0, medium->deviceNode(), mountPoint);
-		connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
+		connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)));
 		mount_jobs[job] = &data;
 		// The caller expects the device to be mounted when the function
 		// completes. Thus block until the job completes.
@@ -1345,7 +1345,7 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
 		data.medium = medium;
 
 		TDEIO::Job *job = TDEIO::unmount( medium->mountPoint(), false );
-		connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
+		connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)));
 		mount_jobs[job] = &data;
 		// The caller expects the device to be unmounted when the function
 		// completes. Thus block until the job completes.
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.h b/tdeioslave/media/mediamanager/tdehardwarebackend.h
index 308a9421e..0c3f84410 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.h
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.h
@@ -44,7 +44,7 @@ class Dialog;
 
 class TDEBackend : public TQObject, public BackendBase
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	/**
diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp
index 069e205de..2510019f2 100644
--- a/tdeioslave/media/medianotifier/medianotifier.cpp
+++ b/tdeioslave/media/medianotifier/medianotifier.cpp
@@ -19,14 +19,18 @@
 
 #include "medianotifier.h"
 
-#if defined (__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined (__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)\
+ || defined(Q_OS_SOLARIS)
+#ifdef Q_OS_SOLARIS
+#include <sys/types.h>
+#endif /* Q_OS_SOLARIS */
 #include <sys/statvfs.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #else
 #include <sys/vfs.h>
 #endif
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(Q_OS_SOLARIS)
 #define statfs statvfs
 #endif
 
@@ -65,7 +69,7 @@ MediaNotifier::MediaNotifier(const TQCString &name) : KDEDModule(name)
 
 	m_notificationDialogList.setAutoDelete(FALSE);
 	m_freeTimer = new TQTimer( this );
-	connect( m_freeTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkFreeDiskSpace() ) );
+	connect( m_freeTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkFreeDiskSpace() ) );
 	m_freeTimer->start( 1000*6*2 /* 20 minutes */ );
 	m_freeDialog = 0;
 }
@@ -119,8 +123,8 @@ void MediaNotifier::onMediumChange( const TQString &name, bool allowNotification
 
 	m_allowNotificationMap[job] = allowNotification;
 	
-	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-	         this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) );
+	connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+	         this, TQ_SLOT( slotStatResult( TDEIO::Job * ) ) );
 }
 
 void MediaNotifier::slotStatResult( TDEIO::Job *job )
@@ -343,7 +347,7 @@ void MediaNotifier::notify( KFileItem &medium )
 		if ( actions.size()>1 )
 		{
 			NotificationDialog*  notifier = new NotificationDialog( medium, settings );
-			connect(notifier, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(notificationDialogDestroyed(TQObject*)));
+			connect(notifier, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(notificationDialogDestroyed(TQObject*)));
 			m_notificationDialogList.append(notifier);
 			notifier->show();
 		}
@@ -403,8 +407,8 @@ void MediaNotifier::checkFreeDiskSpace()
                                            i18n("Do not ask again"),
                                            &checkboxResult, KMessageBox::Notify | KMessageBox::NoExec);
             m_freeDialog->show();
-            connect( m_freeDialog, TQT_SIGNAL( yesClicked() ), TQT_SLOT( slotFreeContinue() ) );
-            connect( m_freeDialog, TQT_SIGNAL( noClicked() ), TQT_SLOT( slotFreeCancel() ) );
+            connect( m_freeDialog, TQ_SIGNAL( yesClicked() ), TQ_SLOT( slotFreeContinue() ) );
+            connect( m_freeDialog, TQ_SIGNAL( noClicked() ), TQ_SLOT( slotFreeCancel() ) );
         }
     }
 }
@@ -421,7 +425,7 @@ void MediaNotifier::slotFreeCancel()
 
 void MediaNotifier::slotFreeFinished( KMessageBox::ButtonCode res )
 {
-    TQCheckBox *checkbox = ::tqqt_cast<TQCheckBox*>( m_freeDialog->child( 0, TQCHECKBOX_OBJECT_NAME_STRING ) );
+    TQCheckBox *checkbox = ::tqt_cast<TQCheckBox*>( m_freeDialog->child( 0, "TQCheckBox" ) );
     if ( checkbox && checkbox->isChecked() )
         KMessageBox::saveDontShowAgainYesNo("dontagainfreespace", res);
     m_freeDialog->delayedDestruct();
diff --git a/tdeioslave/media/medianotifier/medianotifier.h b/tdeioslave/media/medianotifier/medianotifier.h
index 84eee525c..c45db66c1 100644
--- a/tdeioslave/media/medianotifier/medianotifier.h
+++ b/tdeioslave/media/medianotifier/medianotifier.h
@@ -34,7 +34,7 @@ typedef TQPtrList<NotificationDialog> NotificationDialogList;
 
 class MediaNotifier:  public KDEDModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 	K_DCOP
 
 public:
diff --git a/tdeioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp
index fc6d87647..a8bb81ea5 100644
--- a/tdeioslave/media/medianotifier/notificationdialog.cpp
+++ b/tdeioslave/media/medianotifier/notificationdialog.cpp
@@ -71,17 +71,17 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett
 
 	setButtonText( User1, i18n("Configure...") );
 
-	connect( m_actionWatcher, TQT_SIGNAL( dirty( const TQString & ) ),
-	         this, TQT_SLOT( slotActionsChanged( const TQString & ) ) );
-	connect( this , TQT_SIGNAL( okClicked() ),
-	         this, TQT_SLOT( slotOk() ) );
-	connect( this, TQT_SIGNAL( user1Clicked() ),
-	         this, TQT_SLOT( slotConfigure() ) );
-	connect( m_view->actionsList, TQT_SIGNAL( doubleClicked ( TQListBoxItem*, const TQPoint & ) ),
-	         this, TQT_SLOT( slotOk() ) );
-
-	connect( this, TQT_SIGNAL( finished() ),
-	         this, TQT_SLOT( delayedDestruct() ) );
+	connect( m_actionWatcher, TQ_SIGNAL( dirty( const TQString & ) ),
+	         this, TQ_SLOT( slotActionsChanged( const TQString & ) ) );
+	connect( this , TQ_SIGNAL( okClicked() ),
+	         this, TQ_SLOT( slotOk() ) );
+	connect( this, TQ_SIGNAL( user1Clicked() ),
+	         this, TQ_SLOT( slotConfigure() ) );
+	connect( m_view->actionsList, TQ_SIGNAL( doubleClicked ( TQListBoxItem*, const TQPoint & ) ),
+	         this, TQ_SLOT( slotOk() ) );
+
+	connect( this, TQ_SIGNAL( finished() ),
+	         this, TQ_SLOT( delayedDestruct() ) );
 
 	m_actionWatcher->startScan();
 	TQPushButton * btn = actionButton( Ok );
diff --git a/tdeioslave/media/medianotifier/notificationdialog.h b/tdeioslave/media/medianotifier/notificationdialog.h
index 16bedb842..9f1f8057f 100644
--- a/tdeioslave/media/medianotifier/notificationdialog.h
+++ b/tdeioslave/media/medianotifier/notificationdialog.h
@@ -31,7 +31,7 @@
 
 class NotificationDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	NotificationDialog( KFileItem medium, NotifierSettings *settings,
diff --git a/tdeioslave/media/mounthelper/dialog.cpp b/tdeioslave/media/mounthelper/dialog.cpp
index d16c6d974..a257ca6d8 100644
--- a/tdeioslave/media/mounthelper/dialog.cpp
+++ b/tdeioslave/media/mounthelper/dialog.cpp
@@ -36,7 +36,7 @@ Dialog::Dialog(TQString url, TQString iconName) :
 	TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, TDEIcon::SizeLarge);
 	unlockDialog->encryptedIcon->setPixmap( pixmap );
 
-	connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
+	connect(unlockDialog->passwordEdit, TQ_SIGNAL (textChanged(const TQString &)), this, TQ_SLOT (slotPasswordChanged(const TQString &)));
 
 	setMainWidget(unlockDialog);
 }
diff --git a/tdeioslave/media/mounthelper/dialog.h b/tdeioslave/media/mounthelper/dialog.h
index a80a9c69a..d2b2925a9 100644
--- a/tdeioslave/media/mounthelper/dialog.h
+++ b/tdeioslave/media/mounthelper/dialog.h
@@ -39,7 +39,7 @@
 class Dialog : public KDialogBase
 {
 
-Q_OBJECT	
+TQ_OBJECT	
 
 public:
 	Dialog(TQString url, TQString iconName);
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
index 9094b8e56..90f3caa3f 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
@@ -102,8 +102,8 @@ void MountHelper::unlock(const Medium &medium)
 	}
 	m_mediumId = medium.id();
 	m_dialog = new Dialog(device, iconName);
-	connect(m_dialog, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotSendPassword()));
-	connect(m_dialog, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancel()));
+	connect(m_dialog, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotSendPassword()));
+	connect(m_dialog, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCancel()));
 	m_dialog->show();
 }
 
@@ -143,10 +143,10 @@ void MountHelper::eject(const Medium &medium)
 #endif
 
 	// Otherwise fall back to tdeeject
-	TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));
+	TDEProcess *proc = new TDEProcess(this);
 	*proc << "tdeeject";
 	*proc << medium.deviceNode();
-	connect(proc, TQT_SIGNAL(processExited(TDEProcess*)),	this, TQT_SLOT(ejectFinished(TDEProcess*)));
+	connect(proc, TQ_SIGNAL(processExited(TDEProcess*)),	this, TQ_SLOT(ejectFinished(TDEProcess*)));
 	proc->start();
 }
 
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
index e1ae0c5c2..3cdf58488 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
@@ -33,7 +33,7 @@ class TDEProcess;
 
 class MountHelper : public TDEApplication
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	MountHelper();
diff --git a/tdeioslave/media/propsdlgplugin/propertiespage.cpp b/tdeioslave/media/propsdlgplugin/propertiespage.cpp
index 5b54c8c5a..57fff8573 100644
--- a/tdeioslave/media/propsdlgplugin/propertiespage.cpp
+++ b/tdeioslave/media/propsdlgplugin/propertiespage.cpp
@@ -64,43 +64,43 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
       option_ro->hide();
     else
       option_ro->setChecked(options["ro"] == "true");
-    connect( option_ro, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_ro, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     if (!options.contains("quiet"))
       option_quiet->hide();
     else
       option_quiet->setChecked(options["quiet"] == "true");
-    connect( option_quiet, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_quiet, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     if (!options.contains("sync"))
       option_sync->hide();
     else
       option_sync->setChecked(options["sync"] == "true");
-    connect( option_sync, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_sync, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     if (!options.contains("atime"))
       option_atime->hide();
     else
       option_atime->setChecked(options["atime"] == "true");
-    connect( option_atime, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_atime, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     if (!options.contains("flush"))
       option_flush->hide();
     else
       option_flush->setChecked(options["flush"] == "true");
-    connect( option_flush, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_flush, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     if (!options.contains("utf8"))
       option_utf8->hide();
     else
       option_utf8->setChecked(options["utf8"] == "true");
-    connect( option_utf8, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_utf8, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     if (!options.contains("uid"))
       option_uid->hide();
     else
       option_uid->setChecked(options["uid"] == "true");
-    connect( option_uid, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_uid, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     if (!options.contains("shortname"))
       {
@@ -115,7 +115,7 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
 	      option_shortname->setCurrentItem(index);
 	      break;
 	    }
-	connect( option_shortname, TQT_SIGNAL( activated(int) ), TQT_SIGNAL( changed() ) );
+	connect( option_shortname, TQ_SIGNAL( activated(int) ), TQ_SIGNAL( changed() ) );
       }
 
     if (!options.contains("journaling"))
@@ -131,14 +131,14 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
 	      option_journaling->setCurrentItem(index);
 	      break;
 	    }
-	connect( option_journaling, TQT_SIGNAL( activated(int) ), TQT_SIGNAL( changed() ) );
+	connect( option_journaling, TQ_SIGNAL( activated(int) ), TQ_SIGNAL( changed() ) );
       }
 
     label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"]));
     option_mountpoint->setText(options["mountpoint"]);
-    connect( option_mountpoint, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SIGNAL( changed() ) );
+    connect( option_mountpoint, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SIGNAL( changed() ) );
     option_automount->setChecked(options["automount"] == "true");
-    connect( option_automount, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_automount, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     bool has_groupbox_specific = true;
     if (!options.contains("journaling") &&
@@ -152,11 +152,11 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
 
     // The order is important - we want groupboxes to hide automatically depending on use_defaults
     // but don't want to emit changed() until user actually changes something.
-    connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_generic, SLOT( setHidden(bool) ) );
+    connect( option_defaults, TQ_SIGNAL( toggled(bool) ), groupbox_generic, TQ_SLOT( setHidden(bool) ) );
     if (has_groupbox_specific)
-      connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_specific, SLOT( setHidden(bool) ) );
+      connect( option_defaults, TQ_SIGNAL( toggled(bool) ), groupbox_specific, TQ_SLOT( setHidden(bool) ) );
     option_defaults->setChecked(options["use_defaults"] == "true");
-    connect( option_defaults, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );    
+    connect( option_defaults, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );    
 
   } else {
 
diff --git a/tdeioslave/media/propsdlgplugin/propertiespage.h b/tdeioslave/media/propsdlgplugin/propertiespage.h
index 50a480719..33baef40f 100644
--- a/tdeioslave/media/propsdlgplugin/propertiespage.h
+++ b/tdeioslave/media/propsdlgplugin/propertiespage.h
@@ -28,7 +28,7 @@ class Medium;
 
 class PropertiesPage : public PropertiesPageGUI
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   PropertiesPage(TQWidget* parent, const TQString &_id);
diff --git a/tdeioslave/media/propsdlgplugin/propertiespagegui.ui b/tdeioslave/media/propsdlgplugin/propertiespagegui.ui
index 2a6ff899e..5d461b406 100644
--- a/tdeioslave/media/propsdlgplugin/propertiespagegui.ui
+++ b/tdeioslave/media/propsdlgplugin/propertiespagegui.ui
@@ -372,12 +372,12 @@ Display the short name as is; store a long name when the short name is not all u
 <variables>
     <variable>bool m_hasChanged;</variable>
 </variables>
-<Q_SIGNALS>
+<signals>
     <signal>changed()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
     <slot access="protected">changedSlot()</slot>
-</Q_SLOTS>
+</slots>
 <functions>
     <function returnType="bool">hasChanged()</function>
 </functions>
diff --git a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
index ea830d2e1..dce33d786 100644
--- a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
@@ -70,10 +70,10 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
   d = new Private();
 
   d->page = new PropertiesPage(vbox, Medium::create(reply).id());
-  connect(d->page, TQT_SIGNAL(changed()),
-	  TQT_SLOT(slotChanged()));
+  connect(d->page, TQ_SIGNAL(changed()),
+	  TQ_SLOT(slotChanged()));
 
-  //  TQTimer::singleShot(100, this, TQT_SLOT(slotChanged()));
+  //  TQTimer::singleShot(100, this, TQ_SLOT(slotChanged()));
 
 }
 
diff --git a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.h b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.h
index 87b7d1e13..e2ed740a7 100644
--- a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.h
+++ b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.h
@@ -24,7 +24,7 @@
 
 class PropsDlgSharePlugin : public KPropsDlgPlugin
 {
-Q_OBJECT
+TQ_OBJECT
 public:
   PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const TQStringList & );
   virtual ~PropsDlgSharePlugin();
diff --git a/tdeioslave/media/tdecmodule/main.cpp b/tdeioslave/media/tdecmodule/main.cpp
index e2d367e7d..dabac39aa 100644
--- a/tdeioslave/media/tdecmodule/main.cpp
+++ b/tdeioslave/media/tdecmodule/main.cpp
@@ -49,13 +49,13 @@ MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList
 	
 	m_notifierModule = new NotifierModule( this, "notifier" );
 	tab->addTab( m_notifierModule, i18n( "&Notifications" ) );
-	connect( m_notifierModule, TQT_SIGNAL( changed( bool ) ),
-	         this, TQT_SLOT( moduleChanged( bool ) ) );
+	connect( m_notifierModule, TQ_SIGNAL( changed( bool ) ),
+	         this, TQ_SLOT( moduleChanged( bool ) ) );
 
 	m_managerModule = new ManagerModule( this, "manager" );
 	tab->addTab( m_managerModule, i18n( "&Advanced" ) );
-	connect( m_managerModule, TQT_SIGNAL( changed( bool ) ),
-	         this, TQT_SLOT( moduleChanged( bool ) ) );
+	connect( m_managerModule, TQ_SIGNAL( changed( bool ) ),
+	         this, TQ_SLOT( moduleChanged( bool ) ) );
 
 
 
diff --git a/tdeioslave/media/tdecmodule/main.h b/tdeioslave/media/tdecmodule/main.h
index 5052d58eb..29d9eb21f 100644
--- a/tdeioslave/media/tdecmodule/main.h
+++ b/tdeioslave/media/tdecmodule/main.h
@@ -24,7 +24,7 @@
 
 class MediaModule : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	MediaModule( TQWidget *parent, const char *name, const TQStringList& );
diff --git a/tdeioslave/media/tdecmodule/managermodule.cpp b/tdeioslave/media/tdecmodule/managermodule.cpp
index 813775cbd..03a5ea500 100644
--- a/tdeioslave/media/tdecmodule/managermodule.cpp
+++ b/tdeioslave/media/tdecmodule/managermodule.cpp
@@ -51,16 +51,16 @@ ManagerModule::ManagerModule( TQWidget* parent, const char* name )
 #endif
 	view->kcfg_CdPollingEnabled->setEnabled( false );
 
-	connect( view->option_automount, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_ro, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_quiet, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_flush, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_uid, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_utf8, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_sync, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_atime, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_shortname, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_journaling, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) );	
+	connect( view->option_automount, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_ro, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_quiet, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_flush, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_uid, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_utf8, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_sync, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_atime, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_shortname, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_journaling, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( emitChanged() ) );	
 
 	load();
 }	
@@ -91,7 +91,7 @@ void ManagerModule::load()
 	else
 	    view->option_atime->setNoChange();
 	
-	QString value;	
+	TQString value;	
 	
 	value = config.readEntry("shortname", "lower").lower();
 	for (int i = 0; i < view->option_shortname->count(); i++)
diff --git a/tdeioslave/media/tdecmodule/managermodule.h b/tdeioslave/media/tdecmodule/managermodule.h
index a0a384675..ae79e8d78 100644
--- a/tdeioslave/media/tdecmodule/managermodule.h
+++ b/tdeioslave/media/tdecmodule/managermodule.h
@@ -27,7 +27,7 @@ class ManagerModuleView;
 
 class ManagerModule : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	ManagerModule( TQWidget* parent = 0, const char* name = 0);
diff --git a/tdeioslave/media/tdecmodule/notifiermodule.cpp b/tdeioslave/media/tdecmodule/notifiermodule.cpp
index 4364d93ad..2d2d53481 100644
--- a/tdeioslave/media/tdecmodule/notifiermodule.cpp
+++ b/tdeioslave/media/tdecmodule/notifiermodule.cpp
@@ -57,18 +57,18 @@ NotifierModule::NotifierModule(TQWidget *parent, const char *name)
 	
 	updateListBox();
 
-	connect( m_view->mimetypesCombo, TQT_SIGNAL( activated(int) ),
-	         this, TQT_SLOT( slotMimeTypeChanged(int) ) );
-	connect( m_view->actionsList, TQT_SIGNAL( selectionChanged(TQListBoxItem*) ),
-	         this, TQT_SLOT( slotActionSelected(TQListBoxItem*) ) );
-	connect( m_view->addButton, TQT_SIGNAL( clicked() ),
-	         this, TQT_SLOT( slotAdd() ) );
-	connect( m_view->editButton, TQT_SIGNAL( clicked() ),
-	         this, TQT_SLOT( slotEdit() ) );
-	connect( m_view->deleteButton, TQT_SIGNAL( clicked() ),
-	         this, TQT_SLOT( slotDelete() ) );
-	connect( m_view->toggleAutoButton, TQT_SIGNAL( clicked() ),
-	         this, TQT_SLOT( slotToggleAuto() ) );
+	connect( m_view->mimetypesCombo, TQ_SIGNAL( activated(int) ),
+	         this, TQ_SLOT( slotMimeTypeChanged(int) ) );
+	connect( m_view->actionsList, TQ_SIGNAL( selectionChanged(TQListBoxItem*) ),
+	         this, TQ_SLOT( slotActionSelected(TQListBoxItem*) ) );
+	connect( m_view->addButton, TQ_SIGNAL( clicked() ),
+	         this, TQ_SLOT( slotAdd() ) );
+	connect( m_view->editButton, TQ_SIGNAL( clicked() ),
+	         this, TQ_SLOT( slotEdit() ) );
+	connect( m_view->deleteButton, TQ_SIGNAL( clicked() ),
+	         this, TQ_SLOT( slotDelete() ) );
+	connect( m_view->toggleAutoButton, TQ_SIGNAL( clicked() ),
+	         this, TQ_SLOT( slotToggleAuto() ) );
 }
 
 NotifierModule::~NotifierModule()
diff --git a/tdeioslave/media/tdecmodule/notifiermodule.h b/tdeioslave/media/tdecmodule/notifiermodule.h
index d5d97a96d..2192c30a9 100644
--- a/tdeioslave/media/tdecmodule/notifiermodule.h
+++ b/tdeioslave/media/tdecmodule/notifiermodule.h
@@ -28,7 +28,7 @@
 
 class NotifierModule : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	NotifierModule( TQWidget* parent = 0, const char* name = 0);
diff --git a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
index 4147e437c..bcf533b9d 100644
--- a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
+++ b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
@@ -78,10 +78,10 @@ ServiceConfigDialog::ServiceConfigDialog(NotifierServiceAction *action,
 	setMainWidget(m_view);
 	setCaption( m_action->label() );
 
-	connect( m_view->iconButton, TQT_SIGNAL( iconChanged(TQString) ),
-	         this, TQT_SLOT( slotIconChanged() ) );
-	connect( m_view->commandButton, TQT_SIGNAL( clicked() ),
-	         this, TQT_SLOT( slotCommand() ) );
+	connect( m_view->iconButton, TQ_SIGNAL( iconChanged(TQString) ),
+	         this, TQ_SLOT( slotIconChanged() ) );
+	connect( m_view->commandButton, TQ_SIGNAL( clicked() ),
+	         this, TQ_SLOT( slotCommand() ) );
 }
 
 bool operator==( KDEDesktopMimeType::Service s1, KDEDesktopMimeType::Service s2 )
diff --git a/tdeioslave/media/tdecmodule/serviceconfigdialog.h b/tdeioslave/media/tdecmodule/serviceconfigdialog.h
index 24e907205..2f35bfb54 100644
--- a/tdeioslave/media/tdecmodule/serviceconfigdialog.h
+++ b/tdeioslave/media/tdecmodule/serviceconfigdialog.h
@@ -27,7 +27,7 @@
 
 class ServiceConfigDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	ServiceConfigDialog(NotifierServiceAction *action,
diff --git a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
index 826b69f6a..190bec197 100644
--- a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
+++ b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
@@ -158,12 +158,12 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
 			TQPixmap bar(150, 20);
 			TQPainter p(&bar);
 
-			p.fillRect(0, 0, length, 20, Qt::red);
-			p.fillRect(length, 0, 150-length, 20, Qt::green);
+			p.fillRect(0, 0, length, 20, TQt::red);
+			p.fillRect(length, 0, 150-length, 20, TQt::green);
 
 			TQColorGroup cg = TQApplication::palette().active();
 
-			TQApplication::style().tqdrawPrimitive(TQStyle::PE_Panel, &p,
+			TQApplication::style().drawPrimitive(TQStyle::PE_Panel, &p,
 							    TQRect(0, 0, 150, 20), cg,
 							    TQStyle::Style_Sunken);
 
diff --git a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h
index dcc2591be..0f9dc0038 100644
--- a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h
+++ b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h
@@ -28,7 +28,7 @@
 
 class KFileMediaPlugin : public KFilePlugin
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	KFileMediaPlugin(TQObject *parent, const char *name,
 	                 const TQStringList &args);
diff --git a/tdeioslave/media/tdeio_media.cpp b/tdeioslave/media/tdeio_media.cpp
index 9124568c1..c68bc25d5 100644
--- a/tdeioslave/media/tdeio_media.cpp
+++ b/tdeioslave/media/tdeio_media.cpp
@@ -62,8 +62,8 @@ MediaProtocol::MediaProtocol(const TQCString &protocol,
                              const TQCString &pool, const TQCString &app)
 	: ForwardingSlaveBase(protocol, pool, app)
 {
-	connect( &m_impl, TQT_SIGNAL( warning( const TQString & ) ),
-	         this, TQT_SLOT( slotWarning( const TQString & ) ) );
+	connect( &m_impl, TQ_SIGNAL( warning( const TQString & ) ),
+	         this, TQ_SLOT( slotWarning( const TQString & ) ) );
 }
 
 MediaProtocol::~MediaProtocol()
diff --git a/tdeioslave/media/tdeio_media.h b/tdeioslave/media/tdeio_media.h
index 7acc44df0..473a623b1 100644
--- a/tdeioslave/media/tdeio_media.h
+++ b/tdeioslave/media/tdeio_media.h
@@ -26,7 +26,7 @@
 
 class MediaProtocol : public TDEIO::ForwardingSlaveBase
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	MediaProtocol(const TQCString &protocol, const TQCString &pool,
 	              const TQCString &app);
diff --git a/tdeioslave/sftp/AUTHORS b/tdeioslave/sftp/AUTHORS
deleted file mode 100644
index c763d00bc..000000000
--- a/tdeioslave/sftp/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-Dawit Alemayehu <adawit@kde.org>
-Lucas Fisher <ljfisher@iastate.edu>
-
diff --git a/tdeioslave/sftp/CHANGELOG b/tdeioslave/sftp/CHANGELOG
deleted file mode 100644
index c34cd9dec..000000000
--- a/tdeioslave/sftp/CHANGELOG
+++ /dev/null
@@ -1,59 +0,0 @@
-- add dialog to ask for username
-- rename() causes SSH to die
-- How to handle overwrite?
-- After the user cancels with the stop button, we get ERR_CANNOT_LAUNCH_PROCESS
-  errors, until we kill the ioslave. Same thing after trying the wrong passwd
-  too many times.
-  This is happening because TDEProcess thinks that the ssh process is still running
-  even though it exited.
-- How to handle password and caching?
-  - Write our own askpass program using kde
-  - set env SSH_ASKPASS_PROGRAM before launching
-    -how to do this? TDEProcess doesn't give us access to env variables.
-  - Our askpass program can probably talk to the tdesu daemon to implement caching.
-- chmod() succeeds, but konqueror always puts permissions to 0 afterwards. The properties
-  dialog is right though.
-  Nevermind - ftp ioslave does this too! Maybe a bug with konqueror.
-- stat does not give us group and owner names, only numbers.  We could cache the uid/name and
-  gid/name so we can give names when doing a stat also.
-  
-7-13-2001 - ReadLink stopped working. sftp server always retuns a file not found error
-          - Need to implement 64 bit file lengths-->write DataStream << for u_int64
-            Still need to offer 32 bit size since this is what kde wants. ljf
-          - rename() isn't exactly causing ioslave to die.  The stat of the file we are
-            going to rename is killing the slave.  The slave dies in the statEntry() call.
-            I don't know what I am putting in the UDS entry that is causing this. ljf
-7-14-2001 - got put, mimetype working ljf
-          - fixed readlink problem - I was sending the wrong path. doh! ljf
-7-17-2001 - If the user changes the host, the slave doesn't change host! setHost() is not
-            called, nor is another ioslave spawned. I have not investigated the problem
-            yet. ljf
-7-21-2001 - got slave working with kde 2.2 cvs
-7-22-2001 - probable solution to getting password prompt -- open with controlling
-            but don't connect stdin/out to terminal. duh!
-8-9-2001  - Doh! I haven't kept very good logs. Look at the cvs logs for better info.
-          - At this point tdeio_sftp is using KSshProcess which I wrote in order to make
-            a standard interface to the various version of ssh out there. So far it is
-            working fairly well.  We also now report host key changes to the user and
-            allow them to choose whether or not to continue. This is a big improvement.
-          - Todo: support use of keys and ssh agent
-                  put()'s resume functionality needs some work
-1-26-2002 - Rewrote put() following the ftp::put() so it should behave the same way
-          - increase the size of the data packet we ask for in ::get up to 60k.
-            Through-put increases nicely.
-          - Call closeConnection() from construction. Keeps from having unused ssh
-            processes laying around after failed operations.
-2-19-2002 - get() now emits mimetype, fixes problem with konqi not downloading file for
-            viewing in kpart.
-          - get port number using getservbyname instead of hard coding it.
-2-27-2002 - testing before committing back to cvs, test with openssh 3, ssh 3
-6-?-2002 - rewrote openConnection() to using new KSshProcess connect proceedures
-7-20-2002 - Don't put up a message box when auth fails because of now or changed key,
-            the call to error() will put up the dialog.
-          - Connect fails and no more password are prompted for when we get
-            ERR_AUTH_FAILED from KSshProcess.
-9-15-2002 - stuff
-9-29-2002 - the last i18n string updates, fixed problem with uploading files to
-            openssh server.
-5-8-2003  - check whether operation types are supported by the negotiated sftp
-            protocol version
diff --git a/tdeioslave/sftp/CMakeLists.txt b/tdeioslave/sftp/CMakeLists.txt
index 62fe0fce3..8074ea76e 100644
--- a/tdeioslave/sftp/CMakeLists.txt
+++ b/tdeioslave/sftp/CMakeLists.txt
@@ -1,13 +1,10 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
+###########################################
+#                                         #
+#  Improvements and feedback are welcome  #
+#                                         #
+#  This file is released under GPL >= 2   #
+#                                         #
+###########################################
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -21,7 +18,7 @@ link_directories(
 )
 
 
-##### other data ################################
+##### other data #########################
 
 tde_create_translated_desktop(
   SOURCE sftp.protocol
@@ -30,12 +27,12 @@ tde_create_translated_desktop(
 )
 
 
-##### tdeio_sftp (module) #########################
+##### tdeio_sftp (module) ################
 
 set( target tdeio_sftp )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES process.cpp atomicio.cpp tdeio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
-  LINK tdeio-shared tdesu-shared
+  SOURCES tdeio_sftp.cpp
+  LINK tdeio-shared ssh
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/sftp/DEBUGGING b/tdeioslave/sftp/DEBUGGING
deleted file mode 100644
index 8e15c91d4..000000000
--- a/tdeioslave/sftp/DEBUGGING
+++ /dev/null
@@ -1,12 +0,0 @@
-DEBUGGING
-
-The best way to debug this slave is to send debug info to a
-file using 'tdedebugDialog --fullmode'. Then you can 'tail -f' the file to 
-see debug messages in real-time.
-
-I also suggest getting the openssh source and recompiling sftp-server to 
-send messages to the auth log.  This can be done in sftp-server.c be defining
-DEBUG_SFTP_SERVER.
-
-You can do the same with the ssh client by finding the two calls to log_init() 
-in ssh.c and changing the last argument from 1 to 0 and recompiling.
diff --git a/tdeioslave/sftp/Makefile.am b/tdeioslave/sftp/Makefile.am
deleted file mode 100644
index 512f5f7dd..000000000
--- a/tdeioslave/sftp/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-## Makefile.am of tdebase/tdeioslave/sftp
-
-INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-METASOURCES = AUTO
-
-####### Files
-
-check_PROGRAMS = ksshprocesstest
-
-ksshprocesstest_SOURCES = ksshprocesstest.cpp
-ksshprocesstest_LDADD = $(LIB_TDESYCOCA) ksshprocess.lo process.lo atomicio.lo
-
-kde_module_LTLIBRARIES = tdeio_sftp.la
-
-tdeio_sftp_la_SOURCES = process.cpp atomicio.cpp tdeio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
-tdeio_sftp_la_LIBADD = $(LIB_TDEIO)
-tdeio_sftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-noinst_HEADERS = atomicio.h tdeio_sftp.h ksshprocess.h process.h sftpfileattr.h sftp.h
-
-kdelnk_DATA = sftp.protocol
-kdelnkdir = $(kde_servicesdir)
-
-messages:
-	$(XGETTEXT) *.cpp -o $(podir)/tdeio_sftp.pot
diff --git a/tdeioslave/sftp/TODO b/tdeioslave/sftp/TODO
deleted file mode 100644
index 0f1411317..000000000
--- a/tdeioslave/sftp/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-TODO:
-=====
-
-- Support for use of public keys, maybe ssh-agent, a key management app, etc.
-
diff --git a/tdeioslave/sftp/atomicio.cpp b/tdeioslave/sftp/atomicio.cpp
deleted file mode 100644
index 057f20fe9..000000000
--- a/tdeioslave/sftp/atomicio.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-//#include "includes.h"
-//RCSID("$OpenBSD: atomicio.c,v 1.9 2001/03/02 18:54:30 deraadt Exp $");
-
-//#include "xmalloc.h"
-#include "atomicio.h"
-#include <unistd.h>
-#include <errno.h>
-#include <kdebug.h>
-
-/*
- * ensure all of data on socket comes through. f==read || f==write
- */
-
-ssize_t	atomicio(int fd, char *_s, size_t n, bool read)	
-{
-	char *s = _s;
-	ssize_t res;
-	ssize_t pos = 0;
-
-	while (n > pos) {
-		if( read)
-		    res = ::read(fd, s + pos, n - pos);
-		else
-		    res = ::write(fd, s + pos, n - pos);
-
-		switch (res) {
-		case -1:
-		    kdDebug() << "atomicio(): errno=" << errno << endl;
-#ifdef EWOULDBLOCK
-			if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
-#else
-			if (errno == EINTR || errno == EAGAIN)
-#endif
-				continue;
-		case 0:
-			return (res);
-		default:
-			pos += res;
-		}
-	}
-	return (pos);
-}
diff --git a/tdeioslave/sftp/atomicio.h b/tdeioslave/sftp/atomicio.h
deleted file mode 100644
index 4468757d5..000000000
--- a/tdeioslave/sftp/atomicio.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef atomicio_h
-#define atomicio_h
-
-/*	$OpenBSD: atomicio.h,v 1.3 2001/03/02 18:54:30 deraadt Exp $	*/
-
-/*
- * Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <unistd.h>
-
-/*
- * Ensure all of data on socket comes through. f==read || f==write
- */
-ssize_t	atomicio(int fd, char *_s, size_t n, bool read = true);
-
-#endif
diff --git a/tdeioslave/sftp/ksshprocess.cpp b/tdeioslave/sftp/ksshprocess.cpp
deleted file mode 100644
index 0f19126d2..000000000
--- a/tdeioslave/sftp/ksshprocess.cpp
+++ /dev/null
@@ -1,1114 +0,0 @@
-/***************************************************************************
-                          ksshprocess.cpp  -  description
-                             -------------------
-    begin                : Tue Jul 31 2001
-    copyright            : (C) 2001 by Lucas Fisher
-    email                : ljfisher@purdue.edu
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/*
- * See the KSshProcess header for examples on use.
- *
- * This class uses a hacked version of the PTYProcess
- * class.  This was needed because the tdelibs PTYProcess does not provide 
- * access to the pty file descriptor which we need, because ssh prints the
- * password prompt to the pty and reads the password from the pty.  I don't
- * feel I know enough about ptys to confidently modify the orignial
- * PTYProcess class.
- *
- * To start ssh we take the arguments the user gave us
- * in the SshOptList and build the ssh command arguments based on the version
- * of ssh we are using.  This command and its arguments are  passed to
- * PTYProcess for execution.  Once ssh is started we scan each line of input
- * from stdin, stderr, and the pty for recognizable strings.  The recognizable
- * strings are taken from several string tables.  Each table contains a string
- * for each specific version of ssh we support and a string for a generic
- * version of OpenSSH and commercial SSH incase we don't recognized the 
- * specific ssh version strings (as when a new SSH version is released after
- * a release of KSshProcess).  There are tables for ssh version strings,
- * password prompts, new host key errors, different host key errors,
- * messages than indicate a successful connect, authentication errors, etc.
- * If we find user interaction is necessary, for instance to provide a 
- * password or passphrase, we return a err code to the user who can send
- * a message to KSshProcess, using one of several methods, to correct
- * the error.
- *
- * Determining when the ssh connection has successfully authenticationed has
- * proved to be the most difficult challenge.  OpenSSH does not print a message
- * on successful authentication, thus the only way to know is to send data
- * and wait for a return.  The problem here is sometimes it can take a bit
- * to establish the connection (for example, do to DNS lookups).  This means
- * the user may be sitting there waiting for a connection that failed.
- * Instead, ssh is always started with the verbose flag.  Then we look for
- * a message that indicates auth succeeded.  This is hazardous because
- * debug messages are more likely to change between OpenSSH releases.
- * Thus, we could become incompatible with new OpenSSH releases.
- */
-
-#include <config.h>
-
-#include "ksshprocess.h"
-
-#include <stdio.h>
-#include <errno.h>
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include <kstandarddirs.h>
-#include <tdelocale.h>
-#include <tqregexp.h>
-
-/*
- * The following are tables of string and regexps we match
- * against the output of ssh.  An entry in each array 
- * corresponds the the version of ssh found in versionStrs[].
- * 
- * The version strings must be ordered in the array from most
- * specific to least specific in cases where the beginning
- * of several version strings are the similar. For example,
- * consider the openssh version strings.  The generic "OpenSSH"
- * must be the last of the openssh version strings in the array
- * so that is matched last. We use these generic version strings
- * so we can do a best effor to  support unknown ssh versions.
- */
-TQRegExp KSshProcess::versionStrs[] = {
-    TQRegExp("OpenSSH_3\\.[6-9]|OpenSSH_[1-9]*[4-9]\\.[0-9]"),
-    TQRegExp("OpenSSH"),
-    TQRegExp("SSH Secure Shell")
-};
-
-const char * const KSshProcess::passwordPrompt[] = {
-    "password:", // OpenSSH
-    "password:", // OpenSSH
-    "password:"  // SSH
-};
-
-const char * const KSshProcess::passphrasePrompt[] = {
-    "Enter passphrase for key",
-    "Enter passphrase for key",
-    "Passphrase for key"
-};
-
-const char * const KSshProcess::authSuccessMsg[] = {
-    "Authentication succeeded",
-    "ssh-userauth2 successful",
-    "Received SSH_CROSS_AUTHENTICATED packet"
-};
-
-const char* const KSshProcess::authFailedMsg[] = {
-    "Permission denied (",
-    "Permission denied (",
-    "Authentication failed."
-};
-
-const char* const KSshProcess::tryAgainMsg[] = {
-    "please try again",
-    "please try again",
-    "adjfhjsdhfdsjfsjdfhuefeufeuefe"
-};
-
-TQRegExp KSshProcess::hostKeyMissingMsg[] = {
-    TQRegExp("The authenticity of host|No (DSA|RSA) host key is known for"),
-    TQRegExp("The authenticity of host|No (DSA|RSA) host key is known for"),
-    TQRegExp("Host key not found from database")
-};
-
-const char* const KSshProcess::continuePrompt[] = {
-    "Are you sure you want to continue connecting (yes/no)?",
-    "Are you sure you want to continue connecting (yes/no)?",
-    "Are you sure you want to continue connecting (yes/no)?"
-};
-
-const char* const KSshProcess::hostKeyChangedMsg[] = {
-    "WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!",
-    "WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!",
-    "WARNING: HOST IDENTIFICATION HAS CHANGED!"
-};
-
-TQRegExp KSshProcess::keyFingerprintMsg[] = {
-    TQRegExp("..(:..){15}"),
-    TQRegExp("..(:..){15}"),
-    TQRegExp(".....(-.....){10}")
-};
-
-TQRegExp KSshProcess::knownHostsFileMsg[] = {
-    TQRegExp("Add correct host key in (.*) to get rid of this message."),
-    TQRegExp("Add correct host key in (.*) to get rid of this message."),
-    TQRegExp("Add correct host key to \"(.*)\"")
-};
-
-
-// This prompt only applies to commerical ssh.
-const char* const KSshProcess::changeHostKeyOnDiskPrompt[] = {
-    "as;jf;sajkfdslkfjas;dfjdsa;fj;dsajfdsajf",
-    "as;jf;sajkfdslkfjas;dfjdsa;fj;dsajfdsajf",
-    "Do you want to change the host key on disk (yes/no)?"
-};
-
-// We need this in addition the authFailedMsg because when
-// OpenSSH gets a changed host key it will fail to connect
-// depending on the StrictHostKeyChecking option.  Depending
-// how this option is set, it will print "Permission denied"
-// and quit, or print "Host key verification failed." and
-// quit.  The later if StrictHostKeyChecking is "no".
-// The former if StrictHostKeyChecking is
-// "yes" or explicitly set to "ask".
-TQRegExp KSshProcess::hostKeyVerifyFailedMsg[] = {
-    TQRegExp("Host key verification failed\\."),
-    TQRegExp("Host key verification failed\\."),
-    TQRegExp("Disconnected; key exchange or algorithm? negotiation failed \\(Key exchange failed\\.\\)\\.")
-};
-
-const char * const KSshProcess::connectionClosedMsg[] = {
-    "Connection closed by remote host",
-    "Connection closed by remote host",
-    "Connection closed by remote host"
-};
-
-
-void KSshProcess::SIGCHLD_handler(int) {
-	while(waitpid(-1, NULL, WNOHANG) > 0);
-}
-
-void KSshProcess::installSignalHandlers() {
-    struct sigaction act;
-    memset(&act,0,sizeof(act));
-    act.sa_handler = SIGCHLD_handler;
-    act.sa_flags = 0
-#ifdef SA_NOCLDSTOP
-	    | SA_NOCLDSTOP
-#endif
-#ifdef SA_RESTART
-	    | SA_RESTART
-#endif
-	    ;
-    sigaction(SIGCHLD,&act,NULL);
-}
-					
-void KSshProcess::removeSignalHandlers() {
-	struct sigaction act;
-	memset(&act,0,sizeof(act));
-	act.sa_handler = SIG_DFL;
-	sigaction(SIGCHLD,&act,NULL);
-}
-
-KSshProcess::KSshProcess() 
-            : mVersion(UNKNOWN_VER), mConnected(false), 
-        mRunning(false), mConnectState(0) {
-    mSshPath = TDEStandardDirs::findExe(TQString::fromLatin1("ssh"));
-    kdDebug(KSSHPROC) << "KSshProcess::KSshProcess(): ssh path [" << 
-		mSshPath << "]" << endl;
-        
-	installSignalHandlers();
-}
-
-KSshProcess::KSshProcess(TQString pathToSsh)
-            : mSshPath(pathToSsh), mVersion(UNKNOWN_VER), mConnected(false),
-    mRunning(false), mConnectState(0)  {
-	installSignalHandlers();
-}
-
-KSshProcess::~KSshProcess(){
-    disconnect();
-    removeSignalHandlers();
-    while(waitpid(-1, NULL, WNOHANG) > 0);
-}
-
-bool KSshProcess::setSshPath(TQString pathToSsh) {
-    mSshPath = pathToSsh;
-    version();
-    if( mVersion == UNKNOWN_VER )
-        return false;
-
-    return true;
-}
-
-KSshProcess::SshVersion KSshProcess::version() {
-    TQString cmd;
-    cmd = mSshPath+" -V 2>&1";
-
-    // Get version string from ssh client.
-    FILE *p;
-    if( (p = popen(cmd.latin1(), "r")) == NULL ) {
-        kdDebug(KSSHPROC) << "KSshProcess::version(): "
-            "failed to start ssh: " << strerror(errno) << endl;
-        return UNKNOWN_VER;
-    }
-
-    // Determine of the version from the version string. 
-    size_t len;
-    char buf[128];
-    if( (len = fread(buf, sizeof(char), sizeof(buf)-1, p)) == 0 ) {
-        kdDebug(KSSHPROC) << "KSshProcess::version(): "
-            "Read of ssh version string failed " << 
-             strerror(ferror(p)) << endl;
-        return UNKNOWN_VER;
-    }
-    if( pclose(p) == -1 ) {
-        kdError(KSSHPROC) << "KSshProcess::version(): pclose failed." << endl;
-    }
-    buf[len] = '\0';
-    TQString ver;
-    ver = buf;
-    kdDebug(KSSHPROC) << "KSshProcess::version(): "
-        "got version string [" << ver << "]" << endl;
-
-    mVersion = UNKNOWN_VER;
-    for(int i = 0; i < SSH_VER_MAX; i++) {
-        if( ver.find(versionStrs[i]) != -1 ) {
-             mVersion = (SshVersion)i;
-             break;
-        }
-    }
-
-    kdDebug(KSSHPROC) << "KSshPRocess::version(): version number = "
-	    << mVersion << endl;
-    
-    if( mVersion == UNKNOWN_VER ) {
-        kdDebug(KSSHPROC) << "KSshProcess::version(): "
-            "Sorry, I don't know about this version of ssh" << endl;
-        mError = ERR_UNKNOWN_VERSION;
-        return UNKNOWN_VER;
-    }
-
-    return mVersion;
-}
-/*
-TQString KSshProcess::versionStr() {
-    if( mVersion == UNKNOWN_VER ) {
-        version();
-        if( mVersion == UNKNOWN_VER )
-            return TQString::null;
-    }
-
-    return TQString::fromLatin1(versionStrs[mVersion]);
-}
-*/
-
-bool KSshProcess::setOptions(const SshOptList& opts) {
-    kdDebug(KSSHPROC) << "KSshProcess::setOptions()" << endl;
-    mArgs.clear();
-    SshOptListConstIterator it;
-    TQString cmd, subsystem;
-    mPassword = mUsername = mHost = TQString::null;
-    TQCString tmp;
-    for(it = opts.begin(); it != opts.end(); ++it) {
-        //kdDebug(KSSHPROC) << "opt.opt = " << (*it).opt << endl;
-        //kdDebug(KSSHPROC) << "opt.str = " << (*it).str << endl;
-        //kdDebug(KSSHPROC) << "opt.num = " << (*it).num << endl;
-        switch( (*it).opt ) {
-        case SSH_VERBOSE:
-            mArgs.append("-v");
-            break;
-
-        case SSH_SUBSYSTEM:
-            subsystem = (*it).str;
-            break;
-
-        case SSH_PORT:
-            mArgs.append("-p");
-            tmp.setNum((*it).num);
-            mArgs.append(tmp);
-            mPort = (*it).num;
-            break;
-
-        case SSH_HOST:
-            mHost = (*it).str;
-            break;
-
-        case SSH_USERNAME:
-            mArgs.append("-l");
-            mArgs.append((*it).str.latin1());
-            mUsername = (*it).str;
-            break;
-
-        case SSH_PASSWD:
-            mPassword = (*it).str;
-            break;
-
-        case SSH_PROTOCOL:
-            if( mVersion <= OPENSSH ) {
-                tmp = "Protocol=";
-                tmp += TQString::number((*it).num).latin1();
-                mArgs.append("-o");
-                mArgs.append(tmp);
-            }
-            else if( mVersion <= SSH ) {
-                if( (*it).num == 1 ) {
-                    mArgs.append("-1");
-                }
-                // else uses version 2 by default
-            }
-            break;
-
-        case SSH_FORWARDX11:
-            tmp = "ForwardX11=";
-            tmp += (*it).boolean ? "yes" : "no";
-            mArgs.append("-o");
-            mArgs.append(tmp);
-            break;
-
-        case SSH_FORWARDAGENT:
-            tmp = "ForwardAgent=";
-            tmp += (*it).boolean ? "yes" : "no";
-            mArgs.append("-o");
-            mArgs.append(tmp);
-            break;
-
-        case SSH_ESCAPE_CHAR:
-            if( (*it).num == -1 )
-                tmp = "none";
-            else
-                tmp = (char)((*it).num);
-            mArgs.append("-e");
-            mArgs.append(tmp);
-            break;
-
-        case SSH_OPTION:
-            // don't allow NumberOfPasswordPrompts or StrictHostKeyChecking
-            // since KSshProcess depends on specific setting of these for 
-            // preforming authentication correctly.
-            tmp = (*it).str.latin1();
-            if( tmp.contains("NumberOfPasswordPrompts") ||
-                tmp.contains("StrictHostKeyChecking") ) {
-                mError = ERR_INVALID_OPT;
-                return false;
-            }
-            else {
-                mArgs.append("-o");
-                mArgs.append(tmp);
-            }
-            break;
-            
-        case SSH_COMMAND:
-            cmd = (*it).str;
-            break;
-
-        default:
-            kdDebug(KSSHPROC) << "KSshProcess::setOptions(): "
-                "unrecognized ssh opt " << (*it).opt << endl;
-        }
-    }
-
-    if( !subsystem.isEmpty() && !cmd.isEmpty() ) {
-        kdDebug(KSSHPROC) << "KSshProcess::setOptions(): "
-            "cannot use a subsystem and command at the same time" << endl;
-        mError = ERR_CMD_SUBSYS_CONFLICT;
-        mErrorMsg = i18n("Cannot specify a subsystem and command at the same time.");
-        return false;
-    }
-
-    // These options govern the behavior of ssh and 
-    // cannot be defined by the user
-    //mArgs.append("-o");
-    //mArgs.append("StrictHostKeyChecking=ask");
-    mArgs.append("-v"); // So we get a message that the 
-                        // connection was successful
-    if( mVersion <= OPENSSH ) {
-        // nothing
-    }
-    else if( mVersion <= SSH ) {
-        mArgs.append("-o"); // So we can check if the connection was successful
-        mArgs.append("AuthenticationSuccessMsg=yes");
-    }
-
-    if( mHost.isEmpty() ) {
-        kdDebug(KSSHPROC) << "KSshProcess::setOptions(): "
-            "a host name must be supplied" << endl;
-        return false;
-    }
-    else {
-        mArgs.append(mHost.latin1());
-    }
-
-    if( !subsystem.isEmpty() ) {
-        mArgs.append("-s");
-        mArgs.append(subsystem.latin1());
-    }
-
-    if( !cmd.isEmpty() ) {
-        mArgs.append(cmd.latin1());
-    }
-
-    return true;
-}
-
-void KSshProcess::printArgs() {
-    TQValueListIterator<TQCString> it;
-    for( it = mArgs.begin(); it != mArgs.end(); ++it) {
-        kdDebug(KSSHPROC) << "arg: " << *it << endl;
-    }
-}
-
-
-int KSshProcess::error(TQString& msg) {
-    kdDebug(KSSHPROC) << "KSshProcess::error()" << endl;
-    kdDebug() << mErrorMsg << endl;
-    msg = mErrorMsg;
-    return mError;
-}
-
-void KSshProcess::kill(int signal) {
-    int pid = ssh.pid();
-    
-    kdDebug(KSSHPROC) << "KSshProcess::kill(signal:" << signal 
-                      << "): ssh pid is " << pid << endl;
-    kdDebug(KSSHPROC) << "KSshPRocess::kill(): we are " 
-                      << (mConnected ? "" : "not ") << "connected" << endl;
-    kdDebug(KSSHPROC) << "KSshProcess::kill(): we are " 
-                      << (mRunning ? "" : "not ") << "running a ssh process" << endl;
-
-    if( mRunning && pid > 1 ) {
-            // Kill the child process...
-            if ( ::kill(pid, signal) == 0 ) {
-                // clean up if we tried to kill the process
-                if( signal == SIGTERM || signal == SIGKILL ) {
-                    while(waitpid(-1, NULL, WNOHANG) > 0);
-                    mConnected = false;
-                    mRunning = false;
-                }
-            }
-            else
-                kdDebug(KSSHPROC) << "KSshProcess::kill(): kill failed" << endl;
-    }
-    else
-        kdDebug(KSSHPROC) << "KSshProcess::kill(): "
-            "Refusing to kill ssh process" << endl;
-}
-
-
-
-/**
- * Try to open an ssh connection.
- * SSH prints certain messages to certain file descriptiors:
- *    passwordPrompt - pty
- *    passphrasePrompt - pty
- *    authSuccessMsg - stderr (OpenSSH), 
- *    authFailedMsg - stderr
- *    hostKeyMissing - stderr
- *    hostKeyChanged - stderr
- *    continuePrompt - stderr
- * 
- * We will use a select to wait for a line on each descriptor. Then get
- * each line that available and take action based on it.  The type
- * of messages we are looking for and the action we take on each
- * message are:
- *   passwordPrompt - Return false, set error to ERR_NEED_PASSWD.
- *                    On the next call to connect() we expect a password
- *                    to be available.
- *                    
- *   passpharsePrompt - Return false, set error to ERR_NEED_PASSPHRASE.
- *                      On the next call to connect() we expect a
- *                      passphrase to be available.
- *   
- *   authSuccessMsg - Return true, as we have successfully established a
- *                    ssh connection.
- *   
- *   authFailedMsg - Return false, set error to ERR_AUTH_FAILED. We
- *                   were unable to authenticate the connection given
- *                   the available authentication information.
- *   
- *   hostKeyMissing - Return false, set error to ERR_NEW_HOST_KEY. Caller
- *                    must call KSshProcess.acceptHostKey(bool) to accept
- *                    or reject the key before calling connect() again.
- *   
- *   hostKeyChanged - Return false, set error to ERR_DIFF_HOST_KEY. Caller
- *                    must call KSshProcess.acceptHostKey(bool) to accept
- *                    or reject the key before calling connect() again.
- *   
- *   continuePrompt - Send 'yes' or 'no' to accept or reject a key,
- *                    respectively.
- *
- */
-
-
-void KSshProcess::acceptHostKey(bool accept) {
-    kdDebug(KSSHPROC) << "KSshProcess::acceptHostKey(accept:"
-        << accept << ")" << endl;
-    mAcceptHostKey = accept;
-}
-
-void KSshProcess::setPassword(TQString password) {
-    kdDebug(KSSHPROC) << "KSshProcess::setPassword(password:xxxxxxxx)" << endl;
-    mPassword = password;
-}
-
-TQString KSshProcess::getLine() {
-    static TQStringList buffer;
-    TQString line = TQString::null;
-    TQCString ptyLine, errLine;
-
-    if( buffer.empty() ) {
-        // PtyProcess buffers lines.  First check that there
-        // isn't something on the PtyProces buffer or that there
-        // is not data ready to be read from the pty or stderr.
-        ptyLine = ssh.readLineFromPty(false);
-        errLine = ssh.readLineFromStderr(false);
-
-        // If PtyProcess did have something for us, get it and
-        // place it in our line buffer.
-        if( ! ptyLine.isEmpty() ) {
-            buffer.prepend(TQString(ptyLine));
-        }
-
-        if( ! errLine.isEmpty() ) {
-            buffer.prepend(TQString(errLine));
-        }
-
-        // If we still don't have anything in our buffer so there must
-        // not be anything on the pty or stderr. Setup a select()
-        // to wait for some data from SSH.
-        // Hack around select() failure on newer systems
-        unsigned long milliseconds = 0;
-        while ((buffer.size() == 0) && (milliseconds < (60*1000))) {
-            //kdDebug(KSSHPROC) << "KSshProcess::getLine(): " <<
-            //    "Line buffer empty, calling select() to wait for data." << endl;
-            int errfd = ssh.stderrFd();
-            int ptyfd = ssh.fd();
-            fd_set rfds;
-            fd_set efds;
-            struct timeval tv;
-            
-            // find max file descriptor
-            int maxfd = ptyfd > errfd ? ptyfd : errfd;          
-            
-            FD_ZERO(&rfds);
-            FD_SET(ptyfd, &rfds);      // Add pty file descriptor
-            FD_SET(errfd, &rfds);      // Add std error file descriptor
-    
-            FD_ZERO(&efds);
-            FD_SET(ptyfd, &efds);
-            FD_SET(errfd, &efds);
-   
-            tv.tv_sec = 60; tv.tv_usec = 0; // 60 second timeout
-    
-            // Wait for a message from ssh on stderr or the pty.
-            int ret = -1;
-            do 
-              ret = ::select(maxfd+1, &rfds, NULL, &efds, &tv);
-            while( ret == -1 && errno == EINTR );
-    
-            // Handle any errors from select
-            if( ret == 0 ) {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): " <<
-                    "timed out waiting for a response" << endl;
-                mError = ERR_TIMED_OUT;
-                return TQString::null;
-            }
-            else if( ret == -1 ) {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-                    << "select error: " << strerror(errno) << endl;
-                mError = ERR_INTERNAL;
-                return TQString::null;
-            }
-    
-            // We are not respecting any type of order in which the
-            // lines were received. Who knows whether pty or stderr
-            // had data on it first.
-            if( FD_ISSET(ptyfd, &rfds) ) {
-                ptyLine = ssh.readLineFromPty(false);
-                if (ptyLine.size() > 0) {
-                    buffer.prepend(TQString(ptyLine));
-                }
-                //kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
-                //    "line from pty -" << ptyLine  << endl;
-            }
-
-            if( FD_ISSET(errfd, &rfds) ) {
-                errLine = ssh.readLineFromStderr(false);
-                if (errLine.size() > 0) {
-                    buffer.prepend(TQString(errLine));
-                }
-                //kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
-                //    "line from err -" << errLine << endl;
-            }
-
-            if( FD_ISSET(ptyfd, &efds) ) {
-                kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
-                    "Exception on pty file descriptor." << endl;
-            }
-
-            if( FD_ISSET(errfd, &efds) ) {
-                kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
-                    "Exception on std err file descriptor." << endl;
-            }
-
-            if (buffer.size() == 0) {
-                milliseconds++;
-                usleep(1000);
-            }
-        }
-    }
-   
-    // We should have something in our buffer now.
-    // Return the last line.
-    //it = buffer.end();
-    //line = *it;
-    //buffer.remove(it);
-
-    line = buffer.last();
-    buffer.pop_back();
-
-    if( line.isNull() && buffer.count() > 0 ) {
-        line = buffer.last();
-        buffer.pop_back();
-    }
-    
-//    kdDebug(KSSHPROC) << "KSshProcess::getLine(): " << 
-//        buffer.count() << " lines in buffer" << endl;
-    kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
-        "ssh: " << line << endl;
-    
-
-    return line;
-}
-
-// All the different states we could go through while trying to connect.
-enum sshConnectState {
-    STATE_START, STATE_TRY_PASSWD, STATE_WAIT_PROMPT, STATE_NEW_KEY_CONTINUE,
-    STATE_DIFF_KEY_CONTINUE, STATE_FATAL, STATE_WAIT_CONTINUE_PROMPT,
-    STATE_SEND_CONTINUE, STATE_AUTH_FAILED, STATE_NEW_KEY_WAIT_CONTINUE,
-    STATE_DIFF_KEY_WAIT_CONTINUE, STATE_TRY_PASSPHRASE
-};
-
-// Print the state as a string. Good for debugging
-const char* stateStr(int state) {
-    switch(state) {
-        case STATE_START:
-            return "STATE_START";
-        case STATE_TRY_PASSWD:
-            return "STATE_TRY_PASSWD";
-        case STATE_WAIT_PROMPT:
-            return "STATE_WAIT_PROMPT";
-        case STATE_NEW_KEY_CONTINUE:
-            return "STATE_NEW_KEY_CONTINUE";
-        case STATE_DIFF_KEY_CONTINUE:
-            return "STATE_DIFF_KEY_CONTINUE";
-        case STATE_FATAL:
-            return "STATE_FATAL";
-        case STATE_WAIT_CONTINUE_PROMPT:
-            return "STATE_WAIT_CONTINUE_PROMPT";
-        case STATE_SEND_CONTINUE:
-            return "STATE_SEND_CONTINE";
-        case STATE_AUTH_FAILED:
-            return "STATE_AUTH_FAILED";
-        case STATE_NEW_KEY_WAIT_CONTINUE:
-            return "STATE_NEW_KEY_WAIT_CONTINUE";
-        case STATE_DIFF_KEY_WAIT_CONTINUE:
-            return "STATE_DIFF_KEY_WAIT_CONTINUE";
-        case STATE_TRY_PASSPHRASE:
-            return "STATE_TRY_PASSPHRASE";
-    }
-    return "UNKNOWN";
-}
-
-bool KSshProcess::connect() {
-    if( mVersion == UNKNOWN_VER ) {
-        // we don't know the ssh version yet, so find out
-        version();
-        if( mVersion == -1 ) {
-            return false;
-        }
-    }
-
-    // We'll put a limit on the number of state transitions
-    // to ensure we don't go out of control.
-    int transitionLimit = 500;
-
-    while(--transitionLimit) {
-        kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-            << "Connect state " << stateStr(mConnectState) << endl;
-        
-        TQString line;      // a line from ssh
-        TQString msgBuf;    // buffer for important messages from ssh
-                           // which are to be returned to the user
-        
-        switch(mConnectState) {
-        // STATE_START:
-        // Executes the ssh binary with the options provided.  If no options
-        // have been specified, sets error and returns false. Continue to
-        // state 1 if execution is successful, otherwise set error and 
-        // return false.
-        case STATE_START:
-            // reset some key values to safe values
-            mAcceptHostKey = false;
-            mKeyFingerprint = TQString::null;
-            mKnownHostsFile = TQString::null;
-            
-            if( mArgs.isEmpty() ) {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): ssh options "
-                    "need to be set first using setArgs()" << endl;
-                mError = ERR_NO_OPTIONS;
-                mErrorMsg = i18n("No options provided for ssh execution.");
-                return false;
-            }
-
-            if( ssh.exec(mSshPath.latin1(), mArgs) ) {
-                kdDebug(KSSHPROC) << 
-                    "KSshProcess::connect(): ssh exec failed" << endl;
-                mError = ERR_CANNOT_LAUNCH;
-                mErrorMsg = i18n("Failed to execute ssh process.");
-                return false;
-            }
-           
-            kdDebug(KSSHPROC) << "KSshPRocess::connect(): ssh pid = " << ssh.pid() << endl;
-	    
-            // set flag to indicate what have started a ssh process
-            mRunning = true;
-            mConnectState = STATE_WAIT_PROMPT;
-            break;
-        
-        // STATE_WAIT_PROMPT:
-        // Get a line of input from the ssh process. Check the contents 
-        // of the line to determine the next state. Ignore the line
-        // if we don't recognize its contents.  If the line contains
-        // the continue prompt, we have an error since we should never
-        // get that line in this state.  Set ERR_INVALID_STATE error
-        // and return false.
-        case STATE_WAIT_PROMPT:
-            line = getLine();
-            if( line.isNull() ) {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-                    "Got null line in STATE_WAIT_PROMPT." << endl;
-                mError = ERR_INTERACT;
-                mErrorMsg =
-                    i18n("Error encountered while talking to ssh.");
-                mConnectState = STATE_FATAL;
-            }
-            else if( line.find(TQString::fromLatin1(passwordPrompt[mVersion]), 0, false) != -1 ) {
-                mConnectState = STATE_TRY_PASSWD;
-            }
-            else if( line.find(passphrasePrompt[mVersion]) != -1 ) {
-                mConnectState = STATE_TRY_PASSPHRASE;
-            }
-            else if( line.find(authSuccessMsg[mVersion]) != -1 ) {
-                return true;
-            }
-            else if( line.find(authFailedMsg[mVersion]) != -1
-                    && line.find(tryAgainMsg[mVersion]) == -1 ) {
-                mConnectState = STATE_AUTH_FAILED;
-            }
-            else if( line.find(hostKeyMissingMsg[mVersion]) != -1 ) {
-                mConnectState = STATE_NEW_KEY_WAIT_CONTINUE;
-            }
-            else if( line.find(hostKeyChangedMsg[mVersion]) != -1 ) {
-                mConnectState = STATE_DIFF_KEY_WAIT_CONTINUE;
-            }
-            else if( line.find(continuePrompt[mVersion]) != -1 ) {
-                //mConnectState = STATE_SEND_CONTINUE;
-                kdDebug(KSSHPROC) << "KSshProcess:connect(): "
-                    "Got continue prompt where we shouldn't (STATE_WAIT_PROMPT)"
-                    << endl;
-                mError = ERR_INTERACT;
-                mErrorMsg =
-                    i18n("Error encountered while talking to ssh.");
-            }
-            else if( line.find(connectionClosedMsg[mVersion]) != -1 ) {
-                mConnectState = STATE_FATAL;
-                mError = ERR_CLOSED_BY_REMOTE_HOST;
-                mErrorMsg = i18n("Connection closed by remote host.");
-            }
-            else if( line.find(changeHostKeyOnDiskPrompt[mVersion]) != -1 ) {
-                // always say yes to this.  It always comes after commerical ssh
-                // prints a "continue to connect prompt". We assume that if the
-                // user choose to continue, then they also want to save the
-                // host key to disk.
-                ssh.writeLine("yes");
-            }
-            else {
-                // ignore line
-            }
-            break; 
-
-        // STATE_TRY_PASSWD:
-        // If we have password send it to the ssh process, else
-        // set error ERR_NEED_PASSWD and return false to the caller.
-        // The caller then must then call KSshProcess::setPassword(TQString)
-        // before calling KSshProcess::connect() again.
-        //
-        // Almost exactly liek STATE_TRY_PASSPHRASE.  Check there if you
-        // make changes here.
-        case STATE_TRY_PASSWD:
-            // We have a password prompt waiting for us to supply
-            // a password.  Send that password to ssh.  If the caller
-            // did not supply a password like we asked, then ask
-            // again.
-            if( !mPassword.isEmpty() ) {
-//                ssh.WaitSlave();
-                ssh.writeLine(mPassword.latin1());
-                
-                // Overwrite the password so it isn't in memory.
-                mPassword.fill(TQChar('X'));
-                
-                // Set the password to null so we will request another
-                // password if this one fails.
-                mPassword = TQString::null;
-                
-                mConnectState = STATE_WAIT_PROMPT;
-            }
-            else {
-                kdDebug(KSSHPROC) << "KSshProcess::connect() "
-                    "Need password from caller." << endl;
-                // The caller needs to supply a password before
-                // connecting can continue.
-                mError = ERR_NEED_PASSWD;
-                mErrorMsg = i18n("Please supply a password.");
-                mConnectState = STATE_TRY_PASSWD;
-                return false;
-            }
-            break;
-
-        // STATE_TRY_KEY_PASSPHRASE:
-        // If we have passphrase send it to the ssh process, else
-        // set error ERR_NEED_PASSPHRASE and return false to the caller.
-        // The caller then must then call KSshProcess::setPassword(TQString)
-        // before calling KSshProcess::connect() again.
-        //
-        // Almost exactly like STATE_TRY_PASSWD. The only difference is 
-        // the error we set if we don't have a passphrase.  We duplicate
-        // this code to keep in the spirit of the state machine.
-        case STATE_TRY_PASSPHRASE:
-            // We have a passphrase prompt waiting for us to supply
-            // a passphrase.  Send that passphrase to ssh.  If the caller
-            // did not supply a passphrase like we asked, then ask
-            // again.
-            if( !mPassword.isEmpty() ) {
-//                ssh.WaitSlave();
-                ssh.writeLine(mPassword.latin1());
-                
-                // Overwrite the password so it isn't in memory.
-                mPassword.fill(TQChar('X'));
-                
-                // Set the password to null so we will request another
-                // password if this one fails.
-                mPassword = TQString::null;
-                
-                mConnectState = STATE_WAIT_PROMPT;
-            }
-            else {
-                kdDebug(KSSHPROC) << "KSshProcess::connect() "
-                    "Need passphrase from caller." << endl;
-                // The caller needs to supply a passphrase before
-                // connecting can continue.
-                mError = ERR_NEED_PASSPHRASE;
-                mErrorMsg = i18n("Please supply the passphrase for " 
-                    "your SSH private key.");
-                mConnectState = STATE_TRY_PASSPHRASE;
-                return false;
-            }
-            break;
-
-        // STATE_AUTH_FAILED:
-        // Authentication has failed.  Tell the caller by setting the
-        // ERR_AUTH_FAILED error and returning false. If
-        // auth has failed then ssh should have exited, but
-        // we will kill it to make sure. 
-        case STATE_AUTH_FAILED:
-            mError = ERR_AUTH_FAILED;
-            mErrorMsg = i18n("Authentication to %1 failed").arg(mHost);
-            mConnectState = STATE_FATAL;
-            break; 
-        
-        // STATE_NEW_KEY_WAIT_CONTINUE:
-        // Grab lines from ssh until we get a continue prompt or a auth
-        // denied.  We will get the later if StrictHostKeyChecking is set
-        // to yes.  Go to STATE_NEW_KEY_CONTINUE if we get a continue prompt.
-        case STATE_NEW_KEY_WAIT_CONTINUE:
-            line = getLine();
-            if( line.isNull() ) {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-                    "Got null line in STATE_NEW_KEY_WAIT_CONTINUE." << endl;
-                mError = ERR_INTERACT;
-                mErrorMsg =
-                    i18n("Error encountered while talking to ssh.");
-                mConnectState = STATE_FATAL;
-            }
-            else if( (line.find(authFailedMsg[mVersion]) != -1
-                           && line.find(tryAgainMsg[mVersion]) == -1)
-                    || line.find(hostKeyVerifyFailedMsg[mVersion]) != -1 ) {
-                mError = ERR_AUTH_FAILED_NEW_KEY;
-                mErrorMsg = i18n(
-                    "The identity of the remote host '%1' could not be verified "
-                    "because the host's key is not in the \"known hosts\" file."
-                ).arg(mHost);
-                
-                if( mKnownHostsFile.isEmpty() ) {
-                    mErrorMsg += i18n(
-                        " Manually, add the host's key to the \"known hosts\" "
-                        "file or contact your administrator."
-                    );
-                }
-                else {
-                    mErrorMsg += i18n(
-                        " Manually, add the host's key to %1 "
-                        "or contact your administrator."
-                    ).arg(mKnownHostsFile);
-                }
-
-                mConnectState = STATE_FATAL;
-            }
-            else if( line.find(continuePrompt[mVersion]) != -1 ) {
-                mConnectState = STATE_NEW_KEY_CONTINUE;
-            }
-            else if( line.find(connectionClosedMsg[mVersion]) != -1 ) {
-                mConnectState = STATE_FATAL;
-                mError = ERR_CLOSED_BY_REMOTE_HOST;
-                mErrorMsg = i18n("Connection closed by remote host.");
-            }
-            else if( line.find(keyFingerprintMsg[mVersion]) != -1 ) {
-                mKeyFingerprint = keyFingerprintMsg[mVersion].cap();
-                kdDebug(KSSHPROC) << "Found key fingerprint: " << mKeyFingerprint << endl;
-                mConnectState = STATE_NEW_KEY_WAIT_CONTINUE;
-            }
-            else {
-                // ignore line
-            }
-            break; 
-            
-        
-        // STATE_NEW_KEY_CONTINUE:
-        // We got a continue prompt for the new key message.  Set the error 
-        // message to reflect this, return false and hope for caller response.
-        case STATE_NEW_KEY_CONTINUE:
-            mError = ERR_NEW_HOST_KEY;
-            mErrorMsg = i18n(
-                "The identity of the remote host '%1' could not be "
-                "verified. The host's key fingerprint is:\n%2\nYou should "
-                "verify the fingerprint with the host's administrator before "
-                "connecting.\n\n"
-                "Would you like to accept the host's key and connect anyway? "
-            ).arg(mHost).arg(mKeyFingerprint);
-            mConnectState = STATE_SEND_CONTINUE;
-            return false;
-
-        // STATE_DIFF_KEY_WAIT_CONTINUE:
-        // Grab lines from ssh until we get a continue prompt or a auth
-        // denied.  We will get the later if StrictHostKeyChecking is set
-        // to yes.  Go to STATE_DIFF_KEY_CONTINUE if we get a continue prompt.
-        case STATE_DIFF_KEY_WAIT_CONTINUE:
-            line = getLine();
-            if( line.isNull() ) {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-                    "Got null line in STATE_DIFF_KEY_WAIT_CONTINUE." << endl;
-                mError = ERR_INTERACT;
-                mErrorMsg =
-                    i18n("Error encountered while talking to ssh.");
-                mConnectState = STATE_FATAL;
-            }
-            else if( (line.find(authFailedMsg[mVersion]) != -1
-                           && line.find(tryAgainMsg[mVersion]) == -1)
-                    || line.find(hostKeyVerifyFailedMsg[mVersion]) != -1 ) {
-                mError = ERR_AUTH_FAILED_DIFF_KEY;
-                mErrorMsg = i18n(
-                    "WARNING: The identity of the remote host '%1' has changed!\n\n"
-                    "Someone could be eavesdropping on your connection, or the "
-                    "administrator may have just changed the host's key. "
-                    "Either way, you should verify the host's key fingerprint with the host's "
-                    "administrator. The key fingerprint is:\n%2\n"
-                    "Add the correct host key to \"%3\" to "
-                    "get rid of this message."
-                ).arg(mHost).arg(mKeyFingerprint).arg(mKnownHostsFile);
-                mConnectState = STATE_FATAL;
-            }
-            else if( line.find(continuePrompt[mVersion]) != -1 ) {
-                mConnectState = STATE_DIFF_KEY_CONTINUE;
-            }
-            else if( line.find(keyFingerprintMsg[mVersion]) != -1 ) {
-                mKeyFingerprint = keyFingerprintMsg[mVersion].cap();
-                kdDebug(KSSHPROC) << "Found key fingerprint: " << mKeyFingerprint << endl;
-                mConnectState = STATE_DIFF_KEY_WAIT_CONTINUE;
-            }
-            else if( line.find(knownHostsFileMsg[mVersion]) != -1 ) {
-                mKnownHostsFile = (knownHostsFileMsg[mVersion]).cap(1);
-                kdDebug(KSSHPROC) << "Found known hosts file name: " << mKnownHostsFile << endl;
-                mConnectState = STATE_DIFF_KEY_WAIT_CONTINUE;
-            }
-            else {
-                // ignore line
-            }
-            break; 
-            
-        // STATE_DIFF_KEY_CONTINUE:
-        // We got a continue prompt for the different key message. 
-        // Set ERR_DIFF_HOST_KEY error
-        // and return false to signal need to caller action.
-        case STATE_DIFF_KEY_CONTINUE:
-            mError = ERR_DIFF_HOST_KEY;
-            mErrorMsg = i18n(
-                "WARNING: The identity of the remote host '%1' has changed!\n\n"
-                "Someone could be eavesdropping on your connection, or the "
-                "administrator may have just changed the host's key. "
-                "Either way, you should verify the host's key fingerprint with the host's "
-                "administrator before connecting. The key fingerprint is:\n%2\n\n"
-                "Would you like to accept the host's new key and connect anyway?"
-            ).arg(mHost).arg(mKeyFingerprint);
-            mConnectState = STATE_SEND_CONTINUE;
-            return false;
-
-        // STATE_SEND_CONTINUE:
-        // We found a continue prompt.  Send our answer.
-        case STATE_SEND_CONTINUE:
-            if( mAcceptHostKey ) {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-                    "host key accepted" << endl;
-                ssh.writeLine("yes");
-                mConnectState = STATE_WAIT_PROMPT;
-            }
-            else {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-                    "host key rejected" << endl;
-                ssh.writeLine("no");
-                mError = ERR_HOST_KEY_REJECTED;
-                mErrorMsg = i18n("Host key was rejected.");
-                mConnectState = STATE_FATAL;
-            }
-            break;
-
-        // STATE_FATAL:
-        // Something bad happened that we cannot recover from.
-        // Kill the ssh process and set flags to show we have
-        // ended the connection and killed ssh.
-        // 
-        // mError and mErrorMsg should be set by the immediately
-        // previous state.
-        case STATE_FATAL:
-            kill();
-            mConnected = false;
-            mRunning = false;
-            mConnectState = STATE_START;
-            // mError, mErroMsg set by last state
-            return false;
-        
-        default:
-            kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-                "Invalid state number - " << mConnectState << endl;
-            mError = ERR_INVALID_STATE;
-            mConnectState = STATE_FATAL;
-        }
-    }
-
-    // we should never get here
-    kdDebug(KSSHPROC) << "KSshProcess::connect(): " <<
-        "After switch(). We shouldn't be here." << endl;
-    mError = ERR_INTERNAL;
-    return false;
-}
-            
-void KSshProcess::disconnect() {
-    kill();
-    mConnected = false;
-    mRunning = false;
-    mConnectState = STATE_START;
-}
-
diff --git a/tdeioslave/sftp/ksshprocess.h b/tdeioslave/sftp/ksshprocess.h
deleted file mode 100644
index 5130628e4..000000000
--- a/tdeioslave/sftp/ksshprocess.h
+++ /dev/null
@@ -1,623 +0,0 @@
-/***************************************************************************
-                          ksshprocess.h  -  description
-                             -------------------
-    begin                : Tue Jul 31 2001
-    copyright            : (C) 2001 by Lucas Fisher
-    email                : ljfisher@purdue.edu
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef KSSHPROCESS_H
-#define KSSHPROCESS_H
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <unistd.h>
-
-#include <tqvaluelist.h>
-
-#include <kdebug.h>
-
-#include "process.h"
-
-#define KSSHPROC 7120
-
-/**
- * Provides version independent access to ssh. Currently supported
- * versions of SSH are:
- *   OpenSSH 2.9p1
- *   OpenSSH 2.9p2
- *   OpenSSH 3.0
- *   OpenSSH 3.1
- *   Commercial SSH 3.0.0
- * Other versions of OpenSSH and commerical SSH will probably work also.
- *
- * To setup a SSH connection first create a list of options to use and tell
- * KSshProcess about your options. Then start the ssh connection. Once the
- * connection is setup use the  stdin, stdout, stderr, and pty file descriptors
- * to communicate with ssh. For a detailed example of how to use, see
- * ksshprocesstest.cpp.
- *
- * @author Lucas Fisher
- *
- * Example: Connect to ssh server on localhost
- *   KSshProcess::SshOpt opt;
- *   KSshProcess::SshOptList options;
- *
- *   opt.opt = KSshProcess::SSH_HOST;
- *   opt.str = "localhost";
- *   options.append(opt);
- *
- *   opt.opt = KSshProcess::SSH_USERNAME;
- *   opt.str = "me";
- *   options.append(opt);
- *
- *   KSshProcess ssh;
- *   if( !ssh.setOptions(options) ) {
- *       int err = ssh.error();
- *       // process error
- *        return false;
- *   }
- *
- *   int err;
- *   TQString errMsg;
- *   while( !ssh.connect() ) {
- *       err = ssh.error(errMsg);
- *       
- *       switch( err ) {
- *       case KSshProcess::ERR_NEW_HOST_KEY:
- *       case KSshProcess::ERR_DIFF_HOST_KEY:
- *           // ask user to accept key
- *           if( acceptHostKey ) {
- *               ssh.acceptKey(true);
- *           }
- *           break;
- *
- *       case KSshProcess::ERR_NEED_PASSWORD:
- *           // ask user for password
- *           ssh.password(userPassword);
- *           break;
- *       
- *       case KSshProcess::ERR_NEED_KEY_PASSPHRASE:
- *           // ask user for their key passphrase
- *           ssh.keyPassphrase(keyPassphrase);
- *           break;
- *
- *       default:
- *           // somethings wrong, alert user
- *           return;
- *       }
- *   }
- *   // We have an open ssh connection to localhost
- *
- */
-
-class KSshProcess {
-public:
-    /**
-     * SSH Option
-     *
-     * Stores SSH options for use with KSshProcess.
-     *
-     * SSH options are configured much like UDS entries.
-     * Each option is assigned a constant and a string, bool,
-     * or number is assigned based on the option.
-     *
-     * @author Lucas Fisher (ljfisher@iastate.edu)
-     */
-    class SshOpt {
-    public:
-        TQ_UINT32 opt;
-        TQString  str;
-        TQ_INT32  num;
-        bool     boolean;
-    };
-
-    /**
-     * List of SshOptions and associated iterators
-     */
-    typedef TQValueList<SshOpt> SshOptList;
-    typedef TQValueListIterator<SshOpt> SshOptListIterator;
-    typedef TQValueListConstIterator<SshOpt> SshOptListConstIterator;
-
-    /**
-     * Ssh versions supported by KSshProcess. Subject to change
-     * at any time.
-     */
-    enum SshVersion {
-	OPENSSH_3_6,
-        OPENSSH,
-        SSH,
-        SSH_VER_MAX,
-        UNKNOWN_VER
-    };	
-
-    /**
-     * SSH options supported by KSshProcess.  Set SshOpt::opt to one of these
-     * values.
-     */
-    // we cannot do this like UDSAtomType (ORing the type with the name) because
-    // we have too many options for ssh and not enough bits.
-    enum SshOptType {
-        /**
-         * Request server to invoke subsystem. (str)
-         */
-        SSH_SUBSYSTEM,
-        /**
-         * Connect to port on the server. (num)
-         */
-        SSH_PORT,
-        /**
-         * Connect to host. (str)
-         */
-        SSH_HOST,
-        /**
-         * connect using this username. (str)
-         */
-        SSH_USERNAME,
-        /** 
-         * connect using this password. (str)
-         */
-        SSH_PASSWD,
-        /**
-         * connect using this version of the SSH protocol. num == 1 or 2
-         */
-        SSH_PROTOCOL,
-        /**
-         * whether to forward X11 connections. (boolean)
-         */
-        SSH_FORWARDX11,
-        /**
-         * whether to do agent forwarding. (boolean)
-         */
-        SSH_FORWARDAGENT,
-        /**
-         * use as escape character. 0 for none  (num)
-         */
-        SSH_ESCAPE_CHAR,
-        /**
-         * command for ssh to perform once it is connected (str)
-         */
-        SSH_COMMAND,
-        /**
-         * Set ssh verbosity. This may be added multiple times. It may also cause KSSHProcess
-         * to fail since we don't understand all the debug messages.
-         */
-        SSH_VERBOSE,
-        /**
-         * Set a ssh option as one would find in the ssh_config file
-         * The str member should be set to 'optName value'
-         */
-        SSH_OPTION,
-        /**
-         * Set some other option not supported by KSSHProcess. The option should
-         * be specified in the str member of SshOpt. Careful with this since
-         * not all versions of SSH support the same options.
-         */
-        SSH_OTHER,
-        SSH_OPT_MAX // always last
-    }; // that's all for now
-
-    /**
-     * Errors that KSshProcess can encounter.  When a member function returns
-     * false, call error() to retrieve one of these error codes.
-     */
-    enum SshError {
-        /**
-         * Don't recognize the ssh version
-         */
-        ERR_UNKNOWN_VERSION,
-        /**
-         * Cannot lauch ssh client
-         */
-        ERR_CANNOT_LAUNCH,
-        /**
-         * Interaction with the ssh client failed. This happens when we can't
-         * find the password prompt or something similar
-         */
-        ERR_INTERACT,
-        /**
-         * Arguments for both a remotely executed subsystem and command were provide.
-         * Only one or the other may be used
-         */
-        ERR_CMD_SUBSYS_CONFLICT,
-        /**
-         * No password was supplied
-         */
-        ERR_NEED_PASSWD,
-        /**
-         * No passphrase was supplied.
-         */
-        ERR_NEED_PASSPHRASE,
-        /**
-         * No usename was supplied
-         */
-        ERR_NEED_USERNAME,
-        /**
-         * Timed out waiting for a response from ssh or the server
-         */
-        ERR_TIMED_OUT,
-        /**
-         * Internal error, probably from a system call
-         */
-        ERR_INTERNAL,
-        /**
-         * ssh was disconnect from the host
-         */
-        ERR_DISCONNECTED,
-        /**
-         * No ssh options have been set. Call setArgs() before calling connect.
-         */
-        ERR_NO_OPTIONS,
-        /**
-         * A host key was received from an unknown host. 
-         * Call connect() with the acceptHostKey argument to accept the key.
-         */
-        ERR_NEW_HOST_KEY,
-        /**
-         * A host key different from what is stored in the user's known_hosts file
-         * has be received. This is an indication of an attack
-         */
-        ERR_DIFF_HOST_KEY,
-        /**
-         * A new or different host key was rejected by the caller. The ssh
-         * connection was terminated and the ssh process killed.
-         */
-        ERR_HOST_KEY_REJECTED,
-        /**
-         * An invalid option was found in the SSH option list
-         */
-        ERR_INVALID_OPT,
-        /**
-         * SSH accepted host key without prompting user.
-         */
-        ERR_ACCEPTED_KEY,
-        /**
-         * Authentication failed
-         */
-        ERR_AUTH_FAILED,
-        /**
-         * Authentication failed because a new host key was detected and 
-         * SSH is configured with strict host key checking enabled.
-         */
-        ERR_AUTH_FAILED_NEW_KEY,
-        /**
-         * Authentication failed because a changed host key was detected and 
-         * SSH is configured with strict host key checking enabled.
-         */
-        ERR_AUTH_FAILED_DIFF_KEY,
-        /**
-         * The remote host closed the connection for unknown reasons.
-         */
-        ERR_CLOSED_BY_REMOTE_HOST,
-        /**
-         * We have no idea what happened
-         */
-        ERR_UNKNOWN,
-        /**
-         * The connect state machine entered an invalid state.
-         */
-        ERR_INVALID_STATE,
-        ERR_MAX
-    };
-
-    /**
-     * Initialize a SSH process using the first SSH binary found in the PATH
-     */
-    KSshProcess();
-
-    /**
-     * Initialize a SSH process using the specified SSH binary.
-     * @param pathToSsh The fully qualified path name of the ssh binary
-     *                  KSshProcess should use to setup a SSH connection.
-     */
-    KSshProcess(TQString pathToSsh);
-    ~KSshProcess();
-
-    /**
-     * Set the ssh binary KSshProcess should use. This will only affect the
-     * next ssh connection attempt using this instance.
-     *
-     * @param pathToSsh Full path to the ssh binary.
-     *
-     * @return True if the ssh binary is found and KSshProcess
-     *         recognizes the version.
-     *
-     */
-     bool setSshPath(TQString pathToSsh);
-
-    /**
-     * Get the ssh version.
-     *
-     * @return  The ssh version or -1 if KSshProcess does not recognize
-     *          the ssh version. The returned value corresponds to the
-     *          member of the SshVersion enum.
-     */
-    SshVersion version();
-
-    /**
-     * Get a string describing the ssh version
-     *
-     * @return A string describing the ssh version recognized by KSshProcess
-     */
-    //TQString versionStr();
-
-    /**
-     * Get the last error encountered by KSshProcess.
-     *
-     * @param msg Set to the error message, if any, outputted by ssh when it is run.
-     *
-     * @return The error number. See SshError for descriptions.
-     */
-    int error(TQString& msg);
-
-    /**
-     * Get the last error encountered by KSshProcess.
-     * @return The error number. See SshError for descriptions.
-     */
-    int error() { return mError; }
-
-    TQString errorMsg() { return mErrorMsg; }
-
-    /**
-     * Send a signal to the ssh process. Do not use this to end the
-     * ssh connection as it will not correctly reset the internal
-     * state of the KSshProcess object.  Use KSshProcess::disconnect()
-     * instead.
-     *
-     * @param signal The signal to send to the ssh process. See 'kill -l'
-     *               for a list of possible signals.
-     *               The default signal is SIGKILL which kills ssh.
-     *
-     */
-    void kill(int signal = SIGKILL);
-
-    /**
-     * The pid of the ssh process started by this instance of KSshProcess.
-     * Only valid if KSshProcess::running() returns true;
-     * 
-     * @return The pid of the running ssh process.
-     */
-    int pid() { return ssh.pid(); }
-    
-    /**
-     * Whether a ssh connection has been  established with a
-     * remote host.  A establish connection means ssh has successfully
-     * authenticated with the remote host and user data can be transfered
-     * between the local and remote host.  This cannot return
-     * true unless the most recent call to KSshProccess::connect() returned true.
-     *
-     * @return True if a ssh connection has been established with a remote
-     *         host. False otherwise.
-     */
-    bool connected() { return mConnected; }
-
-    /**
-     * Whether a ssh process is currently running.  This  only indicates
-     * if a ssh process has been started and is still running.  It does not
-     * tell if authentication has been successful.  This may return true
-     * even if the most recent call to KSshProcess::connect() returned false.
-     *
-     * @return True if a ssh process started by this instance of KSshProcess
-     *         is running. False otherwise.
-     */
-    bool running() { return mRunning; }
-    
-    /**
-     * Print the command line arguments ssh is run with using kdDebug.
-     */
-    void printArgs();
-
-    /**
-     * Set the SSH options.
-     * This must be called before connect().  See SshOptType for a list of
-     * supported ssh options.  The required options are SSH_USERNAME 
-     * and SSH_HOST.
-     *
-     * To reset the saved options, just recall setOptions() again with
-     * a different options list.
-     *
-     * @param opts A list of SshOpt objects specifying the ssh options.
-     *
-     * @return True if all options are valid. False if unrecognized options
-     *         or a required option is missing. Call error()
-     *         for details.
-     *
-     */
-    bool setOptions(const SshOptList& opts);
-
-    /**
-     * Create a ssh connection based on the options provided by setOptions().
-     * Sets one of the following error codes on failure:
-     * <ul>
-     * <li>ERR_NO_OPTIONS</li>
-     * <li>ERR_CANNOT_LAUNCH</li>
-     * <li>ERR_INVALID_STATE</li>
-     * <li>ERR_NEED_PASSWD</li>
-     * <li>ERR_AUTH_FAILED</li>
-     * <li>ERR_NEW_HOST_KEY</li>
-     * <li>ERR_KEY_ACCEPTED</li>
-     * <li>ERR_DIFF_HOST_KEY</li>
-     * <li>ERR_INTERNAL</li>
-     * <li>ERR_INTERACT</li>
-     * </ul>
-     *
-     * @param acceptHostKey When true KSshProcess will automatically accept
-     *                      unrecognized or changed host keys.
-     *
-     * @return True if the ssh connection is successful. False if the connection
-     *         fails.  Call error() to get the reason for the failure.
-     */
-    bool connect();
-
-
-    /**
-     * Disconnect ssh from the host.  This kills the ssh process and
-     * resets the internal state of this KSshProcess object. After a 
-     * disconnect, the same KSshProcess can be used to connect to a
-     * host.
-     */
-    void disconnect();
-    
-    /**
-     * Call to respond to a ERR_NEW_HOST_KEY or ERR_DIFF_HOST_KEY error.
-     * 
-     * @param accept True to accept the host key, false to not accept the
-     *               host key and kill ssh.
-     * 
-     */
-    void acceptHostKey(bool accept);
-
-    /**
-     * Call to respond to a ERR_NEED_PASSWD or ERR_NEED_PASSPHRASE error.
-     *
-     * @param password The user password to give ssh.
-     */
-    void setPassword(TQString password);
-     
-    /**
-     * Access to standard in and out of the ssh process.
-     *
-     * @return The file description for stdin and stdout of the ssh process.
-     */
-    int stdioFd() { return ssh.stdioFd(); }
-
-    /**
-     * Access to standard error of the ssh process.
-     *
-     * @return The file descriptior for stderr of the ssh process.
-     */
-    int stderrFd() { return ssh.stderrFd(); }
-
-    /**
-     * Access the pty to which the ssh process is attached.
-     *
-     * @return The file descriptor of pty to which ssh is attached.
-     */
-    int pty() { return ssh.fd(); }
-private:
-    /**
-     * Path the the ssh binary.
-     */
-    TQString mSshPath;
-    
-    /**
-     * SSH version.  This is an index into the supported SSH 
-     * versions array, and the various messages arrays.
-     */
-    SshVersion mVersion;
-
-    /**
-     * User's password.  Zero this out when it is no longer needed.
-     */
-    TQString mPassword;
-    
-    /**
-     * User's username.
-     */
-    TQString mUsername;
-    
-    /**
-     * Name of host we are connecting to.
-     */
-    TQString mHost;
-
-    /**
-     * Accept new or changed host keys if true.
-     */
-    bool mAcceptHostKey;
-    
-    /**
-     * Flag to tell use if we have an open, authenticated ssh
-     * session going.
-     */
-    bool mConnected;
-    
-    /**
-     * Flag to tell us if we have started a ssh process, we use this
-     * to make sure we kill ssh before going away.
-     */
-    bool mRunning;
-
-    /**
-     * Save any key fingerprint msg from ssh so we can present
-     * it to the caller.
-     */
-    TQString mKeyFingerprint;
-
-    /**
-     * The location of the known host key file. We grab this from
-     * any error messages ssh prints out.
-     */
-    TQString mKnownHostsFile;
-
-    /**
-     * The state of our connect state machine.
-     */
-    int mConnectState;
-    
-    /**
-     * Port on on which the target ssh server is listening.
-     */
-    int mPort;
-
-    /**
-     * The last error number encountered. This is only valid for the
-     * last error.
-     */
-    SshError mError;
-
-    /**
-     * An error message that corresponds to the error number set in
-     * mError.  Optional.
-     */
-    TQString mErrorMsg;
-    
-    /**
-     * Interface to the SSH process we ceate.  Handles communication
-     * to and from the SSH process using stdin, stdout, stderr, and
-     * pty.
-     */
-    MyPtyProcess ssh;
-
-    /**
-     * List of arguments we start SSH with.
-     */
-    QCStringList mArgs;
-    void init();
-
-    /**
-      * Handler to clean up when ssh process terminates.
-      */
-    static void SIGCHLD_handler(int signo);
-    void installSignalHandlers();
-    void removeSignalHandlers();
-
-    TQString getLine();
-    
-    static TQRegExp versionStrs[];
-    static const char * const passwordPrompt[];
-    static const char * const passphrasePrompt[];
-    static const char * const authSuccessMsg[];
-    static const char * const authFailedMsg[];
-    static TQRegExp hostKeyMissingMsg[];
-    static const char * const hostKeyChangedMsg[];
-    static const char * const continuePrompt[];
-    static const char * const hostKeyAcceptedMsg[];
-    static const char * const tryAgainMsg[];
-    static TQRegExp hostKeyVerifyFailedMsg[];
-    static const char * const connectionClosedMsg[];
-    static const char * const changeHostKeyOnDiskPrompt[];
-    static TQRegExp keyFingerprintMsg[];
-    static TQRegExp knownHostsFileMsg[];
-};
-#endif
diff --git a/tdeioslave/sftp/ksshprocesstest.cpp b/tdeioslave/sftp/ksshprocesstest.cpp
deleted file mode 100644
index 59dbf58c7..000000000
--- a/tdeioslave/sftp/ksshprocesstest.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-#include "ksshprocess.h"
-#include <iostream>
-
-using namespace std;
-
-int main(int argc, char *argv[]) {
-
-    if( argc < 5 ) {
-        cout << "Usage: " << argv[0] << 
-            " <ssh path> <host> <username> <password>" << endl;
-        return 1;
-    }
-
-    KSshProcess ssh(argv[1]);
-    cout << ssh.version() << endl;
-    
-    KSshProcess::SshOptList opts;
-    KSshProcess::SshOpt opt;
-
-    opt.opt = KSshProcess::SSH_PORT;
-    opt.num = 22;
-    opts.append(opt);
-
-    opt.opt = KSshProcess::SSH_HOST;
-    opt.str = TQString(argv[2]);
-    opts.append(opt);
-
-    opt.opt = KSshProcess::SSH_USERNAME;
-    opt.str = TQString(argv[3]);
-    opts.append(opt);
-
-//    opt.opt = KSshProcess::SSH_PASSWD;
-//    opt.str = TQString(argv[4]);
-//   opts.append(opt);
-
-    if( !ssh.setOptions(opts) ) {
-        cout << "ksshprocesstest: setOptions failed" << endl;
-        return -1;
-    }
-
-    ssh.printArgs();
-
-    bool stop = false;
-    bool connected;
-    char buf[256];
-    char c;
-    while( !stop && !(connected = ssh.connect()) ) {
-        cout << "ksshprocesstest: Error num - " << ssh.error() << endl;
-        cout << "ksshprocesstest: Error msg - " << ssh.errorMsg().latin1() << endl;
-        switch( ssh.error() ) {
-            case KSshProcess::ERR_NEED_PASSWD:
-            case KSshProcess::ERR_NEED_PASSPHRASE:
-                cout << "Password: ";
-                cin >> buf;
-                cout << "password is " << buf << endl;
-                ssh.setPassword(TQString(buf));
-                break;
-            case KSshProcess::ERR_NEW_HOST_KEY:
-            case KSshProcess::ERR_DIFF_HOST_KEY:
-                cout << "Accept host key? (y/n): ";
-                cin >> c;
-                cout << "Answered " << c << endl;
-                ssh.acceptHostKey(c == 'y' ? true : false);
-                break;
-            case KSshProcess::ERR_AUTH_FAILED:
-                cout << "ksshprocesstest: auth failed." << endl;
-                stop = true;
-                break;
-            case KSshProcess::ERR_AUTH_FAILED_NEW_KEY:
-                cout << "ksshprocesstest: auth failed because of new key." << endl;
-                stop = true;
-                break;
-            case KSshProcess::ERR_AUTH_FAILED_DIFF_KEY:
-                cout << "ksshprocesstest: auth failed because of changed key." << endl;
-                stop = true;
-                break;
-            
-            case KSshProcess::ERR_INTERACT:
-            case KSshProcess::ERR_INTERNAL:
-            case KSshProcess::ERR_UNKNOWN:
-            case KSshProcess::ERR_INVALID_STATE:
-            case KSshProcess::ERR_CANNOT_LAUNCH:
-            case KSshProcess::ERR_HOST_KEY_REJECTED:
-                cout << "ksshprocesstest: FATAL ERROR" << endl;
-                stop = true;
-                break;
-                
-        }
-    }
-
-    if( connected ) {
-        cout << "ksshprocesstest: Successfully connected to " << argv[2] << endl;
-    }
-    else {
-        cout << "ksshprocesstest: Connect to " << argv[2] << " failed." << endl;
-    }
-    
-}
diff --git a/tdeioslave/sftp/process.cpp b/tdeioslave/sftp/process.cpp
deleted file mode 100644
index 164121497..000000000
--- a/tdeioslave/sftp/process.cpp
+++ /dev/null
@@ -1,493 +0,0 @@
-/*
- *
- *
- * This file is part of the KDE project, module tdesu.
- * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
- * 
- * This file contains code from TEShell.C of the KDE konsole. 
- * Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> 
- *
- * This is free software; you can use this library under the GNU Library 
- * General Public License, version 2. See the file "COPYING.LIB" for the 
- * exact licensing terms.
- *
- * process.cpp: Functionality to build a front end to password asking
- *  terminal programs.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <errno.h>
-#include <string.h>
-#include <termios.h>
-#include <signal.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/socket.h>
-
-#if defined(__SVR4) && defined(sun)
-#include <stropts.h>
-#include <sys/stream.h>
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>		// Needed on some systems.
-#endif
-
-#include <tqglobal.h>
-#include <tqcstring.h>
-#include <tqfile.h>
-
-#include <kdebug.h>
-#include <kstandarddirs.h>
-
-#include "process.h"
-#include <tdesu/tdesu_pty.h>
-#include <tdesu/kcookie.h>
-
-
-MyPtyProcess::MyPtyProcess()
-{
-    m_bTerminal = false;
-    m_bErase = false;
-    m_pPTY = 0L;
-    m_Pid = -1;
-    m_Fd = -1;
-}
-
-
-int MyPtyProcess::init()
-{
-    delete m_pPTY;
-    m_pPTY = new PTY();
-    m_Fd = m_pPTY->getpt();
-    if (m_Fd < 0)
-	return -1;
-    if ((m_pPTY->grantpt() < 0) || (m_pPTY->unlockpt() < 0)) 
-    {
-	kdError(PTYPROC) << k_lineinfo << "Master setup failed.\n" << endl;
-	m_Fd = -1;
-	return -1;
-    }
-    m_TTY = m_pPTY->ptsname();
-    m_stdoutBuf.resize(0);
-    m_stderrBuf.resize(0);
-    m_ptyBuf.resize(0);
-    return 0;
-}
-
-
-MyPtyProcess::~MyPtyProcess()
-{
-    delete m_pPTY;
-}
-    
-
-/*
- * Read one line of input. The terminal is in canonical mode, so you always
- * read a line at at time, but it's possible to receive multiple lines in
- * one time.
- */
-
-
-TQCString MyPtyProcess::readLineFrom(int fd, TQCString& inbuf, bool block)
-{
-    int pos;
-    TQCString ret;
-
-    if (!inbuf.isEmpty())
-    {
-
-        pos = inbuf.find('\n');
-        
-        if (pos == -1) 
-	{
-	    ret = inbuf;
-	    inbuf.resize(0);
-	} else
-	{
-	    ret = inbuf.left(pos);
-	    inbuf = inbuf.mid(pos+1);
-	}
-	return ret;
-
-    }
-
-    int flags = fcntl(fd, F_GETFL);
-    if (flags < 0) 
-    {
-	kdError(PTYPROC) << k_lineinfo << "fcntl(F_GETFL): " << perror << "\n";
-	return ret;
-    }
-    if (block)
-	flags &= ~O_NONBLOCK;
-    else
-	flags |= O_NONBLOCK;
-    if (fcntl(fd, F_SETFL, flags) < 0)
-    {
-	kdError(PTYPROC) << k_lineinfo << "fcntl(F_SETFL): " << perror << "\n";
-	return ret;
-    }
-
-    int nbytes;
-    char buf[256];
-    while (1) 
-    {
-	nbytes = read(fd, buf, 255);
-	if (nbytes == -1) 
-	{
-	    if (errno == EINTR)
-		continue;
-	    else break;
-	}
-	if (nbytes == 0)
-	    break;	// eof
-
-	buf[nbytes] = '\000';
-	inbuf += buf;
-
-	pos = inbuf.find('\n');
-        if (pos == -1) 
-	{
-	    ret = inbuf;
-	    inbuf.resize(0);
-	} else 
-	{
-	    ret = inbuf.left(pos);
-	    inbuf = inbuf.mid(pos+1);
-	}
-	break;
-
-    }
-
-    return ret;
-}
-
-void MyPtyProcess::writeLine(TQCString line, bool addnl)
-{
-    if (!line.isEmpty())
-	write(m_Fd, line, line.length());
-    if (addnl)
-	write(m_Fd, "\n", 1);
-}
-
-void MyPtyProcess::unreadLineFrom(TQCString inbuf, TQCString line, bool addnl)
-{
-    if (addnl)
-	line += '\n';
-    if (!line.isEmpty())
-	inbuf.prepend(line);
-}
-
-
-/*
- * Fork and execute the command. This returns in the parent.
- */
-
-int MyPtyProcess::exec(TQCString command, QCStringList args)
-{
-  kdDebug(PTYPROC) << "MyPtyProcess::exec(): " << command << endl;// << ", args = " << args << endl;
-
-    if (init() < 0)
-        return -1;
-
-    // Open the pty slave before forking. See SetupTTY()
-    int slave = open(m_TTY, O_RDWR);
-    if (slave < 0) 
-    {
-        kdError(PTYPROC) << k_lineinfo << "Could not open slave pty.\n";
-        return -1;
-    } 
-
-    // Also create a socket pair to connect to standard in/out.
-    // This will allow use to bypass the terminal.
-    int inout[2];
-    int err[2];
-    int ok = 1;
-    ok &= socketpair(AF_UNIX, SOCK_STREAM, 0, inout) >= 0;
-    ok &= socketpair(AF_UNIX, SOCK_STREAM, 0, err  ) >= 0;
-    if( !ok ) {
-        kdDebug(PTYPROC) << "Could not create socket" << endl;
-        return -1;
-    }
-    m_stdinout = inout[0];
-    m_err = err[0];
-
-    if ((m_Pid = fork()) == -1) 
-    {
-        kdError(PTYPROC) << k_lineinfo << "fork(): " << perror << "\n";
-        return -1;
-    } 
-
-    // Parent
-    if (m_Pid) 
-    {
-	    close(slave);
-    	close(inout[1]);
-	    close(err[1]);
-    	return 0;
-    }
-
-    // Child
-	
-    ok = 1;
-    ok &= dup2(inout[1], STDIN_FILENO)  >= 0;
-    ok &= dup2(inout[1], STDOUT_FILENO) >= 0;
-    ok &= dup2(err[1],   STDERR_FILENO) >= 0;
-
-    if( !ok )
-    {
-        kdError(PTYPROC) << "dup of socket descriptor failed" << endl;
-        _exit(1);
-    }
-
-    close(inout[1]);
-    close(inout[0]);
-    close(err[1]);
-    close(err[0]);
-
-    if (SetupTTY(slave) < 0)
-	    _exit(1);
-
-    // From now on, terminal output goes through the tty.
-    TQCString path;
-    if (command.contains('/'))
-	    path = command;
-    else 
-    {
-	    TQString file = TDEStandardDirs::findExe(command);
-    	if (file.isEmpty())
-	    {
-	        kdError(PTYPROC) << k_lineinfo << command << " not found\n";
-    	    _exit(1);
-	    }
-    	path = TQFile::encodeName(file);
-    }
-
-    int i;
-    const char * argp[32];
-    argp[0] = path;
-    QCStringList::Iterator it;
-    for (i=1, it=args.begin(); it!=args.end() && i<31; it++) {
-    	argp[i++] = *it;
-    	kdDebug(PTYPROC) << *it << endl;
-    }
-    argp[i] = 0L;
-    execv(path, (char * const *)argp);
-    kdError(PTYPROC) << k_lineinfo << "execv(\"" << path << "\"): " << perror << "\n";
-    _exit(1);
-    return -1; // Shut up compiler. Never reached.
-}
-
-/*
- * Wait until the terminal is set into no echo mode. At least one su 
- * (RH6 w/ Linux-PAM patches) sets noecho mode AFTER writing the Password: 
- * prompt, using TCSAFLUSH. This flushes the terminal I/O queues, possibly 
- * taking the password  with it. So we wait until no echo mode is set 
- * before writing the password.
- * Note that this is done on the slave fd. While Linux allows tcgetattr() on
- * the master side, Solaris doesn't.
- */
-
-int MyPtyProcess::WaitSlave()
-{
-    int slave = open(m_TTY, O_RDWR);
-    if (slave < 0) 
-    {
-	kdError(PTYPROC) << k_lineinfo << "Could not open slave tty.\n";
-	return -1;
-    }
-
-    struct termios tio;
-    struct timeval tv;
-    while (1) 
-    {
-	if (tcgetattr(slave, &tio) < 0) 
-	{
-	    kdError(PTYPROC) << k_lineinfo << "tcgetattr(): " << perror << "\n";
-	    close(slave);
-	    return -1;
-	}
-	if (tio.c_lflag & ECHO) 
-	{
-	    kdDebug(PTYPROC) << k_lineinfo << "Echo mode still on." << endl;
-	    // sleep 1/10 sec
-	    tv.tv_sec = 0; tv.tv_usec = 100000;
-	    select(slave, 0L, 0L, 0L, &tv);
-	    continue;
-	}
-	break;
-    }
-    close(slave);
-    return 0;
-}
-
-
-int MyPtyProcess::enableLocalEcho(bool enable)
-{
-    int slave = open(m_TTY, O_RDWR);
-    if (slave < 0) 
-    {
-	kdError(PTYPROC) << k_lineinfo << "Could not open slave tty.\n";
-	return -1;
-    }
-    struct termios tio;
-    if (tcgetattr(slave, &tio) < 0) 
-    {
-	kdError(PTYPROC) << k_lineinfo << "tcgetattr(): " << perror << "\n";
-	close(slave); return -1;
-    }
-    if (enable)
-	tio.c_lflag |= ECHO;
-    else
-	tio.c_lflag &= ~ECHO;
-    if (tcsetattr(slave, TCSANOW, &tio) < 0) 
-    {
-	kdError(PTYPROC) << k_lineinfo << "tcsetattr(): " << perror << "\n";
-	close(slave); return -1;
-    }
-    close(slave);
-    return 0;
-}
-
-
-/*
- * Copy output to stdout until the child process exists, or a line of output
- * matches `m_Exit'.
- * We have to use waitpid() to test for exit. Merely waiting for EOF on the
- * pty does not work, because the target process may have children still
- * attached to the terminal.
- */
-
-int MyPtyProcess::waitForChild()
-{
-    int ret, state, retval = 1;
-    struct timeval tv;
-
-    fd_set fds;
-    FD_ZERO(&fds);
-
-    while (1) 
-    {
-	tv.tv_sec = 1; tv.tv_usec = 0;
-	FD_SET(m_Fd, &fds);
-	ret = select(m_Fd+1, &fds, 0L, 0L, &tv);
-	if (ret == -1) 
-	{
-	    if (errno == EINTR) continue;
-	    else 
-	    {
-		kdError(PTYPROC) << k_lineinfo << "select(): " << perror << "\n";
-		return -1;
-	    }
-	}
-
-	if (ret) 
-	{
-	    TQCString line = readLine(false);
-	    while (!line.isNull()) 
-	    {
-		if (!m_Exit.isEmpty() && !tqstrnicmp(line, m_Exit, m_Exit.length()))
-		    kill(m_Pid, SIGTERM);
-		if (m_bTerminal) 
-		{
-		    fputs(line, stdout);
-		    fputc('\n', stdout);
-		}
-		line = readLine(false);
-	    }
-	}
-
-	// Check if the process is still alive
-	ret = waitpid(m_Pid, &state, WNOHANG);
-	if (ret < 0) 
-	{
-	    if (errno == ECHILD)
-		retval = 0;
-	    else
-		kdError(PTYPROC) << k_lineinfo << "waitpid(): " << perror << "\n";
-	    break;
-	}
-	if (ret == m_Pid) 
-	{
-	    if (WIFEXITED(state))
-		retval = WEXITSTATUS(state);
-	    break;
-	}
-    }
-
-    return -retval;
-}
-   
-/*
- * SetupTTY: Creates a new session. The filedescriptor "fd" should be
- * connected to the tty. It is closed after the tty is reopened to make it
- * our controlling terminal. This way the tty is always opened at least once
- * so we'll never get EIO when reading from it.
- */
-
-int MyPtyProcess::SetupTTY(int fd)
-{    
-    // Reset signal handlers
-    for (int sig = 1; sig < NSIG; sig++)
-	signal(sig, SIG_DFL);
-    signal(SIGHUP, SIG_IGN);
-
-    // Close all file handles
-//    struct rlimit rlp;
-//    getrlimit(RLIMIT_NOFILE, &rlp);
-//    for (int i = 0; i < (int)rlp.rlim_cur; i++)
-//    if (i != fd) close(i);
-
-    // Create a new session.
-    setsid();
-
-    // Open slave. This will make it our controlling terminal
-    int slave = open(m_TTY, O_RDWR);
-    if (slave < 0) 
-    {
-	kdError(PTYPROC) << k_lineinfo << "Could not open slave side: " << perror << "\n";
-	return -1;
-    }
-    close(fd);
-
-#if defined(__SVR4) && defined(sun)
-
-    // Solaris STREAMS environment.
-    // Push these modules to make the stream look like a terminal.
-    ioctl(slave, I_PUSH, "ptem");
-    ioctl(slave, I_PUSH, "ldterm");
-
-#endif
-
-    // Connect stdin, stdout and stderr
-//    dup2(slave, 0); dup2(slave, 1); dup2(slave, 2);
-//    if (slave > 2)
-//	close(slave);
-
-    // Disable OPOST processing. Otherwise, '\n' are (on Linux at least)
-    // translated to '\r\n'.
-    struct termios tio;
-    if (tcgetattr(slave, &tio) < 0)
-    {
-	kdError(PTYPROC) << k_lineinfo << "tcgetattr(): " << perror << "\n";
-	return -1;
-    }
-    tio.c_oflag &= ~OPOST;
-    if (tcsetattr(slave, TCSANOW, &tio) < 0)
-    {
-	kdError(PTYPROC) << k_lineinfo << "tcsetattr(): " << perror << "\n";
-	return -1;
-    }
-
-    return 0;
-}
diff --git a/tdeioslave/sftp/process.h b/tdeioslave/sftp/process.h
deleted file mode 100644
index ca154f45c..000000000
--- a/tdeioslave/sftp/process.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- *
- *
- * This file is part of the KDE project, module tdesu.
- * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
- * 
- * This is free software; you can use this library under the GNU Library 
- * General Public License, version 2. See the file "COPYING.LIB" for the 
- * exact licensing terms.
- */
-
-#ifndef __Process_h_Included__
-#define __Process_h_Included__
-
-#include <tqcstring.h>
-#include <tqstring.h>
-#include <tqstringlist.h>
-#include <tqvaluelist.h>
-
-#define PTYPROC 7120
-
-class PTY;
-typedef TQValueList<TQCString> QCStringList;
-
-/**
- * Synchronous communication with tty programs.
- *
- * PtyProcess provides synchronous communication with tty based programs. 
- * The communications channel used is a pseudo tty (as opposed to a pipe) 
- * This means that programs which require a terminal will work.
- */
-
-class MyPtyProcess
-{
-public:
-    MyPtyProcess();
-    virtual ~MyPtyProcess();
-
-    /**
-     * Fork off and execute a command. The command's standard in and output 
-     * are connected to the pseudo tty. They are accessible with @ref #readLine 
-     * and @ref #writeLine.
-     * @param command The command to execute.
-     * @param args The arguments to the command.
-     */
-    int exec(TQCString command, QCStringList args);
-
-    /**
-     * Read a line from the program's standard out. Depending on the @em block 
-     * parameter, this call blocks until a single, full line is read. 
-     * @param block Block until a full line is read?
-     * @return The output string.
-     */
-    TQCString readLine(bool block = true)
-        { return readLineFrom(m_Fd, m_ptyBuf, block); }
-
-    TQCString readLineFromPty(bool block = true)
-        { return readLineFrom(m_Fd, m_ptyBuf, block); }
-
-    TQCString readLineFromStdout(bool block = true)
-        { return readLineFrom(m_stdinout, m_stdoutBuf, block); }
-
-    TQCString readLineFromStderr(bool block = true)
-        { return readLineFrom(m_err, m_stderrBuf, block); }
-
-    /**
-     * Write a line of text to the program's standard in.
-     * @param line The text to write.
-     * @param addNewline Adds a '\n' to the line.
-     */
-    void writeLine(TQCString line, bool addNewline=true);
-
-    /**
-     * Put back a line of input.
-     * @param line The line to put back.
-     * @param addNewline Adds a '\n' to the line.
-     */
-
-    void unreadLine(TQCString line, bool addNewline = true)
-        { unreadLineFrom(m_ptyBuf, line, addNewline); }
-
-    void unreadLineFromPty(TQCString line, bool addNewline = true)
-        { unreadLineFrom(m_ptyBuf, line, addNewline); }
-
-    void unreadLineFromStderr(TQCString line, bool addNewline = true)
-        { unreadLineFrom(m_stderrBuf, line, addNewline); }
-
-    void unreadLineFromStdout(TQCString line, bool addNewline = true)
-        { unreadLineFrom(m_stdoutBuf, line, addNewline); }
-
-    /**
-     * Set exit string. If a line of program output matches this,
-     * @ref #waitForChild() will terminate the program and return.
-     */
-    void setExitString(TQCString exit) { m_Exit = exit; }
-
-    /**
-     * Wait for the child to exit. See also @ref #setExitString.
-     */
-    int waitForChild();
-
-    /**
-     * Wait until the pty has cleared the ECHO flag. This is useful 
-     * when programs write a password prompt before they disable ECHO.
-     * Disabling it might flush any input that was written.
-     */
-    int WaitSlave();
-
-    /** Enables/disables local echo on the pseudo tty. */
-    int enableLocalEcho(bool enable=true);
-
-    /** Enable/disable terminal output. Relevant only to some subclasses. */
-    void setTerminal(bool terminal) { m_bTerminal = terminal; }
-
-    /** Overwritte the password as soon as it is used. Relevant only to
-     * some subclasses. */
-    void setErase(bool erase) { m_bErase = erase; }
-
-    /** Return the filedescriptor of the process. */
-    int fd() {return m_Fd;}
-
-    /** Return the pid of the process. */
-    int pid() {return m_Pid;}
-
-    int stdioFd() {return m_stdinout;}
-
-    int stderrFd() {return m_err;}
-
-protected:
-    bool m_bErase, m_bTerminal;
-    int m_Pid, m_Fd, m_stdinout, m_err;
-    TQCString m_Command, m_Exit;
-
-private:
-    int init();
-    int SetupTTY(int fd);
-
-    PTY *m_pPTY;
-    TQCString m_TTY;
-    TQCString m_ptyBuf, m_stderrBuf, m_stdoutBuf;
-
-    TQCString readLineFrom(int fd, TQCString& inbuf, bool block);
-    void unreadLineFrom(TQCString inbuf, TQCString line, bool addnl);
-    class PtyProcessPrivate;
-    PtyProcessPrivate *d;
-};
-
-#endif
diff --git a/tdeioslave/sftp/sftp.h b/tdeioslave/sftp/sftp.h
deleted file mode 100644
index 95518130d..000000000
--- a/tdeioslave/sftp/sftp.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*    $OpenBSD: sftp.h,v 1.3 2001/03/07 10:11:23 djm Exp $    */
-
-/*
- * Copyright (c) 2001 Markus Friedl.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * draft-ietf-secsh-filexfer-01.txt
- */
-
-/* version */
-#define    SSH2_FILEXFER_VERSION        3
-
-/* client to server */
-#define SSH2_FXP_INIT            1
-#define SSH2_FXP_OPEN            3
-#define SSH2_FXP_CLOSE           4
-#define SSH2_FXP_READ            5
-#define SSH2_FXP_WRITE           6
-#define SSH2_FXP_LSTAT           7
-#define SSH2_FXP_FSTAT           8
-#define SSH2_FXP_SETSTAT         9
-#define SSH2_FXP_FSETSTAT        10
-#define SSH2_FXP_OPENDIR         11
-#define SSH2_FXP_READDIR         12
-#define SSH2_FXP_REMOVE          13
-#define SSH2_FXP_MKDIR           14
-#define SSH2_FXP_RMDIR           15
-#define SSH2_FXP_REALPATH        16
-#define SSH2_FXP_STAT            17
-#define SSH2_FXP_RENAME          18
-#define SSH2_FXP_READLINK        19
-#define SSH2_FXP_SYMLINK         20
-
-/* server to client */
-#define SSH2_FXP_VERSION         2
-#define SSH2_FXP_STATUS          101
-#define SSH2_FXP_HANDLE          102
-#define SSH2_FXP_DATA            103
-#define SSH2_FXP_NAME            104
-#define SSH2_FXP_ATTRS           105
-
-#define SSH2_FXP_EXTENDED        200
-#define SSH2_FXP_EXTENDED_REPLY  201
-
-/* attributes */
-#define SSH2_FILEXFER_ATTR_SIZE         0x00000001
-#define SSH2_FILEXFER_ATTR_UIDGID       0x00000002
-#define SSH2_FILEXFER_ATTR_PERMISSIONS  0x00000004
-#define SSH2_FILEXFER_ATTR_ACMODTIME    0x00000008
-#define SSH2_FILEXFER_ATTR_EXTENDED     0x80000000
-
-/* portable open modes */
-#define SSH2_FXF_READ            0x00000001
-#define SSH2_FXF_WRITE           0x00000002
-#define SSH2_FXF_APPEND          0x00000004
-#define SSH2_FXF_CREAT           0x00000008
-#define SSH2_FXF_TRUNC           0x00000010
-#define SSH2_FXF_EXCL            0x00000020
-
-/* status messages */
-#define SSH2_FX_OK                 0
-#define SSH2_FX_EOF                1
-#define SSH2_FX_NO_SUCH_FILE       2
-#define SSH2_FX_PERMISSION_DENIED  3
-#define SSH2_FX_FAILURE            4
-#define SSH2_FX_BAD_MESSAGE        5
-#define SSH2_FX_NO_CONNECTION      6
-#define SSH2_FX_CONNECTION_LOST    7
-#define SSH2_FX_OP_UNSUPPORTED     8
-#define SSH2_FX_MAX                8
diff --git a/tdeioslave/sftp/sftp.protocol b/tdeioslave/sftp/sftp.protocol
index 33e66867a..931ee7890 100644
--- a/tdeioslave/sftp/sftp.protocol
+++ b/tdeioslave/sftp/sftp.protocol
@@ -2,7 +2,7 @@
 exec=tdeio_sftp
 protocol=sftp
 input=none
-listing=Name,Type,Size,Date,Access,Owner,Group,Link
+listing=Name,Type,Size,Date,Access,Owner,Group,Link,MimeType
 output=filesystem
 copyToFile=true
 copyFromFile=true
diff --git a/tdeioslave/sftp/sftpfileattr.cpp b/tdeioslave/sftp/sftpfileattr.cpp
deleted file mode 100644
index ddd94bbe8..000000000
--- a/tdeioslave/sftp/sftpfileattr.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-/***************************************************************************
-                          sftpfileattr.cpp  -  description
-                             -------------------
-    begin                : Sat Jun 30 2001
-    copyright            : (C) 2001 by Lucas Fisher
-    email                : ljfisher@iastate.edu
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "sftpfileattr.h"
-
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <tqstring.h>
-#include <tqdatastream.h>
-
-#include <tdeio/global.h>
-#include <kremoteencoding.h>
-
-using namespace TDEIO;
-
-sftpFileAttr::sftpFileAttr(){
-    clear();
-    mDirAttrs = false;
-}
-
-sftpFileAttr::sftpFileAttr(KRemoteEncoding* encoding){
-    clear();
-    mDirAttrs = false;
-    mEncoding = encoding;
-}
-
-
-/** Constructor to initialize the file attributes on declaration. */
-sftpFileAttr::sftpFileAttr(TQ_ULLONG size, uid_t uid, gid_t gid,
-                    mode_t permissions, time_t atime,
-                    time_t mtime, TQ_UINT32 extendedCount) {
-    clear();
-    mDirAttrs = false;
-    mSize  = size;
-    mUid   = uid;
-    mGid   = gid;
-    mAtime = atime;
-    mMtime = mtime;
-    mPermissions   = permissions;
-    mExtendedCount = extendedCount;
-}
-
-sftpFileAttr::~sftpFileAttr(){
-}
-
-/** Returns a UDSEntry describing the file.
-The UDSEntry is generated from the sftp file attributes. */
-UDSEntry sftpFileAttr::entry() {
-    UDSEntry entry;
-    UDSAtom atom;
-
-    atom.m_uds = UDS_NAME;
-    atom.m_str = mFilename;
-    entry.append(atom);
-
-    if( mFlags & SSH2_FILEXFER_ATTR_SIZE ) {
-        atom.m_uds = UDS_SIZE;
-        atom.m_long = mSize;
-        entry.append(atom);
-    }
-
-    if( mFlags & SSH2_FILEXFER_ATTR_ACMODTIME ) {
-        atom.m_uds = UDS_ACCESS_TIME;
-        atom.m_long = mAtime;
-        entry.append(atom);
-
-        atom.m_uds = UDS_MODIFICATION_TIME;
-        atom.m_long = mMtime;
-        entry.append(atom);
-    }
-
-    if( mFlags & SSH2_FILEXFER_ATTR_UIDGID ) {
-        if( mUserName.isEmpty() || mGroupName.isEmpty() )
-            getUserGroupNames();
-
-        atom.m_uds = UDS_USER;
-        atom.m_str = mUserName;
-        entry.append(atom);
-
-        atom.m_uds = UDS_GROUP;
-        atom.m_str = mGroupName;
-        entry.append(atom);
-    }
-
-    if( mFlags & SSH2_FILEXFER_ATTR_PERMISSIONS ) {
-        atom.m_uds = UDS_ACCESS;
-        atom.m_long = mPermissions;
-        entry.append(atom);
-
-        mode_t type = fileType();
-
-        // Set the type if we know what it is
-        if( type != 0 ) {
-            atom.m_uds = UDS_FILE_TYPE;
-            atom.m_long = (mLinkType ? mLinkType:type);
-            entry.append(atom);
-        }
-
-        if( S_ISLNK(type) ) {
-            atom.m_uds = UDS_LINK_DEST;
-            atom.m_str = mLinkDestination;
-            entry.append(atom);
-        }
-    }
-
-    return entry;
-}
-
-/** Use to output the file attributes to a sftp packet */
-TQDataStream& operator<< (TQDataStream& s, const sftpFileAttr& fa) {
-    s << (TQ_UINT32)fa.mFlags;
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_SIZE )
-        { s << (TQ_ULLONG)fa.mSize; }
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_UIDGID )
-        { s << (TQ_UINT32)fa.mUid << (TQ_UINT32)fa.mGid; }
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_PERMISSIONS )
-        { s << (TQ_UINT32)fa.mPermissions; }
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_ACMODTIME )
-        { s << (TQ_UINT32)fa.mAtime << (TQ_UINT32)fa.mMtime; }
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_EXTENDED ) {
-        s << (TQ_UINT32)fa.mExtendedCount;
-        // XXX: Write extensions to data stream here
-        // s.writeBytes(extendedtype).writeBytes(extendeddata);
-    }
-    return s;
-}
-
-
-/** Use to read a file attribute from a sftp packet */
-TQDataStream& operator>> (TQDataStream& s, sftpFileAttr& fa) {
-
-    // XXX Add some error checking in here in case
-    //     we get a bad sftp packet.
-
-    fa.clear();
-
-    if( fa.mDirAttrs ) {
-        TQCString fn;
-        s >> fn;
-        fn.truncate( fn.size() );
-
-        fa.mFilename = fa.mEncoding->decode( fn );
-
-        s >> fa.mLongname;
-        fa.mLongname.truncate( fa.mLongname.size() );
-        //kdDebug() << ">>: ftpfileattr long filename (" << fa.mLongname.size() << ")= " << fa.mLongname <<  endl;
-    }
-
-    s >> fa.mFlags;  // get flags
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_SIZE ) {
-        TQ_ULLONG fileSize;
-        s >> fileSize;
-        fa.setFileSize(fileSize);
-    }
-
-    TQ_UINT32 x;
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_UIDGID ) {
-        s >> x; fa.setUid(x);
-        s >> x; fa.setGid(x);
-    }
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_PERMISSIONS ) {
-        s >> x; fa.setPermissions(x);
-    }
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_ACMODTIME ) {
-        s >> x; fa.setAtime(x);
-        s >> x; fa.setMtime(x);
-    }
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_EXTENDED ) {
-        s >> x; fa.setExtendedCount(x);
-        // XXX: Read in extensions from data stream here
-        // s.readBytes(extendedtype).readBytes(extendeddata);
-    }
-
-    fa.getUserGroupNames();
-    return s;
-}
-/** Parse longname for the owner and group names. */
-void sftpFileAttr::getUserGroupNames(){
-    // Get the name of the owner and group of the file from longname.
-    TQString user, group;
-    if( mLongname.isEmpty() ) {
-        // do not have the user name so use the user id instead
-        user.setNum(mUid);
-        group.setNum(mGid);
-    }
-    else {
-        int field = 0;
-        int i = 0;
-        int l = mLongname.length();
-
-        TQString longName = mEncoding->decode( mLongname );
-
-        kdDebug(7120) << "Decoded:  " << longName << endl;
-
-        // Find the beginning of the third field which contains the user name.
-        while( field != 2 ) {
-            if( longName[i].isSpace() ) {
-                field++; i++;
-                while( i < l && longName[i].isSpace() ) { i++; }
-            }
-            else { i++; }
-        }
-        // i is the index of the first character of the third field.
-        while( i < l && !longName[i].isSpace() ) {
-            user.append(longName[i]);
-            i++;
-        }
-
-        // i is the first character of the space between fields 3 and 4
-        // user contains the owner's user name
-        while( i < l && longName[i].isSpace() ) {
-            i++;
-        }
-
-        // i is the first character of the fourth field
-        while( i < l && !longName[i].isSpace() ) {
-            group.append(longName[i]);
-            i++;
-        }
-        // group contains the name of the group.
-    }
-
-    mUserName = user;
-    mGroupName = group;
-}
-
-/** No descriptions */
-kdbgstream& operator<< (kdbgstream& s, sftpFileAttr& a) {
-    s << "Filename: " << a.mFilename
-      << ", Uid: " << a.mUid
-      << ", Gid: " << a.mGid
-      << ", Username: " << a.mUserName
-      << ", GroupName: " << a.mGroupName
-      << ", Permissions: " << a.mPermissions
-      << ", size: " << a.mSize
-      << ", atime: " << a.mAtime
-      << ", mtime: " << a.mMtime
-      << ", extended cnt: " << a.mExtendedCount;
-
-    if (S_ISLNK(a.mLinkType)) {
-      s << ", Link Type: " << a.mLinkType;
-      s << ", Link Destination: " << a.mLinkDestination;
-    }
-
-    return s;
-}
-
-/** Make sure it builds with NDEBUG */
-kndbgstream& operator<< (kndbgstream& s, sftpFileAttr& ) {
-    return s;
-}
-
-/** Clear all attributes and flags. */
-void sftpFileAttr::clear(){
-    clearAtime();
-    clearMtime();
-    clearGid();
-    clearUid();
-    clearFileSize();
-    clearPermissions();
-    clearExtensions();
-    mFilename = TQString::null;
-    mGroupName =  TQString::null;
-    mUserName = TQString::null;
-    mLinkDestination = TQString::null;
-    mFlags = 0;
-    mLongname = "\0";
-    mLinkType = 0;
-}
-
-/** Return the size of the sftp attribute. */
-TQ_UINT32 sftpFileAttr::size() const{
-    TQ_UINT32 size = 4; // for the attr flag
-    if( mFlags & SSH2_FILEXFER_ATTR_SIZE )
-        size += 8;
-
-    if( mFlags & SSH2_FILEXFER_ATTR_UIDGID )
-        size += 8;
-
-    if( mFlags & SSH2_FILEXFER_ATTR_PERMISSIONS )
-        size += 4;
-
-    if( mFlags & SSH2_FILEXFER_ATTR_ACMODTIME )
-        size += 8;
-
-    if( mFlags & SSH2_FILEXFER_ATTR_EXTENDED ) {
-        size += 4;
-        // add size of extensions
-    }
-    return size;
-}
-
-/** Returns the file type as determined from the file permissions */
-mode_t sftpFileAttr::fileType() const{
-    mode_t type = 0;
-
-    if( S_ISLNK(mPermissions) )
-      type |= S_IFLNK;
-
-    if( S_ISREG(mPermissions) )
-      type |= S_IFREG;
-    else if( S_ISDIR(mPermissions) )
-      type |= S_IFDIR;
-    else if( S_ISCHR(mPermissions) )
-      type |= S_IFCHR;
-    else if( S_ISBLK(mPermissions) )
-      type |= S_IFBLK;
-    else if( S_ISFIFO(mPermissions) )
-      type |= S_IFIFO;
-    else if( S_ISSOCK(mPermissions) )
-      type |= S_IFSOCK;
-
-    return type;
-}
-
-void sftpFileAttr::setEncoding( KRemoteEncoding* encoding )
-{
-    mEncoding = encoding;
-}
diff --git a/tdeioslave/sftp/sftpfileattr.h b/tdeioslave/sftp/sftpfileattr.h
deleted file mode 100644
index 43b56979d..000000000
--- a/tdeioslave/sftp/sftpfileattr.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/***************************************************************************
-                          sftpfileattr.h  -  description
-                             -------------------
-    begin                : Sat Jun 30 2001
-    copyright            : (C) 2001 by Lucas Fisher
-    email                : ljfisher@iastate.edu
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef SFTPFILEATTR_H
-#define SFTPFILEATTR_H
-
-#include <sys/types.h>
-
-#include <tqglobal.h>
-#include <tqstring.h>
-#include <tqdatastream.h>
-
-#include <tdeio/global.h>
-#include <kdebug.h>
-
-#include "sftp.h"
-
-/**
-  *@author Lucas Fisher
-  */
-
-class KRemoteEncoding;
-
-class sftpFileAttr {
-
-private: // Private attributes
-    /** Name of file. */
-    TQString mFilename;
-
-    /** Specifies which fields of the file attribute are available. */
-    TQ_UINT32 mFlags;
-
-    /** Size of the file in bytes. Should be 64 bit safe. */
-    TQ_ULLONG mSize;
-
-    /** User id of the owner of the file. */
-    uid_t mUid;
-
-    /** Group id of the group to which the file belongs. */
-    gid_t mGid;
-
-    /** POSIX permissions of the file. */
-    mode_t mPermissions;
-
-    /** Last access time of the file in seconds from Jan 1, 1970. */
-    time_t mAtime;
-
-    /** Last modification time of file in seconds since Jan. 1, 1970. */
-    time_t mMtime;
-
-    /** Number of file attribute extensions.
-        Not currently implemented */
-    TQ_UINT32 mExtendedCount;
-
-     /** Longname of the file as found in a SSH_FXP_NAME sftp packet.
-          These contents are parse to return the file's owner name and
-          gr oup name. */
-    TQCString mLongname;
-
-    TQString mUserName;
-    TQString mGroupName;
-
-    /** If file is a link, contains the destination of the link */
-    TQString mLinkDestination;
-
-    /** If resource is a link, contains the type the link,e.g. file,dir... */
-    mode_t mLinkType;
-
-    /** Whether >> operator should read filename and longname from the stream. */
-    bool mDirAttrs;
-
-    /** Holds the encoding of the remote host */
-    KRemoteEncoding* mEncoding;
-
-public:
-    sftpFileAttr();
-
-    sftpFileAttr(KRemoteEncoding* encoding);
-
-    ~sftpFileAttr();
-
-    /** Constructor to initialize the file attributes on declaration. */
-    sftpFileAttr(TQ_ULLONG size_, uid_t uid_, gid_t gid_, mode_t permissions_,
-                 time_t atime_, time_t mtime_, TQ_UINT32 extendedCount_ = 0);
-
-    /** Return the size of the sftp attribute not including filename or longname*/
-    TQ_UINT32 size() const;
-
-    /** Clear all attributes and flags. */
-    void clear();
-
-    /** Set the size of the file. */
-    void setFileSize(TQ_ULLONG s)
-        { mSize = s; mFlags |= SSH2_FILEXFER_ATTR_SIZE; }
-
-    /** The size file attribute will not be included in the UDSEntry
-        or when the file attribute is written to the sftp packet. */
-    void clearFileSize()
-        { mSize = 0; mFlags &= ~SSH2_FILEXFER_ATTR_SIZE; }
-
-    /** Returns the size of the file. */
-    TQ_ULLONG fileSize() const { return mSize; }
-
-    /** Sets the POSIX permissions of the file. */
-    void setPermissions(mode_t p)
-        { mPermissions = p; mFlags |= SSH2_FILEXFER_ATTR_PERMISSIONS; }
-
-    /** The permissions file attribute will not be included in the UDSEntry
-        or when the file attribute is written to the sftp packet. */
-    void clearPermissions()
-        { mPermissions = 0; mFlags &= ~SSH2_FILEXFER_ATTR_PERMISSIONS; }
-
-    /** Returns the POSIX permissons of the file. */
-    mode_t permissions() const { return mPermissions; }
-
-    /** Sets the group id of the file. */
-    void setGid(gid_t id)
-        { mGid = id; mFlags |= SSH2_FILEXFER_ATTR_UIDGID; }
-
-    /** Neither the gid or uid file attributes will not be included in the UDSEntry
-        or when the file attribute is written to the sftp packet. This is
-        equivalent to clearUid() */
-    void clearGid()
-        { mGid = 0; mFlags &= SSH2_FILEXFER_ATTR_UIDGID; }
-
-    /** Returns the group id of the file. */
-    gid_t gid() const { return mGid; }
-
-    /** Sets the uid of the file. */
-    void setUid(uid_t id)
-        { mUid = id; mFlags |= SSH2_FILEXFER_ATTR_UIDGID; }
-
-    /** Neither the gid or uid file attributes will not be included in the UDSEntry
-        or when the file attribute is written to the sftp packet. This is
-        equivalent to clearGid() */
-    void clearUid()
-        { mUid = 0; mFlags &= SSH2_FILEXFER_ATTR_UIDGID; }
-
-    /** Returns the user id of the file. */
-    gid_t uid() const { return mUid; }
-
-    /** Set the modificatoin time of the file in seconds since Jan. 1, 1970. */
-    void setMtime(time_t t)
-        { mMtime = t; mFlags |= SSH2_FILEXFER_ATTR_ACMODTIME; }
-
-    /** Neither the mtime or atime file attributes will not be included in the UDSEntry
-        or when the file attribute is written to the sftp packet. This is
-        equivalent to clearAtime() */
-    void clearMtime()
-        { mMtime = 0; mFlags &= SSH2_FILEXFER_ATTR_ACMODTIME; }
-
-    /** Returns the modification time of the file in seconds since Jan. 1, 1970. */
-    time_t mtime() const { return mMtime; }
-
-    /** Sets the access time of the file in seconds since Jan. 1, 1970. */
-    void setAtime(time_t t)
-        { mAtime = t; mFlags |= SSH2_FILEXFER_ATTR_ACMODTIME; }
-
-    /** Neither the atime or mtime file attributes will not be included in the UDSEntry
-        or when the file attribute is written to the sftp packet. This is
-        equivalent to clearMtime() */
-    void clearAtime()
-        { mAtime = 0; mFlags &= SSH2_FILEXFER_ATTR_ACMODTIME; }
-
-    /** Returns the last access time of the file in seconds since Jan. 1, 1970. */
-    time_t atime() const { return mAtime; }
-
-    /** Sets the number of file attribute extensions. */
-    void setExtendedCount(unsigned int c)
-        { mExtendedCount = c; mFlags |= SSH2_FILEXFER_ATTR_EXTENDED; }
-
-    /** No extensions will be included when the file attribute is written
-        to a sftp packet. */
-    void clearExtensions()
-        { mExtendedCount = 0; mFlags &= ~SSH2_FILEXFER_ATTR_EXTENDED; }
-
-    /** Returns the number of file attribute extentsions. */
-    unsigned int extendedCount() const { return mExtendedCount; }
-
-    /** Returns the flags for the sftp file attributes. */
-    unsigned int flags() const { return mFlags; }
-
-    /** Sets file's longname. See sftpFileAttr::longname. */
-    void setLongname(TQString l) { mLongname = l.latin1(); }
-
-    /** Returns a string describing the file attributes. The format is specific
-        to the implementation of the sftp server.  In most cases (ie OpenSSH)
-        this is similar to the long output of 'ls'. */
-    TQString longname() const { return mLongname; }
-
-    void setLinkDestination(const TQString& target)
-        { mLinkDestination = target; }
-
-    TQString linkDestination()
-        { return mLinkDestination; }
-
-    /** Sets the actual type a symbolic link points to. */
-    void setLinkType (mode_t type) { mLinkType = type; }
-
-    mode_t linkType() const { return mLinkType; }
-
-    /** No descriptions */
-    void setFilename(const TQString& fn)
-        { mFilename = fn; }
-
-    TQString filename() const
-        { return mFilename; }
-
-    /** Returns a UDSEntry describing the file.
-       The UDSEntry is generated from the sftp file attributes. */
-    TDEIO::UDSEntry entry();
-
-    /** Use to output the file attributes to a sftp packet
-        This will only write the sftp ATTR structure to the stream.
-        It will never write the filename and longname because the client
-        never sends those to the server. */
-    friend TQDataStream& operator<< (TQDataStream&, const sftpFileAttr&);
-
-    /** Use to read a file attribute from a sftp packet.
-        Read this carefully! If the DirAttrs flag is true, this will
-        read the filename, longname, and file attributes from the stream.
-        This is for use with listing directories.
-        If the DirAttrs flag is false, this will only read file attributes
-        from the stream.
-        BY DEFAULT, A NEW INSTANCE HAS DirAttrs == false */
-    friend TQDataStream& operator>> (TQDataStream&, sftpFileAttr&);
-
-    /** Parse longname for the owner and group names. */
-    void getUserGroupNames();
-
-    /** Sets the DirAttrs flag.  This flag affects how the >> operator works on data streams. */
-    void setDirAttrsFlag(bool flag){ mDirAttrs = flag; }
-
-    /** Gets the DirAttrs flag. */
-    bool getDirAttrsFlag() const { return mDirAttrs; }
-
-    friend kdbgstream& operator<< (kdbgstream& s, sftpFileAttr& a);
-    friend kndbgstream& operator<< (kndbgstream& s, sftpFileAttr& a);
-
-    /** Returns the file type as determined from the file permissions */
-    mode_t fileType() const;
-
-    /** Set the encoding of the remote file system */
-    void setEncoding( KRemoteEncoding* encoding );
-};
-
-#endif
diff --git a/tdeioslave/sftp/tdeio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp
index eab0eae42..0abcd6238 100644
--- a/tdeioslave/sftp/tdeio_sftp.cpp
+++ b/tdeioslave/sftp/tdeio_sftp.cpp
@@ -1,62 +1,58 @@
-/***************************************************************************
-                          sftp.cpp  -  description
-                             -------------------
-    begin                : Fri Jun 29 23:45:40 CDT 2001
-    copyright            : (C) 2001 by Lucas Fisher
-    email                : ljfisher@purdue.edu
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 /*
-DEBUGGING
-We are pretty much left with kdDebug messages for debugging. We can't use a gdb
-as described in the ioslave DEBUG.howto because tdeinit has to run in a terminal.
-Ssh will detect this terminal and ask for a password there, but will just get garbage.
-So we can't connect.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+ * Copyright (c) 2001  Lucas Fisher       <ljfisher@purdue.edu>
+ * Copyright (c) 2009  Andreas Schneider  <mail@cynapses.org>
+ * Copyright (c) 2020  Martin Sandsmark   <martin@sandsmark.ninja>
+ *                     KDE2 port
+ * Copyright (c) 2022  Mavridis Philippe  <mavridisf@gmail.com>
+ *                     Trinity port
+ *
+ * Portions Copyright (c) 2020-2021 Harald Sitter <sitter@kde.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License (LGPL) as published by the Free Software Foundation;
+ * either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "tdeio_sftp.h"
 
 #include <fcntl.h>
 
-#include <tqcstring.h>
-#include <tqstring.h>
-#include <tqobject.h>
-#include <tqstrlist.h>
+#include <tqapplication.h>
 #include <tqfile.h>
-#include <tqbuffer.h>
+#include <tqdir.h>
+
+#include <numeric>
+#include <functional>
+#include <vector>
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <signal.h>
 #include <errno.h>
-#include <ctype.h>
 #include <time.h>
-#include <netdb.h>
 #include <string.h>
 
-#include <netinet/in.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
+
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/wait.h>
 
 #include <tdeapplication.h>
-#include <kuser.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include <kinstance.h>
 #include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdelocale.h>
@@ -64,15 +60,14 @@ So we can't connect.
 #include <tdeio/ioslave_defaults.h>
 #include <kmimetype.h>
 #include <kmimemagic.h>
-#include <klargefile.h>
-#include <kremoteencoding.h>
+#include <signal.h>
 
-#include "sftp.h"
-#include "tdeio_sftp.h"
-#include "atomicio.h"
-#include "sftpfileattr.h"
-#include "ksshprocess.h"
+#include <libssh/libssh.h>
+#include <libssh/sftp.h>
+#include <libssh/callbacks.h>
 
+#define TDEIO_SFTP_SPECIAL_TIMEOUT 30
+#define ZERO_STRUCTP(x) do { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); } while(0)
 
 using namespace TDEIO;
 extern "C"
@@ -87,8 +82,13 @@ extern "C"
       kdDebug(TDEIO_SFTP_DB) << "Usage: tdeio_sftp  protocol domain-socket1 domain-socket2" << endl;
       exit(-1);
     }
-
     sftpProtocol slave(argv[2], argv[3]);
+
+    if (getenv("DEBUG_TDEIO_SFTP")) {
+        // Give us a coredump in the journal
+        signal(6, SIG_DFL);
+    }
+
     slave.dispatchLoop();
 
     kdDebug(TDEIO_SFTP_DB) << "*** tdeio_sftp Done" << endl;
@@ -96,2187 +96,2134 @@ extern "C"
   }
 }
 
+// Some helper functions/classes
+namespace {
 
-/*
- * This helper handles some special issues (blocking and interrupted
- * system call) when writing to a file handle.
- *
- * @return 0 on success or an error code on failure (ERR_COULD_NOT_WRITE,
- * ERR_DISK_FULL, ERR_CONNECTION_BROKEN).
- */
-static int writeToFile (int fd, const char *buf, size_t len)
-{
-  while (len > 0)
-  {
-    ssize_t written = ::write(fd, buf, len);
-    if (written >= 0)
-    {
-        buf += written;
-        len -= written;
-        continue;
-    }
-
-    switch(errno)
-    {
-      case EINTR:
-        continue;
-      case EPIPE:
-        return ERR_CONNECTION_BROKEN;
-      case ENOSPC:
-        return ERR_DISK_FULL;
-      default:
-        return ERR_COULD_NOT_WRITE;
-    }
+// A quick and dirty scope guard implementation
+class ExitGuard {
+public:
+  template<class Callable>
+  ExitGuard(Callable && undo_func) : f(std::forward<Callable>(undo_func)) {}
+  ExitGuard(ExitGuard && other) : f(std::move(other.f)) {
+      other.f = nullptr;
   }
-  return 0;
-}
-
-sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket)
-             : SlaveBase("tdeio_sftp", pool_socket, app_socket),
-                  mConnected(false), mPort(-1), mMsgId(0) {
-  kdDebug(TDEIO_SFTP_DB) << "sftpProtocol(): pid = " << getpid() << endl;
-}
-
 
-sftpProtocol::~sftpProtocol() {
-    kdDebug(TDEIO_SFTP_DB) << "~sftpProtocol(): pid = " << getpid() << endl;
-    closeConnection();
-}
+  ~ExitGuard() {
+    run();
+  }
 
-/**
-  * Type is a sftp packet type found in .sftp.h'.
-  * Example: SSH2_FXP_READLINK, SSH2_FXP_RENAME, etc.
-  *
-  * Returns true if the type is supported by the sftp protocol
-  * version negotiated by the client and server (sftpVersion).
-  */
-bool sftpProtocol::isSupportedOperation(int type) {
-  switch (type) {
-    case SSH2_FXP_VERSION:
-    case SSH2_FXP_STATUS:
-    case SSH2_FXP_HANDLE:
-    case SSH2_FXP_DATA:
-    case SSH2_FXP_NAME:
-    case SSH2_FXP_ATTRS:
-    case SSH2_FXP_INIT:
-    case SSH2_FXP_OPEN:
-    case SSH2_FXP_CLOSE:
-    case SSH2_FXP_READ:
-    case SSH2_FXP_WRITE:
-    case SSH2_FXP_LSTAT:
-    case SSH2_FXP_FSTAT:
-    case SSH2_FXP_SETSTAT:
-    case SSH2_FXP_FSETSTAT:
-    case SSH2_FXP_OPENDIR:
-    case SSH2_FXP_READDIR:
-    case SSH2_FXP_REMOVE:
-    case SSH2_FXP_MKDIR:
-    case SSH2_FXP_RMDIR:
-    case SSH2_FXP_REALPATH:
-    case SSH2_FXP_STAT:
-      return true;
-    case SSH2_FXP_RENAME:
-      return sftpVersion >= 2 ? true : false;
-    case SSH2_FXP_EXTENDED:
-    case SSH2_FXP_EXTENDED_REPLY:
-    case SSH2_FXP_READLINK:
-    case SSH2_FXP_SYMLINK:
-      return sftpVersion >= 3 ? true : false;
-    default:
-      kdDebug(TDEIO_SFTP_DB) << "isSupportedOperation(type:"
-                            << type << "): unrecognized operation type" << endl;
-      break;
+  void run() noexcept {
+    if(f) { f(); f = nullptr; }
   }
 
-  return false;
-}
+  void abort() {
+    f = nullptr;
+  }
 
-void sftpProtocol::copy(const KURL &src, const KURL &dest, int permissions, bool overwrite)
-{
-    kdDebug(TDEIO_SFTP_DB) << "copy(): " << src << " -> " << dest << endl;
+  ExitGuard(const ExitGuard&) = delete;
+  void operator= (const ExitGuard&) = delete;
 
-    bool srcLocal = src.isLocalFile();
-    bool destLocal = dest.isLocalFile();
+private:
+    std::function<void()> f;
+};
 
-    if ( srcLocal && !destLocal ) // Copy file -> sftp
-      sftpCopyPut(src, dest, permissions, overwrite);
-    else if ( destLocal && !srcLocal ) // Copy sftp -> file
-      sftpCopyGet(dest, src, permissions, overwrite);
-    else
-      error(ERR_UNSUPPORTED_ACTION, TQString::null);
+// A small helper to purge passwords. Paranoiac's note: this is not enough to guarantee the
+// complete purge of the password and all its copy from memory (ioslaves are sending the passwords
+// via dcop, so it's far beyond calling it "secure" in any way), but it's still better than nothing.
+void purgeString(TQString &s) {
+  s.fill('\0');
+  s.setLength(0);
+  s = TQString::null;
 }
 
-void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool overwrite)
-{
-    kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet(): " << src << " -> " << dest << endl;
-
-    // Attempt to establish a connection...
-    openConnection();
-    if( !mConnected )
-        return;
-
-    KDE_struct_stat buff_orig;
-    TQCString dest_orig ( TQFile::encodeName(dest.path()) );
-    bool origExists = (KDE_lstat( dest_orig.data(), &buff_orig ) != -1);
-
-    if (origExists)
-    {
-        if (S_ISDIR(buff_orig.st_mode))
-        {
-          error(ERR_IS_DIRECTORY, dest.prettyURL());
-          return;
-        }
-
-        if (!overwrite)
-        {
-          error(ERR_FILE_ALREADY_EXIST, dest.prettyURL());
-          return;
-        }
-    }
-
-    TDEIO::filesize_t offset = 0;
-    TQCString dest_part ( dest_orig + ".part" );
-
-    int fd = -1;
-    bool partExists = false;
-    bool markPartial = config()->readBoolEntry("MarkPartial", true);
-
-    if (markPartial)
-    {
-        KDE_struct_stat buff_part;
-        partExists = (KDE_stat( dest_part.data(), &buff_part ) != -1);
-
-        if (partExists && buff_part.st_size > 0 && S_ISREG(buff_part.st_mode))
-        {
-            if (canResume( buff_part.st_size ))
-            {
-                offset = buff_part.st_size;
-                kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet: Resuming @ " << offset << endl;
-            }
-        }
-
-        if (offset > 0)
-        {
-            fd = KDE_open(dest_part.data(), O_RDWR);
-            offset = KDE_lseek(fd, 0, SEEK_END);
-            if (offset == 0)
-            {
-              error(ERR_CANNOT_RESUME, dest.prettyURL());
-              return;
-            }
-        }
-        else
-        {
-            // Set up permissions properly, based on what is done in file io-slave
-            int openFlags = (O_CREAT | O_TRUNC | O_WRONLY);
-            int initialMode = (mode == -1) ? 0666 : (mode | S_IWUSR);
-            fd = KDE_open(dest_part.data(), openFlags, initialMode);
-        }
-    }
-    else
-    {
-        // Set up permissions properly, based on what is done in file io-slave
-        int openFlags = (O_CREAT | O_TRUNC | O_WRONLY);
-        int initialMode = (mode == -1) ? 0666 : (mode | S_IWUSR);
-        fd = KDE_open(dest_orig.data(), openFlags, initialMode);
-    }
-
-    if(fd == -1)
-    {
-      kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet: Unable to open (" << fd << ") for writting." << endl;
-      if (errno == EACCES)
-        error (ERR_WRITE_ACCESS_DENIED, dest.prettyURL());
-      else
-        error (ERR_CANNOT_OPEN_FOR_WRITING, dest.prettyURL());
-      return;
-    }
+// A helper class to cleanup password when it goes out of the scope
+class PasswordPurger: public ExitGuard {
+public:
+  PasswordPurger(TQString &pw) : ExitGuard( [&pw](){purgeString(pw);} ) {}
+};
 
-    Status info = sftpGet(src, offset, fd);
-    if ( info.code != 0 )
-    {
-      // Should we keep the partially downloaded file ??
-      TDEIO::filesize_t size = config()->readNumEntry("MinimumKeepSize", DEFAULT_MINIMUM_KEEP_SIZE);
-      if (info.size < size)
-        ::remove(dest_part.data());
+} /* namespace */
 
-      error(info.code, info.text);
-      return;
-    }
+// The callback function for libssh
+int auth_callback(const char *prompt, char *buf, size_t len,
+                  int echo, int verify, void *userdata)
+{
+  if (userdata == NULL) {
+    return -1;
+  }
 
-    if (::close(fd) != 0)
-    {
-      error(ERR_COULD_NOT_WRITE, dest.prettyURL());
-      return;
-    }
+  sftpProtocol *slave = (sftpProtocol *) userdata;
 
-    //
-    if (markPartial)
-    {
-      if (::rename(dest_part.data(), dest_orig.data()) != 0)
-      {
-        error (ERR_CANNOT_RENAME_PARTIAL, dest_part);
-        return;
-      }
-    }
+  if (slave->auth_callback(prompt, buf, len, echo, verify, userdata) < 0) {
+    return -1;
+  }
 
-    data(TQByteArray());
-    kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet(): emit finished()" << endl;
-    finished();
+  return 0;
 }
 
-sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, TDEIO::filesize_t offset, int fd )
-{
-    int code;
-    sftpFileAttr attr(remoteEncoding());
-
-    Status res;
-    res.code = 0;
-    res.size = 0;
-
-    kdDebug(TDEIO_SFTP_DB) << "sftpGet(): " << src << endl;
+void log_callback(ssh_session session, int priority, const char *message,
+    void *userdata) {
+  if (userdata == NULL) {
+    return;
+  }
 
-    // stat the file first to get its size
-    if( (code = sftpStat(src, attr)) != SSH2_FX_OK ) {
-        return doProcessStatus(code, src.prettyURL());
-    }
+  sftpProtocol *slave = (sftpProtocol *) userdata;
 
-    // We cannot get file if it is a directory
-    if( attr.fileType() == S_IFDIR ) {
-        res.text = src.prettyURL();
-        res.code = ERR_IS_DIRECTORY;
-        return res;
-    }
+  slave->log_callback(session, priority, message, userdata);
+}
 
-    TDEIO::filesize_t fileSize = attr.fileSize();
-    TQ_UINT32 pflags = SSH2_FXF_READ;
-    attr.clear();
+class PublicKeyAuth: public SSHAuthMethod {
+public:
+  unsigned flag() override {return SSH_AUTH_METHOD_PUBLICKEY;};
+  int authenticate(sftpProtocol *ioslave) const override {
+    return ioslave->authenticatePublicKey();
+  }
+  SSHAuthMethod* clone() override {return new PublicKeyAuth; }
+};
 
-    TQByteArray handle;
-    if( (code = sftpOpen(src, pflags, attr, handle)) != SSH2_FX_OK ) {
-        res.text = src.prettyURL();
-        res.code = ERR_CANNOT_OPEN_FOR_READING;
-        return res;
-    }
+class KeyboardInteractiveAuth: public SSHAuthMethod {
+public:
+  KeyboardInteractiveAuth(bool noPaswordQuery = false): mNoPaswordQuery(noPaswordQuery) {}
 
-    // needed for determining mimetype
-    // note: have to emit mimetype before emitting totalsize.
-    TQByteArray buff;
-    TQByteArray mimeBuffer;
-
-    unsigned int oldSize;
-    bool foundMimetype = false;
-
-    // How big should each data packet be? Definitely not bigger than 64kb or
-    // you will overflow the 2 byte size variable in a sftp packet.
-    TQ_UINT32 len = 60*1024;
-    code = SSH2_FX_OK;
-
-    kdDebug(TDEIO_SFTP_DB) << "sftpGet(): offset = " << offset << endl;
-    while( code == SSH2_FX_OK ) {
-        if( (code = sftpRead(handle, offset, len, buff)) == SSH2_FX_OK ) {
-            offset += buff.size();
-
-            // save data for mimetype. Pretty much follows what is in the ftp ioslave
-            if( !foundMimetype ) {
-                oldSize = mimeBuffer.size();
-                mimeBuffer.resize(oldSize + buff.size());
-                memcpy(mimeBuffer.data()+oldSize, buff.data(), buff.size());
-
-                if( mimeBuffer.size() > 1024 ||  offset == fileSize ) {
-                    // determine mimetype
-                    KMimeMagicResult* result =
-                        KMimeMagic::self()->findBufferFileType(mimeBuffer, src.fileName());
-                    kdDebug(TDEIO_SFTP_DB) << "sftpGet(): mimetype is " <<
-                                      result->mimeType() << endl;
-                    mimeType(result->mimeType());
-
-                    // Always send the total size after emitting mime-type...
-                    totalSize(fileSize);
-
-                    if (fd == -1)
-                        data(mimeBuffer);
-                    else
-                    {
-                        if ( (res.code=writeToFile(fd, mimeBuffer.data(), mimeBuffer.size())) != 0 )
-                            return res;
-                    }
-
-                    processedSize(mimeBuffer.size());
-                    mimeBuffer.resize(0);
-                    foundMimetype = true;
-                }
-            }
-            else {
-                if (fd == -1)
-                    data(buff);
-                else
-                {
-                    if ( (res.code= writeToFile(fd, buff.data(), buff.size())) != 0 )
-                        return res;
-                }
-                processedSize(offset);
-            }
-        }
+  unsigned flag() override {return SSH_AUTH_METHOD_INTERACTIVE;};
+  int authenticate(sftpProtocol *ioslave) const override {
+    return ioslave->authenticateKeyboardInteractive(mNoPaswordQuery);
+  }
+  SSHAuthMethod* clone() override {return new KeyboardInteractiveAuth(mNoPaswordQuery); }
 
-        /*
-          Check if slave was killed.  According to slavebase.h we need to leave
-          the slave methods as soon as possible if the slave is killed. This
-          allows the slave to be cleaned up properly.
-        */
-        if( wasKilled() ) {
-            res.text = i18n("An internal error occurred. Please retry the request again.");
-            res.code = ERR_UNKNOWN;
-            return res;
-        }
-    }
+private:
+  const bool mNoPaswordQuery;
+};
 
-    if( code != SSH2_FX_EOF ) {
-        res.text = src.prettyURL();
-        res.code = ERR_COULD_NOT_READ; // return here or still send empty array to indicate end of read?
-    }
+class PasswordAuth: public SSHAuthMethod {
+public:
+  PasswordAuth(bool noPaswordQuery = false): mNoPaswordQuery(noPaswordQuery) {}
 
-    res.size = offset;
-    sftpClose(handle);
-    processedSize (offset);
-    return res;
+  unsigned flag() override {return SSH_AUTH_METHOD_PASSWORD;};
+  int authenticate(sftpProtocol *ioslave) const override {
+    return ioslave->authenticatePassword(mNoPaswordQuery);
+  }
+  SSHAuthMethod* clone() override {return new PasswordAuth(mNoPaswordQuery); }
+
+private:
+  const bool mNoPaswordQuery;
+};
+
+TQString SSHAuthMethod::flagToStr (unsigned m) {
+  switch (m) {
+    case SSH_AUTH_METHOD_NONE        : return TQString::fromLatin1 ( "none" );
+    case SSH_AUTH_METHOD_PASSWORD    : return TQString::fromLatin1 ( "password" );
+    case SSH_AUTH_METHOD_PUBLICKEY   : return TQString::fromLatin1 ( "publickey" );
+    case SSH_AUTH_METHOD_HOSTBASED   : return TQString::fromLatin1 ( "hostbased" );
+    case SSH_AUTH_METHOD_INTERACTIVE : return TQString::fromLatin1 ( "keyboard-interactive" );
+    case SSH_AUTH_METHOD_GSSAPI_MIC  : return TQString::fromLatin1 ( "gssapi-with-mic" );
+    default                          : return TQString::fromLatin1 ( "unknown" );
+  }
 }
 
-void sftpProtocol::get(const KURL& url) {
-    kdDebug(TDEIO_SFTP_DB) << "get(): " << url << endl ;
-
-    openConnection();
-    if( !mConnected )
-        return;
+TQStringList SSHAuthMethod::bitsetToStr (unsigned m) {
+  TQStringList rv;
 
-    // Get resume offset
-    TQ_UINT64 offset = config()->readUnsignedLongNumEntry("resume");
-    if( offset > 0 ) {
-        canResume();
-        kdDebug(TDEIO_SFTP_DB) << "get(): canResume(), offset = " << offset << endl;
+  for (int i=0; m>>i; i++) {
+    unsigned flag = m & (1 << i);
+    if (flag) {
+      rv.append(flagToStr(flag));
     }
-
-    Status info = sftpGet(url, offset);
-
-    if (info.code != 0)
-    {
-      error(info.code, info.text);
-      return;
-    }
-
-    data(TQByteArray());
-    kdDebug(TDEIO_SFTP_DB) << "get(): emit finished()" << endl;
-    finished();
+  }
+  return rv;
 }
 
 
-void sftpProtocol::setHost (const TQString& h, int port, const TQString& user, const TQString& pass)
+// Public key authentication
+int sftpProtocol::auth_callback(const char *prompt, char *buf, size_t len,
+                                int echo, int verify, void *userdata)
 {
-    kdDebug(TDEIO_SFTP_DB) << "setHost(): " << user << "@" << h << ":" << port << endl;
+  // unused variables
+  (void) echo;
+  (void) verify;
+  (void) userdata;
+  (void) prompt;
 
-    if( mHost != h || mPort != port || user != mUsername || mPassword != pass )
-        closeConnection();
+  Q_ASSERT(len>0);
 
-    mHost = h;
+  kdDebug(TDEIO_SFTP_DB) << "Entering public key authentication callback" << endl;
 
-    if( port > 0 )
-        mPort = port;
-    else {
-        mPort = -1;
-    }
+  int rc=0;
+  bool firstTimeCalled = !mPubKeyAuthData.wasCalled;
+  mPubKeyAuthData.wasCalled = true;
 
-    mUsername = user;
-    mPassword = pass;
+  AuthInfo pubKeyInfo = authInfo();
 
-    if (user.isEmpty())
-    {
-      KUser u;
-      mUsername = u.loginName();
-    }
-}
+  pubKeyInfo.keepPassword = false; // don't save passwords for public key,
+                                   // that's the task of ssh-agent.
+  pubKeyInfo.readOnly     = true;  // We don't want to handle user name change when authing with a key
 
+  TQString errMsg;
+  TQString keyFile;
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 10, 0)
+  // no way to determine keyfile name on older libssh
+#else
+  char *ssh_key_file = 0;
+  rc = ssh_userauth_publickey_auto_get_current_identity(mSession, &ssh_key_file);
 
-void sftpProtocol::openConnection() {
-
-    if(mConnected)
-      return;
+  if (rc == 0 && ssh_key_file && ssh_key_file[0]) {
+    keyFile = ssh_key_file;
+  }
+  ssh_string_free_char(ssh_key_file);
+#endif
 
-    kdDebug(TDEIO_SFTP_DB) << "openConnection(): " << mUsername << "@"
-                         << mHost << ":" << mPort << endl;
+  bool firstTry = !mPubKeyAuthData.attemptedKeys.contains(keyFile);
 
-    infoMessage( i18n("Opening SFTP connection to host <b>%1:%2</b>").arg(mHost).arg(mPort));
+  if (firstTry) {
+    SlaveBase::s_seqNr = mPubKeyAuthData.current_seqNr;
+  } else {
+    errMsg = i18n("Incorrect or invalid passphrase.").append('\n');
+  }
 
-    if( mHost.isEmpty() ) {
-        kdDebug(TDEIO_SFTP_DB) << "openConnection(): Need hostname..." << endl;
-        error(ERR_UNKNOWN_HOST, i18n("No hostname specified"));
-        return;
-    }
+  // libssh prompt is trash and we know we use this function only for publickey auth, so we'll give
+  // the user a descent prompt
+  if (!keyFile.isEmpty()) {
+      pubKeyInfo.prompt = i18n("Please enter the passphrase for next public key:\n%1").arg(keyFile);
+  } else { // Generally shouldn't happend but on older libssh
+      pubKeyInfo.prompt = i18n("Please enter the passphrase for your public key.");
+  }
 
-    ////////////////////////////////////////////////////////////////////////////
-    // Setup AuthInfo for use with password caching and the
-    // password dialog box.
-    AuthInfo info;
-    info.url.setProtocol("sftp");
-    info.url.setHost(mHost);
-    info.url.setPort(mPort);
-    info.url.setUser(mUsername);
-    info.caption = i18n("SFTP Login");
-    info.comment = "sftp://" + mHost + ":" + TQString::number(mPort);
-    info.commentLabel = i18n("site:");
-    info.username = mUsername;
-    info.keepPassword = true;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Check for cached authentication info if a username AND password were
-    // not specified in setHost().
-    if( mUsername.isEmpty() && mPassword.isEmpty() ) {
-        kdDebug(TDEIO_SFTP_DB) << "openConnection(): checking cache "
-                             << "info.username = " << info.username
-                             << ", info.url = " << info.url.prettyURL() << endl;
-
-        if( checkCachedAuthentication(info) ) {
-            mUsername = info.username;
-            mPassword = info.password;
-        }
-    }
+  // We don't want to clobber with normal passwords in kpasswdserver's cache
+  pubKeyInfo.realmValue = "keyfile passphrase:" + keyFile;
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Now setup our ssh options. If we found a cached username
-    // and password we set the SSH_PASSWORD and SSH_USERNAME
-    // options right away.  Otherwise we wait. The other options are
-    // necessary for running sftp over ssh.
-    KSshProcess::SshOpt opt;   // a ssh option, this can be reused
-    KSshProcess::SshOptList opts; // list of SshOpts
-    KSshProcess::SshOptListIterator passwdIt; // points to the opt in opts that specifies the password
-    KSshProcess::SshOptListIterator usernameIt;
-
-//    opt.opt = KSshProcess::SSH_VERBOSE;
-//    opts.append(opt);
-//    opts.append(opt);
-
-    if( mPort != -1 ) {
-        opt.opt = KSshProcess::SSH_PORT;
-        opt.num = mPort;
-        opts.append(opt);
+  if (openPassDlg(pubKeyInfo, errMsg)) {
+    if (len < pubKeyInfo.password.utf8().length()+1) {
+      kdDebug(TDEIO_SFTP_DB) << "Insufficient buffer size for password: " << len
+        << " (" << pubKeyInfo.password.utf8().length()+1 << "needed)" << endl;
     }
 
-    opt.opt = KSshProcess::SSH_SUBSYSTEM;
-    opt.str = "sftp";
-    opts.append(opt);
-
-    opt.opt = KSshProcess::SSH_FORWARDX11;
-    opt.boolean = false;
-    opts.append(opt);
+    strncpy(buf, pubKeyInfo.password.utf8().data(), len-1);
+    buf[len-1]=0; // Just to be on the safe side
 
-    opt.opt = KSshProcess::SSH_FORWARDAGENT;
-    opt.boolean = false;
-    opts.append(opt);
+    purgeString(pubKeyInfo.password);
 
-    opt.opt = KSshProcess::SSH_PROTOCOL;
-    opt.num = 2;
-    opts.append(opt);
-
-    opt.opt = KSshProcess::SSH_HOST;
-    opt.str = mHost;
-    opts.append(opt);
-
-    opt.opt = KSshProcess::SSH_ESCAPE_CHAR;
-    opt.num = -1; // don't use any escape character
-    opts.append(opt);
-
-    // set the username and password if we have them
-    if( !mUsername.isEmpty()  ) {
-        opt.opt = KSshProcess::SSH_USERNAME;
-        opt.str = mUsername;
-        usernameIt = opts.append(opt);
+    // take a note that we already tried unlocking this keyfile
+    if(firstTry) {
+      mPubKeyAuthData.attemptedKeys.append(keyFile);
     }
 
-    if( !mPassword.isEmpty() ) {
-        opt.opt = KSshProcess::SSH_PASSWD;
-        opt.str = mPassword;
-        passwdIt = opts.append(opt);
+    // we consider publickey auth canceled only if we cancel all the key dialogs
+    mPubKeyAuthData.wasCanceled = false;
+  } else {
+    kdDebug(TDEIO_SFTP_DB) << "User canceled entry of public key passphrase" << endl;
+    rc = -1;
+    if (firstTimeCalled) {
+      mPubKeyAuthData.wasCanceled = true;
     }
+  }
 
-    ssh.setOptions(opts);
-    ssh.printArgs();
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Start the ssh connection process.
-    //
-
-    int err;           // error code from KSshProcess
-    TQString msg;       // msg for dialog box
-    TQString caption;   // dialog box caption
-    bool firstTime = true;
-    bool dlgResult;
-
-    while( !(mConnected = ssh.connect()) ) {
-        err = ssh.error();
-        kdDebug(TDEIO_SFTP_DB) << "openConnection(): "
-            "Got " << err << " from KSshProcess::connect()" << endl;
-
-        switch(err) {
-        case KSshProcess::ERR_NEED_PASSWD:
-        case KSshProcess::ERR_NEED_PASSPHRASE:
-            // At this point we know that either we didn't set
-            // an username or password in the ssh options list,
-            // or what we did pass did not work. Therefore we
-            // must prompt the user.
-            if( err == KSshProcess::ERR_NEED_PASSPHRASE )
-                info.prompt = i18n("Please enter your username and key passphrase.");
-            else
-                info.prompt = i18n("Please enter your username and password.");
-
-            kdDebug(TDEIO_SFTP_DB) << "openConnection(): info.username = " << info.username
-                                 << ", info.url = " << info.url.prettyURL() << endl;
-
-            if( firstTime )
-                dlgResult = openPassDlg(info);
-            else
-                dlgResult = openPassDlg(info, i18n("Incorrect username or password"));
-
-            if( dlgResult ) {
-               if( info.username.isEmpty() || info.password.isEmpty() ) {
-                    error(ERR_COULD_NOT_AUTHENTICATE,
-                      i18n("Please enter a username and password"));
-                    continue;
-                }
-            }
-            else {
-                // user canceled or dialog failed to open
-                error(ERR_USER_CANCELED, TQString::null);
-                kdDebug(TDEIO_SFTP_DB) << "openConnection(): user canceled, dlgResult = " << dlgResult << endl;
-                closeConnection();
-                return;
-            }
-
-            firstTime = false;
-
-            // Check if the username has changed. SSH only accepts
-            // the username at startup. If the username has changed
-            // we must disconnect ssh, change the SSH_USERNAME
-            // option, and reset the option list. We will also set
-            // the password option so the user is not prompted for
-            // it again.
-            if( mUsername != info.username ) {
-                kdDebug(TDEIO_SFTP_DB) << "openConnection(): Username changed from "
-                                     << mUsername << " to " << info.username << endl;
-
-                ssh.disconnect();
-
-                // if we haven't yet added the username
-                // or password option to the ssh options list then
-                // the iterators will be equal to the empty iterator.
-                // Create the opts now and add them to the opt list.
-                if( usernameIt == KSshProcess::SshOptListIterator() ) {
-                    kdDebug(TDEIO_SFTP_DB) << "openConnection(): "
-                        "Adding username to options list" << endl;
-                    opt.opt = KSshProcess::SSH_USERNAME;
-                    usernameIt = opts.append(opt);
-                }
-
-                if( passwdIt == KSshProcess::SshOptListIterator() ) {
-                    kdDebug(TDEIO_SFTP_DB) << "openConnection(): "
-                        "Adding password to options list" << endl;
-                    opt.opt = KSshProcess::SSH_PASSWD;
-                    passwdIt = opts.append(opt);
-                }
-
-                (*usernameIt).str = info.username;
-                (*passwdIt).str = info.password;
-                ssh.setOptions(opts);
-                ssh.printArgs();
-            }
-            else { // just set the password
-                ssh.setPassword(info.password);
-            }
+  return rc;
+}
 
-            mUsername = info.username;
-            mPassword = info.password;
+void sftpProtocol::log_callback(ssh_session session, int priority,
+    const char *message, void *userdata) {
+  (void) session;
+  (void) userdata;
 
-            break;
+  kdDebug(TDEIO_SFTP_DB) << "[" << priority << "] " << message << endl;
+}
 
-        case KSshProcess::ERR_NEW_HOST_KEY:
-            caption = i18n("Warning: Cannot verify host's identity.");
-            msg = ssh.errorMsg();
-            if( KMessageBox::Yes != messageBox(WarningYesNo, msg, caption) ) {
-                closeConnection();
-                error(ERR_USER_CANCELED, TQString::null);
-                return;
-            }
-            ssh.acceptHostKey(true);
-            break;
-
-        case KSshProcess::ERR_DIFF_HOST_KEY:
-            caption = i18n("Warning: Host's identity changed.");
-            msg = ssh.errorMsg();
-            if( KMessageBox::Yes != messageBox(WarningYesNo, msg, caption) ) {
-                closeConnection();
-                error(ERR_USER_CANCELED, TQString::null);
-                return;
-            }
-            ssh.acceptHostKey(true);
-            break;
-
-        case KSshProcess::ERR_AUTH_FAILED:
-            infoMessage(i18n("Authentication failed."));
-            error(ERR_COULD_NOT_LOGIN, i18n("Authentication failed."));
-            return;
-
-        case KSshProcess::ERR_AUTH_FAILED_NEW_KEY:
-            msg = ssh.errorMsg();
-            error(ERR_COULD_NOT_LOGIN, msg);
-            return;
-
-        case KSshProcess::ERR_AUTH_FAILED_DIFF_KEY:
-            msg = ssh.errorMsg();
-            error(ERR_COULD_NOT_LOGIN, msg);
-            return;
-
-        case KSshProcess::ERR_CLOSED_BY_REMOTE_HOST:
-            infoMessage(i18n("Connection failed."));
-            caption = i18n("Connection closed by remote host.");
-            msg = ssh.errorMsg();
-            messageBox(Information, msg, caption);
-            closeConnection();
-            error(ERR_COULD_NOT_LOGIN, msg);
-            return;
-
-        case KSshProcess::ERR_INTERACT:
-        case KSshProcess::ERR_INTERNAL:
-        case KSshProcess::ERR_UNKNOWN:
-        case KSshProcess::ERR_INVALID_STATE:
-        case KSshProcess::ERR_CANNOT_LAUNCH:
-        case KSshProcess::ERR_HOST_KEY_REJECTED:
-        default:
-            infoMessage(i18n("Connection failed."));
-            caption = i18n("Unexpected SFTP error: %1").arg(err);
-            msg = ssh.errorMsg();
-            messageBox(Information, msg, caption);
-            closeConnection();
-            error(ERR_UNKNOWN, msg);
-            return;
-        }
+int sftpProtocol::authenticatePublicKey(){
+  kdDebug(TDEIO_SFTP_DB) << "Trying to authenticate with public key" << endl;
+
+  // First let's do some cleanup
+  mPubKeyAuthData.attemptedKeys.clear();
+  mPubKeyAuthData.current_seqNr = SlaveBase::s_seqNr;
+  mPubKeyAuthData.wasCalled = 0;
+  mPubKeyAuthData.wasCanceled = 0;
+
+  int rc;
+
+  while (1) {
+    mPubKeyAuthData.wasCalled = 0;
+    rc = ssh_userauth_publickey_auto(mSession, nullptr, nullptr);
+
+    kdDebug(TDEIO_SFTP_DB) << "ssh_userauth_publickey_auto returned rc=" << rc
+      << " ssh_err=" << ssh_get_error_code(mSession)
+      << " (" <<  ssh_get_error(mSession) << ")" << endl;
+    if (rc == SSH_AUTH_DENIED) {
+      if (!mPubKeyAuthData.wasCalled) {
+        kdDebug(TDEIO_SFTP_DB) << "Passkey auth denied because it has no matching key" << endl;
+        break; /* rc == SSH_AUTH_DENIED */
+      } else if (mPubKeyAuthData.wasCanceled) {
+        kdDebug(TDEIO_SFTP_DB) << "Passkey auth denied because user canceled" << endl;
+        rc = sftpProtocol::SSH_AUTH_CANCELED;
+        break;
+      } else {
+        kdDebug(TDEIO_SFTP_DB) << "User entered wrong passphrase for the key" << endl;
+        mPubKeyAuthData.current_seqNr = SlaveBase::s_seqNr;
+        // Try it again
+      }
+    } else {
+      // every other rc is either error or success
+      break;
     }
+  }
 
-    // catch all in case we did something wrong above
-    if( !mConnected ) {
-        error(ERR_INTERNAL, TQString::null);
-        return;
-    }
+  return rc;
+}
 
-    // Now send init packet.
-    kdDebug(TDEIO_SFTP_DB) << "openConnection(): Sending SSH2_FXP_INIT packet." << endl;
-    TQByteArray p;
-    TQDataStream packet(p, IO_WriteOnly);
-    packet << (TQ_UINT32)5;                     // packet length
-    packet << (TQ_UINT8) SSH2_FXP_INIT;         // packet type
-    packet << (TQ_UINT32)SSH2_FILEXFER_VERSION; // client version
-
-    putPacket(p);
-    getPacket(p);
-
-    TQDataStream s(p, IO_ReadOnly);
-    TQ_UINT32 version;
-    TQ_UINT8  type;
-    s >> type;
-    kdDebug(TDEIO_SFTP_DB) << "openConnection(): Got type " << type << endl;
-
-    if( type == SSH2_FXP_VERSION ) {
-        s >> version;
-        kdDebug(TDEIO_SFTP_DB) << "openConnection(): Got server version " << version << endl;
-
-        // XXX Get extensions here
-        sftpVersion = version;
-
-        /* Server should return lowest common version supported by
-         * client and server, but double check just in case.
-         */
-        if( sftpVersion > SSH2_FILEXFER_VERSION ) {
-            error(ERR_UNSUPPORTED_PROTOCOL,
-                i18n("SFTP version %1").arg(version));
-            closeConnection();
-            return;
-        }
-    }
-    else {
-        error(ERR_UNKNOWN, i18n("Protocol error."));
-        closeConnection();
-        return;
-    }
+int sftpProtocol::authenticateKeyboardInteractive(bool noPaswordQuery) {
+  kdDebug(TDEIO_SFTP_DB) << "Entering keyboard interactive function" << endl;
 
-    // Login succeeded!
-    infoMessage(i18n("Successfully connected to %1").arg(mHost));
-    info.url.setProtocol("sftp");
-    info.url.setHost(mHost);
-    info.url.setPort(mPort);
-    info.url.setUser(mUsername);
-    info.username = mUsername;
-    info.password = mPassword;
-    kdDebug(TDEIO_SFTP_DB) << "sftpProtocol(): caching info.username = " << info.username <<
-        ", info.url = " << info.url.prettyURL() << endl;
-    cacheAuthentication(info);
-    mConnected = true;
-    connected();
+  int rc = SSH_AUTH_ERROR;
 
-    mPassword.fill('x');
-    info.password.fill('x');
+  bool retryDenied = false; // a flag to avoid infinite looping
 
-    return;
-}
+  TQString cachablePassword;
+  PasswordPurger cachePurger(cachablePassword);
 
-void sftpProtocol::closeConnection() {
-    kdDebug(TDEIO_SFTP_DB) << "closeConnection()" << endl;
-    ssh.disconnect();
-    mConnected = false;
-}
+  // Different prompts during a single pass should be queried with the same s_seqNr value
+  long current_seqNr = SlaveBase::s_seqNr;
 
-void sftpProtocol::sftpCopyPut(const KURL& src, const KURL& dest, int permissions, bool overwrite) {
+  while (1) {
+    int n = 0;
+    int i = 0;
 
-    KDE_struct_stat buff;
-    TQCString file (TQFile::encodeName(src.path()));
+    rc = ssh_userauth_kbdint(mSession, NULL, NULL);
 
-    if (KDE_lstat(file.data(), &buff) == -1) {
-        error (ERR_DOES_NOT_EXIST, src.prettyURL());
-        return;
+    if (rc == SSH_AUTH_DENIED) { // do nothing
+      kdDebug(TDEIO_SFTP_DB) << "kb-interactive auth was denied; retrying again" << endl;
+      if (retryDenied) {
+        // If we were denied update the s_seqNr
+        current_seqNr = SlaveBase::s_seqNr;
+        continue;
+      } else {
+        break;
+      }
+    } else if (rc != SSH_AUTH_INFO) {
+      kdDebug(TDEIO_SFTP_DB) << "Finishing kb-interactive auth rc=" << rc
+        << " ssh_err=" << ssh_get_error_code(mSession)
+        << " (" <<  ssh_get_error(mSession) << ")" << endl;
+      break;
     }
 
-    if (S_ISDIR (buff.st_mode)) {
-        error (ERR_IS_DIRECTORY, src.prettyURL());
-        return;
-    }
+    // See "RFC4256 Section 3.3 User Interface" for meaning of the values
+    TQString name, instruction, prompt;
+    name = TQString::fromUtf8(ssh_userauth_kbdint_getname(mSession));
+    instruction = TQString::fromUtf8(ssh_userauth_kbdint_getinstruction(mSession));
+    n = ssh_userauth_kbdint_getnprompts(mSession);
 
-    int fd = KDE_open (file.data(), O_RDONLY);
-    if (fd == -1) {
-        error (ERR_CANNOT_OPEN_FOR_READING, src.prettyURL());
-        return;
+    if (n>0) {
+      // If there is at least one prompt we will want to retry auth if we fail
+      retryDenied = true;
     }
 
-    totalSize (buff.st_size);
-
-    sftpPut (dest, permissions, false, overwrite, fd);
-
-    // Close the file descriptor...
-    ::close( fd );
-}
-
-void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool overwrite, int fd ) {
+    kdDebug(TDEIO_SFTP_DB) << "name=" << name << " instruction=" << instruction
+      << " prompts:" << n << endl;
 
-    openConnection();
-    if( !mConnected )
-        return;
+    for (i = 0; i < n; ++i) {
+      char echo;
+      bool isPassword=false;
+      TQString answer;
+      TQString errMsg;
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpPut(): " << dest
-                         << ", resume=" << resume
-                         << ", overwrite=" << overwrite << endl;
+      // restore the s_seqNr so it would be the same for all the prompts
+      SlaveBase::s_seqNr = current_seqNr;
 
-    KURL origUrl( dest );
-    sftpFileAttr origAttr(remoteEncoding());
-    bool origExists = false;
+      prompt = TQString::fromUtf8(ssh_userauth_kbdint_getprompt(mSession, i, &echo));
+      kdDebug(TDEIO_SFTP_DB) << "prompt=" << prompt << " echo=" << TQString::number(echo) << endl;
 
-    // Stat original (without part ext)  to see if it already exists
-    int code = sftpStat(origUrl, origAttr);
+      TDEIO::AuthInfo infoKbdInt = authInfo();
+      infoKbdInt.realmValue = prompt; // each prompt will be treated on its own by kpasswdserver
+      infoKbdInt.keepPassword = false;
 
-    if( code == SSH2_FX_OK ) {
-        kdDebug(TDEIO_SFTP_DB) << "sftpPut(): <file> already exists" << endl;
+      if (!name.isEmpty()) {
+        infoKbdInt.caption = TQString(i18n("SFTP Login") + " - " + name);
+      }
 
-        // Delete remote file if its size is zero
-        if( origAttr.fileSize() == 0 ) {
-            if( sftpRemove(origUrl, true) != SSH2_FX_OK ) {
-                error(ERR_CANNOT_DELETE_ORIGINAL, origUrl.prettyURL());
-                return;
+      // Those strings might or might not contain some sensitive information
+      PasswordPurger answerPurger{answer};
+      PasswordPurger infoPurger{infoKbdInt.password};
+
+      if (!echo) {
+        // ssh server requests us to ask user a question without displaying an answer. In normal
+        // circumstances this is probably a password, but it might be something else depending
+        // on the server configuration.
+        if (prompt.lower().startsWith("password")) {
+          // We can assume that the ssh server asks for a password and we will handle that case
+          // with more care since it's what most users will see
+          isPassword = true;
+          if (noPaswordQuery) { // if we have a cached password we might use it
+            kdDebug(TDEIO_SFTP_DB) << "Using cached password" << endl;
+            answer = mPassword;
+            cachablePassword = mPassword;
+            purgeString(mPassword); // if we used up password purge it
+          } else {
+            infoKbdInt.prompt = i18n("Please enter your password.");
+            infoKbdInt.realmValue = TQString(); // passwords use generic realm
+            infoKbdInt.keepPassword = true;
+
+            if (mPasswordWasPrompted) {
+              errMsg = i18n("Login failed: incorrect password or username.").append('\n');
             }
+            mPasswordWasPrompted = true;
+          }
+        } else {
+          // If the server's request doesn't look like a password, keep the servers prompt but
+          // don't prompt for saving the answer
+          infoKbdInt.prompt = i18n("Please enter answer for the next request:");
+          if (!instruction.isEmpty()) {
+            infoKbdInt.prompt.append("\n\n").append(instruction);
+          }
+          infoKbdInt.prompt.append("\n\n").append(prompt);
+          infoKbdInt.readOnly = true; // set username readonly (enable changing it only with password)
         }
-        else {
-            origExists = true;
-        }
-    }
-    else if( code != SSH2_FX_NO_SUCH_FILE ) {
-        processStatus(code, origUrl.prettyURL());
-        return;
-    }
-
-    // Do not waste time/resources with more remote stat calls if the file exists
-    // and we weren't instructed to overwrite it...
-    if( origExists && !overwrite ) {
-        error(ERR_FILE_ALREADY_EXIST, origUrl.prettyURL());
-        return;
-    }
-
-    // Stat file with part ext to see if it already exists...
-    KURL partUrl( origUrl );
-    partUrl.setFileName( partUrl.fileName() + ".part" );
-
-    TQ_UINT64 offset = 0;
-    bool partExists = false;
-    bool markPartial = config()->readBoolEntry("MarkPartial", true);
-
-    if( markPartial ) {
-
-        sftpFileAttr partAttr(remoteEncoding());
-        code = sftpStat(partUrl, partAttr);
 
-        if( code == SSH2_FX_OK ) {
-            kdDebug(TDEIO_SFTP_DB) << "sftpPut(): .part file already exists" << endl;
-            partExists = true;
-            offset = partAttr.fileSize();
-
-            // If for some reason, both the original and partial files exist,
-            // skip resumption just like we would if the size of the partial
-            // file is zero...
-            if( origExists || offset == 0 )
-            {
-                if( sftpRemove(partUrl, true) != SSH2_FX_OK ) {
-                    error(ERR_CANNOT_DELETE_PARTIAL, partUrl.prettyURL());
-                    return;
-                }
-
-                if( sftpRename(origUrl, partUrl) != SSH2_FX_OK ) {
-                    error(ERR_CANNOT_RENAME_ORIGINAL, origUrl.prettyURL());
-                    return;
-                }
-
-                offset = 0;
-            }
-            else if( !overwrite && !resume ) {
-                    if (fd != -1)
-                        resume = (KDE_lseek(fd, offset, SEEK_SET) != -1);
-                    else
-                        resume = canResume( offset );
-
-                    kdDebug(TDEIO_SFTP_DB) << "sftpPut(): can resume = " << resume
-                                         << ", offset = " << offset;
-
-                    if( !resume ) {
-                      error(ERR_FILE_ALREADY_EXIST, partUrl.prettyURL());
-                      return;
-                    }
-            }
-            else {
-                offset = 0;
+        if (answer.isNull()) {
+          if (openPassDlg(infoKbdInt, errMsg)) {
+            answer = infoKbdInt.password;
+            kdDebug(TDEIO_SFTP_DB) << "Got the answer from the password dialog" << endl;
+
+            if (isPassword) {
+              TQString sshUser=sshUsername();
+              if (infoKbdInt.username != sshUser) {
+                kdDebug(TDEIO_SFTP_DB) << "Username changed from " << sshUser
+                                       << " to " << infoKbdInt.username << endl;
+                mCachedUsername = infoKbdInt.username;
+                mPassword = infoKbdInt.password;
+
+                return sftpProtocol::SSH_AUTH_NEED_RECONNECT;
+              }
             }
+          } else {
+            return sftpProtocol::SSH_AUTH_CANCELED;
+          }
         }
-        else if( code == SSH2_FX_NO_SUCH_FILE ) {
-            if( origExists && sftpRename(origUrl, partUrl) != SSH2_FX_OK ) {
-              error(ERR_CANNOT_RENAME_ORIGINAL, origUrl.prettyURL());
-              return;
-            }
-        }
-        else {
-            processStatus(code, partUrl.prettyURL());
-            return;
+      } else {
+        // ssh server asks for some clear-text information from a user (e.g. a one-time
+        // identification code) which should be echoed while user enters it. As for now tdeio has
+        // no means to handle that correctly, so we will have to be creative with the password
+        // dialog.
+        TQString newPrompt;
+
+        if (!instruction.isEmpty()) {
+          newPrompt = instruction + "\n\n";
         }
-    }
+        newPrompt.append(prompt).append("\n\n");
+        newPrompt.append(i18n("Use the username input field to answer this question."));
+        infoKbdInt.prompt = newPrompt;
 
-    // Determine the url we will actually write to...
-    KURL writeUrl (markPartial ? partUrl:origUrl);
-
-    TQ_UINT32 pflags = 0;
-    if( overwrite && !resume )
-        pflags = SSH2_FXF_WRITE | SSH2_FXF_CREAT | SSH2_FXF_TRUNC;
-    else if( !overwrite && !resume )
-        pflags = SSH2_FXF_WRITE | SSH2_FXF_CREAT | SSH2_FXF_EXCL;
-    else if( overwrite && resume )
-        pflags = SSH2_FXF_WRITE | SSH2_FXF_CREAT;
-    else if( !overwrite && resume )
-        pflags = SSH2_FXF_WRITE | SSH2_FXF_CREAT | SSH2_FXF_APPEND;
-
-    sftpFileAttr attr(remoteEncoding());
-    TQByteArray handle;
-
-    // Set the permissions of the file we write to if it didn't already exist
-    // and the permission info is supplied, i.e it is not -1
-    if( !partExists && !origExists && permissions != -1)
-        attr.setPermissions(permissions);
-
-    code = sftpOpen( writeUrl, pflags, attr, handle );
-    if( code != SSH2_FX_OK ) {
-
-        // Rename the file back to its original name if a
-        // put fails due to permissions problems...
-        if( markPartial && overwrite ) {
-            (void) sftpRename(partUrl, origUrl);
-            writeUrl = origUrl;
-        }
+        infoKbdInt.url.setUser(infoKbdInt.username);
+        infoKbdInt.username = TQString::null;
 
-        if( code == SSH2_FX_FAILURE ) { // assume failure means file exists
-            error(ERR_FILE_ALREADY_EXIST, writeUrl.prettyURL());
-            return;
-        }
-        else {
-            processStatus(code, writeUrl.prettyURL());
-            return;
+        infoKbdInt.readOnly = false;
+
+        if (openPassDlg(infoKbdInt)) {
+          answer = infoKbdInt.username;
+          kdDebug(TDEIO_SFTP_DB) << "Got the answer from the password dialog: " << answer << endl;
+        } else {
+          return sftpProtocol::SSH_AUTH_CANCELED;
         }
-    }
+      }
 
-    long nbytes;
-    TQByteArray buff;
+      if (ssh_userauth_kbdint_setanswer(mSession, i, answer.utf8().data()) < 0) {
+        kdDebug(TDEIO_SFTP_DB) << "An error occurred setting the answer: "
+          << ssh_get_error(mSession) << endl;
+        return SSH_AUTH_ERROR;
+      }
+    } // for each ssh_userauth_kbdint_getprompt()
+  } // while (1)
+
+  if (!mPasswordWasPrompted && !cachablePassword.isEmpty() && (rc == SSH_AUTH_SUCCESS || rc == SSH_AUTH_PARTIAL)) {
+    // if the password was never prompted, it was never cached, so we should cache it manually
+    TDEIO::AuthInfo info = authInfo();
+    info.password = cachablePassword;
+    info.keepPassword = false;
+    cacheAuthentication(info);
+    purgeString(info.password);
+  }
 
-    do {
+  return rc;
+}
 
-        if( fd != -1 ) {
-            buff.resize( 16*1024 );
-            if ( (nbytes = ::read(fd, buff.data(), buff.size())) > -1 )
-                buff.resize( nbytes );
-        }
-        else {
-            dataReq();
-            nbytes = readData( buff );
-        }
+int sftpProtocol::authenticatePassword(bool noPaswordQuery) {
+  kdDebug(TDEIO_SFTP_DB) << "Trying to authenticate with password" << endl;
 
-        if( nbytes >= 0 ) {
-            if( (code = sftpWrite(handle, offset, buff)) != SSH2_FX_OK ) {
-                error(ERR_COULD_NOT_WRITE, dest.prettyURL());
-                return;
-            }
+  AuthInfo info = authInfo();
+  info.keepPassword = true;
+  info.prompt = i18n("Please enter your username and password.");
 
-            offset += nbytes;
-            processedSize(offset);
-
-            /* Check if slave was killed.  According to slavebase.h we
-              * need to leave the slave methods as soon as possible if
-              * the slave is killed. This allows the slave to be cleaned
-              * up properly.
-              */
-            if( wasKilled() ) {
-                sftpClose(handle);
-                closeConnection();
-                error(ERR_UNKNOWN, i18n("An internal error occurred. Please try again."));
-                return;
-            }
-        }
+  PasswordPurger pPurger(info.password);
 
-    } while( nbytes > 0 );
+  int rc;
+  do {
+    TQString errMsg;
 
-    if( nbytes < 0 ) {
-        sftpClose(handle);
+    if(noPaswordQuery) { // on the first try use cached password
+      info.password = mPassword;
+      purgeString(mPassword);
+    } else {
+      if (mPasswordWasPrompted) {
+        errMsg = i18n("Login failed: incorrect password or username.").append('\n');
+      }
 
-        if( markPartial ) {
-            // Remove remote file if it smaller than our keep size
-            uint minKeepSize = config()->readNumEntry("MinimumKeepSize", DEFAULT_MINIMUM_KEEP_SIZE);
+      mPasswordWasPrompted = true;
 
-            if( sftpStat(writeUrl, attr) == SSH2_FX_OK ) {
-                if( attr.fileSize() < minKeepSize ) {
-                    sftpRemove(writeUrl, true);
-                }
-            }
-        }
+      // Handle user canceled or dialog failed to open...
+      if (!openPassDlg(info, errMsg)) {
+        kdDebug(TDEIO_SFTP_DB) << "User canceled password dialog" << endl;
+        return sftpProtocol::SSH_AUTH_CANCELED;
+      }
 
-        error( ERR_UNKNOWN, i18n("Unknown error was encountered while copying the file "
-                                 "to '%1'. Please try again.").arg(dest.host()) );
-        return;
+      TQString sshUser=sshUsername();
+      if (info.username != sshUser) {
+        kdDebug(TDEIO_SFTP_DB) << "Username changed from " << sshUser
+                               << " to " << info.username << endl;
+        mCachedUsername = info.username;
+        mPassword = info.password;
+        // libssh doc says that most servers don't permit changing the username during
+        // authentication, so we should reinitialize the session here
+        return sftpProtocol::SSH_AUTH_NEED_RECONNECT;
+      }
     }
 
-    if( (code = sftpClose(handle)) != SSH2_FX_OK ) {
-        error(ERR_COULD_NOT_WRITE, writeUrl.prettyURL());
-        return;
-    }
+    rc = ssh_userauth_password(mSession, NULL, info.password.utf8().data());
 
-    // If wrote to a partial file, then remove the part ext
-    if( markPartial ) {
-        if( sftpRename(partUrl, origUrl) != SSH2_FX_OK ) {
-            error(ERR_CANNOT_RENAME_PARTIAL, origUrl.prettyURL());
-            return;
-        }
-    }
+  } while (rc == SSH_AUTH_DENIED && !noPaswordQuery);
 
-    finished();
+  if (!mPasswordWasPrompted && (rc == SSH_AUTH_SUCCESS || rc == SSH_AUTH_PARTIAL)) {
+    // if the password was never prompted, it was never cached, so we should cache it manually
+    info.keepPassword = false;
+    cacheAuthentication(info);
+  }
+  return rc;
 }
 
-void sftpProtocol::put ( const KURL& url, int permissions, bool overwrite, bool resume ){
-    kdDebug(TDEIO_SFTP_DB) << "put(): " << url << ", overwrite = " << overwrite
-                         << ", resume = " << resume << endl;
-
-    sftpPut( url, permissions, resume, overwrite );
-}
 
-void sftpProtocol::stat ( const KURL& url ){
-    kdDebug(TDEIO_SFTP_DB) << "stat(): " << url << endl;
+TQString sftpProtocol::sshUsername() {
+  int rc;
+  TQString rv;
 
-    openConnection();
-    if( !mConnected )
-        return;
+  char *ssh_username = NULL;
+  rc = ssh_options_get(mSession, SSH_OPTIONS_USER, &ssh_username);
+  if (rc == 0 && ssh_username && ssh_username[0]) {
+    rv = TQString::fromUtf8(ssh_username);
+  }
+  ssh_string_free_char(ssh_username);
 
-    // If the stat URL has no path, do not attempt to determine the real
-    // path and do a redirect. KRun will simply ignore such requests.
-    // Instead, simply return the mime-type as a directory...
-    if( !url.hasPath() ) {
-        UDSEntry entry;
-        UDSAtom atom;
+  return rv;
+}
 
-        atom.m_uds = TDEIO::UDS_NAME;
-        atom.m_str = TQString::null;
-        entry.append( atom );
 
-        atom.m_uds = TDEIO::UDS_FILE_TYPE;
-        atom.m_long = S_IFDIR;
-        entry.append( atom );
+TQString sftpProtocol::sshError(TQString errMsg) {
+  if (ssh_get_error_code(mSession)) {
+    errMsg.append("\n\n").append(i18n("SSH error: \"%1\" (%2)")
+      .arg(TQString::fromUtf8(ssh_get_error(mSession))).arg(ssh_get_error_code(mSession)));
+  }
+  return errMsg;
+}
 
-        atom.m_uds = TDEIO::UDS_ACCESS;
-        atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
-        entry.append( atom );
+TDEIO::AuthInfo sftpProtocol::authInfo() {
+  TDEIO::AuthInfo rv;
 
-        atom.m_uds = TDEIO::UDS_USER;
-        atom.m_str = mUsername;
-        entry.append( atom );
-        atom.m_uds = TDEIO::UDS_GROUP;
-        entry.append( atom );
+  rv.url.setProtocol("sftp");
+  rv.url.setHost(mHost);
+  rv.url.setPort(mPort);
+  rv.url.setUser(mUsername);
 
-        // no size
-        statEntry( entry );
-        finished();
-        return;
-    }
+  rv.caption = i18n("SFTP Login");
+  rv.comment = "sftp://" + mHost + ':' + TQString::number(mPort);
+  rv.commentLabel = i18n("site:");
 
-    int code;
-    sftpFileAttr attr(remoteEncoding());
-    if( (code = sftpStat(url, attr)) != SSH2_FX_OK ) {
-        processStatus(code, url.prettyURL());
-        return;
-    }
-    else {
-        //kdDebug() << "We sent and received stat packet ok" << endl;
-        attr.setFilename(url.fileName());
-        statEntry(attr.entry());
-    }
+  if(!mUsername.isEmpty()) {
+    rv.username = mUsername;
+  } if(!mCachedUsername.isEmpty()) {
+    rv.username = mCachedUsername;
+  } else if (mSession) {
+    rv.username = sshUsername();
+  }
 
-    finished();
+  // if username was specified in the address string it shouldn't be changed
+  if (!mUsername.isEmpty()) {
+    rv.readOnly = true;
+  }
 
-    kdDebug(TDEIO_SFTP_DB) << "stat: END" << endl;
-    return;
+  return rv;
 }
 
+void sftpProtocol::reportError(const KURL &url, const int err) {
+  kdDebug(TDEIO_SFTP_DB) << "url = " << url.url() << " - err=" << err << endl;
 
-void sftpProtocol::mimetype ( const KURL& url ){
-    kdDebug(TDEIO_SFTP_DB) << "mimetype(): " << url << endl;
+  switch (err) {
+    case SSH_FX_OK:
+      break;
+    case SSH_FX_NO_SUCH_FILE:
+    case SSH_FX_NO_SUCH_PATH:
+      error(TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL());
+      break;
+    case SSH_FX_PERMISSION_DENIED:
+      error(TDEIO::ERR_ACCESS_DENIED, url.prettyURL());
+      break;
+    case SSH_FX_FILE_ALREADY_EXISTS:
+      error(TDEIO::ERR_FILE_ALREADY_EXIST, url.prettyURL());
+      break;
+    case SSH_FX_INVALID_HANDLE:
+      error(TDEIO::ERR_MALFORMED_URL, url.prettyURL());
+      break;
+    case SSH_FX_OP_UNSUPPORTED:
+      error(TDEIO::ERR_UNSUPPORTED_ACTION, url.prettyURL());
+      break;
+    case SSH_FX_BAD_MESSAGE:
+      error(TDEIO::ERR_UNKNOWN, url.prettyURL());
+      break;
+    default:
+      error(TDEIO::ERR_INTERNAL, url.prettyURL());
+      break;
+  }
+}
 
-    openConnection();
-    if( !mConnected )
-        return;
+bool sftpProtocol::createUDSEntry(const TQString &filename, const TQByteArray &path,
+      UDSEntry &entry, short int details) {
+  mode_t type;
+  mode_t access;
+  char *link;
 
-    TQ_UINT32 pflags = SSH2_FXF_READ;
-    TQByteArray handle, mydata;
-    sftpFileAttr attr(remoteEncoding());
-    int code;
-    if( (code = sftpOpen(url, pflags, attr, handle)) != SSH2_FX_OK ) {
-        error(ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
-        return;
-    }
+  Q_ASSERT(entry.count() == 0);
 
-    TQ_UINT32 len = 1024; // Get first 1k for determining mimetype
-    TQ_UINT64 offset = 0;
-    code = SSH2_FX_OK;
-    while( offset < len && code == SSH2_FX_OK ) {
-        if( (code = sftpRead(handle, offset, len, mydata)) == SSH2_FX_OK ) {
-            data(mydata);
-            offset += mydata.size();
-            processedSize(offset);
+  sftp_attributes sb = sftp_lstat(mSftp, path.data());
+  if (sb == NULL) {
+    return false;
+  }
 
-            kdDebug(TDEIO_SFTP_DB) << "mimetype(): offset = " << offset << endl;
-        }
+  UDSAtom atom;
+  atom.m_uds = UDS_NAME;
+  atom.m_str = filename;
+  entry.append(atom);
+
+  if (sb->type == SSH_FILEXFER_TYPE_SYMLINK) {
+    atom.m_uds = UDS_FILE_TYPE;
+    atom.m_long = S_IFREG;
+    entry.append(atom);
+    link = sftp_readlink(mSftp, path.data());
+    if (link == NULL) {
+      sftp_attributes_free(sb);
+      return false;
+    }
+    atom.m_uds = UDS_LINK_DEST;
+    atom.m_str = TQFile::decodeName(link);
+    entry.append(atom);
+    delete link;
+    // A symlink -> follow it only if details > 1
+    if (details > 1) {
+      sftp_attributes sb2 = sftp_stat(mSftp, path.data());
+      if (sb2 == NULL) {
+        // It is a link pointing to nowhere
+        type = S_IFMT - 1;
+        access = S_IRWXU | S_IRWXG | S_IRWXO;
+        atom.m_uds = UDS_FILE_TYPE;
+        atom.m_long = type;
+        entry.append(atom);
+
+        atom.m_uds = UDS_ACCESS;
+        atom.m_long = access;
+        entry.append(atom);
+
+        atom.m_uds = UDS_SIZE;
+        atom.m_long = 0LL;
+        entry.append(atom);
+
+        goto notype;
+      }
+      sftp_attributes_free(sb);
+      sb = sb2;
     }
+  }
 
+  switch (sb->type) {
+    case SSH_FILEXFER_TYPE_REGULAR:
+      atom.m_uds = UDS_FILE_TYPE;
+      atom.m_long = S_IFREG;
+      entry.append(atom);
+      break;
+    case SSH_FILEXFER_TYPE_DIRECTORY:
+      atom.m_uds = UDS_FILE_TYPE;
+      atom.m_long = S_IFDIR;
+      entry.append(atom);
+      break;
+    case SSH_FILEXFER_TYPE_SYMLINK:
+      atom.m_uds = UDS_FILE_TYPE;
+      atom.m_long = S_IFLNK;
+      entry.append(atom);
+      break;
+    case SSH_FILEXFER_TYPE_SPECIAL:
+    case SSH_FILEXFER_TYPE_UNKNOWN:
+      atom.m_uds = UDS_FILE_TYPE;
+      atom.m_long = S_IFMT - 1;
+      entry.append(atom);
+      break;
+  }
 
-    data(TQByteArray());
-    processedSize(offset);
-    sftpClose(handle);
-    finished();
-    kdDebug(TDEIO_SFTP_DB) << "mimetype(): END" << endl;
-}
-
-
-void sftpProtocol::listDir(const KURL& url) {
-    kdDebug(TDEIO_SFTP_DB) << "listDir(): " << url << endl;
+  access = sb->permissions & 07777;
+  atom.m_uds = UDS_ACCESS;
+  atom.m_long = access;
+  entry.append(atom);
+
+  atom.m_uds = UDS_SIZE;
+  atom.m_long = sb->size;
+  entry.append(atom);
+
+notype:
+  if (details > 0) {
+    if (sb->owner) {
+      atom.m_uds = UDS_USER;
+      atom.m_str = TQString::fromUtf8(sb->owner);
+      entry.append(atom);
+    } else {
+      atom.m_uds = UDS_USER;
+      atom.m_str = TQString::number(sb->uid);
+      entry.append(atom);
+    }
+
+    if (sb->group) {
+      atom.m_uds = UDS_GROUP;
+      atom.m_str = TQString::fromUtf8(sb->group);
+      entry.append(atom);
+    } else {
+      atom.m_uds = UDS_GROUP;
+      atom.m_str = TQString::number(sb->gid);
+      entry.append(atom);
+    }
+    atom.m_uds = UDS_ACCESS_TIME;
+    atom.m_long = sb->atime;
+    entry.append(atom);
+
+    atom.m_uds = UDS_MODIFICATION_TIME;
+    atom.m_long = sb->mtime;
+    entry.append(atom);
+
+    atom.m_uds = UDS_MODIFICATION_TIME;
+    atom.m_long = sb->createtime;
+    entry.append(atom);
+  }
 
-    openConnection();
-    if( !mConnected )
-        return;
+  sftp_attributes_free(sb);
 
-    if( !url.hasPath() ) {
-        KURL newUrl ( url );
-        if( sftpRealPath(url, newUrl) == SSH2_FX_OK ) {
-            kdDebug(TDEIO_SFTP_DB) << "listDir: Redirecting to " << newUrl << endl;
-            redirection(newUrl);
-            finished();
-            return;
-        }
-    }
+  return true;
+}
 
-    int code;
-    TQByteArray handle;
+TQString sftpProtocol::canonicalizePath(const TQString &path) {
+  kdDebug(TDEIO_SFTP_DB) << "Path to canonicalize: " << path << endl;
+  TQString cPath;
+  char *sPath = NULL;
 
-    if( (code = sftpOpenDirectory(url, handle)) != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "listDir(): open directory failed" << endl;
-        processStatus(code, url.prettyURL());
-        return;
-    }
+  if (path.isEmpty()) {
+    return cPath;
+  }
 
+  sPath = sftp_canonicalize_path(mSftp, path.utf8().data());
+  if (sPath == NULL) {
+    kdDebug(TDEIO_SFTP_DB) << "Could not canonicalize path: " << path << endl;
+    return cPath;
+  }
 
-    code = SSH2_FX_OK;
-    while( code == SSH2_FX_OK ) {
-        code = sftpReadDir(handle, url);
-        if( code != SSH2_FX_OK && code != SSH2_FX_EOF )
-            processStatus(code, url.prettyURL());
-        kdDebug(TDEIO_SFTP_DB) << "listDir(): return code = " << code << endl;
-    }
+  cPath = TQFile::decodeName(sPath);
+  delete sPath;
 
-    if( (code = sftpClose(handle)) != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "listdir(): closing of directory failed" << endl;
-        processStatus(code, url.prettyURL());
-        return;
-    }
+  kdDebug(TDEIO_SFTP_DB) << "Canonicalized path: " << cPath << endl;
 
-    finished();
-    kdDebug(TDEIO_SFTP_DB) << "listDir(): END" << endl;
+  return cPath;
 }
 
-/** Make a directory.
-    OpenSSH does not follow the internet draft for sftp in this case.
-    The format of the mkdir request expected by OpenSSH sftp server is:
-        uint32 id
-        string path
-        ATTR   attr
- */
-void sftpProtocol::mkdir(const KURL&url, int permissions){
+sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket)
+             : SlaveBase("tdeio_sftp", pool_socket, app_socket),
+                  mConnected(false), mPort(-1), mSession(NULL), mSftp(NULL) {
+#ifndef TQ_WS_WIN
+  kdDebug(TDEIO_SFTP_DB) << "pid = " << getpid() << endl;
 
-    kdDebug(TDEIO_SFTP_DB) << "mkdir() creating dir: " << url.path() << endl;
+  kdDebug(TDEIO_SFTP_DB) << "debug = " << getenv("TDEIO_SFTP_LOG_VERBOSITY") << endl;
+#endif
 
-    openConnection();
-    if( !mConnected )
-        return;
+  mCallbacks = (ssh_callbacks) malloc(sizeof(struct ssh_callbacks_struct));
+  if (mCallbacks == NULL) {
+    error(TDEIO::ERR_OUT_OF_MEMORY, i18n("Could not allocate callbacks"));
+    return;
+  }
+  ZERO_STRUCTP(mCallbacks);
 
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
+  mCallbacks->userdata = this;
+  mCallbacks->auth_function = ::auth_callback;
+  if (getenv("TDEIO_SFTP_LOG_VERBOSITY")) {
+    mCallbacks->log_function = ::log_callback;
+  }
 
-    sftpFileAttr attr(remoteEncoding());
+  ssh_callbacks_init(mCallbacks);
+}
 
-    if (permissions != -1)
-      attr.setPermissions(permissions);
+sftpProtocol::~sftpProtocol() {
+#ifndef TQ_WS_WIN
+  kdDebug(TDEIO_SFTP_DB) << "pid = " << getpid() << endl;
+#endif
+  closeConnection();
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+  free(mCallbacks);
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << TQ_UINT32(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + attr.size());
-    s << (TQ_UINT8)SSH2_FXP_MKDIR;
-    s << id;
-    s.writeBytes(path.data(), len);
-    s << attr;
+  /* cleanup and shut down cryto stuff */
+  ssh_finalize();
 
-    kdDebug(TDEIO_SFTP_DB) << "mkdir(): packet size is " << p.size() << endl;
+  purgeString(mPassword);
+}
 
-    putPacket(p);
-    getPacket(p);
+void sftpProtocol::setHost(const TQString& h, int port, const TQString& user, const TQString& pass) {
+  kdDebug(TDEIO_SFTP_DB) << "setHost(): " << user << "@" << h << ":" << port << endl;
 
-    TQ_UINT8 type;
-    TQDataStream r(p, IO_ReadOnly);
+  if (mConnected) {
+    closeConnection();
+  }
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "mkdir: sftp packet id mismatch" << endl;
-        error(ERR_COULD_NOT_MKDIR, path);
-        finished();
-        return;
-    }
+  mHost = h;
 
-    if( type != SSH2_FXP_STATUS ) {
-        kdError(TDEIO_SFTP_DB) << "mkdir(): unexpected packet type of " << type << endl;
-        error(ERR_COULD_NOT_MKDIR, path);
-        finished();
-        return;
+  if (port > 0) {
+    mPort = port;
+  } else {
+    struct servent *pse;
+    if ((pse = getservbyname("ssh", "tcp") ) == NULL) {
+      mPort = 22;
+    } else {
+      mPort = ntohs(pse->s_port);
     }
+  }
 
-    int code;
-    r >> code;
-    if( code != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "mkdir(): failed with code " << code << endl;
-
-        // Check if mkdir failed because the directory already exists so that
-        // we can return the appropriate message...
-        sftpFileAttr dirAttr(remoteEncoding());
-        if ( sftpStat(url, dirAttr) == SSH2_FX_OK )
-        {
-          error( ERR_DIR_ALREADY_EXIST, url.prettyURL() );
-          return;
-        }
-
-        error(ERR_COULD_NOT_MKDIR, path);
-    }
+  kdDebug(TDEIO_SFTP_DB) << "setHost(): mPort=" << mPort << endl;
 
-    finished();
+  mUsername = user;
+  mPassword = pass;
+  mCachedUsername = TQString::null;
 }
 
-void sftpProtocol::rename(const KURL& src, const KURL& dest, bool overwrite){
-    kdDebug(TDEIO_SFTP_DB) << "rename(" << src << " -> " << dest << ")" << endl;
-
-    if (!isSupportedOperation(SSH2_FXP_RENAME)) {
-      error(ERR_UNSUPPORTED_ACTION,
-          i18n("The remote host does not support renaming files."));
-      return;
-    }
 
-    openConnection();
-    if( !mConnected )
-        return;
+int sftpProtocol::initializeConnection() {
+  unsigned char *hash = NULL; // the server hash
+  char *hexa;
+  char *verbosity;
+  int rc, state;
+  int timeout_sec = 30, timeout_usec = 0;
 
-    // Always stat the destination before attempting to rename
-    // a file or a directory...
-    sftpFileAttr attr(remoteEncoding());
-    int code = sftpStat(dest, attr);
+  mSession = ssh_new();
+  if (mSession == NULL) {
+    error(TDEIO::ERR_INTERNAL, i18n("Could not create a new SSH session."));
+    return SSH_ERROR;
+  }
 
-    // If the destination directory, exists tell it to the job
-    // so it the proper action can be presented to the user...
-    if( code == SSH2_FX_OK )
-    {
-      if (!overwrite)
-      {
-        if ( S_ISDIR(attr.permissions()) )
-          error( TDEIO::ERR_DIR_ALREADY_EXIST, dest.url() );
-        else
-          error( TDEIO::ERR_FILE_ALREADY_EXIST, dest.url() );
-        return;
-        }
+  kdDebug(TDEIO_SFTP_DB) << "Creating the SSH session and setting options" << endl;
 
-      // If overwrite is specified, then simply remove the existing file/dir first...
-      if( (code = sftpRemove( dest, !S_ISDIR(attr.permissions()) )) != SSH2_FX_OK )
-      {
-        processStatus(code);
-            return;
-        }
-    }
+  // Set timeout
+  rc = ssh_options_set(mSession, SSH_OPTIONS_TIMEOUT, &timeout_sec);
+  if (rc < 0) {
+    kdDebug(TDEIO_SFTP_DB) << "Could not set a timeout.";
+  }
+  rc = ssh_options_set(mSession, SSH_OPTIONS_TIMEOUT_USEC, &timeout_usec);
+  if (rc < 0) {
+    kdDebug(TDEIO_SFTP_DB) << "Could not set a timeout in usec.";
+  }
 
-    // Do the renaming...
-    if( (code = sftpRename(src, dest)) != SSH2_FX_OK ) {
-        processStatus(code);
-        return;
-    }
+  // Don't use any compression
+  rc = ssh_options_set(mSession, SSH_OPTIONS_COMPRESSION_C_S, "none");
+  if (rc < 0) {
+    kdDebug(TDEIO_SFTP_DB) << "Could not set compression client <- server.";
+  }
 
-    finished();
-    kdDebug(TDEIO_SFTP_DB) << "rename(): END" << endl;
-}
+  rc = ssh_options_set(mSession, SSH_OPTIONS_COMPRESSION_S_C, "none");
+  if (rc < 0) {
+    kdDebug(TDEIO_SFTP_DB) << "Could not set compression server -> client.";
+  }
 
-void sftpProtocol::symlink(const TQString& target, const KURL& dest, bool overwrite){
-    kdDebug(TDEIO_SFTP_DB) << "symlink()" << endl;
+  // Set host and port
+  rc = ssh_options_set(mSession, SSH_OPTIONS_HOST, mHost.utf8().data());
+  if (rc < 0) {
+    error(TDEIO::ERR_OUT_OF_MEMORY, i18n("Could not set host."));
+    return SSH_ERROR;
+  }
 
-    if (!isSupportedOperation(SSH2_FXP_SYMLINK)) {
-      error(ERR_UNSUPPORTED_ACTION,
-          i18n("The remote host does not support creating symbolic links."));
-      return;
+  if (mPort > 0) {
+    rc = ssh_options_set(mSession, SSH_OPTIONS_PORT, &mPort);
+    if (rc < 0) {
+      error(TDEIO::ERR_OUT_OF_MEMORY, i18n("Could not set port."));
+      return SSH_ERROR;
     }
+  }
 
-    openConnection();
-    if( !mConnected )
-        return;
-
-    int code;
-    bool failed = false;
-    if( (code = sftpSymLink(target, dest)) != SSH2_FX_OK ) {
-        if( overwrite ) { // try to delete the destination
-            sftpFileAttr attr(remoteEncoding());
-            if( (code = sftpStat(dest, attr)) != SSH2_FX_OK ) {
-                failed = true;
-            }
-            else {
-                if( (code = sftpRemove(dest, !S_ISDIR(attr.permissions())) ) != SSH2_FX_OK ) {
-                    failed = true;
-                }
-                else {
-                    // XXX what if rename fails again? We have lost the file.
-                    // Maybe rename dest to a temporary name first? If rename is
-                    // successful, then delete?
-                    if( (code = sftpSymLink(target, dest)) != SSH2_FX_OK )
-                        failed = true;
-                }
-            }
-        }
-        else if( code == SSH2_FX_FAILURE ) {
-            error(ERR_FILE_ALREADY_EXIST, dest.prettyURL());
-            return;
-        }
-        else
-            failed = true;
+  // Set the username
+  if (!mCachedUsername.isEmpty() || !mUsername.isEmpty()) {
+    TQString username = !mCachedUsername.isEmpty() ? mCachedUsername : mUsername;
+    rc = ssh_options_set(mSession, SSH_OPTIONS_USER, username.utf8().data());
+    if (rc < 0) {
+      error(TDEIO::ERR_OUT_OF_MEMORY, i18n("Could not set username."));
+      return rc;
     }
+  }
 
-    // What error code do we return? Code for the original symlink command
-    // or for the last command or for both? The second one is implemented here.
-    if( failed )
-        processStatus(code);
+  verbosity = getenv("TDEIO_SFTP_LOG_VERBOSITY");
+  if (verbosity) {
+    rc = ssh_options_set(mSession, SSH_OPTIONS_LOG_VERBOSITY_STR, verbosity);
+    if (rc < 0) {
+      error(TDEIO::ERR_OUT_OF_MEMORY, i18n("Could not set log verbosity."));
+      return rc;
+    }
+  }
 
-    finished();
-}
+  // Read ~/.ssh/config
+  rc = ssh_options_parse_config(mSession, NULL);
+  if (rc < 0) {
+    error(TDEIO::ERR_INTERNAL, i18n("Could not parse the config file."));
+    return rc;
+  }
 
-void sftpProtocol::chmod(const KURL& url, int permissions){
-    TQString perms;
-    perms.setNum(permissions, 8);
-    kdDebug(TDEIO_SFTP_DB) << "chmod(" << url << ", " << perms << ")" << endl;
+  ssh_set_callbacks(mSession, mCallbacks);
 
-    openConnection();
-    if( !mConnected )
-        return;
+  kdDebug(TDEIO_SFTP_DB) << "Trying to connect to the SSH server" << endl;
 
-    sftpFileAttr attr(remoteEncoding());
+  /* try to connect */
+  rc = ssh_connect(mSession);
+  if (rc < 0) {
+    error(TDEIO::ERR_COULD_NOT_CONNECT, sshError());
+    return rc;
+  }
 
-    if (permissions != -1)
-      attr.setPermissions(permissions);
+  kdDebug(TDEIO_SFTP_DB) << "Getting the SSH server hash" << endl;
 
-    int code;
-    if( (code = sftpSetStat(url, attr)) != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "chmod(): sftpSetStat failed with error " << code << endl;
-        if( code == SSH2_FX_FAILURE )
-            error(ERR_CANNOT_CHMOD, TQString::null);
-        else
-            processStatus(code, url.prettyURL());
-    }
-    finished();
-}
+  /* get the hash */
+  ssh_key serverKey;
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 7, 90)
+  rc = ssh_get_publickey(mSession, &serverKey);
+#else
+  rc = ssh_get_server_publickey(mSession, &serverKey);
+#endif
+  if (rc<0) {
+    error(TDEIO::ERR_COULD_NOT_CONNECT, sshError());
+    return rc;
+  }
 
+  size_t hlen;
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 8, 90)
+  rc = ssh_get_publickey_hash(serverKey, SSH_PUBLICKEY_HASH_MD5, &hash, &hlen);
+#else
+  rc = ssh_get_publickey_hash(serverKey, SSH_PUBLICKEY_HASH_SHA256, &hash, &hlen);
+#endif
+  if (rc<0) {
+    error(TDEIO::ERR_COULD_NOT_CONNECT, sshError());
+    return rc;
+  }
 
-void sftpProtocol::del(const KURL &url, bool isfile){
-    kdDebug(TDEIO_SFTP_DB) << "del(" << url << ", " << (isfile?"file":"dir") << ")" << endl;
+  kdDebug(TDEIO_SFTP_DB) << "Checking if the SSH server is known" << endl;
 
-    openConnection();
-    if( !mConnected )
-        return;
+  /* check the server public key hash */
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 7, 90)
+  state = ssh_is_server_known(mSession);
+#else
+  state = ssh_session_is_known_server(mSession);
+#endif
+  switch (state) {
+    case TDEIO_SSH_KNOWN_HOSTS_OK:
+      break;
+    case TDEIO_SSH_KNOWN_HOSTS_OTHER:
+      delete hash;
+      error(TDEIO::ERR_CONNECTION_BROKEN, i18n("The host key for this server was "
+            "not found, but another type of key exists.\n"
+            "An attacker might change the default server key to confuse your "
+            "client into thinking the key does not exist.\n"
+            "Please contact your system administrator.\n%1").arg(TQString::fromUtf8(ssh_get_error(mSession))));
+      return SSH_ERROR;
+    case TDEIO_SSH_KNOWN_HOSTS_CHANGED:
+      hexa = ssh_get_hexa(hash, hlen);
+      delete hash;
+      /* TODO print known_hosts file, port? */
+      error(TDEIO::ERR_CONNECTION_BROKEN, i18n("The host key for the server %1 has changed.\n"
+          "This could either mean that DNS SPOOFING is happening or the IP "
+          "address for the host and its host key have changed at the same time.\n"
+          "The fingerprint for the key sent by the remote host is:\n %2\n"
+          "Please contact your system administrator.\n%3").arg(
+          mHost).arg(TQString::fromUtf8(hexa)).arg(TQString::fromUtf8(ssh_get_error(mSession))));
+      delete hexa;
+      return SSH_ERROR;
+    case TDEIO_SSH_KNOWN_HOSTS_NOT_FOUND:
+    case TDEIO_SSH_KNOWN_HOSTS_UNKNOWN: {
+      TQString msg;     // msg for dialog box
+      TQString caption; // dialog box caption
+      hexa = ssh_get_hexa(hash, hlen);
+      delete hash;
+      caption = i18n("Warning: Cannot verify host's identity.");
+      msg = i18n("The authenticity of host %1 cannot be established.\n"
+        "The key fingerprint is: %2\n"
+        "Are you sure you want to continue connecting?").arg(mHost).arg(hexa);
+      delete hexa;
+
+      if (KMessageBox::Yes != messageBox(WarningYesNo, msg, caption)) {
+        error(TDEIO::ERR_USER_CANCELED, TQString());
+        return SSH_ERROR;
+      }
 
-    int code;
-    if( (code = sftpRemove(url, isfile)) != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "del(): sftpRemove failed with error code " << code << endl;
-        processStatus(code, url.prettyURL());
+      /* write the known_hosts file */
+      kdDebug(TDEIO_SFTP_DB) << "Adding server to known_hosts file." << endl;
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 7, 90)
+      if (ssh_write_knownhost(mSession) != SSH_OK) {
+#else
+      if (ssh_session_update_known_hosts(mSession) != SSH_OK) {
+#endif
+        error(TDEIO::ERR_USER_CANCELED, sshError());
+        return SSH_ERROR;
+      }
+      break;
     }
-    finished();
-}
+    case TDEIO_SSH_KNOWN_HOSTS_ERROR:
+      delete hash;
+      error(TDEIO::ERR_COULD_NOT_CONNECT, sshError());
+      return SSH_ERROR;
+  }
 
-void sftpProtocol::slave_status() {
-    kdDebug(TDEIO_SFTP_DB) << "slave_status(): connected to "
-                         <<  mHost << "? " << mConnected << endl;
+  kdDebug(TDEIO_SFTP_DB) << "Trying to authenticate with the server" << endl;
 
-    slaveStatus ((mConnected ? mHost : TQString::null), mConnected);
+  return SSH_OK;
 }
 
-bool sftpProtocol::getPacket(TQByteArray& msg) {
-    TQByteArray buf(4096);
-
-    // Get the message length...
-    ssize_t len = atomicio(ssh.stdioFd(), buf.data(), 4, true /*read*/);
 
-    if( len == 0 || len == -1 ) {
-        kdDebug(TDEIO_SFTP_DB) << "getPacket(): read of packet length failed, ret = "
-                             << len << ", error =" << strerror(errno) << endl;
-        closeConnection();
-        error( ERR_CONNECTION_BROKEN, mHost);
-        msg.resize(0);
-        return false;
-    }
-
-    uint msgLen;
-    TQDataStream s(buf, IO_ReadOnly);
-    s >> msgLen;
+void sftpProtocol::openConnection() {
 
-    //kdDebug(TDEIO_SFTP_DB) << "getPacket(): Message size = " << msgLen << endl;
+  if (mConnected) {
+    return;
+  }
 
-    msg.resize(0);
+  kdDebug(TDEIO_SFTP_DB) << "username=" << mUsername << ", host=" << mHost << ", port=" << mPort << endl;
 
-    TQBuffer b( msg );
-    b.open( IO_WriteOnly );
+  infoMessage(i18n("Opening SFTP connection to host %1:%2").arg(mHost).arg(mPort));
 
-    while( msgLen ) {
-        len = atomicio(ssh.stdioFd(), buf.data(), kMin((uint)buf.size(), msgLen), true /*read*/);
+  if (mHost.isEmpty()) {
+    kdDebug(TDEIO_SFTP_DB) << "openConnection(): Need hostname..." << endl;
+    error(TDEIO::ERR_UNKNOWN_HOST, i18n("No hostname specified."));
+    return;
+  }
 
-        if( len == 0 || len == -1) {
-            TQString errmsg;
-            if (len == 0)
-              errmsg = i18n("Connection closed");
-            else
-              errmsg = i18n("Could not read SFTP packet");
-            kdDebug(TDEIO_SFTP_DB) << "getPacket(): nothing to read, ret = " <<
-                len << ", error =" << strerror(errno) << endl;
-            closeConnection();
-            error(ERR_CONNECTION_BROKEN, errmsg);
-            b.close();
-            return false;
-        }
+  // Check for cached authentication info if no password is specified...
+  if (mPassword.isEmpty()) {
+    AuthInfo info = authInfo();
 
-        b.writeBlock(buf.data(), len);
+    kdDebug(TDEIO_SFTP_DB) << "checking cache: info.username = " << info.username
+      << ", info.url = " << info.url.prettyURL() << endl;
 
-        //kdDebug(TDEIO_SFTP_DB) << "getPacket(): Read Message size = " << len << endl;
-        //kdDebug(TDEIO_SFTP_DB) << "getPacket(): Copy Message size = " << msg.size() << endl;
+    if (checkCachedAuthentication(info)) {
+      kdDebug() << "using cached" << endl;
+      mCachedUsername = info.username;
+      mPassword = info.password;
 
-        msgLen -= len;
+      purgeString(info.password); //< not really necessary because of Qt's implicit data sharing
     }
+  }
 
-    b.close();
+  mPasswordWasPrompted = false;
+  PasswordPurger pwPurger{mPassword};
 
-    return true;
-}
+  int rc;
+  ExitGuard connectionCloser([this](){ closeConnection(); });
 
-/** Send an sftp packet to stdin of the ssh process. */
-bool sftpProtocol::putPacket(TQByteArray& p){
-//    kdDebug(TDEIO_SFTP_DB) << "putPacket(): size == " << p.size() << endl;
-    int ret;
-    ret = atomicio(ssh.stdioFd(), p.data(), p.size(), false /*write*/);
-    if( ret <= 0 ) {
-        kdDebug(TDEIO_SFTP_DB) << "putPacket(): write failed, ret =" << ret <<
-            ", error = " << strerror(errno) << endl;
-        return false;
+  do { // A loop to restart connection when needed
+    // Start the ssh connection.
+    if (initializeConnection() < 0) {
+      return;
     }
 
-    return true;
-}
-
-/** Used to have the server canonicalize any given path name to an absolute path.
-This is useful for converting path names containing ".." components or relative
-pathnames without a leading slash into absolute paths.
-Returns the canonicalized url. */
-int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){
-
-    kdDebug(TDEIO_SFTP_DB) << "sftpRealPath(" << url << ", newUrl)" << endl;
+    // Try to authenticate (this required before calling ssh_auth_list())
+    rc = ssh_userauth_none(mSession, NULL);
+    if (rc == SSH_AUTH_ERROR) {
+      error(TDEIO::ERR_COULD_NOT_LOGIN, sshError(i18n("Authentication failed (method: %1).")
+                                        .arg(i18n("none"))));
+      return;
+    }
 
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
+    // Preinit the list of supported auth methods
+    static const auto authMethodsNormal = [](){
+      std::vector<std::unique_ptr<SSHAuthMethod>> rv;
+      rv.emplace_back(std::unique_ptr<PublicKeyAuth>(new PublicKeyAuth));
+      rv.emplace_back(std::unique_ptr<KeyboardInteractiveAuth>(new KeyboardInteractiveAuth));
+      rv.emplace_back(std::unique_ptr<PasswordAuth>(new PasswordAuth));
+      return rv;
+    }();
+
+    const static int supportedMethods = std::accumulate(
+        authMethodsNormal.begin(), authMethodsNormal.end(),
+        SSH_AUTH_METHOD_NONE, //< none is supported by default
+        [](int acc, const std::unique_ptr<SSHAuthMethod> &m){ return acc |= m->flag(); });
+
+    unsigned attemptedMethods = 0;
+
+    // Backup of the value of the SlaveBase::s_seqNr. This is used to query different data values
+    // with openPassDlg() with the same seqNr. Otherwise it will result in the prompting of the pass
+    // dialog to the user in cases the values should be recovered from the cache.
+    // This is a bit hacky but necessary
+    long current_seqNr = SlaveBase::s_seqNr;
+
+    while (rc != SSH_AUTH_SUCCESS) {
+      // Note this loop can rerun in case of multistage ssh authentication e.g. "password,publickey"
+      // which will require user to provide a valid password at first and then a valid public key.
+      // see AuthenticationMethods in man 5 sshd_config for more info
+      bool wasCanceled = false;
+      unsigned availableMethodes = ssh_auth_list(mSession);
+
+      SlaveBase::s_seqNr = current_seqNr;
+
+      if (!availableMethodes) {
+        // Technically libssh docs suggest that the server merely MAY send auth methods, but it's
+        // highly unclear what we should do in such case and it looks like openssh doesn't have an
+        // option for that, so let's just consider this server a jerk and don't talk to him anymore.
+        error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("Authentication failed.\n"
+              "The server did not send any authentication methods!"));
+        return;
+      } else if (!(availableMethodes & supportedMethods)) {
+        error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("Authentication failed.\n"
+              "The server sent only unsupported authentication methods (%1)!")
+              .arg(SSHAuthMethod::bitsetToStr(availableMethodes).join(", ")));
+        return;
+      }
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+      const auto *authMethods = &authMethodsNormal;
+
+      // If we have cached password we want try to use it before public key
+      if(!mPassword.isEmpty()) {
+        static const auto authMethodsWithPassword = []() {
+          std::vector<std::unique_ptr<SSHAuthMethod>> rv;
+          rv.emplace_back(std::unique_ptr<KeyboardInteractiveAuth>(
+                      new KeyboardInteractiveAuth(/* noPasswordQuery = */true) ) );
+          rv.emplace_back(std::unique_ptr<PasswordAuth>(
+                      new PasswordAuth(/* noPasswordQuery = */true) ) );
+          for (const auto &m: authMethodsNormal) { rv.emplace_back(m->clone()); }
+          return rv;
+        }();
+
+        authMethods = &authMethodsWithPassword;
+      }
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << TQ_UINT32(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len);
-    s << (TQ_UINT8)SSH2_FXP_REALPATH;
-    s << id;
-    s.writeBytes(path.data(), len);
+      // Actually iterate over the list of methods and try them out
+      for (const auto &method: *authMethods) {
+        if (!(availableMethodes & method->flag())) { continue; }
+
+        rc = method->authenticate( this );
+        attemptedMethods |= method->flag();
+        if (rc == SSH_AUTH_SUCCESS || rc == SSH_AUTH_PARTIAL) {
+          kdDebug(TDEIO_SFTP_DB) << "method=" << method->name() << ": auth "
+            << (rc == SSH_AUTH_SUCCESS ? "success" : "partial") << endl;
+          break; // either next auth method or continue on with the connect
+        } else if (rc == SSH_AUTH_ERROR || rc == SSH_AUTH_AGAIN) {
+          TQString errMsg = i18n("Authentication failed (method: %1).").arg(method->name());
+          // SSH_AUTH_AGAIN returned in case of some errors when server hangs up unexpectedly like
+          // in case there were too many failed authentication attempts
+          if (rc == SSH_AUTH_AGAIN) {
+            errMsg.append("\n").append(i18n("Server is slow to respond or hung up unexpectedly."));
+          }
+          error(TDEIO::ERR_COULD_NOT_LOGIN, sshError(errMsg));
+          return;
+        } else if (rc == SSH_AUTH_CANCELED) {
+          kdDebug(TDEIO_SFTP_DB) << "method=" << method->name() << " was canceled by user"  << endl;
+          // don't quit immediately due to that the user might have canceled one method to use another
+          wasCanceled = true;
+        } else if (rc == SSH_AUTH_NEED_RECONNECT) {
+          kdDebug(TDEIO_SFTP_DB) << "method=" << method->name() << " requested reconnection"  << endl;
+          break;
+        } else if (rc == SSH_AUTH_DENIED) {
+          kdDebug(TDEIO_SFTP_DB) << "Auth for method=" << method->name() << " was denied"  << endl;
+          // do nothing, just proceed with next auth method
+        } else {
+          // Shouldn't happen, but to be on the safe side better handle it
+          error(TDEIO::ERR_UNKNOWN, sshError(i18n("Authentication failed unexpectedly")));
+          return;
+        }
+      }
 
-    putPacket(p);
-    getPacket(p);
+      // At this point rc values should be one of:
+      //   SSH_AUTH_SUCCESS, SSH_AUTH_PARTIAL, SSH_AUTH_DENIED, SSH_AUTH_CANCELED or SSH_AUTH_NEED_RECONNECT
+      if(rc == SSH_AUTH_NEED_RECONNECT) {
+        closeConnection(); //< have to do it manually
+        break;
+      } else if (wasCanceled && (rc == SSH_AUTH_CANCELED || rc == SSH_AUTH_DENIED)) {
+        error(TDEIO::ERR_USER_CANCELED, TQString::null);
+        return;
+      } else if (rc != SSH_AUTH_SUCCESS && rc != SSH_AUTH_PARTIAL) {
+        TQString errMsg = i18n("Authentication denied (attempted methods: %1).")
+                          .arg(SSHAuthMethod::bitsetToStr(attemptedMethods).join(", "));
+        if (availableMethodes & ~supportedMethods) {
+          errMsg.append("\n")
+                .append(i18n("Note: server also declares some unsupported authentication methods (%1)")
+                .arg(SSHAuthMethod::bitsetToStr(availableMethodes & ~supportedMethods).join(", ")));
+        }
+        error(TDEIO::ERR_COULD_NOT_LOGIN, errMsg);
+        return;
+      }
+    } // while (rc != SSH_AUTH_SUCCESS)
+  } while(rc == SSH_AUTH_NEED_RECONNECT);
 
-    TQ_UINT8 type;
-    TQDataStream r(p, IO_ReadOnly);
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRealPath: sftp packet id mismatch" << endl;
-        return -1;
-    }
+  // start sftp session
+  kdDebug(TDEIO_SFTP_DB) << "Trying to request the sftp session" << endl;
+  mSftp = sftp_new(mSession);
+  if (mSftp == NULL) {
+    error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("Unable to request the SFTP subsystem. "
+          "Make sure SFTP is enabled on the server."));
+    return;
+  }
 
-    if( type == SSH2_FXP_STATUS ) {
-        TQ_UINT32 code;
-        r >> code;
-        return code;
-    }
+  kdDebug(TDEIO_SFTP_DB) << "Trying to initialize the sftp session" << endl;
+  if (sftp_init(mSftp) < 0) {
+    error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("Could not initialize the SFTP session."));
+    return;
+  }
 
-    if( type != SSH2_FXP_NAME ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRealPath(): unexpected packet type of " << type << endl;
-        return -1;
-    }
+  // Login succeeded!
+  infoMessage(i18n("Successfully connected to %1").arg(mHost));
 
-    TQ_UINT32 count;
-    r >> count;
-    if( count != 1 ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRealPath(): Bad number of file attributes for realpath command" << endl;
-        return -1;
-    }
+  //setTimeoutSpecialCommand(TDEIO_SFTP_SPECIAL_TIMEOUT);
 
-    TQCString newPath;
-    r >> newPath;
+  mConnected = true;
+  connectionCloser.abort();
 
-    newPath.truncate(newPath.size());
-    if (newPath.isEmpty())
-      newPath = "/";
-    newUrl.setPath(newPath);
+  connected();
 
-    return SSH2_FX_OK;
+  return;
 }
 
-sftpProtocol::Status sftpProtocol::doProcessStatus(TQ_UINT8 code, const TQString& message)
-{
-    Status res;
-    res.code = 0;
-    res.size = 0;
-    res.text = message;
+void sftpProtocol::closeConnection() {
+  kdDebug(TDEIO_SFTP_DB) << "closeConnection()" << endl;
 
-    switch(code)
-    {
-      case SSH2_FX_OK:
-      case SSH2_FX_EOF:
-          break;
-      case SSH2_FX_NO_SUCH_FILE:
-          res.code = ERR_DOES_NOT_EXIST;
-          break;
-      case SSH2_FX_PERMISSION_DENIED:
-          res.code = ERR_ACCESS_DENIED;
-          break;
-      case SSH2_FX_FAILURE:
-          res.text = i18n("SFTP command failed for an unknown reason.");
-          res.code = ERR_UNKNOWN;
-          break;
-      case SSH2_FX_BAD_MESSAGE:
-          res.text = i18n("The SFTP server received a bad message.");
-          res.code = ERR_UNKNOWN;
-          break;
-      case SSH2_FX_OP_UNSUPPORTED:
-          res.text = i18n("You attempted an operation unsupported by the SFTP server.");
-          res.code = ERR_UNKNOWN;
-          break;
-      default:
-          res.text = i18n("Error code: %1").arg(code);
-          res.code = ERR_UNKNOWN;
-    }
+  sftp_free(mSftp);
+  mSftp = NULL;
 
-    return res;
-}
+  ssh_disconnect(mSession);
+  mSession = NULL;
 
-/** Process SSH_FXP_STATUS packets. */
-void sftpProtocol::processStatus(TQ_UINT8 code, const TQString& message){
-    Status st = doProcessStatus( code, message );
-    if( st.code != 0 )
-        error( st.code, st.text );
+  mConnected = false;
 }
 
-/** Opens a directory handle for url.path. Returns true if succeeds. */
-int sftpProtocol::sftpOpenDirectory(const KURL& url, TQByteArray& handle){
-
-    kdDebug(TDEIO_SFTP_DB) << "sftpOpenDirectory(" << url << ", handle)" << endl;
-
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
+#if 0
+void sftpProtocol::special(const TQByteArray &data) {
+    int rc;
+    kdDebug(TDEIO_SFTP_DB) << "special(): polling";
+
+    /*
+     * channel_poll() returns the number of bytes that may be read on the
+     * channel. It does so by checking the input buffer and eventually the
+     * network socket for data to read. If the input buffer is not empty, it
+     * will not probe the network (and such not read packets nor reply to
+     * keepalives).
+     *
+     * As channel_poll can act on two specific buffers (a channel has two
+     * different stream: stdio and stderr), polling for data on the stderr
+     * stream has more chance of not being in the problematic case (data left
+     * in the buffer). Checking the return value (for >0) would be a good idea
+     * to debug the problem.
+     */
+    rc = channel_poll(mSftp->channel, 0);
+    if (rc > 0) {
+        rc = channel_poll(mSftp->channel, 1);
+    }
+
+    if (rc < 0) {
+        kdDebug(TDEIO_SFTP_DB) << "channel_poll failed: " << ssh_get_error(mSession) << endl;
+    }
+
+    setTimeoutSpecialCommand(TDEIO_SFTP_SPECIAL_TIMEOUT);
+}
+#endif
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+void sftpProtocol::statMime(const KURL &url) {
+  kdDebug(TDEIO_SFTP_DB) << "stat: " << url.url() << endl;
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len);
-    s << (TQ_UINT8)SSH2_FXP_OPENDIR;
-    s << (TQ_UINT32)id;
-    s.writeBytes(path.data(), len);
+  openConnection();
+  if (!mConnected) {
+    error(TDEIO::ERR_CONNECTION_BROKEN, url.prettyURL());
+    return;
+  }
 
-    putPacket(p);
-    getPacket(p);
+  const TQString path = url.path();
+  const TQByteArray path_c = path.utf8();
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  sftp_attributes sb = sftp_lstat(mSftp, path_c.data());
+  if (sb == NULL) {
+    reportError(url, sftp_get_error(mSftp));
+    return;
+  }
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpOpenDirectory: sftp packet id mismatch: " <<
-            "expected " << expectedId << ", got " << id << endl;
-        return -1;
-    }
+  switch (sb->type) {
+    case SSH_FILEXFER_TYPE_DIRECTORY:
+      sftp_attributes_free(sb);
+      emit mimeType("inode/directory");
+      return;
+    case SSH_FILEXFER_TYPE_SPECIAL:
+    case SSH_FILEXFER_TYPE_UNKNOWN:
+      error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
+      sftp_attributes_free(sb);
+      return;
+    case SSH_FILEXFER_TYPE_SYMLINK:
+    case SSH_FILEXFER_TYPE_REGULAR:
+      break;
+  }
 
-    if( type == SSH2_FXP_STATUS ) {
-        TQ_UINT32 errCode;
-        r >> errCode;
-        return errCode;
-    }
+  size_t fileSize = sb->size;
+  sftp_attributes_free(sb);
 
-    if( type != SSH2_FXP_HANDLE ) {
-        kdError(TDEIO_SFTP_DB) << "sftpOpenDirectory: unexpected message type of " << type << endl;
-        return -1;
-    }
+  int flags = 0;
 
-    r >> handle;
-    if( handle.size() > 256 ) {
-        kdError(TDEIO_SFTP_DB) << "sftpOpenDirectory: handle exceeds max length" << endl;
-        return -1;
-    }
+  flags = O_RDONLY;
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpOpenDirectory: handle (" << handle.size() << "): [" << handle << "]" << endl;
-    return SSH2_FX_OK;
-}
+  mOpenFile = sftp_open(mSftp, path_c.data(), flags, 0);
 
-/** Closes a directory or file handle. */
-int sftpProtocol::sftpClose(const TQByteArray& handle){
+  if (mOpenFile == NULL) {
+    error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, path);
+    return;
+  }
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpClose()" << endl;
+  // Determine the mimetype of the file to be retrieved, and emit it.
+  // This is mandatory in all slaves (for KRun/BrowserRun to work).
+  // If we're not opening the file ReadOnly or ReadWrite, don't attempt to
+  // read the file and send the mimetype.
+  size_t bytesRequested = 1024;
+  ssize_t bytesRead = 0;
+  TQByteArray buffer(bytesRequested);
+
+  bytesRead = sftp_read(mOpenFile, buffer.data(), bytesRequested);
+  if (bytesRead < 0) {
+      error(TDEIO::ERR_COULD_NOT_READ, mOpenUrl.prettyURL());
+      closeFile();
+      return;
+  } else {
+      TQByteArray fileData;
+      fileData.setRawData(buffer.data(), bytesRead);
+      KMimeMagicResult *p_mimeType = KMimeMagic::self()->findBufferFileType(fileData, mOpenUrl.fileName());
+      emit mimeType(p_mimeType->mimeType());
+  }
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+  sftp_close(mOpenFile);
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size());
-    s << (TQ_UINT8)SSH2_FXP_CLOSE;
-    s << (TQ_UINT32)id;
-    s << handle;
+  mOpenFile = NULL;
+}
 
-    putPacket(p);
-    getPacket(p);
+#if 0
+void sftpProtocol::read(TDEIO::filesize_t bytes) {
+  kdDebug(TDEIO_SFTP_DB) << "read, offset = " << openOffset << ", bytes = " << bytes;
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  Q_ASSERT(mOpenFile != NULL);
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpClose: sftp packet id mismatch" << endl;
-        return -1;
-    }
+  TQVarLengthArray<char> buffer(bytes);
 
-    if( type != SSH2_FXP_STATUS ) {
-        kdError(TDEIO_SFTP_DB) << "sftpClose: unexpected message type of " << type << endl;
-        return -1;
-    }
+  ssize_t bytesRead = sftp_read(mOpenFile, buffer.data(), bytes);
+  Q_ASSERT(bytesRead <= static_cast<ssize_t>(bytes));
 
-    TQ_UINT32 code;
-    r >> code;
-    if( code != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "sftpClose: close failed with err code " << code << endl;
-    }
+  if (bytesRead < 0) {
+    kdDebug(TDEIO_SFTP_DB) << "Could not read " << mOpenUrl;
+    error(TDEIO::ERR_COULD_NOT_READ, mOpenUrl.prettyURL());
+    close();
+    return;
+  }
 
-    return code;
+  TQByteArray fileData = TQByteArray::fromRawData(buffer.data(), bytesRead);
+  data(fileData);
 }
 
-/** Set a files attributes. */
-int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){
+void sftpProtocol::write(const TQByteArray &data) {
+  kdDebug(TDEIO_SFTP_DB) << "write, offset = " << openOffset << ", bytes = " << data.size();
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpSetStat(" << url << ", attr)" << endl;
+  Q_ASSERT(mOpenFile != NULL);
 
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
-
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+  ssize_t bytesWritten = sftp_write(mOpenFile, data.data(), data.size());
+  if (bytesWritten < 0) {
+    kdDebug(TDEIO_SFTP_DB) << "Could not write to " << mOpenUrl;
+    error(TDEIO::ERR_COULD_NOT_WRITE, mOpenUrl.prettyURL());
+    close();
+    return;
+  }
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + attr.size());
-    s << (TQ_UINT8)SSH2_FXP_SETSTAT;
-    s << (TQ_UINT32)id;
-    s.writeBytes(path.data(), len);
-    s << attr;
+  written(bytesWritten);
+}
 
-    putPacket(p);
-    getPacket(p);
+void sftpProtocol::seek(TDEIO::filesize_t offset) {
+  kdDebug(TDEIO_SFTP_DB) << "seek, offset = " << offset;
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  Q_ASSERT(mOpenFile != NULL);
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpSetStat(): sftp packet id mismatch" << endl;
-        return -1;
-        // XXX How do we do a fatal error?
-    }
+  if (sftp_seek64(mOpenFile, static_cast<uint64_t>(offset)) < 0) {
+    error(TDEIO::ERR_COULD_NOT_SEEK, mOpenUrl.path());
+    close();
+  }
 
-    if( type != SSH2_FXP_STATUS ) {
-        kdError(TDEIO_SFTP_DB) << "sftpSetStat(): unexpected message type of " << type << endl;
-        return -1;
-    }
+  position(sftp_tell64(mOpenFile));
+}
+#endif
 
-    TQ_UINT32 code;
-    r >> code;
-    if( code != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "sftpSetStat(): set stat failed with err code " << code << endl;
-    }
+void sftpProtocol::closeFile() {
+  if (mOpenFile) {
+    sftp_close(mOpenFile);
 
-    return code;
+    mOpenFile = NULL;
+    finished();
+  }
 }
 
-/** Sends a sftp command to remove a file or directory. */
-int sftpProtocol::sftpRemove(const KURL& url, bool isfile){
-
-    kdDebug(TDEIO_SFTP_DB) << "sftpRemove(): " << url << ", isFile ? " << isfile << endl;
+void sftpProtocol::get(const KURL& url) {
+  kdDebug(TDEIO_SFTP_DB) << "get(): " << url.url() << endl;
 
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+  TQByteArray path = url.path().utf8();
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len);
-    s << (TQ_UINT8)(isfile ? SSH2_FXP_REMOVE : SSH2_FXP_RMDIR);
-    s << (TQ_UINT32)id;
-    s.writeBytes(path.data(), len);
+  char buf[MAX_XFER_BUF_SIZE] = {0};
+  sftp_file file = NULL;
+  ssize_t bytesread = 0;
+  // time_t curtime = 0;
+  time_t lasttime = 0;
+  time_t starttime = 0;
+  ssize_t totalbytesread  = 0;
 
-    putPacket(p);
-    getPacket(p);
+  sftp_attributes sb = sftp_lstat(mSftp, path.data());
+  if (sb == NULL) {
+    reportError(url, sftp_get_error(mSftp));
+    return;
+  }
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  switch (sb->type) {
+    case SSH_FILEXFER_TYPE_DIRECTORY:
+      error(TDEIO::ERR_IS_DIRECTORY, url.prettyURL());
+      sftp_attributes_free(sb);
+      return;
+    case SSH_FILEXFER_TYPE_SPECIAL:
+    case SSH_FILEXFER_TYPE_UNKNOWN:
+    error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
+      sftp_attributes_free(sb);
+      return;
+    case SSH_FILEXFER_TYPE_SYMLINK:
+    case SSH_FILEXFER_TYPE_REGULAR:
+      break;
+  }
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "del(): sftp packet id mismatch" << endl;
-        return -1;
-    }
+  // Open file
+  file = sftp_open(mSftp, path.data(), O_RDONLY, 0);
+  if (file == NULL) {
+    error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
+    sftp_attributes_free(sb);
+    return;
+  }
 
-    if( type != SSH2_FXP_STATUS ) {
-        kdError(TDEIO_SFTP_DB) << "del(): unexpected message type of " << type << endl;
-        return -1;
+  // Determine the mimetype of the file to be retrieved, and emit it.
+  // This is mandatory in all slaves (for KRun/BrowserRun to work)
+  // In real "remote" slaves, this is usually done using findByNameAndContent
+  // after receiving some data. But we don't know how much data the mimemagic rules
+  // need, so for local files, better use findByUrl with localUrl=true.
+  KMimeType::Ptr mt = KMimeType::findByURL( url, sb->permissions, false /* remote URL */ );
+  emit mimeType( mt->name() ); // FIXME test me
+
+  kdDebug(TDEIO_SFTP_DB) << "Total size: " << TQString::number(sb->size) << endl;
+  // Set the total size
+  totalSize(sb->size);
+
+  const TQString resumeOffset = metaData(TQString("resume"));
+  if (!resumeOffset.isEmpty()) {
+    bool ok;
+    ssize_t offset = resumeOffset.toLong(&ok);
+    if (ok && (offset > 0) && ((unsigned long long) offset < sb->size))
+    {
+      if (sftp_seek64(file, offset) == 0) {
+        canResume();
+        totalbytesread = offset;
+        kdDebug(TDEIO_SFTP_DB) << "Resume offset: " << TQString::number(offset) << endl;
+      }
     }
+  }
 
-    TQ_UINT32 code;
-    r >> code;
-    if( code != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "del(): del failed with err code " << code << endl;
-    }
+  if (file != NULL) {
+    bool isFirstPacket = true;
+    lasttime = starttime = time(NULL);
+
+    for (;;) {
+      bytesread = sftp_read(file, buf, MAX_XFER_BUF_SIZE);
+      kdDebug(TDEIO_SFTP_DB) << "bytesread=" << TQString::number(bytesread) << endl;
+      if (bytesread == 0) {
+        // All done reading
+        break;
+      } else if (bytesread < 0) {
+        kdDebug(TDEIO_SFTP_DB) << "Failed to read";
+        error(TDEIO::ERR_COULD_NOT_READ, url.prettyURL());
+        sftp_attributes_free(sb);
+        return;
+      }
 
-    return code;
-}
+      TQByteArray  filedata;
+      filedata.setRawData(buf, bytesread);
+      if (isFirstPacket) {
+        KMimeMagicResult *p_mimeType = KMimeMagic::self()->findBufferFileType(filedata, mOpenUrl.fileName());
+        mimeType(p_mimeType->mimeType());
+        kdDebug(TDEIO_SFTP_DB) << "mimetype=" << p_mimeType->mimeType() << endl;
+        isFirstPacket = false;
+      }
+      data(filedata);
+      filedata.resetRawData(buf, bytesread);
 
-/** Send a sftp command to rename a file or directoy. */
-int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){
+      // increment total bytes read
+      totalbytesread += bytesread;
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpRename(" << src << " -> " << dest << ")" << endl;
+      processedSize(totalbytesread);
+    }
 
-    TQCString srcPath = remoteEncoding()->encode(src.path());
-    TQCString destPath = remoteEncoding()->encode(dest.path());
+    kdDebug(TDEIO_SFTP_DB) << "size processed=" << totalbytesread << endl;
+    sftp_close(file);
+    //data(TQByteArray());
+    processedSize((sb->size));
+  }
 
-    uint slen = srcPath.length();
-    uint dlen = destPath.length();
+  sftp_attributes_free(sb);
+  finished();
+}
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+void sftpProtocol::put(const KURL& url, int permissions, bool overwrite, bool resume) {
+  kdDebug(TDEIO_SFTP_DB) << "put(): " << url.url()
+                      << " , permissions = " << TQString::number(permissions)
+                      << ", overwrite = " << overwrite
+                      << ", resume = " << resume << endl;
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ +
-                    4 /*str length*/ + slen +
-                    4 /*str length*/ + dlen);
-    s << (TQ_UINT8)SSH2_FXP_RENAME;
-    s << (TQ_UINT32)id;
-    s.writeBytes(srcPath.data(), slen);
-    s.writeBytes(destPath.data(), dlen);
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    putPacket(p);
-    getPacket(p);
+  const TQString dest_orig = url.path();
+  const TQByteArray dest_orig_c = dest_orig.utf8();
+  const TQString dest_part = dest_orig + ".part";
+  const TQByteArray dest_part_c = dest_part.utf8();
+  uid_t owner = 0;
+  gid_t group = 0;
+
+  sftp_attributes sb = sftp_lstat(mSftp, dest_orig_c.data());
+  const bool bOrigExists = (sb != NULL);
+  bool bPartExists = false;
+  const bool bMarkPartial = config()->readEntry("MarkPartial", "true") == "true";
+
+  // Don't change permissions of the original file
+  if (bOrigExists) {
+      permissions = sb->permissions;
+      owner = sb->uid;
+      group = sb->gid;
+  }
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  if (bMarkPartial) {
+    sftp_attributes sbPart = sftp_lstat(mSftp, dest_part_c.data());
+    bPartExists = (sbPart != NULL);
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRename(): sftp packet id mismatch" << endl;
-        return -1;
-    }
+    if (bPartExists && !resume && !overwrite &&
+        sbPart->size > 0 && sbPart->type == SSH_FILEXFER_TYPE_REGULAR) {
+      kdDebug(TDEIO_SFTP_DB) << "put : calling canResume with "
+        << TQString::number(sbPart->size) << endl;
 
-    if( type != SSH2_FXP_STATUS ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRename(): unexpected message type of " << type << endl;
-        return -1;
-    }
+      // Maybe we can use this partial file for resuming
+      // Tell about the size we have, and the app will tell us
+      // if it's ok to resume or not.
+      if (canResume(sbPart->size)) {
+          resume = true;
+      }
 
-    int code;
-    r >> code;
-    if( code != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRename(): rename failed with err code " << code << endl;
-    }
+      kdDebug(TDEIO_SFTP_DB) << "put got answer " << resume << endl;
 
-    return code;
-}
-/** Get directory listings. */
-int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){
-    // url is needed so we can lookup the link destination
-    kdDebug(TDEIO_SFTP_DB) << "sftpReadDir(): " << url << endl;
-
-    TQ_UINT32 id, expectedId, count;
-    TQ_UINT8 type;
-
-    sftpFileAttr attr (remoteEncoding());
-    attr.setDirAttrsFlag(true);
-
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    id = expectedId = mMsgId++;
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size());
-    s << (TQ_UINT8)SSH2_FXP_READDIR;
-    s << (TQ_UINT32)id;
-    s << handle;
-
-    putPacket(p);
-    getPacket(p);
-
-    TQDataStream r(p, IO_ReadOnly);
-    r >> type >> id;
-
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpReadDir(): sftp packet id mismatch" << endl;
-        return -1;
+      delete sbPart;
     }
+  }
 
-    int code;
-    if( type == SSH2_FXP_STATUS ) {
-        r >> code;
-        return code;
+  if (bOrigExists && !(overwrite) && !(resume)) {
+    if (sb->type == SSH_FILEXFER_TYPE_DIRECTORY) {
+      error(TDEIO::ERR_DIR_ALREADY_EXIST, dest_orig);
+    } else {
+      error(TDEIO::ERR_FILE_ALREADY_EXIST, dest_orig);
     }
+    sftp_attributes_free(sb);
+    return;
+  }
 
-    if( type != SSH2_FXP_NAME ) {
-        kdError(TDEIO_SFTP_DB) << "tdeio_sftpProtocl::sftpReadDir(): Unexpected message" << endl;
-        return -1;
+  int result;
+  TQByteArray dest;
+  sftp_file file = NULL;
+
+  // Loop until we got 0 (end of data)
+  do {
+    TQByteArray buffer;
+    dataReq(); // Request for data
+    result = readData(buffer);
+
+    if (result >= 0 && buffer.size()) {
+      kdDebug(TDEIO_SFTP_DB) << TQString("Got %1 bytes of data").arg(buffer.size()) << endl;
+      if (dest.isEmpty()) {
+        if (bMarkPartial) {
+          kdDebug(TDEIO_SFTP_DB) << "Appending .part extension to " << dest_orig << endl;
+          dest = dest_part_c;
+          if (bPartExists && !(resume)) {
+            kdDebug(TDEIO_SFTP_DB) << "Deleting partial file " << dest_part << endl;
+            sftp_unlink(mSftp, dest_part_c.data());
+            // Catch errors when we try to open the file.
+          }
+        } else {
+          dest = dest_orig_c;
+          if (bOrigExists && !(resume)) {
+            kdDebug(TDEIO_SFTP_DB) << "Deleting destination file " << dest_orig << endl;
+            sftp_unlink(mSftp, dest_orig_c.data());
+            // Catch errors when we try to open the file.
+          }
+        } // bMarkPartial
+
+        if ((resume)) {
+          sftp_attributes fstat;
+
+          kdDebug(TDEIO_SFTP_DB) << "Trying to append: " << dest.data() << endl;
+          file = sftp_open(mSftp, dest.data(), O_RDWR, 0);  // append if resuming
+          if (file) {
+             fstat = sftp_fstat(file);
+             if (fstat) {
+                sftp_seek64(file, fstat->size); // Seek to end TODO
+                sftp_attributes_free(fstat);
+             }
+          }
+        } else {
+          mode_t initialMode;
+
+          if (permissions != -1) {
+            initialMode = permissions | S_IWUSR | S_IRUSR;
+          } else {
+            initialMode = 0644;
+          }
+
+          kdDebug(TDEIO_SFTP_DB) << "Trying to open: " << dest.data() << ", mode=" << TQString::number(initialMode) << endl;
+          file = sftp_open(mSftp, dest.data(), O_CREAT | O_TRUNC | O_WRONLY, initialMode);
+        } // resume
+
+        if (file == NULL) {
+          kdDebug(TDEIO_SFTP_DB) << "COULD NOT WRITE " << dest.data()
+                              << " permissions=" << permissions
+                              << " error=" << ssh_get_error(mSession) << endl;
+          if (sftp_get_error(mSftp) == SSH_FX_PERMISSION_DENIED) {
+            error(TDEIO::ERR_WRITE_ACCESS_DENIED, TQString::fromUtf8(dest));
+          } else {
+            error(TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, TQString::fromUtf8(dest));
+          }
+          sftp_attributes_free(sb);
+          finished();
+          return;
+        } // file
+      } // dest.isEmpty
+
+      ssize_t bytesWritten = sftp_write(file, buffer.data(), buffer.size());
+      kdDebug(TDEIO_SFTP_DB) << TQString("Written %1 bytes").arg(bytesWritten) << endl;
+      if (bytesWritten < 0) {
+        error(TDEIO::ERR_COULD_NOT_WRITE, dest_orig);
+        result = -1;
+      }
+    } // result
+  } while (result > 0);
+  sftp_attributes_free(sb);
+
+  // An error occurred deal with it.
+  if (result < 0) {
+    kdDebug(TDEIO_SFTP_DB) << "Error during 'put'. Aborting." << endl;
+
+    if (file != NULL) {
+      sftp_close(file);
+
+      sftp_attributes attr = sftp_stat(mSftp, dest.data());
+      if (bMarkPartial && attr != NULL) {
+        size_t size = config()->readLongNumEntry("MinimumKeepSize", DEFAULT_MINIMUM_KEEP_SIZE);
+        if (attr->size < size) {
+          sftp_unlink(mSftp, dest.data());
+        }
+      }
+      delete attr;
+      sftp_attributes_free(attr);
     }
 
-    r >> count;
-    kdDebug(TDEIO_SFTP_DB) << "sftpReadDir(): got " << count << " entries" << endl;
+    //::exit(255);
+    finished();
+    return;
+  }
 
-    while(count--) {
-        r >> attr;
+  if (file == NULL) { // we got nothing to write out, so we never opened the file
+    finished();
+    return;
+  }
 
-        if( S_ISLNK(attr.permissions()) ) {
-             KURL myurl ( url );
-             myurl.addPath(attr.filename());
+  if (sftp_close(file) < 0) {
+    kdWarning(TDEIO_SFTP_DB) << "Error when closing file descriptor" << endl;
+    error(TDEIO::ERR_COULD_NOT_WRITE, dest_orig);
+    return;
+  }
 
-             // Stat the symlink to find out its type...
-             sftpFileAttr attr2 (remoteEncoding());
-             (void) sftpStat(myurl, attr2);
+  // after full download rename the file back to original name
+  if (bMarkPartial) {
+    // If the original URL is a symlink and we were asked to overwrite it,
+    // remove the symlink first. This ensures that we do not overwrite the
+    // current source if the symlink points to it.
+    if ((overwrite)) {
+      sftp_unlink(mSftp, dest_orig_c.data());
+    }
 
-             attr.setLinkType(attr2.linkType());
-             attr.setLinkDestination(attr2.linkDestination());
-        }
+    if (sftp_rename(mSftp, dest.data(), dest_orig_c.data()) < 0) {
+      kdWarning(TDEIO_SFTP_DB) << " Couldn't rename " << dest.data() << " to " << dest_orig << endl;
+      error(TDEIO::ERR_CANNOT_RENAME_PARTIAL, dest_orig);
+      return;
+    }
+  }
 
-        listEntry(attr.entry(), false);
+  // set final permissions
+  if (permissions != -1 && !(resume)) {
+    kdDebug(TDEIO_SFTP_DB) << "Trying to set final permissions of " << dest_orig << " to " << TQString::number(permissions) << endl;
+    if (sftp_chmod(mSftp, dest_orig_c.data(), permissions) < 0) {
+      warning(i18n( "Could not change permissions for\n%1").arg(dest_orig));
     }
+  }
 
-    listEntry(attr.entry(), true);
+  // set original owner and group
+  if (bOrigExists) {
+      kdDebug(TDEIO_SFTP_DB) << "Trying to restore original owner and group of " << dest_orig << endl;
+      if (sftp_chown(mSftp, dest_orig_c.data(), owner, group) < 0) {
+          // warning(i18n( "Could not change owner and group for\n%1", dest_orig));
+      }
+  }
 
-    return SSH2_FX_OK;
+  // set modification time
+#if 0
+  const TQString mtimeStr = metaData("modified");
+  if (!mtimeStr.isEmpty()) {
+    TQDateTime dt = TQDateTime::fromString(mtimeStr, TQt::ISODate);
+    if (dt.isValid()) {
+      struct timeval times[2];
+
+      sftp_attributes attr = sftp_lstat(mSftp, dest_orig_c.data());
+      if (attr != NULL) {
+        times[0].tv_sec = attr->atime; //// access time, unchanged
+        times[1].tv_sec =  dt.toTime_t(); // modification time
+        times[0].tv_usec = times[1].tv_usec = 0;
+
+        sftp_utimes(mSftp, dest_orig_c.data(), times);
+        sftp_attributes_free(attr);
+      }
+    }
+  }
+#endif
+  // We have done our job => finish
+  finished();
 }
 
-int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){
-
-    kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): " << url << endl;
-
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
-
-    //kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): Encoded Path: " << path << endl;
-    //kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): Encoded Size: " << len << endl;
-
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+void sftpProtocol::copy(const KURL &src, const KURL &dest, int permissions, bool overwrite)
+{
+  kdDebug(TDEIO_SFTP_DB) << src.url() << " -> " << dest.url() << " , permissions = " << TQString::number(permissions)
+                                      << ", overwrite = " << overwrite << endl;
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len);
-    s << (TQ_UINT8)SSH2_FXP_READLINK;
-    s << id;
-    s.writeBytes(path.data(), len);
+  error(TDEIO::ERR_UNSUPPORTED_ACTION, TQString());
+}
 
+void sftpProtocol::stat(const KURL& url) {
+  kdDebug(TDEIO_SFTP_DB) << url.url() << endl;
 
-    putPacket(p);
-    getPacket(p);
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    TQ_UINT8 type;
-    TQDataStream r(p, IO_ReadOnly);
+  if (! url.hasPath() || TQDir::isRelativePath(url.path()) ||
+      url.path().contains("/./") || url.path().contains("/../")) {
+    TQString cPath;
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpReadLink(): sftp packet id mismatch" << endl;
-        return -1;
+    if (url.hasPath()) {
+      cPath = canonicalizePath(url.path());
+    } else {
+      cPath = canonicalizePath(TQString("."));
     }
 
-    if( type == SSH2_FXP_STATUS ) {
-        TQ_UINT32 code;
-        r >> code;
-        kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): read link failed with code " << code << endl;
-        return code;
+    if (cPath.isEmpty()) {
+      error(TDEIO::ERR_MALFORMED_URL, url.prettyURL());
+      return;
     }
+    KURL redir(url);
+    redir.setPath(cPath);
+    redirection(redir);
 
-    if( type != SSH2_FXP_NAME ) {
-        kdError(TDEIO_SFTP_DB) << "sftpReadLink(): unexpected packet type of " << type << endl;
-        return -1;
-    }
+    kdDebug(TDEIO_SFTP_DB) << "redirecting to " << redir.url() << endl;
 
-    TQ_UINT32 count;
-    r >> count;
-    if( count != 1 ) {
-        kdError(TDEIO_SFTP_DB) << "sftpReadLink(): Bad number of file attributes for realpath command" << endl;
-        return -1;
-    }
+    finished();
+    return;
+  }
 
-    TQCString linkAddress;
-    r >> linkAddress;
+  TQByteArray path = url.path().utf8();
 
-    linkAddress.truncate(linkAddress.size());
-    kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): Link address: " << linkAddress << endl;
+  const TQString sDetails = metaData(TQString("details"));
+  const int details = sDetails.isEmpty() ? 2 : sDetails.toInt();
 
-    target = remoteEncoding()->decode(linkAddress);
+  UDSEntry entry;
+  entry.clear();
+  if (!createUDSEntry(url.fileName(), path, entry, details)) {
+    error(TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL());
+    return;
+  }
 
-    return SSH2_FX_OK;
-}
+  statEntry(entry);
 
-int sftpProtocol::sftpSymLink(const TQString& _target, const KURL& dest){
+  finished();
+}
 
-    TQCString destPath = remoteEncoding()->encode(dest.path());
-    TQCString target = remoteEncoding()->encode(_target);
-    uint dlen = destPath.length();
-    uint tlen = target.length();
+void sftpProtocol::mimetype(const KURL& url){
+  kdDebug(TDEIO_SFTP_DB) << url.url() << endl;
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpSymLink(" << target << " -> " << destPath << ")" << endl;
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+  // stat() feeds the mimetype
+  statMime(url);
+  closeFile();
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ +
-                    4 /*str length*/ + tlen +
-                    4 /*str length*/ + dlen);
-    s << (TQ_UINT8)SSH2_FXP_SYMLINK;
-    s << (TQ_UINT32)id;
-    s.writeBytes(target.data(), tlen);
-    s.writeBytes(destPath.data(), dlen);
+  finished();
+}
 
-    putPacket(p);
-    getPacket(p);
+void sftpProtocol::listDir(const KURL& url) {
+  kdDebug(TDEIO_SFTP_DB) << "list directory: " << url.url() << endl;
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpSymLink(): sftp packet id mismatch" << endl;
-        return -1;
-    }
+  if (! url.hasPath() || TQDir::isRelativePath(url.path()) ||
+      url.path().contains("/./") || url.path().contains("/../")) {
+    TQString cPath;
 
-    if( type != SSH2_FXP_STATUS ) {
-        kdError(TDEIO_SFTP_DB) << "sftpSymLink(): unexpected message type of " << type << endl;
-        return -1;
+    if (url.hasPath()) {
+      cPath = canonicalizePath(url.path());
+    } else {
+      cPath = canonicalizePath(TQString("."));
     }
 
-    TQ_UINT32 code;
-    r >> code;
-    if( code != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "sftpSymLink(): rename failed with err code " << code << endl;
+    if (cPath.isEmpty()) {
+      error(TDEIO::ERR_MALFORMED_URL, url.prettyURL());
+      return;
     }
+    KURL redir(url);
+    redir.setPath(cPath);
+    redirection(redir);
 
-    return code;
-}
-
-/** Stats a file. */
-int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) {
+    kdDebug(TDEIO_SFTP_DB) << "redirecting to " << redir.url() << endl;
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpStat(): " << url << endl;
-
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
+    finished();
+    return;
+  }
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+  TQByteArray path = url.path().utf8();
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len);
-    s << (TQ_UINT8)SSH2_FXP_LSTAT;
-    s << (TQ_UINT32)id;
-    s.writeBytes(path.data(), len);
+  sftp_dir dp = sftp_opendir(mSftp, path.data());
+  if (dp == NULL) {
+    reportError(url, sftp_get_error(mSftp));
+    return;
+  }
 
-    putPacket(p);
-    getPacket(p);
+  sftp_attributes dirent = NULL;
+  const TQString sDetails = metaData(TQString("details"));
+  const int details = sDetails.isEmpty() ? 2 : sDetails.toInt();
+  TQValueList<TQByteArray> entryNames;
+  UDSEntry entry;
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  kdDebug(TDEIO_SFTP_DB) << "readdir: " << path.data() << ", details: " << TQString::number(details) << endl;
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpStat(): sftp packet id mismatch" << endl;
-        return -1;
-    }
+  UDSAtom atom;
 
-    if( type == SSH2_FXP_STATUS ) {
-        TQ_UINT32 errCode;
-        r >> errCode;
-        kdError(TDEIO_SFTP_DB) << "sftpStat(): stat failed with code " << errCode << endl;
-        return errCode;
-    }
+  for (;;) {
+    mode_t access;
+    mode_t type;
+    char *link;
 
-    if( type != SSH2_FXP_ATTRS ) {
-        kdError(TDEIO_SFTP_DB) << "sftpStat(): unexpected message type of " << type << endl;
-        return -1;
+    dirent = sftp_readdir(mSftp, dp);
+    if (dirent == NULL) {
+      break;
     }
 
-    r >> attr;
-    attr.setFilename(url.fileName());
-    kdDebug(TDEIO_SFTP_DB) << "sftpStat(): " << attr << endl;
+    entry.clear();
+    atom.m_uds = UDS_NAME;
+    atom.m_str = TQFile::decodeName(dirent->name);
+    entry.append(atom);
 
-    // If the stat'ed resource is a symlink, perform a recursive stat
-    // to determine the actual destination's type (file/dir).
-    if( S_ISLNK(attr.permissions()) && isSupportedOperation(SSH2_FXP_READLINK) ) {
+    if (dirent->type == SSH_FILEXFER_TYPE_SYMLINK) {
+      TQCString file = (TQString::fromUtf8(path) + "/" + TQFile::decodeName(dirent->name)).utf8().data();
 
-        TQString target;
-        int code = sftpReadLink( url, target );
+      atom.m_uds = UDS_FILE_TYPE;
+      atom.m_long = S_IFREG;
+      entry.append(atom);
 
-        if ( code != SSH2_FX_OK ) {
-            kdError(TDEIO_SFTP_DB) << "sftpStat(): Unable to stat symlink destination" << endl;
-            return -1;
+      link = sftp_readlink(mSftp, file.data());
+      if (link == NULL) {
+        sftp_attributes_free(dirent);
+        error(TDEIO::ERR_INTERNAL, i18n("Could not read link: %1").arg(TQString::fromUtf8(file)));
+        return;
+      }
+      atom.m_uds = UDS_LINK_DEST;
+      atom.m_str = TQFile::decodeName(link);
+      entry.append(atom);
+      delete link;
+      // A symlink -> follow it only if details > 1
+      if (details > 1) {
+        sftp_attributes sb = sftp_stat(mSftp, file.data());
+        if (sb == NULL) {
+          // It is a link pointing to nowhere
+          type = S_IFMT - 1;
+          access = S_IRWXU | S_IRWXG | S_IRWXO;
+          atom.m_uds = UDS_FILE_TYPE;
+          atom.m_long = type;
+          entry.append(atom);
+          atom.m_uds = UDS_ACCESS;
+          atom.m_long = access;
+          entry.append(atom);
+          atom.m_uds = UDS_SIZE;
+          atom.m_long = 0;
+          entry.append(atom);
+
+          goto notype;
         }
+        sftp_attributes_free(dirent);
+        dirent = sb;
+      }
+    }
 
-        kdDebug(TDEIO_SFTP_DB) << "sftpStat(): Resource is a symlink to -> " << target << endl;
+    switch (dirent->type) {
+      case SSH_FILEXFER_TYPE_REGULAR:
+        atom.m_uds = UDS_FILE_TYPE;
+        atom.m_long = S_IFREG;
+        entry.append(atom);
+        break;
+      case SSH_FILEXFER_TYPE_DIRECTORY:
+        atom.m_uds = UDS_FILE_TYPE;
+        atom.m_long = S_IFDIR;
+        entry.append(atom);
+        break;
+      case SSH_FILEXFER_TYPE_SYMLINK:
+        atom.m_uds = UDS_FILE_TYPE;
+        atom.m_long = S_IFLNK;
+        entry.append(atom);
+        break;
+      case SSH_FILEXFER_TYPE_SPECIAL:
+      case SSH_FILEXFER_TYPE_UNKNOWN:
+        break;
+    }
+
+    access = dirent->permissions & 07777;
+    atom.m_uds = UDS_ACCESS;
+    atom.m_long = access;
+    entry.append(atom);
+
+    atom.m_uds = UDS_SIZE;
+    atom.m_long = dirent->size;
+    entry.append(atom);
+
+notype:
+    if (details > 0) {
+      atom.m_uds = UDS_USER;
+      if (dirent->owner) {
+          atom.m_str = TQString::fromUtf8(dirent->owner);
+      } else {
+          atom.m_str = TQString::number(dirent->uid);
+      }
+      entry.append(atom);
 
-        KURL dest( url );
-        if( target[0] == '/' )
-            dest.setPath(target);
-        else
-            dest.setFileName(target);
+      atom.m_uds = UDS_GROUP;
+      if (dirent->group) {
+          atom.m_str = TQString::fromUtf8(dirent->group);
+      } else {
+          atom.m_str = TQString::number(dirent->gid);
+      }
+      entry.append(atom);
 
-        dest.cleanPath();
+      atom.m_uds = UDS_ACCESS_TIME;
+      atom.m_long = dirent->atime;
+      entry.append(atom);
 
-        // Ignore symlinks that point to themselves...
-        if ( dest != url ) {
+      atom.m_uds = UDS_MODIFICATION_TIME;
+      atom.m_long = dirent->mtime;
+      entry.append(atom);
 
-            sftpFileAttr attr2 (remoteEncoding());
-            (void) sftpStat(dest, attr2);
+      atom.m_uds = UDS_MODIFICATION_TIME;
+      atom.m_long = dirent->createtime;
+      entry.append(atom);
+    }
 
-            if (attr2.linkType() == 0)
-                attr.setLinkType(attr2.fileType());
-            else
-                attr.setLinkType(attr2.linkType());
+    sftp_attributes_free(dirent);
+    listEntry(entry, false);
+  } // for ever
+  sftp_closedir(dp);
+  listEntry(entry, true); // ready
 
-            attr.setLinkDestination(target);
+  finished();
+}
 
-            kdDebug(TDEIO_SFTP_DB) << "sftpStat(): File type: " << attr.fileType() << endl;
-        }
-    }
+void sftpProtocol::mkdir(const KURL &url, int permissions) {
+  kdDebug(TDEIO_SFTP_DB) << "create directory: " << url.url() << endl;
 
-    return SSH2_FX_OK;
-}
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
+  if (url.path().isEmpty()) {
+    error(TDEIO::ERR_MALFORMED_URL, url.prettyURL());
+    return;
+  }
+  const TQString path = url.path();
+  const TQByteArray path_c = path.utf8();
 
-int sftpProtocol::sftpOpen(const KURL& url, const TQ_UINT32 pflags,
-                           const sftpFileAttr& attr, TQByteArray& handle) {
-    kdDebug(TDEIO_SFTP_DB) << "sftpOpen(" << url << ", handle" << endl;
+  // Remove existing file or symlink, if requested.
+  if (metaData(TQString("overwrite")) == TQString("true")) {
+    kdDebug(TDEIO_SFTP_DB) << "overwrite set, remove existing file or symlink: " << url.url() << endl;
+    sftp_unlink(mSftp, path_c.data());
+  }
 
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
+  kdDebug(TDEIO_SFTP_DB) << "Trying to create directory: " << path << endl;
+  sftp_attributes sb = sftp_lstat(mSftp, path_c.data());
+  if (sb == NULL) {
+    if (sftp_mkdir(mSftp, path_c.data(), 0777) < 0) {
+      reportError(url, sftp_get_error(mSftp));
+      sftp_attributes_free(sb);
+      return;
+    } else {
+      kdDebug(TDEIO_SFTP_DB) << "Successfully created directory: " << url.url() << endl;
+      if (permissions != -1) {
+        chmod(url, permissions);
+      } else {
+        finished();
+      }
+      sftp_attributes_free(sb);
+      return;
+    }
+  }
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+  if (sb->type == SSH_FILEXFER_TYPE_DIRECTORY) {
+    error(TDEIO::ERR_DIR_ALREADY_EXIST, path);
+  } else {
+    error(TDEIO::ERR_FILE_ALREADY_EXIST, path);
+  }
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ +
-                    4 /*str length*/ + len +
-                    4 /*pflags*/ + attr.size());
-    s << (TQ_UINT8)SSH2_FXP_OPEN;
-    s << (TQ_UINT32)id;
-    s.writeBytes(path.data(), len);
-    s << pflags;
-    s << attr;
+  sftp_attributes_free(sb);
+  return;
+}
 
-    putPacket(p);
-    getPacket(p);
+void sftpProtocol::rename(const KURL& src, const KURL& dest, bool overwrite) {
+  kdDebug(TDEIO_SFTP_DB) << "rename " << src.url() << " to " << dest.url() << endl;
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpOpen(): sftp packet id mismatch" << endl;
-        return -1;
-    }
+  TQByteArray qsrc = src.path().utf8();
+  TQByteArray qdest = dest.path().utf8();
 
-    if( type == SSH2_FXP_STATUS ) {
-        TQ_UINT32 errCode;
-        r >> errCode;
-        return errCode;
+  sftp_attributes sb = sftp_lstat(mSftp, qdest.data());
+  if (sb != NULL) {
+    if (!overwrite) {
+      if (sb->type == SSH_FILEXFER_TYPE_DIRECTORY) {
+        error(TDEIO::ERR_DIR_ALREADY_EXIST, dest.url());
+      } else {
+        error(TDEIO::ERR_FILE_ALREADY_EXIST, dest.url());
+      }
+      sftp_attributes_free(sb);
+      return;
     }
 
-    if( type != SSH2_FXP_HANDLE ) {
-        kdError(TDEIO_SFTP_DB) << "sftpOpen(): unexpected message type of " << type << endl;
-        return -1;
-    }
+    del(dest, sb->type == SSH_FILEXFER_TYPE_DIRECTORY ? true : false);
+  }
+  sftp_attributes_free(sb);
 
-    r >> handle;
-    if( handle.size() > 256 ) {
-        kdError(TDEIO_SFTP_DB) << "sftpOpen(): handle exceeds max length" << endl;
-        return -1;
-    }
+  if (sftp_rename(mSftp, qsrc.data(), qdest.data()) < 0) {
+    reportError(dest, sftp_get_error(mSftp));
+    return;
+  }
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpOpen(): handle (" << handle.size() << "): [" << handle << "]" << endl;
-    return SSH2_FX_OK;
+  finished();
 }
 
+void sftpProtocol::symlink(const TQString& target, const KURL& dest, bool overwrite) {
+  kdDebug(TDEIO_SFTP_DB) << "link " << target << "->" << dest.url()
+                      << ", overwrite = " << overwrite << endl;
 
-int sftpProtocol::sftpRead(const TQByteArray& handle, TDEIO::filesize_t offset, TQ_UINT32 len, TQByteArray& data)
-{
- //   kdDebug(TDEIO_SFTP_DB) << "sftpRead( offset = " << offset << ", len = " << len << ")" << endl;
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ +
-                    4 /*str length*/ + handle.size() +
-                    8 /*offset*/ + 4 /*length*/);
-    s << (TQ_UINT8)SSH2_FXP_READ;
-    s << (TQ_UINT32)id;
-    s << handle;
-    s << offset; // we don't have a convienient 64 bit int so set upper int to zero
-    s << len;
-
-    putPacket(p);
-    getPacket(p);
-
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
-
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRead: sftp packet id mismatch" << endl;
-        return -1;
-    }
-
-    if( type == SSH2_FXP_STATUS ) {
-        TQ_UINT32 errCode;
-        r >> errCode;
-        kdError(TDEIO_SFTP_DB) << "sftpRead: read failed with code " << errCode << endl;
-        return errCode;
-    }
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    if( type != SSH2_FXP_DATA ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRead: unexpected message type of " << type << endl;
-        return -1;
+  TQByteArray t = target.utf8();
+  TQByteArray d = dest.path().utf8();
+
+  bool failed = false;
+  if (sftp_symlink(mSftp, t.data(), d.data()) < 0) {
+    if (overwrite) {
+      sftp_attributes sb = sftp_lstat(mSftp, d.data());
+      if (sb == NULL) {
+        failed = true;
+      } else {
+        if (sftp_unlink(mSftp, d.data()) < 0) {
+          failed = true;
+        } else {
+          if (sftp_symlink(mSftp, t.data(), d.data()) < 0) {
+            failed = true;
+          }
+        }
+      }
+      sftp_attributes_free(sb);
     }
+  }
 
-    r >> data;
+  if (failed) {
+    reportError(dest, sftp_get_error(mSftp));
+    return;
+  }
 
-    return SSH2_FX_OK;
+  finished();
 }
 
+void sftpProtocol::chmod(const KURL& url, int permissions) {
+  kdDebug(TDEIO_SFTP_DB) << "change permission of " << url.url() << " to " << TQString::number(permissions) << endl;
 
-int sftpProtocol::sftpWrite(const TQByteArray& handle, TDEIO::filesize_t offset, const TQByteArray& data){
-//    kdDebug(TDEIO_SFTP_DB) << "sftpWrite( offset = " << offset <<
-//        ", data sz = " << data.size() << ")" << endl;
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ +
-                    4 /*str length*/ + handle.size() +
-                    8 /*offset*/ +
-                    4 /* data size */ + data.size());
-    s << (TQ_UINT8)SSH2_FXP_WRITE;
-    s << (TQ_UINT32)id;
-    s << handle;
-    s << offset; // we don't have a convienient 64 bit int so set upper int to zero
-    s << data;
+  TQByteArray path = url.path().utf8();
 
-//    kdDebug(TDEIO_SFTP_DB) << "sftpWrite(): SSH2_FXP_WRITE, id:"
-//        << id << ", handle:" << handle << ", offset:" << offset << ", some data" << endl;
+  if (sftp_chmod(mSftp, path.data(), permissions) < 0) {
+    reportError(url, sftp_get_error(mSftp));
+    return;
+  }
 
-//    kdDebug(TDEIO_SFTP_DB) << "sftpWrite(): send packet [" << p << "]" << endl;
+  finished();
+}
 
-    putPacket(p);
-    getPacket(p);
+void sftpProtocol::del(const KURL &url, bool isfile){
+  kdDebug(TDEIO_SFTP_DB) << "deleting " << (isfile ? "file: " : "directory: ") << url.url() << endl;
 
-//    kdDebug(TDEIO_SFTP_DB) << "sftpWrite(): received packet [" << p << "]" << endl;
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  TQByteArray path = url.path().utf8();
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpWrite(): sftp packet id mismatch, got "
-            << id << ", expected " << expectedId << endl;
-        return -1;
+  if (isfile) {
+    if (sftp_unlink(mSftp, path.data()) < 0) {
+      reportError(url, sftp_get_error(mSftp));
+      return;
     }
-
-    if( type != SSH2_FXP_STATUS ) {
-        kdError(TDEIO_SFTP_DB) << "sftpWrite(): unexpected message type of " << type << endl;
-        return -1;
+  } else {
+    if (sftp_rmdir(mSftp, path.data()) < 0) {
+      reportError(url, sftp_get_error(mSftp));
+      return;
     }
+  }
 
-    TQ_UINT32 code;
-    r >> code;
-    return code;
+  finished();
 }
 
-
+void sftpProtocol::slave_status() {
+  kdDebug(TDEIO_SFTP_DB) << "connected to " << mHost << "?: " << mConnected << endl;
+  slaveStatus((mConnected ? mHost : TQString()), mConnected);
+}
diff --git a/tdeioslave/sftp/tdeio_sftp.h b/tdeioslave/sftp/tdeio_sftp.h
index 30c452f9b..75b295cfd 100644
--- a/tdeioslave/sftp/tdeio_sftp.h
+++ b/tdeioslave/sftp/tdeio_sftp.h
@@ -1,59 +1,111 @@
-/***************************************************************************
-                          sftpProtocol.h  -  description
-                             -------------------
-    begin                : Sat Jun 30 20:08:47 CDT 2001
-    copyright            : (C) 2001 by Lucas Fisher
-    email                : ljfisher@purdue.edu
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+ * Copyright (c) 2001  Lucas Fisher       <ljfisher@purdue.edu>
+ * Copyright (c) 2009  Andreas Schneider  <mail@cynapses.org>
+ * Copyright (c) 2020  Martin Sandsmark   <martin@sandsmark.ninja>
+ *                     KDE2 port
+ * Copyright (c) 2022  Mavridis Philippe  <mavridisf@gmail.com>
+ *                     Trinity port
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License (LGPL) as published by the Free Software Foundation;
+ * either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
 #ifndef __tdeio_sftp_h__
 #define __tdeio_sftp_h__
 
-#include <tqstring.h>
-#include <tqcstring.h>
-#include <tqobject.h>
-
 #include <kurl.h>
 #include <tdeio/global.h>
 #include <tdeio/slavebase.h>
 #include <kdebug.h>
+#include <stdint.h>
+#include <memory>
 
-#include "process.h"
-#include "sftpfileattr.h"
-#include "ksshprocess.h"
+#include <libssh/libssh.h>
+#include <libssh/sftp.h>
+#include <libssh/callbacks.h>
 
+// How big should each data packet be? Definitely not bigger than 64kb or
+// you will overflow the 2 byte size variable in a sftp packet.
+#define MAX_XFER_BUF_SIZE 60 * 1024
 #define TDEIO_SFTP_DB 7120
 
 
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 7, 90)
+#define TDEIO_SSH_KNOWN_HOSTS_OK        SSH_SERVER_KNOWN_OK
+#define TDEIO_SSH_KNOWN_HOSTS_OTHER     SSH_SERVER_FOUND_OTHER
+#define TDEIO_SSH_KNOWN_HOSTS_CHANGED   SSH_SERVER_KNOWN_CHANGED
+#define TDEIO_SSH_KNOWN_HOSTS_NOT_FOUND SSH_SERVER_FILE_NOT_FOUND
+#define TDEIO_SSH_KNOWN_HOSTS_UNKNOWN   SSH_SERVER_NOT_KNOWN
+#define TDEIO_SSH_KNOWN_HOSTS_ERROR     SSH_SERVER_ERROR
+
+#else
+#define TDEIO_SSH_KNOWN_HOSTS_OK        SSH_KNOWN_HOSTS_OK
+#define TDEIO_SSH_KNOWN_HOSTS_OTHER     SSH_KNOWN_HOSTS_OTHER
+#define TDEIO_SSH_KNOWN_HOSTS_CHANGED   SSH_KNOWN_HOSTS_CHANGED
+#define TDEIO_SSH_KNOWN_HOSTS_NOT_FOUND SSH_KNOWN_HOSTS_NOT_FOUND
+#define TDEIO_SSH_KNOWN_HOSTS_UNKNOWN   SSH_KNOWN_HOSTS_UNKNOWN
+#define TDEIO_SSH_KNOWN_HOSTS_ERROR     SSH_KNOWN_HOSTS_ERROR
+#endif
+
+namespace TDEIO {
+  class AuthInfo;
+}
+
 class sftpProtocol : public TDEIO::SlaveBase
 {
 
 public:
   sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket);
   virtual ~sftpProtocol();
-  virtual void setHost(const TQString& h, int port, const TQString& user, const TQString& pass);
-  virtual void get(const KURL& url);
-  virtual void listDir(const KURL& url) ;
-  virtual void mimetype(const KURL& url);
-  virtual void stat(const KURL& url);
-  virtual void copy(const KURL &src, const KURL &dest, int permissions, bool overwrite);
-  virtual void put(const KURL& url, int permissions, bool overwrite, bool resume);
-  virtual void closeConnection();
-  virtual void slave_status();
-  virtual void del(const KURL &url, bool isfile);
-  virtual void chmod(const KURL& url, int permissions);
-  virtual void symlink(const TQString& target, const KURL& dest, bool overwrite);
-  virtual void rename(const KURL& src, const KURL& dest, bool overwrite);
-  virtual void mkdir(const KURL&url, int permissions);
-  virtual void openConnection();
+  virtual void setHost(const TQString& h, int port, const TQString& user, const TQString& pass) override;
+  virtual void get(const KURL& url) override;
+  virtual void listDir(const KURL& url)  override;
+  virtual void mimetype(const KURL& url) override;
+  virtual void stat(const KURL& url) override;
+  virtual void put(const KURL& url, int permissions, bool overwrite, bool resume) override;
+  virtual void copy(const KURL &src, const KURL &dest, int permissions, bool overwrite) override;
+  virtual void closeConnection() override;
+  virtual void slave_status() override;
+  virtual void del(const KURL &url, bool isfile) override;
+  virtual void chmod(const KURL& url, int permissions) override;
+  virtual void symlink(const TQString& target, const KURL& dest, bool overwrite) override;
+  virtual void rename(const KURL& src, const KURL& dest, bool overwrite) override;
+  virtual void mkdir(const KURL& url, int permissions) override;
+  virtual void openConnection() override;
+
+  // libssh authentication callback (note that this is called by the
+  // global ::auth_callback() call.
+  int auth_callback(const char *prompt, char *buf, size_t len,
+                    int echo, int verify, void *userdata);
+
+  // libssh logging callback (note that this is called by the
+  // global ::log_callback() call.
+  void log_callback(ssh_session session, int priority, const char *message,
+                    void *userdata);
+
+  // Callbacks for SSHAuthMethod-derived strategies
+  int authenticatePublicKey();
+  int authenticateKeyboardInteractive(bool noPaswordQuery = false);
+  int authenticatePassword(bool noPaswordQuery = false);
+
+  /** Some extra authentication failure reasons intended to use alongside was declared in libssh */
+  enum extra_ssh_auth_e {
+    SSH_AUTH_CANCELED=128,   //< user canceled password entry dialog
+    SSH_AUTH_NEED_RECONNECT  //< it is required to reinitialize connection from scratch
+  };
 
 private: // Private variables
   /** True if ioslave is connected to sftp server. */
@@ -65,85 +117,103 @@ private: // Private variables
   /** Port we are connected to. */
   int mPort;
 
-  /** Ssh process to which we send the sftp packets. */
-  KSshProcess ssh;
+  /** The ssh session for the connection */
+  ssh_session mSession;
 
-  /** Username to use when connecting */
+  /** The sftp session for the connection */
+  sftp_session mSftp;
+
+  /** Username to use when connecting, Note: it's the one passed in the URL */
   TQString mUsername;
 
-  /** User's password */
+  /** Username to use with the next connection attempt: it's either from the cached data or from
+   * the password dialog that was prompted to the user. */
+  TQString mCachedUsername;
+
+  /** User's password. Note: the password would be set only if it was somehow cached: passed to
+   * setHost(), received from passwdserver's cache or was entered by user before reconnection
+   */
   TQString mPassword;
 
-  /** Message id of the last sftp packet we sent. */
-  unsigned int mMsgId;
+  /** The open file */
+  sftp_file mOpenFile;
 
-  /** Type of packet we are expecting to receive next. */
-  unsigned char mExpected;
+  /** The open URL */
+  KURL mOpenUrl;
+
+  ssh_callbacks mCallbacks;
 
   /** Version of the sftp protocol we are using. */
   int sftpVersion;
-  
-  struct Status 
-  {
-    int code;
-    TDEIO::filesize_t size;
-    TQString text;
-  };
+
+  //struct Status
+  //{
+  //  int code;
+  //  TDEIO::filesize_t size;
+  //  TQString text;
+  //};
+
+  /** Some data needed to interact with auth_callback() */
+  struct {
+    /** List of keys user was already prompted to enter the passphrase for.
+     *  Note: Under most sane circumstances the list shouldn't go beyond size=2,
+     *        so no fancy containers here
+     */
+    TQStringList attemptedKeys;
+    /** A backup for SlaveBase::s_seqNr to pass the same value to prompts for different keys */
+    long current_seqNr;
+    /** true if callback was called */
+    bool wasCalled;
+    /** true if user canceled all passphrase entry dialogues */
+    bool wasCanceled;
+  } mPubKeyAuthData;
+
+  /** true if the password dialog was prompted to the user at leas once */
+  bool mPasswordWasPrompted = false;
 
 private: // private methods
-  bool getPacket(TQByteArray& msg);
+  void statMime(const KURL &url);
+  void closeFile();
 
-   /* Type is a sftp packet type found in .sftp.h'.
-   * Example: SSH2_FXP_READLINK, SSH2_FXP_RENAME, etc.
-   *
-   * Returns true if the type is supported by the sftp protocol
-   * version negotiated by the client and server (sftpVersion).
-   */
-  bool isSupportedOperation(int type);
-  /** Used to have the server canonicalize any given path name to an absolute path.
-      This is useful for converting path names containing ".." components or relative
-      pathnames without a leading slash into absolute paths.
-      Returns the canonicalized url. */
-  int sftpRealPath(const KURL& url, KURL& newUrl);
-
-  /** Send an sftp packet to stdin of the ssh process. */
-  bool putPacket(TQByteArray& p);
-  /** Process SSH_FXP_STATUS packets. */
-  void processStatus(TQ_UINT8, const TQString& message = TQString::null);
-  /** Process SSH_FXP_STATUS packes and return the result. */
-  Status doProcessStatus(TQ_UINT8, const TQString& message = TQString::null);
-  /** Opens a directory handle for url.path. Returns true if succeeds. */
-  int sftpOpenDirectory(const KURL& url, TQByteArray& handle);
-  /** Closes a directory or file handle. */
-  int sftpClose(const TQByteArray& handle);
-  /** Send a sftp command to rename a file or directoy. */
-  int sftpRename(const KURL& src, const KURL& dest);
-  /** Set a files attributes. */
-  int sftpSetStat(const KURL& url, const sftpFileAttr& attr);
-  /** Sends a sftp command to remove a file or directory. */
-  int sftpRemove(const KURL& url, bool isfile);
-  /** Creates a symlink named dest to target. */
-  int sftpSymLink(const TQString& target, const KURL& dest);
-  /** Get directory listings. */
-  int sftpReadDir(const TQByteArray& handle, const KURL& url);
-  /** Retrieves the destination of a link. */
-  int sftpReadLink(const KURL& url, TQString& target);
-  /** Stats a file. */
-  int sftpStat(const KURL& url, sftpFileAttr& attr);
-  /** No descriptions */
-  int sftpOpen(const KURL& url, const TQ_UINT32 pflags, const sftpFileAttr& attr, TQByteArray& handle);
-  /** No descriptions */
-  int sftpRead(const TQByteArray& handle, TDEIO::filesize_t offset, TQ_UINT32 len, TQByteArray& data);
-  /** No descriptions */
-  int sftpWrite(const TQByteArray& handle, TDEIO::filesize_t offset, const TQByteArray& data);
-  
-  /** Performs faster upload when the source is a local file... */
-  void sftpCopyPut(const KURL& src, const KURL& dest, int mode, bool overwrite);
-  /** Performs faster download when the destination is a local file... */
-  void sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool overwrite);
-  
-  /** */
-  Status sftpGet( const KURL& src, TDEIO::filesize_t offset = 0, int fd = -1);
-  void sftpPut( const KURL& dest, int permissions, bool resume, bool overwrite, int fd = -1);
+  /** @returns username used by libssh during the connection */
+  TQString sshUsername();
+
+  /** Adds ssh error (if any) to the given message string */
+  TQString sshError(TQString errMsg=TQString());
+
+  /** A small helper function to construct auth info skeleton for the protocol */
+  TDEIO::AuthInfo authInfo();
+
+  /** A helper function encapsulating creation of an ssh connection before authentication */
+  int initializeConnection();
+
+  void reportError(const KURL &url, const int err);
+
+  bool createUDSEntry(const TQString &filename, const TQByteArray &path,
+      TDEIO::UDSEntry &entry, short int details);
+
+  TQString canonicalizePath(const TQString &path);
 };
+
+/** A base class for ssh authentication methods. */
+class SSHAuthMethod {
+public:
+  /** libssh's flag for he method */
+  virtual unsigned flag() = 0;
+  /** The user-friendly (probably translated) name of the method */
+  virtual TQString name() {return flagToStr(flag());}
+  /** Actually do perform the auth process */
+  virtual int authenticate(sftpProtocol *ioslave) const = 0;
+  /** Creates a copy of derived class */
+  virtual SSHAuthMethod* clone() = 0;
+
+  virtual ~SSHAuthMethod() {};
+
+  /** Returns a name for the given libssh auth method flag */
+  static TQString flagToStr(unsigned method);
+
+  /** Returns a list of names for all the methods set in the given libssh auth method bitset */
+  static TQStringList bitsetToStr(unsigned method);
+};
+
 #endif
diff --git a/tdeioslave/smb/tdeio_smb.h b/tdeioslave/smb/tdeio_smb.h
index a81728d5d..56c296c31 100644
--- a/tdeioslave/smb/tdeio_smb.h
+++ b/tdeioslave/smb/tdeio_smb.h
@@ -94,7 +94,7 @@ class TDEProcess;
 
 class SMBSlave : public TQObject, public TDEIO::SlaveBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 private:
     //---------------------------------------------------------------------
diff --git a/tdeioslave/smb/tdeio_smb_mount.cpp b/tdeioslave/smb/tdeio_smb_mount.cpp
index 0aef92698..120372672 100644
--- a/tdeioslave/smb/tdeio_smb_mount.cpp
+++ b/tdeioslave/smb/tdeio_smb_mount.cpp
@@ -113,11 +113,11 @@ void SMBSlave::special( const TQByteArray & data)
          proc << TDEProcess::quote(mountPoint.local8Bit());
          proc << options;
 
-         connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )),
-                 TQT_SLOT(readOutput(TDEProcess *, char *, int)));
+         connect(&proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int )),
+                 TQ_SLOT(readOutput(TDEProcess *, char *, int)));
 
-         connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )),
-                 TQT_SLOT(readStdErr(TDEProcess *, char *, int)));
+         connect(&proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int )),
+                 TQ_SLOT(readStdErr(TDEProcess *, char *, int)));
 
          if (!proc.start( TDEProcess::Block, TDEProcess::AllOutput ))
          {
@@ -154,11 +154,11 @@ void SMBSlave::special( const TQByteArray & data)
          mybuf.truncate(0);
          mystderr.truncate(0);
 
-         connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )),
-                 TQT_SLOT(readOutput(TDEProcess *, char *, int)));
+         connect(&proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int )),
+                 TQ_SLOT(readOutput(TDEProcess *, char *, int)));
 
-         connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )),
-                 TQT_SLOT(readStdErr(TDEProcess *, char *, int)));
+         connect(&proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int )),
+                 TQ_SLOT(readStdErr(TDEProcess *, char *, int)));
 
          if ( !proc.start( TDEProcess::Block, TDEProcess::AllOutput ) )
          {
diff --git a/tdeioslave/smtp/interactivesmtpserver.cpp b/tdeioslave/smtp/interactivesmtpserver.cpp
index 4055a47a4..ed13d7253 100644
--- a/tdeioslave/smtp/interactivesmtpserver.cpp
+++ b/tdeioslave/smtp/interactivesmtpserver.cpp
@@ -55,8 +55,8 @@ InteractiveSMTPServerWindow::~InteractiveSMTPServerWindow() {
     if ( mSocket ) {
         mSocket->close();
         if ( mSocket->state() == TQSocket::Closing )
-            connect( mSocket, TQT_SIGNAL(delayedCloseFinished()),
-                     mSocket, TQT_SLOT(deleteLater()) );
+            connect( mSocket, TQ_SIGNAL(delayedCloseFinished()),
+                     mSocket, TQ_SLOT(deleteLater()) );
         else
             mSocket->deleteLater();
         mSocket = 0;
@@ -108,17 +108,17 @@ InteractiveSMTPServerWindow::InteractiveSMTPServerWindow( TQSocket * socket, TQW
   hlay->addWidget( mLineEdit, 1 );
   hlay->addWidget( but );
 
-  connect( mLineEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotSendResponse()) );
-  connect( but, TQT_SIGNAL(clicked()), TQT_SLOT(slotSendResponse()) );
+  connect( mLineEdit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotSendResponse()) );
+  connect( but, TQ_SIGNAL(clicked()), TQ_SLOT(slotSendResponse()) );
 
   but = new TQPushButton( "&Close Connection", this );
   vlay->addWidget( but );
 
-  connect( but, TQT_SIGNAL(clicked()), TQT_SLOT(slotConnectionClosed()) );
+  connect( but, TQ_SIGNAL(clicked()), TQ_SLOT(slotConnectionClosed()) );
 
-  connect( socket, TQT_SIGNAL(connectionClosed()), TQT_SLOT(slotConnectionClosed()) );
-  connect( socket, TQT_SIGNAL(error(int)), TQT_SLOT(slotError(int)) );
-  connect( socket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotReadyRead()) );
+  connect( socket, TQ_SIGNAL(connectionClosed()), TQ_SLOT(slotConnectionClosed()) );
+  connect( socket, TQ_SIGNAL(error(int)), TQ_SLOT(slotError(int)) );
+  connect( socket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotReadyRead()) );
 
   mLineEdit->setText( "220 hi there" );
   mLineEdit->setFocus();
diff --git a/tdeioslave/smtp/interactivesmtpserver.h b/tdeioslave/smtp/interactivesmtpserver.h
index 62eb9a7a7..c45a7cf56 100644
--- a/tdeioslave/smtp/interactivesmtpserver.h
+++ b/tdeioslave/smtp/interactivesmtpserver.h
@@ -66,7 +66,7 @@ static TQString trim( const TQString & s ) {
 
 
 class InteractiveSMTPServerWindow : public TQWidget {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   InteractiveSMTPServerWindow( TQSocket * socket, TQWidget * parent=0, const char * name=0, WFlags f=0 );
   ~InteractiveSMTPServerWindow();
@@ -102,7 +102,7 @@ private:
 };
 
 class InteractiveSMTPServer : public TQServerSocket {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   InteractiveSMTPServer( TQObject * parent=0 );
   ~InteractiveSMTPServer() {}
diff --git a/tdeioslave/smtp/smtp.cpp b/tdeioslave/smtp/smtp.cpp
index 00dff3684..ba009c1c5 100644
--- a/tdeioslave/smtp/smtp.cpp
+++ b/tdeioslave/smtp/smtp.cpp
@@ -71,7 +71,6 @@ using KioSMTP::TransactionState;
 #include <tqcstring.h>
 
 #include <memory>
-using std::auto_ptr;
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -446,8 +445,8 @@ void SMTPProtocol::queueCommand( int type ) {
 }
 
 bool SMTPProtocol::execute( int type, TransactionState * ts ) {
-  auto_ptr<Command> cmd( Command::createSimpleCommand( type, this ) );
-  kdFatal( !cmd.get(), 7112 ) << "Command::createSimpleCommand( " << type << " ) returned null!" << endl;
+  std::unique_ptr<Command> cmd( Command::createSimpleCommand( type, this ) );
+  kdFatal( !cmd, 7112 ) << "Command::createSimpleCommand( " << type << " ) returned null!" << endl;
   return execute( cmd.get(), ts );
 }
 
diff --git a/tdeioslave/smtp/smtp.h b/tdeioslave/smtp/smtp.h
index 853ff3ec6..9d324fe0c 100644
--- a/tdeioslave/smtp/smtp.h
+++ b/tdeioslave/smtp/smtp.h
@@ -39,9 +39,7 @@
 class KURL;
 class TQCString;
 template <typename T> class TQMemArray;
-#ifdef USE_QT3
 typedef TQMemArray<char> TQByteArray;
-#endif // USE_QT3
 
 namespace KioSMTP {
   class Response;
diff --git a/tdeioslave/system/systemimpl.cpp b/tdeioslave/system/systemimpl.cpp
index 21a9da7da..164b9a467 100644
--- a/tdeioslave/system/systemimpl.cpp
+++ b/tdeioslave/system/systemimpl.cpp
@@ -279,12 +279,12 @@ void SystemImpl::createEntry(TDEIO::UDSEntry &entry,
 		m_lastListingEmpty = true;
 
 		TDEIO::ListJob *job = TDEIO::listDir(url, false, false);
-		connect( job, TQT_SIGNAL( entries(TDEIO::Job *,
+		connect( job, TQ_SIGNAL( entries(TDEIO::Job *,
 		                      const TDEIO::UDSEntryList &) ),
-		         this, TQT_SLOT( slotEntries(TDEIO::Job *,
+		         this, TQ_SLOT( slotEntries(TDEIO::Job *,
 			             const TDEIO::UDSEntryList &) ) );
-		connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
-		         this, TQT_SLOT( slotResult(TDEIO::Job *) ) );
+		connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+		         this, TQ_SLOT( slotResult(TDEIO::Job *) ) );
 		tqApp->eventLoop()->enterLoop();
 
 		if (m_lastListingEmpty) icon = empty_icon;
diff --git a/tdeioslave/system/systemimpl.h b/tdeioslave/system/systemimpl.h
index 6270489c8..d4cc0e1cb 100644
--- a/tdeioslave/system/systemimpl.h
+++ b/tdeioslave/system/systemimpl.h
@@ -31,7 +31,7 @@
 
 class SystemImpl : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	SystemImpl();
 
diff --git a/tdeioslave/thumbnail/htmlcreator.cpp b/tdeioslave/thumbnail/htmlcreator.cpp
index 34742a0e9..5a6935010 100644
--- a/tdeioslave/thumbnail/htmlcreator.cpp
+++ b/tdeioslave/thumbnail/htmlcreator.cpp
@@ -50,7 +50,7 @@ bool HTMLCreator::create(const TQString &path, int width, int height, TQImage &i
     if (!m_html)
     {
         m_html = new TDEHTMLPart;
-        connect(m_html, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted()));
+        connect(m_html, TQ_SIGNAL(completed()), TQ_SLOT(slotCompleted()));
         m_html->setJScriptEnabled(false);
         m_html->setJavaEnabled(false);
         m_html->setPluginsEnabled(false);
diff --git a/tdeioslave/thumbnail/htmlcreator.h b/tdeioslave/thumbnail/htmlcreator.h
index 752cf0ace..052e1959e 100644
--- a/tdeioslave/thumbnail/htmlcreator.h
+++ b/tdeioslave/thumbnail/htmlcreator.h
@@ -27,7 +27,7 @@ class TDEHTMLPart;
 
 class HTMLCreator : public TQObject, public ThumbCreator
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTMLCreator();
     virtual ~HTMLCreator();
diff --git a/tdeioslave/thumbnail/thumbnail.cpp b/tdeioslave/thumbnail/thumbnail.cpp
index cc2eefbc3..98b01138c 100644
--- a/tdeioslave/thumbnail/thumbnail.cpp
+++ b/tdeioslave/thumbnail/thumbnail.cpp
@@ -428,7 +428,7 @@ const TQImage& ThumbnailProtocol::getIcon()
         int h = icon->height();
         for ( int y = 0; y < h; y++ )
         {
-            QRgb *line = (QRgb *) icon->scanLine( y );
+            TQRgb *line = (TQRgb *) icon->scanLine( y );
             for ( int x = 0; x < w; x++ )
                 line[x] &= m_iconAlpha; // transparency
         }
diff --git a/tdeioslave/trash/discspaceutil.cpp b/tdeioslave/trash/discspaceutil.cpp
index 186cb0e7f..e231b901c 100644
--- a/tdeioslave/trash/discspaceutil.cpp
+++ b/tdeioslave/trash/discspaceutil.cpp
@@ -102,9 +102,9 @@ void DiscSpaceUtil::done()
 void DiscSpaceUtil::calculateFullSize()
 {
   KDiskFreeSp *sp = KDiskFreeSp::findUsageInfo( mDirectory );
-  connect( sp, TQT_SIGNAL( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ),
-           this, TQT_SLOT( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ) );
-  connect( sp, TQT_SIGNAL( done() ), this, TQT_SLOT( done() ) );
+  connect( sp, TQ_SIGNAL( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ),
+           this, TQ_SLOT( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ) );
+  connect( sp, TQ_SIGNAL( done() ), this, TQ_SLOT( done() ) );
 
   tqApp->eventLoop()->enterLoop();
 }
diff --git a/tdeioslave/trash/discspaceutil.h b/tdeioslave/trash/discspaceutil.h
index a00141296..bcd8126e1 100644
--- a/tdeioslave/trash/discspaceutil.h
+++ b/tdeioslave/trash/discspaceutil.h
@@ -31,7 +31,7 @@
  */
 class DiscSpaceUtil : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/tdeioslave/trash/kcmtrash.cpp b/tdeioslave/trash/kcmtrash.cpp
index 4747e092a..8793be5d9 100644
--- a/tdeioslave/trash/kcmtrash.cpp
+++ b/tdeioslave/trash/kcmtrash.cpp
@@ -51,7 +51,7 @@ TrashModule::TrashModule(TQWidget *parent, const char *name)
 
 	policyWidget = new KTrashPropsWidget(this);
   tab->addTab(policyWidget, i18n("&Trash Policy"));
-  connect(policyWidget, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+  connect(policyWidget, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
   TQVBoxLayout *top = new TQVBoxLayout(this);
   top->addWidget(tab);
diff --git a/tdeioslave/trash/kcmtrash.h b/tdeioslave/trash/kcmtrash.h
index 4987ccfba..dc04b9587 100644
--- a/tdeioslave/trash/kcmtrash.h
+++ b/tdeioslave/trash/kcmtrash.h
@@ -27,7 +27,7 @@ class TQTabWidget;
 
 class TrashModule : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TrashModule(TQWidget *parent, const char *name);
diff --git a/tdeioslave/trash/ktrashpropsdlgplugin.cpp b/tdeioslave/trash/ktrashpropsdlgplugin.cpp
index 067c10b6e..7b36aaaf4 100644
--- a/tdeioslave/trash/ktrashpropsdlgplugin.cpp
+++ b/tdeioslave/trash/ktrashpropsdlgplugin.cpp
@@ -74,7 +74,7 @@ KTrashPropsDlgPlugin::KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const cha
 	policyWidget = new KTrashPropsWidget(frame);
   TQVBoxLayout *vLayout = new TQVBoxLayout(frame, 0, 0);
   vLayout->addWidget(policyWidget);
-  connect(policyWidget, TQT_SIGNAL(changed(bool)), TQT_SLOT(setDirty()));
+  connect(policyWidget, TQ_SIGNAL(changed(bool)), TQ_SLOT(setDirty()));
 }
 
 KTrashPropsDlgPlugin::~KTrashPropsDlgPlugin()
diff --git a/tdeioslave/trash/ktrashpropsdlgplugin.h b/tdeioslave/trash/ktrashpropsdlgplugin.h
index b839f6428..b17c0d5f8 100644
--- a/tdeioslave/trash/ktrashpropsdlgplugin.h
+++ b/tdeioslave/trash/ktrashpropsdlgplugin.h
@@ -36,7 +36,7 @@ class KTrashPropsWidget;
 
 class KTrashPropsDlgPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const char*, const TQStringList& );
diff --git a/tdeioslave/trash/ktrashpropswidget.cpp b/tdeioslave/trash/ktrashpropswidget.cpp
index 40e12cb4f..2040e9a76 100644
--- a/tdeioslave/trash/ktrashpropswidget.cpp
+++ b/tdeioslave/trash/ktrashpropswidget.cpp
@@ -50,15 +50,15 @@ KTrashPropsWidget::KTrashPropsWidget(TQWidget *parent, const char *name)
   mTrashImpl->init();
 
   setupGui();
-  connect(mUseTimeLimit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(useTypeChanged()));
-  connect(mDays, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setDirty()));
-  connect(mUseSizeLimit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(useTypeChanged()));
-  connect(mPercentSize, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(percentSizeChanged(double)));
-  connect(mFixedSize, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(fixedSizeChanged(double)));
-  connect(mFixedSizeUnit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(fixedSizeUnitActivated(int)));
-  connect(mRbPercentSize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(rbPercentSizeToggled(bool)));
-  connect(mRbFixedSize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(rbFixedSizeToggled(bool)));
-  connect(mLimitReachedAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDirty()));
+  connect(mUseTimeLimit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(useTypeChanged()));
+  connect(mDays, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setDirty()));
+  connect(mUseSizeLimit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(useTypeChanged()));
+  connect(mPercentSize, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(percentSizeChanged(double)));
+  connect(mFixedSize, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(fixedSizeChanged(double)));
+  connect(mFixedSizeUnit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(fixedSizeUnitActivated(int)));
+  connect(mRbPercentSize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(rbPercentSizeToggled(bool)));
+  connect(mRbFixedSize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(rbFixedSizeToggled(bool)));
+  connect(mLimitReachedAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setDirty()));
 
   inhibitChangedSignal = true;
   load();
@@ -87,7 +87,7 @@ void KTrashPropsWidget::setupGui()
       mountPoints->insertItem(folderPixmap, util.mountPoint(), it.key());
     }
     mountPoints->setCurrentItem(0);
-    connect(mountPoints, TQT_SIGNAL(highlighted(int)), TQT_SLOT(trashChanged(int)));
+    connect(mountPoints, TQ_SIGNAL(highlighted(int)), TQ_SLOT(trashChanged(int)));
   }
 
   mCurrentTrash = map[0];
diff --git a/tdeioslave/trash/ktrashpropswidget.h b/tdeioslave/trash/ktrashpropswidget.h
index 8cebfcae4..ac131039b 100644
--- a/tdeioslave/trash/ktrashpropswidget.h
+++ b/tdeioslave/trash/ktrashpropswidget.h
@@ -32,7 +32,7 @@ class TrashImpl;
 
 class KTrashPropsWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KTrashPropsWidget(TQWidget *parent=0, const char *name=0);
diff --git a/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS b/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS
index f4e10f262..7ada25041 100644
--- a/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS
+++ b/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS
@@ -1,4 +1,4 @@
 tdefile_trash
 ===========
-QString OriginalPath
+TQString OriginalPath
 DateTime DateOfDeletion
diff --git a/tdeioslave/trash/tdefile-plugin/tdefile_trash.h b/tdeioslave/trash/tdefile-plugin/tdefile_trash.h
index fbd6c9e3d..afcbba1f1 100644
--- a/tdeioslave/trash/tdefile-plugin/tdefile_trash.h
+++ b/tdeioslave/trash/tdefile-plugin/tdefile_trash.h
@@ -28,7 +28,7 @@ class TQStringList;
 
 class KTrashPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KTrashPlugin(TQObject *parent, const char *name, const TQStringList& args);
diff --git a/tdeioslave/trash/tdeio_trash.cpp b/tdeioslave/trash/tdeio_trash.cpp
index 90431afd5..aa1f63aa1 100644
--- a/tdeioslave/trash/tdeio_trash.cpp
+++ b/tdeioslave/trash/tdeio_trash.cpp
@@ -435,7 +435,7 @@ bool TrashProtocol::createUDSEntry( const TQString& physicalPath, const TQString
     addAtom( entry, TDEIO::UDS_MODIFICATION_TIME, buff.st_mtime );
     addAtom( entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime ); // ## or use it for deletion time?
     addAtom( entry, TDEIO::UDS_EXTRA, 0, info.origPath );
-    addAtom( entry, TDEIO::UDS_EXTRA, 0, info.deletionDate.toString( Qt::ISODate ) );
+    addAtom( entry, TDEIO::UDS_EXTRA, 0, info.deletionDate.toString( TQt::ISODate ) );
     return true;
 }
 
@@ -533,12 +533,12 @@ void TrashProtocol::get( const KURL& url )
     KURL fileURL;
     fileURL.setPath( physicalPath );
     TDEIO::Job* job = TDEIO::get( fileURL );
-    connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-             this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
-    connect( job, TQT_SIGNAL( mimetype( TDEIO::Job*, const TQString& ) ),
-             this, TQT_SLOT( slotMimetype( TDEIO::Job*, const TQString& ) ) );
-    connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
-             this, TQT_SLOT( jobFinished(TDEIO::Job *) ) );
+    connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+             this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+    connect( job, TQ_SIGNAL( mimetype( TDEIO::Job*, const TQString& ) ),
+             this, TQ_SLOT( slotMimetype( TDEIO::Job*, const TQString& ) ) );
+    connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+             this, TQ_SLOT( jobFinished(TDEIO::Job *) ) );
     tqApp->eventLoop()->enterLoop();
 }
 
diff --git a/tdeioslave/trash/tdeio_trash.h b/tdeioslave/trash/tdeio_trash.h
index 1f19927ca..5d16ce93a 100644
--- a/tdeioslave/trash/tdeio_trash.h
+++ b/tdeioslave/trash/tdeio_trash.h
@@ -30,7 +30,7 @@ typedef TrashImpl::TrashedFileInfoList TrashedFileInfoList;
 
 class TrashProtocol : public TQObject, public TDEIO::SlaveBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TrashProtocol( const TQCString& protocol, const TQCString &pool, const TQCString &app);
     virtual ~TrashProtocol();
diff --git a/tdeioslave/trash/testtrash.cpp b/tdeioslave/trash/testtrash.cpp
index 60fe2d1a6..4a1ca12f8 100644
--- a/tdeioslave/trash/testtrash.cpp
+++ b/tdeioslave/trash/testtrash.cpp
@@ -1094,8 +1094,8 @@ void TestTrash::listRootDir()
     m_entryCount = 0;
     m_listResult.clear();
     TDEIO::ListJob* job = TDEIO::listDir( "trash:/" );
-    connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
-             TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+    connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+             TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
     bool ok = TDEIO::NetAccess::synchronousRun( job, 0 );
     assert( ok );
     kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl;
@@ -1111,8 +1111,8 @@ void TestTrash::listRecursiveRootDir()
     m_entryCount = 0;
     m_listResult.clear();
     TDEIO::ListJob* job = TDEIO::listRecursive( "trash:/" );
-    connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
-             TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+    connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+             TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
     bool ok = TDEIO::NetAccess::synchronousRun( job, 0 );
     assert( ok );
     kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl;
@@ -1128,8 +1128,8 @@ void TestTrash::listSubDir()
     m_entryCount = 0;
     m_listResult.clear();
     TDEIO::ListJob* job = TDEIO::listDir( "trash:/0-trashDirFromHome" );
-    connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
-             TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+    connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+             TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
     bool ok = TDEIO::NetAccess::synchronousRun( job, 0 );
     assert( ok );
     kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl;
diff --git a/tdeioslave/trash/testtrash.h b/tdeioslave/trash/testtrash.h
index e87b9c3a0..1b46e3551 100644
--- a/tdeioslave/trash/testtrash.h
+++ b/tdeioslave/trash/testtrash.h
@@ -22,9 +22,9 @@
 
 #include <tqobject.h>
 
-class TestTrash : public QObject
+class TestTrash : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TestTrash() {}
diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp
index 40fc8e6ce..8c062256c 100644
--- a/tdeioslave/trash/trashimpl.cpp
+++ b/tdeioslave/trash/trashimpl.cpp
@@ -263,7 +263,7 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi
         info += KURL::encode_string( makeRelativePath( topDirectoryPath( trashId ), origPath ), m_mibEnum ).latin1();
     info += "\n";
     info += "DeletionDate=";
-    info += TQDateTime::currentDateTime().toString( Qt::ISODate ).latin1();
+    info += TQDateTime::currentDateTime().toString( TQt::ISODate ).latin1();
     info += "\n";
     size_t sz = info.size() - 1; // avoid trailing 0 from QCString
 
@@ -374,8 +374,8 @@ bool TrashImpl::move( const TQString& src, const TQString& dest )
 #ifdef TDEIO_COPYJOB_HAS_SETINTERACTIVE
     job->setInteractive( false );
 #endif
-    connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
-             this, TQT_SLOT( jobFinished(TDEIO::Job *) ) );
+    connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+             this, TQ_SLOT( jobFinished(TDEIO::Job *) ) );
     tqApp->eventLoop()->enterLoop();
 
     return m_lastErrorCode == 0;
@@ -424,8 +424,8 @@ bool TrashImpl::copy( const TQString& src, const TQString& dest )
 #ifdef TDEIO_COPYJOB_HAS_SETINTERACTIVE
     job->setInteractive( false );
 #endif
-    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-             this, TQT_SLOT( jobFinished( TDEIO::Job* ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+             this, TQ_SLOT( jobFinished( TDEIO::Job* ) ) );
     tqApp->eventLoop()->enterLoop();
 
     return m_lastErrorCode == 0;
@@ -513,15 +513,15 @@ bool TrashImpl::synchronousDel( const TQString& path, bool setLastErrorCode, boo
         KFileItemList fileItemList;
         fileItemList.append( &fileItem );
         TDEIO::ChmodJob* chmodJob = TDEIO::chmod( fileItemList, 0200, 0200, TQString::null, TQString::null, true /*recursive*/, false /*showProgressInfo*/ );
-        connect( chmodJob, TQT_SIGNAL( result(TDEIO::Job *) ),
-                 this, TQT_SLOT( jobFinished(TDEIO::Job *) ) );
+        connect( chmodJob, TQ_SIGNAL( result(TDEIO::Job *) ),
+                 this, TQ_SLOT( jobFinished(TDEIO::Job *) ) );
         tqApp->eventLoop()->enterLoop();
     }
 
     kdDebug() << k_funcinfo << "deleting " << url << endl;
     TDEIO::DeleteJob *job = TDEIO::del( url, false, false );
-    connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
-             this, TQT_SLOT( jobFinished(TDEIO::Job *) ) );
+    connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+             this, TQ_SLOT( jobFinished(TDEIO::Job *) ) );
     tqApp->eventLoop()->enterLoop();
     bool ok = m_lastErrorCode == 0;
     if ( !setLastErrorCode ) {
@@ -637,7 +637,7 @@ bool TrashImpl::readInfoFile( const TQString& infoPath, TrashedFileInfo& info, i
     }
     TQString line = cfg.readEntry( "DeletionDate" );
     if ( !line.isEmpty() ) {
-        info.deletionDate = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( line, Qt::ISODate ));
+        info.deletionDate = TQDateTime::fromString( line, TQt::ISODate );
     }
     return true;
 }
diff --git a/tdeioslave/trash/trashimpl.h b/tdeioslave/trash/trashimpl.h
index 571bbd353..90032762d 100644
--- a/tdeioslave/trash/trashimpl.h
+++ b/tdeioslave/trash/trashimpl.h
@@ -33,7 +33,7 @@
  */
 class TrashImpl : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TrashImpl();
 
diff --git a/tdepasswd/kcm/chfacedlg.cpp b/tdepasswd/kcm/chfacedlg.cpp
index 0a3dbfb78..bea316c8c 100644
--- a/tdepasswd/kcm/chfacedlg.cpp
+++ b/tdepasswd/kcm/chfacedlg.cpp
@@ -68,16 +68,16 @@ ChFaceDlg::ChFaceDlg(const TQString& picsdir, TQWidget *parent, const char *name
   m_FacesWidget->setItemsMovable( false );
   m_FacesWidget->setMinimumSize( 400, 200 );
 
-  connect( m_FacesWidget, TQT_SIGNAL( selectionChanged( TQIconViewItem * ) ), TQT_SLOT( slotFaceWidgetSelectionChanged( TQIconViewItem * ) ) );
+  connect( m_FacesWidget, TQ_SIGNAL( selectionChanged( TQIconViewItem * ) ), TQ_SLOT( slotFaceWidgetSelectionChanged( TQIconViewItem * ) ) );
 
-  connect( m_FacesWidget, TQT_SIGNAL( doubleClicked( TQIconViewItem *, const TQPoint & ) ), TQT_SLOT( slotOk() ) );
+  connect( m_FacesWidget, TQ_SIGNAL( doubleClicked( TQIconViewItem *, const TQPoint & ) ), TQ_SLOT( slotOk() ) );
 
   top->addWidget( m_FacesWidget );
 
   // Buttons to get more pics
   TQHBoxLayout * morePics = new TQHBoxLayout( 0, 0, spacingHint() );
   TQPushButton *browseBtn = new TQPushButton( i18n("Custom &Image..."), page );
-  connect( browseBtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotGetCustomImage() ) );
+  connect( browseBtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotGetCustomImage() ) );
   morePics->addWidget( browseBtn );
 #if 0
   TQPushButton *acquireBtn = new TQPushButton( i18n("&Acquire Image..."), page );
@@ -110,7 +110,7 @@ ChFaceDlg::ChFaceDlg(const TQString& picsdir, TQWidget *parent, const char *name
   m_FacesWidget->arrangeItemsInGrid();
 
   enableButtonOK( false );
-  //connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotSaveCustomImage() ) );
+  //connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( slotSaveCustomImage() ) );
 
   resize( 420, 400 );
 }
@@ -128,7 +128,7 @@ void ChFaceDlg::addCustomPixmap( TQString imPath, bool saveCopy )
   }
   if ( (pix.width() > KCFGUserAccount::faceSize())
 	|| (pix.height() > KCFGUserAccount::faceSize()) )
-    pix = pix.scale( KCFGUserAccount::faceSize(), KCFGUserAccount::faceSize(), TQ_ScaleMin );// Should be no bigger than certain size.
+    pix = pix.scale( KCFGUserAccount::faceSize(), KCFGUserAccount::faceSize(), TQImage::ScaleMin );// Should be no bigger than certain size.
 
   if ( saveCopy )
   {
diff --git a/tdepasswd/kcm/chfacedlg.h b/tdepasswd/kcm/chfacedlg.h
index f96d50084..6ae6a1c16 100644
--- a/tdepasswd/kcm/chfacedlg.h
+++ b/tdepasswd/kcm/chfacedlg.h
@@ -38,7 +38,7 @@ class KDialogBase;
 
 class ChFaceDlg : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
 
diff --git a/tdepasswd/kcm/main.cpp b/tdepasswd/kcm/main.cpp
index 0751c997e..b7e2aa8fa 100644
--- a/tdepasswd/kcm/main.cpp
+++ b/tdepasswd/kcm/main.cpp
@@ -63,14 +63,14 @@ KCMUserAccount::KCMUserAccount( TQWidget *parent, const char *name,
 	_mw = new MainWidget(this);
 	topLayout->addWidget( _mw );
 
-	connect( _mw->btnChangeFace, TQT_SIGNAL(clicked()), TQT_SLOT(slotFaceButtonClicked()));
-	connect( _mw->btnChangePassword, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangePassword()));
+	connect( _mw->btnChangeFace, TQ_SIGNAL(clicked()), TQ_SLOT(slotFaceButtonClicked()));
+	connect( _mw->btnChangePassword, TQ_SIGNAL(clicked()), TQ_SLOT(slotChangePassword()));
 	_mw->btnChangePassword->setGuiItem( KGuiItem( i18n("Change &Password..."), "password" ));
 	
-	connect( _mw->leRealname, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
-	connect( _mw->leOrganization, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
-	connect( _mw->leEmail, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
-	connect( _mw->leSMTP, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
+	connect( _mw->leRealname, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
+	connect( _mw->leOrganization, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
+	connect( _mw->leEmail, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
+	connect( _mw->leSMTP, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
 
 	_ku = new KUser();
 	_kes = new KEMailSettings();
diff --git a/tdepasswd/kcm/main.h b/tdepasswd/kcm/main.h
index 350c42820..f74ad55de 100644
--- a/tdepasswd/kcm/main.h
+++ b/tdepasswd/kcm/main.h
@@ -36,7 +36,7 @@ class Config;
  */
 class KCMUserAccount : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KCMUserAccount(TQWidget* parent, const char* name = "KCMUserAccount",
diff --git a/tdepasswd/passwddlg.h b/tdepasswd/passwddlg.h
index 3284e332f..392738fef 100644
--- a/tdepasswd/passwddlg.h
+++ b/tdepasswd/passwddlg.h
@@ -14,7 +14,7 @@
 class TDEpasswd1Dialog
     : public KPasswordDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TDEpasswd1Dialog();
@@ -30,7 +30,7 @@ protected:
 class TDEpasswd2Dialog
     : public KPasswordDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TDEpasswd2Dialog(const TQString &oldpass, const TQString &user);
diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp
index cdf1fc225..814cda92a 100644
--- a/tdeprint/kjobviewer/kjobviewer.cpp
+++ b/tdeprint/kjobviewer/kjobviewer.cpp
@@ -39,7 +39,7 @@ class JobTray : public KSystemTray
 {
 public:
 	JobTray(KJobViewerApp *parent, const char *name = 0)
-		: KSystemTray(0, name), m_app(parent) { connect( this, TQT_SIGNAL( quitSelected() ), kapp, TQT_SLOT( quit() ) ); }
+		: KSystemTray(0, name), m_app(parent) { connect( this, TQ_SIGNAL( quitSelected() ), kapp, TQ_SLOT( quit() ) ); }
 protected:
 	void mousePressEvent(TQMouseEvent*);
 private:
@@ -48,7 +48,7 @@ private:
 
 void JobTray::mousePressEvent(TQMouseEvent *e)
 {
-	if (e->button() == Qt::RightButton)
+	if (e->button() == TQt::RightButton)
 		KSystemTray::mousePressEvent(e);
 	else if (m_app->m_views.count() > 0)
 	{
@@ -114,13 +114,13 @@ void KJobViewerApp::initialize()
 	TDECmdLineArgs	*args = TDECmdLineArgs::parsedArgs();
 	bool 	showIt = args->isSet("show");
 	bool	all = args->isSet("all");
-	QString	prname = args->getOption("d");
+	TQString	prname = args->getOption("d");
 	KMJobViewer	*view(0);
 
 	if (!m_timer)
 	{
 		m_timer = KMTimer::self();
-		connect(m_timer,TQT_SIGNAL(timeout()),TQT_SLOT(slotTimer()));
+		connect(m_timer,TQ_SIGNAL(timeout()),TQ_SLOT(slotTimer()));
 	}
 
 	if (prname.isEmpty() && all)
@@ -149,10 +149,10 @@ void KJobViewerApp::initialize()
         {
             kdDebug() << "creating new view: " << TQString(prname) << endl;
             view = new KMJobViewer();
-            connect(view, TQT_SIGNAL(jobsShown(KMJobViewer*,bool)), TQT_SLOT(slotJobsShown(KMJobViewer*,bool)));
-            connect(view, TQT_SIGNAL(printerChanged(KMJobViewer*,const TQString&)), TQT_SLOT(slotPrinterChanged(KMJobViewer*,const TQString&)));
-            connect(view, TQT_SIGNAL(refreshClicked()), TQT_SLOT(slotTimer()));
-            connect(view, TQT_SIGNAL(viewerDestroyed(KMJobViewer*)), TQT_SLOT(slotViewerDestroyed(KMJobViewer*)));
+            connect(view, TQ_SIGNAL(jobsShown(KMJobViewer*,bool)), TQ_SLOT(slotJobsShown(KMJobViewer*,bool)));
+            connect(view, TQ_SIGNAL(printerChanged(KMJobViewer*,const TQString&)), TQ_SLOT(slotPrinterChanged(KMJobViewer*,const TQString&)));
+            connect(view, TQ_SIGNAL(refreshClicked()), TQ_SLOT(slotTimer()));
+            connect(view, TQ_SIGNAL(viewerDestroyed(KMJobViewer*)), TQ_SLOT(slotViewerDestroyed(KMJobViewer*)));
             m_views.insert(prname, view);
         }
 
diff --git a/tdeprint/kjobviewer/kjobviewer.h b/tdeprint/kjobviewer/kjobviewer.h
index 967262de2..af606b551 100644
--- a/tdeprint/kjobviewer/kjobviewer.h
+++ b/tdeprint/kjobviewer/kjobviewer.h
@@ -30,7 +30,7 @@ class JobTray;
 
 class KJobViewerApp : public KUniqueApplication, public KPReloadObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	friend class JobTray;
 public:
 	KJobViewerApp();
diff --git a/tdeprint/kprinter/main.cpp b/tdeprint/kprinter/main.cpp
index fd528b705..b9e04be1f 100644
--- a/tdeprint/kprinter/main.cpp
+++ b/tdeprint/kprinter/main.cpp
@@ -49,7 +49,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
 	TDEApplication	app;
 	PrintWrapper	*wrap = new PrintWrapper;
 	app.setMainWidget(wrap);
-	TQTimer::singleShot(10,wrap,TQT_SLOT(slotPrint()));
+	TQTimer::singleShot(10,wrap,TQ_SLOT(slotPrint()));
 
 	int	result = app.exec();
 	delete wrap;
diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp
index 102951ffd..aed2065a1 100644
--- a/tdeprint/kprinter/printwrapper.cpp
+++ b/tdeprint/kprinter/printwrapper.cpp
@@ -262,11 +262,11 @@ void PrintWrapper::slotPrint()
 		dlg = KPrintDialog::printerDialog(&kprinter, 0);
 		if (dlg)
 		{
-			connect(dlg, TQT_SIGNAL(printRequested(KPrinter*)), TQT_SLOT(slotPrintRequested(KPrinter*)));
+			connect(dlg, TQ_SIGNAL(printRequested(KPrinter*)), TQ_SLOT(slotPrintRequested(KPrinter*)));
 			if( check_stdin )
 			{
-			    notif = new TQSocketNotifier( 0, TQSocketNotifier::Read, TQT_TQOBJECT(this) );
-			    connect( notif, TQT_SIGNAL( activated( int )), this, TQT_SLOT( slotGotStdin()));
+			    notif = new TQSocketNotifier( 0, TQSocketNotifier::Read, this );
+			    connect( notif, TQ_SIGNAL( activated( int )), this, TQ_SLOT( slotGotStdin()));
 			    kdDebug( 500 ) << "waiting for input on stdin" << endl;
 			}
 			dlg->exec();
@@ -276,7 +276,7 @@ void PrintWrapper::slotPrint()
 			errormsg(i18n("Unable to construct the print dialog."));
 	}
 
-	TQTimer::singleShot(10,kapp,TQT_SLOT(quit()));
+	TQTimer::singleShot(10,kapp,TQ_SLOT(quit()));
 }
 
 void hack( KPrintDialog* dlg );
@@ -395,7 +395,7 @@ void PrintWrapper::slotPrintRequested(KPrinter *kprinter)
 	// if nobody complains.
 	/*else
 	{
-		QString	msg = i18n("<nobr>File(s) sent to printer <b>%1</b>.</nobr>").arg(kprinter->printerName());
+		TQString msg = i18n("<nobr>File(s) sent to printer <b>%1</b>.</nobr>").arg(kprinter->printerName());
 		showmsg(msg,0);
 	}*/
 }
diff --git a/tdeprint/kprinter/printwrapper.h b/tdeprint/kprinter/printwrapper.h
index e34e8d964..734235252 100644
--- a/tdeprint/kprinter/printwrapper.h
+++ b/tdeprint/kprinter/printwrapper.h
@@ -28,7 +28,7 @@ class TQSocketNotifier;
 
 class PrintWrapper : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	PrintWrapper();
 
diff --git a/tdeprint/slave/tdeio_print.cpp b/tdeprint/slave/tdeio_print.cpp
index 2e714087a..5ca66f09b 100644
--- a/tdeprint/slave/tdeio_print.cpp
+++ b/tdeprint/slave/tdeio_print.cpp
@@ -455,10 +455,10 @@ bool TDEIO_Print::getDBFile( const KURL& src )
 
 	/* start the transfer job */
 	TDEIO::TransferJob *job = TDEIO::get( src, false, false );
-	connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( slotResult( TDEIO::Job* ) ) );
-	connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
-	connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
-	connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+	connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( slotResult( TDEIO::Job* ) ) );
+	connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+	connect( job, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+	connect( job, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
 	kapp->enter_loop();
 	m_httpBuffer.close();
 
diff --git a/tdeprint/slave/tdeio_print.h b/tdeprint/slave/tdeio_print.h
index ff56cb426..40891c044 100644
--- a/tdeprint/slave/tdeio_print.h
+++ b/tdeprint/slave/tdeio_print.h
@@ -32,7 +32,7 @@ namespace TDEIO {
 
 class TDEIO_Print : public TQObject, public TDEIO::SlaveBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	TDEIO_Print(const TQCString& pool, const TQCString& app);
 
diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp
index 3ae57e7ab..3c9b0e9f1 100644
--- a/tdeprint/tdeprint_part/printpart.cpp
+++ b/tdeprint/tdeprint_part/printpart.cpp
@@ -43,7 +43,7 @@ PrintPart::PrintPart(TQWidget *parentWidget, const char * /*widgetName*/ ,
 	m_extension = new PrintPartExtension(this);
 
 	m_view = new KMMainView(parentWidget, "MainView", actionCollection());
-	m_view->setFocusPolicy(TQ_ClickFocus);
+	m_view->setFocusPolicy(TQWidget::ClickFocus);
 	m_view->enableToolbar(false);
 	setWidget(m_view);
 
diff --git a/tdeprint/tdeprint_part/printpart.h b/tdeprint/tdeprint_part/printpart.h
index 40e8041ea..8f32207df 100644
--- a/tdeprint/tdeprint_part/printpart.h
+++ b/tdeprint/tdeprint_part/printpart.h
@@ -29,7 +29,7 @@ class TDEAboutData;
 
 class PrintPart : public KParts::ReadOnlyPart
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	PrintPart(TQWidget *parentWidget, const char *widgetName,
 		  TQObject *parent, const char *name,
@@ -49,7 +49,7 @@ private:
 
 class PrintPartExtension : public KParts::BrowserExtension
 {
-	Q_OBJECT
+	TQ_OBJECT
 	friend class PrintPart;
 public:
 	PrintPartExtension(PrintPart *parent);
diff --git a/tdeprint/tdeprintfax/conffilters.cpp b/tdeprint/tdeprintfax/conffilters.cpp
index 7fdb4fec1..8a2456e73 100644
--- a/tdeprint/tdeprintfax/conffilters.cpp
+++ b/tdeprint/tdeprintfax/conffilters.cpp
@@ -45,7 +45,7 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name)
 	m_filters->setLineWidth(1);
 	m_filters->setSorting(-1);
 	m_filters->header()->setStretchEnabled(true, 1);
-	connect(m_filters, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(slotChange()));
+	connect(m_filters, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(slotChange()));
 
 	m_add = new TQPushButton(this);
 	m_add->setPixmap(BarIcon("document-new"));
@@ -57,11 +57,11 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name)
 	m_up->setIconSet(BarIconSet("go-up"));
 	m_down = new TQPushButton(this);
 	m_down->setIconSet(BarIconSet("go-down"));
-	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()));
-	connect(m_change, TQT_SIGNAL(clicked()), TQT_SLOT(slotChange()));
-	connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
-	connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp()));
-	connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown()));
+	connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()));
+	connect(m_change, TQ_SIGNAL(clicked()), TQ_SLOT(slotChange()));
+	connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()));
+	connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUp()));
+	connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDown()));
 	TQToolTip::add(m_add, i18n("Add filter"));
 	TQToolTip::add(m_change, i18n("Modify filter"));
 	TQToolTip::add(m_remove, i18n("Remove filter"));
@@ -80,7 +80,7 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name)
 	l1->addWidget(m_down);
 	l1->addStretch(1);
 	updateButton();
-	connect(m_filters, TQT_SIGNAL(selectionChanged ()),TQT_SLOT(updateButton()));
+	connect(m_filters, TQ_SIGNAL(selectionChanged ()),TQ_SLOT(updateButton()));
 }
 
 void ConfFilters::load()
diff --git a/tdeprint/tdeprintfax/conffilters.h b/tdeprint/tdeprintfax/conffilters.h
index ca796b934..e40c7e89a 100644
--- a/tdeprint/tdeprintfax/conffilters.h
+++ b/tdeprint/tdeprintfax/conffilters.h
@@ -27,7 +27,7 @@ class TDEListView;
 
 class ConfFilters : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	ConfFilters(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/tdeprintfax/confgeneral.cpp b/tdeprint/tdeprintfax/confgeneral.cpp
index ad7512d8d..b79e2f52b 100644
--- a/tdeprint/tdeprintfax/confgeneral.cpp
+++ b/tdeprint/tdeprintfax/confgeneral.cpp
@@ -49,7 +49,7 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name)
 	m_replace_int_char_val = new TQLineEdit( this );
 	m_replace_int_char_val->setEnabled( false );
 
-	connect( m_replace_int_char, TQT_SIGNAL( toggled( bool ) ), m_replace_int_char_val, TQT_SLOT( setEnabled( bool ) ) );
+	connect( m_replace_int_char, TQ_SIGNAL( toggled( bool ) ), m_replace_int_char_val, TQ_SLOT( setEnabled( bool ) ) );
 
 	TQGridLayout	*l0 = new TQGridLayout(this, 6, 2, 10, 10);
 	l0->setColStretch(1, 1);
diff --git a/tdeprint/tdeprintfax/confsystem.cpp b/tdeprint/tdeprintfax/confsystem.cpp
index fbb27aac9..bfb201691 100644
--- a/tdeprint/tdeprintfax/confsystem.cpp
+++ b/tdeprint/tdeprintfax/confsystem.cpp
@@ -51,7 +51,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)
 	TQLabel	*cmdlabel = new TQLabel(i18n("Co&mmand:"), this);
 	syslabel->setBuddy(m_system);
 	cmdlabel->setBuddy(m_command);
-	connect(m_system, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSystemChanged(int)));
+	connect(m_system, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSystemChanged(int)));
 	m_current = 0;
 	m_system->setCurrentItem(m_current);
 
@@ -66,7 +66,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)
 	for (int i=0; i<10; i++)
 		m_device->insertItem(TQString(i18n("Serial Port #%1").arg(i)));
 	m_device->insertItem( i18n( "Other" ) );
-	connect( m_device, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotDeviceChanged( int ) ) );
+	connect( m_device, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotDeviceChanged( int ) ) );
 	m_device_edit = new TQLineEdit( m_dummy2 );
 	slotDeviceChanged( 0 );
 
@@ -75,7 +75,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)
  
 	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 10, 10);
 	TQGridLayout	*l1 = new TQGridLayout(0, 2, 2, 0, 10);
-	l0->addLayout(TQT_TQLAYOUT(l1));
+	l0->addLayout(l1);
 	l1->setColStretch(1, 1);
 	l1->addWidget(syslabel, 0, 0);
 	l1->addWidget(cmdlabel, 1, 0);
diff --git a/tdeprint/tdeprintfax/confsystem.h b/tdeprint/tdeprintfax/confsystem.h
index 0ce8971f0..01170f387 100644
--- a/tdeprint/tdeprintfax/confsystem.h
+++ b/tdeprint/tdeprintfax/confsystem.h
@@ -29,7 +29,7 @@ class TQComboBox;
 
 class ConfSystem : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	ConfSystem(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp
index 1b3eb6131..f9f16c4aa 100644
--- a/tdeprint/tdeprintfax/faxab.cpp
+++ b/tdeprint/tdeprintfax/faxab.cpp
@@ -45,9 +45,9 @@ FaxAB::FaxAB(TQWidget *parent, const char *name)
 	m_ok = new KPushButton(KStdGuiItem::ok(), this);
 	TQPushButton	*m_cancel = new KPushButton(KStdGuiItem::cancel(), this);
 	TQPushButton	*m_ab = new KPushButton(KGuiItem(i18n("&Edit Addressbook"), "contents"), this);
-	connect(m_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
-	connect(m_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
-	connect(m_ab, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditAb()));
+	connect(m_ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()));
+	connect(m_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
+	connect(m_ab, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditAb()));
 	m_ok->setDefault(true);
 
 	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 10, 10);
@@ -66,7 +66,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name)
 	resize( conf->readSizeEntry( "ABSize", &defsize ) );
 
 	initialize();
-	connect(TDEABC::StdAddressBook::self(), TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT(slotAbChanged(AddressBook*)));
+	connect(TDEABC::StdAddressBook::self(), TQ_SIGNAL(addressBookChanged(AddressBook*)), TQ_SLOT(slotAbChanged(AddressBook*)));
 }
 
 FaxAB::~FaxAB()
diff --git a/tdeprint/tdeprintfax/faxab.h b/tdeprint/tdeprintfax/faxab.h
index da38fb9d8..ac2098cc0 100644
--- a/tdeprint/tdeprintfax/faxab.h
+++ b/tdeprint/tdeprintfax/faxab.h
@@ -32,7 +32,7 @@ class TQPushButton;
 
 class FaxAB : public KDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	FaxAB(TQWidget *parent = 0, const char *name = 0);
 	~FaxAB();
diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp
index 5ea6a65a2..78074c55f 100644
--- a/tdeprint/tdeprintfax/faxctrl.cpp
+++ b/tdeprint/tdeprintfax/faxctrl.cpp
@@ -356,10 +356,10 @@ FaxCtrl::FaxCtrl(TQWidget *parent, const char *name)
 {
 	m_process = new TDEProcess();
 	m_process->setUseShell(true);
-	connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
-	connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
-	connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
-	connect(this, TQT_SIGNAL(faxSent(bool)), TQT_SLOT(cleanTempFiles()));
+	connect(m_process, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
+	connect(m_process, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
+	connect(m_process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*)));
+	connect(this, TQ_SIGNAL(faxSent(bool)), TQ_SLOT(cleanTempFiles()));
 	m_logview = 0;
 }
 
@@ -522,7 +522,7 @@ void FaxCtrl::viewLog(TQWidget *)
 		m_logview = new KTextEdit(topView);
 		m_logview->setTextFormat( TQt::LogText );
 		m_logview->setWordWrap( TQTextEdit::WidgetWidth );
-		m_logview->setPaper( Qt::white );
+		m_logview->setPaper( TQt::white );
 		//m_logview->setReadOnly(true);
 		//m_logview->setWordWrap(TQTextEdit::NoWrap);
 		TQPushButton	*m_clear = new KPushButton(KStdGuiItem::clear(), topView);
@@ -530,11 +530,11 @@ void FaxCtrl::viewLog(TQWidget *)
 		TQPushButton *m_print = new KPushButton( KStdGuiItem::print(), topView );
 		TQPushButton *m_save = new KPushButton( KStdGuiItem::saveAs(), topView );
 		m_close->setDefault(true);
-		connect(m_clear, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearLog()));
-		connect(m_close, TQT_SIGNAL(clicked()), TQT_SLOT(slotCloseLog()));
-		connect(m_logview, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCloseLog()));
-		connect( m_print, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPrintLog() ) );
-		connect( m_save, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSaveLog() ) );
+		connect(m_clear, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearLog()));
+		connect(m_close, TQ_SIGNAL(clicked()), TQ_SLOT(slotCloseLog()));
+		connect(m_logview, TQ_SIGNAL(destroyed()), TQ_SLOT(slotCloseLog()));
+		connect( m_print, TQ_SIGNAL( clicked() ), TQ_SLOT( slotPrintLog() ) );
+		connect( m_save, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSaveLog() ) );
 
 		TQVBoxLayout	*l0 = new TQVBoxLayout(topView, 10, 10);
 		l0->addWidget(m_logview);
@@ -599,12 +599,12 @@ void FaxCtrl::slotClearLog()
 
 void FaxCtrl::slotCloseLog()
 {
-	const TQObject	*obj = TQT_TQOBJECT_CONST(sender());
+	const TQObject	*obj = sender();
 	if (m_logview)
 	{
 		TQTextEdit	*view = m_logview;
 		m_logview = 0;
-		if (obj && obj->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING))
+		if (obj && obj->inherits("TQPushButton"))
 			delete view->parentWidget();
 kdDebug() << "slotClose()" << endl;
 	}
diff --git a/tdeprint/tdeprintfax/faxctrl.h b/tdeprint/tdeprintfax/faxctrl.h
index 9135b7cc6..5a11e37d9 100644
--- a/tdeprint/tdeprintfax/faxctrl.h
+++ b/tdeprint/tdeprintfax/faxctrl.h
@@ -32,7 +32,7 @@ class TQTextEdit;
 
 class FaxCtrl : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	FaxCtrl(TQWidget *parent = 0, const char *name = 0);
 	~FaxCtrl();
diff --git a/tdeprint/tdeprintfax/filterdlg.cpp b/tdeprint/tdeprintfax/filterdlg.cpp
index 141e7138a..fa3eed829 100644
--- a/tdeprint/tdeprintfax/filterdlg.cpp
+++ b/tdeprint/tdeprintfax/filterdlg.cpp
@@ -47,8 +47,8 @@ FilterDlg::FilterDlg(TQWidget *parent, const char *name)
 	setMainWidget(w);
 	m_mime->setFocus();
 	resize(300, 100);
-	connect(m_mime, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(slotTextFilterChanged()));
-        connect(m_cmd, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(slotTextFilterChanged()));
+	connect(m_mime, TQ_SIGNAL(textChanged ( const TQString & )),this, TQ_SLOT(slotTextFilterChanged()));
+        connect(m_cmd, TQ_SIGNAL(textChanged ( const TQString & )),this, TQ_SLOT(slotTextFilterChanged()));
         slotTextFilterChanged();
 }
 
diff --git a/tdeprint/tdeprintfax/filterdlg.h b/tdeprint/tdeprintfax/filterdlg.h
index ab4fd0406..26dbc729c 100644
--- a/tdeprint/tdeprintfax/filterdlg.h
+++ b/tdeprint/tdeprintfax/filterdlg.h
@@ -27,7 +27,7 @@ class TQLineEdit;
 
 class FilterDlg : public KDialogBase
 {
-  	Q_OBJECT
+  	TQ_OBJECT
 public:
 	FilterDlg(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp
index 2927d4e88..4538bc7ae 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.cpp
+++ b/tdeprint/tdeprintfax/tdeprintfax.cpp
@@ -62,22 +62,22 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 {
 	m_faxctrl = new FaxCtrl(this);
 	m_quitAfterSend = false;
-	connect(m_faxctrl, TQT_SIGNAL(message(const TQString&)), TQT_SLOT(slotMessage(const TQString&)));
-	connect(m_faxctrl, TQT_SIGNAL(faxSent(bool)), TQT_SLOT(slotFaxSent(bool)));
+	connect(m_faxctrl, TQ_SIGNAL(message(const TQString&)), TQ_SLOT(slotMessage(const TQString&)));
+	connect(m_faxctrl, TQ_SIGNAL(faxSent(bool)), TQ_SLOT(slotFaxSent(bool)));
 
 	TQWidget	*mainw = new TQWidget(this);
 	setCentralWidget(mainw);
 	m_files = new TDEListBox(mainw);
-	connect( m_files, TQT_SIGNAL( currentChanged( TQListBoxItem* ) ), TQT_SLOT( slotCurrentChanged() ) );
+	connect( m_files, TQ_SIGNAL( currentChanged( TQListBoxItem* ) ), TQ_SLOT( slotCurrentChanged() ) );
 	m_upbtn = new KPushButton( mainw );
 	m_upbtn->setIconSet( SmallIconSet( "go-up" ) );
 	TQToolTip::add( m_upbtn, i18n( "Move up" ) );
-	connect( m_upbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveUp() ) );
+	connect( m_upbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveUp() ) );
 	m_upbtn->setEnabled( false );
 	m_downbtn = new KPushButton( mainw );
 	m_downbtn->setIconSet( SmallIconSet( "go-down" ) );
 	TQToolTip::add( m_downbtn, i18n( "Move down" ) );
-	connect( m_downbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveDown() ) );
+	connect( m_downbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveDown() ) );
 	m_downbtn->setEnabled( false );
 	TQLabel	*m_filelabel = new TQLabel(i18n("F&iles:"), mainw);
         m_filelabel->setBuddy(m_files);
@@ -89,21 +89,21 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	m_numbers->addColumn( i18n("Enterprise") );
 	m_numbers->header()->setStretchEnabled( true );
 	m_numbers->setSelectionMode( TQListView::Extended );
-	connect( m_numbers, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotFaxSelectionChanged() ) );
-	connect( m_numbers, TQT_SIGNAL( executed( TQListViewItem* ) ), TQT_SLOT( slotFaxExecuted( TQListViewItem* ) ) );
+	connect( m_numbers, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotFaxSelectionChanged() ) );
+	connect( m_numbers, TQ_SIGNAL( executed( TQListViewItem* ) ), TQ_SLOT( slotFaxExecuted( TQListViewItem* ) ) );
 	m_newbtn = new KPushButton( mainw );
 	m_newbtn->setPixmap( SmallIcon( "edit" ) );
 	TQToolTip::add( m_newbtn, i18n( "Add fax number" ) );
-	connect( m_newbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxAdd() ) );
+	connect( m_newbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotFaxAdd() ) );
 	m_abbtn = new KPushButton( mainw );
 	m_abbtn->setPixmap( SmallIcon( "kaddressbook" ) );
 	TQToolTip::add( m_abbtn, i18n( "Add fax number from addressbook" ) );
-	connect( m_abbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotKab() ) );
+	connect( m_abbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotKab() ) );
 	m_delbtn = new KPushButton( mainw );
 	m_delbtn->setIconSet( SmallIconSet( "edittrash" ) );
 	TQToolTip::add( m_delbtn, i18n( "Remove fax number" ) );
 	m_delbtn->setEnabled( false );
-	connect( m_delbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxRemove() ) );
+	connect( m_delbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotFaxRemove() ) );
 	TQLabel	*m_commentlabel = new TQLabel(i18n("&Comment:"), mainw);
 	KSystemTray	*m_tray = new KSystemTray(this);
 	m_tray->setPixmap(SmallIcon("tdeprintfax"));
@@ -124,16 +124,16 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	m_time = new TQTimeEdit(mainw);
 	m_time->setTime(TQTime::currentTime());
 	m_time->setEnabled(false);
-	connect(m_timecombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTimeComboActivated(int)));
+	connect(m_timecombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTimeComboActivated(int)));
 	m_cover = new TQCheckBox(i18n("Send Co&ver Sheet"), mainw);
-	connect(m_cover, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCoverToggled(bool)));
+	connect(m_cover, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCoverToggled(bool)));
 	m_subject = new TQLineEdit( mainw );
 	TQLabel *m_subjectlabel = new TQLabel( i18n( "Su&bject:" ), mainw );
 	m_subjectlabel->setBuddy( m_subject );
 
 	TQGridLayout	*l0 = new TQGridLayout(mainw, 10, 2, 10, 5);
 	l0->setColStretch(1,1);
-	l0->addWidget(m_filelabel, 0, 0, Qt::AlignLeft|Qt::AlignTop);
+	l0->addWidget(m_filelabel, 0, 0, TQt::AlignLeft|TQt::AlignTop);
 	TQHBoxLayout *l2 = new TQHBoxLayout( 0, 0, 10 );
 	TQVBoxLayout *l3 = new TQVBoxLayout( 0, 0, 5 );
 	l0->addLayout( l2, 0, 1 );
@@ -159,7 +159,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	l0->addWidget( m_cover, 6, 1 );
 	l0->addWidget( m_subjectlabel, 7, 0 );
 	l0->addWidget( m_subject, 7, 1 );
-	l0->addWidget(m_commentlabel, 8, 0, Qt::AlignTop|Qt::AlignLeft);
+	l0->addWidget(m_commentlabel, 8, 0, TQt::AlignTop|TQt::AlignLeft);
 	l0->addWidget(m_comment, 8, 1);
 	l0->addWidget(m_timelabel, 9, 0);
 	TQHBoxLayout	*l1 = new TQHBoxLayout(0, 0, 5);
@@ -178,7 +178,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	updateState();
 
 	resize(550,500);
-	TQWidget	*d = TQT_TQWIDGET(kapp->desktop());
+	TQWidget	*d = kapp->desktop();
 	move((d->width()-width())/2, (d->height()-height())/2);
 }
 
@@ -188,23 +188,23 @@ KdeprintFax::~KdeprintFax()
 
 void KdeprintFax::initActions()
 {
-	new TDEAction(i18n("&Add File..."), "document-new", Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add");
-	new TDEAction(i18n("&Remove File"), "remove", Qt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove");
-	new TDEAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send");
-	new TDEAction(i18n("A&bort"), "process-stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop");
-	new TDEAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotKab()), actionCollection(), "fax_ab");
-	new TDEAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "fax_log");
-	new TDEAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "file_view");
-	new TDEAction( i18n( "&New Fax Recipient..." ), "edit", Qt::CTRL+Qt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" );
+	new TDEAction(i18n("&Add File..."), "document-new", TQt::Key_Insert, this, TQ_SLOT(slotAdd()), actionCollection(), "file_add");
+	new TDEAction(i18n("&Remove File"), "remove", TQt::Key_Delete, this, TQ_SLOT(slotRemove()), actionCollection(), "file_remove");
+	new TDEAction(i18n("&Send Fax"), "connect_established", TQt::Key_Return, this, TQ_SLOT(slotFax()), actionCollection(), "fax_send");
+	new TDEAction(i18n("A&bort"), "process-stop", TQt::Key_Escape, this, TQ_SLOT(slotAbort()), actionCollection(), "fax_stop");
+	new TDEAction(i18n("A&ddress Book"), "kaddressbook", TQt::CTRL+TQt::Key_A, this, TQ_SLOT(slotKab()), actionCollection(), "fax_ab");
+	new TDEAction(i18n("V&iew Log"), "contents", TQt::CTRL+TQt::Key_L, this, TQ_SLOT(slotViewLog()), actionCollection(), "fax_log");
+	new TDEAction(i18n("Vi&ew File"), "filefind", TQt::CTRL+TQt::Key_O, this, TQ_SLOT(slotView()), actionCollection(), "file_view");
+	new TDEAction( i18n( "&New Fax Recipient..." ), "edit", TQt::CTRL+TQt::Key_N, this, TQ_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" );
 
-	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
+	KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection());
 	setStandardToolBarMenuEnabled(true);
-	KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleMenuBar()), actionCollection());
-	KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection());
-        KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), 
+	KStdAction::showMenubar(this, TQ_SLOT(slotToggleMenuBar()), actionCollection());
+	KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection());
+        KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), 
 actionCollection());
 	actionCollection()->action("fax_stop")->setEnabled(false);
-	connect(actionCollection()->action("file_remove"), TQT_SIGNAL(enabled(bool)), actionCollection()->action("file_view"), TQT_SLOT(setEnabled(bool)));
+	connect(actionCollection()->action("file_remove"), TQ_SIGNAL(enabled(bool)), actionCollection()->action("file_view"), TQ_SLOT(setEnabled(bool)));
 	actionCollection()->action("file_remove")->setEnabled(false);
 
 	createGUI();
diff --git a/tdeprint/tdeprintfax/tdeprintfax.h b/tdeprint/tdeprintfax/tdeprintfax.h
index 783593c3b..9981ba72a 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.h
+++ b/tdeprint/tdeprintfax/tdeprintfax.h
@@ -38,7 +38,7 @@ class TQListViewItem;
 
 class KdeprintFax : public TDEMainWindow
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	struct FaxItem
 	{
diff --git a/tdescreensaver/blankscrn.cpp b/tdescreensaver/blankscrn.cpp
index fce4491e7..f1f39ca57 100644
--- a/tdescreensaver/blankscrn.cpp
+++ b/tdescreensaver/blankscrn.cpp
@@ -55,8 +55,8 @@ KBlankSetup::KBlankSetup( TQWidget *parent, const char *name )
 
 	KColorButton *colorPush = new KColorButton( color, main );
 	colorPush->setMinimumWidth(80);
-	connect( colorPush, TQT_SIGNAL( changed(const TQColor &) ),
-		TQT_SLOT( slotColor(const TQColor &) ) );
+	connect( colorPush, TQ_SIGNAL( changed(const TQColor &) ),
+		TQ_SLOT( slotColor(const TQColor &) ) );
 	grid->addWidget(colorPush, 1, 0);
 
 	preview = new TQWidget( main );
diff --git a/tdescreensaver/blankscrn.h b/tdescreensaver/blankscrn.h
index ba6da0226..4fefb9dfd 100644
--- a/tdescreensaver/blankscrn.h
+++ b/tdescreensaver/blankscrn.h
@@ -17,7 +17,7 @@ class KColorButton;
 
 class KBlankSaver : public KScreenSaver
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KBlankSaver( WId drawable );
 	virtual ~KBlankSaver();
@@ -34,7 +34,7 @@ private:
 
 class KBlankSetup : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KBlankSetup( TQWidget *parent = NULL, const char *name = NULL );
 
diff --git a/tdescreensaver/random.h b/tdescreensaver/random.h
index e34556662..3b7fb8ea4 100644
--- a/tdescreensaver/random.h
+++ b/tdescreensaver/random.h
@@ -19,7 +19,7 @@ class TQCheckBox;
 
 class KRandomSetup : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		KRandomSetup( TQWidget *parent = NULL, const char *name = NULL );
 
diff --git a/tdesu/CMakeLists.txt b/tdesu/CMakeLists.txt
index 4c33fb0d8..67ee4c645 100644
--- a/tdesu/CMakeLists.txt
+++ b/tdesu/CMakeLists.txt
@@ -40,6 +40,8 @@ else()
 endif()
 
 check_function_exists( getpeereid HAVE_GETPEEREID )
+check_function_exists( getpeerucred HAVE_GETPEERUCRED )
+
 check_include_file( "sys/select.h" HAVE_SYS_SELECT_H )
 check_include_file( "sys/wait.h" HAVE_SYS_WAIT_H )
 
diff --git a/tdesu/tdesu/sudlg.h b/tdesu/tdesu/sudlg.h
index 2cc8dbe7e..669eea8e7 100644
--- a/tdesu/tdesu/sudlg.h
+++ b/tdesu/tdesu/sudlg.h
@@ -12,7 +12,7 @@
 class TDEsuDialog
     : public KPasswordDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon , bool withIgnoreButton=false, int timeout=-1);
diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp
index d463a400a..950bb91b4 100644
--- a/tdesu/tdesud/tdesud.cpp
+++ b/tdesu/tdesud/tdesud.cpp
@@ -45,7 +45,8 @@
 #include <pwd.h>
 #include <errno.h>
 
-#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) &&\
+	!defined(Q_OS_SOLARIS)
 #include <sys/prctl.h>
 #endif
 #include <sys/time.h>
@@ -251,7 +252,8 @@ int create_socket()
 
 int main(int argc, char *argv[])
 {
-#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) &&\
+	!defined(Q_OS_SOLARIS)
     prctl(PR_SET_DUMPABLE, 0);
 #endif
 
diff --git a/tdm/ConfigureChecks.cmake b/tdm/ConfigureChecks.cmake
index 335a37f63..d0080f4f1 100644
--- a/tdm/ConfigureChecks.cmake
+++ b/tdm/ConfigureChecks.cmake
@@ -10,11 +10,19 @@
 #################################################
 
 find_library( UTIL_LIBRARY util )
+if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+  set( UTIL_LIBRARY "" )
+endif()
 
 check_function_exists( getdomainname HAVE_GETDOMAINNAME )
 check_function_exists( initgroups HAVE_INITGROUPS )
 check_function_exists( mkstemp HAVE_MKSTEMP )
 check_function_exists( setproctitle HAVE_SETPROCTITLE )
+tde_save_and_set( CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE" "-D__BSD_VISIBLE=1" )
+tde_save_and_set( CMAKE_REQUIRED_LIBRARIES "pthread" )
+check_function_exists( pthread_setname_np HAVE_PTHREAD_SETNAME_NP )
+tde_restore( CMAKE_REQUIRED_DEFINITIONS )
+tde_restore( CMAKE_REQUIRED_LIBRARIES )
 check_function_exists( sysinfo HAVE_SYSINFO )
 check_function_exists( strnlen HAVE_STRNLEN )
 check_function_exists( getifaddrs HAVE_GETIFADDRS )
@@ -118,18 +126,6 @@ if( WITH_XDMCP )
 endif()
 
 
-if( WITH_PAM )
-
-  set( USE_PAM 1 CACHE INTERNAL "" FORCE )
-
-elseif( WITH_SHADOW )
-
-  set( HAVE_SHADOW 1 CACHE INTERNAL "" FORCE )
-  set( USESHADOW 1 CACHE INTERNAL "" FORCE )
-
-endif( )
-
-
 # If a tdm.service file is wanted, find systemd, then work out which
 # distribution is running, select an appropriate template and create the file.
 # When it is not possible to identify the distribution or there is no specific
diff --git a/tdm/backend/CMakeLists.txt b/tdm/backend/CMakeLists.txt
index 8f11c4b34..cb0cd3d3f 100644
--- a/tdm/backend/CMakeLists.txt
+++ b/tdm/backend/CMakeLists.txt
@@ -18,6 +18,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdm/kfrontend
   ${XAU_INCLUDE_DIRS}
   ${XDMCP_INCLUDE_DIRS}
+  ${TQT_INCLUDE_DIRS}
 )
 
 link_directories(
@@ -48,6 +49,6 @@ tde_add_executable( tdm
     process.c protodpy.c reset.c resource.c rpcauth.c
     server.c session.c sessreg.c socket.c streams.c
     util.c xdmauth.c xdmcp.c
-  LINK X11 ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${UTIL_LIBRARY} ${XDMCP_LIBRARIES}
+  LINK X11 pthread ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${UTIL_LIBRARY} ${XDMCP_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tdm/backend/ctrl.c b/tdm/backend/ctrl.c
index 1e7cfd07a..cc9540745 100644
--- a/tdm/backend/ctrl.c
+++ b/tdm/backend/ctrl.c
@@ -41,6 +41,7 @@ from the copyright holder.
 #include <string.h>
 #include <signal.h>
 #include <pwd.h>
+#include <sys/ioctl.h>
 #include <sys/stat.h>
 
 #ifdef __linux__
diff --git a/tdm/backend/dm.c b/tdm/backend/dm.c
index 605f0b1c4..9168b88b5 100644
--- a/tdm/backend/dm.c
+++ b/tdm/backend/dm.c
@@ -34,6 +34,8 @@ from the copyright holder.
  * display manager
  */
 
+#include <tqglobal.h>
+
 #include "dm.h"
 #include "dm_auth.h"
 #include "dm_error.h"
@@ -51,6 +53,12 @@ from the copyright holder.
 # include <sys/vt.h>
 #endif
 
+#ifdef HAVE_PTHREAD_SETNAME_NP
+#define _GNU_SOURCE
+#define __BSD_VISIBLE 1
+#include <pthread.h>
+#endif /* pthread_setname_np() */
+
 // Limited by the number of VTs configured into the kernel or 256, whichever is less
 #define MAX_VT_NUMBER 48
 
@@ -66,7 +74,8 @@ static void MainLoop( void );
 
 static int signalFds[2];
 
-#if !defined(HAVE_SETPROCTITLE) && !defined(NOXDMTITLE)
+#if !defined(HAVE_SETPROCTITLE) && !defined(NOXDMTITLE) && \
+    !defined(HAVE_PTHREAD_SETNAME_NP)
 static char *Title;
 static int TitleLen;
 #endif
@@ -104,7 +113,7 @@ main( int argc, char **argv )
 		if (!StrDup( &progpath, argv[0] ))
 			Panic( "Out of memory" );
 	} else
-#ifdef __linux__
+#ifdef Q_OS_LINUX
 	{
 		/* note that this will resolve symlinks ... */
 		int len;
@@ -114,6 +123,16 @@ main( int argc, char **argv )
 		if (!StrNDup( &progpath, fullpath, len ))
 			Panic( "Out of memory" );
 	}
+#elif defined(Q_OS_SOLARIS)
+	{
+		/* note that this will resolve symlinks ... */
+		int len;
+		char fullpath[PATH_MAX];
+		if ((len = readlink( "/proc/self/path/a.out", fullpath, sizeof(fullpath) )) < 0)
+			Panic( "Invoke with full path specification or mount /proc" );
+		if (!StrNDup( &progpath, fullpath, len ))
+			Panic( "Out of memory" );
+	}
 #else
 # if 0
 		Panic( "Must be invoked with full path specification" );
@@ -161,7 +180,8 @@ main( int argc, char **argv )
 #endif
 	prog = strrchr( progpath, '/' ) + 1;
 
-#if !defined(HAVE_SETPROCTITLE) && !defined(NOXDMTITLE)
+#if !defined(HAVE_SETPROCTITLE) && !defined(NOXDMTITLE) && \
+    !defined(HAVE_PTHREAD_SETNAME_NP)
 	Title = argv[0];
 	TitleLen = (argv[argc - 1] + strlen( argv[argc - 1] )) - Title;
 #endif
@@ -1685,7 +1705,8 @@ UnlockPidFile( void )
 void
 SetTitle( const char *name )
 {
-#if !defined(HAVE_SETPROCTITLE) && !defined(NOXDMTITLE)
+#if !defined(HAVE_SETPROCTITLE) && !defined(NOXDMTITLE) && \
+    !defined(HAVE_PTHREAD_SETNAME_NP)
 	char *p;
 	int left;
 #endif
@@ -1694,6 +1715,8 @@ SetTitle( const char *name )
 	ReInitErrorLog();
 #ifdef HAVE_SETPROCTITLE
 	setproctitle( "%s", name );
+#elif defined(HAVE_PTHREAD_SETNAME_NP)
+	pthread_setname_np(pthread_self(), name);
 #elif !defined(NOXDMTITLE)
 	p = Title;
 	left = TitleLen;
diff --git a/tdm/backend/getfd.c b/tdm/backend/getfd.c
index aaad616b6..6dea4f56c 100644
--- a/tdm/backend/getfd.c
+++ b/tdm/backend/getfd.c
@@ -1,12 +1,15 @@
+#include <tqglobal.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/ioctl.h>
-#ifdef __linux__
+#ifdef Q_OS_LINUX
 #include <linux/kd.h>
 #endif
+
 #include "getfd.h"
 
 /*
@@ -22,7 +25,8 @@ is_a_console(int fd) {
 	char arg;
 
 	arg = 0;
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) ||\
+    defined(Q_OS_SOLARIS)
 	return arg;
 #else
 	return (ioctl(fd, KDGKBTYPE, &arg) == 0
diff --git a/tdm/backend/xdmcp.c b/tdm/backend/xdmcp.c
index 6abaf5fc8..85bea54be 100644
--- a/tdm/backend/xdmcp.c
+++ b/tdm/backend/xdmcp.c
@@ -160,7 +160,7 @@ all_query_respond( struct sockaddr *from, int fromlen,
 	int family;
 	int length;
 
-	family = ConvertAddr( (XdmcpNetaddr)from, &length, &(addr.data) );
+	family = ConvertAddr( (XdmcpNetaddr)from, &length, (char**)&(addr.data) );
 	addr.length = length; /* convert int to short */
 	Debug( "all_query_respond: conntype=%d, addr=%02[*:hhx\n",
 	       family, addr.length, addr.data );
diff --git a/tdm/config.def b/tdm/config.def
index 7ffdd2376..43de11c71 100644
--- a/tdm/config.def
+++ b/tdm/config.def
@@ -33,19 +33,8 @@
 #define TDMCONF KDE_CONFDIR "/tdm"
 #define TDMDATA KDE_DATADIR "/tdm"
 
-#ifdef _AIX
-# define HALT_CMD	"/usr/sbin/shutdown -h now"
-# define REBOOT_CMD	"/usr/sbin/shutdown -r now"
-#elif defined(BSD)
-# define HALT_CMD	"/sbin/shutdown -h now"
-# define REBOOT_CMD	"/sbin/shutdown -r now"
-#elif defined(__SVR4)
-# define HALT_CMD	"/usr/sbin/halt"
-# define REBOOT_CMD	"/usr/sbin/reboot"
-#else
-# define HALT_CMD	"/sbin/poweroff"
-# define REBOOT_CMD	"/sbin/reboot"
-#endif
+# define HALT_CMD	POWEROFF_BINARY
+# define REBOOT_CMD	REBOOT_BINARY
 
 #if defined(BSD) || defined(__linux__)
 # define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games"
diff --git a/tdm/cryptocardwatcher/main.cpp b/tdm/cryptocardwatcher/main.cpp
index 5d27ff19b..34cc96b59 100644
--- a/tdm/cryptocardwatcher/main.cpp
+++ b/tdm/cryptocardwatcher/main.cpp
@@ -123,8 +123,8 @@ int main(int argc, char *argv[]) {
 	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);
 	for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) {
 		TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-		TQObject::connect(cdevice, TQT_SIGNAL(cardInserted(TDECryptographicCardDevice*)), watcher, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
-		TQObject::connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), watcher, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
+		TQObject::connect(cdevice, TQ_SIGNAL(cardInserted(TDECryptographicCardDevice*)), watcher, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
+		TQObject::connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), watcher, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
 		cdevice->enableCardMonitoring(true);
 	}
 
diff --git a/tdm/cryptocardwatcher/watcher.h b/tdm/cryptocardwatcher/watcher.h
index bfbb010a0..289f16142 100644
--- a/tdm/cryptocardwatcher/watcher.h
+++ b/tdm/cryptocardwatcher/watcher.h
@@ -26,7 +26,7 @@ class TDECryptographicCardDevice;
 
 class CardWatcher : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		CardWatcher();
diff --git a/tdm/kfrontend/kchooser.cpp b/tdm/kfrontend/kchooser.cpp
index 9f0c714c0..876f42c88 100644
--- a/tdm/kfrontend/kchooser.cpp
+++ b/tdm/kfrontend/kchooser.cpp
@@ -75,7 +75,7 @@ ChooserDlg::ChooserDlg()
 	iline->setEnabled( TRUE );
 	TQLabel *itxt = new TQLabel( iline, i18n("Hos&t:"), this );
 	TQPushButton *addButton = new TQPushButton( i18n("A&dd"), this );
-	connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addHostname()) );
+	connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addHostname()) );
 	TQBoxLayout *hibox = new TQHBoxLayout( vbox, 10 );
 	hibox->addWidget( itxt );
 	hibox->addWidget( iline );
@@ -106,13 +106,13 @@ ChooserDlg::ChooserDlg()
 		vbox->addWidget( consoleView );
 #endif
 
-	sn = new TQSocketNotifier( rfd, TQSocketNotifier::Read, TQT_TQOBJECT(this) );
-	connect( sn, TQT_SIGNAL(activated( int )), TQT_SLOT(slotReadPipe()) );
+	sn = new TQSocketNotifier( rfd, TQSocketNotifier::Read, this );
+	connect( sn, TQ_SIGNAL(activated( int )), TQ_SLOT(slotReadPipe()) );
 
-	connect( pingButton, TQT_SIGNAL(clicked()), TQT_SLOT(pingHosts()) );
-	connect( acceptButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
-//	connect( helpButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()) );
-	connect( host_view, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(accept()) );
+	connect( pingButton, TQ_SIGNAL(clicked()), TQ_SLOT(pingHosts()) );
+	connect( acceptButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
+//	connect( helpButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp()) );
+	connect( host_view, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(accept()) );
 
 	adjustGeometry();
 }
diff --git a/tdm/kfrontend/kchooser.h b/tdm/kfrontend/kchooser.h
index fcf14b1e1..1382ddd57 100644
--- a/tdm/kfrontend/kchooser.h
+++ b/tdm/kfrontend/kchooser.h
@@ -33,7 +33,7 @@ class TQListView;
 class TQListViewItem;
 
 class ChooserDlg : public KGDialog {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef KGDialog inherited;
 
   public:
diff --git a/tdm/kfrontend/kconsole.cpp b/tdm/kfrontend/kconsole.cpp
index bf1560aed..d47576c12 100644
--- a/tdm/kfrontend/kconsole.cpp
+++ b/tdm/kfrontend/kconsole.cpp
@@ -129,7 +129,7 @@ KConsole::OpenConsole()
 
   gotcon:
 	notifier = new TQSocketNotifier( fd, TQSocketNotifier::Read, this );
-	connect( notifier, TQT_SIGNAL(activated( int )), TQT_SLOT(slotData()) );
+	connect( notifier, TQ_SIGNAL(activated( int )), TQ_SLOT(slotData()) );
 	return 1;
 }
 
diff --git a/tdm/kfrontend/kconsole.h b/tdm/kfrontend/kconsole.h
index 2b3e2aac3..04d197652 100644
--- a/tdm/kfrontend/kconsole.h
+++ b/tdm/kfrontend/kconsole.h
@@ -30,7 +30,7 @@ class TQSocketNotifier;
 class KPty;
 
 class KConsole : public TQTextEdit {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TQTextEdit inherited;
 
   public:
diff --git a/tdm/kfrontend/kfdialog.cpp b/tdm/kfrontend/kfdialog.cpp
index 5e8f8e861..30ee85a00 100644
--- a/tdm/kfrontend/kfdialog.cpp
+++ b/tdm/kfrontend/kfdialog.cpp
@@ -178,10 +178,10 @@ KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &t
 	KPushButton *button = new KPushButton( KStdGuiItem::ok(), this );
 	button->setDefault( true );
 	button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
-	connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
+	connect( button, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
 
 	TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 );
-	grid->addWidget( label1, 0, 0, Qt::AlignCenter );
-	grid->addWidget( label2, 0, 1, Qt::AlignCenter );
-	grid->addMultiCellWidget( button, 1,1, 0,1, Qt::AlignCenter );
+	grid->addWidget( label1, 0, 0, TQt::AlignCenter );
+	grid->addWidget( label2, 0, 1, TQt::AlignCenter );
+	grid->addMultiCellWidget( button, 1,1, 0,1, TQt::AlignCenter );
 }
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index 58b9d2e9c..6e144600f 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -101,7 +101,7 @@ GreeterApp::GreeterApp(Display *dpy) : TDEApplication(dpy)
 	init();
 }
 
-GreeterApp::GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap) : TDEApplication(dpy, visual, colormap)
+GreeterApp::GreeterApp(Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap) : TDEApplication(dpy, visual, colormap)
 {
 	init();
 }
@@ -126,7 +126,7 @@ void GreeterApp::init()
 
 #ifdef WITH_TDEHWLIB
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*)));
 #endif
 }
 
@@ -201,7 +201,7 @@ checkSAK(GreeterApp* app)
 	app->restoreOverrideCursor();
 	SAKDlg sak(0);
 	sak.exec();
-	app->setOverrideCursor( Qt::WaitCursor );
+	app->setOverrideCursor( TQt::WaitCursor );
 }
 
 void
@@ -284,7 +284,7 @@ kg_main( const char *argv0 )
 
 	GreeterApp *app;
 	if ((!_compositor.isEmpty()) && ( argb_visual_available == true )) {
-		app = new GreeterApp(dpyi, Qt::HANDLE( visual ), Qt::HANDLE( colormap ));
+		app = new GreeterApp(dpyi, TQt::HANDLE( visual ), TQt::HANDLE( colormap ));
 	}
 	else {
 		argb_visual_available = false;
@@ -411,14 +411,14 @@ kg_main( const char *argv0 )
 		}
 
 		if (cmd == G_ErrorGreet) {
-			if (KGVerify::handleFailVerify( TQT_TQWIDGET(tqApp->desktop()->screen( _greeterScreen )) ))
+			if (KGVerify::handleFailVerify( tqApp->desktop()->screen( _greeterScreen ) ))
 				break;
 			_autoLoginDelay = 0;
 			cmd = G_Greet;
 		}
 
 		TDEProcess *proc2 = 0;
-		app->setOverrideCursor( Qt::WaitCursor );
+		app->setOverrideCursor( TQt::WaitCursor );
 		FDialog *dialog = NULL;
 #ifdef XDMCP
 		if (cmd == G_Choose) {
diff --git a/tdm/kfrontend/kgapp.h b/tdm/kfrontend/kgapp.h
index 4b6c65f6a..1acbcf187 100644
--- a/tdm/kfrontend/kgapp.h
+++ b/tdm/kfrontend/kgapp.h
@@ -34,13 +34,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #endif
 
 class GreeterApp : public TDEApplication {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TDEApplication inherited;
 
   public:
 	GreeterApp();
 	GreeterApp(Display *dpy);
-	GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap);
+	GreeterApp(Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap);
 	~GreeterApp();
 	virtual bool x11EventFilter( XEvent * );
 
diff --git a/tdm/kfrontend/kgdialog.cpp b/tdm/kfrontend/kgdialog.cpp
index 91058a0b8..684c57e6d 100644
--- a/tdm/kfrontend/kgdialog.cpp
+++ b/tdm/kfrontend/kgdialog.cpp
@@ -60,42 +60,42 @@ KGDialog::completeMenu()
 	if (_isLocal) {
 		dpyMenu = new TQPopupMenu( this );
 		int id = inserten( i18n("Sw&itch User"), ALT+Key_I, dpyMenu );
-		connect( dpyMenu, TQT_SIGNAL(activated( int )),
-		         TQT_SLOT(slotDisplaySelected( int )) );
-		connect( dpyMenu, TQT_SIGNAL(aboutToShow()),
-		         TQT_SLOT(slotPopulateDisplays()) );
+		connect( dpyMenu, TQ_SIGNAL(activated( int )),
+		         TQ_SLOT(slotDisplaySelected( int )) );
+		connect( dpyMenu, TQ_SIGNAL(aboutToShow()),
+		         TQ_SLOT(slotPopulateDisplays()) );
 		TQAccel *accel = new TQAccel( this );
 		accel->insertItem( ALT+CTRL+Key_Insert, id );
-		connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActivateMenu( int )) );
+		connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotActivateMenu( int )) );
 	}
 #endif
 
 	if (_allowClose)
 		inserten( _isLocal ? i18n("R&estart X Server") : i18n("Clos&e Connection"),
-		          ALT+Key_E, TQT_SLOT(slotExit()) );
+		          ALT+Key_E, TQ_SLOT(slotExit()) );
 
 #ifdef XDMCP
 	if (_isLocal && _loginMode != _switchIf) {
 		switchCode = _switchCode;
-		inserten( _switchMsg, _switchAccel, TQT_SLOT(slotSwitch()) );
+		inserten( _switchMsg, _switchAccel, TQ_SLOT(slotSwitch()) );
 	}
 #endif
 
 	if (_hasConsole)
-		inserten( i18n("Co&nsole Login"), ALT+Key_N, TQT_SLOT(slotConsole()) );
+		inserten( i18n("Co&nsole Login"), ALT+Key_N, TQ_SLOT(slotConsole()) );
 
 	if (_allowShutdown != SHUT_NONE) {
                 ensureMenu();
-                optMenu->insertItem(SmallIconSet( "system-log-out" ), i18n("&Shutdown..."), this, TQT_SLOT(slotShutdown(int)), ALT+Key_S );
+                optMenu->insertItem(SmallIconSet( "system-log-out" ), i18n("&Shutdown..."), this, TQ_SLOT(slotShutdown(int)), ALT+Key_S );
 		TQAccel *accel = new TQAccel( this );
 		accel->insertItem( ALT+CTRL+Key_Delete );
-		connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) );
+		connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotShutdown( int )) );
 		accel = new TQAccel( this );
 		accel->insertItem( SHIFT+ALT+CTRL+Key_PageUp, SHUT_REBOOT );
-		connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) );
+		connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotShutdown( int )) );
 		accel = new TQAccel( this );
 		accel->insertItem( SHIFT+ALT+CTRL+Key_PageDown, SHUT_HALT );
-		connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) );
+		connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotShutdown( int )) );
 	}
 }
 
@@ -125,7 +125,7 @@ KGDialog::inserten( const TQString& txt, int accel, TQPopupMenu *cmnu )
 	ensureMenu();
 	int id = optMenu->insertItem( txt, cmnu );
 	optMenu->setAccel( accel, id );
-	optMenu->connectItem( id, this, TQT_SLOT(slotActivateMenu( int )) );
+	optMenu->connectItem( id, this, TQ_SLOT(slotActivateMenu( int )) );
 	optMenu->setItemParameter( id, id );
 	return id;
 }
@@ -151,7 +151,7 @@ KGDialog::slotSwitch()
 {
 #ifdef XDMCP
 	// workaround for Qt bug
-	TQTimer::singleShot( 0, this, TQT_SLOT(slotReallySwitch()) );
+	TQTimer::singleShot( 0, this, TQ_SLOT(slotReallySwitch()) );
 #endif
 }
 
diff --git a/tdm/kfrontend/kgdialog.h b/tdm/kfrontend/kgdialog.h
index a902b6ff0..fe084ca0b 100644
--- a/tdm/kfrontend/kgdialog.h
+++ b/tdm/kfrontend/kgdialog.h
@@ -41,7 +41,7 @@ class KGVerify;
 #define ex_choose  3
 
 class KGDialog : public FDialog {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef FDialog inherited;
 
   public:
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index c5e5e37e7..d0815efbe 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -123,8 +123,8 @@ class UserListView : public TDEListView {
                 // FIXME: This must be configurable, so disable
                 // painting of list background for now.
 //		if (themed) {
-//		  setBackgroundMode( Qt::NoBackground );
-//		  viewport()->setBackgroundMode( Qt::NoBackground );
+//		  setBackgroundMode( TQt::NoBackground );
+//		  viewport()->setBackgroundMode( TQt::NoBackground );
 //		  setFrameStyle( TQFrame::NoFrame );
 //		}
 	}
@@ -169,7 +169,7 @@ public:
         // painting of list background for now.
         return TDEListView::paintEmptyArea(p, rect );
 
-        const TQPixmap *pm = TQT_TQPIXMAP_CONST(paletteBackgroundPixmap());
+        const TQPixmap *pm = paletteBackgroundPixmap();
         if (!pm || pm->isNull()) {
             return;
         }
@@ -207,18 +207,18 @@ KGreeter::KGreeter( bool framed )
 	if (_userList) {
                 readFacesList();
 		userView = new UserListView( framed, this );
-		connect( userView, TQT_SIGNAL(clicked( TQListViewItem * )),
-		         TQT_SLOT(slotUserClicked( TQListViewItem * )) );
-		connect( userView, TQT_SIGNAL(doubleClicked( TQListViewItem * )),
-		         TQT_SLOT(accept()) );
+		connect( userView, TQ_SIGNAL(clicked( TQListViewItem * )),
+		         TQ_SLOT(slotUserClicked( TQListViewItem * )) );
+		connect( userView, TQ_SIGNAL(doubleClicked( TQListViewItem * )),
+		         TQ_SLOT(accept()) );
 	}
 	if (_userCompletion) {
 		userList = new TQStringList;
 	}
 
         sessMenu = new TQPopupMenu( this );
-	connect( sessMenu, TQT_SIGNAL(activated( int )),
-	         TQT_SLOT(slotSessionSelected( int )) );
+	connect( sessMenu, TQ_SIGNAL(activated( int )),
+	         TQ_SLOT(slotSessionSelected( int )) );
 	insertSessions();
 
 	if (curPlugin < 0) {
@@ -230,8 +230,8 @@ KGreeter::KGreeter( bool framed )
 	mControlPipeHandler = new ControlPipeHandlerObject();
 	mControlPipeHandler->mKGreeterParent = this;
 	mControlPipeHandler->moveToThread(mControlPipeHandlerThread);
-	TQObject::connect(mControlPipeHandler, SIGNAL(processCommand(TQString)), this, SLOT(processInputPipeCommand(TQString)));
-	TQTimer::singleShot(0, mControlPipeHandler, SLOT(run()));
+	TQObject::connect(mControlPipeHandler, TQ_SIGNAL(processCommand(TQString)), this, TQ_SLOT(processInputPipeCommand(TQString)));
+	TQTimer::singleShot(0, mControlPipeHandler, TQ_SLOT(run()));
 	mControlPipeHandlerThread->start();
 }
 
@@ -258,8 +258,8 @@ void KGreeter::cryptographicCardWatcherSetup() {
 	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);
 	for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) {
 		TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-		connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
-		connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
+		connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
+		connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
 		cdevice->enableCardMonitoring(true);
 	}
 #endif
@@ -393,7 +393,7 @@ KGreeter::insertUser( const TQImage &default_pix,
 		TQBuffer buf( fc );
 		buf.open( IO_ReadOnly );
 		TQImageIO ir;
-		ir.setIODevice( TQT_TQIODEVICE(&buf) );
+		ir.setIODevice( &buf );
 		if (!ir.read()) {
 			LogInfo( "%s is no valid image\n", fn.data() );
 			continue;
@@ -401,7 +401,7 @@ KGreeter::insertUser( const TQImage &default_pix,
 		p = ir.image();
 		TQSize ns( 48, 48 );
 		if (p.size() != ns) {
-			p = p.convertDepth( 32 ).smoothScale( ns, TQ_ScaleMin );
+			p = p.convertDepth( 32 ).smoothScale( ns, TQImage::ScaleMin );
 		}
 		break;
 	} while (--nd >= 0);
@@ -490,7 +490,7 @@ KGreeter::insertUsers(int limit_users)
 		TQSize ns( 48, 48 );
 		if (default_pix.size() != ns)
 			default_pix =
-			  default_pix.convertDepth( 32 ).smoothScale( ns, TQ_ScaleMin );
+			  default_pix.convertDepth( 32 ).smoothScale( ns, TQImage::ScaleMin );
 	}
 	if (_showUsers == SHOW_ALL) {
 		KGreeterUserList noUsers( _noUsers );
@@ -656,7 +656,7 @@ KGreeter::slotUserEntered()
 	if (isVisible())
 		slotLoadPrevWM();
 	else
-		TQTimer::singleShot( 0, this, TQT_SLOT(slotLoadPrevWM()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(slotLoadPrevWM()) );
 }
 
 void
@@ -993,7 +993,7 @@ KStdGreeter::KStdGreeter()
 		                    "open windows on it or intercept your input.") );
 		complainLabel->setAlignment( AlignCenter );
 		complainLabel->setFont( _failFont );
-		complainLabel->setPaletteForegroundColor( Qt::red );
+		complainLabel->setPaletteForegroundColor( TQt::red );
 		inner_box->addWidget( complainLabel );
 	}
 	if (_logoArea == LOGO_NONE) {
@@ -1053,7 +1053,7 @@ KStdGreeter::KStdGreeter()
 
 	goButton = new TQPushButton( i18n("L&ogin"), this );
 	goButton->setDefault( true );
-	connect( goButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
+	connect( goButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
 	menuButton = new TQPushButton( i18n("&Menu"), this );
 	//helpButton
 
@@ -1112,7 +1112,7 @@ KStdGreeter::KStdGreeter()
         verify->setInfoMessageDisplay(showInfoMessages);
 	verify->start();
 
-	TQTimer::singleShot(0, this, SLOT(cryptographicCardWatcherSetup()));
+	TQTimer::singleShot(0, this, TQ_SLOT(cryptographicCardWatcherSetup()));
 }
 
 void
@@ -1168,8 +1168,8 @@ KThemedGreeter::KThemedGreeter()
 		return;
 	}
 
-	connect( themer, TQT_SIGNAL(activated( const TQString & )),
-	         TQT_SLOT(slotThemeActivated( const TQString & )) );
+	connect( themer, TQ_SIGNAL(activated( const TQString & )),
+	         TQ_SLOT(slotThemeActivated( const TQString & )) );
 
 	console_rect = themer->findNode( "xconsole" ); // tdm ext
 	userlist_rect = themer->findNode( "userlist" );
@@ -1256,14 +1256,14 @@ KThemedGreeter::KThemedGreeter()
 	system_button = themer->findNode( "system_button" );
 	TQAccel *accel = new TQAccel( this );
 	accel->insertItem( ALT+Key_M, 0 );
-	connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActionMenu()) );
+	connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotActionMenu()) );
 
 	pluginSetup();
 
 	verify->setInfoMessageDisplay(showInfoMessages);
 	verify->start();
 
-	TQTimer::singleShot(0, this, SLOT(cryptographicCardWatcherSetup()));
+	TQTimer::singleShot(0, this, TQ_SLOT(cryptographicCardWatcherSetup()));
 }
 
 bool
diff --git a/tdm/kfrontend/kgreeter.h b/tdm/kfrontend/kgreeter.h
index f715b3a8c..ed634c6e8 100644
--- a/tdm/kfrontend/kgreeter.h
+++ b/tdm/kfrontend/kgreeter.h
@@ -69,7 +69,7 @@ struct SessType {
 //
 class ControlPipeHandlerObject : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ControlPipeHandlerObject();
@@ -93,7 +93,7 @@ class ControlPipeHandlerObject : public TQObject
 // TDM greeter
 //
 class KGreeter : public KGDialog, public KGVerifyHandler {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef KGDialog inherited;
 
   public:
@@ -166,7 +166,7 @@ class KGreeter : public KGDialog, public KGVerifyHandler {
 };
 
 class KStdGreeter : public KGreeter {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef KGreeter inherited;
 
   public:
@@ -187,7 +187,7 @@ class KStdGreeter : public KGreeter {
 };
 
 class KThemedGreeter : public KGreeter {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef KGreeter inherited;
 
   public:
diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp
index 44353087a..105ee3aeb 100644
--- a/tdm/kfrontend/kgverify.cpp
+++ b/tdm/kfrontend/kgverify.cpp
@@ -105,8 +105,8 @@ KGVerify::KGVerify(KGVerifyHandler *_handler, KdmThemer *_themer,
 	, cardLoginDevice(NULL)
 #endif
 {
-	connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
-	connect( kapp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
+	connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
+	connect( kapp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()) );
 
 	_parent->installEventFilter( this );
 }
@@ -125,8 +125,8 @@ KGVerify::getPlugMenu()
 		uint np = pluginList.count();
 		if (np > 1) {
 			plugMenu = new TQPopupMenu( parent );
-			connect( plugMenu, TQT_SIGNAL(activated( int )),
-			         TQT_SLOT(slotPluginSelected( int )) );
+			connect( plugMenu, TQ_SIGNAL(activated( int )),
+			         TQ_SLOT(slotPluginSelected( int )) );
 			for (uint i = 0; i < np; i++)
 				plugMenu->insertItem( i18n(greetPlugins[pluginList[i]].info->name), pluginList[i] );
 		}
@@ -1086,7 +1086,7 @@ KGStdVerify::KGStdVerify( KGVerifyHandler *_handler, TQWidget *_parent,
 
 	failedLabel = new TQLabel( parent );
 	failedLabel->setFont( _failFont );
-	grid->addWidget( failedLabel, 1, 0, Qt::AlignCenter );
+	grid->addWidget( failedLabel, 1, 0, TQt::AlignCenter );
 
 	updateLockStatus();
 }
@@ -1143,7 +1143,7 @@ KGStdVerify::updateStatus()
 	if (failedLabelState != nfls) {
 		failedLabelState = nfls;
 		if (nfls < 0) {
-			failedLabel->setPaletteForegroundColor( Qt::black );
+			failedLabel->setPaletteForegroundColor( TQt::black );
 			failedLabel->setText( i18n( "Automatic login in 1 second...",
 			                            "Automatic login in %n seconds...",
 			                            timedLeft ) );
@@ -1153,11 +1153,11 @@ KGStdVerify::updateStatus()
 				failedLabel->clear();
 				break;
 			case 3:
-				failedLabel->setPaletteForegroundColor( Qt::red );
+				failedLabel->setPaletteForegroundColor( TQt::red );
 				failedLabel->setText( i18n("Warning: Caps Lock on") );
 				break;
 			case 2:
-				failedLabel->setPaletteForegroundColor( Qt::black );
+				failedLabel->setPaletteForegroundColor( TQt::black );
 				failedLabel->setText( authTok ?
 				                         i18n("Change failed") :
 				                         fixedEntity.isEmpty() ?
@@ -1264,10 +1264,10 @@ KGChTok::KGChTok( TQWidget *_parent, const TQString &user,
 	hlay->addWidget( cancelButton );
 	hlay->addStretch( 1 );
 
-	connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
-	connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
+	connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
+	connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
 
-	TQTimer::singleShot( 0, verify, TQT_SLOT(start()) );
+	TQTimer::singleShot( 0, verify, TQ_SLOT(start()) );
 }
 
 KGChTok::~KGChTok()
@@ -1321,7 +1321,7 @@ QXTimer::QXTimer()
 	: inherited( 0 )
 	, left( -1 )
 {
-	connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
+	connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
 }
 
 void
diff --git a/tdm/kfrontend/kgverify.h b/tdm/kfrontend/kgverify.h
index 7e3b7f89f..405fa35ba 100644
--- a/tdm/kfrontend/kgverify.h
+++ b/tdm/kfrontend/kgverify.h
@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // helper class, nuke when qt supports suspend()/resume()
 class QXTimer : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TQObject inherited;
 
   public:
@@ -89,7 +89,7 @@ struct GreeterPluginHandle {
 typedef TQValueVector<int> PluginList;
 
 class KGVerify : public TQObject, public KGreeterPluginHandler {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TQObject inherited;
 
   public:
@@ -191,7 +191,7 @@ class KGVerify : public TQObject, public KGreeterPluginHandler {
 };
 
 class KGStdVerify : public KGVerify {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef KGVerify inherited;
 
   public:
@@ -200,7 +200,7 @@ class KGStdVerify : public KGVerify {
 	             const PluginList &pluginList,
 	             KGreeterPlugin::Function func, KGreeterPlugin::Context ctx );
 	virtual ~KGStdVerify();
-	TQLayout *getLayout() const { return TQT_TQLAYOUT(grid); }
+	TQLayout *getLayout() const { return grid; }
 	void selectPlugin( int id );
 
   protected:
@@ -216,7 +216,7 @@ class KGStdVerify : public KGVerify {
 };
 
 class KGThemedVerify : public KGVerify {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef KGVerify inherited;
 
   public:
@@ -237,7 +237,7 @@ class KGThemedVerify : public KGVerify {
 };
 
 class KGChTok : public FDialog, public KGVerifyHandler {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef FDialog inherited;
 
   public:
diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp
index 7145eb18a..a52adabb2 100644
--- a/tdm/kfrontend/krootimage.cpp
+++ b/tdm/kfrontend/krootimage.cpp
@@ -51,8 +51,8 @@ MyApplication::MyApplication( const char *conf )
 	: TDEApplication(),
 	  renderer( 0, new KSimpleConfig( TQFile::decodeName( conf ) ) )
 {
-	connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
-	connect( &renderer, TQT_SIGNAL(imageDone( int )), this, TQT_SLOT(renderDone()) );
+	connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
+	connect( &renderer, TQ_SIGNAL(imageDone( int )), this, TQ_SLOT(renderDone()) );
 	renderer.enableTiling( true ); // optimize
 	renderer.changeWallpaper(); // cannot do it when we're killed, so do it now
 	timer.start( 60000 );
@@ -72,8 +72,8 @@ MyApplication::renderDone()
 	TQPixmap pm = renderer.pixmap();
 
 	// ...set it to the desktop widget...
-	TQT_TQWIDGET(desktop())->setBackgroundPixmap( pm );
-	TQT_TQWIDGET(desktop())->repaint( true );
+	desktop()->setBackgroundPixmap( pm );
+	desktop()->repaint( true );
 
 	// ...and export it via Esetroot-style so that composition managers can use it!
 	Pixmap bgPm = pm.handle(); // fetch the actual X handle to it
diff --git a/tdm/kfrontend/krootimage.h b/tdm/kfrontend/krootimage.h
index e002ce230..65b55ba45 100644
--- a/tdm/kfrontend/krootimage.h
+++ b/tdm/kfrontend/krootimage.h
@@ -32,7 +32,7 @@ Boston, MA 02110-1301, USA.
 
 class MyApplication : public TDEApplication
 {
-	Q_OBJECT
+	TQ_OBJECT
 
   public:
 	MyApplication( const char * );
diff --git a/tdm/kfrontend/sakdlg.cpp b/tdm/kfrontend/sakdlg.cpp
index a15012a17..879e30e02 100644
--- a/tdm/kfrontend/sakdlg.cpp
+++ b/tdm/kfrontend/sakdlg.cpp
@@ -133,7 +133,7 @@ SAKDlg::SAKDlg(TQWidget *parent)
 
 	mSAKProcess = new TDEProcess;
 	*mSAKProcess << "tdmtsak" << "dm";
-	connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
+	connect(mSAKProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotSAKProcessExited()));
 	mSAKProcess->start();
 
 #ifdef WITH_TDEHWLIB
@@ -143,8 +143,8 @@ SAKDlg::SAKDlg(TQWidget *parent)
 	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);
 	for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) {
 		TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-		connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
-		connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
+		connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
+		connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
 		cdevice->enableCardMonitoring(true);
 	}
 #endif
@@ -153,8 +153,8 @@ SAKDlg::SAKDlg(TQWidget *parent)
 	mControlPipeHandler = new ControlPipeHandlerObject();
 	mControlPipeHandler->mSAKDlgParent = this;
 	mControlPipeHandler->moveToThread(mControlPipeHandlerThread);
-	TQObject::connect(mControlPipeHandler, SIGNAL(processCommand(TQString)), this, SLOT(processInputPipeCommand(TQString)));
-	TQTimer::singleShot(0, mControlPipeHandler, SLOT(run()));
+	TQObject::connect(mControlPipeHandler, TQ_SIGNAL(processCommand(TQString)), this, TQ_SLOT(processInputPipeCommand(TQString)));
+	TQTimer::singleShot(0, mControlPipeHandler, TQ_SLOT(run()));
 	mControlPipeHandlerThread->start();
 }
 
@@ -253,7 +253,7 @@ void SAKDlg::reject()
 
 void SAKDlg::updateLabel(TQString &txt)
 {
-	mStatusLabel->setPaletteForegroundColor(Qt::black);
+	mStatusLabel->setPaletteForegroundColor(TQt::black);
 	mStatusLabel->setText("<b>" + txt + "</b>");
 }
 
diff --git a/tdm/kfrontend/sakdlg.h b/tdm/kfrontend/sakdlg.h
index fd77dd028..8854d8ee0 100644
--- a/tdm/kfrontend/sakdlg.h
+++ b/tdm/kfrontend/sakdlg.h
@@ -31,7 +31,7 @@ class TDECryptographicCardDevice;
 //
 class SAKDlg : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		SAKDlg(TQWidget *parent);
diff --git a/tdm/kfrontend/tdmadmindialog.cpp b/tdm/kfrontend/tdmadmindialog.cpp
index 7c792c083..9f511d221 100644
--- a/tdm/kfrontend/tdmadmindialog.cpp
+++ b/tdm/kfrontend/tdmadmindialog.cpp
@@ -70,7 +70,7 @@ TDMAdmin::TDMAdmin( const TQString &user, TQWidget *_parent )
     box->addLayout( verify->getLayout() );
     TQAccel *accel = new TQAccel( this );
     accel->insertItem( ALT+Key_A, 0 );
-    connect( accel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivatePlugMenu()) );
+    connect( accel, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivatePlugMenu()) );
 
     box->addWidget( new KSeparator( KSeparator::HLine, this ) );
 
@@ -87,8 +87,8 @@ TDMAdmin::TDMAdmin( const TQString &user, TQWidget *_parent )
     hlay->addWidget( cancelButton );
     hlay->addStretch( 1 );
 
-    connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
-    connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
+    connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
+    connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
 
     slotWhenChanged();
 }
diff --git a/tdm/kfrontend/tdmadmindialog.h b/tdm/kfrontend/tdmadmindialog.h
index e5a68fbb9..bf0e22dce 100644
--- a/tdm/kfrontend/tdmadmindialog.h
+++ b/tdm/kfrontend/tdmadmindialog.h
@@ -37,7 +37,7 @@ class TQButtonGroup;
 class TQComboBox;
 
 class TDMAdmin : public FDialog, public KGVerifyHandler {
-    Q_OBJECT
+    TQ_OBJECT
     typedef FDialog inherited;
 
 public:
diff --git a/tdm/kfrontend/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp
index f9a7122b8..88beae860 100644
--- a/tdm/kfrontend/tdmclock.cpp
+++ b/tdm/kfrontend/tdmclock.cpp
@@ -37,7 +37,7 @@ KdmClock::KdmClock( TQWidget *parent, const char *name )
 {
 	// start timer
 	TQTimer *timer = new TQTimer( this );
-	connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) );
+	connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) );
 	timer->start( 1000 );
 
 	// reading rc file
diff --git a/tdm/kfrontend/tdmclock.h b/tdm/kfrontend/tdmclock.h
index 89a48eb8e..c579cb81c 100644
--- a/tdm/kfrontend/tdmclock.h
+++ b/tdm/kfrontend/tdmclock.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqframe.h>
 
 class KdmClock : public TQFrame {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TQFrame inherited;
 
   public:
diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp
index 0cba5e82d..da0863be5 100644
--- a/tdm/kfrontend/tdmshutdown.cpp
+++ b/tdm/kfrontend/tdmshutdown.cpp
@@ -108,7 +108,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget )
 		box->addLayout( verify->getLayout() );
 		TQAccel *accel = new TQAccel( this );
 		accel->insertItem( ALT+Key_A, 0 );
-		connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActivatePlugMenu()) );
+		connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotActivatePlugMenu()) );
 	}
 
 	box->addWidget( new KSeparator( KSeparator::HLine, this ) );
@@ -121,7 +121,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget )
 		okButton->setDefault( true );
 		hlay->addWidget( okButton );
 		hlay->addStretch( 1 );
-		connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
+		connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
 	}
 	if (maySched) {
 		KPushButton *schedButton =
@@ -129,7 +129,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget )
 		schedButton->setSizePolicy( fp );
 		hlay->addWidget( schedButton );
 		hlay->addStretch( 1 );
-		connect( schedButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) );
+		connect( schedButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSched()) );
 	}
 	cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
 	cancelButton->setSizePolicy( fp );
@@ -137,7 +137,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget )
 		cancelButton->setDefault( true );
 	hlay->addWidget( cancelButton );
 	hlay->addStretch( 1 );
-	connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
+	connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
 
 	updateNeedRoot();
 }
@@ -260,8 +260,8 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent )
 
 	restart_rb = new TDMRadioButton( i18n("&Restart computer"), howGroup );
 
-	connect( rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) );
-	connect( restart_rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) );
+	connect( rb, TQ_SIGNAL(doubleClicked()), TQ_SLOT(accept()) );
+	connect( restart_rb, TQ_SIGNAL(doubleClicked()), TQ_SLOT(accept()) );
 
 	GSet( 1 );
 	GSendInt( G_ListBootOpts );
@@ -280,7 +280,7 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent )
 		          + howGroup->insideSpacing();
 		hb->addSpacing( spc );
 		hb->addWidget( targets );
-		connect( targets, TQT_SIGNAL(activated( int )), TQT_SLOT(slotTargetChanged()) );
+		connect( targets, TQ_SIGNAL(activated( int )), TQ_SLOT(slotTargetChanged()) );
 	}
 	GSet( 0 );
 
@@ -297,16 +297,16 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent )
 
 	cb_force = new TQCheckBox( i18n("&Force after timeout"), schedGroup );
 	if (_allowNuke != SHUT_NONE) {
-		connect( cb_force, TQT_SIGNAL(clicked()), TQT_SLOT(slotWhenChanged()) );
+		connect( cb_force, TQ_SIGNAL(clicked()), TQ_SLOT(slotWhenChanged()) );
 		mayNuke = true;
 	} else
 		cb_force->setEnabled( false );
 
 	TQGridLayout *grid = new TQGridLayout( schedGroup, 0, 0, KDmh, KDsh );
 	grid->addRowSpacing( 0, schedGroup->fontMetrics().height() - 5 );
-	grid->addWidget( lab1, 1, 0, Qt::AlignRight );
+	grid->addWidget( lab1, 1, 0, TQt::AlignRight );
 	grid->addWidget( le_start, 1, 1 );
-	grid->addWidget( lab2, 2, 0, Qt::AlignRight );
+	grid->addWidget( lab2, 2, 0, TQt::AlignRight );
 	grid->addWidget( le_timeout, 2, 1 );
 	grid->addMultiCellWidget( cb_force, 3,3, 0,1 );
 
@@ -437,9 +437,9 @@ TDMDelayedPushButton::TDMDelayedPushButton( const KGuiItem &item,
 	: inherited( item, parent, name )
 	, pop( 0 )
 {
-	connect( this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()) );
-	connect( this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()) );
-	connect( &popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
+	connect( this, TQ_SIGNAL(pressed()), TQ_SLOT(slotPressed()) );
+	connect( this, TQ_SIGNAL(released()), TQ_SLOT(slotReleased()) );
+	connect( &popt, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
 }
 
 void TDMDelayedPushButton::setPopup( TQPopupMenu *p )
@@ -494,7 +494,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
 
 		// first line of buttons
 		hbuttonbox = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() );
-		hbuttonbox->setAlignment( Qt::AlignHCenter );
+		hbuttonbox->setAlignment( TQt::AlignHCenter );
 
 		// Reboot
 		FlatButton* btnReboot = new FlatButton( lfrm );
@@ -503,7 +503,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
                 int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
                 btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ;
 		hbuttonbox->addWidget ( btnReboot);
-		connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
+		connect(btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot()));
 		
 		// Copied completely from the standard restart/shutdown dialog
 		GSet( 1 );
@@ -522,7 +522,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
 									t, i );
 			}
 			btnReboot->setPopup( targets );
-			connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) );
+			connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) );
 		}
 		GSet( 0 );
 		// Copied completely from the standard restart/shutdown dialog
@@ -534,16 +534,16 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
                 i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
                 btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ;
 		hbuttonbox->addWidget ( btnHalt );
-		connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
+		connect(btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt()));
 
 		// cancel buttonbox
 		TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint()  );
-		hbuttonbox2->setAlignment( Qt::AlignRight );
+		hbuttonbox2->setAlignment( TQt::AlignRight );
 
 		// Back to tdm
 		KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm );
 		hbuttonbox2->addWidget( btnBack );
-		connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+		connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 	}
 	else
 	{
@@ -567,14 +567,14 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
 		KPushButton *btnHalt = new
 			KPushButton( KGuiItem( i18n("&Turn Off Computer"), "system-log-out" ), this );
 		buttonlay->addWidget( btnHalt );
-		connect( btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()) );
+		connect( btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt()) );
 	
 		buttonlay->addSpacing( KDialog::spacingHint() );
 	
 		TDMDelayedPushButton *btnReboot = new
 			TDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this );
 		buttonlay->addWidget( btnReboot );
-		connect( btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()) );
+		connect( btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot()) );
 	
 		GSet( 1 );
 		GSendInt( G_ListBootOpts );
@@ -591,7 +591,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
 									t, i );
 			}
 			btnReboot->setPopup( targets );
-			connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) );
+			connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) );
 		}
 		GSet( 0 );
 	
@@ -601,7 +601,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
 			KPushButton *btnSched = new
 				KPushButton( KGuiItem( i18n("&Schedule...") ), this );
 			buttonlay->addWidget( btnSched );
-			connect( btnSched, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) );
+			connect( btnSched, TQ_SIGNAL(clicked()), TQ_SLOT(slotSched()) );
 	
 			buttonlay->addStretch( 1 );
 		}
@@ -612,7 +612,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
 	
 		KPushButton *btnBack = new KPushButton( KStdGuiItem::cancel(), this );
 		buttonlay->addWidget( btnBack );
-		connect( btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
+		connect( btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
 	
 		buttonlay->addSpacing( KDialog::spacingHint() );	
 	}
@@ -753,7 +753,7 @@ void FlatButton::init()
 	setUsesBigPixmap(true);
 	setAutoRaise(true);
 	setTextPosition( TQToolButton::Under );
-	setFocusPolicy(TQ_StrongFocus);	
+	setFocusPolicy(TQWidget::StrongFocus);	
  }
 
 
@@ -885,13 +885,13 @@ TDMCancelShutdown::TDMCancelShutdown( int how, int start, int timeout,
 		strt = i18n("now");
 	else {
 		qdt.setTime_t( start );
-		strt = qdt.toString( Qt::LocalDate );
+		strt = qdt.toString( TQt::LocalDate );
 	}
 	if (timeout == TO_INF)
 		end = i18n("infinite");
 	else {
 		qdt.setTime_t( timeout );
-		end = qdt.toString( Qt::LocalDate );
+		end = qdt.toString( TQt::LocalDate );
 	}
 	TQString trg =
 		i18n("Owner: %1"
diff --git a/tdm/kfrontend/tdmshutdown.h b/tdm/kfrontend/tdmshutdown.h
index 6a2ee3a70..603511267 100644
--- a/tdm/kfrontend/tdmshutdown.h
+++ b/tdm/kfrontend/tdmshutdown.h
@@ -46,7 +46,7 @@ class TQLineEdit;
 enum { Authed = TQDialog::Accepted + 1, Schedule };
 
 class TDMShutdownBase : public FDialog, public KGVerifyHandler {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef FDialog inherited;
 
   public:
@@ -94,7 +94,7 @@ class TDMShutdownBase : public FDialog, public KGVerifyHandler {
 
 
 class TDMShutdown : public TDMShutdownBase {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TDMShutdownBase inherited;
 
   public:
@@ -124,7 +124,7 @@ class TDMShutdown : public TDMShutdownBase {
 };
 
 class TDMRadioButton : public TQRadioButton {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TQRadioButton inherited;
 
   public:
@@ -139,7 +139,7 @@ class TDMRadioButton : public TQRadioButton {
 };
 
 class TDMDelayedPushButton : public KPushButton {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef KPushButton inherited;
 
   public:
@@ -157,7 +157,7 @@ class TDMDelayedPushButton : public KPushButton {
 };
 
 class TDMSlimShutdown : public FDialog {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef FDialog inherited;
 
   public:
@@ -178,7 +178,7 @@ class TDMSlimShutdown : public FDialog {
 };
 
 class TDMConfShutdown : public TDMShutdownBase {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TDMShutdownBase inherited;
 
   public:
@@ -187,7 +187,7 @@ class TDMConfShutdown : public TDMShutdownBase {
 };
 
 class TDMCancelShutdown : public TDMShutdownBase {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TDMShutdownBase inherited;
 
   public:
@@ -197,7 +197,7 @@ class TDMCancelShutdown : public TDMShutdownBase {
 
 class KSMPushButton : public KPushButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -215,7 +215,7 @@ private:
 
 class FlatButton : public TQToolButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  public:
 
diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp
index ce5904a26..befcb7c35 100644
--- a/tdm/kfrontend/themer/tdmitem.cpp
+++ b/tdm/kfrontend/themer/tdmitem.cpp
@@ -232,13 +232,13 @@ KdmItem::setWidget( TQWidget *widget )
 		myWidget->show();
 
 	// Remove borders so that it blends nicely with the theme background
-	TQFrame* frame = ::tqqt_cast<TQFrame *>( widget );
+	TQFrame* frame = ::tqt_cast<TQFrame *>( widget );
 	if (frame)
 		frame->setFrameStyle( TQFrame::NoFrame );
 
 	setGeometry(area, true);
 
-	connect( myWidget, TQT_SIGNAL(destroyed()), TQT_SLOT(widgetGone()) );
+	connect( myWidget, TQ_SIGNAL(destroyed()), TQ_SLOT(widgetGone()) );
 }
 
 void
@@ -253,11 +253,11 @@ KdmItem::setLayoutItem( TQLayoutItem *item )
 	myLayoutItem = item;
 	// XXX hiding not supported - it think it's pointless here
 	if (myLayoutItem->widget())
-		connect( myLayoutItem->widget(), TQT_SIGNAL(destroyed()),
-		         TQT_SLOT(layoutItemGone()) );
+		connect( myLayoutItem->widget(), TQ_SIGNAL(destroyed()),
+		         TQ_SLOT(layoutItemGone()) );
 	else if (myLayoutItem->layout())
-		connect( myLayoutItem->layout(), TQT_SIGNAL(destroyed()),
-		         TQT_SLOT(layoutItemGone()) );
+		connect( myLayoutItem->layout(), TQ_SIGNAL(destroyed()),
+		         TQ_SLOT(layoutItemGone()) );
 }
 
 void
@@ -307,7 +307,7 @@ KdmItem::paint( TQPainter *p, const TQRect &rect )
 	}
 
 	if (myWidget || (myLayoutItem && myLayoutItem->widget())) {
-            // TDEListView because it's missing a Q_OBJECT
+            // TDEListView because it's missing a TQ_OBJECT
             // FIXME: This is a nice idea in theory, but in practice it is
             // very confusing for the user not to see the empty list box
             // delineated from the rest of the greeter.
@@ -379,7 +379,7 @@ KdmItem::paint( TQPainter *p, const TQRect &rect )
 
 #ifdef DRAW_OUTLINE
 	// Draw bounding rect for this item
-	p->setPen( Qt::white );
+	p->setPen( TQt::white );
 	p->drawRect( area );
 #endif
 
@@ -583,8 +583,8 @@ KdmItem::addChildItem( KdmItem *item )
 	}
 
 	// signal bounce from child to parent
-	connect( item, TQT_SIGNAL(needUpdate( int, int, int, int )), TQT_SIGNAL(needUpdate( int, int, int, int )) );
-	connect( item, TQT_SIGNAL(activated( const TQString & )), TQT_SIGNAL(activated( const TQString & )) );
+	connect( item, TQ_SIGNAL(needUpdate( int, int, int, int )), TQ_SIGNAL(needUpdate( int, int, int, int )) );
+	connect( item, TQ_SIGNAL(activated( const TQString & )), TQ_SIGNAL(activated( const TQString & )) );
 }
 
 void
@@ -663,7 +663,7 @@ KdmItem::parentWidget() const
   if (!this->parent())
     return 0;
 
-  if (parent()->tqt_cast(TQWIDGET_OBJECT_NAME_STRING))
+  if (parent()->tqt_cast("TQWidget"))
     return (TQWidget*)parent();
   return ((KdmItem*)parent())->parentWidget();
 }
diff --git a/tdm/kfrontend/themer/tdmitem.h b/tdm/kfrontend/themer/tdmitem.h
index d2aeed69c..ad07f16cb 100644
--- a/tdm/kfrontend/themer/tdmitem.h
+++ b/tdm/kfrontend/themer/tdmitem.h
@@ -81,7 +81,7 @@ class TQLayoutItem;
  */
 
 class KdmItem : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
 
 	friend class KdmThemer;
 
diff --git a/tdm/kfrontend/themer/tdmlabel.cpp b/tdm/kfrontend/themer/tdmlabel.cpp
index f2fae90a6..1af382819 100644
--- a/tdm/kfrontend/themer/tdmlabel.cpp
+++ b/tdm/kfrontend/themer/tdmlabel.cpp
@@ -100,7 +100,7 @@ KdmLabel::KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name )
 	if (label.isTimer) {
 		timer = new TQTimer( this );
 		timer->start( 1000 );
-		connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(update()) );
+		connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(update()) );
 	}
 	setTextInt( lookupText( label.text ) );
 }
@@ -117,7 +117,7 @@ KdmLabel::setTextInt( const TQString &txt)
 	  cText.remove('&');
 	  myAccel = new TQAccel(parentWidget());
 	  myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().unicode());
-	  connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel()));
+	  connect(myAccel, TQ_SIGNAL(activated(int)), TQ_SLOT(slotAccel()));
 	}
 }
 
diff --git a/tdm/kfrontend/themer/tdmlabel.h b/tdm/kfrontend/themer/tdmlabel.h
index e45d68091..37b10be56 100644
--- a/tdm/kfrontend/themer/tdmlabel.h
+++ b/tdm/kfrontend/themer/tdmlabel.h
@@ -34,7 +34,7 @@ class TQTimer;
  */
 
 class KdmLabel : public KdmItem {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name = 0 );
diff --git a/tdm/kfrontend/themer/tdmpixmap.cpp b/tdm/kfrontend/themer/tdmpixmap.cpp
index 079135c1d..fa9e0fcf5 100644
--- a/tdm/kfrontend/themer/tdmpixmap.cpp
+++ b/tdm/kfrontend/themer/tdmpixmap.cpp
@@ -303,9 +303,9 @@ KdmPixmap::drawContents( TQPainter *p, const TQRect &r )
 			float tint_alpha = pClass->alpha;
 
 			for (int y = 0; y < h; ++y) {
-				QRgb *ls = (QRgb *)scaledImage.scanLine( y );
+				TQRgb *ls = (TQRgb *)scaledImage.scanLine( y );
 				for (int x = 0; x < w; ++x) {
-					QRgb l = ls[x];
+					TQRgb l = ls[x];
 					int r = int( tqRed( l ) * tint_red );
 					int g = int( tqGreen( l ) * tint_green );
 					int b = int( tqBlue( l ) * tint_blue );
diff --git a/tdm/kfrontend/themer/tdmpixmap.h b/tdm/kfrontend/themer/tdmpixmap.h
index faa71a034..90d0a38aa 100644
--- a/tdm/kfrontend/themer/tdmpixmap.h
+++ b/tdm/kfrontend/themer/tdmpixmap.h
@@ -35,7 +35,7 @@
  */
 
 class KdmPixmap : public KdmItem {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name = 0 );
diff --git a/tdm/kfrontend/themer/tdmrect.cpp b/tdm/kfrontend/themer/tdmrect.cpp
index a92b0f679..bb4023cd4 100644
--- a/tdm/kfrontend/themer/tdmrect.cpp
+++ b/tdm/kfrontend/themer/tdmrect.cpp
@@ -182,7 +182,7 @@ KdmRect::setWidget( TQWidget *widget )
         if ( rect.normal.color.isValid() && widget ) 
         {
      	     TQPalette p = widget->palette();
-	     p.setColor( TQPalette::Normal, TQColorGroup::Text, rect.normal.color );
+	     p.setColor( TQPalette::Active, TQColorGroup::Text, rect.normal.color );
 	     widget->setPalette(p);
 	}
 	KdmItem::setWidget( widget );
diff --git a/tdm/kfrontend/themer/tdmrect.h b/tdm/kfrontend/themer/tdmrect.h
index 6dfdc126a..8c436ccda 100644
--- a/tdm/kfrontend/themer/tdmrect.h
+++ b/tdm/kfrontend/themer/tdmrect.h
@@ -32,7 +32,7 @@
  */
 
 class KdmRect : public KdmItem {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KdmRect( KdmItem *parent, const TQDomNode &node, const char *name = 0 );
diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp
index 6c27b7629..f064e384a 100644
--- a/tdm/kfrontend/themer/tdmthemer.cpp
+++ b/tdm/kfrontend/themer/tdmthemer.cpp
@@ -78,24 +78,24 @@ KdmThemer::KdmThemer( const TQString &_filename, const TQString &mode, TQWidget
 	// Set the root (screen) item
 	rootItem = new KdmRect( parent, TQDomNode(), "tdm root" );
 
-	connect( rootItem, TQT_SIGNAL(needUpdate( int, int, int, int )),
-	         widget(), TQT_SLOT(update( int, int, int, int )) );
+	connect( rootItem, TQ_SIGNAL(needUpdate( int, int, int, int )),
+	         widget(), TQ_SLOT(update( int, int, int, int )) );
 
 	rootItem->setBaseDir( TQFileInfo( filename ).dirPath( true ) );
 
 	// generate all the items defined in the theme
 	generateItems( rootItem );
 
-	connect( rootItem, TQT_SIGNAL(activated( const TQString & )), TQT_SIGNAL(activated( const TQString & )) );
-	connect( rootItem, TQT_SIGNAL(activated( const TQString & )), TQT_SLOT(slotActivated( const TQString & )) );
+	connect( rootItem, TQ_SIGNAL(activated( const TQString & )), TQ_SIGNAL(activated( const TQString & )) );
+	connect( rootItem, TQ_SIGNAL(activated( const TQString & )), TQ_SLOT(slotActivated( const TQString & )) );
 
-	TQTimer::singleShot(800, this, TQT_SLOT(slotPaintRoot()));
+	TQTimer::singleShot(800, this, TQ_SLOT(slotPaintRoot()));
 
 /*	*TODO*
 	// Animation timer
 	TQTimer *time = new TQTimer( this );
 	time->start( 500 );
-	connect( time, TQT_SIGNAL(timeout()), TQT_SLOT(update()) )
+	connect( time, TQ_SIGNAL(timeout()), TQ_SLOT(update()) )
 */
 }
 
@@ -139,19 +139,19 @@ KdmThemer::widgetEvent( TQEvent *e )
 	switch (e->type()) {
 	case TQEvent::MouseMove:
 		{
-			TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
+			TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
 			rootItem->mouseEvent( me->x(), me->y() );
 		}
 		break;
 	case TQEvent::MouseButtonPress:
 		{
-			TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
+			TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
 			rootItem->mouseEvent( me->x(), me->y(), true );
 		}
 		break;
 	case TQEvent::MouseButtonRelease:
 		{
-			TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
+			TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
 			rootItem->mouseEvent( me->x(), me->y(), false, true );
 		}
 		break;
@@ -164,7 +164,7 @@ KdmThemer::widgetEvent( TQEvent *e )
 		break;
 	case TQEvent::Paint:
 		{
-			TQRect paintRect = TQT_TQPAINTEVENT(e)->rect();
+			TQRect paintRect = static_cast<TQPaintEvent*>(e)->rect();
 			kdDebug() << timestamp() << " paint on: " << paintRect << endl;
 
 			if (!argb_visual_available) {
@@ -411,7 +411,7 @@ KdmThemer::slotActivated( const TQString &id )
 	}
 	
 	item->widget()->setFocus();
-	TQLineEdit *le = (TQLineEdit*)item->widget()->tqt_cast(TQLINEEDIT_OBJECT_NAME_STRING);
+	TQLineEdit *le = (TQLineEdit*)item->widget()->tqt_cast("TQLineEdit");
 	if (le) {
 		le->selectAll();
 	}
@@ -432,8 +432,8 @@ KdmThemer::slotPaintRoot()
 	}
 	else return;
 	
-	TQT_TQWIDGET(TQApplication::desktop()->screen())->setErasePixmap(pm);
-	TQT_TQWIDGET(TQApplication::desktop()->screen())->erase();
+	TQApplication::desktop()->screen()->setErasePixmap(pm);
+	TQApplication::desktop()->screen()->erase();
 }
 
 #include "tdmthemer.moc"
diff --git a/tdm/kfrontend/themer/tdmthemer.h b/tdm/kfrontend/themer/tdmthemer.h
index 785a116da..7b9cd2049 100644
--- a/tdm/kfrontend/themer/tdmthemer.h
+++ b/tdm/kfrontend/themer/tdmthemer.h
@@ -49,7 +49,7 @@ class TQEvent;
 
 
 class KdmThemer : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	/*
diff --git a/tdmlib/dmctl.cpp b/tdmlib/dmctl.cpp
index 00c3cb489..6cd6f7e93 100644
--- a/tdmlib/dmctl.cpp
+++ b/tdmlib/dmctl.cpp
@@ -19,7 +19,7 @@
 
 #include "dmctl.h"
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 #include <tdelocale.h>
 #include <dcopclient.h>
@@ -531,4 +531,4 @@ DM::type()
 	return DMType;
 }
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
diff --git a/tdmlib/dmctl.h b/tdmlib/dmctl.h
index e0cdc966c..40ea95f26 100644
--- a/tdmlib/dmctl.h
+++ b/tdmlib/dmctl.h
@@ -32,7 +32,7 @@ struct SessEnt {
 typedef TQValueList<SessEnt> SessList;
 
 class DM {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 public:
 
@@ -77,7 +77,7 @@ private:
 
 	void GDMAuthenticate();
 
-#else // Q_WS_X11
+#else // TQ_WS_X11
 
 public:
 	DM() {}
@@ -100,7 +100,7 @@ public:
 
 	int type() { return NoDM }
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 }; // class DM
 
diff --git a/tdmlib/kgreet_classic.cpp b/tdmlib/kgreet_classic.cpp
index 996754181..7a04b7fea 100644
--- a/tdmlib/kgreet_classic.cpp
+++ b/tdmlib/kgreet_classic.cpp
@@ -83,7 +83,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
 
 	if (!themer)
 		grid = new TQGridLayout( 0, 0, 10 );
-		layoutItem = TQT_TQLAYOUTITEM(grid);
+		layoutItem = grid;
 
 	loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
 	loginEdit = 0;
@@ -94,10 +94,10 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
 		if (fixedUser.isEmpty()) {
 			loginEdit = new KLineEdit( parent );
 			loginEdit->setContextMenuEnabled( false );
-			connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) );
-			connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
-			connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) );
-			connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotLoginLostFocus()) );
+			connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotActivity()) );
 			if (pred) {
 				parent->setTabOrder( pred, loginEdit );
 				pred = loginEdit;
@@ -120,9 +120,9 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
 		else
 			passwdEdit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
 			                                  parent );
-		connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
-		         TQT_SLOT(slotActivity()) );
-		connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+		connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )),
+		         TQ_SLOT(slotActivity()) );
+		connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
 		if (pred) {
 			parent->setTabOrder( pred, passwdEdit );
 			pred = passwdEdit;
@@ -174,7 +174,7 @@ KClassicGreeter::~KClassicGreeter()
 		delete passwdEdit;
 		return;
 	}
-	TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator();
+	TQLayoutIterator it = static_cast<TQLayout*>(layoutItem)->iterator();
 	for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
 		 delete itm->widget();
 	delete layoutItem;
diff --git a/tdmlib/kgreet_classic.h b/tdmlib/kgreet_classic.h
index 3f36d5000..f5dc52122 100644
--- a/tdmlib/kgreet_classic.h
+++ b/tdmlib/kgreet_classic.h
@@ -37,7 +37,7 @@ class TQGridLayout;
 class TQLabel;
 
 class KClassicGreeter : public TQObject, public KGreeterPlugin {
-	Q_OBJECT
+	TQ_OBJECT
 
   public:
 	KClassicGreeter( KGreeterPluginHandler *handler,
diff --git a/tdmlib/kgreet_pam.cpp b/tdmlib/kgreet_pam.cpp
index 69eac485b..1f6da138c 100644
--- a/tdmlib/kgreet_pam.cpp
+++ b/tdmlib/kgreet_pam.cpp
@@ -111,7 +111,7 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
         m_themer = themer;
 
 	if (!themer)
-		layoutItem = TQT_TQLAYOUTITEM(new TQGridLayout( 0, 0, 10 ));
+		layoutItem = new TQGridLayout( 0, 0, 10 );
 
         loginLabel = 0;
         authLabel.clear();
@@ -127,10 +127,10 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
 		if (fixedUser.isEmpty()) {
 			loginEdit = new KLineEdit( parent );
 			loginEdit->setContextMenuEnabled( false );
-			connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) );
-			connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
-			connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) );
-			connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotLoginLostFocus()) );
+			connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotActivity()) );
 			if (pred) {
 				parent->setTabOrder( pred, loginEdit );
 				pred = loginEdit;
@@ -154,9 +154,9 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
 		else
 			passwdEdit = new TDMPasswordEdit( echoMode,
 			                                  parent );
-		connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
-		         TQT_SLOT(slotActivity()) );
-		connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+		connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )),
+		         TQ_SLOT(slotActivity()) );
+		connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
 		if (pred) {
 			parent->setTabOrder( pred, passwdEdit );
 			pred = passwdEdit;
@@ -211,7 +211,7 @@ KPamGreeter::~KPamGreeter()
 		delete loginEdit;
 		return;
 	}
-	TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator();
+	TQLayoutIterator it = static_cast<TQLayout*>(layoutItem)->iterator();
 	for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
 		 delete itm->widget();
 	delete layoutItem;
@@ -377,7 +377,7 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
             if (tdmlabel) {
                 //userLabel->setText(TQString::fromUtf8(prompt));
                 tdmlabel->label.text = TQString::fromUtf8(prompt);
-                TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update()));
+                TQTimer::singleShot(0, tdmlabel, TQ_SLOT(update()));
             }
         }
     }
@@ -395,7 +395,7 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
                 //userLabel->setText(TQString::fromUtf8(prompt));
                 TQString str = TQString::fromUtf8(prompt);
                 tdmlabel->label.text = str;
-                TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update()));
+                TQTimer::singleShot(0, tdmlabel, TQ_SLOT(update()));
             }
         }
 
@@ -405,9 +405,9 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
 	    passwdEdit = new TDMPasswordEdit( m_parentWidget );
 	else
 	    passwdEdit = new TDMPasswordEdit( echoMode, m_parentWidget);
-	connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
-		TQT_SLOT(slotActivity()) );
-	connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+	connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )),
+		TQ_SLOT(slotActivity()) );
+	connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
 	authEdit << passwdEdit;
 
 #if 1
@@ -435,7 +435,7 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
            if (0) {
                 //userLabel->setText(TQString::fromUtf8(prompt));
                 //tdmlabel->label.text = TQString::fromUtf8(prompt);
-                //TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update()));
+                //TQTimer::singleShot(0, tdmlabel, TQ_SLOT(update()));
            }
        } 
        else
diff --git a/tdmlib/kgreet_pam.h b/tdmlib/kgreet_pam.h
index f579f9522..98e3315b1 100644
--- a/tdmlib/kgreet_pam.h
+++ b/tdmlib/kgreet_pam.h
@@ -37,7 +37,7 @@ class TQGridLayout;
 class TQLabel;
 
 class KPamGreeter : public TQObject, public KGreeterPlugin {
-	Q_OBJECT
+	TQ_OBJECT
 
   public:
 	KPamGreeter( KGreeterPluginHandler *handler,
@@ -68,7 +68,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin {
 	virtual void revive();
 	virtual void clear();
 
-        TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(TQT_TQLAYOUT(layoutItem)); }
+        TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(layoutItem); }
 
   public slots:
 	void slotLoginLostFocus();
diff --git a/tdmlib/kgreet_winbind.cpp b/tdmlib/kgreet_winbind.cpp
index 471095d7e..b7a9211b8 100644
--- a/tdmlib/kgreet_winbind.cpp
+++ b/tdmlib/kgreet_winbind.cpp
@@ -91,8 +91,10 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
 		themer = 0;
 
 	if (!themer)
+	{
 		grid = new TQGridLayout( 0, 0, 10 );
-		layoutItem = TQT_TQLAYOUTITEM(grid);
+		layoutItem = grid;
+	}
 
 	domainLabel = loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
 	domainCombo = 0;
@@ -106,12 +108,12 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
 	if (func != ChAuthTok) {
 		if (fixedUser.isEmpty()) {
 			domainCombo = new KComboBox( parent );
-			connect( domainCombo, TQT_SIGNAL(activated( const TQString & )),
-			         TQT_SLOT(slotChangedDomain( const TQString & )) );
-			connect( domainCombo, TQT_SIGNAL(activated( const TQString & )),
-			         TQT_SLOT(slotLoginLostFocus()) );
-			connect( domainCombo, TQT_SIGNAL(activated( const TQString & )),
-			         TQT_SLOT(slotActivity()) );
+			connect( domainCombo, TQ_SIGNAL(activated( const TQString & )),
+			         TQ_SLOT(slotChangedDomain( const TQString & )) );
+			connect( domainCombo, TQ_SIGNAL(activated( const TQString & )),
+			         TQ_SLOT(slotLoginLostFocus()) );
+			connect( domainCombo, TQ_SIGNAL(activated( const TQString & )),
+			         TQ_SLOT(slotActivity()) );
 			// should handle loss of focus
 			loginEdit = new KLineEdit( parent );
 			loginEdit->setContextMenuEnabled( false );
@@ -134,13 +136,13 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
 				grid->addWidget( loginLabel, line, 0 );
 				grid->addWidget( loginEdit, line++, 1 );
 			}
-			connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) );
-			connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
-			connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) );
-			connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) );
-			connect(&mDomainListTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotStartDomainList()));
+			connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotLoginLostFocus()) );
+			connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotActivity()) );
+			connect(&mDomainListTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotStartDomainList()));
 			domainCombo->insertStringList( staticDomains );
-			TQTimer::singleShot(0, this, TQT_SLOT(slotStartDomainList()));
+			TQTimer::singleShot(0, this, TQ_SLOT(slotStartDomainList()));
 		} else if (ctx != Login && ctx != Shutdown && grid) {
 			domainLabel = new TQLabel( i18n("Domain:"), parent );
 			grid->addWidget( domainLabel, line, 0 );
@@ -154,9 +156,9 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
 		else
 			passwdEdit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
 			                                  parent );
-		connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
-		         TQT_SLOT(slotActivity()) );
-		connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+		connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )),
+		         TQ_SLOT(slotActivity()) );
+		connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
 
 		if (!grid) {
 			passwdEdit->adjustSize();
@@ -215,7 +217,7 @@ KWinbindGreeter::~KWinbindGreeter()
 		delete domainCombo;
 		return;
 	}
-	TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator();
+	TQLayoutIterator it = static_cast<TQLayout*>(layoutItem)->iterator();
 	for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
 		delete itm->widget();
 	delete layoutItem;
@@ -611,8 +613,8 @@ KWinbindGreeter::slotStartDomainList()
     mDomainListing.clear();
 
     m_domainLister = new KProcIO;
-    connect(m_domainLister, TQT_SIGNAL(readReady(KProcIO*)), TQT_SLOT(slotReadDomainList()));
-    connect(m_domainLister, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotEndDomainList()));
+    connect(m_domainLister, TQ_SIGNAL(readReady(KProcIO*)), TQ_SLOT(slotReadDomainList()));
+    connect(m_domainLister, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotEndDomainList()));
 
     (*m_domainLister) << "wbinfo" << "--own-domain" << "--trusted-domains";
     m_domainLister->setComm (TDEProcess::Stdout);
diff --git a/tdmlib/kgreet_winbind.h b/tdmlib/kgreet_winbind.h
index 85565628e..7bd8e59e6 100644
--- a/tdmlib/kgreet_winbind.h
+++ b/tdmlib/kgreet_winbind.h
@@ -41,7 +41,7 @@ class KdmThemer;
 class KProcIO;
 
 class KWinbindGreeter : public TQObject, public KGreeterPlugin {
-	Q_OBJECT
+	TQ_OBJECT
 
   public:
 	KWinbindGreeter( KGreeterPluginHandler *handler,
diff --git a/tqt3integration/libtqttde/tqttde.cpp b/tqt3integration/libtqttde/tqttde.cpp
index 3647db8a2..45b0a8b96 100644
--- a/tqt3integration/libtqttde/tqttde.cpp
+++ b/tqt3integration/libtqttde/tqttde.cpp
@@ -90,7 +90,7 @@ static DCOPClient* dcopClient()
         if( !tqApp->inherits( "TDEApplication" )) // KApp takes care of input blocking
             {
             static tqttde_EventLoop* loop = new tqttde_EventLoop;
-            TQObject::connect( dcop, TQT_SIGNAL( blockUserInput( bool )), loop, TQT_SLOT( block( bool )));
+            TQObject::connect( dcop, TQ_SIGNAL( blockUserInput( bool )), loop, TQ_SLOT( block( bool )));
             }
         }
     return dcop;
diff --git a/tqt3integration/libtqttde/tqttde.h b/tqt3integration/libtqttde/tqttde.h
index 2d634df07..06cba49ed 100644
--- a/tqt3integration/libtqttde/tqttde.h
+++ b/tqt3integration/libtqttde/tqttde.h
@@ -26,7 +26,7 @@
 class tqttde_EventLoop
     : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
 
     public slots:
         void block( bool );
diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp
index e397105b1..9a7d8f6e3 100644
--- a/tqt3integration/module/module.cpp
+++ b/tqt3integration/module/module.cpp
@@ -93,7 +93,7 @@ void* Module::getOpenFileNames( const TQString& filter, TQString workingDirector
     dlg->setMode(( multiple ? KFile::Files : KFile::File ) | KFile::LocalOnly );
     dlg->setPlainCaption( caption.isNull() ? i18n("Open") : caption );
 // TODO    dlg->ops->clearHistory();
-    connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+    connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
     dlg->show();
     return dlg;
     }
@@ -117,7 +117,7 @@ void* Module::getSaveFileName( const TQString& initialSelection, const TQString&
     prepareDialog( dlg, parent, wmclass1, wmclass2 );
     dlg->setOperationMode( KFileDialog::Saving );
     dlg->setPlainCaption( caption.isNull() ? i18n("Save As") : caption );
-    connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+    connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
     dlg->show();
     return dlg;
     }
@@ -130,7 +130,7 @@ void* Module::getExistingDirectory( const TQString& initialDirectory, long paren
         name.isEmpty() ? name : "kdirselect dialog", false );
     prepareDialog( dlg, parent, wmclass1, wmclass2 );
     dlg->setPlainCaption( caption.isNull() ? i18n( "Select Folder" ) : caption );
-    connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+    connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
     dlg->show();
     return dlg;
     }
@@ -144,7 +144,7 @@ void* Module::getColor( const TQColor& color, long parent, const TQCString& name
         dlg->setColor( color );
     prepareDialog( dlg, parent, wmclass1, wmclass2 );
     dlg->setPlainCaption( i18n( "Select Color" ));
-    connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+    connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
     dlg->show();
     return dlg;
     }
@@ -156,7 +156,7 @@ void* Module::getFont( bool /*ok*/, const TQFont& def, long parent, const TQCStr
     dlg->setFont( def, false );
     prepareDialog( dlg, parent, wmclass1, wmclass2 );
     dlg->setPlainCaption( i18n( "Select Font" ));
-    connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+    connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
     dlg->show();
     return dlg;
     }
@@ -245,7 +245,7 @@ void* Module::messageBox1( int type, long parent, const TQString& caption, const
                        &checkboxResult, KMessageBox::Notify | KMessageBox::NoExec);
     prepareDialog( dialog, parent, wmclass1, wmclass2 );
     dialog->setPlainCaption( caption );
-    connect( dialog, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+    connect( dialog, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
     btns b;
     b.buttons[ 0 ] = buttons[ 0 ];
     b.buttons[ 1 ] = buttons[ 1 ];
@@ -277,7 +277,7 @@ void* Module::messageBox2( int type, long parent, const TQString& caption, const
                        &checkboxResult, KMessageBox::Notify | KMessageBox::NoExec);
     prepareDialog( dialog, parent, wmclass1, wmclass2 );
     dialog->setPlainCaption( caption );
-    connect( dialog, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+    connect( dialog, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
     dialog->show();
     return dialog;
     }
diff --git a/tqt3integration/module/module.h b/tqt3integration/module/module.h
index cf136aa8c..f32ef85e2 100644
--- a/tqt3integration/module/module.h
+++ b/tqt3integration/module/module.h
@@ -36,7 +36,7 @@ namespace TDEIntegration
 class Module
     : public KDEDModule
     {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         Module( const TQCString& obj );
@@ -69,7 +69,7 @@ class Module
 class KFileDialog
     : public ::KFileDialog
     {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         KFileDialog(const TQString& startDir, const TQString& filter,
@@ -86,7 +86,7 @@ class KFileDialog
 class KDirSelectDialog
     : public ::KDirSelectDialog
     {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         KDirSelectDialog(const TQString& startDir, bool localOnly,
@@ -103,7 +103,7 @@ class KDirSelectDialog
 class KColorDialog
     : public ::KColorDialog
     {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         KColorDialog( TQWidget *parent, const char *name, bool modal )
@@ -118,7 +118,7 @@ class KColorDialog
 class TDEFontDialog
     : public ::TDEFontDialog
     {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         TDEFontDialog( TQWidget *parent, const char *name, bool onlyFixed, bool modal,
@@ -135,7 +135,7 @@ class TDEFontDialog
 class KDialogBase
     : public ::KDialogBase
     {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         KDialogBase( const TQString &caption, int buttonMask=Yes|No|Cancel,
diff --git a/tqt3integration/utils/CMakeLists.txt b/tqt3integration/utils/CMakeLists.txt
index c75567af5..a65b3108e 100644
--- a/tqt3integration/utils/CMakeLists.txt
+++ b/tqt3integration/utils/CMakeLists.txt
@@ -31,7 +31,7 @@ tde_add_executable( gen AUTOMOC
   LINK tdecore-shared
 )
 
-ADD_CUSTOM_COMMAND(
+add_custom_command(
   OUTPUT
     ${CMAKE_CURRENT_BINARY_DIR}/tqttde_functions.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/module_functions.cpp
@@ -44,6 +44,6 @@ ADD_CUSTOM_COMMAND(
   DEPENDS gen
 )
 
-ADD_CUSTOM_TARGET( generate_tqt3_bindings
+add_custom_target( generate_tqt3_bindings
   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tqttde_functions.cpp
 )
diff --git a/translations/desktop_files/applnk-compat/es.po b/translations/desktop_files/applnk-compat/es.po
index eadea9f43..581b22a09 100644
--- a/translations/desktop_files/applnk-compat/es.po
+++ b/translations/desktop_files/applnk-compat/es.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Real name <sbdc1wdfzk@crossmailjet.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-08-29 21:55+0000\n"
+"Last-Translator: Real name <sbdc1wdfzk@crossmailjet.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-compat/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
@@ -81,7 +82,7 @@ msgstr ""
 #. Name
 #: socks.desktop:2
 msgid "Socks"
-msgstr ""
+msgstr "SOCKS"
 
 #. Name
 #: userinfo.desktop:13
diff --git a/translations/desktop_files/applnk-compat/ru.po b/translations/desktop_files/applnk-compat/ru.po
index ebdf95b26..bd71f2d99 100644
--- a/translations/desktop_files/applnk-compat/ru.po
+++ b/translations/desktop_files/applnk-compat/ru.po
@@ -1,12 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Alexander Golubev <fatzer2@gmail.com>, 2021.
+# Alexander Golubev <fatzer2@gmail.com>, 2021, 2024.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\n"
-"PO-Revision-Date: 2021-01-21 09:11+0000\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
 "Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/applnk-compat/ru/>\n"
@@ -14,9 +15,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.4.2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
@@ -42,6 +43,13 @@ msgid ""
 "Current Profile;Profile;Organization;Incoming Host;Outgoing Host;Email "
 "Client;"
 msgstr ""
+"EMail;Mail;E-Mail;Address;Email server;IMAP;POP3;Local mailbox;mailbox;User "
+"Information;Reply Address;Server information;User Name;Passwords;Host;"
+"Current Profile;Profile;Organization;Incoming Host;Outgoing Host;Email "
+"Client;Электронна� почта;Почта;Эл. почта;�дре�;Почтовый �ервер;Локальный "
+"почтовый �щик;почтовый �щик;Информаци� о пользователе;�дре� ответа;"
+"Информаци� о �ервере;Им� пользовател�;Пароли;Хо�т;Текущий "
+"профиль;Профиль;Организаци�;Вход�щий хо�т;И�ход�щий хо�т;Почтовый клиент;"
 
 #. Name
 #: kcmkonq.desktop:2
@@ -72,11 +80,13 @@ msgstr "�а�тройка паролей"
 #: passwords.desktop:15
 msgid "Passwords;tdesu;Echo characters;Remember passwords;Timeout;"
 msgstr ""
+"Passwords;tdesu;Echo characters;Remember passwords;Timeout;Пароли;"
+"Запоминание паролей;Сохранение паролей;Тайм-аут;"
 
 #. Name
 #: socks.desktop:2
 msgid "Socks"
-msgstr ""
+msgstr "Socks"
 
 #. Name
 #: userinfo.desktop:13
diff --git a/translations/desktop_files/applnk-directories/es.po b/translations/desktop_files/applnk-directories/es.po
index 6a33c09e7..54614ad6d 100644
--- a/translations/desktop_files/applnk-directories/es.po
+++ b/translations/desktop_files/applnk-directories/es.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Real name <sbdc1wdfzk@crossmailjet.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-08-29 21:56+0000\n"
+"Last-Translator: Real name <sbdc1wdfzk@crossmailjet.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-directories/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: .directory:2
@@ -38,7 +39,7 @@ msgstr "Desarrollo web"
 #: kde-science.directory:5 kde-settingsmenu.directory:4 kde-system.directory:4
 #: kde-utilities.directory:4
 msgid "KDE"
-msgstr ""
+msgstr "KDE"
 
 #. Name
 #: kde-editors.directory:4 tde-editors.directory:4
@@ -48,17 +49,17 @@ msgstr "Editores"
 #. Name
 #: kde-edu-languages.directory:4
 msgid "Languages"
-msgstr ""
+msgstr "Lenguajes"
 
 #. Name
 #: kde-edu-mathematics.directory:4
 msgid "Mathematics"
-msgstr ""
+msgstr "Matematicas"
 
 #. Name
 #: kde-edu-miscellaneous.directory:4
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Miscelaneo"
 
 #. Name
 #: kde-edu-science.directory:4 tde-science.directory:5
@@ -68,7 +69,7 @@ msgstr "Ciencia"
 #. Name
 #: kde-games-arcade.directory:4 tde-games-arcade.directory:4
 msgid "Arcade"
-msgstr ""
+msgstr "Arcade"
 
 #. Name
 #: kde-games-board.directory:4 tde-games-board.directory:4
@@ -115,7 +116,7 @@ msgstr "Escritorio"
 #: kde-utilities-pim.directory:4 tde-utilities-pim.directory:4
 #: tde-utilities-pim.directory:6
 msgid "PIM"
-msgstr ""
+msgstr "PIM"
 
 #. Name
 #: tde-development-translation.directory:4
diff --git a/translations/desktop_files/applnk-directories/ru.po b/translations/desktop_files/applnk-directories/ru.po
index 3682a198b..f1735c604 100644
--- a/translations/desktop_files/applnk-directories/ru.po
+++ b/translations/desktop_files/applnk-directories/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-12-07 21:14+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-directories/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: .directory:2
@@ -38,7 +40,7 @@ msgstr "Веб-разработка"
 #: kde-science.directory:5 kde-settingsmenu.directory:4 kde-system.directory:4
 #: kde-utilities.directory:4
 msgid "KDE"
-msgstr ""
+msgstr "KDE"
 
 #. Name
 #: kde-editors.directory:4 tde-editors.directory:4
@@ -48,17 +50,17 @@ msgstr "Редакторы"
 #. Name
 #: kde-edu-languages.directory:4
 msgid "Languages"
-msgstr ""
+msgstr "Языки"
 
 #. Name
 #: kde-edu-mathematics.directory:4
 msgid "Mathematics"
-msgstr ""
+msgstr "Математика"
 
 #. Name
 #: kde-edu-miscellaneous.directory:4
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Прочее"
 
 #. Name
 #: kde-edu-science.directory:4 tde-science.directory:5
@@ -88,7 +90,7 @@ msgstr "Дет�кие игры"
 #. Name
 #: kde-games-strategy.directory:4 tde-games-strategy.directory:4
 msgid "Tactics & Strategy"
-msgstr "Стратеги�"
+msgstr "Тактика и �тратеги�"
 
 #. Name
 #: kde-toys.directory:4 tde-toys.directory:4
@@ -135,7 +137,7 @@ msgstr "Образование"
 #. Name
 #: tde-games-logic.directory:4
 msgid "Logic Games"
-msgstr "головоломки"
+msgstr "Головоломки"
 
 #. Name
 #: tde-games-roguelikes.directory:4
diff --git a/translations/desktop_files/drkonqi-presets/pt.po b/translations/desktop_files/drkonqi-presets/pt.po
index ca27d371e..0d33ab446 100644
--- a/translations/desktop_files/drkonqi-presets/pt.po
+++ b/translations/desktop_files/drkonqi-presets/pt.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2022, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 03:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-07-16 17:52+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/drkonqi-presets/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: developerrc:2
@@ -44,7 +45,7 @@ msgstr "Pode desejar corrigir o programa. Examine a página do 'backtrace'."
 #. Name
 #: developerrc:20 enduserrc:20
 msgid "SIGILL"
-msgstr ""
+msgstr "SIGILL"
 
 #. Comment
 #: developerrc:21
@@ -54,7 +55,7 @@ msgstr "Instrução inválida."
 #. Name
 #: developerrc:24 enduserrc:24
 msgid "SIGABRT"
-msgstr ""
+msgstr "SIGABRT"
 
 #. Comment
 #: developerrc:25
@@ -64,7 +65,7 @@ msgstr "Abortado."
 #. Name
 #: developerrc:28 enduserrc:28
 msgid "SIGFPE"
-msgstr ""
+msgstr "SIGFPE"
 
 #. Comment
 #: developerrc:29
@@ -74,7 +75,7 @@ msgstr "Excepção de virgula flutuante."
 #. Name
 #: developerrc:32 enduserrc:32
 msgid "SIGSEGV"
-msgstr ""
+msgstr "SIGSEGV"
 
 #. Comment
 #: developerrc:33
@@ -119,11 +120,11 @@ msgid ""
 "include as much information as possible, maybe the original documents. If "
 "you have a way to reproduce the error, include this also."
 msgstr ""
-"Você poderá querer enviar um relatório de erro para esta aplicação. "
-"Verifique se está listada no http://bugs.trinitydesktop.org; caso contrário, "
-"mande um e-mail ao autor. Por favor inclua o máximo possível de informação, "
-"bem como os documentos em que estava a trabalhar. Se conseguir reproduzir o "
-"erro, inclua também a forma de o fazer."
+"Poderá querer enviar um relatório de erro para esta aplicação. Verifique se "
+"está listada no http://bugs.trinitydesktop.org; caso contrário, mande um e-"
+"mail ao autor. Por favor inclua o máximo possível de informação, bem como os "
+"documentos em que estava a trabalhar. Se conseguir reproduzir o erro, inclua "
+"também a forma de o fazer."
 
 #. Comment
 #: enduserrc:21
diff --git a/translations/desktop_files/drkonqi-presets/ru.po b/translations/desktop_files/drkonqi-presets/ru.po
index 96af366d0..e4c87d38d 100644
--- a/translations/desktop_files/drkonqi-presets/ru.po
+++ b/translations/desktop_files/drkonqi-presets/ru.po
@@ -1,20 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 03:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-04-06 08:44+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/drkonqi-presets/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: developerrc:2
@@ -33,7 +36,7 @@ msgid ""
 "The application %progname (%appname), pid %pid, crashed and caused the "
 "signal %signum (%signame)."
 msgstr ""
-"В приложении %progname (%appname) � id проце��а %pid произошёл фатальный "
+"В приложении %progname (%appname) � ИД проце��а %pid произошёл фатальный "
 "�бой, вызвавший �игнал %signum (%signame)."
 
 #. Name
@@ -44,7 +47,7 @@ msgstr "Возможно, вы захотите иÑ�править програÐ
 #. Name
 #: developerrc:20 enduserrc:20
 msgid "SIGILL"
-msgstr ""
+msgstr "SIGILL"
 
 #. Comment
 #: developerrc:21
@@ -54,7 +57,7 @@ msgstr "�едопу�тима� ин�трукци�."
 #. Name
 #: developerrc:24 enduserrc:24
 msgid "SIGABRT"
-msgstr ""
+msgstr "SIGABRT"
 
 #. Comment
 #: developerrc:25
@@ -64,7 +67,7 @@ msgstr "Прервано."
 #. Name
 #: developerrc:28 enduserrc:28
 msgid "SIGFPE"
-msgstr ""
+msgstr "SIGFPE"
 
 #. Comment
 #: developerrc:29
@@ -74,7 +77,7 @@ msgstr "ИÑ�ключительнаÑ� Ñ�итуациÑ� при вычиÑ�лениÐ
 #. Name
 #: developerrc:32 enduserrc:32
 msgid "SIGSEGV"
-msgstr ""
+msgstr "SIGSEGV"
 
 #. Comment
 #: developerrc:33
@@ -89,7 +92,7 @@ msgstr "�еизве�тный"
 #. Comment
 #: developerrc:37
 msgid "This signal is unknown."
-msgstr "�еизве�тный �игнал"
+msgstr "�еизве�тный �игнал."
 
 #. Name
 #: enduserrc:2
diff --git a/translations/desktop_files/kappfinder-data/pl.po b/translations/desktop_files/kappfinder-data/pl.po
index 8030321b9..cdb3bb475 100644
--- a/translations/desktop_files/kappfinder-data/pl.po
+++ b/translations/desktop_files/kappfinder-data/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-10-25 18:06+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-data/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: Development/Forte.desktop:2
@@ -29,7 +31,7 @@ msgstr "Åšrodowisko Javy"
 #. Name
 #: Development/assistant.desktop:2
 msgid "Qt Assistant"
-msgstr ""
+msgstr "Qt Assistant"
 
 #. GenericName
 #: Development/assistant.desktop:3
@@ -39,7 +41,7 @@ msgstr "Przeglądarka dokumentów"
 #. Name
 #: Development/ddd.desktop:2
 msgid "DDD"
-msgstr ""
+msgstr "DDD"
 
 #. GenericName
 #: Development/ddd.desktop:3
@@ -48,9 +50,8 @@ msgstr "Debuger danych"
 
 #. Name
 #: Development/designer.desktop:2
-#, fuzzy
 msgid "Qt Designer"
-msgstr "Projektant okien"
+msgstr "Qt designer"
 
 #. GenericName
 #: Development/designer.desktop:3
@@ -69,9 +70,8 @@ msgstr "Edytor okien dialogowych"
 
 #. Name
 #: Development/eclipse.desktop:3
-#, fuzzy
 msgid "Eclipse"
-msgstr "Åšrodowisko programowania Eclipse"
+msgstr "Eclipse"
 
 #. GenericName
 #: Development/eclipse.desktop:4
@@ -86,7 +86,7 @@ msgstr "Projektant okien"
 #. Name
 #: Development/j2mewtk.desktop:2
 msgid "J2ME"
-msgstr ""
+msgstr "J2ME"
 
 #. GenericName
 #: Development/j2mewtk.desktop:3
@@ -920,9 +920,8 @@ msgstr "Interfejs graficzny do BitTorrent używający wxGTK"
 
 #. Name
 #: Internet/coolmail.desktop:2
-#, fuzzy
 msgid "Coolmail"
-msgstr "coolmail"
+msgstr "Coolmail"
 
 #. Name
 #: Internet/dc_gui.desktop:2
@@ -1493,7 +1492,7 @@ msgstr ""
 #: System/Terminal/aterm.desktop:2
 #, fuzzy
 msgid "Terminal"
-msgstr "Oryginał"
+msgstr "Terminal"
 
 #. GenericName
 #: System/Terminal/aterm.desktop:3 Utilities/XUtilities/xterm.desktop:3
@@ -1755,9 +1754,8 @@ msgstr "Powiększenie pulpitu"
 
 #. Name
 #: Utilities/XUtilities/xterm.desktop:2
-#, fuzzy
 msgid "X Terminal"
-msgstr "Oryginał"
+msgstr "Terminal X"
 
 #. Name
 #: Utilities/calctool.desktop:2
diff --git a/translations/desktop_files/kappfinder-data/ru.po b/translations/desktop_files/kappfinder-data/ru.po
index 2e3fcecf9..67a1718e1 100644
--- a/translations/desktop_files/kappfinder-data/ru.po
+++ b/translations/desktop_files/kappfinder-data/ru.po
@@ -1,12 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Alexander Golubev <fatzer2@gmail.com>, 2022.
+# Alexander Golubev <fatzer2@gmail.com>, 2022, 2024.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\n"
-"PO-Revision-Date: 2022-02-14 23:01+0000\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
 "Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/kappfinder-data/ru/>\n"
@@ -14,9 +15,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.10.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Development/Forte.desktop:2
@@ -41,7 +42,7 @@ msgstr "Программа про�мотра документов"
 #. Name
 #: Development/ddd.desktop:2
 msgid "DDD"
-msgstr ""
+msgstr "DDD"
 
 #. GenericName
 #: Development/ddd.desktop:3
@@ -50,9 +51,8 @@ msgstr "Экранный отладчик DDD"
 
 #. Name
 #: Development/designer.desktop:2
-#, fuzzy
 msgid "Qt Designer"
-msgstr "Редактор форм"
+msgstr "Qt Designer"
 
 #. GenericName
 #: Development/designer.desktop:3
@@ -73,12 +73,12 @@ msgstr "Редактор диалогов дл� Qt"
 #. Name
 #: Development/eclipse.desktop:3
 msgid "Eclipse"
-msgstr ""
+msgstr "Eclipse"
 
 #. GenericName
 #: Development/eclipse.desktop:4
 msgid "Eclipse IDE"
-msgstr ""
+msgstr "Eclipse IDE"
 
 #. Name
 #: Development/fdesign.desktop:2
@@ -88,7 +88,7 @@ msgstr "Редактор форм"
 #. Name
 #: Development/j2mewtk.desktop:2
 msgid "J2ME"
-msgstr ""
+msgstr "J2ME"
 
 #. GenericName
 #: Development/j2mewtk.desktop:3
@@ -108,7 +108,7 @@ msgstr "Переводчик дл� Qt"
 #. Name
 #: Development/pose.desktop:2
 msgid "Pose"
-msgstr ""
+msgstr "Pose"
 
 #. GenericName
 #: Development/pose.desktop:3
@@ -118,17 +118,17 @@ msgstr "Эмул�тор Palm/Wireless"
 #. Name
 #: Development/sced.desktop:2
 msgid "Sced"
-msgstr ""
+msgstr "Sced"
 
 #. GenericName
 #: Development/sced.desktop:3
 msgid "Scene Modeler"
-msgstr ""
+msgstr "Моделирование �цен"
 
 #. Name
 #: Games/Arcade/ClanBomber.desktop:2
 msgid "ClanBomber"
-msgstr ""
+msgstr "ClanBomber"
 
 #. GenericName
 #: Games/Arcade/ClanBomber.desktop:3 Games/Arcade/GnobotsII.desktop:3
@@ -144,7 +144,7 @@ msgstr "�ркадна� игра"
 #. Name
 #: Games/Arcade/FrozenBubble.desktop:2
 msgid "Frozen Bubble"
-msgstr ""
+msgstr "Frozen Bubble"
 
 #. GenericName
 #: Games/Arcade/FrozenBubble.desktop:3
@@ -154,7 +154,7 @@ msgstr "Тетри�-подобна� игра"
 #. Name
 #: Games/Arcade/Gnibbles.desktop:2
 msgid "Gnibbles"
-msgstr ""
+msgstr "Gnibbles"
 
 #. GenericName
 #: Games/Arcade/Gnibbles.desktop:3
@@ -164,12 +164,12 @@ msgstr "Игра GNOME"
 #. Name
 #: Games/Arcade/GnobotsII.desktop:2
 msgid "Gnobots II"
-msgstr ""
+msgstr "Gnobots II"
 
 #. Name
 #: Games/Arcade/Mures.desktop:2
 msgid "Mures"
-msgstr ""
+msgstr "Mures"
 
 #. Name
 #: Games/Arcade/SuperMethaneBrothers.desktop:2
@@ -194,17 +194,17 @@ msgstr "Игра-гонки"
 #. Name
 #: Games/Arcade/XKobo.desktop:2
 msgid "XKobo"
-msgstr ""
+msgstr "XKobo"
 
 #. Name
 #: Games/Arcade/XSoldier.desktop:2
 msgid "XSoldier"
-msgstr ""
+msgstr "XSoldier"
 
 #. Name
 #: Games/Arcade/alephone-nogl.desktop:2
 msgid "Alephone"
-msgstr ""
+msgstr "Alephone"
 
 #. Comment
 #: Games/Arcade/alephone-nogl.desktop:3
@@ -230,7 +230,7 @@ msgstr "Батальон"
 #. Name
 #: Games/Arcade/battleball.desktop:2
 msgid "Battleball"
-msgstr ""
+msgstr "Battleball"
 
 #. GenericName
 #: Games/Arcade/battleball.desktop:3
@@ -240,12 +240,12 @@ msgstr "�а�тольна� игра"
 #. Name
 #: Games/Arcade/cxhextris.desktop:2
 msgid "cxhextris"
-msgstr ""
+msgstr "cxhextris"
 
 #. Name
 #: Games/Arcade/rocksndiamonds.desktop:2
 msgid "Rocks n Diamonds"
-msgstr ""
+msgstr "Rocks n Diamonds"
 
 #. GenericName
 #: Games/Arcade/rocksndiamonds.desktop:3 Games/Board/Glines.desktop:3
@@ -255,12 +255,12 @@ msgstr "Тактиче�ка� игра"
 #. Name
 #: Games/Arcade/scavenger.desktop:2
 msgid "Scavenger"
-msgstr ""
+msgstr "Scavenger"
 
 #. Name
 #: Games/Board/Gataxx.desktop:2
 msgid "Gataxx"
-msgstr ""
+msgstr "Gataxx"
 
 #. Name
 #: Games/Board/Gchess.desktop:2
@@ -270,13 +270,12 @@ msgstr "Шахматы GNOME"
 #. Name
 #: Games/Board/Glines.desktop:2
 msgid "Glines"
-msgstr ""
+msgstr "Glines"
 
 #. Name
 #: Games/Board/Gmahjongg.desktop:2
-#, fuzzy
 msgid "GNOME Mahjongg"
-msgstr "Сапёр GNOME"
+msgstr "Маджонг GNOME"
 
 #. GenericName
 #: Games/Board/Gmahjongg.desktop:3
@@ -291,17 +290,17 @@ msgstr "Сапёр GNOME"
 #. GenericName
 #: Games/Board/Gmines.desktop:3
 msgid "Logic Game"
-msgstr "Логиче�ка� игра"
+msgstr "Головоломка"
 
 #. Name
 #: Games/Board/Gnotravex.desktop:2
 msgid "Gnotravex"
-msgstr ""
+msgstr "Gnotravex"
 
 #. Name
 #: Games/Board/Gnotski.desktop:2
 msgid "Gnotski"
-msgstr ""
+msgstr "Gnotski"
 
 #. GenericName
 #: Games/Board/Gnotski.desktop:3
@@ -310,14 +309,13 @@ msgstr "Игра GNOME (Klotski)"
 
 #. Name
 #: Games/Board/Gstones.desktop:2
-#, fuzzy
 msgid "GNOME Stones"
-msgstr "Сапёр GNOME"
+msgstr "GNOME Stones"
 
 #. Name
 #: Games/Board/Iagno.desktop:2
 msgid "Iagno"
-msgstr ""
+msgstr "Ревер�и GNOME"
 
 #. GenericName
 #: Games/Board/Iagno.desktop:3 Games/Board/SameGnome.desktop:3
@@ -328,18 +326,17 @@ msgstr "�а�тольна� игра"
 #. Name
 #: Games/Board/SameGnome.desktop:2
 msgid "Same GNOME"
-msgstr ""
+msgstr "Same GNOME"
 
 #. Name
 #: Games/Board/Xgammon.desktop:2
 msgid "Xgammon"
-msgstr ""
+msgstr "Xgammon"
 
 #. Name
 #: Games/Board/xboard.desktop:2
-#, fuzzy
 msgid "Xboard"
-msgstr "Буфер обмена X"
+msgstr "Xboard"
 
 #. GenericName
 #: Games/Board/xboard.desktop:3
@@ -349,7 +346,7 @@ msgstr "Шахматы"
 #. Name
 #: Games/Card/AisleRiot.desktop:2
 msgid "AisleRiot"
-msgstr ""
+msgstr "AisleRiot"
 
 #. GenericName
 #: Games/Card/AisleRiot.desktop:3 Games/Card/FreeCell.desktop:3
@@ -360,28 +357,27 @@ msgstr "Карточна� игра"
 #. Name
 #: Games/Card/FreeCell.desktop:2
 msgid "FreeCell"
-msgstr ""
+msgstr "Свободна� �чейка"
 
 #. Name
 #: Games/Card/PySol.desktop:2
 msgid "PySol"
-msgstr ""
+msgstr "PySol"
 
 #. Name
 #: Games/Card/XPat2.desktop:2
 msgid "XPat 2"
-msgstr ""
+msgstr "XPat 2"
 
 #. Name
 #: Games/Clanbomber.desktop:2
 msgid "Clanbomber"
-msgstr ""
+msgstr "Clanbomber"
 
 #. Name
 #: Games/Emulators/cmail.desktop:2
-#, fuzzy
 msgid "ChessMail"
-msgstr "Шахматы"
+msgstr "ChessMail"
 
 #. GenericName
 #: Games/Emulators/cmail.desktop:3
@@ -391,7 +387,7 @@ msgstr "Сообщение email дл� шахмат"
 #. Name
 #: Games/Emulators/qmamecat.desktop:2
 msgid "Qmamecat"
-msgstr ""
+msgstr "Qmamecat"
 
 #. GenericName
 #: Games/Emulators/qmamecat.desktop:3
@@ -401,7 +397,7 @@ msgstr "Эмул�тор аркадных игр"
 #. Name
 #: Games/GTali.desktop:2
 msgid "GTali"
-msgstr ""
+msgstr "GTali"
 
 #. GenericName
 #: Games/GTali.desktop:3
@@ -431,7 +427,7 @@ msgstr "Отправьте�ь в Морию и победите Барлога"
 #. Name
 #: Games/Roguelikes/nethack.desktop:2
 msgid "NetHack"
-msgstr ""
+msgstr "NetHack"
 
 #. GenericName
 #: Games/Roguelikes/nethack.desktop:3 Games/Roguelikes/tome.desktop:3
@@ -441,7 +437,7 @@ msgstr "Приключение (кве�т)"
 #. Name
 #: Games/Roguelikes/rogue.desktop:2
 msgid "Rogue"
-msgstr ""
+msgstr "Rogue"
 
 #. GenericName
 #: Games/Roguelikes/rogue.desktop:3
@@ -452,7 +448,7 @@ msgstr "Терминал"
 #. Name
 #: Games/Roguelikes/tome.desktop:2
 msgid "ToME"
-msgstr ""
+msgstr "ToME"
 
 #. Name
 #: Games/Roguelikes/zangband.desktop:2
@@ -468,7 +464,7 @@ msgstr "Победите Зме� хао�а"
 #. Name
 #: Games/TacticStrategy/freeciv.desktop:3
 msgid "Freeciv"
-msgstr ""
+msgstr "Freeciv"
 
 #. GenericName
 #: Games/TacticStrategy/freeciv.desktop:4 Games/xshipwars.desktop:4
@@ -488,7 +484,7 @@ msgstr "Сервер дл� FreeCiv"
 #. Name
 #: Games/TacticStrategy/xscorch.desktop:3
 msgid "XScorch"
-msgstr ""
+msgstr "XScorch"
 
 #. Comment
 #: Games/TacticStrategy/xscorch.desktop:4
@@ -528,7 +524,7 @@ msgstr ""
 #. Name
 #: Games/xshipwars.desktop:3
 msgid "XShipWars"
-msgstr ""
+msgstr "XShipWars"
 
 #. Name
 #: Graphics/ElectricEyes.desktop:2
@@ -543,7 +539,7 @@ msgstr "Программа про�мотра ри�унков"
 #. Name
 #: Graphics/GPhoto.desktop:2
 msgid "GPhoto"
-msgstr ""
+msgstr "GPhoto"
 
 #. GenericName
 #: Graphics/GPhoto.desktop:3
@@ -583,7 +579,7 @@ msgstr "Программа векторной графики"
 #. Name
 #: Graphics/Xpcd.desktop:2
 msgid "Xpcd"
-msgstr ""
+msgstr "Xpcd"
 
 #. GenericName
 #: Graphics/Xpcd.desktop:3
@@ -613,7 +609,7 @@ msgstr "Создание ра�тровых ри�унков"
 #. Name
 #: Graphics/blender.desktop:2
 msgid "Blender"
-msgstr ""
+msgstr "Blender"
 
 #. GenericName
 #: Graphics/blender.desktop:3
@@ -623,7 +619,7 @@ msgstr "3D рендерер/моделер"
 #. Name
 #: Graphics/ghostview.desktop:2
 msgid "GhostView"
-msgstr ""
+msgstr "GhostView"
 
 #. GenericName
 #: Graphics/ghostview.desktop:3
@@ -633,7 +629,7 @@ msgstr "Программа про�мотра PostScript"
 #. Name
 #: Graphics/gimp.desktop:2
 msgid "Gimp"
-msgstr ""
+msgstr "Gimp"
 
 #. GenericName
 #: Graphics/gimp.desktop:3
@@ -643,7 +639,7 @@ msgstr "Редактор ри�унков"
 #. Name
 #: Graphics/gv.desktop:2
 msgid "GV"
-msgstr ""
+msgstr "GV"
 
 #. GenericName
 #: Graphics/gv.desktop:3
@@ -653,7 +649,7 @@ msgstr "Программа про�мотра Postscript"
 #. Name
 #: Graphics/inkscape.desktop:2
 msgid "Inkscape"
-msgstr ""
+msgstr "Inkscape"
 
 #. GenericName
 #: Graphics/inkscape.desktop:3 Graphics/sodipodi.desktop:3
@@ -678,7 +674,7 @@ msgstr "Программа дл� ри�овани�"
 #. Name
 #: Graphics/xdvi.desktop:2
 msgid "X DVI"
-msgstr ""
+msgstr "X DVI"
 
 #. GenericName
 #: Graphics/xdvi.desktop:3
@@ -693,7 +689,7 @@ msgstr ""
 #. Name
 #: Graphics/xpaint.desktop:2
 msgid "X Paint"
-msgstr ""
+msgstr "X Paint"
 
 #. GenericName
 #: Graphics/xpaint.desktop:3
@@ -703,7 +699,7 @@ msgstr "Графиче�кий редактор"
 #. Name
 #: Graphics/xv.desktop:2
 msgid "XV"
-msgstr ""
+msgstr "XV"
 
 #. GenericName
 #: Graphics/xv.desktop:3
@@ -743,7 +739,7 @@ msgstr "Синхронизаци� папок"
 #. Name
 #: Internet/Evolution.desktop:2
 msgid "Evolution"
-msgstr ""
+msgstr "Evolution"
 
 #. GenericName
 #: Internet/Evolution.desktop:3 Internet/Netscapemessenger.desktop:3
@@ -778,7 +774,7 @@ msgstr "�а�тройка fetchmail"
 #. Name
 #: Internet/Gabber.desktop:2
 msgid "Gabber"
-msgstr ""
+msgstr "Gabber"
 
 #. GenericName
 #: Internet/Gabber.desktop:3 Internet/gaim.desktop:3
@@ -845,12 +841,12 @@ msgstr ""
 #. Name
 #: Internet/Terminal/Links.desktop:2
 msgid "Links"
-msgstr ""
+msgstr "Links"
 
 #. Name
 #: Internet/Terminal/Lynx.desktop:2
 msgid "Lynx"
-msgstr ""
+msgstr "Lynx"
 
 #. Name
 #: Internet/Terminal/btdownloadcurses.desktop:2
@@ -876,7 +872,7 @@ msgstr "Клиент FTP"
 #. Name
 #: Internet/Terminal/mutt.desktop:2
 msgid "Mutt"
-msgstr ""
+msgstr "Mutt"
 
 #. Name
 #: Internet/Terminal/ncftp.desktop:2
@@ -891,7 +887,7 @@ msgstr ""
 #. Name
 #: Internet/Terminal/silc.desktop:2
 msgid "Silc"
-msgstr ""
+msgstr "Silc"
 
 #. GenericName
 #: Internet/Terminal/silc.desktop:3
@@ -911,7 +907,7 @@ msgstr "Программа дл� чтени� ново�тей"
 #. Name
 #: Internet/Terminal/w3m.desktop:2
 msgid "w3m"
-msgstr ""
+msgstr "w3m"
 
 #. Name
 #: Internet/arena.desktop:2
@@ -956,12 +952,12 @@ msgstr "Графиче�кий интерфей� eDonkey2000"
 #. Name
 #: Internet/epiphany.desktop:2
 msgid "Epiphany"
-msgstr ""
+msgstr "Epiphany"
 
 #. Name
 #: Internet/ethereal.desktop:2
 msgid "Ethereal"
-msgstr ""
+msgstr "Ethereal"
 
 #. GenericName
 #: Internet/ethereal.desktop:3 Internet/wireshark.desktop:3
@@ -971,7 +967,7 @@ msgstr "�нализатор �етевого трафика"
 #. Name
 #: Internet/gFTP.desktop:2
 msgid "gFTP"
-msgstr ""
+msgstr "gFTP"
 
 #. Name
 #: Internet/gaim.desktop:2
@@ -1023,7 +1019,7 @@ msgstr "Запу�к приложений Java из �ети"
 #. Name
 #: Internet/knews.desktop:2
 msgid "KNews"
-msgstr ""
+msgstr "KNews"
 
 #. Name
 #: Internet/licq.desktop:2
@@ -1043,37 +1039,37 @@ msgstr "Графиче�кий интерфей� MLDonkey"
 #. Name
 #: Internet/mozilla-firefox.desktop:2
 msgid "Firefox"
-msgstr ""
+msgstr "Firefox"
 
 #. Name
 #: Internet/mozilla-thunderbird.desktop:2
 msgid "Thunderbird"
-msgstr ""
+msgstr "Thunderbird"
 
 #. Name
 #: Internet/mozilla.desktop:2
 msgid "Mozilla"
-msgstr ""
+msgstr "Mozilla"
 
 #. Name
 #: Internet/netscape.desktop:2
 msgid "Netscape"
-msgstr ""
+msgstr "Netscape"
 
 #. Name
 #: Internet/netscape6.desktop:2
 msgid "Netscape6"
-msgstr ""
+msgstr "Netscape6"
 
 #. Name
 #: Internet/opera.desktop:2
 msgid "Opera"
-msgstr ""
+msgstr "Opera"
 
 #. Name
 #: Internet/wireshark.desktop:2
 msgid "Wireshark"
-msgstr ""
+msgstr "Wireshark"
 
 #. Name
 #: Internet/xbiff.desktop:2
@@ -1082,9 +1078,8 @@ msgstr ""
 
 #. Name
 #: Internet/xchat.desktop:2
-#, fuzzy
 msgid "XChat"
-msgstr "Клиент IRC"
+msgstr "XChat"
 
 #. GenericName
 #: Internet/xchat.desktop:3
@@ -1124,7 +1119,7 @@ msgstr "CD плейер/риппер"
 #. Name
 #: Multimedia/MP3info.desktop:2
 msgid "MP3 Info"
-msgstr ""
+msgstr "MP3 Info"
 
 #. Name
 #: Multimedia/XMovie.desktop:2
@@ -1172,7 +1167,7 @@ msgstr "Звуковой редактор"
 #. Name
 #: Multimedia/aviplay.desktop:2
 msgid "Aviplay"
-msgstr ""
+msgstr "Aviplay"
 
 #. GenericName
 #: Multimedia/aviplay.desktop:3
@@ -1207,7 +1202,7 @@ msgstr ""
 #. Name
 #: Multimedia/jazz.desktop:2
 msgid "Jazz"
-msgstr ""
+msgstr "Jazz"
 
 #. GenericName
 #: Multimedia/jazz.desktop:3
@@ -1216,9 +1211,8 @@ msgstr "Звуковой проце��ор"
 
 #. Name
 #: Multimedia/mplayer.desktop:2
-#, fuzzy
 msgid "MPlayer"
-msgstr "Проигрыватель MPEG"
+msgstr "MPlayer"
 
 #. Name
 #: Multimedia/mtv.desktop:2
@@ -1295,7 +1289,7 @@ msgstr "Камера"
 #. Name
 #: Multimedia/xine.desktop:2
 msgid "Xine"
-msgstr ""
+msgstr "Xine"
 
 #. Name
 #: Multimedia/xmms-enqueue.desktop:2
@@ -1310,7 +1304,7 @@ msgstr "Спи�ок пе�ен"
 #. Name
 #: Multimedia/xmms.desktop:2
 msgid "XMMS"
-msgstr ""
+msgstr "XMMS"
 
 #. GenericName
 #: Multimedia/xmms.desktop:3
@@ -1330,7 +1324,7 @@ msgstr "Офи�ный пакет"
 #. Name
 #: Office/Dia.desktop:2
 msgid "Dia"
-msgstr ""
+msgstr "Dia"
 
 #. GenericName
 #: Office/Dia.desktop:3 Office/Guppi.desktop:3
@@ -1365,7 +1359,7 @@ msgstr "Учёт времени GNOME"
 #. Name
 #: Office/Gnumeric.desktop:2
 msgid "Gnumeric"
-msgstr ""
+msgstr "Gnumeric"
 
 #. GenericName
 #: Office/Gnumeric.desktop:3 Office/XsLite.desktop:3
@@ -1380,7 +1374,7 @@ msgstr ""
 #. Name
 #: Office/Ical.desktop:2
 msgid "Ical"
-msgstr ""
+msgstr "Ical"
 
 #. GenericName
 #: Office/Ical.desktop:3
@@ -1406,7 +1400,7 @@ msgstr ""
 #. Name
 #: Office/XAcc.desktop:2
 msgid "xacc"
-msgstr ""
+msgstr "xacc"
 
 #. GenericName
 #: Office/XAcc.desktop:3
@@ -1421,12 +1415,12 @@ msgstr ""
 #. Name
 #: Office/abiword.desktop:2
 msgid "AbiWord"
-msgstr ""
+msgstr "AbiWord"
 
 #. Name
 #: Office/acroread.desktop:2
 msgid "Acrobat Reader"
-msgstr ""
+msgstr "Acrobat Reader"
 
 #. GenericName
 #: Office/acroread.desktop:3 Office/xpdf.desktop:3
@@ -1435,8 +1429,9 @@ msgstr "Про�мотр PDF"
 
 #. Name
 #: Office/gnucash.desktop:2
+#, fuzzy
 msgid "GnuCash"
-msgstr ""
+msgstr "GnuCash"
 
 #. GenericName
 #: Office/gnucash.desktop:3
@@ -1446,7 +1441,7 @@ msgstr "Менеджер финан�ов"
 #. Name
 #: Office/lyx.desktop:2
 msgid "LyX"
-msgstr ""
+msgstr "LyX"
 
 #. Name
 #: Office/mrproject.desktop:2
@@ -1497,7 +1492,7 @@ msgstr "�а�тольное издатель�тво"
 #. Name
 #: Office/xpdf.desktop:2
 msgid "X PDF"
-msgstr ""
+msgstr "X PDF"
 
 #. Name
 #: System/Terminal/aterm.desktop:2
@@ -1512,7 +1507,7 @@ msgstr "Терминал"
 #. Name
 #: System/Terminal/procinfo.desktop:2
 msgid "Procinfo"
-msgstr ""
+msgstr "Procinfo"
 
 #. GenericName
 #: System/Terminal/procinfo.desktop:3
@@ -1522,7 +1517,7 @@ msgstr "Сведени� о �и�темных проце��ах"
 #. Name
 #: System/Terminal/rxvt.desktop:2
 msgid "RXVT"
-msgstr ""
+msgstr "RXVT"
 
 #. GenericName
 #: System/Terminal/rxvt.desktop:3
@@ -1532,7 +1527,7 @@ msgstr "Ра�ширенный �мул�тор терминала"
 #. Name
 #: System/Terminal/vmstat.desktop:2
 msgid "Vmstat"
-msgstr ""
+msgstr "Vmstat"
 
 #. GenericName
 #: System/Terminal/vmstat.desktop:3
@@ -1567,7 +1562,7 @@ msgstr "Си�темное админи�трирование SAM"
 #. Name
 #: System/wine.desktop:2
 msgid "Wine"
-msgstr ""
+msgstr "Wine"
 
 #. GenericName
 #: System/wine.desktop:3
@@ -1587,7 +1582,7 @@ msgstr "Си�темный монитор"
 #. Name
 #: Utilities/Editors/emacs.desktop:2
 msgid "Emacs"
-msgstr ""
+msgstr "Emacs"
 
 #. GenericName
 #: Utilities/Editors/emacs.desktop:3 Utilities/Editors/gedit.desktop:3
@@ -1600,9 +1595,8 @@ msgstr "Тек�товый редактор"
 
 #. Name
 #: Utilities/Editors/gedit.desktop:2
-#, fuzzy
 msgid "gEdit"
-msgstr "Редактор X"
+msgstr "gEdit"
 
 #. Name
 #: Utilities/Editors/gvim.desktop:2
@@ -1617,7 +1611,7 @@ msgstr ""
 #. Name
 #: Utilities/Editors/nano.desktop:2
 msgid "Nano"
-msgstr ""
+msgstr "Nano"
 
 #. Name
 #: Utilities/Editors/nedit.desktop:2
@@ -1627,7 +1621,7 @@ msgstr "NEdit"
 #. Name
 #: Utilities/Editors/pico.desktop:2
 msgid "Pico"
-msgstr ""
+msgstr "Pico"
 
 #. Name
 #: Utilities/Editors/xedit.desktop:2
@@ -1637,12 +1631,12 @@ msgstr "Редактор X"
 #. Name
 #: Utilities/Editors/xemacs.desktop:2
 msgid "X Emacs"
-msgstr ""
+msgstr "X Emacs"
 
 #. Name
 #: Utilities/GKrellM.desktop:2
 msgid "GKrellM"
-msgstr ""
+msgstr "GKrellM"
 
 #. GenericName
 #: Utilities/GKrellM.desktop:3
@@ -1673,7 +1667,7 @@ msgstr "Про�мотр �и�темных журналов"
 #. Name
 #: Utilities/XUtilities/Xkill.desktop:2
 msgid "X Kill"
-msgstr ""
+msgstr "X Kill"
 
 #. GenericName
 #: Utilities/XUtilities/Xkill.desktop:3
@@ -1784,14 +1778,13 @@ msgstr "Личные заметки"
 
 #. Name
 #: Utilities/oclock.desktop:2
-#, fuzzy
 msgid "OClock"
-msgstr "Ча�ы"
+msgstr "OClock"
 
 #. Name
 #: Utilities/xgnokii.desktop:2
 msgid "X-Gnokii"
-msgstr ""
+msgstr "X-Gnokii"
 
 #. GenericName
 #: Utilities/xgnokii.desktop:3
diff --git a/translations/desktop_files/kate-desktops/pl.po b/translations/desktop_files/kate-desktops/pl.po
index 2c9859c6e..594e501a6 100644
--- a/translations/desktop_files/kate-desktops/pl.po
+++ b/translations/desktop_files/kate-desktops/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-18 03:49+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kate-desktop-files/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. GenericName
 #: data/kate.desktop:2
@@ -24,7 +26,7 @@ msgstr "Zaawansowany edytor tekstu"
 #. Name
 #: data/kate.desktop:3
 msgid "Kate"
-msgstr ""
+msgstr "Kate"
 
 #. Comment
 #: data/kateplugin.desktop:5
@@ -39,4 +41,4 @@ msgstr "Edytor tekstu"
 #. Name
 #: data/kwrite.desktop:3
 msgid "KWrite"
-msgstr ""
+msgstr "KWrite"
diff --git a/translations/desktop_files/kate-desktops/ru.po b/translations/desktop_files/kate-desktops/ru.po
index 9e6153ae1..f18ccd22a 100644
--- a/translations/desktop_files/kate-desktops/ru.po
+++ b/translations/desktop_files/kate-desktops/ru.po
@@ -1,22 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Alexander Golubev <fatzer2@gmail.com>, 2022.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-18 03:49+0200\n"
-"PO-Revision-Date: 2022-02-14 23:01+0000\n"
-"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"PO-Revision-Date: 2023-12-09 05:14+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/kate-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.10.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. GenericName
 #: data/kate.desktop:2
@@ -41,4 +42,4 @@ msgstr "Тек�товый редактор"
 #. Name
 #: data/kwrite.desktop:3
 msgid "KWrite"
-msgstr ""
+msgstr "KWrite"
diff --git a/translations/desktop_files/kcontrol-color-schemes/af.po b/translations/desktop_files/kcontrol-color-schemes/af.po
index c3cc359c0..3840a3b42 100644
--- a/translations/desktop_files/kcontrol-color-schemes/af.po
+++ b/translations/desktop_files/kcontrol-color-schemes/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr "Evex"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "Kde 1"
@@ -90,6 +95,16 @@ msgid "Keramik White"
 msgstr "Keramik Wit"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Media Perske"
@@ -110,6 +125,11 @@ msgid "Plastik"
 msgstr "Plastiek"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Punt Strale Groen"
@@ -120,6 +140,11 @@ msgid "Pumpkin"
 msgstr "Pampoen"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -135,6 +160,11 @@ msgid "System"
 msgstr "Stelsel"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Hoë kontras wit teks"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ar.po b/translations/desktop_files/kcontrol-color-schemes/ar.po
index 6fe86c385..2652aa5ec 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ar.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "قرميدي أبيض"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr "بلاستيك"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "يقطيني"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "النظام"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "نص أبيض عالي التباين"
diff --git a/translations/desktop_files/kcontrol-color-schemes/az.po b/translations/desktop_files/kcontrol-color-schemes/az.po
index a10cfeea2..f482ef2d7 100644
--- a/translations/desktop_files/kcontrol-color-schemes/az.po
+++ b/translations/desktop_files/kcontrol-color-schemes/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik AÄŸ"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes Yaşılı"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solaris CDE"
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/be.po b/translations/desktop_files/kcontrol-color-schemes/be.po
index 6f1dc742e..54f4f8c21 100644
--- a/translations/desktop_files/kcontrol-color-schemes/be.po
+++ b/translations/desktop_files/kcontrol-color-schemes/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Бела� кераміка"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Пла�тык"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Гарбуз"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Сі�т�ма"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Вы�ока кантра�тна� \"белы т�к�т\""
diff --git a/translations/desktop_files/kcontrol-color-schemes/bg.po b/translations/desktop_files/kcontrol-color-schemes/bg.po
index 41681f6a0..36f33f8a8 100644
--- a/translations/desktop_files/kcontrol-color-schemes/bg.po
+++ b/translations/desktop_files/kcontrol-color-schemes/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: 2020-07-19 22:59+0000\n"
 "Last-Translator: Emanoil Kotsev <deloptes@gmail.com>\n"
 "Language-Team: Bulgarian <https://mirror.git.trinitydesktop.org/weblate/"
@@ -63,6 +63,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Керамика в б�ло"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr "Пла�тика"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Тиква"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Си�тема"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Б�л тек�т � ви�ок контра�т"
diff --git a/translations/desktop_files/kcontrol-color-schemes/bn.po b/translations/desktop_files/kcontrol-color-schemes/bn.po
index 4b7a13495..ff6b8a7b3 100644
--- a/translations/desktop_files/kcontrol-color-schemes/bn.po
+++ b/translations/desktop_files/kcontrol-color-schemes/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "কে.ডি.ই. ১"
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "কেরামিক সাদা"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "মিডিয়া পীচ"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "প�লাস�টিক"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "পাম�পকিন"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "সোলারিস"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "সিস�টেম"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "হাই কনট�রাস�ট সাদা লেখা"
diff --git a/translations/desktop_files/kcontrol-color-schemes/br.po b/translations/desktop_files/kcontrol-color-schemes/br.po
index 80370c31e..6c014566f 100644
--- a/translations/desktop_files/kcontrol-color-schemes/br.po
+++ b/translations/desktop_files/kcontrol-color-schemes/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik gwenn"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Reizhiad"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/bs.po b/translations/desktop_files/kcontrol-color-schemes/bs.po
index c8accd749..b031ff346 100644
--- a/translations/desktop_files/kcontrol-color-schemes/bs.po
+++ b/translations/desktop_files/kcontrol-color-schemes/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik bijela"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Media breskva"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes zelena"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Visoki kontrast, bijeli tekst"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ca.po b/translations/desktop_files/kcontrol-color-schemes/ca.po
index d8a3fa82b..9b3b1195f 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ca.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik blanc"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Verd Point Reyes"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Carabassa"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Text blanc d'alt contrast"
diff --git a/translations/desktop_files/kcontrol-color-schemes/cs.po b/translations/desktop_files/kcontrol-color-schemes/cs.po
index 65b220e1f..ccc183366 100644
--- a/translations/desktop_files/kcontrol-color-schemes/cs.po
+++ b/translations/desktop_files/kcontrol-color-schemes/cs.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: 2020-12-23 13:59+0000\n"
 "Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
 "Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
@@ -63,6 +63,11 @@ msgid "EveX"
 msgstr "EveX"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramika (bílá)"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Pastelově broskvová"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr "Plastický"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Zelená Point Reyes"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Dýně"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solaris"
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Systém"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Vysoký kontrast, bílý text"
diff --git a/translations/desktop_files/kcontrol-color-schemes/csb.po b/translations/desktop_files/kcontrol-color-schemes/csb.po
index 527972c32..0ab321869 100644
--- a/translations/desktop_files/kcontrol-color-schemes/csb.po
+++ b/translations/desktop_files/kcontrol-color-schemes/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik Biôłi"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Zelonosc pùnktu Reyes"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Bania"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Systema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Kòntrastowi biôłi tekst"
diff --git a/translations/desktop_files/kcontrol-color-schemes/cy.po b/translations/desktop_files/kcontrol-color-schemes/cy.po
index e4b9c7016..327d07df3 100644
--- a/translations/desktop_files/kcontrol-color-schemes/cy.po
+++ b/translations/desktop_files/kcontrol-color-schemes/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik Gwyn"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Eirynen Wlanog Cyfryngau"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Gwyrdd Point Reyes "
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Pwmpen"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Cysawd"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/da.po b/translations/desktop_files/kcontrol-color-schemes/da.po
index 7353311f9..74dbc6496 100644
--- a/translations/desktop_files/kcontrol-color-schemes/da.po
+++ b/translations/desktop_files/kcontrol-color-schemes/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik hvid"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Hvid tekst med høj kontrast"
diff --git a/translations/desktop_files/kcontrol-color-schemes/de.po b/translations/desktop_files/kcontrol-color-schemes/de.po
index 76d42e31e..f4f006d11 100644
--- a/translations/desktop_files/kcontrol-color-schemes/de.po
+++ b/translations/desktop_files/kcontrol-color-schemes/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Porzellanweiß"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Mittlere Pfirsichfarbe"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes-Grün"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Kürbis"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Hoher Kontrast, Weiß auf Schwarz"
diff --git a/translations/desktop_files/kcontrol-color-schemes/el.po b/translations/desktop_files/kcontrol-color-schemes/el.po
index 17e340138..f0819fbe6 100644
--- a/translations/desktop_files/kcontrol-color-schemes/el.po
+++ b/translations/desktop_files/kcontrol-color-schemes/el.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: 2022-01-16 15:00+0000\n"
 "Last-Translator: blu.256 <mavridisf@gmail.com>\n"
 "Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
@@ -63,6 +63,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik άσπ�ο"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Βε�ίκοκο παστέλ"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr "Πλαστικό"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Π�άσινο Point Reyes"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Κολοκ�θα"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solaris"
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Σ�στημα"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Άσπ�ο κείμενο υψηλής αντίθεσης"
diff --git a/translations/desktop_files/kcontrol-color-schemes/en_GB.po b/translations/desktop_files/kcontrol-color-schemes/en_GB.po
index 65b228073..7c0293f4b 100644
--- a/translations/desktop_files/kcontrol-color-schemes/en_GB.po
+++ b/translations/desktop_files/kcontrol-color-schemes/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/eo.po b/translations/desktop_files/kcontrol-color-schemes/eo.po
index 8f33c70ed..150773c83 100644
--- a/translations/desktop_files/kcontrol-color-schemes/eo.po
+++ b/translations/desktop_files/kcontrol-color-schemes/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Ceramika blanko"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Persiko"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Plastiko"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Verdaj tonoj"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Kukurbo"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solariso"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Sistemo"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Alt-kontrasta Blanka Teksto"
diff --git a/translations/desktop_files/kcontrol-color-schemes/es.po b/translations/desktop_files/kcontrol-color-schemes/es.po
index addbdd69c..974ef787e 100644
--- a/translations/desktop_files/kcontrol-color-schemes/es.po
+++ b/translations/desktop_files/kcontrol-color-schemes/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik blanco"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Melocotón multimedia"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Verde Point Reyes"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Calabaza"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Texto blanco de alto contraste"
diff --git a/translations/desktop_files/kcontrol-color-schemes/es_AR.po b/translations/desktop_files/kcontrol-color-schemes/es_AR.po
index b1ffb04da..7b3ee5cbf 100644
--- a/translations/desktop_files/kcontrol-color-schemes/es_AR.po
+++ b/translations/desktop_files/kcontrol-color-schemes/es_AR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: 2020-11-11 19:33+0000\n"
 "Last-Translator: Sergio Ricardo Vicari <sercari@gmail.com>\n"
 "Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
@@ -63,6 +63,11 @@ msgid "EveX"
 msgstr "EveX"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "TDE 1"
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik Blanca"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Texto blanco de alto contraste"
diff --git a/translations/desktop_files/kcontrol-color-schemes/et.po b/translations/desktop_files/kcontrol-color-schemes/et.po
index 586ee0f74..8a7979623 100644
--- a/translations/desktop_files/kcontrol-color-schemes/et.po
+++ b/translations/desktop_files/kcontrol-color-schemes/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Valge Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes roheline"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Kõrvits"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Süsteem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Väga kontrastne valge tekst"
diff --git a/translations/desktop_files/kcontrol-color-schemes/eu.po b/translations/desktop_files/kcontrol-color-schemes/eu.po
index 60314c221..f7d55c284 100644
--- a/translations/desktop_files/kcontrol-color-schemes/eu.po
+++ b/translations/desktop_files/kcontrol-color-schemes/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik zuria"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Multimedia mertxika"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes berdea"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Kalabaza"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Kontraste handiko testu zuria"
diff --git a/translations/desktop_files/kcontrol-color-schemes/fa.po b/translations/desktop_files/kcontrol-color-schemes/fa.po
index 9d33b7195..268e1d1f1 100644
--- a/translations/desktop_files/kcontrol-color-schemes/fa.po
+++ b/translations/desktop_files/kcontrol-color-schemes/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE Û±"
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "س�ید کرامیک"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "پلاستیک"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "سبز نقطه-نقطه"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "کدو حلوایی"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "سولاریس"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "سیستم"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "متن س�ید با سایه روشن بالا"
diff --git a/translations/desktop_files/kcontrol-color-schemes/fi.po b/translations/desktop_files/kcontrol-color-schemes/fi.po
index 0163180bb..0ef6df59b 100644
--- a/translations/desktop_files/kcontrol-color-schemes/fi.po
+++ b/translations/desktop_files/kcontrol-color-schemes/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik valkoinen"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Kurpitsa"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Järjestelmä"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Suuren värikontrastin valkoinen teksti"
diff --git a/translations/desktop_files/kcontrol-color-schemes/fo.po b/translations/desktop_files/kcontrol-color-schemes/fo.po
index 0be529428..a3f1bf73f 100644
--- a/translations/desktop_files/kcontrol-color-schemes/fo.po
+++ b/translations/desktop_files/kcontrol-color-schemes/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Kervi"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/fr.po b/translations/desktop_files/kcontrol-color-schemes/fr.po
index 0336d363e..b8fd519bc 100644
--- a/translations/desktop_files/kcontrol-color-schemes/fr.po
+++ b/translations/desktop_files/kcontrol-color-schemes/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik blanc"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Pêche pastel"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Vert doux"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Potiron"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Système"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Texte en blanc avec contraste élevé"
diff --git a/translations/desktop_files/kcontrol-color-schemes/fy.po b/translations/desktop_files/kcontrol-color-schemes/fy.po
index a0feb26a5..d02907876 100644
--- a/translations/desktop_files/kcontrol-color-schemes/fy.po
+++ b/translations/desktop_files/kcontrol-color-schemes/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Keramyk-wit"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Plastyk"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Dúngrien"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "klabats"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Systeem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Heech kontrast wite tekst"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ga.po b/translations/desktop_files/kcontrol-color-schemes/ga.po
index ef831564b..f8b620968 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ga.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Bán Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Puimcín"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Córas"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/gl.po b/translations/desktop_files/kcontrol-color-schemes/gl.po
index 8e553f1c9..5a81d5770 100644
--- a/translations/desktop_files/kcontrol-color-schemes/gl.po
+++ b/translations/desktop_files/kcontrol-color-schemes/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramic Branco"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Texto Branco de Alto Contraste"
diff --git a/translations/desktop_files/kcontrol-color-schemes/he.po b/translations/desktop_files/kcontrol-color-schemes/he.po
index d133afb61..b81c4d9f6 100644
--- a/translations/desktop_files/kcontrol-color-schemes/he.po
+++ b/translations/desktop_files/kcontrol-color-schemes/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "�פרסק"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "ירוק י�"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "דלעת"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "מערכת"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "ניגודיות גבוהה ע� טקסט לבן"
diff --git a/translations/desktop_files/kcontrol-color-schemes/hi.po b/translations/desktop_files/kcontrol-color-schemes/hi.po
index 51874518a..844adb587 100644
--- a/translations/desktop_files/kcontrol-color-schemes/hi.po
+++ b/translations/desktop_files/kcontrol-color-schemes/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr "�वेक�स"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "केडीई 1"
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "केरमिक सफेद"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "मीडिया पीच"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "प�लास�टिक"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "प�वाइंट रेस हरा"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "क�म�हड़ा"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "सोलारिस"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "तंत�र"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/hr.po b/translations/desktop_files/kcontrol-color-schemes/hr.po
index 7c55fc064..40e7a91e7 100644
--- a/translations/desktop_files/kcontrol-color-schemes/hr.po
+++ b/translations/desktop_files/kcontrol-color-schemes/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik bijela"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Medijska breskva"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr "Plastika"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes zeleno"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Bundeva"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Sustav"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Bijeli tekst visokog kontrasta"
diff --git a/translations/desktop_files/kcontrol-color-schemes/hu.po b/translations/desktop_files/kcontrol-color-schemes/hu.po
index 11306dfd0..57539f2e9 100644
--- a/translations/desktop_files/kcontrol-color-schemes/hu.po
+++ b/translations/desktop_files/kcontrol-color-schemes/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik (fehér)"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Barackszínű"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Zöldes árnyalat"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Házitök"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Rendszer"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Erősen kontrasztos fehér szöveg"
diff --git a/translations/desktop_files/kcontrol-color-schemes/id.po b/translations/desktop_files/kcontrol-color-schemes/id.po
index a69aa1bf1..9dbc920ae 100644
--- a/translations/desktop_files/kcontrol-color-schemes/id.po
+++ b/translations/desktop_files/kcontrol-color-schemes/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/is.po b/translations/desktop_files/kcontrol-color-schemes/is.po
index d468f409b..e1c551bf5 100644
--- a/translations/desktop_files/kcontrol-color-schemes/is.po
+++ b/translations/desktop_files/kcontrol-color-schemes/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik hvítt"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr "Plast"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes grænt"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Grasker"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Kerfi"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Há birtuskila hvítur texti"
diff --git a/translations/desktop_files/kcontrol-color-schemes/it.po b/translations/desktop_files/kcontrol-color-schemes/it.po
index 0d63e9a96..56ee0d0d8 100644
--- a/translations/desktop_files/kcontrol-color-schemes/it.po
+++ b/translations/desktop_files/kcontrol-color-schemes/it.po
@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Fiflagar Lorizen <fiflagar.lorizen@posteo.net>, 2021.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
-"PO-Revision-Date: 2021-04-18 18:00+0000\n"
-"Last-Translator: Fiflagar Lorizen <fiflagar.lorizen@posteo.net>\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"PO-Revision-Date: 2023-11-08 01:13+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
 "Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/color-schemes/it/>\n"
 "Language: it\n"
@@ -15,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.5.3\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -63,6 +64,11 @@ msgid "EveX"
 msgstr "EveX"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr "Umano"
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -88,6 +94,16 @@ msgid "Keramik White"
 msgstr "Ceramica bianca"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr "Last.fm"
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr "Lucertola"
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Pesca"
@@ -108,6 +124,11 @@ msgid "Plastik"
 msgstr "Plastica"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr "Platino"
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Verde Point Reyes"
@@ -118,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Zucca"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr "Sienna"
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solaris"
@@ -133,6 +159,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr "WedgieWeb"
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Testo bianco ad alto contrasto"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ja.po b/translations/desktop_files/kcontrol-color-schemes/ja.po
index 320a0c81a..6e82decd1 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ja.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "�イントレイズグリーン"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "���ゃ色"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "システム"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "�イコントラスト�白�テキスト"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ka.po b/translations/desktop_files/kcontrol-color-schemes/ka.po
index 40b285fa5..f51a17183 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ka.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Пла�тик"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "სისტემ�"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "მ�ღ�ლკ�ნსტრ�სტული თეთრი ტექტი"
diff --git a/translations/desktop_files/kcontrol-color-schemes/kcontrol-color-schemes.pot b/translations/desktop_files/kcontrol-color-schemes/kcontrol-color-schemes.pot
index 2c9449596..bc28357e2 100644
--- a/translations/desktop_files/kcontrol-color-schemes/kcontrol-color-schemes.pot
+++ b/translations/desktop_files/kcontrol-color-schemes/kcontrol-color-schemes.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/kk.po b/translations/desktop_files/kcontrol-color-schemes/kk.po
index e17bd723f..cfa5f26d7 100644
--- a/translations/desktop_files/kcontrol-color-schemes/kk.po
+++ b/translations/desktop_files/kcontrol-color-schemes/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Пла�тик"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "��қабақ"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Сол�ри�"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Жүйелік"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Контра�тығы жоғары ақ мәтін"
diff --git a/translations/desktop_files/kcontrol-color-schemes/km.po b/translations/desktop_files/kcontrol-color-schemes/km.po
index 054c858c1..29cfb83d3 100644
--- a/translations/desktop_files/kcontrol-color-schemes/km.po
+++ b/translations/desktop_files/kcontrol-color-schemes/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE ១"
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik ស"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr "ប្ល៉ាស្ទិក"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "ល្ពៅ"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "ប្រព�ន្ធ"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "អ�្�បទ​ពណ៌​ស កម្រិ�​ពណ៌​�្ពស់"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ko.po b/translations/desktop_files/kcontrol-color-schemes/ko.po
index f3add73b1..81f933e4d 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ko.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "시스템"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/lo.po b/translations/desktop_files/kcontrol-color-schemes/lo.po
index 79d59f881..f8d704876 100644
--- a/translations/desktop_files/kcontrol-color-schemes/lo.po
+++ b/translations/desktop_files/kcontrol-color-schemes/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr "�ບບ EveX"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "ໂປຣ��ຣມຈັດ�ານຫນ້າຕ່າງ KDE 1"
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "ເຄຣາມິ� - K"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "ລູ�ທ�້"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "ຈຸດຂງວປະ�າ�"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "ຫມາ�ອຶ"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "ໂຊລາຣິສ"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "ຈັດ�ານລະບົບ"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/lt.po b/translations/desktop_files/kcontrol-color-schemes/lt.po
index 342911d0b..ce9c3ff3f 100644
--- a/translations/desktop_files/kcontrol-color-schemes/lt.po
+++ b/translations/desktop_files/kcontrol-color-schemes/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik baltas"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Media persiko"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr "Plastikinis"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes žalia"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solario CDE"
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Didelio kontrasto baltas tekstas"
diff --git a/translations/desktop_files/kcontrol-color-schemes/lv.po b/translations/desktop_files/kcontrol-color-schemes/lv.po
index e82d42516..318f08fae 100644
--- a/translations/desktop_files/kcontrol-color-schemes/lv.po
+++ b/translations/desktop_files/kcontrol-color-schemes/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Balta Keramika"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "MÄ“diju Persiks"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Plastika"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes Zaļš"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Ķirbis"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Sistēma"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/mk.po b/translations/desktop_files/kcontrol-color-schemes/mk.po
index 35dbe019b..e8d067a2b 100644
--- a/translations/desktop_files/kcontrol-color-schemes/mk.po
+++ b/translations/desktop_files/kcontrol-color-schemes/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Керамик бело"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Пла�тик"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Тиквичка"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Си�тем"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Бел тек�т �о ви�ок контра�т"
diff --git a/translations/desktop_files/kcontrol-color-schemes/mn.po b/translations/desktop_files/kcontrol-color-schemes/mn.po
index 4dba036b5..1a5add8c2 100644
--- a/translations/desktop_files/kcontrol-color-schemes/mn.po
+++ b/translations/desktop_files/kcontrol-color-schemes/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "КДЭ 1"
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Шаазан цагаан"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes-�огоон"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Хулуу"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Си�тем"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/ms.po b/translations/desktop_files/kcontrol-color-schemes/ms.po
index c66642cf8..91e969086 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ms.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Putih Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Pic Sederhana"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Labu"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Teks Putih Kontras Tinggi"
diff --git a/translations/desktop_files/kcontrol-color-schemes/mt.po b/translations/desktop_files/kcontrol-color-schemes/mt.po
index b95b25055..daf00e49b 100644
--- a/translations/desktop_files/kcontrol-color-schemes/mt.po
+++ b/translations/desktop_files/kcontrol-color-schemes/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik Abjad"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Aħdar Point Reyes"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Qargħa Ħamra"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/nb.po b/translations/desktop_files/kcontrol-color-schemes/nb.po
index a65e21244..7a4d44d42 100644
--- a/translations/desktop_files/kcontrol-color-schemes/nb.po
+++ b/translations/desktop_files/kcontrol-color-schemes/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Keramikk, hvit"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Mediefersken"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Plast"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Grønn og rosa"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Gresskar"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Høykontrast, hvit tekst"
diff --git a/translations/desktop_files/kcontrol-color-schemes/nds.po b/translations/desktop_files/kcontrol-color-schemes/nds.po
index 8b1dda5f9..d0a767b9e 100644
--- a/translations/desktop_files/kcontrol-color-schemes/nds.po
+++ b/translations/desktop_files/kcontrol-color-schemes/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramikwitt"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Middelpeersch"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes-Gröön"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Körbs"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Systeem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Hogen Kontrast, witt Text"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ne.po b/translations/desktop_files/kcontrol-color-schemes/ne.po
index d125d7f5b..7d4328737 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ne.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "केरामिक सेतो"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "मिडिया पिच"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "प�लास�टिक"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "बिन�द� रेइज हरियो"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "पम�पकिन"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "सोलारिस"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "प�रणाली"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "उच�च व�यतिरेक सेतो पाठ"
diff --git a/translations/desktop_files/kcontrol-color-schemes/nl.po b/translations/desktop_files/kcontrol-color-schemes/nl.po
index a69bae666..189991ec6 100644
--- a/translations/desktop_files/kcontrol-color-schemes/nl.po
+++ b/translations/desktop_files/kcontrol-color-schemes/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik-wit"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Duingroen"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Pompoen"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Systeem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Hoog contrast witte tekst"
diff --git a/translations/desktop_files/kcontrol-color-schemes/nn.po b/translations/desktop_files/kcontrol-color-schemes/nn.po
index 4a148d254..3a4d0a8d0 100644
--- a/translations/desktop_files/kcontrol-color-schemes/nn.po
+++ b/translations/desktop_files/kcontrol-color-schemes/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Keramikk kvit"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Mediefersken"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Plast"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Grøn og rosa"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Graskar"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Høgkontrast, kvit tekst"
diff --git a/translations/desktop_files/kcontrol-color-schemes/nso.po b/translations/desktop_files/kcontrol-color-schemes/nso.po
index 7fda9a302..58b6d66a5 100644
--- a/translations/desktop_files/kcontrol-color-schemes/nso.po
+++ b/translations/desktop_files/kcontrol-color-schemes/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Boshweu bja Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Lephutsi"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/oc.po b/translations/desktop_files/kcontrol-color-schemes/oc.po
index 7898a6e92..9e6594dcc 100644
--- a/translations/desktop_files/kcontrol-color-schemes/oc.po
+++ b/translations/desktop_files/kcontrol-color-schemes/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Sistemo"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/pa.po b/translations/desktop_files/kcontrol-color-schemes/pa.po
index 3de389ee7..580747870 100644
--- a/translations/desktop_files/kcontrol-color-schemes/pa.po
+++ b/translations/desktop_files/kcontrol-color-schemes/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "ਕੀਰਾਮਿਕ ਸਫੈਦ"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "ਮੀਡਿਆ ਪੀਂਚ"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "ਪਲਾਸਟਿਕ"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "ਬਿੰਦੂ ਰੀਆਈਸ ਹਰਾ"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "ਪੰਪਕਿਨ"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "ਸਿਸਟਮ"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "ਜਿਆਦਾ ਗੂੜਾ ਪਾਠ ਸਫੈਦ"
diff --git a/translations/desktop_files/kcontrol-color-schemes/pl.po b/translations/desktop_files/kcontrol-color-schemes/pl.po
index c142af9ec..3ca34bb1a 100644
--- a/translations/desktop_files/kcontrol-color-schemes/pl.po
+++ b/translations/desktop_files/kcontrol-color-schemes/pl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: 2021-10-10 09:30+0000\n"
 "Last-Translator: Marek W <coronzon88@gmail.com>\n"
 "Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
@@ -64,6 +64,11 @@ msgid "EveX"
 msgstr "WigiliaX"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik Biały"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Media - brzoskwiniowy"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr "Plastik"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Zieleń punktu Reyes"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Dynia"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solaris"
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "System"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Kontrastowy biały tekst"
diff --git a/translations/desktop_files/kcontrol-color-schemes/pt.po b/translations/desktop_files/kcontrol-color-schemes/pt.po
index 3e01adfb1..4bf452766 100644
--- a/translations/desktop_files/kcontrol-color-schemes/pt.po
+++ b/translations/desktop_files/kcontrol-color-schemes/pt.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021.
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
-"PO-Revision-Date: 2021-12-02 19:00+0000\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"PO-Revision-Date: 2024-03-26 17:44+0000\n"
 "Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
 "Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/color-schemes/pt/>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.9.1\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -63,6 +63,11 @@ msgid "EveX"
 msgstr "EveX"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr "Human"
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik Branco"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr "Last.fm"
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr "Lizard"
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Media Peach"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr "Plastik"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr "Platinum"
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Verde Point Reyes"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Abóbora"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr "Sienna"
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solaris"
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr "WedgieWeb"
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Alto Contraste Texto Branco"
diff --git a/translations/desktop_files/kcontrol-color-schemes/pt_BR.po b/translations/desktop_files/kcontrol-color-schemes/pt_BR.po
index ea3a80aa1..1cfdb51f2 100644
--- a/translations/desktop_files/kcontrol-color-schemes/pt_BR.po
+++ b/translations/desktop_files/kcontrol-color-schemes/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik Branco"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Pêssego"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Verde"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Abóbora"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Alto Contraste do Texto Branco"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ro.po b/translations/desktop_files/kcontrol-color-schemes/ro.po
index 13c2b5ce3..1c4dee37f 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ro.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik alb"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Piersică"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr "Plastic"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Verde Point Reyes"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Dovlecel"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Contrast mare text alb"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ru.po b/translations/desktop_files/kcontrol-color-schemes/ru.po
index df80aba83..3f0e6a76b 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ru.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ru.po
@@ -1,22 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # blu.256 <mavridisf@gmail.com>, 2022.
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
-"PO-Revision-Date: 2022-01-16 15:00+0000\n"
-"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/color-schemes/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.10.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -61,7 +62,12 @@ msgstr "Цифровой CDE"
 #. Name
 #: EveX.kcsrc:2
 msgid "EveX"
-msgstr "EveX"
+msgstr "Ева X"
+
+#. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr "Человек"
 
 #. Name
 #: KDEOne.kcsrc:2
@@ -89,6 +95,16 @@ msgid "Keramik White"
 msgstr "Керамика бела�"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr "Last.fm"
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr "Ящерица"
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Медиапер�ик"
@@ -109,6 +125,11 @@ msgid "Plastik"
 msgstr "Пла�тик"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr "Платина"
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Зелёный из Point Reyes"
@@ -119,6 +140,11 @@ msgid "Pumpkin"
 msgstr "Тыква"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr "Сиена"
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Сол�ри�"
@@ -134,6 +160,11 @@ msgid "System"
 msgstr "Си�тема"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr "WedgieWeb"
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Вы�ококонтра�тный белый тек�т"
@@ -141,17 +172,17 @@ msgstr "Вы�ококонтра�тный белый тек�т"
 #. Name
 #: Windows2000.kcsrc:2
 msgid "Redmond 2000"
-msgstr "Redmond 2000"
+msgstr "Редмонд 2000"
 
 #. Name
 #: Windows95.kcsrc:3
 msgid "Redmond 95"
-msgstr "Redmond 95"
+msgstr "Редмонд 95"
 
 #. Name
 #: WindowsXP.kcsrc:2
 msgid "Redmond XP"
-msgstr "Redmond XP"
+msgstr "Редмонд XP"
 
 #. Name
 #: YellowOnBlue.kcsrc:2
diff --git a/translations/desktop_files/kcontrol-color-schemes/rw.po b/translations/desktop_files/kcontrol-color-schemes/rw.po
index c9aae4920..ae40f3e55 100644
--- a/translations/desktop_files/kcontrol-color-schemes/rw.po
+++ b/translations/desktop_files/kcontrol-color-schemes/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Umweru Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Akadomo Reyes Icyatsi"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sisitemu"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Umwandiko w'Umweru Inyuranyamigaragarire yo Hejuru"
diff --git a/translations/desktop_files/kcontrol-color-schemes/se.po b/translations/desktop_files/kcontrol-color-schemes/se.po
index adb43b538..950f971f1 100644
--- a/translations/desktop_files/kcontrol-color-schemes/se.po
+++ b/translations/desktop_files/kcontrol-color-schemes/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Vilges bálseduoddji"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Mediapersihkka"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Plastihkka"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Ruoná ja guvgesrukses"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Gurbbet"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Vuogádat"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Alla vuostálasvuohta, vilges teaksta"
diff --git a/translations/desktop_files/kcontrol-color-schemes/sk.po b/translations/desktop_files/kcontrol-color-schemes/sk.po
index f065401a0..5064ea031 100644
--- a/translations/desktop_files/kcontrol-color-schemes/sk.po
+++ b/translations/desktop_files/kcontrol-color-schemes/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: 2020-10-16 13:31+0000\n"
 "Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
 "Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
@@ -63,6 +63,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramika Biela"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes Zelená"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Tekvica"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solaris"
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Systém"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Vysokokontrastný biely text"
diff --git a/translations/desktop_files/kcontrol-color-schemes/sl.po b/translations/desktop_files/kcontrol-color-schemes/sl.po
index 54fccfa98..9847fd4e8 100644
--- a/translations/desktop_files/kcontrol-color-schemes/sl.po
+++ b/translations/desktop_files/kcontrol-color-schemes/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik bela"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Zelena Point Reyes"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Bu�a"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Visoko kontrastno belo besedilo"
diff --git a/translations/desktop_files/kcontrol-color-schemes/sr.po b/translations/desktop_files/kcontrol-color-schemes/sr.po
index dee85d68a..0aefb3194 100644
--- a/translations/desktop_files/kcontrol-color-schemes/sr.po
+++ b/translations/desktop_files/kcontrol-color-schemes/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Бела керамика"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Пла�тика"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes зелена"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Бундева"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Си�тем"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Бели тек�т ви�оког контра�та"
diff --git a/translations/desktop_files/kcontrol-color-schemes/sr@Latn.po b/translations/desktop_files/kcontrol-color-schemes/sr@Latn.po
index bfe0eb154..1067dd4dc 100644
--- a/translations/desktop_files/kcontrol-color-schemes/sr@Latn.po
+++ b/translations/desktop_files/kcontrol-color-schemes/sr@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Bela keramika"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Plastika"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes zelena"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Bundeva"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Beli tekst visokog kontrasta"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ss.po b/translations/desktop_files/kcontrol-color-schemes/ss.po
index bc1fdc53f..10247f99c 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ss.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Litsanga"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Umshini"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/sv.po b/translations/desktop_files/kcontrol-color-schemes/sv.po
index 09d932eef..25aa358d7 100644
--- a/translations/desktop_files/kcontrol-color-schemes/sv.po
+++ b/translations/desktop_files/kcontrol-color-schemes/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Vit Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes-grön"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Pumpa"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Vit text med hög kontrast"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ta.po b/translations/desktop_files/kcontrol-color-schemes/ta.po
index 95e265c20..185d42844 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ta.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "கேரமிக� வெள�ளை"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "ஊடக பீச�"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "திட�டம�"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "பூசணிக�காய�"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "சோலாரிஸ�"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "அமைப�ப�"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "அதிக மாற�பட�ட வெள�ளை உரை"
diff --git a/translations/desktop_files/kcontrol-color-schemes/te.po b/translations/desktop_files/kcontrol-color-schemes/te.po
index 0db79e2d7..1278c283e 100644
--- a/translations/desktop_files/kcontrol-color-schemes/te.po
+++ b/translations/desktop_files/kcontrol-color-schemes/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr "ఈవెక�స�"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "కెడిఈ 1"
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "కెరామిక� తెల�ప�"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "మీడియా పీచ�"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "ప�లాస�టిక�"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "పాయింట� రెయిస� పచ�చ"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "గ�మ�మడి"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "సొలారిస�"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "వ�యవస�థ"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/tg.po b/translations/desktop_files/kcontrol-color-schemes/tg.po
index 1bd40758d..e200e80a6 100644
--- a/translations/desktop_files/kcontrol-color-schemes/tg.po
+++ b/translations/desktop_files/kcontrol-color-schemes/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik-и �афед"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Сабзи нуқта нуқта"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Каду"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Сол�ри�"
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Си�тема"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 #, fuzzy
 msgid "High Contrast White Text"
diff --git a/translations/desktop_files/kcontrol-color-schemes/th.po b/translations/desktop_files/kcontrol-color-schemes/th.po
index 7074209ba..ca097aacd 100644
--- a/translations/desktop_files/kcontrol-color-schemes/th.po
+++ b/translations/desktop_files/kcontrol-color-schemes/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr "�บบ EveX"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "�บบ KDE 1"
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "เครามิ�ขาว"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "ลู�ท้อ"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "พลาสติ�"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "จุดเขียวประปราย"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "ฟั�ทอง"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "โซลาริส"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "ระบบ"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "ตัวอั�ษรขาวคอนทราสสูง"
diff --git a/translations/desktop_files/kcontrol-color-schemes/tr.po b/translations/desktop_files/kcontrol-color-schemes/tr.po
index be55a6e1a..1fc9b7d31 100644
--- a/translations/desktop_files/kcontrol-color-schemes/tr.po
+++ b/translations/desktop_files/kcontrol-color-schemes/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: 2021-04-20 20:01+0000\n"
 "Last-Translator: Erdem Ersoy <erdemersoy@erdemersoy.net>\n"
 "Language-Team: Turkish <https://mirror.git.trinitydesktop.org/weblate/"
@@ -64,6 +64,11 @@ msgid "EveX"
 msgstr "EveX"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Beyaz Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Medya Åžeftalisi"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr "Plastik"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes YeÅŸili"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Kabak"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solaris"
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Yüksek Kontrast Beyaz Metin"
diff --git a/translations/desktop_files/kcontrol-color-schemes/tt.po b/translations/desktop_files/kcontrol-color-schemes/tt.po
index 058715db9..3bbd089c5 100644
--- a/translations/desktop_files/kcontrol-color-schemes/tt.po
+++ b/translations/desktop_files/kcontrol-color-schemes/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Qabaq"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Qoyaşlı"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Kisken Aq"
diff --git a/translations/desktop_files/kcontrol-color-schemes/uk.po b/translations/desktop_files/kcontrol-color-schemes/uk.po
index df24055d9..f257c3746 100644
--- a/translations/desktop_files/kcontrol-color-schemes/uk.po
+++ b/translations/desktop_files/kcontrol-color-schemes/uk.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Roman Savochenko <roman@oscada.org>, 2020.
+# Roman Savochenko <roman@oscada.org>, 2020, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
-"PO-Revision-Date: 2020-07-21 05:23+0000\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"PO-Revision-Date: 2024-03-29 18:40+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/color-schemes/uk/>\n"
@@ -14,9 +14,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -64,6 +64,11 @@ msgid "EveX"
 msgstr "EveX"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr "Людина"
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Білий Керамік"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr "Last.fm"
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr "Ящірка"
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Медіа Пер�ик"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr "Пла�тик"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr "Платина"
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Пойнт-Рейе� Зелений"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Гарбузовий"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr "Сиена"
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solaris"
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Си�тема"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr "WedgieWeb"
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Ви�ококонтра�тний білий тек�т"
diff --git a/translations/desktop_files/kcontrol-color-schemes/uz.po b/translations/desktop_files/kcontrol-color-schemes/uz.po
index 1905012f7..dc8dffc37 100644
--- a/translations/desktop_files/kcontrol-color-schemes/uz.po
+++ b/translations/desktop_files/kcontrol-color-schemes/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Oq keramika"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Shaftoli"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Qovoq"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Tizim"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Yuqori kontrastli oq matn"
diff --git a/translations/desktop_files/kcontrol-color-schemes/uz@cyrillic.po b/translations/desktop_files/kcontrol-color-schemes/uz@cyrillic.po
index 9abbb4b92..e4d87fdef 100644
--- a/translations/desktop_files/kcontrol-color-schemes/uz@cyrillic.po
+++ b/translations/desktop_files/kcontrol-color-schemes/uz@cyrillic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Оқ керамика"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Шафтоли"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Пла�тик"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Қовоқ"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Тизим"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Юқори контра�тли оқ матн"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ven.po b/translations/desktop_files/kcontrol-color-schemes/ven.po
index 6ca5eac44..8d5780701 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ven.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Beregisi Zwimvumvusi"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Kha Muvhala mudala"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Fhuri"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solarisi"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Maitele"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/vi.po b/translations/desktop_files/kcontrol-color-schemes/vi.po
index c73a04a95..76b8749cc 100644
--- a/translations/desktop_files/kcontrol-color-schemes/vi.po
+++ b/translations/desktop_files/kcontrol-color-schemes/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Gốm trắng"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Hồng đào"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Chất dẻo"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Màu xanh Point Reyes"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Bí đ�"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Hệ thống"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Chữ trắng trên n�n đen"
diff --git a/translations/desktop_files/kcontrol-color-schemes/wa.po b/translations/desktop_files/kcontrol-color-schemes/wa.po
index 8cf74e85a..af4568fc5 100644
--- a/translations/desktop_files/kcontrol-color-schemes/wa.po
+++ b/translations/desktop_files/kcontrol-color-schemes/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Blanc Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Petche media"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Vert Point Reyes"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Potiron"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Sistinme"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Blanc so noer"
diff --git a/translations/desktop_files/kcontrol-color-schemes/xh.po b/translations/desktop_files/kcontrol-color-schemes/xh.po
index 1ea48e079..3e97b2a5a 100644
--- a/translations/desktop_files/kcontrol-color-schemes/xh.po
+++ b/translations/desktop_files/kcontrol-color-schemes/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik Emhlophe"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Peach Esesiphakathini"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes Green (okwengca)"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Ithanga"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Isikhanyiso esenziwa lilanga"
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Indlela esestyenziswayo"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/zh_CN.po b/translations/desktop_files/kcontrol-color-schemes/zh_CN.po
index af876077b..b04e875d6 100644
--- a/translations/desktop_files/kcontrol-color-schemes/zh_CN.po
+++ b/translations/desktop_files/kcontrol-color-schemes/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik 白"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Media 桃色"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr "å¡‘æ–™"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "�瓜黄"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "系统"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "高对比度白色文字"
diff --git a/translations/desktop_files/kcontrol-color-schemes/zh_TW.po b/translations/desktop_files/kcontrol-color-schemes/zh_TW.po
index dfc13d669..09d238def 100644
--- a/translations/desktop_files/kcontrol-color-schemes/zh_TW.po
+++ b/translations/desktop_files/kcontrol-color-schemes/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik 白"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Media 桃紅"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes 綠"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "�瓜黃"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "系統"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "高�比�白文字"
diff --git a/translations/desktop_files/kcontrol-color-schemes/zu.po b/translations/desktop_files/kcontrol-color-schemes/zu.po
index 8f51abbd7..1a279b340 100644
--- a/translations/desktop_files/kcontrol-color-schemes/zu.po
+++ b/translations/desktop_files/kcontrol-color-schemes/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Okumhlophe kwe-Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Unozindaba osapetshisi"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Ithanga"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Isistimu"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/pl.po b/translations/desktop_files/kcontrol-desktops/pl.po
index 6ed1bb749..f6401a148 100644
--- a/translations/desktop_files/kcontrol-desktops/pl.po
+++ b/translations/desktop_files/kcontrol-desktops/pl.po
@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Jan Stolarek <jwstolarek@gmail.com>, 2020.
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2020-08-07 18:36+0000\n"
-"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"PO-Revision-Date: 2022-10-25 18:06+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
 "Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/kcontrol-desktop-files/pl/>\n"
 "Language: pl\n"
@@ -16,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: access/kaccess.desktop:3
@@ -1116,9 +1117,8 @@ msgstr ""
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:3
-#, fuzzy
 msgid "Technorati"
-msgstr "Znaczniki Technorati"
+msgstr "Technorati"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:6
diff --git a/translations/desktop_files/kcontrol-desktops/ru.po b/translations/desktop_files/kcontrol-desktops/ru.po
index a449cd4e3..932818c17 100644
--- a/translations/desktop_files/kcontrol-desktops/ru.po
+++ b/translations/desktop_files/kcontrol-desktops/ru.po
@@ -1,22 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Alexander Golubev <fatzer2@gmail.com>, 2021, 2022.
+# Alexander Golubev <fatzer2@gmail.com>, 2021, 2022, 2024.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2022-02-27 19:02+0000\n"
-"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"PO-Revision-Date: 2024-04-06 08:44+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/kcontrol-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.11\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: access/kaccess.desktop:3
@@ -231,7 +232,7 @@ msgstr ""
 #. Name
 #: crypto/crypto.desktop:10
 msgid "Crypto"
-msgstr "Криптографи�"
+msgstr "Шифрование"
 
 #. Comment
 #: crypto/crypto.desktop:12
@@ -288,7 +289,7 @@ msgstr "Конфигураци� �крана"
 #. Keywords
 #: displayconfig/displayconfig.desktop:16
 msgid "monitor;resolution;display;"
-msgstr ""
+msgstr "monitor;resolution;display;монитор;разрешение;ди�плей;"
 
 #. Name
 #: dnssd/kcm_tdednssd.desktop:18
@@ -1736,7 +1737,7 @@ msgstr ""
 #. Name
 #: konq/desktop.desktop:11
 msgid "Multiple Desktops"
-msgstr "Виртуальные рабочие �толы"
+msgstr "Вирт. рабочие �толы"
 
 #. Comment
 #: konq/desktop.desktop:13
diff --git a/translations/desktop_files/kdcop.desktop/ru.po b/translations/desktop_files/kdcop.desktop/ru.po
new file mode 100644
index 000000000..2e0368e5b
--- /dev/null
+++ b/translations/desktop_files/kdcop.desktop/ru.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-19 01:46+0200\n"
+"PO-Revision-Date: 2023-06-04 15:15+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdcop-kdcopdesktop/ru/>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: kdcop.desktop:11
+msgid "KDCOP"
+msgstr "KDCOP"
+
+#. GenericName
+#: kdcop.desktop:13
+msgid "DCOP browser"
+msgstr "Обозреватель DCOP"
diff --git a/translations/desktop_files/kdesktop-desktops/af.po b/translations/desktop_files/kdesktop-desktops/af.po
index 89e675fdb..f323c8795 100644
--- a/translations/desktop_files/kdesktop-desktops/af.po
+++ b/translations/desktop_files/kdesktop-desktops/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Gesentreer"
 msgid "Tiled"
 msgstr "Geteël"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Gesentreer"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Gesentreer"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Gesentreer"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ar.po b/translations/desktop_files/kdesktop-desktops/ar.po
index 68dd5c46c..9d339ac75 100644
--- a/translations/desktop_files/kdesktop-desktops/ar.po
+++ b/translations/desktop_files/kdesktop-desktops/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "مركز"
 msgid "Tiled"
 msgstr "مبلّط"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "مركز"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "مركز"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "مركز"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/az.po b/translations/desktop_files/kdesktop-desktops/az.po
index 6262ba0ef..c066f5cdd 100644
--- a/translations/desktop_files/kdesktop-desktops/az.po
+++ b/translations/desktop_files/kdesktop-desktops/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/be.po b/translations/desktop_files/kdesktop-desktops/be.po
index 48c98599c..6fd3fc657 100644
--- a/translations/desktop_files/kdesktop-desktops/be.po
+++ b/translations/desktop_files/kdesktop-desktops/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Па��р�дзіне"
 msgid "Tiled"
 msgstr "Ра�ц�гнутае"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Па��р�дзіне"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Па��р�дзіне"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Па��р�дзіне"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/bg.po b/translations/desktop_files/kdesktop-desktops/bg.po
index 0dc599966..6b07184a5 100644
--- a/translations/desktop_files/kdesktop-desktops/bg.po
+++ b/translations/desktop_files/kdesktop-desktops/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: 2020-07-21 05:23+0000\n"
 "Last-Translator: Emanoil Kotsev <deloptes@gmail.com>\n"
 "Language-Team: Bulgarian <https://mirror.git.trinitydesktop.org/weblate/"
@@ -37,6 +37,42 @@ msgstr "Центрирано"
 msgid "Tiled"
 msgstr "Ка�кадно"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Центрирано"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Центрирано"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Центрирано"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/bn.po b/translations/desktop_files/kdesktop-desktops/bn.po
index a76547a12..23aee2621 100644
--- a/translations/desktop_files/kdesktop-desktops/bn.po
+++ b/translations/desktop_files/kdesktop-desktops/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "মা�ামা�ি"
 msgid "Tiled"
 msgstr "টাইল করা"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "মা�ামা�ি"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "মা�ামা�ি"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "মা�ামা�ি"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/br.po b/translations/desktop_files/kdesktop-desktops/br.po
index e9dd7eeba..cbb55f6a0 100644
--- a/translations/desktop_files/kdesktop-desktops/br.po
+++ b/translations/desktop_files/kdesktop-desktops/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Kreizennet"
 msgid "Tiled"
 msgstr "Teolet"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Kreizennet"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Kreizennet"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Kreizennet"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/bs.po b/translations/desktop_files/kdesktop-desktops/bs.po
index 137091328..e1d9ba35c 100644
--- a/translations/desktop_files/kdesktop-desktops/bs.po
+++ b/translations/desktop_files/kdesktop-desktops/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Centrirano"
 msgid "Tiled"
 msgstr "Poplo�ano"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrirano"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrirano"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrirano"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ca.po b/translations/desktop_files/kdesktop-desktops/ca.po
index 5b98ee049..a4e9060f6 100644
--- a/translations/desktop_files/kdesktop-desktops/ca.po
+++ b/translations/desktop_files/kdesktop-desktops/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Centrat"
 msgid "Tiled"
 msgstr "Repetit"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/cs.po b/translations/desktop_files/kdesktop-desktops/cs.po
index 420047671..96194e583 100644
--- a/translations/desktop_files/kdesktop-desktops/cs.po
+++ b/translations/desktop_files/kdesktop-desktops/cs.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Slávek Banko <slavek.banko@axis.cz>, 2021.
+# Slávek Banko <slavek.banko@axis.cz>, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
-"PO-Revision-Date: 2021-08-26 22:14+0000\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
+"PO-Revision-Date: 2022-07-19 22:46+0000\n"
 "Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
 "Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
 "tdebase/kdesktop-desktop-files/cs/>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.8\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: kdesktop.desktop.cmake:10
@@ -37,6 +37,36 @@ msgstr "Na střed"
 msgid "Tiled"
 msgstr "Dlaždice"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr "Vydlážděné centrovaně"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr "Centrované s maximálním poměrem stran"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr "Vydlážděné s maximálním poměrem stran"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr "Zvětšené"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr "Centrované, automatická změna velikosti"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr "Zvětšené a oříznuté"
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/csb.po b/translations/desktop_files/kdesktop-desktops/csb.po
index 41f67a17e..27c6ca0c7 100644
--- a/translations/desktop_files/kdesktop-desktops/csb.po
+++ b/translations/desktop_files/kdesktop-desktops/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Na westrzódkù"
 msgid "Tiled"
 msgstr "Kachelkòwóné"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Na westrzódkù"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Na westrzódkù"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Na westrzódkù"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/cy.po b/translations/desktop_files/kdesktop-desktops/cy.po
index ed6f7e6a5..ec30d6847 100644
--- a/translations/desktop_files/kdesktop-desktops/cy.po
+++ b/translations/desktop_files/kdesktop-desktops/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Canoledig"
 msgid "Tiled"
 msgstr "Teiledig"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Canoledig"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Canoledig"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Canoledig"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/da.po b/translations/desktop_files/kdesktop-desktops/da.po
index da5b5fa36..9ffdee013 100644
--- a/translations/desktop_files/kdesktop-desktops/da.po
+++ b/translations/desktop_files/kdesktop-desktops/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Centreret"
 msgid "Tiled"
 msgstr "Fliselagt"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centreret"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centreret"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centreret"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/de.po b/translations/desktop_files/kdesktop-desktops/de.po
index 039098ec3..bd46d1420 100644
--- a/translations/desktop_files/kdesktop-desktops/de.po
+++ b/translations/desktop_files/kdesktop-desktops/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Zentriert"
 msgid "Tiled"
 msgstr "Gekachelt"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Zentriert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Zentriert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Zentriert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/el.po b/translations/desktop_files/kdesktop-desktops/el.po
index b7bd3ba9f..365657e0e 100644
--- a/translations/desktop_files/kdesktop-desktops/el.po
+++ b/translations/desktop_files/kdesktop-desktops/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Κεντ�ά�ισμα"
 msgid "Tiled"
 msgstr "Σε πα�άθεση"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Κεντ�ά�ισμα"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Κεντ�ά�ισμα"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Κεντ�ά�ισμα"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/en_GB.po b/translations/desktop_files/kdesktop-desktops/en_GB.po
index 075fc122c..30b8f346f 100644
--- a/translations/desktop_files/kdesktop-desktops/en_GB.po
+++ b/translations/desktop_files/kdesktop-desktops/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Centred"
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centred"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centred"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centred"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/eo.po b/translations/desktop_files/kdesktop-desktops/eo.po
index daf4f8b3e..07a6c2546 100644
--- a/translations/desktop_files/kdesktop-desktops/eo.po
+++ b/translations/desktop_files/kdesktop-desktops/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Meza"
 msgid "Tiled"
 msgstr "kahela"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Meza"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Meza"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Meza"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/es.po b/translations/desktop_files/kdesktop-desktops/es.po
index e40d00ee1..e34374acf 100644
--- a/translations/desktop_files/kdesktop-desktops/es.po
+++ b/translations/desktop_files/kdesktop-desktops/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Centrado"
 msgid "Tiled"
 msgstr "Mosaico"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/et.po b/translations/desktop_files/kdesktop-desktops/et.po
index 863aa1f2c..8b787d74f 100644
--- a/translations/desktop_files/kdesktop-desktops/et.po
+++ b/translations/desktop_files/kdesktop-desktops/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Tsentreeritud"
 msgid "Tiled"
 msgstr "Paanidena"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Tsentreeritud"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Tsentreeritud"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Tsentreeritud"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/eu.po b/translations/desktop_files/kdesktop-desktops/eu.po
index 03a058b77..aa8c65fe2 100644
--- a/translations/desktop_files/kdesktop-desktops/eu.po
+++ b/translations/desktop_files/kdesktop-desktops/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Erdiratua"
 msgid "Tiled"
 msgstr "Mosaikoa"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Erdiratua"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Erdiratua"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Erdiratua"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/fa.po b/translations/desktop_files/kdesktop-desktops/fa.po
index c495a80b7..8d8b77a50 100644
--- a/translations/desktop_files/kdesktop-desktops/fa.po
+++ b/translations/desktop_files/kdesktop-desktops/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "مرکزی"
 msgid "Tiled"
 msgstr "کاشی‌شده"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "مرکزی"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "مرکزی"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "مرکزی"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/fi.po b/translations/desktop_files/kdesktop-desktops/fi.po
index c4d34829e..bc674459d 100644
--- a/translations/desktop_files/kdesktop-desktops/fi.po
+++ b/translations/desktop_files/kdesktop-desktops/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Keskitetty"
 msgid "Tiled"
 msgstr "Vierekkäin"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Keskitetty"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Keskitetty"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Keskitetty"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/fr.po b/translations/desktop_files/kdesktop-desktops/fr.po
index 504d5b0e0..1d410ee87 100644
--- a/translations/desktop_files/kdesktop-desktops/fr.po
+++ b/translations/desktop_files/kdesktop-desktops/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Centré"
 msgid "Tiled"
 msgstr "Mosaïque"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centré"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centré"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centré"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/fy.po b/translations/desktop_files/kdesktop-desktops/fy.po
index d0f5409ae..96f8aa7b8 100644
--- a/translations/desktop_files/kdesktop-desktops/fy.po
+++ b/translations/desktop_files/kdesktop-desktops/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "sintraal setten"
 msgid "Tiled"
 msgstr "Tegele"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "sintraal setten"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "sintraal setten"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "sintraal setten"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ga.po b/translations/desktop_files/kdesktop-desktops/ga.po
index f0b82aef6..ecf3e8a22 100644
--- a/translations/desktop_files/kdesktop-desktops/ga.po
+++ b/translations/desktop_files/kdesktop-desktops/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Láraithe"
 msgid "Tiled"
 msgstr "Tilithe"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Láraithe"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Láraithe"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Láraithe"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 #, fuzzy
diff --git a/translations/desktop_files/kdesktop-desktops/gl.po b/translations/desktop_files/kdesktop-desktops/gl.po
index b3ee5fd7f..f38132fde 100644
--- a/translations/desktop_files/kdesktop-desktops/gl.po
+++ b/translations/desktop_files/kdesktop-desktops/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Centrado"
 msgid "Tiled"
 msgstr "Mosaico"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/he.po b/translations/desktop_files/kdesktop-desktops/he.po
index 5c840d729..f8531cf1f 100644
--- a/translations/desktop_files/kdesktop-desktops/he.po
+++ b/translations/desktop_files/kdesktop-desktops/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "ממורכז"
 msgid "Tiled"
 msgstr "פרוש"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "ממורכז"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "ממורכז"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "ממורכז"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/hi.po b/translations/desktop_files/kdesktop-desktops/hi.po
index cdb6ab06d..b7eea64e0 100644
--- a/translations/desktop_files/kdesktop-desktops/hi.po
+++ b/translations/desktop_files/kdesktop-desktops/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "बीचों-बीच"
 msgid "Tiled"
 msgstr "चटाई-दार"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "बीचों-बीच"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "बीचों-बीच"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "बीचों-बीच"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/hr.po b/translations/desktop_files/kdesktop-desktops/hr.po
index a91411d6d..3846d2813 100644
--- a/translations/desktop_files/kdesktop-desktops/hr.po
+++ b/translations/desktop_files/kdesktop-desktops/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Sredinom"
 msgid "Tiled"
 msgstr "Poplo�eno"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Sredinom"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Sredinom"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Sredinom"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/hu.po b/translations/desktop_files/kdesktop-desktops/hu.po
index 4003e604a..77551f5d2 100644
--- a/translations/desktop_files/kdesktop-desktops/hu.po
+++ b/translations/desktop_files/kdesktop-desktops/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Középre igazítva"
 msgid "Tiled"
 msgstr "Mozaikszerűen"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Középre igazítva"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Középre igazítva"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Középre igazítva"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/id.po b/translations/desktop_files/kdesktop-desktops/id.po
index 5817c8daf..a21b4511b 100644
--- a/translations/desktop_files/kdesktop-desktops/id.po
+++ b/translations/desktop_files/kdesktop-desktops/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/is.po b/translations/desktop_files/kdesktop-desktops/is.po
index 82d861443..a670c8c64 100644
--- a/translations/desktop_files/kdesktop-desktops/is.po
+++ b/translations/desktop_files/kdesktop-desktops/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Miðjað"
 msgid "Tiled"
 msgstr "Flísað"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Miðjað"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Miðjað"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Miðjað"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/it.po b/translations/desktop_files/kdesktop-desktops/it.po
index c5419d0ab..ed6231a6e 100644
--- a/translations/desktop_files/kdesktop-desktops/it.po
+++ b/translations/desktop_files/kdesktop-desktops/it.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
-"PO-Revision-Date: 2022-01-09 06:00+0000\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
+"PO-Revision-Date: 2022-07-19 22:46+0000\n"
 "Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
 "Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/kdesktop-desktop-files/it/>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.10.1\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: kdesktop.desktop.cmake:10
@@ -37,6 +37,36 @@ msgstr "Centrato"
 msgid "Tiled"
 msgstr "Ripetuto"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr "Centrato e ripetuto"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr "Centrato e massimizzato"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr "Ripetuto e massimizzato"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr "Scalato"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr "Centrato con adattamento automatico"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr "Ridimensiona e ritaglia"
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ja.po b/translations/desktop_files/kdesktop-desktops/ja.po
index e23f9d01c..66b4947cf 100644
--- a/translations/desktop_files/kdesktop-desktops/ja.po
+++ b/translations/desktop_files/kdesktop-desktops/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "中央"
 msgid "Tiled"
 msgstr "タイル状"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "中央"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "中央"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "中央"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ka.po b/translations/desktop_files/kdesktop-desktops/ka.po
index 3737a95d6..fac448dee 100644
--- a/translations/desktop_files/kdesktop-desktops/ka.po
+++ b/translations/desktop_files/kdesktop-desktops/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "ცენტრზე"
 msgid "Tiled"
 msgstr "მ�ზ�იკ�"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "ცენტრზე"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "ცენტრზე"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "ცენტრზე"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/kdesktop-desktops.pot b/translations/desktop_files/kdesktop-desktops/kdesktop-desktops.pot
index cb4ff5160..4c9b3d717 100644
--- a/translations/desktop_files/kdesktop-desktops/kdesktop-desktops.pot
+++ b/translations/desktop_files/kdesktop-desktops/kdesktop-desktops.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/kk.po b/translations/desktop_files/kdesktop-desktops/kk.po
index da269a7e7..78c6ae8dc 100644
--- a/translations/desktop_files/kdesktop-desktops/kk.po
+++ b/translations/desktop_files/kdesktop-desktops/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Ортаға"
 msgid "Tiled"
 msgstr "Қатарлап"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Ортаға"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Ортаға"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Ортаға"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 #, fuzzy
diff --git a/translations/desktop_files/kdesktop-desktops/km.po b/translations/desktop_files/kdesktop-desktops/km.po
index 9220e9036..ae10bbf6a 100644
--- a/translations/desktop_files/kdesktop-desktops/km.po
+++ b/translations/desktop_files/kdesktop-desktops/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "កណ្ដាល"
 msgid "Tiled"
 msgstr "ក្បឿង"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "កណ្ដាល"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "កណ្ដាល"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "កណ្ដាល"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ko.po b/translations/desktop_files/kdesktop-desktops/ko.po
index 6bfc7ecb4..d4101c063 100644
--- a/translations/desktop_files/kdesktop-desktops/ko.po
+++ b/translations/desktop_files/kdesktop-desktops/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 #, fuzzy
diff --git a/translations/desktop_files/kdesktop-desktops/lo.po b/translations/desktop_files/kdesktop-desktops/lo.po
index 62451dbbb..ba98d93e4 100644
--- a/translations/desktop_files/kdesktop-desktops/lo.po
+++ b/translations/desktop_files/kdesktop-desktops/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/lt.po b/translations/desktop_files/kdesktop-desktops/lt.po
index 9798693be..cd33d3f47 100644
--- a/translations/desktop_files/kdesktop-desktops/lt.po
+++ b/translations/desktop_files/kdesktop-desktops/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Centruota"
 msgid "Tiled"
 msgstr "IÅ¡kloti"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centruota"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centruota"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centruota"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/lv.po b/translations/desktop_files/kdesktop-desktops/lv.po
index 1c69c3b24..045a6998e 100644
--- a/translations/desktop_files/kdesktop-desktops/lv.po
+++ b/translations/desktop_files/kdesktop-desktops/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Centrēts"
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrēts"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrēts"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrēts"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/mk.po b/translations/desktop_files/kdesktop-desktops/mk.po
index 793bb5e4f..daa80bbf8 100644
--- a/translations/desktop_files/kdesktop-desktops/mk.po
+++ b/translations/desktop_files/kdesktop-desktops/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Центриран"
 msgid "Tiled"
 msgstr "Поплочен"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Центриран"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Центриран"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Центриран"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/mn.po b/translations/desktop_files/kdesktop-desktops/mn.po
index f2483a874..45fa0fa6f 100644
--- a/translations/desktop_files/kdesktop-desktops/mn.po
+++ b/translations/desktop_files/kdesktop-desktops/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ms.po b/translations/desktop_files/kdesktop-desktops/ms.po
index 28fc5865f..d957c51ad 100644
--- a/translations/desktop_files/kdesktop-desktops/ms.po
+++ b/translations/desktop_files/kdesktop-desktops/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Tengah"
 msgid "Tiled"
 msgstr "Berjubin"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Tengah"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Tengah"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Tengah"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/mt.po b/translations/desktop_files/kdesktop-desktops/mt.po
index 8cd3e5cce..f9dac9417 100644
--- a/translations/desktop_files/kdesktop-desktops/mt.po
+++ b/translations/desktop_files/kdesktop-desktops/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "IÄ‹Ä‹entrat"
 msgid "Tiled"
 msgstr "Madum"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "IÄ‹Ä‹entrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "IÄ‹Ä‹entrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "IÄ‹Ä‹entrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/nb.po b/translations/desktop_files/kdesktop-desktops/nb.po
index 2dba26920..978141614 100644
--- a/translations/desktop_files/kdesktop-desktops/nb.po
+++ b/translations/desktop_files/kdesktop-desktops/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Sentrert"
 msgid "Tiled"
 msgstr "Flislagt"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Sentrert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Sentrert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Sentrert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/nds.po b/translations/desktop_files/kdesktop-desktops/nds.po
index 4e0cf3e42..467b0c9e0 100644
--- a/translations/desktop_files/kdesktop-desktops/nds.po
+++ b/translations/desktop_files/kdesktop-desktops/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "In de Merrn"
 msgid "Tiled"
 msgstr "Kachelt"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "In de Merrn"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "In de Merrn"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "In de Merrn"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ne.po b/translations/desktop_files/kdesktop-desktops/ne.po
index b258b3ac4..655dbced9 100644
--- a/translations/desktop_files/kdesktop-desktops/ne.po
+++ b/translations/desktop_files/kdesktop-desktops/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "केन�द�रित"
 msgid "Tiled"
 msgstr "टायल गरि�को"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "केन�द�रित"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "केन�द�रित"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "केन�द�रित"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/nl.po b/translations/desktop_files/kdesktop-desktops/nl.po
index a09a4933b..37560a7de 100644
--- a/translations/desktop_files/kdesktop-desktops/nl.po
+++ b/translations/desktop_files/kdesktop-desktops/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Gecentreerd"
 msgid "Tiled"
 msgstr "Tegels"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Gecentreerd"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Gecentreerd"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Gecentreerd"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/nn.po b/translations/desktop_files/kdesktop-desktops/nn.po
index 36cf6fe41..8c8d4bd9c 100644
--- a/translations/desktop_files/kdesktop-desktops/nn.po
+++ b/translations/desktop_files/kdesktop-desktops/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Sentrert"
 msgid "Tiled"
 msgstr "Jamsides"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Sentrert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Sentrert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Sentrert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/nso.po b/translations/desktop_files/kdesktop-desktops/nso.po
index 80ef8813a..d00d58f20 100644
--- a/translations/desktop_files/kdesktop-desktops/nso.po
+++ b/translations/desktop_files/kdesktop-desktops/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/oc.po b/translations/desktop_files/kdesktop-desktops/oc.po
index 96e436a9e..91c11d08c 100644
--- a/translations/desktop_files/kdesktop-desktops/oc.po
+++ b/translations/desktop_files/kdesktop-desktops/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,6 +37,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/pa.po b/translations/desktop_files/kdesktop-desktops/pa.po
index 2a4a8001e..36f86738d 100644
--- a/translations/desktop_files/kdesktop-desktops/pa.po
+++ b/translations/desktop_files/kdesktop-desktops/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "ਕੇਂਦਰੀ"
 msgid "Tiled"
 msgstr "ਤਣਿਆ"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "ਕੇਂਦਰੀ"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "ਕੇਂਦਰੀ"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "ਕੇਂਦਰੀ"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/pl.po b/translations/desktop_files/kdesktop-desktops/pl.po
index 51aacb7c8..0eef8d8cd 100644
--- a/translations/desktop_files/kdesktop-desktops/pl.po
+++ b/translations/desktop_files/kdesktop-desktops/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
+"PO-Revision-Date: 2022-10-25 18:06+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdesktop-desktop-files/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: kdesktop.desktop.cmake:10
@@ -36,6 +38,36 @@ msgstr "Wyśrodkowane"
 msgid "Tiled"
 msgstr "Kafelkowane"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr "Wyśrodkowane"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr "Wyśrodkowane zmaksymalizowane"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr "Kafelkowanie zmaksymalizowane"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr "Skalowanie"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr "Wyśrodkowane, automatyczne dopasowanie"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr "Skalowanie z przycięciem"
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/pt.po b/translations/desktop_files/kdesktop-desktops/pt.po
index b0e75f71d..1a0da521c 100644
--- a/translations/desktop_files/kdesktop-desktops/pt.po
+++ b/translations/desktop_files/kdesktop-desktops/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Centrado"
 msgid "Tiled"
 msgstr "Mosaico"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/pt_BR.po b/translations/desktop_files/kdesktop-desktops/pt_BR.po
index 174ed770a..53afbd72b 100644
--- a/translations/desktop_files/kdesktop-desktops/pt_BR.po
+++ b/translations/desktop_files/kdesktop-desktops/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Centralizado"
 msgid "Tiled"
 msgstr "Ladrilhado"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centralizado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centralizado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centralizado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ro.po b/translations/desktop_files/kdesktop-desktops/ro.po
index 8cec4fd5b..518e442b4 100644
--- a/translations/desktop_files/kdesktop-desktops/ro.po
+++ b/translations/desktop_files/kdesktop-desktops/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Centrat"
 msgid "Tiled"
 msgstr "Mozaic"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ru.po b/translations/desktop_files/kdesktop-desktops/ru.po
index ca866c47f..b33d9084d 100644
--- a/translations/desktop_files/kdesktop-desktops/ru.po
+++ b/translations/desktop_files/kdesktop-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
+"PO-Revision-Date: 2024-04-06 08:44+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdesktop-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kdesktop.desktop.cmake:10
@@ -36,11 +38,40 @@ msgstr "По центру"
 msgid "Tiled"
 msgstr "Черепицей"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr "По центру черепицей"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr "По центру пропорционально"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr "Черепицей пропорционально"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr "Ра�т�нуть"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr "�втозаполнение по центру"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr "Ма�штабирование � кадрированием"
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
-#, fuzzy
 msgid "TDE Web Desktop"
-msgstr "Рабочий �тол TDE"
+msgstr "Рабочий веб-�тол TDE"
 
 #. Comment
 #: patterns/fish.desktop:2
@@ -65,7 +96,7 @@ msgstr "Мо�това�"
 #. Comment
 #: patterns/rattan.desktop:2
 msgid "Rattan"
-msgstr ""
+msgstr "Rattan"
 
 #. Comment
 #: patterns/stonewall2.desktop:2
diff --git a/translations/desktop_files/kdesktop-desktops/rw.po b/translations/desktop_files/kdesktop-desktops/rw.po
index d302d336e..545d21010 100644
--- a/translations/desktop_files/kdesktop-desktops/rw.po
+++ b/translations/desktop_files/kdesktop-desktops/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Biri hagati"
 msgid "Tiled"
 msgstr "Byudukaro"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Biri hagati"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Biri hagati"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Biri hagati"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/se.po b/translations/desktop_files/kdesktop-desktops/se.po
index 2795989b0..1447f6f0a 100644
--- a/translations/desktop_files/kdesktop-desktops/se.po
+++ b/translations/desktop_files/kdesktop-desktops/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Guovdut"
 msgid "Tiled"
 msgstr "Bálddalaga"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Guovdut"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Guovdut"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Guovdut"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/sk.po b/translations/desktop_files/kdesktop-desktops/sk.po
index 2d89670ca..748614f33 100644
--- a/translations/desktop_files/kdesktop-desktops/sk.po
+++ b/translations/desktop_files/kdesktop-desktops/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "V strede"
 msgid "Tiled"
 msgstr "Dlaždice"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "V strede"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "V strede"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "V strede"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/sl.po b/translations/desktop_files/kdesktop-desktops/sl.po
index 9909a48f6..f0972cb62 100644
--- a/translations/desktop_files/kdesktop-desktops/sl.po
+++ b/translations/desktop_files/kdesktop-desktops/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Usrediš�eno"
 msgid "Tiled"
 msgstr "Razdeljeno"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Usrediš�eno"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Usrediš�eno"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Usrediš�eno"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/sr.po b/translations/desktop_files/kdesktop-desktops/sr.po
index e4d65bd53..78b393a40 100644
--- a/translations/desktop_files/kdesktop-desktops/sr.po
+++ b/translations/desktop_files/kdesktop-desktops/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Центрирано"
 msgid "Tiled"
 msgstr "Поређано"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Центрирано"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Центрирано"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Центрирано"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/sr@Latn.po b/translations/desktop_files/kdesktop-desktops/sr@Latn.po
index 5937a3aa5..6100318d9 100644
--- a/translations/desktop_files/kdesktop-desktops/sr@Latn.po
+++ b/translations/desktop_files/kdesktop-desktops/sr@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Centrirano"
 msgid "Tiled"
 msgstr "Poređano"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrirano"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrirano"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrirano"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ss.po b/translations/desktop_files/kdesktop-desktops/ss.po
index 9535bce9c..01bb77f00 100644
--- a/translations/desktop_files/kdesktop-desktops/ss.po
+++ b/translations/desktop_files/kdesktop-desktops/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/sv.po b/translations/desktop_files/kdesktop-desktops/sv.po
index ca5569613..5fa43b9c1 100644
--- a/translations/desktop_files/kdesktop-desktops/sv.po
+++ b/translations/desktop_files/kdesktop-desktops/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Centrerad"
 msgid "Tiled"
 msgstr "Sida vid sida"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrerad"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrerad"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrerad"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ta.po b/translations/desktop_files/kdesktop-desktops/ta.po
index a5e34e1e8..4124f9273 100644
--- a/translations/desktop_files/kdesktop-desktops/ta.po
+++ b/translations/desktop_files/kdesktop-desktops/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "மைய"
 msgid "Tiled"
 msgstr "பிண�ணனி"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "மைய"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "மைய"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "மைய"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/te.po b/translations/desktop_files/kdesktop-desktops/te.po
index 42f1d00fc..0cf8796e6 100644
--- a/translations/desktop_files/kdesktop-desktops/te.po
+++ b/translations/desktop_files/kdesktop-desktops/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "మద�యన"
 msgid "Tiled"
 msgstr "పలకల�గా"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "మద�యన"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "మద�యన"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "మద�యన"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/tg.po b/translations/desktop_files/kdesktop-desktops/tg.po
index be0a5f249..c4033dfd7 100644
--- a/translations/desktop_files/kdesktop-desktops/tg.po
+++ b/translations/desktop_files/kdesktop-desktops/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Марказӣ"
 msgid "Tiled"
 msgstr "Тахта�ангӣ"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Марказӣ"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Марказӣ"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Марказӣ"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/th.po b/translations/desktop_files/kdesktop-desktops/th.po
index 76f3d1f34..4ad9dff41 100644
--- a/translations/desktop_files/kdesktop-desktops/th.po
+++ b/translations/desktop_files/kdesktop-desktops/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "จัด�ลาง"
 msgid "Tiled"
 msgstr "ปูทั้งหน้าจอ"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "จัด�ลาง"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "จัด�ลาง"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "จัด�ลาง"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/tr.po b/translations/desktop_files/kdesktop-desktops/tr.po
index 69c8fb166..5261e2a0f 100644
--- a/translations/desktop_files/kdesktop-desktops/tr.po
+++ b/translations/desktop_files/kdesktop-desktops/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Uzat"
 msgid "Tiled"
 msgstr "Sırala"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Uzat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Uzat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Uzat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/tt.po b/translations/desktop_files/kdesktop-desktops/tt.po
index d7e0d319e..96738c811 100644
--- a/translations/desktop_files/kdesktop-desktops/tt.po
+++ b/translations/desktop_files/kdesktop-desktops/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Üzäkläşep"
 msgid "Tiled"
 msgstr "Bülengän"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Üzäkläşep"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Üzäkläşep"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Üzäkläşep"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/uk.po b/translations/desktop_files/kdesktop-desktops/uk.po
index 57f20a554..b289cf396 100644
--- a/translations/desktop_files/kdesktop-desktops/uk.po
+++ b/translations/desktop_files/kdesktop-desktops/uk.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Roman Savochenko <roman@oscada.org>, 2020.
+# Roman Savochenko <roman@oscada.org>, 2020, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
-"PO-Revision-Date: 2020-07-21 05:23+0000\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
+"PO-Revision-Date: 2022-10-18 19:56+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/kdesktop-desktop-files/uk/>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: kdesktop.desktop.cmake:10
@@ -38,6 +38,36 @@ msgstr "По центру"
 msgid "Tiled"
 msgstr "Плиткою"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr "По центру Плиткою"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr "По центру Maxpect"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr "Плиткою Maxpect"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr "Ма�штабовано"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr "По центру �вто Підлашт."
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr "Ма�штаб & Кадруванн�"
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/uz.po b/translations/desktop_files/kdesktop-desktops/uz.po
index 2f694c68d..ac3ad01fc 100644
--- a/translations/desktop_files/kdesktop-desktops/uz.po
+++ b/translations/desktop_files/kdesktop-desktops/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Markazda"
 msgid "Tiled"
 msgstr "Kafel"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Markazda"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Markazda"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Markazda"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/uz@cyrillic.po b/translations/desktop_files/kdesktop-desktops/uz@cyrillic.po
index 0f77465e7..398c85050 100644
--- a/translations/desktop_files/kdesktop-desktops/uz@cyrillic.po
+++ b/translations/desktop_files/kdesktop-desktops/uz@cyrillic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Марказда"
 msgid "Tiled"
 msgstr "Кафель"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Марказда"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Марказда"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Марказда"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ven.po b/translations/desktop_files/kdesktop-desktops/ven.po
index 6035bff68..d52eebe8e 100644
--- a/translations/desktop_files/kdesktop-desktops/ven.po
+++ b/translations/desktop_files/kdesktop-desktops/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/vi.po b/translations/desktop_files/kdesktop-desktops/vi.po
index 51d612785..845943e9d 100644
--- a/translations/desktop_files/kdesktop-desktops/vi.po
+++ b/translations/desktop_files/kdesktop-desktops/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Giữa"
 msgid "Tiled"
 msgstr "Xếp ngói"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Giữa"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Giữa"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Giữa"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/wa.po b/translations/desktop_files/kdesktop-desktops/wa.po
index 9d43400cd..66c437a4d 100644
--- a/translations/desktop_files/kdesktop-desktops/wa.po
+++ b/translations/desktop_files/kdesktop-desktops/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "Ã… mitan"
 msgid "Tiled"
 msgstr "A schaeyes"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Ã… mitan"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Ã… mitan"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Ã… mitan"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/xh.po b/translations/desktop_files/kdesktop-desktops/xh.po
index ab5e291df..1762e3284 100644
--- a/translations/desktop_files/kdesktop-desktops/xh.po
+++ b/translations/desktop_files/kdesktop-desktops/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/zh_CN.po b/translations/desktop_files/kdesktop-desktops/zh_CN.po
index fe3a7b929..09990246d 100644
--- a/translations/desktop_files/kdesktop-desktops/zh_CN.po
+++ b/translations/desktop_files/kdesktop-desktops/zh_CN.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Wantao Liu <vantao@aosc.io>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
+"PO-Revision-Date: 2023-08-23 07:29+0000\n"
+"Last-Translator: Wantao Liu <vantao@aosc.io>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kdesktop-desktop-files/zh_Hans/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kdesktop.desktop.cmake:10
@@ -36,10 +37,40 @@ msgstr "居中"
 msgid "Tiled"
 msgstr "平铺"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr "居中并平铺 (Center Tiled)"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr "居中并按比例最大化 (Centered Maxpect)"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr "平铺并按比例最大化 (Tiled Maxpect)"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr "拉伸"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr "自适应居中"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr "缩放 & �剪"
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
-msgstr "TDE Web 桌�"
+msgstr "TDE 网站桌�"
 
 #. Comment
 #: patterns/fish.desktop:2
@@ -49,17 +80,17 @@ msgstr "渔网"
 #. Comment
 #: patterns/flowers.desktop:2
 msgid "Flowers"
-msgstr "花"
+msgstr "�花"
 
 #. Comment
 #: patterns/night-rock.desktop:2
 msgid "Night Rock by Tigert"
-msgstr "Tigert 的夜色中的岩石"
+msgstr "夜色中的岩石（创作者：Tigert）"
 
 #. Comment
 #: patterns/pavement.desktop:2
 msgid "Pavement"
-msgstr "人行�"
+msgstr "è¡—ç –"
 
 #. Comment
 #: patterns/rattan.desktop:2
@@ -69,7 +100,7 @@ msgstr "藤�"
 #. Comment
 #: patterns/stonewall2.desktop:2
 msgid "Stonewall 2 by Tigert"
-msgstr "Tigert 的石墙 2"
+msgstr "石墙 2（创作者：Tigert）"
 
 #. Comment
 #: patterns/triangles.desktop:2
@@ -79,14 +110,14 @@ msgstr "三角形"
 #. Comment
 #: programs/xearth.desktop:2
 msgid "XEarth by Kirk Johnson"
-msgstr "Kirk Johnson çš„ XEarth"
+msgstr "XEarth（创作者：Kirk Johnson）"
 
 #. Comment
 #: programs/xglobe.desktop:2
 msgid "XGlobe by Thorsten Scheuermann"
-msgstr "Thorsten Scheuermann çš„ XGlobe"
+msgstr "XGlobe（创作者：Thorsten Scheuermann）"
 
 #. Comment
 #: programs/xplanet.desktop:2
 msgid "XPlanet by Hari Nair"
-msgstr "Hari Nair çš„ XPlanet"
+msgstr "XPlanet（创作者：Hari Nair）"
diff --git a/translations/desktop_files/kdesktop-desktops/zh_TW.po b/translations/desktop_files/kdesktop-desktops/zh_TW.po
index 02317fcbb..91b76cef6 100644
--- a/translations/desktop_files/kdesktop-desktops/zh_TW.po
+++ b/translations/desktop_files/kdesktop-desktops/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,42 @@ msgstr "置中"
 msgid "Tiled"
 msgstr "拼貼"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "置中"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "置中"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "置中"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/zu.po b/translations/desktop_files/kdesktop-desktops/zu.po
index d9cd65d34..dea6a315b 100644
--- a/translations/desktop_files/kdesktop-desktops/zu.po
+++ b/translations/desktop_files/kdesktop-desktops/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-icons/el.po b/translations/desktop_files/kdesktop-icons/el.po
index c59ddb7f3..e45cfa072 100644
--- a/translations/desktop_files/kdesktop-icons/el.po
+++ b/translations/desktop_files/kdesktop-icons/el.po
@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # blu.256 <mavridisf@gmail.com>, 2021.
+# "blu.256" <mavridisf@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2021-06-18 12:07+0000\n"
-"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"PO-Revision-Date: 2023-10-30 19:13+0000\n"
+"Last-Translator: \"blu.256\" <mavridisf@gmail.com>\n"
 "Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
 "tdebase/kdesktop-icons/el/>\n"
 "Language: el\n"
@@ -15,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.6.2\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Home.desktop:2
@@ -35,7 +36,7 @@ msgstr "Πε�ιέχει π�οσωπικά α�χεία"
 #. Name
 #: My_Computer:5
 msgid "My Computer"
-msgstr "Ο υπολογιστής μου"
+msgstr "Υπολογιστής"
 
 #. Comment
 #: My_Computer:7
@@ -45,7 +46,7 @@ msgstr "Π�όσβαση σε μέσα αποθήκευσης"
 #. Name
 #: My_Documents:5
 msgid "My Documents"
-msgstr "Τα έγγ�αφά μου"
+msgstr "Έγγ�αφα"
 
 #. Comment
 #: My_Documents:7
@@ -55,7 +56,7 @@ msgstr "Πε�ιέχει π�οσωπικά έγγ�αφα"
 #. Name
 #: My_Network_Places:5
 msgid "My Network Places"
-msgstr "Απομακ�υσμένες τοποθεσίες"
+msgstr "Θέσεις δικτ�ου"
 
 #. Comment
 #: My_Network_Places:7
@@ -80,7 +81,7 @@ msgstr "Σ�στημα"
 #. GenericName
 #: System.desktop:4
 msgid "System Locations"
-msgstr "Τοποθεσίες συστήματος"
+msgstr "Σ�στημα"
 
 #. Comment
 #: System.desktop:6
@@ -241,7 +242,7 @@ msgstr "�έα συσκευή ZIP"
 #. Name
 #: Trash:8
 msgid "Trash"
-msgstr "Κάδος απο��ιμμάτων"
+msgstr "Απο��ίμματα"
 
 #. Comment
 #: Trash:10
@@ -252,7 +253,7 @@ msgstr "Πε�ιέχει α�χεία π�ος διαγ�αφή"
 #. GenericName
 #: Web_Browser:6 Web_Browser:8
 msgid "Web Browser"
-msgstr "Πε�ιηγητής ιστο�"
+msgstr "Φυλλομετ�ητής"
 
 #. Comment
 #: Web_Browser:10
diff --git a/translations/desktop_files/kdesktop-icons/ru.po b/translations/desktop_files/kdesktop-icons/ru.po
index c2cb951d7..7c71a4076 100644
--- a/translations/desktop_files/kdesktop-icons/ru.po
+++ b/translations/desktop_files/kdesktop-icons/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-06-04 15:15+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdesktop-icons/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Home.desktop:2
@@ -256,7 +258,7 @@ msgstr "Интернет обозреватель"
 #. Comment
 #: Web_Browser:10
 msgid "Browse the World Wide Web"
-msgstr "Обозреватель В�емирной Паутины"
+msgstr "Обозреватель В�емирной паутины"
 
 #. Name
 #: directory.autostart:3
diff --git a/translations/desktop_files/kdesktop-icons/zh_CN.po b/translations/desktop_files/kdesktop-icons/zh_CN.po
index 535bedffe..6db578dcf 100644
--- a/translations/desktop_files/kdesktop-icons/zh_CN.po
+++ b/translations/desktop_files/kdesktop-icons/zh_CN.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Wantao Liu <vantao@aosc.io>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-08-23 07:29+0000\n"
+"Last-Translator: Wantao Liu <vantao@aosc.io>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kdesktop-icons/zh_Hans/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Home.desktop:2
@@ -28,39 +29,38 @@ msgstr "个人文件"
 
 #. Comment
 #: Home.desktop:6
-#, fuzzy
 msgid "Contains personal files"
-msgstr "个人文件"
+msgstr "此处包�个人文件"
 
 #. Name
 #: My_Computer:5
 msgid "My Computer"
-msgstr ""
+msgstr "我的电脑"
 
 #. Comment
 #: My_Computer:7
 msgid "Access to storage media"
-msgstr ""
+msgstr "显示连接到此计算机的存储介质"
 
 #. Name
 #: My_Documents:5
 msgid "My Documents"
-msgstr "文档文件夹"
+msgstr "我的文档"
 
 #. Comment
 #: My_Documents:7
 msgid "Contains personal documents"
-msgstr ""
+msgstr "此处包�个人文档"
 
 #. Name
 #: My_Network_Places:5
 msgid "My Network Places"
-msgstr "远程�置"
+msgstr "网上邻居"
 
 #. Comment
 #: My_Network_Places:7
 msgid "Access to network places and remote hosts"
-msgstr ""
+msgstr "访问网络上的计算机和设备"
 
 #. Name
 #: Printers:5
@@ -70,22 +70,22 @@ msgstr "打�机"
 #. Comment
 #: Printers:7
 msgid "Manage print jobs"
-msgstr ""
+msgstr "管�打�任务"
 
 #. Name
 #: System.desktop:2
 msgid "System"
-msgstr "系统"
+msgstr "本机系统"
 
 #. GenericName
 #: System.desktop:4
 msgid "System Locations"
-msgstr "系统定�"
+msgstr "本机系统�置"
 
 #. Comment
 #: System.desktop:6
 msgid "Access to system places"
-msgstr ""
+msgstr "访问本机系统�置"
 
 #. Name
 #: Templates/CDROM-Device.desktop:12 Templates/CDWRITER-Device.desktop:12
@@ -96,7 +96,7 @@ msgstr "弹出"
 #. Name
 #: Templates/Directory.desktop:2
 msgid "Folder..."
-msgstr "文件夹..."
+msgstr "文件夹…"
 
 #. Comment
 #: Templates/Directory.desktop:3
@@ -111,7 +111,7 @@ msgstr "格�"
 #. Name
 #: Templates/HTMLFile.desktop:2
 msgid "HTML File..."
-msgstr "HTML 文件..."
+msgstr "HTML 文件…"
 
 #. Comment
 #: Templates/HTMLFile.desktop:3
@@ -121,7 +121,7 @@ msgstr "输入 HTML 文件�："
 #. Name
 #: Templates/TextFile.desktop:2
 msgid "Text File..."
-msgstr "文本文件..."
+msgstr "文本文件…"
 
 #. Comment
 #: Templates/TextFile.desktop:3
@@ -131,77 +131,77 @@ msgstr "输入文本文件�："
 #. Name
 #: Templates/linkCAMERA.desktop:2
 msgid "Camera Device..."
-msgstr "相机设备..."
+msgstr "相机设备…"
 
 #. Comment
 #: Templates/linkCAMERA.desktop:3
 msgid "New camera"
-msgstr "新建相机"
+msgstr "添加相机"
 
 #. Name
 #: Templates/linkCDROM.desktop:2
 msgid "CD-ROM Device..."
-msgstr "CD-ROM 设备..."
+msgstr "CD-ROM 光驱…"
 
 #. Comment
 #: Templates/linkCDROM.desktop:3
 msgid "New CD-ROM Device"
-msgstr "新建 CD-ROM 设备"
+msgstr "添加 CD-ROM 光驱"
 
 #. Name
 #: Templates/linkCDWRITER.desktop:2
 msgid "CDWRITER Device..."
-msgstr "刻录机设备..."
+msgstr "刻录机…"
 
 #. Comment
 #: Templates/linkCDWRITER.desktop:3
 msgid "New CDWRITER Device"
-msgstr "新建刻录机设备"
+msgstr "添加刻录机"
 
 #. Name
 #: Templates/linkDVDROM.desktop:2
 msgid "DVD-ROM Device..."
-msgstr "DVD-ROM 设备..."
+msgstr "DVD-ROM 光驱…"
 
 #. Comment
 #: Templates/linkDVDROM.desktop:3
 msgid "New DVD-ROM Device"
-msgstr "新建 DVD-ROM 设备"
+msgstr "添加 DVD-ROM 光驱"
 
 #. Name
 #: Templates/linkFloppy.desktop:2
 msgid "Floppy Device..."
-msgstr "软驱设备..."
+msgstr "软驱…"
 
 #. Comment
 #: Templates/linkFloppy.desktop:3
 msgid "New Floppy Device"
-msgstr "新建软驱设备"
+msgstr "添加软驱"
 
 #. Name
 #: Templates/linkHD.desktop:2
 msgid "Hard Disc Device..."
-msgstr "硬盘设备..."
+msgstr "硬盘…"
 
 #. Comment
 #: Templates/linkHD.desktop:3
 msgid "New Hard Disc"
-msgstr "新建硬盘"
+msgstr "添加硬盘"
 
 #. Name
 #: Templates/linkMO.desktop:2
 msgid "MO Device..."
-msgstr "MO 设备..."
+msgstr "MO 光驱…"
 
 #. Comment
 #: Templates/linkMO.desktop:3
 msgid "New MO Device"
-msgstr "新建 MO 设备"
+msgstr "添加 MO 光驱"
 
 #. Name
 #: Templates/linkNFS.desktop:2
 msgid "NFS..."
-msgstr ""
+msgstr "NFS 远程文件夹…"
 
 #. Comment
 #: Templates/linkNFS.desktop:3
@@ -211,32 +211,32 @@ msgstr "新建 NFS 链接"
 #. Name
 #: Templates/linkProgram.desktop:2
 msgid "Link to Application..."
-msgstr "应用程�链接..."
+msgstr "快�方�…"
 
 #. Comment
 #: Templates/linkProgram.desktop:3
 msgid "New Link to Application"
-msgstr "新建应用程�链接"
+msgstr "新建快�方�"
 
 #. Name
 #: Templates/linkURL.desktop:2
 msgid "Link to Location (URL)..."
-msgstr "到�置(URL)的链接..."
+msgstr "网� (URL)…"
 
 #. Comment
 #: Templates/linkURL.desktop:3
 msgid "Enter link to location (URL):"
-msgstr "输入到�置(URL)的链接："
+msgstr "输入网� (URL)："
 
 #. Name
 #: Templates/linkZIP.desktop:2
 msgid "ZIP Device..."
-msgstr "ZIP 设备..."
+msgstr "Zip 驱动器…"
 
 #. Comment
 #: Templates/linkZIP.desktop:3
 msgid "New ZIP Device"
-msgstr "新建 ZIP 设备"
+msgstr "添加 Zip 驱动器"
 
 #. Name
 #: Trash:8
@@ -246,18 +246,18 @@ msgstr "回收站"
 #. Comment
 #: Trash:10
 msgid "Contains removed files"
-msgstr ""
+msgstr "此处包�已删除的文件"
 
 #. Name
 #. GenericName
 #: Web_Browser:6 Web_Browser:8
 msgid "Web Browser"
-msgstr ""
+msgstr "网页�览器"
 
 #. Comment
 #: Web_Browser:10
 msgid "Browse the World Wide Web"
-msgstr ""
+msgstr "�览互�网"
 
 #. Name
 #: directory.autostart:3
@@ -272,4 +272,4 @@ msgstr "桌�"
 #. Name
 #: directory.templates:3
 msgid "Templates"
-msgstr "模�"
+msgstr "文件模�"
diff --git a/translations/desktop_files/khelpcenter-desktops/af.po b/translations/desktop_files/khelpcenter-desktops/af.po
index defb977ce..2365422db 100644
--- a/translations/desktop_files/khelpcenter-desktops/af.po
+++ b/translations/desktop_files/khelpcenter-desktops/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Woerts-warts Gids"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Ondersteun TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/ar.po b/translations/desktop_files/khelpcenter-desktops/ar.po
index ea9c9d9fe..6101af4a4 100644
--- a/translations/desktop_files/khelpcenter-desktops/ar.po
+++ b/translations/desktop_files/khelpcenter-desktops/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "دليل إرشاد البدء السريع"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "دعم TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/az.po b/translations/desktop_files/khelpcenter-desktops/az.po
index 10d991183..e6d99e0e8 100644
--- a/translations/desktop_files/khelpcenter-desktops/az.po
+++ b/translations/desktop_files/khelpcenter-desktops/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Sür'ətli Başlama Rehberi"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/be.po b/translations/desktop_files/khelpcenter-desktops/be.po
index bba7fe52c..093908d8f 100644
--- a/translations/desktop_files/khelpcenter-desktops/be.po
+++ b/translations/desktop_files/khelpcenter-desktops/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -166,6 +166,11 @@ msgid "Quickstart Guide"
 msgstr "Падручнік дл� пачаткоўца"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Падтрымка TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/bg.po b/translations/desktop_files/khelpcenter-desktops/bg.po
index d0b8a9c1f..20f289021 100644
--- a/translations/desktop_files/khelpcenter-desktops/bg.po
+++ b/translations/desktop_files/khelpcenter-desktops/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: 2020-07-21 05:23+0000\n"
 "Last-Translator: Emanoil Kotsev <deloptes@gmail.com>\n"
 "Language-Team: Bulgarian <https://mirror.git.trinitydesktop.org/weblate/"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Ръковод�тво за начинаещите"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Подпомагане на TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/bn.po b/translations/desktop_files/khelpcenter-desktops/bn.po
index a3073a087..0182e79f1 100644
--- a/translations/desktop_files/khelpcenter-desktops/bn.po
+++ b/translations/desktop_files/khelpcenter-desktops/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "ক�ইকস�টার�ট গাইড"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "কে.ডি.ই-কে সহায়তা"
diff --git a/translations/desktop_files/khelpcenter-desktops/br.po b/translations/desktop_files/khelpcenter-desktops/br.po
index 51b15acce..de5e76987 100644
--- a/translations/desktop_files/khelpcenter-desktops/br.po
+++ b/translations/desktop_files/khelpcenter-desktops/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Sturier Kregiñ fonnus"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Skoazellañ TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/bs.po b/translations/desktop_files/khelpcenter-desktops/bs.po
index 4fbfb6647..8552a56c6 100644
--- a/translations/desktop_files/khelpcenter-desktops/bs.po
+++ b/translations/desktop_files/khelpcenter-desktops/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Vodi� za brzi po�etak"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Podržite TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/ca.po b/translations/desktop_files/khelpcenter-desktops/ca.po
index 4c1fd44bc..77c099e66 100644
--- a/translations/desktop_files/khelpcenter-desktops/ca.po
+++ b/translations/desktop_files/khelpcenter-desktops/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Guia ràpida"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Com col·laborar amb el TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/cs.po b/translations/desktop_files/khelpcenter-desktops/cs.po
index 5c9f16d6f..860240745 100644
--- a/translations/desktop_files/khelpcenter-desktops/cs.po
+++ b/translations/desktop_files/khelpcenter-desktops/cs.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Slávek Banko <slavek.banko@axis.cz>, 2020.
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
-"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
+"PO-Revision-Date: 2023-06-06 19:15+0000\n"
 "Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
 "Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
 "tdebase/khelpcenter-desktop-files/cs/>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.2.2\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Help.desktop:10
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Úvodní seznámení"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr "Poznámky k vydání TDE"
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Podpora TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/csb.po b/translations/desktop_files/khelpcenter-desktops/csb.po
index ec08478c8..470abd383 100644
--- a/translations/desktop_files/khelpcenter-desktops/csb.po
+++ b/translations/desktop_files/khelpcenter-desktops/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Sztartowi prowôdnik"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Wspiarcë dlô TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/cy.po b/translations/desktop_files/khelpcenter-desktops/cy.po
index 75b5020c0..e244be442 100644
--- a/translations/desktop_files/khelpcenter-desktops/cy.po
+++ b/translations/desktop_files/khelpcenter-desktops/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Canllaw cychwyn cyflym"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Cefnogi TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/da.po b/translations/desktop_files/khelpcenter-desktops/da.po
index 72095a3e1..9e6d9e97b 100644
--- a/translations/desktop_files/khelpcenter-desktops/da.po
+++ b/translations/desktop_files/khelpcenter-desktops/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Kvikstart-guide"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Støt TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/de.po b/translations/desktop_files/khelpcenter-desktops/de.po
index e8ccf820b..8c9b6d4d6 100644
--- a/translations/desktop_files/khelpcenter-desktops/de.po
+++ b/translations/desktop_files/khelpcenter-desktops/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Kurzeinführung"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE unterstützen"
diff --git a/translations/desktop_files/khelpcenter-desktops/el.po b/translations/desktop_files/khelpcenter-desktops/el.po
index ce37c0d3f..b004be627 100644
--- a/translations/desktop_files/khelpcenter-desktops/el.po
+++ b/translations/desktop_files/khelpcenter-desktops/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Οδηγός γ�ήγο�ου ξεκινήματος"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Υποστή�ιξη στο TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/en_GB.po b/translations/desktop_files/khelpcenter-desktops/en_GB.po
index e6213dcc1..012c9ad84 100644
--- a/translations/desktop_files/khelpcenter-desktops/en_GB.po
+++ b/translations/desktop_files/khelpcenter-desktops/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -162,6 +162,11 @@ msgid "Quickstart Guide"
 msgstr ""
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/eo.po b/translations/desktop_files/khelpcenter-desktops/eo.po
index 94b64c4a7..ae4a0111c 100644
--- a/translations/desktop_files/khelpcenter-desktops/eo.po
+++ b/translations/desktop_files/khelpcenter-desktops/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Konciza gvidlibro"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Subteni TDEon"
diff --git a/translations/desktop_files/khelpcenter-desktops/es.po b/translations/desktop_files/khelpcenter-desktops/es.po
index e2c8464bc..fe2bb6ebe 100644
--- a/translations/desktop_files/khelpcenter-desktops/es.po
+++ b/translations/desktop_files/khelpcenter-desktops/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Guía rápida"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Colaborando con TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/et.po b/translations/desktop_files/khelpcenter-desktops/et.po
index 5a81aa02d..eae383619 100644
--- a/translations/desktop_files/khelpcenter-desktops/et.po
+++ b/translations/desktop_files/khelpcenter-desktops/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Kiire sissejuhatus"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE toetamine"
diff --git a/translations/desktop_files/khelpcenter-desktops/eu.po b/translations/desktop_files/khelpcenter-desktops/eu.po
index 0a80d0bea..6669c9b5f 100644
--- a/translations/desktop_files/khelpcenter-desktops/eu.po
+++ b/translations/desktop_files/khelpcenter-desktops/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Gida bizkorra"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDEri lagunduz"
diff --git a/translations/desktop_files/khelpcenter-desktops/fa.po b/translations/desktop_files/khelpcenter-desktops/fa.po
index 45ef5a64e..361338a68 100644
--- a/translations/desktop_files/khelpcenter-desktops/fa.po
+++ b/translations/desktop_files/khelpcenter-desktops/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "راهنمای آغاز سریع"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "پشتیبانی TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/fi.po b/translations/desktop_files/khelpcenter-desktops/fi.po
index cba99bf83..976ee311e 100644
--- a/translations/desktop_files/khelpcenter-desktops/fi.po
+++ b/translations/desktop_files/khelpcenter-desktops/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Pikaohje"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE:n tukeminen"
diff --git a/translations/desktop_files/khelpcenter-desktops/fo.po b/translations/desktop_files/khelpcenter-desktops/fo.po
index f64e3808d..2174a6953 100644
--- a/translations/desktop_files/khelpcenter-desktops/fo.po
+++ b/translations/desktop_files/khelpcenter-desktops/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr ""
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/fr.po b/translations/desktop_files/khelpcenter-desktops/fr.po
index 6a4e1724a..2f0c979a6 100644
--- a/translations/desktop_files/khelpcenter-desktops/fr.po
+++ b/translations/desktop_files/khelpcenter-desktops/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Guide de démarrage rapide"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Aider TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/fy.po b/translations/desktop_files/khelpcenter-desktops/fy.po
index cdcd5901f..dc6dfcf21 100644
--- a/translations/desktop_files/khelpcenter-desktops/fy.po
+++ b/translations/desktop_files/khelpcenter-desktops/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Fluchstartgids"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE stypje"
diff --git a/translations/desktop_files/khelpcenter-desktops/ga.po b/translations/desktop_files/khelpcenter-desktops/ga.po
index b3399906d..f9dfd1fa8 100644
--- a/translations/desktop_files/khelpcenter-desktops/ga.po
+++ b/translations/desktop_files/khelpcenter-desktops/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr ""
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Ag Tacú le TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/gl.po b/translations/desktop_files/khelpcenter-desktops/gl.po
index 62d1dcadd..445c8ceaf 100644
--- a/translations/desktop_files/khelpcenter-desktops/gl.po
+++ b/translations/desktop_files/khelpcenter-desktops/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Guia de Início Rápido"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Dar Apoio a TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/he.po b/translations/desktop_files/khelpcenter-desktops/he.po
index 11e7417b6..eb6db4358 100644
--- a/translations/desktop_files/khelpcenter-desktops/he.po
+++ b/translations/desktop_files/khelpcenter-desktops/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "מדריך התחלה מהירה"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "תמיכה ב־TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/hi.po b/translations/desktop_files/khelpcenter-desktops/hi.po
index 132bb95b5..624d28268 100644
--- a/translations/desktop_files/khelpcenter-desktops/hi.po
+++ b/translations/desktop_files/khelpcenter-desktops/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "शीघ�रप�रारंभ मार�गदर�शक"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "केडीई को आधार दें"
diff --git a/translations/desktop_files/khelpcenter-desktops/hr.po b/translations/desktop_files/khelpcenter-desktops/hr.po
index e0a6f4bd7..db99929cd 100644
--- a/translations/desktop_files/khelpcenter-desktops/hr.po
+++ b/translations/desktop_files/khelpcenter-desktops/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Brzi uvod"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Podrška TDE-u"
diff --git a/translations/desktop_files/khelpcenter-desktops/hsb.po b/translations/desktop_files/khelpcenter-desktops/hsb.po
index f11606380..a818f5350 100644
--- a/translations/desktop_files/khelpcenter-desktops/hsb.po
+++ b/translations/desktop_files/khelpcenter-desktops/hsb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -162,6 +162,11 @@ msgid "Quickstart Guide"
 msgstr ""
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/hu.po b/translations/desktop_files/khelpcenter-desktops/hu.po
index af6fa9e70..f8d6c8f50 100644
--- a/translations/desktop_files/khelpcenter-desktops/hu.po
+++ b/translations/desktop_files/khelpcenter-desktops/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Rövid bevezetés"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "A TDE támogatása"
diff --git a/translations/desktop_files/khelpcenter-desktops/id.po b/translations/desktop_files/khelpcenter-desktops/id.po
index 5c64ba02b..cff678718 100644
--- a/translations/desktop_files/khelpcenter-desktops/id.po
+++ b/translations/desktop_files/khelpcenter-desktops/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Petunjuk Memulai Secara Cepat"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/is.po b/translations/desktop_files/khelpcenter-desktops/is.po
index bd785a2ad..b5c272f4a 100644
--- a/translations/desktop_files/khelpcenter-desktops/is.po
+++ b/translations/desktop_files/khelpcenter-desktops/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Skyndileiðbeiningar"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Styðja TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/it.po b/translations/desktop_files/khelpcenter-desktops/it.po
index 5720f7509..beef2e4fe 100644
--- a/translations/desktop_files/khelpcenter-desktops/it.po
+++ b/translations/desktop_files/khelpcenter-desktops/it.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
-"PO-Revision-Date: 2022-01-15 09:00+0000\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
+"PO-Revision-Date: 2023-08-23 07:29+0000\n"
 "Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
 "Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/khelpcenter-desktop-files/it/>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.10.1\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Help.desktop:10
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Guida rapida"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr "Note sulla versione di TDE"
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Aiutare TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/ja.po b/translations/desktop_files/khelpcenter-desktops/ja.po
index 8e3ab5962..db69d12cc 100644
--- a/translations/desktop_files/khelpcenter-desktops/ja.po
+++ b/translations/desktop_files/khelpcenter-desktops/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "クイックスタート"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE 支�"
diff --git a/translations/desktop_files/khelpcenter-desktops/ka.po b/translations/desktop_files/khelpcenter-desktops/ka.po
index eba073c07..a49f9b9e5 100644
--- a/translations/desktop_files/khelpcenter-desktops/ka.po
+++ b/translations/desktop_files/khelpcenter-desktops/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "ს�ხელმძღვ�ნელ� დ�მწყებთ�თვის"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE-ს მხ�რდ�ჭერ�"
diff --git a/translations/desktop_files/khelpcenter-desktops/khelpcenter-desktops.pot b/translations/desktop_files/khelpcenter-desktops/khelpcenter-desktops.pot
index d90fa069c..78c72adfd 100644
--- a/translations/desktop_files/khelpcenter-desktops/khelpcenter-desktops.pot
+++ b/translations/desktop_files/khelpcenter-desktops/khelpcenter-desktops.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -162,6 +162,11 @@ msgid "Quickstart Guide"
 msgstr ""
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/kk.po b/translations/desktop_files/khelpcenter-desktops/kk.po
index 907e5b879..3d50fb504 100644
--- a/translations/desktop_files/khelpcenter-desktops/kk.po
+++ b/translations/desktop_files/khelpcenter-desktops/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Ба�таушы бағыттама�ы"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE-ні қолдау"
diff --git a/translations/desktop_files/khelpcenter-desktops/km.po b/translations/desktop_files/khelpcenter-desktops/km.po
index 6f7e45bf1..67ead7775 100644
--- a/translations/desktop_files/khelpcenter-desktops/km.po
+++ b/translations/desktop_files/khelpcenter-desktops/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "មគ្គុទ្ទ�សក�​ចាប់ផ្ដើម​រហ�ស"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "ការ​គាំទ្រ TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/ko.po b/translations/desktop_files/khelpcenter-desktops/ko.po
index dad0f9bb3..353059ca6 100644
--- a/translations/desktop_files/khelpcenter-desktops/ko.po
+++ b/translations/desktop_files/khelpcenter-desktops/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "빠른 시작 설명서"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE 지�"
diff --git a/translations/desktop_files/khelpcenter-desktops/lo.po b/translations/desktop_files/khelpcenter-desktops/lo.po
index 3a3088e0b..a40a7840b 100644
--- a/translations/desktop_files/khelpcenter-desktops/lo.po
+++ b/translations/desktop_files/khelpcenter-desktops/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -162,6 +162,11 @@ msgid "Quickstart Guide"
 msgstr "ຄຳ�ນະນຳ�ບບໄວ"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "ເ�ມ�ີລາ"
diff --git a/translations/desktop_files/khelpcenter-desktops/lt.po b/translations/desktop_files/khelpcenter-desktops/lt.po
index 121b1b700..9f06ff137 100644
--- a/translations/desktop_files/khelpcenter-desktops/lt.po
+++ b/translations/desktop_files/khelpcenter-desktops/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Greitos pradžios gidas"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE palaikymas"
diff --git a/translations/desktop_files/khelpcenter-desktops/lv.po b/translations/desktop_files/khelpcenter-desktops/lv.po
index ea00d3b3c..7f4d67b39 100644
--- a/translations/desktop_files/khelpcenter-desktops/lv.po
+++ b/translations/desktop_files/khelpcenter-desktops/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Ātras s�kšanas ceļvedis"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE atbalstīšana"
diff --git a/translations/desktop_files/khelpcenter-desktops/mk.po b/translations/desktop_files/khelpcenter-desktops/mk.po
index d97b56aa6..cc95efda1 100644
--- a/translations/desktop_files/khelpcenter-desktops/mk.po
+++ b/translations/desktop_files/khelpcenter-desktops/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Водич за брзо �наоѓање"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Поддршка за TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/mn.po b/translations/desktop_files/khelpcenter-desktops/mn.po
index 163c677fe..561394dec 100644
--- a/translations/desktop_files/khelpcenter-desktops/mn.po
+++ b/translations/desktop_files/khelpcenter-desktops/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -162,6 +162,11 @@ msgid "Quickstart Guide"
 msgstr "QuickStart-Зааварчилгаа"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "КДЭ д�мжил�г"
diff --git a/translations/desktop_files/khelpcenter-desktops/ms.po b/translations/desktop_files/khelpcenter-desktops/ms.po
index 527d7f994..8450af26a 100644
--- a/translations/desktop_files/khelpcenter-desktops/ms.po
+++ b/translations/desktop_files/khelpcenter-desktops/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Panduan Mula Pantas"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE Sokongan"
diff --git a/translations/desktop_files/khelpcenter-desktops/mt.po b/translations/desktop_files/khelpcenter-desktops/mt.po
index 0563f65f0..56d72490b 100644
--- a/translations/desktop_files/khelpcenter-desktops/mt.po
+++ b/translations/desktop_files/khelpcenter-desktops/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -167,6 +167,11 @@ msgid "Quickstart Guide"
 msgstr "Gwida biex tibda malajr"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Appoġġja lill-TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/nb.po b/translations/desktop_files/khelpcenter-desktops/nb.po
index 304fea002..fc835228b 100644
--- a/translations/desktop_files/khelpcenter-desktops/nb.po
+++ b/translations/desktop_files/khelpcenter-desktops/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Hurtigstart-guide"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Støtt TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/nds.po b/translations/desktop_files/khelpcenter-desktops/nds.po
index 99351af68..51b55c9f5 100644
--- a/translations/desktop_files/khelpcenter-desktops/nds.po
+++ b/translations/desktop_files/khelpcenter-desktops/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Fixstart-Föhrer"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE ünnerstütten"
diff --git a/translations/desktop_files/khelpcenter-desktops/ne.po b/translations/desktop_files/khelpcenter-desktops/ne.po
index e4c81ab01..52b41c8c7 100644
--- a/translations/desktop_files/khelpcenter-desktops/ne.po
+++ b/translations/desktop_files/khelpcenter-desktops/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "द�र�त स�र�आत मार�गदर�शन"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "केडीई समर�थन"
diff --git a/translations/desktop_files/khelpcenter-desktops/nl.po b/translations/desktop_files/khelpcenter-desktops/nl.po
index 95a367983..a6b9d7cde 100644
--- a/translations/desktop_files/khelpcenter-desktops/nl.po
+++ b/translations/desktop_files/khelpcenter-desktops/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Snelstartgids"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE ondersteunen"
diff --git a/translations/desktop_files/khelpcenter-desktops/nn.po b/translations/desktop_files/khelpcenter-desktops/nn.po
index 58b48e7d0..bd1909395 100644
--- a/translations/desktop_files/khelpcenter-desktops/nn.po
+++ b/translations/desktop_files/khelpcenter-desktops/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Snøggstarguide"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Støtt TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/nso.po b/translations/desktop_files/khelpcenter-desktops/nso.po
index 9c39a067e..7c08ab4d7 100644
--- a/translations/desktop_files/khelpcenter-desktops/nso.po
+++ b/translations/desktop_files/khelpcenter-desktops/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Keletso ya Thomiso ya Kapejana"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Go Thekga TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/oc.po b/translations/desktop_files/khelpcenter-desktops/oc.po
index 9dcec0f50..dd31fd5c9 100644
--- a/translations/desktop_files/khelpcenter-desktops/oc.po
+++ b/translations/desktop_files/khelpcenter-desktops/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -162,6 +162,11 @@ msgid "Quickstart Guide"
 msgstr "Guia rapida"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/pa.po b/translations/desktop_files/khelpcenter-desktops/pa.po
index 746645718..8dd0aa4f4 100644
--- a/translations/desktop_files/khelpcenter-desktops/pa.po
+++ b/translations/desktop_files/khelpcenter-desktops/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "ਚ�ਸਤ ਸ਼�ਰੂਆਤ ਗਾਈਡ"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE ਦੀ ਸਹਾਇਤਾ"
diff --git a/translations/desktop_files/khelpcenter-desktops/pl.po b/translations/desktop_files/khelpcenter-desktops/pl.po
index 5d3742163..04bc308cd 100644
--- a/translations/desktop_files/khelpcenter-desktops/pl.po
+++ b/translations/desktop_files/khelpcenter-desktops/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
+"PO-Revision-Date: 2022-10-25 18:06+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khelpcenter-desktop-files/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: Help.desktop:10
@@ -113,9 +115,8 @@ msgstr "(n) nowe"
 
 #. Name
 #: plugins/adminguide.desktop:6
-#, fuzzy
 msgid "TDE Admininstrator Guide"
-msgstr "Podręcznik użytkownika TDE"
+msgstr "Podręcznik administratora TDE"
 
 #. Name
 #: plugins/applets.desktop:6
@@ -163,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Przewodnik startowy"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Wspomaganie TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/pt.po b/translations/desktop_files/khelpcenter-desktops/pt.po
index b074ac6be..adad4bffb 100644
--- a/translations/desktop_files/khelpcenter-desktops/pt.po
+++ b/translations/desktop_files/khelpcenter-desktops/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Guia de Iniciação"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Apoiar o TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/pt_BR.po b/translations/desktop_files/khelpcenter-desktops/pt_BR.po
index 059334b97..479b112e4 100644
--- a/translations/desktop_files/khelpcenter-desktops/pt_BR.po
+++ b/translations/desktop_files/khelpcenter-desktops/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Guia Rápido"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Assistência ao TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/ro.po b/translations/desktop_files/khelpcenter-desktops/ro.po
index 3ee772d97..35ddaba86 100644
--- a/translations/desktop_files/khelpcenter-desktops/ro.po
+++ b/translations/desktop_files/khelpcenter-desktops/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Ghid rapid"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Cum să ajutați Proiectul TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/ru.po b/translations/desktop_files/khelpcenter-desktops/ru.po
index 349edf312..f9353fac5 100644
--- a/translations/desktop_files/khelpcenter-desktops/ru.po
+++ b/translations/desktop_files/khelpcenter-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khelpcenter-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Help.desktop:10
@@ -35,6 +37,8 @@ msgstr "Создание индек�а"
 #: htmlsearch/htmlsearch.desktop:16
 msgid "Help;HTML;Search;Index;htdig;htsearch;htmerge;Scope;Language;"
 msgstr ""
+"Помощь;Справка;HTML;Пои�к;Указатель;Индек�;htdig;htsearch;htmerge;Обла�ть;Язы"
+"к;"
 
 #. Name
 #: kcmhelpcenter.desktop:13
@@ -49,7 +53,7 @@ msgstr "�а�тройка индек�ов �правочной �и�темы
 #. Keywords
 #: kcmhelpcenter.desktop:17
 msgid "khelpcenter;help;index;search;"
-msgstr ""
+msgstr "khelpcenter;помощь;�правка;указатель;индек�;пои�к;"
 
 #. Name
 #: khelpcenter.desktop:11
@@ -113,9 +117,8 @@ msgstr "(n) �овые"
 
 #. Name
 #: plugins/adminguide.desktop:6
-#, fuzzy
 msgid "TDE Admininstrator Guide"
-msgstr "Руковод�тво пользовател� TDE"
+msgstr "Руковод�тво админи�тратора TDE"
 
 #. Name
 #: plugins/applets.desktop:6
@@ -163,6 +166,11 @@ msgid "Quickstart Guide"
 msgstr "Руковод�тво дл� начинающих в TDE"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr "Примечани� к выпу�ку TDE"
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Поддержка TDE"
@@ -180,7 +188,7 @@ msgstr "Сведени� о протоколах ввода-вывода"
 #. Keywords
 #: plugins/tdeioslaves.desktop:10
 msgid "Protocol;IO slaves;Slaves;Network;Information;Timeout;"
-msgstr ""
+msgstr "протокол;IO slaves;slaves;Сеть;Информаци�;Тайм-аут;задержка;"
 
 #. Name
 #: plugins/userguide.desktop:6
@@ -210,4 +218,4 @@ msgstr "Страницы руковод�тв UNIX"
 #. Name
 #: plugins/Scrollkeeper/.directory:5
 msgid "Scrollkeeper"
-msgstr ""
+msgstr "Scrollkeeper"
diff --git a/translations/desktop_files/khelpcenter-desktops/rw.po b/translations/desktop_files/khelpcenter-desktops/rw.po
index 55f4d2a83..99d7ac528 100644
--- a/translations/desktop_files/khelpcenter-desktops/rw.po
+++ b/translations/desktop_files/khelpcenter-desktops/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Iyobora GutangiraVuba"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Gufasha TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/se.po b/translations/desktop_files/khelpcenter-desktops/se.po
index c5e03c49f..da37c42f1 100644
--- a/translations/desktop_files/khelpcenter-desktops/se.po
+++ b/translations/desktop_files/khelpcenter-desktops/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Oanehis TDE-introdukšuvdna"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Doarjjo TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/sk.po b/translations/desktop_files/khelpcenter-desktops/sk.po
index da1d4cfcd..561f164b0 100644
--- a/translations/desktop_files/khelpcenter-desktops/sk.po
+++ b/translations/desktop_files/khelpcenter-desktops/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Návod na rýchle použitie"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Podpora TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/sl.po b/translations/desktop_files/khelpcenter-desktops/sl.po
index 12ec7ac54..3e69176dc 100644
--- a/translations/desktop_files/khelpcenter-desktops/sl.po
+++ b/translations/desktop_files/khelpcenter-desktops/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Vodnik za hitri za�etek"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Podpiranje TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/sr.po b/translations/desktop_files/khelpcenter-desktops/sr.po
index f23605216..5475165fa 100644
--- a/translations/desktop_files/khelpcenter-desktops/sr.po
+++ b/translations/desktop_files/khelpcenter-desktops/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Почетни водич"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Подржавање TDE-а"
diff --git a/translations/desktop_files/khelpcenter-desktops/sr@Latn.po b/translations/desktop_files/khelpcenter-desktops/sr@Latn.po
index a044fe322..62480b66e 100644
--- a/translations/desktop_files/khelpcenter-desktops/sr@Latn.po
+++ b/translations/desktop_files/khelpcenter-desktops/sr@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Po�etni vodi�"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Podržavanje TDE-a"
diff --git a/translations/desktop_files/khelpcenter-desktops/ss.po b/translations/desktop_files/khelpcenter-desktops/ss.po
index d7300ebe6..73109a9b4 100644
--- a/translations/desktop_files/khelpcenter-desktops/ss.po
+++ b/translations/desktop_files/khelpcenter-desktops/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr ""
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/sv.po b/translations/desktop_files/khelpcenter-desktops/sv.po
index c1040dc2d..a6ac935b9 100644
--- a/translations/desktop_files/khelpcenter-desktops/sv.po
+++ b/translations/desktop_files/khelpcenter-desktops/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Snabbstartsguide"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Ge TDE ditt stöd"
diff --git a/translations/desktop_files/khelpcenter-desktops/ta.po b/translations/desktop_files/khelpcenter-desktops/ta.po
index 3bb71fadb..0f18133c6 100644
--- a/translations/desktop_files/khelpcenter-desktops/ta.po
+++ b/translations/desktop_files/khelpcenter-desktops/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "விரைவ�த�வக�க வழிகாட�டி."
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE� ஆதரிக�கிறத�"
diff --git a/translations/desktop_files/khelpcenter-desktops/te.po b/translations/desktop_files/khelpcenter-desktops/te.po
index e9d5f6eb2..dd79bbe8f 100644
--- a/translations/desktop_files/khelpcenter-desktops/te.po
+++ b/translations/desktop_files/khelpcenter-desktops/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr ""
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "కెడిఈ కి సహాయంచెయండి"
diff --git a/translations/desktop_files/khelpcenter-desktops/tg.po b/translations/desktop_files/khelpcenter-desktops/tg.po
index 8a1f9e28f..4208d695e 100644
--- a/translations/desktop_files/khelpcenter-desktops/tg.po
+++ b/translations/desktop_files/khelpcenter-desktops/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Роҳнамоии шурӯъ кунӣ"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Пуштибони TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/th.po b/translations/desktop_files/khelpcenter-desktops/th.po
index 2761f268c..2197de851 100644
--- a/translations/desktop_files/khelpcenter-desktops/th.po
+++ b/translations/desktop_files/khelpcenter-desktops/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "คำ�นะนำด่วน"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "�ารสนับสนุน TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/tr.po b/translations/desktop_files/khelpcenter-desktops/tr.po
index 5538a3e32..8d6219a05 100644
--- a/translations/desktop_files/khelpcenter-desktops/tr.po
+++ b/translations/desktop_files/khelpcenter-desktops/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Hızlı Başlama Rehberi"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE'yi Destekleyin"
diff --git a/translations/desktop_files/khelpcenter-desktops/tt.po b/translations/desktop_files/khelpcenter-desktops/tt.po
index c52fc3012..a83f4bc3f 100644
--- a/translations/desktop_files/khelpcenter-desktops/tt.po
+++ b/translations/desktop_files/khelpcenter-desktops/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Tizcibärü Qullanması"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE Teräge"
diff --git a/translations/desktop_files/khelpcenter-desktops/uk.po b/translations/desktop_files/khelpcenter-desktops/uk.po
index 54d9ad0cf..2308037b9 100644
--- a/translations/desktop_files/khelpcenter-desktops/uk.po
+++ b/translations/desktop_files/khelpcenter-desktops/uk.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Roman Savochenko <roman@oscada.org>, 2020.
+# Roman Savochenko <roman@oscada.org>, 2020, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
-"PO-Revision-Date: 2020-07-21 05:23+0000\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
+"PO-Revision-Date: 2023-07-04 18:21+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/khelpcenter-desktop-files/uk/>\n"
@@ -14,9 +14,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Help.desktop:10
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "По�ібник дл� швидкого �тарту"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr "Примітки до Випу�ку TDE"
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Підтримка TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/uz.po b/translations/desktop_files/khelpcenter-desktops/uz.po
index bf9f9fda7..b4728c179 100644
--- a/translations/desktop_files/khelpcenter-desktops/uz.po
+++ b/translations/desktop_files/khelpcenter-desktops/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "TDE boʻyicha yoʻlkoʻrsatgich"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE'ni qoʻllab-quvvatlash"
diff --git a/translations/desktop_files/khelpcenter-desktops/uz@cyrillic.po b/translations/desktop_files/khelpcenter-desktops/uz@cyrillic.po
index ab07c231b..09c6b6de7 100644
--- a/translations/desktop_files/khelpcenter-desktops/uz@cyrillic.po
+++ b/translations/desktop_files/khelpcenter-desktops/uz@cyrillic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "TDE бўйича йўлкўр�атгич"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE'ни қўллаб-қувватлаш"
diff --git a/translations/desktop_files/khelpcenter-desktops/ven.po b/translations/desktop_files/khelpcenter-desktops/ven.po
index a0d58f7f7..a17f5851c 100644
--- a/translations/desktop_files/khelpcenter-desktops/ven.po
+++ b/translations/desktop_files/khelpcenter-desktops/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Tsumbavhulwo ya mathomele au tavhanya"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "U tikedza TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/vi.po b/translations/desktop_files/khelpcenter-desktops/vi.po
index 488eaa9a6..fc8c3e628 100644
--- a/translations/desktop_files/khelpcenter-desktops/vi.po
+++ b/translations/desktop_files/khelpcenter-desktops/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Hướng dẫn nhanh"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Hỗ trợ TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/wa.po b/translations/desktop_files/khelpcenter-desktops/wa.po
index ab76f3341..0249f6d1a 100644
--- a/translations/desktop_files/khelpcenter-desktops/wa.po
+++ b/translations/desktop_files/khelpcenter-desktops/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Guide d' enondaedje al vole"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Sopoirter TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/xh.po b/translations/desktop_files/khelpcenter-desktops/xh.po
index 57ae1f1e3..68e3dc66b 100644
--- a/translations/desktop_files/khelpcenter-desktops/xh.po
+++ b/translations/desktop_files/khelpcenter-desktops/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -162,6 +162,11 @@ msgid "Quickstart Guide"
 msgstr "Isikhombisi Sesiqalo esikhawulezayo"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Ixhasa i TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/zh_CN.po b/translations/desktop_files/khelpcenter-desktops/zh_CN.po
index ca4149bfa..769e83041 100644
--- a/translations/desktop_files/khelpcenter-desktops/zh_CN.po
+++ b/translations/desktop_files/khelpcenter-desktops/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "速�指�"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "支� TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/zh_TW.po b/translations/desktop_files/khelpcenter-desktops/zh_TW.po
index 2fb8a7468..bf5c5458a 100644
--- a/translations/desktop_files/khelpcenter-desktops/zh_TW.po
+++ b/translations/desktop_files/khelpcenter-desktops/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "快速入門指�"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "支� TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/zu.po b/translations/desktop_files/khelpcenter-desktops/zu.po
index 65d547e54..82a77b51f 100644
--- a/translations/desktop_files/khelpcenter-desktops/zu.po
+++ b/translations/desktop_files/khelpcenter-desktops/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Umbonisi wokuqala ngokushesha"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Ixhasa i-TDE"
diff --git a/translations/desktop_files/khotkeys-data/pl.po b/translations/desktop_files/khotkeys-data/pl.po
index 919074c76..caa7a323b 100644
--- a/translations/desktop_files/khotkeys-data/pl.po
+++ b/translations/desktop_files/khotkeys-data/pl.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Marek W <coronzon88@gmail.com>, 2021.
+# Marek W <coronzon88@gmail.com>, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2021-10-18 20:31+0000\n"
+"PO-Revision-Date: 2022-10-24 17:57+0000\n"
 "Last-Translator: Marek W <coronzon88@gmail.com>\n"
 "Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/khotkeys-data/pl/>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.8.1\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:5
@@ -37,9 +37,8 @@ msgstr "Okno Konquerora"
 #: konqueror_gestures_trinity21.khotkeys:20
 #: konqueror_gestures_trinity21.khotkeys:26 trinity2b1.khotkeys:226
 #: trinity2b1.khotkeys:232
-#, fuzzy
 msgid "Konqueror"
-msgstr "Okno Konquerora"
+msgstr "Konqueror"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:35
diff --git a/translations/desktop_files/khotkeys-data/ru.po b/translations/desktop_files/khotkeys-data/ru.po
index 916db27c0..e665c4d5f 100644
--- a/translations/desktop_files/khotkeys-data/ru.po
+++ b/translations/desktop_files/khotkeys-data/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khotkeys-data/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:5
@@ -35,9 +37,8 @@ msgstr "Окно Konqueror"
 #: konqueror_gestures_trinity21.khotkeys:20
 #: konqueror_gestures_trinity21.khotkeys:26 trinity2b1.khotkeys:226
 #: trinity2b1.khotkeys:232
-#, fuzzy
 msgid "Konqueror"
-msgstr "Окно Konqueror"
+msgstr "Konqueror"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:35
@@ -80,7 +81,7 @@ msgstr "О�тановить загрузку"
 #: konqueror_gestures_trinity21.khotkeys:385 trinity2b1.khotkeys:257
 #: trinity2b1.khotkeys:289 trinity2b1.khotkeys:321 trinity2b1.khotkeys:353
 msgid "Gesture_triggers"
-msgstr ""
+msgstr "Триггеры_же�тов"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:66
@@ -89,7 +90,7 @@ msgid ""
 "Mozilla-style: Press, move up, move left, move up, release."
 msgstr ""
 "Перейти на два уровн� выше.\n"
-"Ро�черк Mozilla: нажать, вверх, влево, вверх, отпу�тить"
+"Ро�черк Mozilla: нажать, вверх, влево, вверх, отпу�тить."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:68 trinity2b1.khotkeys:306
@@ -256,15 +257,16 @@ msgstr "Про�тое дей�твие"
 
 #. Comment
 #: printscreen.khotkeys:41
-#, fuzzy
 msgid ""
 "Launches KSnapShot in window capture mode when ALT+PrintScrn is pressed.\n"
-msgstr "Запу�к KSnapShot при нажатии кнопки PrintScreen."
+msgstr ""
+"Запу�к KSnapShot в режиме захвата активного окна при нажатии Alt+PrintScreen."
+"\n"
 
 #. Name
 #: printscreen.khotkeys:43
 msgid "PrintWindow"
-msgstr ""
+msgstr "Снимок окна"
 
 #. Comment
 #: trinity2b1.khotkeys:5
@@ -300,7 +302,7 @@ msgstr "Окно KSIRC"
 #. Comment
 #: trinity2b1.khotkeys:34
 msgid "KSIRC"
-msgstr ""
+msgstr "KSIRC"
 
 #. Comment
 #: trinity2b1.khotkeys:54
@@ -318,8 +320,20 @@ msgid ""
 ": (colon)                                  Shift+;\n"
 "' '  (space)                              Space"
 msgstr ""
-"При нажатии Alt+Ctrl+H будет �мулирован ввод �лова \"Hello\" как будто бы вы "
-"набивали его вручную � клавиатуры."
+"При нажатии Alt+Ctrl+H будет �мулирован ввод �лова \"Hello\", как будто бы "
+"вы набрали его вручную � клавиатуры. О�обенно полезно, е�ли вам лень вводить "
+"такие вещи, как например «unsigned». Каждое нажатие клавиши при вводе "
+"отдел�ет�� двоеточием ':'. Обратите внимание, что нажати� клавиш на �амом "
+"деле означают нажати� клавиш, по�тому зде�ь вам нужно указывать то, что вы "
+"на �амом деле нажимаете на клавиатуре. В таблице ниже в левом �толбце "
+"показан желаемый ввод, а в правом �толбце показано, что должно быть указано "
+"в на�тройках.\n"
+"\n"
+"\"enter\" (т.е. перевод �троки)        Enter или Return\n"
+"a (т.е. �трочна� a)                  A\n"
+"A (т.е. заглавна� a)                 Shift+A\n"
+": (двоеточие)                        Shift+;\n"
+"' ' (пробел)                         Space"
 
 #. Name
 #: trinity2b1.khotkeys:56
@@ -357,9 +371,25 @@ msgid ""
 "Qt Designer seems to always have title 'Qt Designer by Trolltech', so the "
 "condition will check for the active window having that title."
 msgstr ""
-"По Ctrl+W будет �мулировано нажатие Ctrl+F4 дл� закрыти� окна Qt Designer.\n"
-"Пои�к окна Qt Designer о�уще�твл�ет�� по заголовку \"Qt Designer by Trolltech"
-"\"."
+"Сначала прочтите комментарий к дей�твию «ввод \"Hello\"».\n"
+"\n"
+"Qt Designer и�пользует Ctrl+F4 дл� закрыти� окон (возможно, потому, что MS "
+"Windows делает �то именно так *ну что � ними подделаешь*). �о �очетание "
+"клавиш Ctrl+F4 в TDE и�пользует�� дл� перехода на 4-й виртуальный рабочий "
+"�тол, по�тому оно не работает в Qt Designer, а также Qt Designer не "
+"и�пользует �тандартное �очетание клавиш TDE дл� закрыти� окон — Ctrl+W.\n"
+"\n"
+"�о проблему можно решить, переназначив Ctrl+W на Ctrl+F4, когда активным "
+"окном �вл�ет�� Qt Designer. Когда Qt Designer активен, каждый раз при "
+"нажатии Ctrl+W вме�то �того в Qt Designer будет отправл�ть�� Ctrl+F4, а в "
+"других приложени�х Ctrl+W, конечно, продолжит работать как обычно.\n"
+"\n"
+"Теперь нам нужно указать три вещи: новый триггер бы�трого вызова «Ctrl+W», "
+"новое дей�твие ввода � клавиатуры, отправл�ющее Ctrl+F4, и новое у�ловие, "
+"�огла�но которому активным окном �вл�ет�� Qt Designer.\n"
+"Кажет��, заголовком Qt Designer в�егда �вл�ет�� «Qt Designer by Trolltech», "
+"по�тому в у�ловие можно про�то провер�ть, что активное окно имеет данный "
+"заголовок."
 
 #. Name
 #: trinity2b1.khotkeys:105
@@ -369,7 +399,7 @@ msgstr "Замена Ctrl+W на Ctrl+F4 дл� Qt Designer"
 #. Comment
 #: trinity2b1.khotkeys:123
 msgid "Qt Designer"
-msgstr ""
+msgstr "Qt Designer"
 
 #. Comment
 #: trinity2b1.khotkeys:144
@@ -402,11 +432,18 @@ msgid ""
 "(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see "
 "'XMMS_Player')."
 msgstr ""
-"При нажатии Ctrl+Alt+B �мулирует�� нажатие клавиши \"B\" дл� окна XMMS "
-"(перейти на �ледующую композицию). Окно XMMS ищет�� по кла��у окна "
-"\"XMMS_Player\".\n"
-"Кла�� окна вы можете определить, запу�тив программу \"xprop\" и нажав "
-"кур�ором мыши на окне."
+"Сначала прочтите комментарий к дей�твию «ввод \"Hello\"».\n"
+"\n"
+"Как и дей�твие «ввод \"Hello\"», оно имитирует ввод � клавиатуры, а именно: "
+"по�ле нажати� Ctrl+Alt+B оно отправл�ет B в XMMS (B в XMMS переходит на "
+"�ледующую пе�ню). Параметр «Пере�ылать ввод в» у�тановлен в значение «"
+"Указанное окно», а также указан кла�� окна: «XMMS_Player»; �то приведёт к "
+"тому, что ввод в�егда будет отправл�ть�� в �то окно. Таким образом, вы "
+"можете управл�ть XMMS, даже е�ли он находит��, например, на другом "
+"виртуальном рабочем �толе.\n"
+"\n"
+"(Запу�тите \"xprop\", щёлкните по окну XMMS и найдите WM_CLASS, чтобы "
+"увидеть «XMMS_Player»)."
 
 #. Name
 #: trinity2b1.khotkeys:173
@@ -458,17 +495,39 @@ msgid ""
 "are active only if the active window is Konqueror (class contains "
 "'konqueror')."
 msgstr ""
-"С вер�ии 3.1 Konqueror поддерживает работу � вкладками.\n"
-"�ажмите �реднюю кнопку мыши, �делайте необходимый ро�черк и отпу�тите "
-"кнопку. В�тавка тек�та по �редней кнопки мыши по прежнему работает (е�ли вы "
-"не двигаете мышь).\n"
-"До�тупны �ледующие ро�черки:\n"
-"вправо и влево - Вперёд (Alt+Стрелка вправо)\n"
-"влево и вправо - �азад (Alt+Стрелка влево)\n"
-"вверх и вниз - Вверх (Alt+Стрелка вверх)\n"
-"окружно�ть против ча�овой �трелки - Обновить (F5)\n"
-"Вы можете легко указать ро�черки, выбрав направлени� движени� мыши. В�е �ти "
-"ро�черки работают только в окне Konqueror (кла�� окна \"konqueror\")."
+"Ок, в Konqi в TDE теперь е�ть вкладки, и теперь вы также можете и�пользовать "
+"же�ты. Другие браузеры больше не нужны >;).\n"
+"\n"
+"Про�то нажмите �реднюю кнопку мыши и начните ри�овать один из же�тов, а "
+"по�ле того, как закончите, отпу�тите кнопку мыши. Е�ли вы хотите про�то "
+"в�тавить тек�т из буфера выделени� то, �то тоже работает: про�то нажмите "
+"�реднюю кнопку мыши. (Вы можете изменить и�пользуемую кнопку мыши в "
+"глобальных на�тройках).\n"
+"\n"
+"�а данный момент до�тупны �ледующие же�ты:\n"
+"- движение вправо и назад влево — Вперёд (ALt+Right)\n"
+"- движение влево и назад вправо — �азад (Alt+Влево)\n"
+"- движение вверх и назад вниз — Вверх (Alt+Up)\n"
+"- круг против ча�овой �трелки — Перезагрузить (F5)\n"
+"  (Как только � узнаю, какие из них е�ть в Opera или Mozilla, � добавлю еще "
+"и позабочу�ь, чтобы они были такими же. Или, е�ли вы �делаете �то �ами, не "
+"�те�н�йте�ь помочь мне и пришлите мне �вой hotkeysrc.)\n"
+"\n"
+"Формы же�тов (некоторые диалоговые окна вз�ты из KGesture, �па�ибо Майку "
+"Пилону) можно вводить про�то нари�овав их в окне на�троек. Вы также можете "
+"пред�тавить �ебе цифровой блок клавиатуры: же�ты ра�познают�� как �етка "
+"полей 3x3 � номерами от 1 до 9.\n"
+"\n"
+"Обратите внимание, что вы должны в точно�ти выполнить же�т, чтобы вызвать "
+"нужное дей�твие. Из-за �того дл� одного дей�тви� допу�кае�ть вводить больше "
+"одного же�та. Вам �ледует также �тарать�� избегать �ложных же�тов (при "
+"которых приходит�� мен�ть направление движени� мыши более одного раза, "
+"например, 45654 или 74123 про�ты в и�полнении, но, например, 1236987 может "
+"быть уже довольно �ложным).\n"
+"\n"
+"В �той группе определ�ют�� у�лови� дл� в�ех же�тов. В�е �ти же�ты активны, "
+"только е�ли активным окном �вл�ет�� Konqueror (кла�� окна �одержит "
+"«konqueror»)."
 
 #. Name
 #: trinity2b1.khotkeys:214
diff --git a/translations/desktop_files/khotkeys-data/zh_CN.po b/translations/desktop_files/khotkeys-data/zh_CN.po
index fad6f67fe..31cc495ae 100644
--- a/translations/desktop_files/khotkeys-data/zh_CN.po
+++ b/translations/desktop_files/khotkeys-data/zh_CN.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Wantao Liu <vantao@aosc.io>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-08-02 17:16+0000\n"
+"Last-Translator: Wantao Liu <vantao@aosc.io>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/khotkeys-data/zh_Hans/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:5
@@ -35,14 +36,13 @@ msgstr "Konqueror 窗�"
 #: konqueror_gestures_trinity21.khotkeys:20
 #: konqueror_gestures_trinity21.khotkeys:26 trinity2b1.khotkeys:226
 #: trinity2b1.khotkeys:232
-#, fuzzy
 msgid "Konqueror"
-msgstr "Konqueror 窗�"
+msgstr "Konqueror"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:35
 msgid "Press, move left, release."
-msgstr ""
+msgstr "按下，�左移动，释放。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:37 trinity2b1.khotkeys:242
@@ -55,11 +55,13 @@ msgid ""
 "Opera-style: Press, move up, release.\n"
 "NOTE: Conflicts with 'New Tab', and as such is disabled by default."
 msgstr ""
+"Opera-style：按下，�上移动，释放。\n"
+"注�：与“新标签�冲�，因此被默认为�用。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:43
 msgid "Stop Loading"
-msgstr ""
+msgstr "�止加载"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:58
@@ -86,6 +88,8 @@ msgid ""
 "Going up in URL/directory structure.\n"
 "Mozilla-style: Press, move up, move left, move up, release."
 msgstr ""
+"�览 URL 或目录的上一级。\n"
+"Mozilla-style：按下，�上移动，�左移动，�上移动，释放。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:68 trinity2b1.khotkeys:306
@@ -100,57 +104,59 @@ msgid ""
 "NOTE: Conflicts with  \"Activate Previous Tab\", and as such is disabled by "
 "default."
 msgstr ""
+"�览 URL 或目录的上一级。\n"
+"Opera-style：按下，�上移动，�左移动，�上移动，释放。\n"
+"注�：与“激活上一个标签页�冲�，因此被默认为�用。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:93
 msgid "Up #2"
-msgstr ""
+msgstr "Up #2"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:116
 msgid "Press, move up, move right, release."
-msgstr ""
+msgstr "按下，�上移动，��移动，释放。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:118
 msgid "Activate Next Tab"
-msgstr ""
+msgstr "激活下一个标签页"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:141
 msgid "Press, move up, move left, release."
-msgstr ""
+msgstr "按下，�上移动，�左移动，释放。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:143
 msgid "Activate Previous Tab"
-msgstr ""
+msgstr "激活上一个标签页"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:185
 msgid "Press, move down, move up, move down, release."
-msgstr ""
+msgstr "按下，�下移动，�上移动，�下移动，释放。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:187
 msgid "Duplicate Tab"
-msgstr ""
+msgstr "�制标签页"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:210
 msgid "Press, move down, move up, release."
-msgstr ""
+msgstr "按下，�下移动，�上移动，释放。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:212
-#, fuzzy
 msgid "Duplicate Window"
-msgstr "新建窗�"
+msgstr "�制窗�"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:235
 msgid "Press, move right, release."
-msgstr ""
+msgstr "按下，��移动，释放。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:237 trinity2b1.khotkeys:274
@@ -163,11 +169,13 @@ msgid ""
 "Press, move down, move half up, move right, move down, release.\n"
 "(Drawing a lowercase 'h'.)"
 msgstr ""
+"按下，�下移动，�上移动一�，��移动，�下移动，释放。\n"
+"（画一个�写的“h�）"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:262
 msgid "Home"
-msgstr "主文件夹"
+msgstr "首页"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:289
@@ -175,11 +183,13 @@ msgid ""
 "Press, move right, move down, move right, release.\n"
 "Mozilla-style: Press, move down, move right, release."
 msgstr ""
+"按下，��移动，�下移动，��移动，释放。\n"
+"Mozilla-style：按下，�下移动，��移动，释放。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:291
 msgid "Close Tab"
-msgstr ""
+msgstr "关闭标签页"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:318
@@ -187,16 +197,18 @@ msgid ""
 "Press, move up, release.\n"
 "Conflicts with Opera-style 'Up #2', which is disabled by default."
 msgstr ""
+"按下，�上移动，释放。\n"
+"与 Opera-style 的“Up #2�相冲�，�者被默认为�用。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:320
 msgid "New Tab"
-msgstr ""
+msgstr "新建标签页"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:343
 msgid "Press, move down, release."
-msgstr ""
+msgstr "按下，�下移动，释放。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:345
@@ -206,84 +218,85 @@ msgstr "新建窗�"
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:368
 msgid "Press, move up, move down, release."
-msgstr ""
+msgstr "按下，�上移动，�下移动，释放。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:370 trinity2b1.khotkeys:338
 msgid "Reload"
-msgstr "�新装入"
+msgstr "�新加载"
 
 #. Comment
 #: printscreen.khotkeys:5
 msgid "This group contains actions that are set up by default."
-msgstr ""
+msgstr "该组包�了预设�作。"
 
 #. Name
 #: printscreen.khotkeys:8
 msgid "Preset Actions"
-msgstr ""
+msgstr "预设�作"
 
 #. Comment
 #: printscreen.khotkeys:17
 msgid "Launches KSnapShot when PrintScrn is pressed."
-msgstr ""
+msgstr "按下 PrintScrn 键时�动 KSnapShot。"
 
 #. Name
 #: printscreen.khotkeys:19
 msgid "PrintScreen"
-msgstr ""
+msgstr "截图行为"
 
 #. Comment
 #: printscreen.khotkeys:33 printscreen.khotkeys:57 trinity2b1.khotkeys:46
 #: trinity2b1.khotkeys:71 trinity2b1.khotkeys:95 trinity2b1.khotkeys:163
 #: trinity2b1.khotkeys:203 trinity2b1.khotkeys:385
 msgid "Simple_action"
-msgstr ""
+msgstr "简��作"
 
 #. Comment
 #: printscreen.khotkeys:41
 msgid ""
 "Launches KSnapShot in window capture mode when ALT+PrintScrn is pressed.\n"
-msgstr ""
+msgstr "当按下 ALT+PrintScrn 组�键时，KSnapShot 将会在窗���模�下被�动。\n"
 
 #. Name
 #: printscreen.khotkeys:43
 msgid "PrintWindow"
-msgstr ""
+msgstr "窗�截图行为"
 
 #. Comment
 #: trinity2b1.khotkeys:5
 msgid ""
 "This group contains various examples demonstrating most of the features of "
 "KHotkeys. (Note that this group and all its actions are disabled by default.)"
-msgstr ""
+msgstr "该群组包�了丰富的针对大部分 KHotkeys "
+"特性的实例演示（请注�，该群组�其所包�的所有�作都被默认为�用）。"
 
 #. Name
 #: trinity2b1.khotkeys:8
 msgid "Examples"
-msgstr ""
+msgstr "实例"
 
 #. Comment
 #: trinity2b1.khotkeys:16
 msgid ""
 "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. "
 "Simple."
-msgstr ""
+msgstr "按下 Ctrl+Alt+I 组�键时，KSIRC 窗�将被激活（如果存在的�），就是这么简�。"
 
 #. Name
 #: trinity2b1.khotkeys:18
 msgid "Activate KSIRC Window"
-msgstr ""
+msgstr "激活 KSIRC 窗�"
 
 #. Comment
 #: trinity2b1.khotkeys:28
 msgid "KSIRC window"
-msgstr ""
+msgstr "KSIRC 窗�"
 
 #. Comment
 #: trinity2b1.khotkeys:34
 msgid "KSIRC"
-msgstr ""
+msgstr "KSIRC"
 
 #. Comment
 #: trinity2b1.khotkeys:54
@@ -301,21 +314,32 @@ msgid ""
 ": (colon)                                  Shift+;\n"
 "' '  (space)                              Space"
 msgstr ""
+"按下 Alt+Ctrl+H 组�键时，“Hello�就会�是您亲自敲键盘一样地被模拟并输入。当您"
+"懒得亲自键入“unsigned�这样的字符串的时候，这招就特别管用。输入的�个按键 "
+"(keypresses) 都由冒�“:�隔开。请注�，按键 (keypresses) 是指在键盘上真实地敲"
+"击，所以您必须写入你在键盘上真正按下的键。在下�的表格中，左�显示了将�被模"
+"拟的输入，��则显示了对应左侧输入的所�执行的（组�）键。\n"
+"\n"
+"“回车�（�新的一行）\t\t\tEnter 或 Return\n"
+"a（�写字�a）\t\t\tA\n"
+"A（大写字�A）\t\t\tShift+A\n"
+":（英文冒�）\t\t\tShift+;\n"
+"“ �（空格）\t\t\tSpace"
 
 #. Name
 #: trinity2b1.khotkeys:56
 msgid "Type 'Hello'"
-msgstr ""
+msgstr "键入“Hello�"
 
 #. Comment
 #: trinity2b1.khotkeys:79
 msgid "This action runs Konsole, after pressing Ctrl+Alt+T."
-msgstr ""
+msgstr "按下 Ctrl+Alt+T 组�键时，�行 Konsole。"
 
 #. Name
 #: trinity2b1.khotkeys:81
 msgid "Run Konsole"
-msgstr ""
+msgstr "�行 Konsole"
 
 #. Comment
 #: trinity2b1.khotkeys:103
@@ -338,16 +362,34 @@ msgid ""
 "Qt Designer seems to always have title 'Qt Designer by Trolltech', so the "
 "condition will check for the active window having that title."
 msgstr ""
+"首先请阅读关于“键入‘Hello’��作的注释。\n"
+"\n"
+"Qt Designer 使用 Ctrl+F4 组�键�关闭窗�（也许是因为 MS Windows 也这样�）。"
+"但是 Ctrl+F4 组�键在 TDE 中代表进入虚拟桌� 4，所以该�作（进入虚拟桌� 4）"
+"在 Qt Designer 中�起作用。而且，Qt Designer 也�使用 TDE 的标准�作（� "
+"Ctrl+W）�关闭窗�。\n"
+"\n"
+"但这个问题�以通过在活动窗�为 Qt Designer 时，将 Ctrl+W 组�键�设为 Ctrl+"
+"F4 �解决。当 Qt Designer 处于活动状�时，�当按下 Ctrl+W 组�键时，Ctrl+F4 "
+"将作为替代，被��给 Qt Designer。在其他应用程�中，Ctrl+W "
+"组�键�然按照常规方�工作。\n"
+"\n"
+"我们现在需�指定三件事：一个新的用以触�“Ctrl+W�的组�键设定，"
+"一个新的用以�� Ctrl+F4 "
+"组�键的键盘输入�作，以�一个新的（令上述�作有效的）�件，�活动窗�应当为 "
+"Qt Designer。\n"
+"Qt Designer 似乎总是以“Qt Designer by Trolltech�为标题，所以这个（令上述�作"
+"有效的）�件将检查活动窗�是�有这个标题。"
 
 #. Name
 #: trinity2b1.khotkeys:105
 msgid "Remap Ctrl+W to Ctrl+F4 in Qt Designer"
-msgstr ""
+msgstr "在 Qt Designer 中�映射 Ctrl+W 组�键为 Ctrl+F4"
 
 #. Comment
 #: trinity2b1.khotkeys:123
 msgid "Qt Designer"
-msgstr "Qt 设计器"
+msgstr "Qt Designer"
 
 #. Comment
 #: trinity2b1.khotkeys:144
@@ -356,11 +398,13 @@ msgid ""
 "minicli. You can use any kind of DCOP call, just like using the command line "
 "'dcop' tool."
 msgstr ""
+"通过按下 Alt+Ctrl+W 组�键，将执行一个 DCOP 调用以显示 minicli。"
+"您�以使用任何�类的 DCOP 调用，就�使用命令行工具“dcop�一样。"
 
 #. Name
 #: trinity2b1.khotkeys:146
 msgid "Perform DCOP call 'kdesktop KDesktopIface popupExecuteCommand()'"
-msgstr ""
+msgstr "执行 DCOP 以调用“kdesktop KDesktopIface popupExecuteCommand()�"
 
 #. Comment
 #: trinity2b1.khotkeys:171
@@ -377,21 +421,30 @@ msgid ""
 "(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see "
 "'XMMS_Player')."
 msgstr ""
+"首先请阅读关于“键入‘Hello’��作的注释。\n"
+"\n"
+"如�“键入‘Hello’��作一样，该�作模拟了键盘输入，具体�说，在按下 Ctrl+Alt+B "
+"组�键时，它将模拟键盘输入 B 并��到 XMMS （在 XMMS 中，B �味�跳到下一首歌"
+"曲）。选中“��到特定窗���选框，并指定一个包�“XMMS_Player�类的窗�；该�作"
+"将使得输入的内容总是被��到指定的窗�，通过这样设置，�使 XMMS "
+"在��的虚拟桌�上，您也�以��控制。\n"
+"\n"
+"(�行“xprop�并点击 XMMS 窗�，�索 WM_CLASS 以查看“XMMS_Player�）。"
 
 #. Name
 #: trinity2b1.khotkeys:173
 msgid "Next in XMMS"
-msgstr ""
+msgstr "在 XMMS 中的下一个"
 
 #. Comment
 #: trinity2b1.khotkeys:185
 msgid "XMMS window"
-msgstr ""
+msgstr "XMMS 窗�"
 
 #. Comment
 #: trinity2b1.khotkeys:191
 msgid "XMMS Player window"
-msgstr ""
+msgstr "XMMS 播放器窗�"
 
 #. Comment
 #: trinity2b1.khotkeys:211
@@ -428,6 +481,32 @@ msgid ""
 "are active only if the active window is Konqueror (class contains "
 "'konqueror')."
 msgstr ""
+"好了，TDE 中的 Konqi 有了标签页功能，您现在也�以使用手势�作啦，"
+"�需��去使用其他�览器了� （��抹泪）。\n"
+"\n"
+"�需按下鼠标中键，然�开始绘制众多手势中的任�一�，当您完��，释放鼠标中键"
+"。如果您�想进行手势�作，�是想粘贴选区，那么请点击鼠标中键（您也�以在全局"
+"设置中改��使用的特定鼠标按钮）。\n"
+"\n"
+"目�为止，有以下手势�作�用：\n"
+"��和�左�移动 - �进 (ALt+Right)\n"
+"�左和��移动 - �退 (Alt+Left)\n"
+"�上和�下移动 - �上 (Alt+Up)\n"
+"逆时针转圈 - �新加载 (F5)。\n"
+"（一旦我�现哪些手势是 Opera 或 Mozilla 中存在而我们缺失的，我将尽快补充，并"
+"会确�它们是相�的。或者您也�以自己动手，欢迎帮助我，并将您的 khotkeysrc "
+"�给我。）\n"
+"手势形状�以简�地通过在�置对�框（有些对�框�自 KGesture，感谢 Mike "
+"Pilone）中执行它们而输入。您也�以看一眼您的数字键盘�辅助您�解，"
+"手势的识别就�一个编�为从 1 到 9 的 3x3 网格区域。\n"
+"\n"
+"请注�，您必须通过准确地执行手势�触��作。也正因为如此，�有�能为指定的�"
+"作输入更多的手势。您也应该尽�����的手势，�多次改�鼠标移动的方�（例如"
+"，� 1236987 这类手势�能已�相当困难，建议设置� 45654 或 74123 "
+"这类手势，因为它们执行起�很简�）。\n"
+"\n"
+"所有手势的（触�）�件都已�在该组中定义，�所有手势都�有在活动窗�是 "
+"Konqueror（手势类中包� “konqueror�）时�会生效。"
 
 #. Name
 #: trinity2b1.khotkeys:214
@@ -441,8 +520,11 @@ msgid ""
 "http://www.trinitydesktop.org . You may run all kind of commands you can run "
 "in minicli (Alt+F2)."
 msgstr ""
+"在按下 Win+E (Tux+E) 组�键时，将�动�览器并打开 http://"
+"www.trinitydesktop.org 网站。您�以�行所有您能够在 minicli (Alt+F2) "
+"中�行的命令。"
 
 #. Name
 #: trinity2b1.khotkeys:371
 msgid "Go to TDE Website"
-msgstr "转到 TDE 网站"
+msgstr "�览 TDE 官方网站"
diff --git a/translations/desktop_files/kicker-desktops/el.po b/translations/desktop_files/kicker-desktops/el.po
index 0e7454a98..142182300 100644
--- a/translations/desktop_files/kicker-desktops/el.po
+++ b/translations/desktop_files/kicker-desktops/el.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# blu.256 <mavridisf@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 16:24+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-09-18 17:59+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kicker-desktop-files/el/>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: applets/clock/clockapplet.desktop:4
@@ -155,7 +156,7 @@ msgstr "Επέκταση γÏ�αμμής Ï€Ï�οσαÏ�τημένων εφαÏ�μοÎ
 #. Name
 #: extensions/kasbar/kasbarextension.desktop:2
 msgid "KasBar"
-msgstr ""
+msgstr "KasBar"
 
 #. Comment
 #: extensions/kasbar/kasbarextension.desktop:4
@@ -256,7 +257,7 @@ msgstr "Επέκταση θυγατ�ικο� πίνακα."
 #. Comment
 #: kicker/interfaces/kickoffsearchplugin.desktop:5
 msgid "A search plugin for Kickoff"
-msgstr ""
+msgstr "Ένα π�όσθετο αναζήτησης για το Kickoff"
 
 #. Name
 #: kicker/kcmkicker.desktop:10
@@ -375,7 +376,7 @@ msgstr "Μενο� για το σ�στημα εκτ�πωσης"
 #. Name
 #: menuext/tom/tom.desktop:2
 msgid "TOM"
-msgstr ""
+msgstr "TOM"
 
 #. Comment
 #: menuext/tom/tom.desktop:4
diff --git a/translations/desktop_files/kicker-desktops/ru.po b/translations/desktop_files/kicker-desktops/ru.po
index 1ca530d66..654456e63 100644
--- a/translations/desktop_files/kicker-desktops/ru.po
+++ b/translations/desktop_files/kicker-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 16:24+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kicker-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: applets/clock/clockapplet.desktop:4
@@ -153,7 +155,7 @@ msgstr "Ра�ширение панели дл� в�траивани� прил
 #. Name
 #: extensions/kasbar/kasbarextension.desktop:2
 msgid "KasBar"
-msgstr ""
+msgstr "KasBar"
 
 #. Comment
 #: extensions/kasbar/kasbarextension.desktop:4
@@ -253,7 +255,7 @@ msgstr "Ра�ширение дочерней панели"
 #. Comment
 #: kicker/interfaces/kickoffsearchplugin.desktop:5
 msgid "A search plugin for Kickoff"
-msgstr ""
+msgstr "Модуль пои�ка дл� Kickoff"
 
 #. Name
 #: kicker/kcmkicker.desktop:10
@@ -368,7 +370,7 @@ msgstr "Бы�трый до�туп к �и�теме печати"
 #. Name
 #: menuext/tom/tom.desktop:2
 msgid "TOM"
-msgstr ""
+msgstr "TOM"
 
 #. Comment
 #: menuext/tom/tom.desktop:4
diff --git a/translations/desktop_files/kicker-desktops/zh_CN.po b/translations/desktop_files/kicker-desktops/zh_CN.po
index 3ffe2bccb..14025f28a 100644
--- a/translations/desktop_files/kicker-desktops/zh_CN.po
+++ b/translations/desktop_files/kicker-desktops/zh_CN.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Wantao Liu <vantao@aosc.io>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 16:24+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-09-21 11:39+0000\n"
+"Last-Translator: Wantao Liu <vantao@aosc.io>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kicker-desktop-files/zh_Hans/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: applets/clock/clockapplet.desktop:4
@@ -24,7 +25,7 @@ msgstr "时钟"
 #. Comment
 #: applets/clock/clockapplet.desktop:6
 msgid "An analog and digital clock"
-msgstr "模拟和数字时钟���程�"
+msgstr "在主��上显示模拟或数�管等样�的自定义时钟��"
 
 #. Name
 #: applets/launcher/quicklauncher.desktop:3
@@ -34,7 +35,7 @@ msgstr "快速�动"
 #. Comment
 #: applets/launcher/quicklauncher.desktop:5
 msgid "Directly access your frequently used applications"
-msgstr "直接访问您最�常使用的应用程�"
+msgstr "轻�访问您最常用的应用程�"
 
 #. Name
 #: applets/lockout/lockout.desktop:3
@@ -54,7 +55,7 @@ msgstr "存储介质"
 #. Comment
 #: applets/media/mediaapplet.desktop:5
 msgid "Directly access your storage media"
-msgstr "直接访问您的存储介质"
+msgstr "轻�访问存储介质"
 
 #. Name
 #: applets/menu/menuapplet.desktop:4
@@ -69,22 +70,22 @@ msgstr "嵌入独立���的�程�"
 #. Name
 #: applets/minipager/minipagerapplet.desktop:4
 msgid "Desktop Preview & Pager"
-msgstr "桌�预览器和页�切�器"
+msgstr "虚拟桌�预览与切�器"
 
 #. Comment
 #: applets/minipager/minipagerapplet.desktop:6
 msgid "Preview, manage and switch to multiple virtual desktops"
-msgstr "预览�管��切�多个虚拟桌�"
+msgstr "预览�管�以�在多个虚拟桌�之间进行切�"
 
 #. Name
 #: applets/naughty/naughtyapplet.desktop:3
 msgid "Runaway Process Catcher"
-msgstr "�跑进程��器"
+msgstr "失控进程�消器"
 
 #. Comment
 #: applets/naughty/naughtyapplet.desktop:5
 msgid "Detect and end broken processes which consume too much CPU time"
-msgstr "检测并结��用太多 CPU 时间的进程"
+msgstr "监测并终止消耗过多 CPU 时间的失控进程"
 
 #. Name
 #: applets/run/runapplet.desktop:3
@@ -94,7 +95,7 @@ msgstr "�行命令"
 #. Comment
 #: applets/run/runapplet.desktop:5
 msgid "Launch single commands without a terminal window"
-msgstr "调用��命令而无须使用终端窗�"
+msgstr "无需终端窗���执行�个命令"
 
 #. Name
 #: applets/swallow/swallowapplet.desktop:3
@@ -119,12 +120,12 @@ msgstr "系统托盘�程�"
 #. Name
 #: applets/taskbar/taskbarapplet.desktop:3
 msgid "Taskbar"
-msgstr "任务�"
+msgstr "任务�"
 
 #. Comment
 #: applets/taskbar/taskbarapplet.desktop:5
 msgid "The default task bar for window management"
-msgstr "窗�管�的默认任务�"
+msgstr "用于窗�管�的系统默认任务�"
 
 #. Name
 #: applets/trash/trashapplet.desktop:3
@@ -134,27 +135,27 @@ msgstr "回收站"
 #. Comment
 #: applets/trash/trashapplet.desktop:5
 msgid "Displays the trashcan and allows files to be dropped onto it"
-msgstr "显示回收站，并�许您将文件拖至其上"
+msgstr "显示�许通过拖拽以执行删除的垃圾桶"
 
 #. Name
 #: extensions/dockbar/dockbarextension.desktop:2
 msgid "Dock Application Bar"
-msgstr "��应用程��"
+msgstr "应用程����"
 
 #. Comment
 #: extensions/dockbar/dockbarextension.desktop:4
 msgid "Dock application bar extension."
-msgstr "��应用程��扩展。"
+msgstr "��应用程�的拓展任务�"
 
 #. Name
 #: extensions/kasbar/kasbarextension.desktop:2
 msgid "KasBar"
-msgstr ""
+msgstr "KasBar"
 
 #. Comment
 #: extensions/kasbar/kasbarextension.desktop:4
 msgid "An alternative taskbar panel applet."
-msgstr "备选的任务����程�。"
+msgstr "新颖的任务����程�"
 
 #. Name
 #: extensions/sidebar/sidebarextension.desktop:2
@@ -164,22 +165,22 @@ msgstr "通用侧边�"
 #. Comment
 #: extensions/sidebar/sidebarextension.desktop:4
 msgid "Wrapper around Konqueror's navigation panel"
-msgstr "Konqueror 导航��的转�器"
+msgstr "将 Konqueror 导航��打包到桌�上"
 
 #. Name
 #: extensions/taskbar/taskbarextension.desktop:2
 msgid "External Taskbar"
-msgstr "外部任务�"
+msgstr "外置任务�"
 
 #. Comment
 #: extensions/taskbar/taskbarextension.desktop:4
 msgid "External taskbar panel extension"
-msgstr "外部任务���扩展"
+msgstr "将任务���外置于主��之外"
 
 #. Name
 #: kicker/buttons/bookmarks.desktop:2
 msgid "Bookmarks Menu"
-msgstr "书签��"
+msgstr "书签"
 
 #. Comment
 #: kicker/buttons/bookmarks.desktop:4
@@ -189,12 +190,12 @@ msgstr "您的 Konqueror 书签"
 #. Name
 #: kicker/buttons/browser.desktop:2
 msgid "Quick File Browser"
-msgstr "快速文件�览器"
+msgstr "快�文件�览器"
 
 #. Comment
 #: kicker/buttons/browser.desktop:4
 msgid "A menu that lists files in a given folder"
-msgstr "列出给定文件夹中文件的��"
+msgstr "列出指定文件夹中文件的��"
 
 #. Name
 #: kicker/buttons/desktop.desktop:2
@@ -204,7 +205,7 @@ msgstr "显示桌�"
 #. Comment
 #: kicker/buttons/desktop.desktop:4
 msgid "A button that gives quick access to the desktop when pressed"
-msgstr "按下�快速访问桌�的按钮"
+msgstr "添加快速访问桌�的按钮"
 
 #. Name
 #: kicker/buttons/exec.desktop:2
@@ -214,7 +215,7 @@ msgstr "� TDE 应用程��动器"
 #. Comment
 #: kicker/buttons/exec.desktop:4
 msgid "A launcher for programs not in the TDE Menu"
-msgstr "�动�在 TDE ��中的程�"
+msgstr "为� TDE 应用程�制作个性化�动按钮"
 
 #. Name
 #: kicker/buttons/kmenu.desktop:2
@@ -224,7 +225,7 @@ msgstr "TDE ��"
 #. Comment
 #: kicker/buttons/kmenu.desktop:4
 msgid "Applications and common actions"
-msgstr "应用程�和公共�作"
+msgstr "应用程�和常用�作"
 
 #. Name
 #: kicker/buttons/windowlist.desktop:2
@@ -234,7 +235,7 @@ msgstr "窗�列表��"
 #. Comment
 #: kicker/buttons/windowlist.desktop:4
 msgid "A menu that lists all open windows"
-msgstr "列出打开的全部窗�的��"
+msgstr "列出全部已打开窗�的��"
 
 #. Name
 #: kicker/core/childpanelextension.desktop:2
@@ -244,12 +245,12 @@ msgstr "��"
 #. Comment
 #: kicker/core/childpanelextension.desktop:4
 msgid "Child panel extension."
-msgstr "���扩展。"
+msgstr "在�幕四周拓展���，以放置更多的�程�或应用程�"
 
 #. Comment
 #: kicker/interfaces/kickoffsearchplugin.desktop:5
 msgid "A search plugin for Kickoff"
-msgstr ""
+msgstr "Kickoff �索�件"
 
 #. Name
 #: kicker/kcmkicker.desktop:10
@@ -269,7 +270,7 @@ msgstr "查找"
 #. Comment
 #: menuext/find/find.desktop:4
 msgid "Menu for starting a file or web search"
-msgstr "�动文件或 Web �索的��"
+msgstr "�动文件/Web�索的��"
 
 #. Name
 #: menuext/find/kfind.desktop:11
@@ -289,7 +290,7 @@ msgstr "Kate 会���"
 #. Comment
 #: menuext/kate/katesessionmenu.desktop:4
 msgid "Allows you to open Kate with a specified session, or create a new one"
-msgstr "�许您用指定会�打开 Kate，或创建新会�"
+msgstr "�许您用指定会�或创建新会�以打开 Kate"
 
 #. Name
 #: menuext/konq-profiles/konquerormenu.desktop:2
@@ -314,12 +315,12 @@ msgstr "以会�或书签�动终端模拟器的��"
 #. Name
 #: menuext/prefmenu/prefmenu.desktop:2
 msgid "Trinity Control Center"
-msgstr "控制中心"
+msgstr "Trinity 控制中心"
 
 #. Comment
 #: menuext/prefmenu/prefmenu.desktop:4
 msgid "Trinity Control Center modules menu"
-msgstr "控制中心模���"
+msgstr "Trinity 控制中心模���"
 
 #. Name
 #: menuext/recentdocs/recentdocs.desktop:2
@@ -329,7 +330,7 @@ msgstr "最近文档"
 #. Comment
 #: menuext/recentdocs/recentdocs.desktop:4
 msgid "Menu of documents you have used recently"
-msgstr "您最近使用过的文档的��"
+msgstr "您最近使用过的文档列表"
 
 #. Name
 #: menuext/remote/remotemenu.desktop:2
@@ -349,7 +350,7 @@ msgstr "系统��"
 #. Comment
 #: menuext/system/systemmenu.desktop:4
 msgid "Menu of important system places"
-msgstr "��系统�置的��"
+msgstr "��系统�置��"
 
 #. Name
 #: menuext/tdeprint/printmenu.desktop:2
@@ -364,9 +365,9 @@ msgstr "打�系统��"
 #. Name
 #: menuext/tom/tom.desktop:2
 msgid "TOM"
-msgstr "任务��"
+msgstr "任务导���"
 
 #. Comment
 #: menuext/tom/tom.desktop:4
 msgid "A task oriented menu system"
-msgstr "��任务的��系统"
+msgstr "任务导�的��系统"
diff --git a/translations/desktop_files/klipper-desktops/ru.po b/translations/desktop_files/klipper-desktops/ru.po
index 066641e40..b934bb3a6 100644
--- a/translations/desktop_files/klipper-desktops/ru.po
+++ b/translations/desktop_files/klipper-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-12-09 05:14+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/klipper-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: klipper.desktop:2
@@ -75,7 +77,7 @@ msgstr "Отправить &�траницу"
 #. Description
 #: klipperrc.desktop:51
 msgid "Mail-URL"
-msgstr ""
+msgstr "�дре� почты"
 
 #. Description
 #: klipperrc.desktop:56
diff --git a/translations/desktop_files/kmenuedit.desktop/pl.po b/translations/desktop_files/kmenuedit.desktop/pl.po
index c290d73f1..d172a6d92 100644
--- a/translations/desktop_files/kmenuedit.desktop/pl.po
+++ b/translations/desktop_files/kmenuedit.desktop/pl.po
@@ -1,26 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 14:56+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kmenuedit-kmenueditdesktop/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: kmenuedit.desktop:2
-#, fuzzy
 msgid "KMenuEdit"
-msgstr "Edytor menu"
+msgstr "KMenuEdit"
 
 #. GenericName
 #: kmenuedit.desktop:4
diff --git a/translations/desktop_files/knetattach.desktop/es.po b/translations/desktop_files/knetattach.desktop/es.po
index a8082f6db..50cf4453b 100644
--- a/translations/desktop_files/knetattach.desktop/es.po
+++ b/translations/desktop_files/knetattach.desktop/es.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Real name <sbdc1wdfzk@crossmailjet.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 14:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-08-29 21:56+0000\n"
+"Last-Translator: Real name <sbdc1wdfzk@crossmailjet.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/knetattach-knetattachdesktop/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: knetattach.desktop:2
 msgid "KNetAttach"
-msgstr ""
+msgstr "KNetAttach"
 
 #. GenericName
 #: knetattach.desktop:4
diff --git a/translations/desktop_files/knetattach.desktop/pl.po b/translations/desktop_files/knetattach.desktop/pl.po
index e7de56850..bfc57ce1a 100644
--- a/translations/desktop_files/knetattach.desktop/pl.po
+++ b/translations/desktop_files/knetattach.desktop/pl.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 14:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/knetattach-knetattachdesktop/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: knetattach.desktop:2
 msgid "KNetAttach"
-msgstr ""
+msgstr "KNetAttach"
 
 #. GenericName
 #: knetattach.desktop:4
diff --git a/translations/desktop_files/konqueror-desktops/ru.po b/translations/desktop_files/konqueror-desktops/ru.po
index d25400f3d..15652655a 100644
--- a/translations/desktop_files/konqueror-desktops/ru.po
+++ b/translations/desktop_files/konqueror-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konqueror-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Home.desktop:7
@@ -46,7 +48,7 @@ msgstr "В не�колько колонок"
 #: kfmclient_war.desktop:9 konqbrowser.desktop:7 konqueror.desktop:6
 #: konquerorsu.desktop:8
 msgid "Konqueror"
-msgstr ""
+msgstr "Konqueror"
 
 #. GenericName
 #: konqbrowser.desktop:9
@@ -75,9 +77,10 @@ msgstr "Зачитывание тек�та"
 
 #. Comment
 #: kttsplugin/tdehtmlkttsd.desktop:14
-#, fuzzy
 msgid "A plugin which enables texts to be read aloud on the web with KTTS"
-msgstr "Выполнить команду из Konqueror"
+msgstr ""
+"Ра�ширение, которое позвол�ет во�производить в�лух тек�т на web-�траницах � "
+"помощью KTTS"
 
 #. Name
 #: listview/konq_detailedlistview.desktop:3
@@ -131,9 +134,8 @@ msgstr "Разработка в TDE"
 
 #. Name
 #: profile_midnightcommander.desktop:9
-#, fuzzy
 msgid "Midnight Commander"
-msgstr "Выполнить команду"
+msgstr "Midnight Commander"
 
 #. Name
 #: profile_simplebrowser.desktop:2
diff --git a/translations/desktop_files/konsole-desktops/ru.po b/translations/desktop_files/konsole-desktops/ru.po
index 94a071046..3fba2ec5b 100644
--- a/translations/desktop_files/konsole-desktops/ru.po
+++ b/translations/desktop_files/konsole-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-04-12 17:44+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konsole-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmkonsole.desktop:9
@@ -158,7 +160,7 @@ msgstr "Кон�оль"
 #. Name
 #: other/3shells:2
 msgid "Three consoles"
-msgstr ""
+msgstr "Три кон�оли"
 
 #. Title2
 #: other/3shells:8 other/4shells:8 other/5shells:8
diff --git a/translations/desktop_files/konsole-desktops/zh_CN.po b/translations/desktop_files/konsole-desktops/zh_CN.po
index 483378bc9..8cd38a5a1 100644
--- a/translations/desktop_files/konsole-desktops/zh_CN.po
+++ b/translations/desktop_files/konsole-desktops/zh_CN.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Wantao Liu <vantao@aosc.io>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-08-23 07:29+0000\n"
+"Last-Translator: Wantao Liu <vantao@aosc.io>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/konsole-desktop-files/zh_Hans/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmkonsole.desktop:9
@@ -24,18 +25,17 @@ msgstr "控制�"
 #. GenericName
 #: kcmkonsole.desktop:11
 msgid "All Konsole Settings"
-msgstr "Konsole 的全部设置"
+msgstr "Konsole 设置"
 
 #. Keywords
 #: kcmkonsole.desktop:13
 msgid "konsole;console;terminal;"
-msgstr "konsole;console;terminal;终端;控制�;"
+msgstr "konsole，控制� (console)，终端 (terminal);"
 
 #. Name
 #: konsole-script.desktop:9 konsole.desktop:9 konsolesu.desktop:10
-#, fuzzy
 msgid "Konsole"
-msgstr "控制�"
+msgstr "Konsole"
 
 #. GenericName
 #: konsole-script.desktop:11 konsole.desktop:11
@@ -45,27 +45,27 @@ msgstr "终端程�"
 #. Comment
 #: konsole/x-konsole.desktop:7
 msgid "File to Open a Shell"
-msgstr "打开 Shell 的文件"
+msgstr "用于打开 Shell 的文件类型"
 
 #. Name
 #: konsolepart.desktop:14 terminalemulator.desktop:5
 msgid "Terminal Emulator"
-msgstr "终端仿真器"
+msgstr "终端模拟器"
 
 #. GenericName
 #: konsolesu.desktop:12
 msgid "Terminal Program - Super User Mode"
-msgstr "终端程� - 超级用户模�"
+msgstr "终端程�：超级用户模�"
 
 #. Name
 #: kwrited.desktop:2
 msgid "TDE Write Daemon"
-msgstr "TDE Write 守护程�"
+msgstr "TDE Write 守护进程"
 
 #. Comment
 #: kwrited.desktop:4
 msgid "Watch for messages from local users sent with write(1) or wall(1)"
-msgstr "监视本地用户�出的 write(1) 或 wall(1)"
+msgstr "监视本地用户�出的 write(1) 或 wall(1) 消�"
 
 #. Name
 #: other/linux.desktop:3
@@ -79,14 +79,13 @@ msgstr "新建 Linux 控制�"
 
 #. Name
 #: other/mc.desktop:3
-#, fuzzy
 msgid "Midnight Commander"
-msgstr "新建 Midnight Commander"
+msgstr "打开 Midnight Commander 界�"
 
 #. Comment
 #: other/mc.desktop:4
 msgid "New Midnight Commander"
-msgstr "新建 Midnight Commander"
+msgstr "打开 Midnight Commander 界�"
 
 #. Name
 #: other/screen.desktop:3
@@ -102,7 +101,6 @@ msgstr "新建�幕会�"
 #. Title0
 #: other/shell.desktop:3 other/2shells:6 other/3shells:6 other/4shells:6
 #: other/5shells:6
-#, fuzzy
 msgid "Shell"
 msgstr "新建 Shell"
 
@@ -113,80 +111,70 @@ msgstr "新建 Shell"
 
 #. Name
 #: other/su.desktop.cmake:3
-#, fuzzy
 msgid "Root Shell"
-msgstr "新建 Root Shell"
+msgstr "以管�员身份 (root) 新建 Shell"
 
 #. Comment
 #: other/su.desktop.cmake:4
 msgid "New Root Shell"
-msgstr "新建 Root Shell"
+msgstr "以管�员身份 (root) 新建 Shell"
 
 #. Name
 #: other/sumc.desktop.cmake:3
-#, fuzzy
 msgid "Root Midnight Commander"
-msgstr "新建 Root Midnight Commander"
+msgstr "以管�员身份 (root) 打开 Midnight Commander 界�"
 
 #. Comment
 #: other/sumc.desktop.cmake:4
 msgid "New Root Midnight Commander"
-msgstr "新建 Root Midnight Commander"
+msgstr "以管�员身份 (root) 打开 Midnight Commander 界�"
 
 #. Name
 #: terminalhere.desktop:6
-#, fuzzy
 msgid "Terminal"
-msgstr "终端程�"
+msgstr "终端"
 
 #. Name
 #: terminalhere.desktop:11
 msgid "Open Terminal Here"
-msgstr "在此打开终端"
+msgstr "在此处打开终端"
 
 #. Name
 #: other/2shells:2
-#, fuzzy
 msgid "Two consoles"
-msgstr "控制�"
+msgstr "两个控制�"
 
 #. Title1
 #: other/2shells:7 other/3shells:7 other/4shells:7 other/5shells:7
-#, fuzzy
 msgid "Shell No. 2"
-msgstr "新建 Shell"
+msgstr "2 � Shell"
 
 #. Name
 #: other/3shells:2
 msgid "Three consoles"
-msgstr ""
+msgstr "三个控制�"
 
 #. Title2
 #: other/3shells:8 other/4shells:8 other/5shells:8
-#, fuzzy
 msgid "Shell No. 3"
-msgstr "新建 Shell"
+msgstr "3 � Shell"
 
 #. Name
 #: other/4shells:2
-#, fuzzy
 msgid "Four consoles"
-msgstr "Linux 控制�"
+msgstr "四个控制�"
 
 #. Title3
 #: other/4shells:9 other/5shells:9
-#, fuzzy
 msgid "Shell No. 4"
-msgstr "新建 Shell"
+msgstr "4 � Shell"
 
 #. Name
 #: other/5shells:2
-#, fuzzy
 msgid "Five consoles"
-msgstr "Linux 控制�"
+msgstr "五个控制�"
 
 #. Title4
 #: other/5shells:10
-#, fuzzy
 msgid "Shell No. 5"
-msgstr "新建 Shell"
+msgstr "5 � Shell"
diff --git a/translations/desktop_files/konsole-eventsrc/pl.po b/translations/desktop_files/konsole-eventsrc/pl.po
index 6abcdf343..a2db92a6c 100644
--- a/translations/desktop_files/konsole-eventsrc/pl.po
+++ b/translations/desktop_files/konsole-eventsrc/pl.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 15:54+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konsole-events/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Comment
 #: eventsrc:3
 msgid "Konsole"
-msgstr ""
+msgstr "Konsola"
 
 #. Name
 #: eventsrc:6
diff --git a/translations/desktop_files/konsole-eventsrc/pt_BR.po b/translations/desktop_files/konsole-eventsrc/pt_BR.po
index 5c695758a..1fe78b49f 100644
--- a/translations/desktop_files/konsole-eventsrc/pt_BR.po
+++ b/translations/desktop_files/konsole-eventsrc/pt_BR.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Diogo Leal <diogo@diogoleal.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 15:54+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-04-07 15:44+0000\n"
+"Last-Translator: Diogo Leal <diogo@diogoleal.com>\n"
+"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/konsole-events/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: eventsrc:3
 msgid "Konsole"
-msgstr ""
+msgstr "Konsole"
 
 #. Name
 #: eventsrc:6
diff --git a/translations/desktop_files/konsole-eventsrc/zh_CN.po b/translations/desktop_files/konsole-eventsrc/zh_CN.po
index ed9fe8fc1..b827b2400 100644
--- a/translations/desktop_files/konsole-eventsrc/zh_CN.po
+++ b/translations/desktop_files/konsole-eventsrc/zh_CN.po
@@ -1,72 +1,73 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Wantao Liu <vantao@aosc.io>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 15:54+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-08-23 07:29+0000\n"
+"Last-Translator: Wantao Liu <vantao@aosc.io>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/konsole-events/zh_Hans/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: eventsrc:3
 msgid "Konsole"
-msgstr ""
+msgstr "Konsole"
 
 #. Name
 #: eventsrc:6
 msgid "Bell in visible session"
-msgstr "��会�中的�铃"
+msgstr "��会��铃"
 
 #. Comment
 #: eventsrc:7
 msgid "Bell emitted within a visible session"
-msgstr "��会�中�生的�铃"
+msgstr "��会�中�生�铃"
 
 #. Name
 #: eventsrc:12
 msgid "Bell in non-visible session"
-msgstr "���会�中的�铃"
+msgstr "���会��铃"
 
 #. Comment
 #: eventsrc:13
 msgid "Bell emitted within a non-visible session"
-msgstr "���会�中�生的�铃"
+msgstr "���会�中�生�铃"
 
 #. Name
 #: eventsrc:18
 msgid "Activity in monitored session"
-msgstr "被监视会�中的活动"
+msgstr "�监视会�中有活动"
 
 #. Comment
 #: eventsrc:19
 msgid "Activity detected in a monitored session"
-msgstr "被监视会�中检测到的活动"
+msgstr "在�监视会�中检测到活动"
 
 #. Name
 #: eventsrc:23
 msgid "Silence in monitored session"
-msgstr "被监视会�中的缄默"
+msgstr "�监视会�中无活动"
 
 #. Comment
 #: eventsrc:24
 msgid "Silence detected in a monitored session"
-msgstr "被监视会�中检测到的缄默"
+msgstr "没有在�监视会�中检测到活动"
 
 #. Name
 #: eventsrc:28
 msgid "Session finished with non-zero status"
-msgstr "�零状�完�的会�"
+msgstr "会�以错误状�完�"
 
 #. Comment
 #: eventsrc:29
 msgid "A session has exited with non-zero status"
-msgstr "会�以�零状�退出"
+msgstr "会�以错误状�退出"
diff --git a/translations/desktop_files/ksplash-desktops/ru.po b/translations/desktop_files/ksplash-desktops/ru.po
index 710b0aad7..c78a51038 100644
--- a/translations/desktop_files/ksplash-desktops/ru.po
+++ b/translations/desktop_files/ksplash-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 19:16+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-12-17 17:55+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksplash-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmksplash/ksplashthememgr.desktop:12
@@ -29,18 +31,17 @@ msgstr "Менеджер тем �крана-за�тавки"
 #. Keywords
 #: kcmksplash/ksplashthememgr.desktop:16
 msgid "splash screen;splash theme;startup;"
-msgstr ""
+msgstr "splash screen;splash theme;startup;за�тавка;тема за�тавки;запу�к;"
 
 #. Name
 #: ksplash.desktop:2
-#, fuzzy
 msgid "KSplash"
-msgstr "Модуль KSplash"
+msgstr "KSplash"
 
 #. Name
 #: themeengine/default/ksplashdefault.desktop:3
 msgid "KSplashLegacy"
-msgstr ""
+msgstr "KSplashLegacy"
 
 #. Comment
 #: themeengine/default/ksplashdefault.desktop:4
@@ -53,14 +54,14 @@ msgstr "Модуль KSplash"
 #. Name
 #: themeengine/redmond/ksplashredmond.desktop:3
 msgid "KSplashRedmond"
-msgstr ""
+msgstr "KSplashRedmond"
 
 #. Name
 #: themeengine/standard/ksplashstandard.desktop:3
 msgid "KSplashStandard"
-msgstr ""
+msgstr "KSplashStandard"
 
 #. Name
 #: themeengine/unified/ksplashunified.desktop:3
 msgid "KSplashUnified"
-msgstr ""
+msgstr "KSplashUnified"
diff --git a/translations/desktop_files/ksplash-themes/el.po b/translations/desktop_files/ksplash-themes/el.po
new file mode 100644
index 000000000..b986ce7d3
--- /dev/null
+++ b/translations/desktop_files/ksplash-themes/el.po
@@ -0,0 +1,101 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# blu.256 <mavridisf@gmail.com>, 2022.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-01-24 18:26+0100\n"
+"PO-Revision-Date: 2022-09-18 17:59+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ksplash-themes/el/>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.13.1\n"
+
+#. Name
+#: pics/themes/TDE-Classic/Theme.rc:4
+#: pics/themes/TDE-Classic/locolor/Theme.rc:4
+msgid "TDE 3.5 Splash Screen"
+msgstr "Θέμα KSplash TDE"
+
+#. Description
+#: pics/themes/TDE-Classic/Theme.rc:5
+#: pics/themes/TDE-Classic/locolor/Theme.rc:5
+msgid "Waves of change"
+msgstr "Τα κ�ματα της αλλαγής"
+
+#. Name
+#: pics/themes/blue-bend/Theme.rc:6
+msgid "Blue-Bend KDE Splash Theme"
+msgstr "Blue Bend KDE"
+
+#. Description
+#: pics/themes/blue-bend/Theme.rc:7
+msgid "Load Blue-Bend KDE KSplash theme."
+msgstr "Χ�ήση θέματος Blue Bend KDE."
+
+#. Name
+#: pics/themes/default/Theme.rc:6
+#, fuzzy
+msgid "Refresh TDE Splash Theme"
+msgstr "KSplash Ανανέωαη"
+
+#. Description
+#: pics/themes/default/Theme.rc:7
+msgid "Load Refresh TDE KSplash theme."
+msgstr "Χ�ήση θέματος"
+
+#. Name
+#: pics/themes/none/Theme.rc:4
+msgid "No Splash Screen"
+msgstr ""
+
+#. Description
+#: pics/themes/none/Theme.rc:5
+msgid "Splash Screen Turned Off"
+msgstr ""
+
+#. Name
+#: pics/themes/simple/Theme.rc:4
+msgid "Simple Splash Screen"
+msgstr ""
+
+#. Description
+#: pics/themes/simple/Theme.rc:5
+msgid "Very Simple Optimized Splash Screen"
+msgstr ""
+
+#. Name
+#: pics/themes/unified/Theme.rc:4
+msgid "Trinity Unified Splash Screen"
+msgstr ""
+
+#. Description
+#: pics/themes/unified/Theme.rc:5
+msgid "Unified system startup screen"
+msgstr ""
+
+#. Name
+#: themeengine/redmond/Theme.rc:2
+msgid "Redmond Splash Screen"
+msgstr ""
+
+#. Description
+#: themeengine/redmond/Theme.rc:3
+msgid "KSplash theme inspired by the Microsoft Windows startup screen."
+msgstr ""
+
+#. Name
+#: themeengine/standard/Theme.rc:2
+msgid "Standard Splash Screen"
+msgstr ""
+
+#. Description
+#: themeengine/standard/Theme.rc:3
+msgid "Standard TDE KSplash theme."
+msgstr ""
diff --git a/translations/desktop_files/ksplash-themes/es.po b/translations/desktop_files/ksplash-themes/es.po
index 72aa6e916..d1713d986 100644
--- a/translations/desktop_files/ksplash-themes/es.po
+++ b/translations/desktop_files/ksplash-themes/es.po
@@ -1,99 +1,100 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Real name <sbdc1wdfzk@crossmailjet.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-24 18:26+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-08-29 21:56+0000\n"
+"Last-Translator: Real name <sbdc1wdfzk@crossmailjet.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksplash-themes/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: pics/themes/TDE-Classic/Theme.rc:4
 #: pics/themes/TDE-Classic/locolor/Theme.rc:4
 msgid "TDE 3.5 Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora de TDE 3.5"
 
 #. Description
 #: pics/themes/TDE-Classic/Theme.rc:5
 #: pics/themes/TDE-Classic/locolor/Theme.rc:5
 msgid "Waves of change"
-msgstr ""
+msgstr "Olas del cambio"
 
 #. Name
 #: pics/themes/blue-bend/Theme.rc:6
 msgid "Blue-Bend KDE Splash Theme"
-msgstr ""
+msgstr "Tema de Anunciador KDE Azul-curvado"
 
 #. Description
 #: pics/themes/blue-bend/Theme.rc:7
 msgid "Load Blue-Bend KDE KSplash theme."
-msgstr ""
+msgstr "Carga el Tema KDE Azul-curvado."
 
 #. Name
 #: pics/themes/default/Theme.rc:6
 msgid "Refresh TDE Splash Theme"
-msgstr ""
+msgstr "Tema de Anunciador TDE Refrescado"
 
 #. Description
 #: pics/themes/default/Theme.rc:7
 msgid "Load Refresh TDE KSplash theme."
-msgstr ""
+msgstr "Carga el tema KSplash TDE Refrescado."
 
 #. Name
 #: pics/themes/none/Theme.rc:4
 msgid "No Splash Screen"
-msgstr ""
+msgstr "Sin Pantalla Anunciadora"
 
 #. Description
 #: pics/themes/none/Theme.rc:5
 msgid "Splash Screen Turned Off"
-msgstr ""
+msgstr "Pantalla Anunciadora Apagada"
 
 #. Name
 #: pics/themes/simple/Theme.rc:4
 msgid "Simple Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora Simple"
 
 #. Description
 #: pics/themes/simple/Theme.rc:5
 msgid "Very Simple Optimized Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora Optimizada y Simple"
 
 #. Name
 #: pics/themes/unified/Theme.rc:4
 msgid "Trinity Unified Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora Unificada de Trinity"
 
 #. Description
 #: pics/themes/unified/Theme.rc:5
 msgid "Unified system startup screen"
-msgstr ""
+msgstr "Pantalla unificada de inicio del sistema"
 
 #. Name
 #: themeengine/redmond/Theme.rc:2
 msgid "Redmond Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora de Redmond"
 
 #. Description
 #: themeengine/redmond/Theme.rc:3
 msgid "KSplash theme inspired by the Microsoft Windows startup screen."
-msgstr ""
+msgstr "Tema KSplash inspirado por la pantalla de inicio de Microsoft Windows."
 
 #. Name
 #: themeengine/standard/Theme.rc:2
 msgid "Standard Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora Estandar"
 
 #. Description
 #: themeengine/standard/Theme.rc:3
 msgid "Standard TDE KSplash theme."
-msgstr ""
+msgstr "Tema KSplash Estandar de TDE."
diff --git a/translations/desktop_files/ksplash-themes/ru.po b/translations/desktop_files/ksplash-themes/ru.po
index 4cf36220a..146be4e9a 100644
--- a/translations/desktop_files/ksplash-themes/ru.po
+++ b/translations/desktop_files/ksplash-themes/ru.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Alexander Golubev <fatzer2@gmail.com>, 2021.
+# Alexander Golubev <fatzer2@gmail.com>, 2021, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-24 18:26+0100\n"
-"PO-Revision-Date: 2021-02-14 18:48+0000\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
 "Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/ksplash-themes/ru/>\n"
@@ -14,9 +14,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.4.2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: pics/themes/TDE-Classic/Theme.rc:4
@@ -43,12 +43,12 @@ msgstr "Тема KSplash «Синий изгиб KDE»."
 #. Name
 #: pics/themes/default/Theme.rc:6
 msgid "Refresh TDE Splash Theme"
-msgstr ""
+msgstr "Обновлённа� тема за�тавки TDE"
 
 #. Description
 #: pics/themes/default/Theme.rc:7
 msgid "Load Refresh TDE KSplash theme."
-msgstr ""
+msgstr "Тема за�тавки TDE Load Refresh."
 
 #. Name
 #: pics/themes/none/Theme.rc:4
@@ -63,39 +63,39 @@ msgstr "За�тавка отключена"
 #. Name
 #: pics/themes/simple/Theme.rc:4
 msgid "Simple Splash Screen"
-msgstr ""
+msgstr "Про�та� за�тавка"
 
 #. Description
 #: pics/themes/simple/Theme.rc:5
 msgid "Very Simple Optimized Splash Screen"
-msgstr ""
+msgstr "Очень про�та�, но оптимизированна� тема за�тавки"
 
 #. Name
 #: pics/themes/unified/Theme.rc:4
 msgid "Trinity Unified Splash Screen"
-msgstr ""
+msgstr "Объединённа� тема за�тавки Trinity"
 
 #. Description
 #: pics/themes/unified/Theme.rc:5
 msgid "Unified system startup screen"
-msgstr ""
+msgstr "Объединённый �и�темный �кран за�тавки"
 
 #. Name
 #: themeengine/redmond/Theme.rc:2
 msgid "Redmond Splash Screen"
-msgstr ""
+msgstr "За�тавка Редмонд"
 
 #. Description
 #: themeengine/redmond/Theme.rc:3
 msgid "KSplash theme inspired by the Microsoft Windows startup screen."
-msgstr ""
+msgstr "Тема за�тавки KSplash вдохновлённа� �краном загрузки Microsoft Windows."
 
 #. Name
 #: themeengine/standard/Theme.rc:2
 msgid "Standard Splash Screen"
-msgstr ""
+msgstr "Стандартна� за�тавка"
 
 #. Description
 #: themeengine/standard/Theme.rc:3
 msgid "Standard TDE KSplash theme."
-msgstr ""
+msgstr "Стандартна� тема за�тавки TDE."
diff --git a/translations/desktop_files/ksysguard-eventsrc/ru.po b/translations/desktop_files/ksysguard-eventsrc/ru.po
index 32cd04328..54b3bde40 100644
--- a/translations/desktop_files/ksysguard-eventsrc/ru.po
+++ b/translations/desktop_files/ksysguard-eventsrc/ru.po
@@ -1,22 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Alexander Golubev <fatzer2@gmail.com>, 2022.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 20:10+0200\n"
-"PO-Revision-Date: 2022-02-14 23:01+0000\n"
-"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"PO-Revision-Date: 2023-12-09 05:14+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/ksysguard-events/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.10.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: eventsrc:3
@@ -36,7 +37,7 @@ msgstr "Соответ�твие шаблону пои�ка"
 #. Name
 #: eventsrc:10
 msgid "sensor_alarm"
-msgstr ""
+msgstr "sensor_alarm"
 
 #. Comment
 #: eventsrc:11
diff --git a/translations/desktop_files/ktip.desktop/es.po b/translations/desktop_files/ktip.desktop/es.po
index 59b640cc8..fcd687cb6 100644
--- a/translations/desktop_files/ktip.desktop/es.po
+++ b/translations/desktop_files/ktip.desktop/es.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Real name <sbdc1wdfzk@crossmailjet.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 20:16+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-08-29 21:56+0000\n"
+"Last-Translator: Real name <sbdc1wdfzk@crossmailjet.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ktip-ktipdesktop/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: ktip.desktop:2
 msgid "KTip"
-msgstr ""
+msgstr "KTip"
 
 #. GenericName
 #: ktip.desktop:4
diff --git a/translations/desktop_files/kxkb-desktops/ru.po b/translations/desktop_files/kxkb-desktops/ru.po
index 0c3a55332..b927f8bae 100644
--- a/translations/desktop_files/kxkb-desktops/ru.po
+++ b/translations/desktop_files/kxkb-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 20:20+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kxkb-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: keyboard.desktop:12
@@ -30,6 +32,8 @@ msgstr "�а�тройка клавиатуры"
 #: keyboard.desktop:16
 msgid "Keyboard;Keyboard repeat;Click volume;Input Devices;repeat;volume;"
 msgstr ""
+"Клавиатура;�втоповтор;Звук нажати� клавишь;Звук;У�трой�тва "
+"ввода;повтор;громко�ть;"
 
 #. Name
 #. Comment
@@ -39,9 +43,8 @@ msgstr "Ра�кладка клавиатуры"
 
 #. Keywords
 #: keyboard_layout.desktop:16
-#, fuzzy
 msgid "Keyboard;Layout;International;"
-msgstr "Ра�кладка клавиатуры"
+msgstr "Клавиатура;Ра�кладка;Международный;"
 
 #. Name
 #: kxkb.desktop:4
diff --git a/translations/desktop_files/kxkb-eventsrc/it.po b/translations/desktop_files/kxkb-eventsrc/it.po
new file mode 100644
index 000000000..d7fb9cc64
--- /dev/null
+++ b/translations/desktop_files/kxkb-eventsrc/it.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-12-25 17:45+0900\n"
+"PO-Revision-Date: 2024-01-15 08:06+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kxkb-events/it/>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Comment
+#: eventsrc:3
+msgid "TDE Keyboard Tool"
+msgstr "Strumento TDE per la tastiera"
+
+#. Name
+#: eventsrc:6
+msgid "Keyboard layout switch"
+msgstr "Cambia layout della tastiera"
+
+#. Comment
+#: eventsrc:7
+msgid "The keyboard layout was switched"
+msgstr "Il layout della tastiera è stato cambiato"
diff --git a/translations/desktop_files/kxkb-eventsrc/kxkb-eventsrc.pot b/translations/desktop_files/kxkb-eventsrc/kxkb-eventsrc.pot
new file mode 100644
index 000000000..c4fefe679
--- /dev/null
+++ b/translations/desktop_files/kxkb-eventsrc/kxkb-eventsrc.pot
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-12-25 17:45+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Comment
+#: eventsrc:3
+msgid "TDE Keyboard Tool"
+msgstr ""
+
+#. Name
+#: eventsrc:6
+msgid "Keyboard layout switch"
+msgstr ""
+
+#. Comment
+#: eventsrc:7
+msgid "The keyboard layout was switched"
+msgstr ""
diff --git a/translations/desktop_files/kxkb-eventsrc/ru.po b/translations/desktop_files/kxkb-eventsrc/ru.po
new file mode 100644
index 000000000..1591aaeb8
--- /dev/null
+++ b/translations/desktop_files/kxkb-eventsrc/ru.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-12-25 17:45+0900\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kxkb-events/ru/>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Comment
+#: eventsrc:3
+msgid "TDE Keyboard Tool"
+msgstr "Утилита TDE дл� работы � клавиатурой"
+
+#. Name
+#: eventsrc:6
+msgid "Keyboard layout switch"
+msgstr "Переключение ра�кладки клавиатуры"
+
+#. Comment
+#: eventsrc:7
+msgid "The keyboard layout was switched"
+msgstr "Ра�кладка клавиатуры была переключена"
diff --git a/translations/desktop_files/l10n-desktops/pl.po b/translations/desktop_files/l10n-desktops/pl.po
index 06f1c10ea..7666e1f11 100644
--- a/translations/desktop_files/l10n-desktops/pl.po
+++ b/translations/desktop_files/l10n-desktops/pl.po
@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Jan Stolarek <jwstolarek@gmail.com>, 2020.
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-16 18:21+0000\n"
-"PO-Revision-Date: 2020-08-12 23:04+0000\n"
-"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"PO-Revision-Date: 2022-10-25 18:06+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
 "Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/l10n-desktop-files/pl/>\n"
 "Language: pl\n"
@@ -16,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: caribbean.desktop:2
@@ -497,7 +498,7 @@ msgstr "Wielka Brytania"
 #: gd/entry.desktop:2
 #, fuzzy
 msgid "Grenada"
-msgstr "Kanada"
+msgstr "Grenada"
 
 #. Name
 #: ge/entry.desktop:2
@@ -800,7 +801,7 @@ msgstr "Nowa Zelandia"
 #: mk/entry.desktop:3
 #, fuzzy
 msgid "Macedonia"
-msgstr "Nowa Kaledonia"
+msgstr "Macedonia"
 
 #. Name
 #: ml/entry.desktop:2
@@ -816,7 +817,7 @@ msgstr ""
 #: mn/entry.desktop:2
 #, fuzzy
 msgid "Mongolia"
-msgstr "Kongo"
+msgstr "Mongolia"
 
 #. Name
 #: mo/entry.desktop:2
@@ -900,7 +901,7 @@ msgstr "Wyspy Norfolk"
 #: ng/entry.desktop:2
 #, fuzzy
 msgid "Nigeria"
-msgstr "Algieria"
+msgstr "Nigeria"
 
 #. Name
 #: ni/entry.desktop:2
@@ -966,7 +967,7 @@ msgstr "Filipiny"
 #: pk/entry.desktop:2
 #, fuzzy
 msgid "Pakistan"
-msgstr "Tadżykistan"
+msgstr "Pakistan"
 
 #. Name
 #: pl/entry.desktop:2
@@ -1152,7 +1153,7 @@ msgstr ""
 #: tm/entry.desktop:2
 #, fuzzy
 msgid "Turkmenistan"
-msgstr "Tadżykistan"
+msgstr "Turkmenistan"
 
 #. Name
 #: tn/entry.desktop:2
@@ -1203,7 +1204,7 @@ msgstr "Ukraina"
 #: ug/entry.desktop:2
 #, fuzzy
 msgid "Uganda"
-msgstr "Ruanda"
+msgstr "Uganda"
 
 #. Name
 #: us/entry.desktop:2
@@ -1219,7 +1220,7 @@ msgstr "Urugwaj"
 #: uz/entry.desktop:2
 #, fuzzy
 msgid "Uzbekistan"
-msgstr "Tadżykistan"
+msgstr "Uzbekistan"
 
 #. Name
 #: va/entry.desktop:2
diff --git a/translations/desktop_files/l10n-desktops/ru.po b/translations/desktop_files/l10n-desktops/ru.po
index 91d8aff0b..47f7d4dba 100644
--- a/translations/desktop_files/l10n-desktops/ru.po
+++ b/translations/desktop_files/l10n-desktops/ru.po
@@ -1,20 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-16 18:21+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/l10n-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: caribbean.desktop:2
@@ -244,7 +247,7 @@ msgstr "Бенин"
 #. Name
 #: bm/entry.desktop:2
 msgid "Bermuda"
-msgstr "Бермуд�кие О�трова"
+msgstr "Бермуды"
 
 #. Name
 #: bn/entry.desktop:3
@@ -264,7 +267,7 @@ msgstr "Бразили�"
 #. Name
 #: braille/entry.desktop:2
 msgid "Braille"
-msgstr ""
+msgstr "Шрифт Брайл�"
 
 #. Name
 #: bs/entry.desktop:2
@@ -309,7 +312,7 @@ msgstr "Демократиче�ка� Ре�публика Конго"
 #. Name
 #: cf/entry.desktop:2
 msgid "Central African Republic"
-msgstr "Центрально-�фрикан�ка� Ре�публика"
+msgstr "Центральноафрикан�ка� Ре�публика"
 
 #. Name
 #: cg/entry.desktop:2
@@ -324,7 +327,7 @@ msgstr "Швейцари�"
 #. Name
 #: ci/entry.desktop:2
 msgid "Cote d'ivoire"
-msgstr "Кот Д'Ивуар"
+msgstr "Кот-д’Ивуар"
 
 #. Name
 #: ck/entry.desktop:2
@@ -404,7 +407,7 @@ msgstr "Доминика"
 #. Name
 #: do/entry.desktop:2
 msgid "Dominican Republic"
-msgstr "Доминикан�ка� ре�публика"
+msgstr "Доминикан�ка� Ре�публика"
 
 #. Name
 #: dz/entry.desktop:2
@@ -434,7 +437,7 @@ msgstr "Западна� Сахара"
 #. Name
 #: eo/entry.desktop:2
 msgid "Esperanto"
-msgstr ""
+msgstr "Э�перанто"
 
 #. Name
 #: er/entry.desktop:2
@@ -464,7 +467,7 @@ msgstr "Фиджи"
 #. Name
 #: fk/entry.desktop:2
 msgid "Falkland Islands (Malvinas)"
-msgstr "Фолкленд�кие (Мальвин�кие) о�трова"
+msgstr "Фолкленд�кие о�трова (Мальвин�кие)"
 
 #. Name
 #: fm/entry.desktop:2
@@ -643,10 +646,8 @@ msgstr "Япони�"
 
 #. Name
 #: jv/entry.desktop:2
-#, fuzzy
-#| msgid "Indonesia"
 msgid "Indonesia (Java)"
-msgstr "Индонези�"
+msgstr "Индонези� (Ява)"
 
 #. Name
 #: ke/entry.desktop:2
@@ -656,7 +657,7 @@ msgstr "Кени�"
 #. Name
 #: kg/entry.desktop:2
 msgid "Kyrgyzstan"
-msgstr "Киргиз�тан"
+msgstr "Киргизи�"
 
 #. Name
 #: kh/entry.desktop:2
@@ -696,7 +697,7 @@ msgstr "Кувейт"
 #. Name
 #: ky/entry.desktop:2
 msgid "Cayman Islands"
-msgstr "Каймановы о�трова"
+msgstr "О�трова Кайман"
 
 #. Name
 #: kz/entry.desktop:2
@@ -786,7 +787,7 @@ msgstr "Мадага�кар"
 #. Name
 #: mh/entry.desktop:2
 msgid "Marshall Islands"
-msgstr "Маршалловы о�трова"
+msgstr "Маршалловы О�трова"
 
 #. Name
 #: mi/entry.desktop:2 nz/entry.desktop:3
@@ -846,7 +847,7 @@ msgstr "Маврикий"
 #. Name
 #: mv/entry.desktop:2
 msgid "Maldives"
-msgstr "Мальдив�кие о�трова"
+msgstr "Мальдивы"
 
 #. Name
 #: mw/entry.desktop:2
@@ -946,7 +947,7 @@ msgstr "Француз�ка� Полинези�"
 #. Name
 #: pg/entry.desktop:2
 msgid "Papua New Guinea"
-msgstr "Папуа-�ова� Гвине�"
+msgstr "Папуа �ова� Гвине�"
 
 #. Name
 #: ph/entry.desktop:2
@@ -1056,7 +1057,7 @@ msgstr "Сингапур"
 #. Name
 #: sh/entry.desktop:2
 msgid "Saint Helena"
-msgstr "о�тров Св�той Елены"
+msgstr "О�тров Св�той Елены"
 
 #. Name
 #: si/entry.desktop:2
diff --git a/translations/desktop_files/libkonq-desktops/ru.po b/translations/desktop_files/libkonq-desktops/ru.po
index d555442f9..a9469b816 100644
--- a/translations/desktop_files/libkonq-desktops/ru.po
+++ b/translations/desktop_files/libkonq-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-22 18:52+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-12-09 05:14+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/libkonq-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: directory_bookmarkbar.desktop:3
@@ -39,4 +41,4 @@ msgstr "Модуль дл� диалога на�троек"
 #. Name
 #: servicemenus/edit-as-root.desktop:6
 msgid "Edit as system administrator"
-msgstr ""
+msgstr "Править от �и�темного админи�тратора"
diff --git a/translations/desktop_files/tde_release_notes.desktop/ru.po b/translations/desktop_files/tde_release_notes.desktop/ru.po
new file mode 100644
index 000000000..344bc6ac8
--- /dev/null
+++ b/translations/desktop_files/tde_release_notes.desktop/ru.po
@@ -0,0 +1,24 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-17 20:22+0200\n"
+"PO-Revision-Date: 2023-06-04 15:15+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tde_release_notesdesktop/ru/>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: tde_release_notes.desktop:3
+msgid "tde_release_notes"
+msgstr "Примечани� к выпу�ку TDE"
diff --git a/translations/desktop_files/tdehtml_plugins.desktop/ru.po b/translations/desktop_files/tdehtml_plugins.desktop/ru.po
index cf4df8d42..392528381 100644
--- a/translations/desktop_files/tdehtml_plugins.desktop/ru.po
+++ b/translations/desktop_files/tdehtml_plugins.desktop/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-22 19:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-12-09 05:14+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdehtml_pluginsdesktop/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: tdehtml_plugins.desktop:14
@@ -30,3 +32,4 @@ msgstr "�а�тройка модулей браузера"
 #: tdehtml_plugins.desktop:18
 msgid "konqueror;kfm;browser;html;web;www;fonts;plugins;"
 msgstr ""
+"konqueror;kfm;browser;html;web;www;fonts;plugins;браузер;шрифты;веб;плагины;"
diff --git a/translations/desktop_files/tdeintegration.desktop/ru.po b/translations/desktop_files/tdeintegration.desktop/ru.po
new file mode 100644
index 000000000..b8fc55ec5
--- /dev/null
+++ b/translations/desktop_files/tdeintegration.desktop/ru.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-25 21:05+0200\n"
+"PO-Revision-Date: 2023-06-04 15:15+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdeintegrationdesktop/ru/>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: tdeintegration.desktop:12
+msgid "TDE Integration Module"
+msgstr "Модуль интеграции TDE"
+
+#. Comment
+#: tdeintegration.desktop:14
+msgid "Module for integrating UI of non-TDE applications"
+msgstr "Модуль интеграции графиче�кой оболочки дл� приложений не из TDE"
diff --git a/translations/desktop_files/tdeioslave-desktops/ru.po b/translations/desktop_files/tdeioslave-desktops/ru.po
index 5a3e69b82..e6e644a4d 100644
--- a/translations/desktop_files/tdeioslave-desktops/ru.po
+++ b/translations/desktop_files/tdeioslave-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-04-12 17:44+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdeioslave-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: cgi/kcmcgi/kcmcgi.desktop:9
@@ -75,7 +77,7 @@ msgstr "Си�тема обработки уведомлений от подкл
 #. Comment
 #: media/mimetypes/audiocd.desktop:6
 msgid "Audio CD"
-msgstr "�удио CD"
+msgstr "�удио-CD"
 
 #. Comment
 #: media/mimetypes/blankbluray.desktop:6
diff --git a/translations/desktop_files/tdeprint-desktops/pl.po b/translations/desktop_files/tdeprint-desktops/pl.po
index dd0b18f99..0b45d7cf6 100644
--- a/translations/desktop_files/tdeprint-desktops/pl.po
+++ b/translations/desktop_files/tdeprint-desktops/pl.po
@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Jan Stolarek <jwstolarek@gmail.com>, 2020.
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2020-08-12 23:04+0000\n"
-"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"PO-Revision-Date: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
 "Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/tdeprint-desktop-files/pl/>\n"
 "Language: pl\n"
@@ -16,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: kjobviewer/kjobviewer-autostart.desktop:7 kjobviewer/kjobviewer.desktop:8
@@ -32,9 +33,8 @@ msgstr "Zadania drukowania"
 
 #. Name
 #: kprinter/kprinter.desktop:9
-#, fuzzy
 msgid "KPrinter"
-msgstr "Drukarka"
+msgstr "KPrinter"
 
 #. GenericName
 #: kprinter/kprinter.desktop:11
diff --git a/translations/desktop_files/tdeprint-desktops/ru.po b/translations/desktop_files/tdeprint-desktops/ru.po
index 60c2e3ae1..9817e3394 100644
--- a/translations/desktop_files/tdeprint-desktops/ru.po
+++ b/translations/desktop_files/tdeprint-desktops/ru.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Alexander Golubev <fatzer2@gmail.com>, 2022.
+# Alexander Golubev <fatzer2@gmail.com>, 2022, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2022-02-14 23:01+0000\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
 "Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/tdeprint-desktop-files/ru/>\n"
@@ -14,9 +14,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.10.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kjobviewer/kjobviewer-autostart.desktop:7 kjobviewer/kjobviewer.desktop:8
@@ -53,7 +53,7 @@ msgstr "�а�тройки �и�темы печати (принтеры, зад
 #. Keywords
 #: printmgr/printers.desktop:16
 msgid "print;printer;printing management;"
-msgstr ""
+msgstr "печать;принтер;управление печатью;"
 
 #. Comment
 #: slave/mimetypes/class.desktop:2
@@ -89,7 +89,7 @@ msgstr "Модель принтера"
 #. Name
 #: tdeprintfax/tdeprintfax.desktop:2
 msgid "TDEPrintFax"
-msgstr ""
+msgstr "TDEPrintFax"
 
 #. GenericName
 #: tdeprintfax/tdeprintfax.desktop:4
diff --git a/translations/desktop_files/tdm-themes/ru.po b/translations/desktop_files/tdm-themes/ru.po
index 718650b99..88a783284 100644
--- a/translations/desktop_files/tdm-themes/ru.po
+++ b/translations/desktop_files/tdm-themes/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 20:50+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-12-17 17:55+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdm-themes/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: circles/GdmGreeterTheme.desktop:7
@@ -29,19 +31,19 @@ msgstr "Тема � �иними кругами"
 #. Name
 #: minimalist/GdmGreeterTheme.desktop:8
 msgid "Minimalist"
-msgstr ""
+msgstr "Минимали�т"
 
 #. Description
 #: minimalist/GdmGreeterTheme.desktop:10
 msgid "A minimalist TDM theme for TDE, inspired by LightDM"
-msgstr ""
+msgstr "Минимали�тична� тема TDM дл� TDE, вдохновлённа� LightDM"
 
 #. Name
 #: o2_enterprise/GdmGreeterTheme.desktop:8
 msgid "O2 Enterprise"
-msgstr ""
+msgstr "O2 Enterprise"
 
 #. Description
 #: o2_enterprise/GdmGreeterTheme.desktop:10
 msgid "A sleek and professional looking TDM theme for Trinity"
-msgstr ""
+msgstr "Элегантна� и профе��иональна� тема TDM дл� Trinity"
diff --git a/translations/desktop_files/twin-clients-desktops/ru.po b/translations/desktop_files/twin-clients-desktops/ru.po
index db2d1ff33..2bdb5df23 100644
--- a/translations/desktop_files/twin-clients-desktops/ru.po
+++ b/translations/desktop_files/twin-clients-desktops/ru.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Alexander Golubev <fatzer2@gmail.com>, 2022.
+# Alexander Golubev <fatzer2@gmail.com>, 2022, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 21:19+0200\n"
-"PO-Revision-Date: 2022-02-14 23:01+0000\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
 "Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/twin-clients-desktop-files/ru/>\n"
@@ -14,9 +14,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.10.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: b2/b2.desktop:2
@@ -26,7 +26,7 @@ msgstr "B II"
 #. Name
 #: keramik/keramik.desktop:2
 msgid "Keramik"
-msgstr ""
+msgstr "Керамика"
 
 #. Name
 #: kwmtheme/kwmtheme.desktop:2
@@ -56,7 +56,7 @@ msgstr "Кварц"
 #. Name
 #: redmond/redmond.desktop:2
 msgid "Redmond"
-msgstr ""
+msgstr "Редмонд"
 
 #. Name
 #: test/test.desktop:2
@@ -66,4 +66,4 @@ msgstr "Проверка KWin"
 #. Name
 #: web/web.desktop:2
 msgid "Web"
-msgstr ""
+msgstr "Web"
diff --git a/translations/desktop_files/twin-desktops/af.po b/translations/desktop_files/twin-desktops/af.po
index 723f09b3f..2fd5fe083 100644
--- a/translations/desktop_files/twin-desktops/af.po
+++ b/translations/desktop_files/twin-desktops/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Konfigureer gevorderde venster bestuuring funksies"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Gevorderde"
diff --git a/translations/desktop_files/twin-desktops/ar.po b/translations/desktop_files/twin-desktops/ar.po
index 07b2efa74..fc6eda809 100644
--- a/translations/desktop_files/twin-desktops/ar.po
+++ b/translations/desktop_files/twin-desktops/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,6 +64,25 @@ msgstr ""
 "الأس�ل;قائمة العمليات;شريط العنوان;تحجيم;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "تهيئة ميزات النوا�ذ المتقدمة"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "متقدم"
diff --git a/translations/desktop_files/twin-desktops/az.po b/translations/desktop_files/twin-desktops/az.po
index 72918b72b..f02a38c7a 100644
--- a/translations/desktop_files/twin-desktops/az.po
+++ b/translations/desktop_files/twin-desktops/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,6 +64,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr ""
diff --git a/translations/desktop_files/twin-desktops/be.po b/translations/desktop_files/twin-desktops/be.po
index be3b5a332..2231c22bf 100644
--- a/translations/desktop_files/twin-desktops/be.po
+++ b/translations/desktop_files/twin-desktops/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,6 +67,25 @@ msgstr ""
 "titlebar;resize;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "�а�таўленне адмы�ловых здольна�ц�ў кіраванн� вокнамі"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "�дмы�ловы�"
diff --git a/translations/desktop_files/twin-desktops/bg.po b/translations/desktop_files/twin-desktops/bg.po
index 1b6a0fff2..cc949bc4c 100644
--- a/translations/desktop_files/twin-desktops/bg.po
+++ b/translations/desktop_files/twin-desktops/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,6 +66,25 @@ msgstr ""
 "resize;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "�а�тройване допълнителните параметри на прозорците"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Допълнителни"
diff --git a/translations/desktop_files/twin-desktops/bn.po b/translations/desktop_files/twin-desktops/bn.po
index 9c588911e..10e87b9b5 100644
--- a/translations/desktop_files/twin-desktops/bn.po
+++ b/translations/desktop_files/twin-desktops/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "উইণ�ডো ম�যানেজমেন�টের ক�ষ�দ�রাতিক�ষ�দ�র বৈশিষ�ট�য কনফিগার কর�ন"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "অগ�রসর"
diff --git a/translations/desktop_files/twin-desktops/br.po b/translations/desktop_files/twin-desktops/br.po
index a5265ff86..5657ba81f 100644
--- a/translations/desktop_files/twin-desktops/br.po
+++ b/translations/desktop_files/twin-desktops/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Barek"
diff --git a/translations/desktop_files/twin-desktops/bs.po b/translations/desktop_files/twin-desktops/bs.po
index 636c204c5..9ef000e5a 100644
--- a/translations/desktop_files/twin-desktops/bs.po
+++ b/translations/desktop_files/twin-desktops/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Podesite napredne mogućnosti upravljanja prozorima"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Napredno"
diff --git a/translations/desktop_files/twin-desktops/ca.po b/translations/desktop_files/twin-desktops/ca.po
index 809b3bd71..2d93482ee 100644
--- a/translations/desktop_files/twin-desktops/ca.po
+++ b/translations/desktop_files/twin-desktops/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,27 @@ msgstr ""
 "del títol;redimensionar;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr ""
+"Aquí podeu configurar les característiques avançades de la gestió de "
+"finestres"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avançat"
diff --git a/translations/desktop_files/twin-desktops/cs.po b/translations/desktop_files/twin-desktops/cs.po
index 3a541b01a..efbfbd404 100644
--- a/translations/desktop_files/twin-desktops/cs.po
+++ b/translations/desktop_files/twin-desktops/cs.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Slávek Banko <slavek.banko@axis.cz>, 2020.
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
-"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
+"PO-Revision-Date: 2023-09-19 19:39+0000\n"
 "Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
 "Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
 "tdebase/twin-desktop-files/cs/>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.2.2\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmtwin/showdesktop.desktop:4
@@ -66,6 +66,23 @@ msgstr ""
 "velikosti;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr "Aktivní okraje"
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr "Nastavení vlastností aktivních okrajů/rohů"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr "chování oken;okna;rám;titulek;okraje;rohy;aktivní okraje;aerosnap;"
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Pokro�ilé"
diff --git a/translations/desktop_files/twin-desktops/csb.po b/translations/desktop_files/twin-desktops/csb.po
index 3e089d717..df660ae64 100644
--- a/translations/desktop_files/twin-desktops/csb.po
+++ b/translations/desktop_files/twin-desktops/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "zmiana miarë;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Kònfigùracëjô awansowónëch òptacëji sprôwianiô òknama"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Awansowóné"
diff --git a/translations/desktop_files/twin-desktops/cy.po b/translations/desktop_files/twin-desktops/cy.po
index 52368e722..3ca9b8aae 100644
--- a/translations/desktop_files/twin-desktops/cy.po
+++ b/translations/desktop_files/twin-desktops/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "feintio;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Ffurfweddu Nodweddion Uwch Trefnu Ffenestri"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Uwch"
diff --git a/translations/desktop_files/twin-desktops/da.po b/translations/desktop_files/twin-desktops/da.po
index b3c2e41c3..6f2e06b9c 100644
--- a/translations/desktop_files/twin-desktops/da.po
+++ b/translations/desktop_files/twin-desktops/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,6 +63,25 @@ msgid ""
 msgstr "skyg;maksimér;minimér;sænk;operationsmenu;titellinje;ændr størrelse;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Indstil avancerede vindueshåndteringsegenskaber"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avanceret"
diff --git a/translations/desktop_files/twin-desktops/de.po b/translations/desktop_files/twin-desktops/de.po
index 36118fe0b..6a1f1483d 100644
--- a/translations/desktop_files/twin-desktops/de.po
+++ b/translations/desktop_files/twin-desktops/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,6 +64,25 @@ msgstr ""
 "Fensterheber;Maximieren;Minimieren;Nach oben/unten;Titelleiste;Größe ändern;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Erweiterte Fensterverwaltung einrichten"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Erweitert"
diff --git a/translations/desktop_files/twin-desktops/el.po b/translations/desktop_files/twin-desktops/el.po
index 5ff48b348..d3f9af202 100644
--- a/translations/desktop_files/twin-desktops/el.po
+++ b/translations/desktop_files/twin-desktops/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,6 +66,25 @@ msgstr ""
 "μενο� χει�ισμών;μπά�α τίτλου;αλλαγή μεγέθους;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Ρυθμίστε π�οχω�ημένα χα�ακτη�ιστικά της διαχεί�ισης πα�αθ��ων"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Π�οχω�ημένα"
diff --git a/translations/desktop_files/twin-desktops/en_GB.po b/translations/desktop_files/twin-desktops/en_GB.po
index e44e50a5b..0cace0efc 100644
--- a/translations/desktop_files/twin-desktops/en_GB.po
+++ b/translations/desktop_files/twin-desktops/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,6 +63,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr ""
diff --git a/translations/desktop_files/twin-desktops/eo.po b/translations/desktop_files/twin-desktops/eo.po
index f3d28d770..790ba6832 100644
--- a/translations/desktop_files/twin-desktops/eo.po
+++ b/translations/desktop_files/twin-desktops/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,6 +63,25 @@ msgid ""
 msgstr "maksimigi;minimumigi;menuo;titolo;grandec�an�i;grandigi;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Agordu la pli bonajn fenestroadministrilecojn"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Pliaj"
diff --git a/translations/desktop_files/twin-desktops/es.po b/translations/desktop_files/twin-desktops/es.po
index 6fe2bd478..bcdcb5d5e 100644
--- a/translations/desktop_files/twin-desktops/es.po
+++ b/translations/desktop_files/twin-desktops/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,6 +66,25 @@ msgstr ""
 "barra de título;redimensionarmenu;titlebar;resize;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Configuración de las propiedades avanzadas del gestor de ventanas"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avanzado"
diff --git a/translations/desktop_files/twin-desktops/et.po b/translations/desktop_files/twin-desktops/et.po
index 2469e915e..b2a0ca877 100644
--- a/translations/desktop_files/twin-desktops/et.po
+++ b/translations/desktop_files/twin-desktops/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "tiitliriba;suuruse muutmine;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Aknahalduri seadistamine"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Muu"
diff --git a/translations/desktop_files/twin-desktops/eu.po b/translations/desktop_files/twin-desktops/eu.po
index 7bed4d8c5..1ef2ba593 100644
--- a/translations/desktop_files/twin-desktops/eu.po
+++ b/translations/desktop_files/twin-desktops/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "tamaina aldatu;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Konfiguratu leiho kudeaketaren ezaugarri aurreratuak"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Aurreratua"
diff --git a/translations/desktop_files/twin-desktops/fa.po b/translations/desktop_files/twin-desktops/fa.po
index 1ac26d725..1032a0591 100644
--- a/translations/desktop_files/twin-desktops/fa.po
+++ b/translations/desktop_files/twin-desktops/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "میله عنوان، تغییر اندازه;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "پیکربندی ویژگیهای مدیریت پنجرۀ پیشر�ته"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "پیشر�ته"
diff --git a/translations/desktop_files/twin-desktops/fi.po b/translations/desktop_files/twin-desktops/fi.po
index 9db3c47a5..61b932c5b 100644
--- a/translations/desktop_files/twin-desktops/fi.po
+++ b/translations/desktop_files/twin-desktops/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,6 +64,25 @@ msgstr ""
 "varjosta;suurenna;pienennä;laske;toimintovalikko;otsikkopalkki;vaihda kokoa;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Muokkaa ikkunoinnin ominaisuuksien lisäasetuksia"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Lisäasetukset"
diff --git a/translations/desktop_files/twin-desktops/fo.po b/translations/desktop_files/twin-desktops/fo.po
index e95f78b5c..41d272602 100644
--- a/translations/desktop_files/twin-desktops/fo.po
+++ b/translations/desktop_files/twin-desktops/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Tilkomið"
diff --git a/translations/desktop_files/twin-desktops/fr.po b/translations/desktop_files/twin-desktops/fr.po
index 478ec5adf..0b399600b 100644
--- a/translations/desktop_files/twin-desktops/fr.po
+++ b/translations/desktop_files/twin-desktops/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "titre;redimensionner;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Configuration des fonctionnalités de gestion avancée des fenêtres"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avancé"
diff --git a/translations/desktop_files/twin-desktops/fy.po b/translations/desktop_files/twin-desktops/fy.po
index c0f5cfaf7..6b3148631 100644
--- a/translations/desktop_files/twin-desktops/fy.po
+++ b/translations/desktop_files/twin-desktops/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,6 +67,25 @@ msgstr ""
 "eftergrûn;grutte;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Hjir kinne jo de avansearre finsterbehearmooglikheden ynstelle"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avansearre"
diff --git a/translations/desktop_files/twin-desktops/ga.po b/translations/desktop_files/twin-desktops/ga.po
index c91acc1b8..84cf36639 100644
--- a/translations/desktop_files/twin-desktops/ga.po
+++ b/translations/desktop_files/twin-desktops/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,6 +67,25 @@ msgstr ""
 "oibríochta;barra teidil;athraigh méid;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Cumraigh ardghnéithe bhainisteoireacht na bhfuinneog"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Casta"
diff --git a/translations/desktop_files/twin-desktops/gl.po b/translations/desktop_files/twin-desktops/gl.po
index 74e393ba4..38f972ece 100644
--- a/translations/desktop_files/twin-desktops/gl.po
+++ b/translations/desktop_files/twin-desktops/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "título;redimensionar;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Configurar as características avanzadas da xestión de fiestras"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avanzado"
diff --git a/translations/desktop_files/twin-desktops/he.po b/translations/desktop_files/twin-desktops/he.po
index 8eb6e2ef2..78a164273 100644
--- a/translations/desktop_files/twin-desktops/he.po
+++ b/translations/desktop_files/twin-desktops/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,6 +66,25 @@ msgstr ""
 "maximise;maximize;minimize;minimise;lower;operations menu;titlebar;resize;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "שינוי הגדרות מתקדמות של ניהול חלונות"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "מתקד�"
diff --git a/translations/desktop_files/twin-desktops/hi.po b/translations/desktop_files/twin-desktops/hi.po
index 469957d88..56c8d5efc 100644
--- a/translations/desktop_files/twin-desktops/hi.po
+++ b/translations/desktop_files/twin-desktops/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,25 @@ msgid ""
 msgstr "शेड;अधिकतम;बड़ा;न�यूनतम;छोटा;नीचे;ऑपरेशन�स मेन�यू;शीर�षक-पट�टी;नयाआकार;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "विस�तृत विंडो प�रबंधन विशेषता कॉन�फ़िगर करें"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "विस�तृत"
diff --git a/translations/desktop_files/twin-desktops/hr.po b/translations/desktop_files/twin-desktops/hr.po
index db643f324..2680cbf42 100644
--- a/translations/desktop_files/twin-desktops/hr.po
+++ b/translations/desktop_files/twin-desktops/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,6 +67,25 @@ msgstr ""
 "traka;promjena veli�ine;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Konfiguriranje naprednih svojstava upravitelja prozora"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Napredno"
diff --git a/translations/desktop_files/twin-desktops/hu.po b/translations/desktop_files/twin-desktops/hu.po
index a2fd70b98..ca6f86c17 100644
--- a/translations/desktop_files/twin-desktops/hu.po
+++ b/translations/desktop_files/twin-desktops/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "hátraengedés;műveletek menü;címsor;átméretezés;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Az ablakkezelés speciális beállításai"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Speciális"
diff --git a/translations/desktop_files/twin-desktops/id.po b/translations/desktop_files/twin-desktops/id.po
index 53b56f6af..0f05dd315 100644
--- a/translations/desktop_files/twin-desktops/id.po
+++ b/translations/desktop_files/twin-desktops/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr ""
diff --git a/translations/desktop_files/twin-desktops/is.po b/translations/desktop_files/twin-desktops/is.po
index 4684d08e5..7cdac833a 100644
--- a/translations/desktop_files/twin-desktops/is.po
+++ b/translations/desktop_files/twin-desktops/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "stærð;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Stilla ítarlegri hegðan setustjóra"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "�tarlegt"
diff --git a/translations/desktop_files/twin-desktops/it.po b/translations/desktop_files/twin-desktops/it.po
index 3fff615e3..e900f4015 100644
--- a/translations/desktop_files/twin-desktops/it.po
+++ b/translations/desktop_files/twin-desktops/it.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
-"PO-Revision-Date: 2022-03-13 09:11+0000\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
+"PO-Revision-Date: 2023-08-23 07:29+0000\n"
 "Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
 "Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/twin-desktop-files/it/>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.11.2\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmtwin/showdesktop.desktop:4
@@ -66,6 +66,25 @@ msgstr ""
 "barra del titolo;titolo;ridimensiona;sposta;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr "Bordi Attivi"
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr "Configura le funzioni dei bordi/angoli attivi"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+"comportamento delle finestre;finestre;cornice;barra del titolo;bordi;angoli;"
+"bordi attivi;aerosnap;"
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avanzate"
@@ -177,7 +196,8 @@ msgstr "(Predefinito) Disabilita la prevenzione della cattura del fuoco per XV"
 #. Description
 #: data/fsp_workarounds_1.twinrules:10
 msgid "(Default) Allow focus stealing by the screen locker"
-msgstr "(Predefinito) Consenti la cattura del focus da parte del blocca schermo"
+msgstr ""
+"(Predefinito) Consenti la cattura del focus da parte del blocca schermo"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:21
diff --git a/translations/desktop_files/twin-desktops/ja.po b/translations/desktop_files/twin-desktops/ja.po
index 32ce54bd4..ec6995f98 100644
--- a/translations/desktop_files/twin-desktops/ja.po
+++ b/translations/desktop_files/twin-desktops/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,6 +64,25 @@ msgstr ""
 "シェード;最大化;最�化;後��;�作メニュー;タイトル�ー;サイズ変更;リサイズ;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "ウィンドウ管�機能�詳細設定"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "詳細"
diff --git a/translations/desktop_files/twin-desktops/ka.po b/translations/desktop_files/twin-desktops/ka.po
index ba03f46eb..0c33ab44d 100644
--- a/translations/desktop_files/twin-desktops/ka.po
+++ b/translations/desktop_files/twin-desktops/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "ფ�ნჯრების მენეჯერის დ�მ�ტებითი ფუნქციების კ�ნფიგურ�ცი�"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "დ�მ�ტებით"
diff --git a/translations/desktop_files/twin-desktops/kk.po b/translations/desktop_files/twin-desktops/kk.po
index 86ff0f4bd..e48c36690 100644
--- a/translations/desktop_files/twin-desktops/kk.po
+++ b/translations/desktop_files/twin-desktops/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Терезе ба�қаруының қо�ымша параметрлерін баптау"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Қо�ымша"
diff --git a/translations/desktop_files/twin-desktops/km.po b/translations/desktop_files/twin-desktops/km.po
index a8e0a6a15..f85ce590f 100644
--- a/translations/desktop_files/twin-desktops/km.po
+++ b/translations/desktop_files/twin-desktops/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,6 +63,25 @@ msgstr ""
 "ស្រមោល;ពង្រីក​អ�ិបរមា;បង្រួម​អប្បបរមា;បន្ទាប់​ចុះ​ក្រោម;ម៉ឺនុយ​ប្រ�ិប�្�ិការ;របារ​ចំណងជើង;ប្ដូរ​ទំហំ;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "កំណ�់​រចនាសម្ព�ន្ធ​លក្�ណៈ​ពិស�ស​ការ​គ្រប់គ្រង​បង្អួច​កម្រិ�​�្ពស់"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "កម្រិ�​�្ពស់"
diff --git a/translations/desktop_files/twin-desktops/ko.po b/translations/desktop_files/twin-desktops/ko.po
index 1ad59b63c..555594f9a 100644
--- a/translations/desktop_files/twin-desktops/ko.po
+++ b/translations/desktop_files/twin-desktops/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "고급 창 관리� 기능 설정하기"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "고급"
diff --git a/translations/desktop_files/twin-desktops/lo.po b/translations/desktop_files/twin-desktops/lo.po
index 3e7982cfc..613ae1fa6 100644
--- a/translations/desktop_files/twin-desktops/lo.po
+++ b/translations/desktop_files/twin-desktops/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "ທ່ານສາມາດປັບ�ຕ່ງ�ານທຳງານຂອງເຄື່ອງມືຈັດ�ານເຊສຊົນໄດ້ທີ່ນີ້"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "ັ�ຣັ່ງ"
diff --git a/translations/desktop_files/twin-desktops/lt.po b/translations/desktop_files/twin-desktops/lt.po
index 79c9f2e10..cabb3c95c 100644
--- a/translations/desktop_files/twin-desktops/lt.po
+++ b/translations/desktop_files/twin-desktops/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,6 +67,25 @@ msgstr ""
 "pakeisti dydį;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Konfigūruoti sudėtingesnes langų tvarkymo savybes"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "SudÄ—tingiau"
diff --git a/translations/desktop_files/twin-desktops/lv.po b/translations/desktop_files/twin-desktops/lv.po
index 981d98c39..c612c2e89 100644
--- a/translations/desktop_files/twin-desktops/lv.po
+++ b/translations/desktop_files/twin-desktops/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "virsraksta josla;mainīt izmēru;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Šeit Jūs varat konfigurēt logu p�rvaldīšanas iespējas"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Paplašin�ts"
diff --git a/translations/desktop_files/twin-desktops/mk.po b/translations/desktop_files/twin-desktops/mk.po
index f2a506355..09d533c77 100644
--- a/translations/desktop_files/twin-desktops/mk.po
+++ b/translations/desktop_files/twin-desktops/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,6 +66,25 @@ msgstr ""
 "resize;за�ени;рашири;�пушти;мени �о операции;на�ловна лента;промени големина;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Конфигурирајте ги напредните можно�ти за менаџмент на прозорците"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "�апредни"
diff --git a/translations/desktop_files/twin-desktops/mn.po b/translations/desktop_files/twin-desktops/mn.po
index 93ed8823f..02cf96512 100644
--- a/translations/desktop_files/twin-desktops/mn.po
+++ b/translations/desktop_files/twin-desktops/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "өөрчилөх; Үйлд�л ц��;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Өргөтгө�өн цонхны удирдлага тохируулах"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Өргөтгө�өн"
diff --git a/translations/desktop_files/twin-desktops/ms.po b/translations/desktop_files/twin-desktops/ms.po
index a016405fd..31e52664b 100644
--- a/translations/desktop_files/twin-desktops/ms.po
+++ b/translations/desktop_files/twin-desktops/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Lanjutan"
diff --git a/translations/desktop_files/twin-desktops/mt.po b/translations/desktop_files/twin-desktops/mt.po
index d63411c23..dfae87bef 100644
--- a/translations/desktop_files/twin-desktops/mt.po
+++ b/translations/desktop_files/twin-desktops/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "resize;massimizza;minimma;baxxi;Ä‹ekken;kabbar;daqqas;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Setings avvanzati tal-immaniġġjar tal-windows"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avvanzat"
diff --git a/translations/desktop_files/twin-desktops/nb.po b/translations/desktop_files/twin-desktops/nb.po
index e18ba634c..e5cfecd1d 100644
--- a/translations/desktop_files/twin-desktops/nb.po
+++ b/translations/desktop_files/twin-desktops/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "vindu; tittellinje;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Tilpass avansert vindusbehandling"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avansert"
diff --git a/translations/desktop_files/twin-desktops/nds.po b/translations/desktop_files/twin-desktops/nds.po
index 0bdefc857..1e17c47e3 100644
--- a/translations/desktop_files/twin-desktops/nds.po
+++ b/translations/desktop_files/twin-desktops/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,6 +64,25 @@ msgstr ""
 "inrullen;maximeren;minimeren;utrullen;Akschonenmenü;Titelbalken;Grött ännern;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Verwiederte Finsterinstellen"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Verwiedert"
diff --git a/translations/desktop_files/twin-desktops/ne.po b/translations/desktop_files/twin-desktops/ne.po
index a7b71634b..47d0e5767 100644
--- a/translations/desktop_files/twin-desktops/ne.po
+++ b/translations/desktop_files/twin-desktops/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,6 +64,25 @@ msgstr ""
 "छाया�; बढाउन�; बढाउन�; घटाउन�; घटाउन�;भन�दा तल; सञ�चालन मेन�; शीर�षकपट�टी; रिसाइज;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "उन�नत सञ���याल व�यवस�थापन आकृति कन�फिगर गर�न�होस�"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "उन�नत"
diff --git a/translations/desktop_files/twin-desktops/nl.po b/translations/desktop_files/twin-desktops/nl.po
index be313c057..db608b9e1 100644
--- a/translations/desktop_files/twin-desktops/nl.po
+++ b/translations/desktop_files/twin-desktops/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,6 +66,25 @@ msgstr ""
 "tibelbalk;grootte wijzigen;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Hier kunt u de geavanceerde vensterbeheermogelijkheden instellen"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Geavanceerd"
diff --git a/translations/desktop_files/twin-desktops/nn.po b/translations/desktop_files/twin-desktops/nn.po
index 125c5fde7..153f6f61a 100644
--- a/translations/desktop_files/twin-desktops/nn.po
+++ b/translations/desktop_files/twin-desktops/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "vindauge;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Set opp avanserte vindaugshandsamarfunksjonar"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avansert"
diff --git a/translations/desktop_files/twin-desktops/nso.po b/translations/desktop_files/twin-desktops/nso.po
index 823e2d0af..dfb851e27 100644
--- a/translations/desktop_files/twin-desktops/nso.po
+++ b/translations/desktop_files/twin-desktops/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "ya leina;popoleswa;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Beakanya dika tseo di beetswego pele tsa taolo ya window"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Beetswepele"
diff --git a/translations/desktop_files/twin-desktops/oc.po b/translations/desktop_files/twin-desktops/oc.po
index 05be5fedc..7414e2421 100644
--- a/translations/desktop_files/twin-desktops/oc.po
+++ b/translations/desktop_files/twin-desktops/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,6 +62,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr ""
diff --git a/translations/desktop_files/twin-desktops/pa.po b/translations/desktop_files/twin-desktops/pa.po
index d2d7788c1..0a23807aa 100644
--- a/translations/desktop_files/twin-desktops/pa.po
+++ b/translations/desktop_files/twin-desktops/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "resize;ਨਿਊਨਤਮ;ਅਧਿਕਤਮ;ਕਾਰਵਾਈ ਮੇਨੂ;ਮ�ੜ-ਅਕਾਰ;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "ਤਕਨੀਕੀ �ਰੋਖਾ ਪਰਬੰਧਨ ਫੀਚਰ ਸੰਰਚਨਾ"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "ਤਕਨੀਕੀ"
diff --git a/translations/desktop_files/twin-desktops/pl.po b/translations/desktop_files/twin-desktops/pl.po
index 9aa0e4c6b..f0828b01a 100644
--- a/translations/desktop_files/twin-desktops/pl.po
+++ b/translations/desktop_files/twin-desktops/pl.po
@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Jan Stolarek <jwstolarek@gmail.com>, 2020.
+# Marek W <coronzon88@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
-"PO-Revision-Date: 2020-08-12 23:04+0000\n"
-"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
+"PO-Revision-Date: 2023-07-07 15:16+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
 "Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/twin-desktop-files/pl/>\n"
 "Language: pl\n"
@@ -16,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmtwin/showdesktop.desktop:4
@@ -67,6 +68,23 @@ msgstr ""
 "rozmiaru;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr "Aktywne krawędzie"
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr "Konfiguracja właściwości aktywnych krawędzi i narożników"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Zaawansowane"
diff --git a/translations/desktop_files/twin-desktops/pt.po b/translations/desktop_files/twin-desktops/pt.po
index 4ebcc87f3..7f61b958e 100644
--- a/translations/desktop_files/twin-desktops/pt.po
+++ b/translations/desktop_files/twin-desktops/pt.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
+"PO-Revision-Date: 2022-10-31 21:56+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-desktop-files/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: kcmtwin/showdesktop.desktop:4
@@ -65,6 +66,25 @@ msgstr ""
 "dimensionar;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Configuração das funcionalidades de gestão de janelas avançadas"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avançado"
@@ -174,9 +194,8 @@ msgstr "(Predefinido) Desactivar a prevenção de roubo do primeiro plano do XV"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:10
-#, fuzzy
 msgid "(Default) Allow focus stealing by the screen locker"
-msgstr "(Predefinido) Desactivar a prevenção de roubo do primeiro plano do XV"
+msgstr "(Predefinido) Permitir o roubo do foco pelo bloqueador de ecrã"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:21
diff --git a/translations/desktop_files/twin-desktops/pt_BR.po b/translations/desktop_files/twin-desktops/pt_BR.po
index 5d0c8352d..7ce641868 100644
--- a/translations/desktop_files/twin-desktops/pt_BR.po
+++ b/translations/desktop_files/twin-desktops/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,6 +67,25 @@ msgstr ""
 "redimensionar;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Configura as características avançadas de gerenciamento de janela"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avançado"
diff --git a/translations/desktop_files/twin-desktops/ro.po b/translations/desktop_files/twin-desktops/ro.po
index 59e0413b6..b129fd758 100644
--- a/translations/desktop_files/twin-desktops/ro.po
+++ b/translations/desktop_files/twin-desktops/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "redimensionare;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Configurează caracteristicile de management al ferestrelor"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avansat"
diff --git a/translations/desktop_files/twin-desktops/ru.po b/translations/desktop_files/twin-desktops/ru.po
index 5037037fb..ec21e298c 100644
--- a/translations/desktop_files/twin-desktops/ru.po
+++ b/translations/desktop_files/twin-desktops/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "�а�тройка дополнительных функций менеджера окон"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Дополнительно"
diff --git a/translations/desktop_files/twin-desktops/rw.po b/translations/desktop_files/twin-desktops/rw.po
index d3ddc9922..9071ee197 100644
--- a/translations/desktop_files/twin-desktops/rw.po
+++ b/translations/desktop_files/twin-desktops/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "umwanyabikoresho;ihindurangero;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Kuboneza ibijyanye n'ubuyobozi buhanitse bw'idirishya "
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Bihanitse"
diff --git a/translations/desktop_files/twin-desktops/se.po b/translations/desktop_files/twin-desktops/se.po
index fe79a1bd9..e6fb12488 100644
--- a/translations/desktop_files/twin-desktops/se.po
+++ b/translations/desktop_files/twin-desktops/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "namahus;skálere;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Heivet viiddiduvvon lásegieđahanfunkšuvnnaid"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Viiddiduvvon"
diff --git a/translations/desktop_files/twin-desktops/sk.po b/translations/desktop_files/twin-desktops/sk.po
index 7dd94180b..bb64890cb 100644
--- a/translations/desktop_files/twin-desktops/sk.po
+++ b/translations/desktop_files/twin-desktops/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: 2020-10-06 21:31+0000\n"
 "Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
 "Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
@@ -66,6 +66,25 @@ msgstr ""
 "ponuky;titulok;zmena veľkosti;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Nastavenie pokro�ilých možností správy okien"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Pokro�ilé"
diff --git a/translations/desktop_files/twin-desktops/sl.po b/translations/desktop_files/twin-desktops/sl.po
index f9ae6456e..0e1028f54 100644
--- a/translations/desktop_files/twin-desktops/sl.po
+++ b/translations/desktop_files/twin-desktops/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "velikost;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Nastavitve dodatnih možnosti upravljanja oken"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Napredno"
diff --git a/translations/desktop_files/twin-desktops/sr.po b/translations/desktop_files/twin-desktops/sr.po
index 1357d7399..060d8d6cf 100644
--- a/translations/desktop_files/twin-desktops/sr.po
+++ b/translations/desktop_files/twin-desktops/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,6 +67,25 @@ msgstr ""
 "промена величине;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Подешавање напредних могућно�ти управљања прозорима"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "�апредно"
diff --git a/translations/desktop_files/twin-desktops/sr@Latn.po b/translations/desktop_files/twin-desktops/sr@Latn.po
index 5083b062f..b10363684 100644
--- a/translations/desktop_files/twin-desktops/sr@Latn.po
+++ b/translations/desktop_files/twin-desktops/sr@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,6 +67,25 @@ msgstr ""
 "promena veli�ine;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Podešavanje naprednih mogućnosti upravljanja prozorima"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Napredno"
diff --git a/translations/desktop_files/twin-desktops/ss.po b/translations/desktop_files/twin-desktops/ss.po
index 0fbf0f4ed..e151ad261 100644
--- a/translations/desktop_files/twin-desktops/ss.po
+++ b/translations/desktop_files/twin-desktops/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Sembili"
diff --git a/translations/desktop_files/twin-desktops/sv.po b/translations/desktop_files/twin-desktops/sv.po
index b88c892b9..8cc3b4b2d 100644
--- a/translations/desktop_files/twin-desktops/sv.po
+++ b/translations/desktop_files/twin-desktops/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,6 +63,25 @@ msgid ""
 msgstr "rulla upp;maximera;minimera;sänk;åtgärdsmeny;namnlist;ändra storlek;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Anpassa avancerade fönsterhanteringsfunktioner"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avancerat"
diff --git a/translations/desktop_files/twin-desktops/ta.po b/translations/desktop_files/twin-desktops/ta.po
index 32b204125..b0b04894a 100644
--- a/translations/desktop_files/twin-desktops/ta.po
+++ b/translations/desktop_files/twin-desktops/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "பட�டி; அளவை மாற�ற�;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "மேம�பட�ட சாளர மேலாளரின� தன�மைகளை வடிவமை"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "உயர�நிலை "
diff --git a/translations/desktop_files/twin-desktops/te.po b/translations/desktop_files/twin-desktops/te.po
index 02a5b3e78..7a5d12a25 100644
--- a/translations/desktop_files/twin-desktops/te.po
+++ b/translations/desktop_files/twin-desktops/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "ఆధ�నిక"
diff --git a/translations/desktop_files/twin-desktops/tg.po b/translations/desktop_files/twin-desktops/tg.po
index a81532bc6..97c040007 100644
--- a/translations/desktop_files/twin-desktops/tg.po
+++ b/translations/desktop_files/twin-desktops/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Танзими мудири�ти пешрафтаи тирезаҳо"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Пешрафта"
diff --git a/translations/desktop_files/twin-desktops/th.po b/translations/desktop_files/twin-desktops/th.po
index 8ae31948a..e6cefc203 100644
--- a/translations/desktop_files/twin-desktops/th.po
+++ b/translations/desktop_files/twin-desktops/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,6 +63,25 @@ msgid ""
 msgstr "พับเ�็บ;ขยายเต็มจอ;ย่อเล็�สุด;อยู่ด้านล่าง;เมนูป�ิบัติ�าร;�ถบหัวเรื่อง;ปรับขนาด;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "ปรับ�ต่งคุณสมบัติเพิ่มเติมของ�ารจัด�ารหน้าต่าง"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "เพิ่มเติม"
diff --git a/translations/desktop_files/twin-desktops/tr.po b/translations/desktop_files/twin-desktops/tr.po
index 9cb480a2a..cecaf1b58 100644
--- a/translations/desktop_files/twin-desktops/tr.po
+++ b/translations/desktop_files/twin-desktops/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,6 +63,25 @@ msgid ""
 msgstr "topla;küçült;büyüt;indir;işlemler;araç çubuğu;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Gelişmiş pencere yönetim özelliklerini yapılandır"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "GeliÅŸmiÅŸ"
diff --git a/translations/desktop_files/twin-desktops/tt.po b/translations/desktop_files/twin-desktops/tt.po
index 60cd715bf..57d502cde 100644
--- a/translations/desktop_files/twin-desktops/tt.po
+++ b/translations/desktop_files/twin-desktops/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,6 +63,25 @@ msgstr ""
 "resize;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Täräzä idäräçeneñ östämä çaraların caylaw"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Kiñäytep"
diff --git a/translations/desktop_files/twin-desktops/twin-desktops.pot b/translations/desktop_files/twin-desktops/twin-desktops.pot
index 15badbe91..54653d622 100644
--- a/translations/desktop_files/twin-desktops/twin-desktops.pot
+++ b/translations/desktop_files/twin-desktops/twin-desktops.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr ""
diff --git a/translations/desktop_files/twin-desktops/uk.po b/translations/desktop_files/twin-desktops/uk.po
index e1473f38d..cc44f1f23 100644
--- a/translations/desktop_files/twin-desktops/uk.po
+++ b/translations/desktop_files/twin-desktops/uk.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Roman Savochenko <roman@oscada.org>, 2020.
+# Roman Savochenko <roman@oscada.org>, 2020, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
-"PO-Revision-Date: 2020-07-21 05:23+0000\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
+"PO-Revision-Date: 2023-09-13 06:31+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/twin-desktop-files/uk/>\n"
@@ -14,9 +14,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmtwin/showdesktop.desktop:4
@@ -67,6 +67,25 @@ msgstr ""
 "зміна розміру;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr "�ктивні Межі"
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr "�алаштувати вла�тиво�ті активних меж/кутів"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+"поведінка вікна;вікна;рамка;�мужка заголовку;межі;кути;активні межі;"
+"повітр�ний клік;"
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Додатково"
diff --git a/translations/desktop_files/twin-desktops/uz.po b/translations/desktop_files/twin-desktops/uz.po
index 3c507067d..e862471ff 100644
--- a/translations/desktop_files/twin-desktops/uz.po
+++ b/translations/desktop_files/twin-desktops/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,25 @@ msgid ""
 msgstr "soyalash;yoyish;yigʻish;orqaga;amallar menyusi;sarlavha;resize;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Oyna boshqaruvning koʻshimcha imkoniyatlarini moslash"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Qoʻshimcha"
diff --git a/translations/desktop_files/twin-desktops/uz@cyrillic.po b/translations/desktop_files/twin-desktops/uz@cyrillic.po
index aa41c4a60..10055d6a1 100644
--- a/translations/desktop_files/twin-desktops/uz@cyrillic.po
+++ b/translations/desktop_files/twin-desktops/uz@cyrillic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,6 +61,25 @@ msgid ""
 msgstr "�о�лаш;ёйиш;йиғиш;орқага;амаллар меню�и;�арлавҳа;resize;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Ойна бошқарувнинг кўшимча имкони�тларини мо�лаш"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Қўшимча"
diff --git a/translations/desktop_files/twin-desktops/ven.po b/translations/desktop_files/twin-desktops/ven.po
index 79bf1afff..08102cf7f 100644
--- a/translations/desktop_files/twin-desktops/ven.po
+++ b/translations/desktop_files/twin-desktops/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,6 +66,25 @@ msgstr ""
 "ya thoho;uitulula saizi;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Dzudzanyani zwitenwa zwa vhulanguli ha khwinesa"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Zwa khwinesa"
diff --git a/translations/desktop_files/twin-desktops/vi.po b/translations/desktop_files/twin-desktops/vi.po
index ffce7f172..91d76445e 100644
--- a/translations/desktop_files/twin-desktops/vi.po
+++ b/translations/desktop_files/twin-desktops/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "tên thanh;thay đổi cỡ;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Cấu hình các tính năng quản lý cửa sổ nâng cao"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Nâng cao"
diff --git a/translations/desktop_files/twin-desktops/wa.po b/translations/desktop_files/twin-desktops/wa.po
index e45835657..e5193b5f7 100644
--- a/translations/desktop_files/twin-desktops/wa.po
+++ b/translations/desktop_files/twin-desktops/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "candjî li grandeu;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Apontiaedje des spepieusès fonccionålités do manaedjaedje des purneas"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Sipepieus"
diff --git a/translations/desktop_files/twin-desktops/xh.po b/translations/desktop_files/twin-desktops/xh.po
index 30b6486de..ab850aa68 100644
--- a/translations/desktop_files/twin-desktops/xh.po
+++ b/translations/desktop_files/twin-desktops/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "yewonga;yenza ubungakanani kwakhona;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Qwalasela imisebenzi esemqoka ebhekisa phambili yophatho lwe window"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Ebhekisa phambili"
diff --git a/translations/desktop_files/twin-desktops/zh_CN.po b/translations/desktop_files/twin-desktops/zh_CN.po
index c81caaa8c..239ae1ccd 100644
--- a/translations/desktop_files/twin-desktops/zh_CN.po
+++ b/translations/desktop_files/twin-desktops/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "resize;�起;最大化;最�化;�低;�作��;标题�;缩放;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "�置高级窗�管�特性"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "高级"
diff --git a/translations/desktop_files/twin-desktops/zh_TW.po b/translations/desktop_files/twin-desktops/zh_TW.po
index a00f36ad1..ebf2a177c 100644
--- a/translations/desktop_files/twin-desktops/zh_TW.po
+++ b/translations/desktop_files/twin-desktops/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "resize;收起;最大化;最�化;�下;�作�單;標題列;�設大�;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "設定進階視窗管�功能"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "進階"
diff --git a/translations/desktop_files/twin-desktops/zu.po b/translations/desktop_files/twin-desktops/zu.po
index ce8e9aff2..1cc7a8b43 100644
--- a/translations/desktop_files/twin-desktops/zu.po
+++ b/translations/desktop_files/twin-desktops/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,6 +65,25 @@ msgstr ""
 "ibha yesihloko;shintsha usayizi;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Hlanganisela amalungu okuphathwa kwe-window yezinga eliphezulu"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Okwezinga eliphezulu"
diff --git a/translations/desktop_files/wallpapers-desktops/ru.po b/translations/desktop_files/wallpapers-desktops/ru.po
index e0c92e03e..005fc8977 100644
--- a/translations/desktop_files/wallpapers-desktops/ru.po
+++ b/translations/desktop_files/wallpapers-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-22 19:13+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/wallpapers-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: All-Good-People-1.jpg.desktop:3
@@ -64,7 +66,7 @@ msgstr "Иголки"
 #. Name
 #: airplane.jpg.desktop:3
 msgid "Airplane"
-msgstr "Airplane"
+msgstr "��роплан"
 
 #. Name
 #: alta-badia.jpg.desktop:3
@@ -79,7 +81,7 @@ msgstr "Вене�у�ла"
 #. Name
 #: another-view.jpg.desktop:3
 msgid "Another View"
-msgstr "Another View"
+msgstr "Другой вид"
 
 #. Name
 #: aurora.svgz.desktop:3
@@ -134,7 +136,7 @@ msgstr "Туманно�ть Кон�ка� Голова"
 #. Name
 #: isadora.png.desktop:3
 msgid "Isadora"
-msgstr ""
+msgstr "Изадора"
 
 #. Name
 #: konqui.svgz.desktop:3
@@ -174,7 +176,7 @@ msgstr "�ациональный парк Стельвио"
 #. Name
 #: stripes.jpg.desktop:3
 msgid "Stripes"
-msgstr ""
+msgstr "Поло�ы"
 
 #. Name
 #: sunshine-after-the-rain.jpg.desktop:3
diff --git a/twin/CMakeL10n.txt b/twin/CMakeL10n.txt
index 11540e442..07bc99559 100644
--- a/twin/CMakeL10n.txt
+++ b/twin/CMakeL10n.txt
@@ -5,6 +5,7 @@ tde_l10n_create_template(
     EXCLUDES
         "^clients/"
         "^kcmtwin/"
+        "^lib/"
 )
 
 tde_l10n_auto_add_subdirectories( )
diff --git a/twin/KWinInterface.h b/twin/KWinInterface.h
index dbc132888..37fe2d9b6 100644
--- a/twin/KWinInterface.h
+++ b/twin/KWinInterface.h
@@ -18,7 +18,8 @@ class KWinInterface : virtual public DCOPObject
     virtual bool isResumeableWindowID(unsigned long winId) = 0;
     virtual void refresh() = 0;
     virtual void doNotManage(TQString)= 0;
-    virtual void showWindowMenuAt(unsigned long winId, int x, int y)= 0;
+    virtual void showWindowMenuAt(unsigned long winId, int x, int y) = 0;
+    virtual void showWindowMenu(unsigned long winId) = 0;
     virtual void kDestopResized() = 0;
     virtual void setDesktopLayout(int orientation, int x, int y)= 0;
     virtual bool setCurrentDesktop(int)= 0;
@@ -28,6 +29,10 @@ class KWinInterface : virtual public DCOPObject
     virtual void circulateDesktopApplications() = 0;
     virtual void updateOverlappingShadows(unsigned long window) = 0;
     virtual void setShadowed(unsigned long window, bool shadowed) = 0;
+    virtual void tileWindowToBorder(unsigned long w1, int location) = 0;
+    virtual void tileTwoWindowsHorizontally(unsigned long w1, unsigned long w2) = 0;
+    virtual void tileTwoWindowsVertically(unsigned long w1, unsigned long w2) = 0;
+    virtual void tileFourWindowsInGrid(unsigned long w1, unsigned long w2, unsigned long w3, unsigned long w4) = 0;
 
     // kompmgr stuff
     virtual void startKompmgr() = 0;
diff --git a/twin/README b/twin/README
index 8d61c7163..d2fb31c75 100644
--- a/twin/README
+++ b/twin/README
@@ -163,16 +163,16 @@ WM_TRANSIENT_FOR property is manually set using the XSetTransientForHint()
 call (see tdelibs/tdeioslave/http/kcookiejar/kcookiewin.cpp). The arguments
 to XSetTransientForHint() call are the X display (i.e. qt_xdisplay()),
 the window id on which the WM_TRANSIENT_FOR property is to be set
-(i.e. use QWidget::winId()), and the window id of the mainwindow.
+(i.e. use TQWidget::winId()), and the window id of the mainwindow.
 
 
   Simple short HOWTO:
   
  To put it simply: Let's say you have a daemon application that has
-DCOP call "showDialog( QString text )", and when this is called, it shows
+DCOP call "showDialog( TQString text )", and when this is called, it shows
 a dialog with the given text. This won't work properly with focus stealing
 prevention. The DCOP call should be changed to
-"showDialog( QString text, long id )". The caller should pass something like
+"showDialog( TQString text, long id )". The caller should pass something like
 myMainWindow->winId() as the second argument. In the daemon, before
 the dialog is shown, a call to XSetTransientHint() should be added:
 
diff --git a/twin/activation.cpp b/twin/activation.cpp
index 83ff24edb..47e0f9a34 100644
--- a/twin/activation.cpp
+++ b/twin/activation.cpp
@@ -674,7 +674,7 @@ void Workspace::unfakeActivity( Client* c )
 void Client::updateUserTime( Time time )
     { // copied in Group::updateUserTime
     if( time == CurrentTime )
-        time = GET_QT_X_TIME();
+        time = get_tqt_x_time();
     if( time != -1U
         && ( user_time == CurrentTime
             || timestampCompare( time, user_time ) > 0 )) // time > user_time
@@ -727,7 +727,7 @@ void Client::demandAttention( bool set )
         if( demandAttentionKNotifyTimer == NULL )
             {
             demandAttentionKNotifyTimer = new TQTimer( this );
-            connect( demandAttentionKNotifyTimer, TQT_SIGNAL( timeout()), TQT_SLOT( demandAttentionKNotify()));
+            connect( demandAttentionKNotifyTimer, TQ_SIGNAL( timeout()), TQ_SLOT( demandAttentionKNotify()));
             }
         demandAttentionKNotifyTimer->start( 1000, true );
         }
@@ -1005,7 +1005,7 @@ void Group::startupIdChanged()
 void Group::updateUserTime( Time time )
     { // copy of Client::updateUserTime
     if( time == CurrentTime )
-        time = GET_QT_X_TIME();
+        time = get_tqt_x_time();
     if( time != -1U
         && ( user_time == CurrentTime
             || timestampCompare( time, user_time ) > 0 )) // time > user_time
diff --git a/twin/bridge.cpp b/twin/bridge.cpp
index f79382457..5a9365dbe 100644
--- a/twin/bridge.cpp
+++ b/twin/bridge.cpp
@@ -147,7 +147,7 @@ TQWidget* Bridge::initialParentWidget() const
     return NULL;
     }
 
-Qt::WFlags Bridge::initialWFlags() const
+TQt::WFlags Bridge::initialWFlags() const
     {
     return 0;
     }
diff --git a/twin/bridge.h b/twin/bridge.h
index 3208b3192..b7fb51c1a 100644
--- a/twin/bridge.h
+++ b/twin/bridge.h
@@ -65,7 +65,7 @@ class Bridge : public KDecorationBridge
         virtual void setKeepBelow( bool );
         virtual int currentDesktop() const;
         virtual TQWidget* initialParentWidget() const;
-        virtual Qt::WFlags initialWFlags() const;
+        virtual TQt::WFlags initialWFlags() const;
         virtual void helperShowHide( bool show );
         virtual void grabXServer( bool grab );
     private:
diff --git a/twin/client.cpp b/twin/client.cpp
index b57cab35f..b8f00746e 100644
--- a/twin/client.cpp
+++ b/twin/client.cpp
@@ -27,6 +27,11 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tdelocale.h>
 #include <stdlib.h>
 
+#ifdef Q_OS_SOLARIS
+#include <procfs.h>
+#include <libgen.h>
+#endif /* SunOS */
+
 #include "bridge.h"
 #include "group.h"
 #include "workspace.h"
@@ -94,6 +99,7 @@ Client::Client( Workspace *ws )
         decoration( NULL ),
         wspace( ws ),
         bridge( new Bridge( this )),
+        inhibitConfigureRequests(false),
         move_faked_activity( false ),
         move_resize_grab_window( None ),
         transient_for( NULL ),
@@ -115,18 +121,23 @@ Client::Client( Workspace *ws )
         border_top( 0 ),
         border_bottom( 0 ),
         opacity_( 0 ),
-        demandAttentionKNotifyTimer( NULL )
+        demandAttentionKNotifyTimer( NULL ),
+        activeMaximizing(false),
+        activeTiled(false)
 // SELI do all as initialization
     {
     autoRaiseTimer = 0;
     shadeHoverTimer = 0;
 
+    configureRequestTimer = new TQTimer(this);
+    connect(configureRequestTimer, TQ_SIGNAL(timeout()), TQ_SLOT(configureRequestTimeout()));
+
     shadowDelayTimer = new TQTimer(this);
     opacityCache = &activeOpacityCache;
     shadowAfterClient = NULL;
     shadowWidget = NULL;
     shadowMe = true;
-    connect(shadowDelayTimer, TQT_SIGNAL(timeout()), TQT_SLOT(drawShadow()));
+    connect(shadowDelayTimer, TQ_SIGNAL(timeout()), TQ_SLOT(drawShadow()));
 
     // set the initial mapping state
     mapping_state = WithdrawnState;
@@ -171,7 +182,7 @@ Client::Client( Workspace *ws )
 
     max_mode = MaximizeRestore;
     maxmode_restore = MaximizeRestore;
-    
+
     cmap = None;
 
     frame_geometry = TQRect( 0, 0, 100, 100 ); // so that decorations don't start with size being (0,0)
@@ -255,7 +266,7 @@ void Client::releaseWindow( bool on_shutdown )
         {
         // Make sure it's not mapped if the app unmapped it (#65279). The app
         // may do map+unmap before we initially map the window by calling rawShow() from manage().
-        XUnmapWindow( tqt_xdisplay(), client ); 
+        XUnmapWindow( tqt_xdisplay(), client );
         }
     client = None;
     XDestroyWindow( tqt_xdisplay(), wrapper );
@@ -519,7 +530,7 @@ bool Client::isModalSystemNotification() const
 void Client::updateShape()
     {
     // workaround for #19644 - shaped windows shouldn't have decoration
-    if( shape() && !noBorder()) 
+    if( shape() && !noBorder())
         {
         noborder = true;
         updateDecoration( true );
@@ -598,7 +609,7 @@ TQRegion Client::mask() const
         return TQRegion( 0, 0, width(), height());
     return _mask;
     }
-    
+
 void Client::setShapable(bool b)
     {
     long tmp = b?1:0;
@@ -740,12 +751,12 @@ void Client::animateMinimizeOrUnminimize( bool minimize )
     TQPixmap pm = animationPixmap( minimize ? width() : icongeom.width() );
 
     TQRect before, after;
-    if ( minimize ) 
+    if ( minimize )
         {
         before = TQRect( x(), y(), width(), pm.height() );
         after = TQRect( icongeom.x(), icongeom.y(), icongeom.width(), pm.height() );
         }
-    else 
+    else
         {
         before = TQRect( icongeom.x(), icongeom.y(), icongeom.width(), pm.height() );
         after = TQRect( x(), y(), width(), pm.height() );
@@ -769,14 +780,14 @@ void Client::animateMinimizeOrUnminimize( bool minimize )
     TQPainter p ( workspace()->desktopWidget() );
     bool need_to_clear = FALSE;
     TQPixmap pm3;
-    do 
+    do
         {
         if (area2 != area)
             {
             pm = animationPixmap( area.width() );
             pm2 = TQPixmap::grabWindow( tqt_xrootwin(), area.x(), area.y(), area.width(), area.height() );
             p.drawPixmap( area.x(), area.y(), pm );
-            if ( need_to_clear ) 
+            if ( need_to_clear )
                 {
                 p.drawPixmap( area2.x(), area2.y(), pm3 );
                 need_to_clear = FALSE;
@@ -792,11 +803,11 @@ void Client::animateMinimizeOrUnminimize( bool minimize )
         area.setRight(before.right() + int(diff*rf));
         area.setTop(before.top() + int(diff*tf));
         area.setBottom(before.bottom() + int(diff*bf));
-        if (area2 != area ) 
+        if (area2 != area )
             {
             if ( area2.intersects( area ) )
                 p.drawPixmap( area2.x(), area2.y(), pm2 );
-            else 
+            else
                 { // no overlap, we can clear later to avoid flicker
                 pm3 = pm2;
                 need_to_clear = TRUE;
@@ -870,7 +881,7 @@ void Client::setShade( ShadeMode mode )
 
     int as = options->animateShade? 10 : 1;
 // TODO all this unmapping, resizing etc. feels too much duplicated from elsewhere
-    if ( isShade()) 
+    if ( isShade())
         { // shade_mode == ShadeNormal
         // we're about to shade, texx xcompmgr to prepare
         long _shade = 1;
@@ -884,13 +895,13 @@ void Client::setShade( ShadeMode mode )
         XUnmapWindow( tqt_xdisplay(), wrapper );
         XUnmapWindow( tqt_xdisplay(), client );
         XSelectInput( tqt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask );
-        //as we hid the unmap event, xcompmgr didn't recognize the client wid has vanished, so we'll extra inform it        
+        //as we hid the unmap event, xcompmgr didn't recognize the client wid has vanished, so we'll extra inform it
         //done xcompmgr workaround
 // FRAME       repaint( FALSE );
 //        bool wasStaticContents = testWFlags( WStaticContents );
 //        setWFlags( WStaticContents );
-        int step = TQMAX( 4, QABS( h - s.height() ) / as )+1;
-        do 
+        int step = TQMAX( 4, TQABS( h - s.height() ) / as )+1;
+        do
             {
             h -= step;
             XResizeWindow( tqt_xdisplay(), frameId(), s.width(), h );
@@ -910,17 +921,17 @@ void Client::setShade( ShadeMode mode )
             }
         // tell xcompmgr shade's done
         _shade = 2;
-        XChangeProperty(tqt_xdisplay(), frameId(), atoms->net_wm_window_shade, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &_shade, 1L);    
+        XChangeProperty(tqt_xdisplay(), frameId(), atoms->net_wm_window_shade, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &_shade, 1L);
         }
-    else 
+    else
         {
         int h = height();
         shade_geometry_change = true;
         TQSize s( sizeForClientSize( clientSize()));
 // FRAME       bool wasStaticContents = testWFlags( WStaticContents );
 //        setWFlags( WStaticContents );
-        int step = TQMAX( 4, QABS( h - s.height() ) / as )+1;
-        do 
+        int step = TQMAX( 4, TQABS( h - s.height() ) / as )+1;
+        do
             {
             h += step;
             XResizeWindow( tqt_xdisplay(), frameId(), s.width(), h );
@@ -962,6 +973,12 @@ void Client::setShade( ShadeMode mode )
     updateWindowRules();
     }
 
+void Client::configureRequestTimeout()
+    {
+    inhibitConfigureRequests = false;
+    sendSyntheticConfigureNotify();
+    }
+
 void Client::shadeHover()
     {
     setShade( ShadeHover );
@@ -1193,7 +1210,7 @@ void Client::drawDelayedShadow()
 void Client::drawShadowAfter(Client *after)
 {
     shadowAfterClient = after;
-    connect(after, TQT_SIGNAL(shadowDrawn()), TQT_SLOT(drawShadow()));
+    connect(after, TQ_SIGNAL(shadowDrawn()), TQ_SLOT(drawShadow()));
 }
 
 /*!
@@ -1207,7 +1224,7 @@ void Client::drawShadow()
 
     // If we are waiting for another Client's shadow to be drawn, stop waiting now
     if (shadowAfterClient != NULL) {
-        disconnect(shadowAfterClient, TQT_SIGNAL(shadowDrawn()), this, TQT_SLOT(drawShadow()));
+        disconnect(shadowAfterClient, TQ_SIGNAL(shadowDrawn()), this, TQ_SLOT(drawShadow()));
         shadowAfterClient = NULL;
     }
 
@@ -1253,7 +1270,7 @@ void Client::drawShadow()
 
     removeShadow();
 
-    TQMemArray<QRgb> pixelData;
+    TQMemArray<TQRgb> pixelData;
     TQPixmap shadowPixmap;
     TQRect shadow;
     TQRegion exposedRegion;
@@ -1426,7 +1443,7 @@ TQRegion Client::getExposedRegion(TQRegion occludedRegion, int x, int y, int w,
  */
 void Client::imposeCachedShadow(TQPixmap &pixmap, TQRegion exposed)
 {
-    QRgb pixel;
+    TQRgb pixel;
     double opacity;
     int red, green, blue, pixelRed, pixelGreen, pixelBlue;
     int subW, subH, w, x, y, zeroX, zeroY;
@@ -1483,7 +1500,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded,
         TQRegion exposed, int thickness, double maxOpacity)
 {
     int distance, intersectCount, i, j, x, y;
-    QRgb pixel;
+    TQRgb pixel;
     double decay, factor, opacity;
     int red, green, blue, pixelRed, pixelGreen, pixelBlue;
     int lineIntersects, maxIntersects, maxY;
@@ -1697,7 +1714,7 @@ void Client::sendClientMessage(Window w, Atom a, Atom protocol, long data1, long
     ev.xclient.message_type = a;
     ev.xclient.format = 32;
     ev.xclient.data.l[0] = protocol;
-    ev.xclient.data.l[1] = GET_QT_X_TIME();
+    ev.xclient.data.l[1] = get_tqt_x_time();
     ev.xclient.data.l[2] = data1;
     ev.xclient.data.l[3] = data2;
     ev.xclient.data.l[4] = data3;
@@ -1726,14 +1743,14 @@ void Client::closeWindow()
     if( !isCloseable())
         return;
     // Update user time, because the window may create a confirming dialog.
-    updateUserTime(); 
+    updateUserTime();
     if ( Pdeletewindow )
         {
         Notify::raise( Notify::Close );
         sendClientMessage( window(), atoms->wm_protocols, atoms->wm_delete_window);
         pingWindow();
         }
-    else 
+    else
         {
         // client will not react on wm_delete_window. We have not choice
         // but destroy his connection to the XServer.
@@ -1774,9 +1791,9 @@ void Client::pingWindow()
     if( ping_timer != NULL )
         return; // pinging already
     ping_timer = new TQTimer( this );
-    connect( ping_timer, TQT_SIGNAL( timeout()), TQT_SLOT( pingTimeout()));
+    connect( ping_timer, TQ_SIGNAL( timeout()), TQ_SLOT( pingTimeout()));
     ping_timer->start( options->killPingTimeout, true );
-    ping_timestamp = GET_QT_X_TIME();
+    ping_timestamp = get_tqt_x_time();
     workspace()->sendPingToWindow( window(), ping_timestamp );
     }
 
@@ -1833,8 +1850,8 @@ void Client::killProcess( bool ask, Time timestamp )
             << "--applicationname" << resourceClass()
             << "--wid" << TQCString().setNum( window())
             << "--timestamp" << TQCString().setNum( timestamp );
-        connect( process_killer, TQT_SIGNAL( processExited( TDEProcess* )),
-            TQT_SLOT( processKillerExited()));
+        connect( process_killer, TQ_SIGNAL( processExited( TDEProcess* )),
+            TQ_SLOT( processKillerExited()));
         if( !process_killer->start( TDEProcess::NotifyOnExit ))
             {
             delete process_killer;
@@ -1860,15 +1877,30 @@ bool Client::isSuspendable() const
         }
     else
         {
+#ifdef Q_OS_SOLARIS
+        TQFile procStatFile(TQString("/proc/%1/lwp/1/lwpsinfo").arg(pid));
+#else /* default */
         TQFile procStatFile(TQString("/proc/%1/stat").arg(pid));
+#endif
         if (procStatFile.open(IO_ReadOnly))
             {
             TQByteArray statRaw = procStatFile.readAll();
             procStatFile.close();
+#ifdef Q_OS_SOLARIS
+            lwpsinfo_t *inf = (lwpsinfo_t *)statRaw.data();
+            char tbuf[PATH_MAX];
+            TQString tcomm;
+            TQString state(TQChar(inf->pr_sname));
+
+            readlink(TQString("/proc/%1/path/a.out").arg(pid).latin1(),
+                tbuf, sizeof(tbuf));
+            tcomm = basename(tbuf);
+#else /* default */
             TQString statString(statRaw);
             TQStringList statFields = TQStringList::split(" ", statString, TRUE);
             TQString tcomm = statFields[1];
             TQString state = statFields[2];
+#endif /* default */
             if( state != "T" )
                 {
                 // Make sure no windows of this process are special
@@ -1921,15 +1953,24 @@ bool Client::isResumeable() const
         }
     else
         {
+#ifdef Q_OS_SOLARIS
+        TQFile procStatFile(TQString("/proc/%1/lwp/1/lwpsinfo").arg(pid));
+#else /* default */
         TQFile procStatFile(TQString("/proc/%1/stat").arg(pid));
+#endif
         if (procStatFile.open(IO_ReadOnly))
             {
             TQByteArray statRaw = procStatFile.readAll();
             procStatFile.close();
+#ifdef Q_OS_SOLARIS
+            lwpsinfo_t *inf = (lwpsinfo_t *)statRaw.data();
+            TQString state(TQChar(inf->pr_sname));
+#else /* default */
             TQString statString(statRaw);
             TQStringList statFields = TQStringList::split(" ", statString, TRUE);
             TQString tcomm = statFields[1];
             TQString state = statFields[2];
+#endif /* default */
             if( state == "T" )
                 {
                 return true;
@@ -1961,8 +2002,8 @@ bool Client::queryUserSuspendedResume()
                 << "--windowname" << caption().utf8()
                 << "--applicationname" << resourceClass()
                 << "--wid" << TQCString().setNum( window());
-            connect( process_resumer, TQT_SIGNAL( processExited( TDEProcess* )),
-                TQT_SLOT( processResumerExited()));
+            connect( process_resumer, TQ_SIGNAL( processExited( TDEProcess* )),
+                TQ_SLOT( processResumerExited()));
             if( !process_resumer->start( TDEProcess::NotifyOnExit ))
                 {
                 delete process_resumer;
@@ -2172,15 +2213,15 @@ void Client::takeActivity( int flags, bool handled, allowed_t )
 #ifndef NDEBUG
     static Time previous_activity_timestamp;
     static Client* previous_client;
-    if( previous_activity_timestamp == GET_QT_X_TIME() && previous_client != this )
+    if( previous_activity_timestamp == get_tqt_x_time() && previous_client != this )
         {
         kdDebug( 1212 ) << "Repeated use of the same X timestamp for activity" << endl;
         kdDebug( 1212 ) << kdBacktrace() << endl;
         }
-    previous_activity_timestamp = GET_QT_X_TIME();
+    previous_activity_timestamp = get_tqt_x_time();
     previous_client = this;
 #endif
-    workspace()->sendTakeActivity( this, GET_QT_X_TIME(), flags );
+    workspace()->sendTakeActivity( this, get_tqt_x_time(), flags );
     }
 
 // performs the actual focusing of the window using XSetInputFocus and WM_TAKE_FOCUS
@@ -2189,17 +2230,17 @@ void Client::takeFocus( allowed_t )
 #ifndef NDEBUG
     static Time previous_focus_timestamp;
     static Client* previous_client;
-    if( previous_focus_timestamp == GET_QT_X_TIME() && previous_client != this )
+    if( previous_focus_timestamp == get_tqt_x_time() && previous_client != this )
         {
         kdDebug( 1212 ) << "Repeated use of the same X timestamp for focus" << endl;
         kdDebug( 1212 ) << kdBacktrace() << endl;
         }
-    previous_focus_timestamp = GET_QT_X_TIME();
+    previous_focus_timestamp = get_tqt_x_time();
     previous_client = this;
 #endif
     if ( rules()->checkAcceptFocus( input ))
         {
-        XSetInputFocus( tqt_xdisplay(), window(), RevertToPointerRoot, GET_QT_X_TIME() );
+        XSetInputFocus( tqt_xdisplay(), window(), RevertToPointerRoot, get_tqt_x_time() );
         // Work around opacity bug
         bool activePrev = active;
         active = true;
@@ -2236,7 +2277,7 @@ bool Client::providesContextHelp() const
  */
 void Client::showContextHelp()
     {
-    if ( Pcontexthelp ) 
+    if ( Pcontexthelp )
         {
         sendClientMessage(window(), atoms->wm_protocols, atoms->net_wm_context_help);
         TQWhatsThis::enterWhatsThisMode(); // SELI?
@@ -2255,17 +2296,17 @@ void Client::fetchName()
 
 TQString Client::readName() const
     {
-    if ( info->name() && info->name()[ 0 ] != '\0' ) 
+    if ( info->name() && info->name()[ 0 ] != '\0' )
         return TQString::fromUtf8( info->name() );
-    else 
+    else
         return KWin::readNameProperty( window(), XA_WM_NAME );
     }
-    
+
 KWIN_COMPARE_PREDICATE( FetchNameInternalPredicate, const Client*, (!cl->isSpecialWindow() || cl->isToolbar()) && cl != value && cl->caption() == value->caption());
 
 void Client::setCaption( const TQString& s, bool force )
     {
-    if ( s != cap_normal || force ) 
+    if ( s != cap_normal || force )
         {
         bool reset_name = force;
         for( unsigned int i = 0;
@@ -2280,10 +2321,10 @@ void Client::setCaption( const TQString& s, bool force )
             machine_suffix = " <@" + wmClientMachine( true ) + ">";
         TQString shortcut_suffix = !shortcut().isNull() ? ( " {" + shortcut().toString() + "}" ) : "";
         cap_suffix = machine_suffix + shortcut_suffix;
-        if ( ( !isSpecialWindow() || isToolbar()) && workspace()->findClient( FetchNameInternalPredicate( this ))) 
+        if ( ( !isSpecialWindow() || isToolbar()) && workspace()->findClient( FetchNameInternalPredicate( this )))
             {
             int i = 2;
-            do 
+            do
                 {
                 cap_suffix = machine_suffix + " <" + TQString::number(i) + ">" + shortcut_suffix;
                 i++;
@@ -2313,11 +2354,11 @@ void Client::updateCaption()
 void Client::fetchIconicName()
     {
     TQString s;
-    if ( info->iconName() && info->iconName()[ 0 ] != '\0' ) 
+    if ( info->iconName() && info->iconName()[ 0 ] != '\0' )
         s = TQString::fromUtf8( info->iconName() );
-    else 
+    else
         s = KWin::readNameProperty( window(), XA_WM_ICON_NAME );
-    if ( s != cap_iconic ) 
+    if ( s != cap_iconic )
         {
 	bool was_set = !cap_iconic.isEmpty();
         cap_iconic = s;
@@ -2378,7 +2419,7 @@ void Client::getMotifHints()
     }
 
 void Client::readIcons( Window win, TQPixmap* icon, TQPixmap* miniicon )
-    {    
+    {
     // get the icons, allow scaling
     if( icon != NULL )
         *icon = KWin::icon( win, 32, 32, TRUE, KWin::NETWM | KWin::WMHints );
@@ -2494,7 +2535,7 @@ Window Client::staticWmClientLeader(WId w)
                                  FALSE, XA_WINDOW, &type, &format,
                                  &nitems, &extra, &data );
     XSetErrorHandler(oldHandler);
-    if (status  == Success ) 
+    if (status  == Success )
         {
         if (data && nitems > 0)
             result = *((Window*) data);
@@ -2672,29 +2713,29 @@ void Client::setCursor( Position m )
         {
         m = PositionCenter;
         }
-    switch ( m ) 
+    switch ( m )
         {
         case PositionTopLeft:
         case PositionBottomRight:
-            setCursor( tqsizeFDiagCursor );
+            setCursor( TQt::sizeFDiagCursor );
             break;
         case PositionBottomLeft:
         case PositionTopRight:
-            setCursor( tqsizeBDiagCursor );
+            setCursor( TQt::sizeBDiagCursor );
             break;
         case PositionTop:
         case PositionBottom:
-            setCursor( tqsizeVerCursor );
+            setCursor( TQt::sizeVerCursor );
             break;
         case PositionLeft:
         case PositionRight:
-            setCursor( tqsizeHorCursor );
+            setCursor( TQt::sizeHorCursor );
             break;
         default:
             if( buttonDown && isMovable())
-                setCursor( tqsizeAllCursor );
+                setCursor( TQt::sizeAllCursor );
             else
-                setCursor( tqarrowCursor );
+                setCursor( TQt::arrowCursor );
             break;
         }
     }
@@ -2946,7 +2987,7 @@ void Client::updateOpacity()
             }
         }
     }
-    
+
 void Client::updateShadowSize()
 // extra syncscreen flag allows to avoid double syncs when active state changes (as it will usually change for two windows)
     {
@@ -2967,7 +3008,7 @@ uint Client::ruleOpacityActive()
     {
     return rule_opacity_active;// != 0;
     }
-    
+
 bool Client::getWindowOpacity() //query translucency settings from X, returns true if window opacity is set
     {
     unsigned char *data = 0;
@@ -2985,12 +3026,12 @@ bool Client::getWindowOpacity() //query translucency settings from X, returns tr
         }
     return FALSE;
     }
-    
+
 void Client::setCustomOpacityFlag(bool custom)
     {
     custom_opacity = custom;
     }
-    
+
 uint Client::opacity()
     {
     return opacity_;
@@ -3000,7 +3041,7 @@ int Client::opacityPercentage()
     {
     return int(100*((double)opacity_/0xffffffff));
     }
-    
+
 bool Client::touches(const Client* c)
 // checks if this client borders c, needed to test beep media player window state
     {
@@ -3014,7 +3055,7 @@ bool Client::touches(const Client* c)
         return TRUE;
     return FALSE;
     }
-    
+
 void Client::setDecoHashProperty(uint topHeight, uint rightWidth, uint bottomHeight, uint leftWidth)
 {
    long data = (topHeight < 255 ? topHeight : 255) << 24 |
@@ -3028,7 +3069,7 @@ void Client::unsetDecoHashProperty()
 {
    XDeleteProperty( tqt_xdisplay(), frameId(), atoms->net_wm_window_decohash);
 }
-    
+
 #ifndef NDEBUG
 kdbgstream& operator<<( kdbgstream& stream, const Client* cl )
     {
diff --git a/twin/client.h b/twin/client.h
index d3c7e7b13..a59b20acd 100644
--- a/twin/client.h
+++ b/twin/client.h
@@ -45,7 +45,7 @@ class Bridge;
 
 class Client : public TQObject, public KDecorationDefines
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Client( Workspace *ws );
         Window window() const;
@@ -232,6 +232,15 @@ class Client : public TQObject, public KDecorationDefines
         void resizeWithChecks( int w, int h, ForceGeometry_t force = NormalGeometrySet );
         void resizeWithChecks( const TQSize& s, ForceGeometry_t force = NormalGeometrySet );
         void keepInArea( TQRect area, bool partial = false );
+        void setActiveBorderMode( ActiveMaximizingMode mode );
+        void setActiveBorder( ActiveBorder border);
+        ActiveMaximizingMode activeBorderMode() const;
+        ActiveBorder activeBorder() const;
+        void setActiveBorderMaximizing(bool maximizing);
+        void cancelActiveBorderMaximizing();
+        bool isActiveBorderMaximizing() const;
+        TQRect activeBorderMaximizeGeometry();
+        void tileToBorder(ActiveBorder border);
 
         void growHorizontal();
         void shrinkHorizontal();
@@ -331,6 +340,7 @@ class Client : public TQObject, public KDecorationDefines
     private slots:
         void autoRaise();
         void shadeHover();
+        void configureRequestTimeout();
         void shortcutActivated();
 	void updateOpacityCache();
 
@@ -448,7 +458,7 @@ class Client : public TQObject, public KDecorationDefines
         static void sendClientMessage( Window w, Atom a, Atom protocol,
             long data1 = 0, long data2 = 0, long data3 = 0 );
 
-        void embedClient( Window w, const XWindowAttributes &attr );    
+        void embedClient( Window w, const XWindowAttributes &attr );
         void detectNoBorder();
         void detectShapable();
         void destroyDecoration();
@@ -472,14 +482,15 @@ class Client : public TQObject, public KDecorationDefines
         int desk;
         bool buttonDown;
         bool moveResizeMode;
+        bool inhibitConfigureRequests;
         bool move_faked_activity;
         Window move_resize_grab_window;
         bool unrestrictedMoveResize;
-        bool isMove() const 
+        bool isMove() const
             {
             return moveResizeMode && mode == PositionCenter;
             }
-        bool isResize() const 
+        bool isResize() const
             {
             return moveResizeMode && mode != PositionCenter;
             }
@@ -550,6 +561,7 @@ class Client : public TQObject, public KDecorationDefines
         WinInfo* info;
         TQTimer* autoRaiseTimer;
         TQTimer* shadeHoverTimer;
+        TQTimer* configureRequestTimer;
         Colormap cmap;
         TQCString resource_name;
         TQCString resource_class;
@@ -600,6 +612,12 @@ class Client : public TQObject, public KDecorationDefines
         bool isBMP_;
         TQTimer* demandAttentionKNotifyTimer;
 
+        bool activeMaximizing;
+        bool activeTiled;
+        TQRect activeTiledOrigGeom;
+        ActiveMaximizingMode activeMode;
+        ActiveBorder currentActiveBorder;
+
         friend bool performTransiencyCheck();
         bool minimized_before_suspend;
     };
@@ -946,7 +964,7 @@ inline bool Client::hasUserTimeSupport() const
     {
     return info->userTime() != -1U;
     }
-    
+
 inline bool Client::ignoreFocusStealing() const
     {
     return ignore_focus_stealing;
diff --git a/twin/clients/PORTING b/twin/clients/PORTING
index 0c0c1a6ea..199ddb9de 100644
--- a/twin/clients/PORTING
+++ b/twin/clients/PORTING
@@ -2,18 +2,14 @@ It's suggested you check sources of some KDE CVS decoration if in doubts or in n
 Also, the API is documented in the .h header files.
 
 Makefile.am:
-- Change twin_ to twin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES).
 - Make sure LDFLAGS contains $(KDE_PLUGIN) and -module .
 - Add -ltdecorations to LIBADD.
 - Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/twin/ ).
 
-.desktop file:
-- Change twin_ to twin3_ in X-TDE-Library.
-
 Sources:
 - There are no twin/something.h includes, and don't use the KWinInternal namespace.
 - Use QToolTip instead of KWinToolTip.
-- Use QButton instead of KWinButton, QToolButton instead of KWinToolButton and QWidget
+- Use QButton instead of KWinButton, QToolButton instead of KWinToolButton and TQWidget
   instead of KWinWidgetButton.
 - For tooltips, use simply QToolTip::add().
 - Change Client* to MyClient* (or whatever is your main client class) in your MyButton.
@@ -26,11 +22,11 @@ Sources:
 - As the first thing in init(), call createMainWidget(); if your client class took some
   flags such as WResizeNoErase, pass them to this function.
 - Then, do 'widget()->installEventFilter( this );'.
-- Implement MyClient::eventFilter() - as MyClient is now no longer QWidget, you need the event
+- Implement MyClient::eventFilter() - as MyClient is now no longer TQWidget, you need the event
   filter to call all the functions that used to be called directly. Usually, it's something
   like:
 =====
-bool MyClient::eventFilter( QObject* o, QEvent* e )
+bool MyClient::eventFilter( TQObject* o, QEvent* e )
 {
 	if ( o != widget() )
 		return false;
@@ -67,7 +63,7 @@ bool MyClient::eventFilter( QObject* o, QEvent* e )
 }
 =====
 - In MyClient, 'this' will have to be often replaced with 'widget()', pay special attention
-  to cases where this won't cause compile error (e.g. in connect() calls, which take QObject* ).
+  to cases where this won't cause compile error (e.g. in connect() calls, which take TQObject* ).
 - Also, many calls may need 'widget()->' prepended.
 - Layout is created in init(), so call createLayout() directly there (if it's implemented).
 - Remove calls to Client methods (Client::resizeEvent() and so on).
diff --git a/twin/clients/b2/CMakeLists.txt b/twin/clients/b2/CMakeLists.txt
index cd08f4d99..ba946ba75 100644
--- a/twin/clients/b2/CMakeLists.txt
+++ b/twin/clients/b2/CMakeLists.txt
@@ -32,9 +32,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_b2 (module) #########################
+##### twin_b2 (module) #########################
 
-tde_add_kpart( twin3_b2 AUTOMOC
+tde_add_kpart( twin_b2 AUTOMOC
   SOURCES b2client.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/b2/Makefile.am b/twin/clients/b2/Makefile.am
index ccd7f39fa..71bbbb556 100644
--- a/twin/clients/b2/Makefile.am
+++ b/twin/clients/b2/Makefile.am
@@ -3,12 +3,12 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
 SUBDIRS = . config
 
-kde_module_LTLIBRARIES = twin3_b2.la
+kde_module_LTLIBRARIES = twin_b2.la
 
-twin3_b2_la_SOURCES = b2client.cpp
-twin3_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_b2_la_SOURCES = b2client.cpp
+twin_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 # twin_b2_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
-twin3_b2_la_LIBADD  = ../../lib/libtdecorations.la
+twin_b2_la_LIBADD  = ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 noinst_HEADERS = b2client.h
diff --git a/twin/clients/b2/b2.desktop b/twin/clients/b2/b2.desktop
index b5eacefa9..767e9bfc4 100644
--- a/twin/clients/b2/b2.desktop
+++ b/twin/clients/b2/b2.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=B II
-X-TDE-Library=twin3_b2
+X-TDE-Library=twin_b2
diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index 3e0cdf7ad..16a451932 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -221,7 +221,7 @@ static void create_pixmaps()
     TQPainter mask;
     mask.begin(&normalizeMask);
 
-    TQBrush one(Qt::color1);
+    TQBrush one(TQt::color1);
     mask.fillRect(normalizeMask.width() - 12, normalizeMask.height() - 12, 
 		  12, 12, one);
     mask.fillRect(0, 0, 10, 10, one);
@@ -461,11 +461,11 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 	  if (!isModalSystemNotification()) {
 	    if (!button[BtnMenu]) {
 		button[BtnMenu] = new B2Button(this, tb, tips[BtnMenu], 
-			Qt::LeftButton | Qt::RightButton);
+			TQt::LeftButton | TQt::RightButton);
 		button[BtnMenu]->setPixmaps(P_MENU);
 		button[BtnMenu]->setUseMiniIcon();
-		connect(button[BtnMenu], TQT_SIGNAL(pressed()),
-			this, TQT_SLOT(menuButtonPressed()));
+		connect(button[BtnMenu], TQ_SIGNAL(pressed()),
+			this, TQ_SLOT(menuButtonPressed()));
 		titleLayout->addWidget(button[BtnMenu]);
 	    }
 	  }
@@ -477,8 +477,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 		button[BtnSticky]->setPixmaps(P_PINUP);
 		button[BtnSticky]->setToggle();
 		button[BtnSticky]->setDown(isOnAllDesktops());
-		connect(button[BtnSticky], TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(toggleOnAllDesktops()));
+		connect(button[BtnSticky], TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(toggleOnAllDesktops()));
 		titleLayout->addWidget(button[BtnSticky]);
 	    }
 	  }
@@ -487,8 +487,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 	    if (providesContextHelp() && (!button[BtnHelp])) {
 		button[BtnHelp] = new B2Button(this, tb, tips[BtnHelp]);
 		button[BtnHelp]->setPixmaps(P_HELP);
-		connect(button[BtnHelp], TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(showContextHelp()));
+		connect(button[BtnHelp], TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(showContextHelp()));
 		titleLayout->addWidget(button[BtnHelp]);
 	    }
 	    break;
@@ -496,19 +496,19 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 	    if (isMinimizable() && (!button[BtnIconify])) {
 		button[BtnIconify] = new B2Button(this, tb,tips[BtnIconify]);
 		button[BtnIconify]->setPixmaps(P_ICONIFY);
-		connect(button[BtnIconify], TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(minimize()));
+		connect(button[BtnIconify], TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(minimize()));
 		titleLayout->addWidget(button[BtnIconify]);
 	    }
 	    break;
 	case 'A':  // Maximize button
 	    if (isMaximizable() && (!button[BtnMax])) {
 		button[BtnMax] = new B2Button(this, tb, tips[BtnMax], 
-			Qt::LeftButton | Qt::MidButton | Qt::RightButton);
+			TQt::LeftButton | TQt::MidButton | TQt::RightButton);
 		button[BtnMax]->setPixmaps(maximizeMode() == MaximizeFull ?
 			P_NORMALIZE : P_MAX);
-		connect(button[BtnMax], TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(maxButtonClicked()));
+		connect(button[BtnMax], TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(maxButtonClicked()));
 		titleLayout->addWidget(button[BtnMax]);
 	    }
 	    break;
@@ -516,8 +516,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 	    if (isCloseable() && !button[BtnClose]) {
 		button[BtnClose] = new B2Button(this, tb, tips[BtnClose]);
 		button[BtnClose]->setPixmaps(P_CLOSE);
-		connect(button[BtnClose], TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(closeWindow()));
+		connect(button[BtnClose], TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(closeWindow()));
 		titleLayout->addWidget(button[BtnClose]);
 	    }
 	    break;
@@ -525,8 +525,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 	    if (isShadeable() && !button[BtnShade]) {
 		button[BtnShade] = new B2Button(this, tb, tips[BtnShade]);
 		button[BtnShade]->setPixmaps(P_SHADE);
-		connect(button[BtnShade], TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(shadeButtonClicked()));
+		connect(button[BtnShade], TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(shadeButtonClicked()));
 		titleLayout->addWidget(button[BtnShade]);
 	    }
 	    break;
@@ -534,8 +534,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 	    if (resizable && !button[BtnResize]) {
 		button[BtnResize] = new B2Button(this, tb, tips[BtnResize]);
 		button[BtnResize]->setPixmaps(P_RESIZE);
-		connect(button[BtnResize], TQT_SIGNAL(pressed()),
-			this, TQT_SLOT(resizeButtonPressed()));
+		connect(button[BtnResize], TQ_SIGNAL(pressed()),
+			this, TQ_SLOT(resizeButtonPressed()));
 		titleLayout->addWidget(button[BtnResize]);
 	    }
 	    break;
@@ -676,7 +676,7 @@ void B2Client::paintEvent(TQPaintEvent* e)
 
     // bottom handle rect
     if (mustDrawHandle()) {
-        p.setPen(Qt::black);
+        p.setPen(TQt::black);
 	int hx = width() - 40;
 	int hw = 40;
 
@@ -981,8 +981,8 @@ static void redraw_pixmaps()
 	KPixmap *pix = pixmap[P_SHADE * NumStates + i];
 	TQColor color = is_act ? aGrp.button() : iGrp.button();
 	drawB2Rect(&thinBox, color, is_down);
-	pix->fill(Qt::black);
-	bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&thinBox), 
+	pix->fill(TQt::black);
+	bitBlt(pix, 0, 0, &thinBox, 
 		0, 0, thinBox.width(), thinBox.height(), TQt::CopyROP, true);
     }
 
@@ -1005,12 +1005,12 @@ static void redraw_pixmaps()
 	drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down);
 	drawB2Rect(&largeBox, is_act ? aGrp.button() : iGrp.button(), is_down);
 	pix->fill(options()->color(KDecoration::ColorTitleBar, is_act));
-	bitBlt(TQT_TQPAINTDEVICE(pix), pix->width() - 12, pix->width() - 12, TQT_TQPAINTDEVICE(&largeBox),
+	bitBlt(pix, pix->width() - 12, pix->width() - 12, &largeBox,
 	       0, 0, 12, 12, TQt::CopyROP, true);
-	bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true);
+	bitBlt(pix, 0, 0, &smallBox, 0, 0, 10, 10, TQt::CopyROP, true);
 
-	bitBlt(TQT_TQPAINTDEVICE(pixmap[P_ICONIFY * NumStates + i]), 0, 0,
-	       TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true);
+	bitBlt(pixmap[P_ICONIFY * NumStates + i], 0, 0,
+	       &smallBox, 0, 0, 10, 10, TQt::CopyROP, true);
     }
     
     // resize
@@ -1020,8 +1020,8 @@ static void redraw_pixmaps()
 	*pixmap[P_RESIZE * NumStates + i] = *pixmap[P_CLOSE * NumStates + i];
 	pixmap[P_RESIZE * NumStates + i]->detach();
 	drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down);
-	bitBlt(TQT_TQPAINTDEVICE(pixmap[P_RESIZE * NumStates + i]), 
-		0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true);
+	bitBlt(pixmap[P_RESIZE * NumStates + i], 
+		0, 0, &smallBox, 0, 0, 10, 10, TQt::CopyROP, true);
     }
 
 
@@ -1166,7 +1166,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear)
 	*visible_bound = geom;
     }
     TQPainter p(workspaceWidget());
-    p.setPen(TQPen(Qt::white, 5));
+    p.setPen(TQPen(TQt::white, 5));
     p.setRasterOp(TQt::XorROP);
     p.drawPolygon(bound_shape);
 
@@ -1179,26 +1179,26 @@ bool B2Client::drawbound(const TQRect& geom, bool clear)
 
 bool B2Client::eventFilter(TQObject *o, TQEvent *e)
 {
-    if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()))
+    if (o != widget())
 	return false;
     switch (e->type()) {
     case TQEvent::Resize:
-	resizeEvent(TQT_TQRESIZEEVENT(e));
+	resizeEvent(static_cast<TQResizeEvent*>(e));
 	return true;
     case TQEvent::Paint:
-	paintEvent(TQT_TQPAINTEVENT(e));
+	paintEvent(static_cast<TQPaintEvent*>(e));
 	return true;
     case TQEvent::MouseButtonDblClick:
-	titlebar->mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e));
+	titlebar->mouseDoubleClickEvent(static_cast<TQMouseEvent*>(e));
 	return true;
     case TQEvent::Wheel:
-	titlebar->wheelEvent(TQT_TQWHEELEVENT(e));
+	titlebar->wheelEvent(static_cast<TQWheelEvent*>(e));
 	return true;
     case TQEvent::MouseButtonPress:
-	processMousePressEvent(TQT_TQMOUSEEVENT(e));
+	processMousePressEvent(static_cast<TQMouseEvent*>(e));
 	return true;
     case TQEvent::Show:
-	showEvent(TQT_TQSHOWEVENT(e));
+	showEvent(static_cast<TQShowEvent*>(e));
 	return true;
     default:
 	break;
@@ -1213,7 +1213,7 @@ B2Button::B2Button(B2Client *_client, TQWidget *parent,
    : TQButton(parent, 0), hover(false)
 {
     setBackgroundMode(NoBackground);
-    setCursor(tqarrowCursor);
+    setCursor(TQt::arrowCursor);
     realizeButtons = realizeBtns;
     client = _client;
     useMiniIcon = false;
@@ -1280,7 +1280,7 @@ void B2Button::mousePressEvent(TQMouseEvent * e)
 {
     last_button = e->button();
     TQMouseEvent me(e->type(), e->pos(), e->globalPos(), 
-	    (e->button() & realizeButtons) ? Qt::LeftButton : Qt::NoButton, 
+	    (e->button() & realizeButtons) ? TQt::LeftButton : TQt::NoButton, 
 	    e->state());
     TQButton::mousePressEvent(&me);
 }
@@ -1289,7 +1289,7 @@ void B2Button::mouseReleaseEvent(TQMouseEvent * e)
 {
     last_button = e->button();
     TQMouseEvent me(e->type(), e->pos(), e->globalPos(), 
-	    (e->button() & realizeButtons) ? Qt::LeftButton : Qt::NoButton, 
+	    (e->button() & realizeButtons) ? TQt::LeftButton : TQt::NoButton, 
 	    e->state());
     TQButton::mouseReleaseEvent(&me);
 }
@@ -1356,7 +1356,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state)
 
     TQRect t = rect();
     // black titlebar frame
-    p.setPen(Qt::black);
+    p.setPen(TQt::black);
     p.drawLine(0, 0, 0, t.bottom());
     p.drawLine(0, 0, t.right(), 0);
     p.drawLine(t.right(), 0, t.right(), t.bottom());
@@ -1395,7 +1395,7 @@ void B2Titlebar::resizeEvent(TQResizeEvent *)
 void B2Titlebar::paintEvent(TQPaintEvent *)
 {
     if(client->isActive())
-        bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&titleBuffer), 0, 0, titleBuffer.width(),
+        bitBlt(this, 0, 0, &titleBuffer, 0, 0, titleBuffer.width(),
                titleBuffer.height(), TQt::CopyROP, true);
     else {
         TQPainter p(this);
@@ -1405,14 +1405,14 @@ void B2Titlebar::paintEvent(TQPaintEvent *)
 
 void B2Titlebar::mouseDoubleClickEvent(TQMouseEvent *e)
 {
-    if (e->button() == Qt::LeftButton && e->y() < height()) {
+    if (e->button() == TQt::LeftButton && e->y() < height()) {
 	client->titlebarDblClickOperation();
     }
 }
 
 void B2Titlebar::wheelEvent(TQWheelEvent *e)
 {
-    if (client->isSetShade() || TQT_TQRECT_OBJECT(rect()).contains(e->pos())) 
+    if (client->isSetShade() || rect().contains(e->pos())) 
 	client->titlebarMouseWheelOperation( e->delta());
 }
 
diff --git a/twin/clients/b2/b2client.h b/twin/clients/b2/b2client.h
index 30220b175..c9748ccd6 100644
--- a/twin/clients/b2/b2client.h
+++ b/twin/clients/b2/b2client.h
@@ -28,7 +28,7 @@ class B2Client;
 class B2Button : public TQButton
 {
 public:
-    B2Button(B2Client *_client=0, TQWidget *parent=0, const TQString& tip=NULL, const int realizeBtns = Qt::LeftButton);
+    B2Button(B2Client *_client=0, TQWidget *parent=0, const TQString& tip=NULL, const int realizeBtns = TQt::LeftButton);
     ~B2Button() {};
 
     void setBg(const TQColor &c){bg = c;}
@@ -93,7 +93,7 @@ private:
 
 class B2Client : public KDecoration
 {
-    Q_OBJECT
+    TQ_OBJECT
     friend class B2Titlebar;
 public:
     B2Client(KDecorationBridge *b, KDecorationFactory *f);
diff --git a/twin/clients/b2/config/config.cpp b/twin/clients/b2/config/config.cpp
index 5b7a29e0f..b955254ec 100644
--- a/twin/clients/b2/config/config.cpp
+++ b/twin/clients/b2/config/config.cpp
@@ -70,12 +70,12 @@ B2Config::B2Config( TDEConfig* conf, TQWidget* parent )
 	load(conf);
 
 	// Ensure we track user changes properly
-	connect(cbColorBorder, TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(slotSelectionChanged()));
-    connect(showGrabHandleCb, TQT_SIGNAL(clicked()),
-		    this, TQT_SLOT(slotSelectionChanged()));
-    connect(menuDblClickOp, TQT_SIGNAL(activated(int)),
-		    this, TQT_SLOT(slotSelectionChanged()));
+	connect(cbColorBorder, TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(slotSelectionChanged()));
+    connect(showGrabHandleCb, TQ_SIGNAL(clicked()),
+		    this, TQ_SLOT(slotSelectionChanged()));
+    connect(menuDblClickOp, TQ_SIGNAL(activated(int)),
+		    this, TQ_SLOT(slotSelectionChanged()));
 	// Make the widgets visible in twindecoration
 	gb->show();
 }
diff --git a/twin/clients/b2/config/config.h b/twin/clients/b2/config/config.h
index a5382dc45..0a3e7c9ec 100644
--- a/twin/clients/b2/config/config.h
+++ b/twin/clients/b2/config/config.h
@@ -18,7 +18,7 @@
 
 class B2Config: public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		B2Config( TDEConfig* conf, TQWidget* parent );
diff --git a/twin/clients/default/CMakeLists.txt b/twin/clients/default/CMakeLists.txt
index 142a9b783..56bae72f9 100644
--- a/twin/clients/default/CMakeLists.txt
+++ b/twin/clients/default/CMakeLists.txt
@@ -23,9 +23,9 @@ link_directories(
 )
 
 
-##### twin3_default (module) ####################
+##### twin_default (module) ####################
 
-tde_add_kpart( twin3_default AUTOMOC
+tde_add_kpart( twin_default AUTOMOC
   SOURCES kdedefault.cpp
   LINK tdecorations-shared tdecore-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/default/Makefile.am b/twin/clients/default/Makefile.am
index 3e687a2a6..2b609988b 100644
--- a/twin/clients/default/Makefile.am
+++ b/twin/clients/default/Makefile.am
@@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
 SUBDIRS = . config
 
-kde_module_LTLIBRARIES = twin3_default.la
+kde_module_LTLIBRARIES = twin_default.la
 
-twin3_default_la_SOURCES = kdedefault.cpp
-twin3_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_default_la_LIBADD  = $(LIB_TDECORE) ../../lib/libtdecorations.la
+twin_default_la_SOURCES = kdedefault.cpp
+twin_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_default_la_LIBADD  = $(LIB_TDECORE) ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 noinst_HEADERS = kdedefault.h
diff --git a/twin/clients/default/config/config.cpp b/twin/clients/default/config/config.cpp
index 886077925..36ddb1402 100644
--- a/twin/clients/default/config/config.cpp
+++ b/twin/clients/default/config/config.cpp
@@ -61,13 +61,13 @@ KDEDefaultConfig::KDEDefaultConfig( TDEConfig* conf, TQWidget* parent )
 	load( conf );
 
 	// Ensure we track user changes properly
-	connect( cbShowStipple, TQT_SIGNAL(clicked()), 
-			 this, TQT_SLOT(slotSelectionChanged()) );
-	connect( cbShowGrabBar, TQT_SIGNAL(clicked()), 
-			 this, TQT_SLOT(slotSelectionChanged()) );
+	connect( cbShowStipple, TQ_SIGNAL(clicked()), 
+			 this, TQ_SLOT(slotSelectionChanged()) );
+	connect( cbShowGrabBar, TQ_SIGNAL(clicked()), 
+			 this, TQ_SLOT(slotSelectionChanged()) );
 	if (highcolor)
-		connect( cbUseGradients, TQT_SIGNAL(clicked()), 
-				 this, TQT_SLOT(slotSelectionChanged()) );
+		connect( cbUseGradients, TQ_SIGNAL(clicked()), 
+				 this, TQ_SLOT(slotSelectionChanged()) );
 
 	// Make the widgets visible in twindecoration
 	gb->show();
diff --git a/twin/clients/default/config/config.h b/twin/clients/default/config/config.h
index daf38af95..d01459a13 100644
--- a/twin/clients/default/config/config.h
+++ b/twin/clients/default/config/config.h
@@ -19,7 +19,7 @@
 
 class KDEDefaultConfig: public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		KDEDefaultConfig( TDEConfig* conf, TQWidget* parent );
diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp
index e6d742bd6..3513ca5df 100644
--- a/twin/clients/default/kdedefault.cpp
+++ b/twin/clients/default/kdedefault.cpp
@@ -267,11 +267,11 @@ void KDEDefaultHandler::createPixmaps()
 		int i, x, y;
 		titlePix = new TQPixmap(132, normalTitleHeight+2);
 		TQBitmap mask(132, normalTitleHeight+2);
-		mask.fill(Qt::color0);
+		mask.fill(TQt::color0);
 
 		p.begin(titlePix);
 		maskPainter.begin(&mask);
-		maskPainter.setPen(Qt::color1);
+		maskPainter.setPen(TQt::color1);
 		for(i=0, y=2; i < 9; ++i, y+=4)
 			for(x=1; x <= 132; x+=3)
 			{
@@ -681,9 +681,9 @@ void KDEDefaultButton::drawButton(TQPainter *p)
 				active).rgb() ) > 127;
 
 		if (isMouseOver)
-			p->setPen( darkDeco ? Qt::darkGray : Qt::lightGray );
+			p->setPen( darkDeco ? TQt::darkGray : TQt::lightGray );
 		else
-			p->setPen( darkDeco ? Qt::black : Qt::white );
+			p->setPen( darkDeco ? TQt::black : TQt::white );
 
 		int xOff = (width()-10)/2;
 		int yOff = (height()-10)/2;
@@ -905,7 +905,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* )
     titleBuffer->resize( rightOffset-3, titleHeight+1 );
 
 	// Draw an outer black frame
-	p.setPen(Qt::black);
+	p.setPen(TQt::black);
 	p.drawRect(x,y,w,h);
 
     // Draw part of the frame that is the titlebar color
@@ -923,7 +923,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* )
 	           options()->color(ColorTitleBar, isActive() ));
 
 	// Finish drawing the titlebar extension
-	p.setPen(Qt::black);
+	p.setPen(TQt::black);
 	p.drawLine(x+1, leftFrameStart+borderWidth-4, x+borderWidth-2, leftFrameStart-1);
 	p.setPen(g.mid());
 	p.drawLine(x+borderWidth-2, y+titleHeight+3, x+borderWidth-2, leftFrameStart-2);
@@ -939,7 +939,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* )
 
 	p.setPen(options()->color(ColorFrame, isActive()));
 	TQPointArray a;
-	TQBrush brush( options()->color(ColorFrame, isActive()), Qt::SolidPattern );
+	TQBrush brush( options()->color(ColorFrame, isActive()), TQt::SolidPattern );
 	p.setBrush( brush );                       // use solid, yellow brush
     a.setPoints( 4, x+2,             leftFrameStart+borderWidth-4,
 	                x+borderWidth-2, leftFrameStart,
diff --git a/twin/clients/keramik/CMakeLists.txt b/twin/clients/keramik/CMakeLists.txt
index 6eade7074..736d3dc3a 100644
--- a/twin/clients/keramik/CMakeLists.txt
+++ b/twin/clients/keramik/CMakeLists.txt
@@ -32,12 +32,12 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_keramik (module) ####################
+##### twin_keramik (module) ####################
 
 set_source_files_properties( keramik.cpp
   PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tiles.h )
 
-tde_add_kpart( twin3_keramik AUTOMOC
+tde_add_kpart( twin_keramik AUTOMOC
   SOURCES keramik.cpp
   LINK tdecorations-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/keramik/Makefile.am b/twin/clients/keramik/Makefile.am
index 2ed77cac7..3fe2162ed 100644
--- a/twin/clients/keramik/Makefile.am
+++ b/twin/clients/keramik/Makefile.am
@@ -10,13 +10,13 @@ embedtool_SOURCES         = embedtool.cpp
 embedtool_LDADD           = $(LIB_TQT)
 embedtool_LDFLAGS         = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-kde_module_LTLIBRARIES    = twin3_keramik.la
+kde_module_LTLIBRARIES    = twin_keramik.la
 
-twin3_keramik_la_SOURCES   = keramik.cpp
-twin3_keramik_la_COMPILE_FIRST = tiles.h
-twin3_keramik_la_LDFLAGS   = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_keramik_la_LIBADD    = $(LIB_TDEUI) ../../lib/libtdecorations.la
-#twin3_keramik_la_LDFLAGS   = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
+twin_keramik_la_SOURCES   = keramik.cpp
+twin_keramik_la_COMPILE_FIRST = tiles.h
+twin_keramik_la_LDFLAGS   = $(all_libraries) $(KDE_PLUGIN) -module
+twin_keramik_la_LIBADD    = $(LIB_TDEUI) ../../lib/libtdecorations.la
+#twin_keramik_la_LDFLAGS   = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
 
 METASOURCES               = AUTO
 noinst_headers        	  = keramik.h tiles.h
diff --git a/twin/clients/keramik/config/config.cpp b/twin/clients/keramik/config/config.cpp
index dfd5e20aa..98a46e308 100644
--- a/twin/clients/keramik/config/config.cpp
+++ b/twin/clients/keramik/config/config.cpp
@@ -55,10 +55,10 @@ KeramikConfig::KeramikConfig( TDEConfig* conf, TQWidget* parent )
 	c = new TDEConfig( "twinkeramikrc" );
 	
 	ui = new KeramikConfigUI( parent );
-	connect( ui->showAppIcons,    TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) );
-	connect( ui->smallCaptions,   TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) );
-	connect( ui->largeGrabBars,   TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) );
-	connect( ui->useShadowedText, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) );
+	connect( ui->showAppIcons,    TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) );
+	connect( ui->smallCaptions,   TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) );
+	connect( ui->largeGrabBars,   TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) );
+	connect( ui->useShadowedText, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) );
 
 	load( conf );
 	ui->show();
diff --git a/twin/clients/keramik/config/config.h b/twin/clients/keramik/config/config.h
index 721248a09..42f3a44e2 100644
--- a/twin/clients/keramik/config/config.h
+++ b/twin/clients/keramik/config/config.h
@@ -31,7 +31,7 @@
 
 class KeramikConfig: public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 
 	public:
diff --git a/twin/clients/keramik/embedtool.cpp b/twin/clients/keramik/embedtool.cpp
index 88cf93838..1cc56fe32 100644
--- a/twin/clients/keramik/embedtool.cpp
+++ b/twin/clients/keramik/embedtool.cpp
@@ -66,7 +66,7 @@ KeramikEmbedder::KeramikEmbedder()
 	file = new TQFile( "tiles.h" );
 	file->open( IO_WriteOnly | IO_Truncate );
 
-	stream.setDevice( TQT_TQIODEVICE(file) );
+	stream.setDevice( file );
 	
 	stream << "/*\n";
 	stream << " * Generated by embedtool 1.0 on " << datestring << endl;
@@ -101,7 +101,7 @@ void KeramikEmbedder::embed( const char *name )
 	
 	codename = codename.replace( TQRegExp("[^a-zA-Z0-9]"), "_" );
 	
-	stream << "\tstatic const QRgb " << codename << "_data[] = {" << endl << "\t\t";
+	stream << "\tstatic const TQRgb " << codename << "_data[] = {" << endl << "\t\t";
 	stream.setf( TQTextStream::hex | TQTextStream::right );
 	stream.fill( '0' );
 	
@@ -147,7 +147,7 @@ void KeramikEmbedder::writeIndex()
 	stream << "\t\tint width;\n";
 	stream << "\t\tint height;\n";
 	stream << "\t\tbool alpha;\n";
-	stream << "\t\tconst QRgb *data;\n";
+	stream << "\t\tconst TQRgb *data;\n";
 	stream << "\t};\n\n";
 
 	uint i = 0;
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index 82a6aba83..942962693 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -411,18 +411,18 @@ void KeramikHandler::createPixmaps()
 	}
 
 	// Pretile the center & border tiles for optimal performance
-	pretile( activeTiles[ CaptionSmallCenter ], 64, Qt::Horizontal );
-	pretile( activeTiles[ CaptionLargeCenter ], 64, Qt::Horizontal );
-	pretile( activeTiles[ TitleCenter ], 64, Qt::Horizontal );
-	pretile( activeTiles[ GrabBarCenter ], 128, Qt::Horizontal );
-	pretile( activeTiles[ BorderLeft ], 128, Qt::Vertical );
-	pretile( activeTiles[ BorderRight ], 128, Qt::Vertical );
-
-	pretile( inactiveTiles[ CaptionSmallCenter ], 64, Qt::Horizontal );
-	pretile( inactiveTiles[ TitleCenter ], 64, Qt::Horizontal );
-	pretile( inactiveTiles[ GrabBarCenter ], 128, Qt::Horizontal );
-	pretile( inactiveTiles[ BorderLeft ], 128, Qt::Vertical );
-	pretile( inactiveTiles[ BorderRight ], 128, Qt::Vertical );
+	pretile( activeTiles[ CaptionSmallCenter ], 64, TQt::Horizontal );
+	pretile( activeTiles[ CaptionLargeCenter ], 64, TQt::Horizontal );
+	pretile( activeTiles[ TitleCenter ], 64, TQt::Horizontal );
+	pretile( activeTiles[ GrabBarCenter ], 128, TQt::Horizontal );
+	pretile( activeTiles[ BorderLeft ], 128, TQt::Vertical );
+	pretile( activeTiles[ BorderRight ], 128, TQt::Vertical );
+
+	pretile( inactiveTiles[ CaptionSmallCenter ], 64, TQt::Horizontal );
+	pretile( inactiveTiles[ TitleCenter ], 64, TQt::Horizontal );
+	pretile( inactiveTiles[ GrabBarCenter ], 128, TQt::Horizontal );
+	pretile( inactiveTiles[ BorderLeft ], 128, TQt::Vertical );
+	pretile( inactiveTiles[ BorderRight ], 128, TQt::Vertical );
 
 	if (heightOffset > 0) {
 		addHeight (heightOffset, activeTiles[TitleLeft]);
@@ -541,12 +541,12 @@ void KeramikHandler::flip( TQPixmap *&pix1, TQPixmap *&pix2 )
 }
 
 
-void KeramikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir )
+void KeramikHandler::pretile( TQPixmap *&pix, int size, TQt::Orientation dir )
 {
 	TQPixmap *newpix;
 	TQPainter p;
 
-	if ( dir == Qt::Horizontal )
+	if ( dir == TQt::Horizontal )
 		newpix = new TQPixmap( size, pix->height() );
 	else
 		newpix = new TQPixmap( pix->width(), size );
@@ -759,13 +759,13 @@ TQValueList< KeramikHandler::BorderSize > KeramikHandler::borderSizes() const
 
 KeramikButton::KeramikButton( KeramikClient* c, const char *name, Button btn, const TQString &tip, const int realizeBtns )
 		: TQButton( c->widget(), name ),
-		client( c ), button( btn ), hover( false ), lastbutton( Qt::NoButton )
+		client( c ), button( btn ), hover( false ), lastbutton( TQt::NoButton )
 {
 	realizeButtons = realizeBtns;
 
 	TQToolTip::add( this, tip ); // FRAME
 	setBackgroundMode( NoBackground );
-        setCursor( tqarrowCursor );
+        setCursor( TQt::arrowCursor );
 	int size = clientHandler->roundButton()->height();
 	setFixedSize( size, size );
 
@@ -800,7 +800,7 @@ void KeramikButton::leaveEvent( TQEvent *e )
 void KeramikButton::mousePressEvent( TQMouseEvent *e )
 {
 	lastbutton = e->button();
-	TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() );
+	TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state() );
 	TQButton::mousePressEvent( &me );
 }
 
@@ -808,7 +808,7 @@ void KeramikButton::mousePressEvent( TQMouseEvent *e )
 void KeramikButton::mouseReleaseEvent( TQMouseEvent *e )
 {
 	lastbutton = e->button();
-	TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() );
+	TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state() );
 	TQButton::mouseReleaseEvent( &me );
 }
 
@@ -889,7 +889,7 @@ void KeramikButton::drawButton( TQPainter *p )
 			deco = NULL;
 	}
 
-	p->setPen( Qt::black ); // ### hardcoded color
+	p->setPen( TQt::black ); // ### hardcoded color
 	p->drawPixmap( (size-17)/2, (size-17)/2, *deco );
 }
 
@@ -907,8 +907,8 @@ KeramikClient::KeramikClient( KDecorationBridge* bridge, KDecorationFactory* fac
 
 void KeramikClient::init()
 {
-	connect( this, TQT_SIGNAL( keepAboveChanged( bool )), TQT_SLOT( keepAboveChange( bool )));
-	connect( this, TQT_SIGNAL( keepBelowChanged( bool )), TQT_SLOT( keepBelowChange( bool )));
+	connect( this, TQ_SIGNAL( keepAboveChanged( bool )), TQ_SLOT( keepAboveChange( bool )));
+	connect( this, TQ_SIGNAL( keepBelowChanged( bool )), TQ_SLOT( keepBelowChange( bool )));
 
         createMainWidget( (WFlags)(WStaticContents | WResizeNoErase | WRepaintNoErase) );
 	widget()->installEventFilter( this );
@@ -1050,8 +1050,8 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 			case 'M' :
 				if (!isModalSystemNotification()) {
 					if ( !button[MenuButton] ) {
-						button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), Qt::LeftButton|Qt::RightButton );
-						connect( button[MenuButton], TQT_SIGNAL( pressed() ), TQT_SLOT( menuButtonPressed() ) );
+						button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), TQt::LeftButton|TQt::RightButton );
+						connect( button[MenuButton], TQ_SIGNAL( pressed() ), TQ_SLOT( menuButtonPressed() ) );
 						layout->addWidget( button[MenuButton] );
 					}
 				}
@@ -1065,7 +1065,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 								OnAllDesktopsButton, isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops") );
 						if(isOnAllDesktops())
 							button[OnAllDesktopsButton]->toggle();
-						connect( button[OnAllDesktopsButton], TQT_SIGNAL( clicked() ), TQT_SLOT( toggleOnAllDesktops() ) );
+						connect( button[OnAllDesktopsButton], TQ_SIGNAL( clicked() ), TQ_SLOT( toggleOnAllDesktops() ) );
 						layout->addWidget( button[OnAllDesktopsButton] );
 					}
 				}
@@ -1075,7 +1075,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 			case 'H' :
 				if ( !button[HelpButton] && providesContextHelp() ) {
 					button[HelpButton] = new KeramikButton( this, "help", HelpButton, i18n("Help") );
-					connect( button[HelpButton], TQT_SIGNAL( clicked() ), TQT_SLOT( showContextHelp() ) );
+					connect( button[HelpButton], TQ_SIGNAL( clicked() ), TQ_SLOT( showContextHelp() ) );
 					layout->addWidget( button[HelpButton] );
 				}
 				break;
@@ -1084,7 +1084,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 			case 'I' :
 				if ( !button[MinButton] && isMinimizable() ) {
 					button[MinButton] = new KeramikButton( this, "minimize", MinButton, i18n("Minimize") );
-					connect( button[MinButton], TQT_SIGNAL( clicked() ), TQT_SLOT( minimize() ) );
+					connect( button[MinButton], TQ_SIGNAL( clicked() ), TQ_SLOT( minimize() ) );
 					layout->addWidget( button[MinButton] );
 				}
 				break;
@@ -1092,8 +1092,8 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 			// Maximize button
 			case 'A' :
 				if ( !button[MaxButton] && isMaximizable() ) {
-					button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton );
-					connect( button[MaxButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotMaximize() ) );
+					button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton );
+					connect( button[MaxButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotMaximize() ) );
 					layout->addWidget( button[MaxButton] );
 				}
 				break;
@@ -1102,7 +1102,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 			case 'X' :
 				if ( !button[CloseButton] && isCloseable() ) {
 					button[CloseButton] = new KeramikButton( this, "close", CloseButton, i18n("Close") );
-					connect( button[CloseButton], TQT_SIGNAL( clicked() ), TQT_SLOT( closeWindow() ) );
+					connect( button[CloseButton], TQ_SIGNAL( clicked() ), TQ_SLOT( closeWindow() ) );
 					layout->addWidget( button[CloseButton] );
 				}
 				break;
@@ -1111,7 +1111,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 			case 'F' :
 				if ( !button[AboveButton]) {
 					button[AboveButton] = new KeramikButton( this, "above", AboveButton, i18n("Keep Above Others") );
-					connect( button[AboveButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotAbove() ) );
+					connect( button[AboveButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotAbove() ) );
 					layout->addWidget( button[AboveButton] );
 				}
 				break;
@@ -1120,7 +1120,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 			case 'B' :
 				if ( !button[BelowButton]) {
 					button[BelowButton] = new KeramikButton( this, "below", BelowButton, i18n("Keep Below Others") );
-					connect( button[BelowButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotBelow() ) );
+					connect( button[BelowButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotBelow() ) );
 					layout->addWidget( button[BelowButton] );
 				}
 				break;
@@ -1130,7 +1130,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 				if ( !button[ShadeButton] && isShadeable() ) {
 					button[ShadeButton] = new KeramikButton( this, "shade", ShadeButton,
                                             isSetShade() ? i18n("Unshade") : i18n( "Shade" ));
-					connect( button[ShadeButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotShade() ) );
+					connect( button[ShadeButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotShade() ) );
 					layout->addWidget( button[ShadeButton] );
 				}
 				break;
@@ -1277,7 +1277,7 @@ void KeramikClient::updateCaptionBuffer()
 	TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10,
 				captionRect.height() - 4), captionBuffer.rect() );
 
-	//p.setPen( Qt::red ); // debug
+	//p.setPen( TQt::red ); // debug
 	//p.drawRect( tr );    // debug
 
 	// Application icon
@@ -1647,10 +1647,10 @@ void KeramikClient::resizeEvent( TQResizeEvent *e )
 		int dy = 0;
 
 		if ( e->oldSize().width() != width() )
-			dx = 32 + QABS( e->oldSize().width() -  width() );
+			dx = 32 + TQABS( e->oldSize().width() -  width() );
 
 		if ( e->oldSize().height() != height() )
-			dy = 8 + QABS( e->oldSize().height() -  height() );
+			dy = 8 + TQABS( e->oldSize().height() -  height() );
 
 		if ( dy )
 			widget()->update( 0, height() - dy + 1, width(), dy );
@@ -1670,7 +1670,7 @@ void KeramikClient::resizeEvent( TQResizeEvent *e )
 
 void KeramikClient::mouseDoubleClickEvent( TQMouseEvent *e )
 {
-	if ( e->button() == Qt::LeftButton
+	if ( e->button() == TQt::LeftButton
             && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) )
 		titlebarDblClickOperation();
 }
@@ -1796,29 +1796,29 @@ TQSize KeramikClient::minimumSize() const
 
 bool KeramikClient::eventFilter( TQObject* o, TQEvent* e )
 {
-	if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()) )
+	if ( o != widget() )
 		return false;
 
 	switch ( e->type() )
 	{
 		case TQEvent::Resize:
-			resizeEvent( TQT_TQRESIZEEVENT( e ) );
+			resizeEvent( static_cast<TQResizeEvent*>( e ) );
 			return true;
 
 		case TQEvent::Paint:
-			paintEvent( TQT_TQPAINTEVENT( e ) );
+			paintEvent( static_cast<TQPaintEvent*>( e ) );
 			return true;
 
 		case TQEvent::MouseButtonDblClick:
-			mouseDoubleClickEvent( TQT_TQMOUSEEVENT( e ) );
+			mouseDoubleClickEvent( static_cast<TQMouseEvent*>( e ) );
 			return true;
 
 		case TQEvent::MouseButtonPress:
-			processMousePressEvent( TQT_TQMOUSEEVENT( e ) );
+			processMousePressEvent( static_cast<TQMouseEvent*>( e ) );
 			return true;
 
 		case TQEvent::Wheel:
-			wheelEvent( TQT_TQWHEELEVENT( e ));
+			wheelEvent( static_cast<TQWheelEvent*>( e ));
 			return true;
 
 		default:
diff --git a/twin/clients/keramik/keramik.desktop b/twin/clients/keramik/keramik.desktop
index fa51c6ea1..fde07b804 100644
--- a/twin/clients/keramik/keramik.desktop
+++ b/twin/clients/keramik/keramik.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Keramik
-X-TDE-Library=twin3_keramik
+X-TDE-Library=twin_keramik
diff --git a/twin/clients/keramik/keramik.h b/twin/clients/keramik/keramik.h
index 54639dece..7369b5346 100644
--- a/twin/clients/keramik/keramik.h
+++ b/twin/clients/keramik/keramik.h
@@ -92,7 +92,7 @@ namespace Keramik {
 			void addWidth  (int width,  TQPixmap *&pix, bool left, TQPixmap *bottomPix);
 			void addHeight (int height, TQPixmap *&pix);
 			void flip( TQPixmap *&, TQPixmap *& );
-			void pretile( TQPixmap *&, int, Qt::Orientation );
+			void pretile( TQPixmap *&, int, TQt::Orientation );
 			TQPixmap *composite( TQImage *, TQImage * );
 			TQImage  *loadImage( const TQString &, const TQColor & );
 			TQPixmap *loadPixmap( const TQString &, const TQColor & );
@@ -114,7 +114,7 @@ namespace Keramik {
 	class KeramikButton : public TQButton
 	{
 		public:
-			KeramikButton( KeramikClient *, const char *, Button, const TQString &, const int realizeBtns = Qt::LeftButton );
+			KeramikButton( KeramikClient *, const char *, Button, const TQString &, const int realizeBtns = TQt::LeftButton );
 			~KeramikButton();
 
 			ButtonState lastButton() const { return lastbutton; }
@@ -137,7 +137,7 @@ namespace Keramik {
 
 	class KeramikClient : public KDecoration
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 
diff --git a/twin/clients/kwmtheme/Makefile.am b/twin/clients/kwmtheme/Makefile.am
index e9d3c36b8..6a201bccf 100644
--- a/twin/clients/kwmtheme/Makefile.am
+++ b/twin/clients/kwmtheme/Makefile.am
@@ -1,11 +1,11 @@
 SUBDIRS=cli_installer
 INCLUDES = $(all_includes) 
 
-kde_module_LTLIBRARIES = twin3_kwmtheme.la
+kde_module_LTLIBRARIES = twin_kwmtheme.la
 
-twin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp
-twin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_kwmtheme_la_LIBADD  = -ltdecorations
+twin_kwmtheme_la_SOURCES = kwmthemeclient.cpp
+twin_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_kwmtheme_la_LIBADD  = -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = kwmthemeclient.h
diff --git a/twin/clients/kwmtheme/kwmtheme.desktop b/twin/clients/kwmtheme/kwmtheme.desktop
index 69e066f63..b18ce962b 100644
--- a/twin/clients/kwmtheme/kwmtheme.desktop
+++ b/twin/clients/kwmtheme/kwmtheme.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=KWM Theme
-X-TDE-Library=twin3_kwmtheme
+X-TDE-Library=twin_kwmtheme
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index 73c8feaca..defc8a3df 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -141,11 +141,11 @@ static void create_pixmaps()
     
     tmpStr = config->readEntry("TitleAlignment");
     if(tmpStr == "right")
-        titleAlign = Qt::AlignRight | Qt::AlignVCenter;
+        titleAlign = TQt::AlignRight | TQt::AlignVCenter;
     else if(tmpStr == "middle")
-        titleAlign = Qt::AlignCenter;
+        titleAlign = TQt::AlignCenter;
     else
-        titleAlign = Qt::AlignLeft | Qt::AlignVCenter;
+        titleAlign = TQt::AlignLeft | TQt::AlignVCenter;
     titleSunken = config->readBoolEntry("TitleFrameShaded", true);
     // titleSunken = true; // is this fixed?
     titleTransparent = config->readBoolEntry("PixmapUnderTitleText", true);
@@ -293,8 +293,8 @@ void KWMThemeClient::init()
             iconChange();
             hb->addWidget(mnuBtn);
             mnuBtn->setFixedSize(20, 20);
-            connect(mnuBtn, TQT_SIGNAL(pressed()), this,
-                    TQT_SLOT(menuButtonPressed()));
+            connect(mnuBtn, TQ_SIGNAL(pressed()), this,
+                    TQ_SLOT(menuButtonPressed()));
         }
         else if(val == "Sticky"){
             stickyBtn = new MyButton(widget(), "sticky");
@@ -303,7 +303,7 @@ void KWMThemeClient::init()
                 stickyBtn->setPixmap(*pindownPix);
             else
                 stickyBtn->setPixmap(*pinupPix);
-            connect(stickyBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT(toggleOnAllDesktops()));
+            connect(stickyBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT(toggleOnAllDesktops()));
             hb->addWidget(stickyBtn);
             stickyBtn->setFixedSize(20, 20);
         }
@@ -311,7 +311,7 @@ void KWMThemeClient::init()
             btn = new MyButton(widget(), "iconify");
             TQToolTip::add( btn, i18n("Minimize"));
             btn->setPixmap(*iconifyPix);
-            connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(minimize()));
+            connect(btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(minimize()));
             hb->addWidget(btn);
             btn->setFixedSize(20, 20);
         }
@@ -319,7 +319,7 @@ void KWMThemeClient::init()
             maxBtn = new MyButton(widget(), "max");
             TQToolTip::add( maxBtn, i18n("Maximize"));
             maxBtn->setPixmap(*maxPix);
-            connect(maxBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(maximize()));
+            connect(maxBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(maximize()));
             hb->addWidget(maxBtn);
             maxBtn->setFixedSize(20, 20);
         }
@@ -327,7 +327,7 @@ void KWMThemeClient::init()
             btn = new MyButton(widget(), "close");
             TQToolTip::add( btn, i18n("Close"));
             btn->setPixmap(*closePix);
-            connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeWindow()));
+            connect(btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeWindow()));
             hb->addWidget(btn);
             btn->setFixedSize(20, 20);
         }
diff --git a/twin/clients/kwmtheme/kwmthemeclient.h b/twin/clients/kwmtheme/kwmthemeclient.h
index 58db3d14f..f611e89d2 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.h
+++ b/twin/clients/kwmtheme/kwmthemeclient.h
@@ -24,7 +24,7 @@ protected:
 
 class KWMThemeClient : public KDecoration
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KWMThemeClient( KDecorationBridge* b, KDecorationFactory* f );
     ~KWMThemeClient(){;}
diff --git a/twin/clients/laptop/CMakeLists.txt b/twin/clients/laptop/CMakeLists.txt
index 479de7a84..9fe25af3a 100644
--- a/twin/clients/laptop/CMakeLists.txt
+++ b/twin/clients/laptop/CMakeLists.txt
@@ -30,9 +30,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_laptop (module) #####################
+##### twin_laptop (module) #####################
 
-tde_add_kpart( twin3_laptop AUTOMOC
+tde_add_kpart( twin_laptop AUTOMOC
   SOURCES laptopclient.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/laptop/Makefile.am b/twin/clients/laptop/Makefile.am
index ccf1d359b..1788a8691 100644
--- a/twin/clients/laptop/Makefile.am
+++ b/twin/clients/laptop/Makefile.am
@@ -1,11 +1,11 @@
 
 INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
-kde_module_LTLIBRARIES = twin3_laptop.la
+kde_module_LTLIBRARIES = twin_laptop.la
 
-twin3_laptop_la_SOURCES = laptopclient.cpp
-twin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module 
-twin3_laptop_la_LIBADD  = ../../lib/libtdecorations.la
+twin_laptop_la_SOURCES = laptopclient.cpp
+twin_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module 
+twin_laptop_la_LIBADD  = ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 noinst_HEADERS = laptopclient.h
diff --git a/twin/clients/laptop/laptop.desktop b/twin/clients/laptop/laptop.desktop
index 27f569634..060b0cce2 100644
--- a/twin/clients/laptop/laptop.desktop
+++ b/twin/clients/laptop/laptop.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Laptop
-X-TDE-Library=twin3_laptop
+X-TDE-Library=twin_laptop
diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp
index 114b03f4d..30fb76b3a 100644
--- a/twin/clients/laptop/laptopclient.cpp
+++ b/twin/clients/laptop/laptopclient.cpp
@@ -121,11 +121,11 @@ static void create_pixmaps()
     int i, x, y;
     titlePix = new TQPixmap(33, 12);
     TQBitmap mask(33, 12);
-    mask.fill(Qt::color0);
+    mask.fill(TQt::color0);
 
     p.begin(titlePix);
     maskPainter.begin(&mask);
-    maskPainter.setPen(Qt::color1);
+    maskPainter.setPen(TQt::color1);
     for(i=0, y=2; i < 3; ++i, y+=4){
         for(x=1; x <= 33; x+=3){
             p.setPen(options()->color(KDecoration::ColorTitleBar, true).light(150));
@@ -221,9 +221,9 @@ static void create_pixmaps()
     drawButtonFrame(iBtnDownPix2, g, true);
 
     if(tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128)
-        btnForeground = Qt::black;
+        btnForeground = TQt::black;
     else
-        btnForeground = Qt::white;
+        btnForeground = TQt::white;
 }
 
 static void delete_pixmaps()
@@ -290,7 +290,7 @@ void LaptopButton::setBitmap(const unsigned char *bitmap)
         deco = TQBitmap(8, 8, bitmap, true);
     else {
         deco = TQBitmap(8,8);
-        deco.fill(Qt::color0);
+        deco.fill(TQt::color0);
     }
     deco.setMask(deco);
     repaint();
@@ -472,7 +472,7 @@ void LaptopClient::paintEvent( TQPaintEvent* )
     TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive());
 
     TQRect r(widget()->rect());
-    p.setPen(Qt::black);
+    p.setPen(TQt::black);
     p.drawRect(r);
 
     // fill mid frame...
diff --git a/twin/clients/modernsystem/CMakeLists.txt b/twin/clients/modernsystem/CMakeLists.txt
index 5bb92031e..166e3aae5 100644
--- a/twin/clients/modernsystem/CMakeLists.txt
+++ b/twin/clients/modernsystem/CMakeLists.txt
@@ -31,9 +31,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_modernsys (module) ##################
+##### twin_modernsys (module) ##################
 
-tde_add_kpart( twin3_modernsys
+tde_add_kpart( twin_modernsys
   SOURCES modernsys.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/modernsystem/Makefile.am b/twin/clients/modernsystem/Makefile.am
index e4c21d7a3..902669685 100644
--- a/twin/clients/modernsystem/Makefile.am
+++ b/twin/clients/modernsystem/Makefile.am
@@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
 SUBDIRS = config
 
-kde_module_LTLIBRARIES = twin3_modernsys.la
+kde_module_LTLIBRARIES = twin_modernsys.la
 
-twin3_modernsys_la_SOURCES = modernsys.cpp
-twin3_modernsys_la_LIBADD = ../../lib/libtdecorations.la
-twin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_modernsys_la_SOURCES = modernsys.cpp
+twin_modernsys_la_LIBADD = ../../lib/libtdecorations.la
+twin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = modernsys.h
diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp
index 18d6870f7..187278d43 100644
--- a/twin/clients/modernsystem/config/config.cpp
+++ b/twin/clients/modernsystem/config/config.cpp
@@ -44,15 +44,15 @@ ModernSysConfig::ModernSysConfig(TDEConfig* conf, TQWidget* parent) : TQObject(p
 			"easier, especially for trackballs and other mouse replacements "
 			"on laptops."));
         layout->addMultiCellWidget(cbShowHandle, 0, 0, 0, 1);
-	connect(cbShowHandle, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()));
+	connect(cbShowHandle, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged()));
 
 	sliderBox = new TQVBox(handleBox);
-	handleSizeSlider = new TQSlider(0, 4, 1, 0, Qt::Horizontal, sliderBox);
+	handleSizeSlider = new TQSlider(0, 4, 1, 0, TQt::Horizontal, sliderBox);
 	TQWhatsThis::add(handleSizeSlider,
 			i18n("Here you can change the size of the resize handle."));
 	handleSizeSlider->setTickInterval(1);
 	handleSizeSlider->setTickmarks(TQSlider::Below);
-	connect(handleSizeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSelectionChanged()));
+	connect(handleSizeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSelectionChanged()));
 
 	hbox = new TQHBox(sliderBox);
 	hbox->setSpacing(6);
diff --git a/twin/clients/modernsystem/config/config.h b/twin/clients/modernsystem/config/config.h
index 20ce5539e..004dd9855 100644
--- a/twin/clients/modernsystem/config/config.h
+++ b/twin/clients/modernsystem/config/config.h
@@ -10,7 +10,7 @@
 
 class ModernSysConfig : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ModernSysConfig(TDEConfig* conf, TQWidget* parent);
diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp
index f2d31ed11..94615b190 100644
--- a/twin/clients/modernsystem/modernsys.cpp
+++ b/twin/clients/modernsystem/modernsys.cpp
@@ -185,9 +185,9 @@ static void create_pixmaps()
 
 
     if(tqGray(btnColor.background().rgb()) < 150)
-        buttonFg = new TQColor(Qt::white);
+        buttonFg = new TQColor(TQt::white);
     else
-        buttonFg = new TQColor(Qt::black);
+        buttonFg = new TQColor(TQt::black);
 
     delete lcDark1;
     delete lcDark2;
@@ -342,7 +342,7 @@ void ModernButton::setBitmap(const unsigned char *bitmap)
         deco = TQBitmap(8, 8, bitmap, true);
     else {
         deco = TQBitmap(8,8);
-        deco.fill(Qt::color0);
+        deco.fill(TQt::color0);
     }
     deco.setMask(deco);
 }
@@ -631,7 +631,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
         p.drawLine(width()-hw, height()-hs-1, width()-4, height()-hs-1);
         p.drawLine(width()-hs-1, height()-hw, width()-hs-1, height()-4);
 
-        p.setPen(Qt::black);
+        p.setPen(TQt::black);
         p.drawRect(0, 0, w, h);
 
         // handle outline
@@ -640,7 +640,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
         p.drawLine(width()-hs, height()-2, width()-2, height()-2);
         p.drawLine(width()-hs, height()-hw, width()-hs, height()-2);
     } else {
-        p.setPen(Qt::black);
+        p.setPen(TQt::black);
         p.drawRect(0, 0, w, h);
     }
 }
diff --git a/twin/clients/modernsystem/modernsystem.desktop b/twin/clients/modernsystem/modernsystem.desktop
index 85a301733..76601f9f2 100644
--- a/twin/clients/modernsystem/modernsystem.desktop
+++ b/twin/clients/modernsystem/modernsystem.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Modern System
-X-TDE-Library=twin3_modernsys
+X-TDE-Library=twin_modernsys
diff --git a/twin/clients/plastik/CMakeLists.txt b/twin/clients/plastik/CMakeLists.txt
index 695468994..8e920bdc2 100644
--- a/twin/clients/plastik/CMakeLists.txt
+++ b/twin/clients/plastik/CMakeLists.txt
@@ -34,9 +34,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_plastik (module) ####################
+##### twin_plastik (module) ####################
 
-tde_add_kpart( twin3_plastik AUTOMOC
+tde_add_kpart( twin_plastik AUTOMOC
   SOURCES plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
   LINK tdecorations-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/plastik/Makefile.am b/twin/clients/plastik/Makefile.am
index c1757891d..0afee676a 100644
--- a/twin/clients/plastik/Makefile.am
+++ b/twin/clients/plastik/Makefile.am
@@ -9,11 +9,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 twindir = $(kde_datadir)/twin/
 twin_DATA = plastik.desktop
 
-kde_module_LTLIBRARIES = twin3_plastik.la
-twin3_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
-twin3_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
-twin3_plastik_la_METASOURCES = AUTO
+kde_module_LTLIBRARIES = twin_plastik.la
+twin_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
+twin_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
+twin_plastik_la_METASOURCES = AUTO
 
-DISTCLEANFILES = $(twin3_plastik_la_METASOURCES)
+DISTCLEANFILES = $(twin_plastik_la_METASOURCES)
 
diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp
index 04658796c..81192f699 100644
--- a/twin/clients/plastik/config/config.cpp
+++ b/twin/clients/plastik/config/config.cpp
@@ -49,16 +49,16 @@ PlastikConfig::PlastikConfig(TDEConfig* config, TQWidget* parent)
     load(config);
 
     // setup the connections
-    connect(m_dialog->titleAlign, TQT_SIGNAL(clicked(int)),
-            this, TQT_SIGNAL(changed()));
-    connect(m_dialog->animateButtons, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SIGNAL(changed()));
-    connect(m_dialog->menuClose, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SIGNAL(changed()));
-    connect(m_dialog->titleShadow, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SIGNAL(changed()));
-    connect(m_dialog->coloredBorder, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SIGNAL(changed()));
+    connect(m_dialog->titleAlign, TQ_SIGNAL(clicked(int)),
+            this, TQ_SIGNAL(changed()));
+    connect(m_dialog->animateButtons, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SIGNAL(changed()));
+    connect(m_dialog->menuClose, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SIGNAL(changed()));
+    connect(m_dialog->titleShadow, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SIGNAL(changed()));
+    connect(m_dialog->coloredBorder, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SIGNAL(changed()));
 }
 
 PlastikConfig::~PlastikConfig()
diff --git a/twin/clients/plastik/config/config.h b/twin/clients/plastik/config/config.h
index 73231c50f..d83ebf149 100644
--- a/twin/clients/plastik/config/config.h
+++ b/twin/clients/plastik/config/config.h
@@ -32,7 +32,7 @@ class ConfigDialog;
 
 class PlastikConfig : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PlastikConfig(TDEConfig* config, TQWidget* parent);
     ~PlastikConfig();
diff --git a/twin/clients/plastik/config/configdialog.ui b/twin/clients/plastik/config/configdialog.ui
index f751d8024..505d91b06 100644
--- a/twin/clients/plastik/config/configdialog.ui
+++ b/twin/clients/plastik/config/configdialog.ui
@@ -66,9 +66,6 @@
             <property name="text">
                 <string>Colored window border</string>
             </property>
-            <property name="accel">
-                <string></string>
-            </property>
             <property name="whatsThis" stdset="0">
                 <string>Check this option if the window border should be painted in the titlebar color. Otherwise it will be painted in the background color.</string>
             </property>
diff --git a/twin/clients/plastik/misc.cpp b/twin/clients/plastik/misc.cpp
index 1b259d383..053cf15ea 100644
--- a/twin/clients/plastik/misc.cpp
+++ b/twin/clients/plastik/misc.cpp
@@ -54,8 +54,8 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i
 {
 
     // normal button...
-    QRgb rgb = bgColor.rgb();
-    QRgb rgb_b = fgColor.rgb();
+    TQRgb rgb = bgColor.rgb();
+    TQRgb rgb_b = fgColor.rgb();
     int alpha = a;
     if(alpha>255) alpha = 255;
     if(alpha<0) alpha = 0;
diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp
index b5cdeb85b..b5a4808d7 100644
--- a/twin/clients/plastik/plastik.cpp
+++ b/twin/clients/plastik/plastik.cpp
@@ -185,9 +185,9 @@ void PlastikHandler::readConfig()
         m_titleHeightTool++;
 
     TQString value = config.readEntry("TitleAlignment", "AlignLeft");
-    if (value == "AlignLeft")         m_titleAlign = Qt::AlignLeft;
-    else if (value == "AlignHCenter") m_titleAlign = Qt::AlignHCenter;
-    else if (value == "AlignRight")   m_titleAlign = Qt::AlignRight;
+    if (value == "AlignLeft")         m_titleAlign = TQt::AlignLeft;
+    else if (value == "AlignHCenter") m_titleAlign = TQt::AlignHCenter;
+    else if (value == "AlignRight")   m_titleAlign = TQt::AlignRight;
 
     m_coloredBorder = config.readBoolEntry("ColoredBorder", true);
     m_animateButtons = config.readBoolEntry("AnimateButtons", true);
@@ -210,27 +210,27 @@ TQColor PlastikHandler::getColor(KWinPlastik::ColorType type, const bool active)
             break;
         case ShadeTitleLight:
             return alphaBlendColors(KDecoration::options()->color(ColorTitleBar, active),
-                                    Qt::white, active?205:215);
+                                    TQt::white, active?205:215);
             break;
         case ShadeTitleDark:
             return alphaBlendColors(KDecoration::options()->color(ColorTitleBar, active),
-                                    Qt::black, active?205:215);
+                                    TQt::black, active?205:215);
             break;
         case Border:
             return KDecoration::options()->color(ColorFrame, active);
         case TitleFont:
             return KDecoration::options()->color(ColorFont, active);
         default:
-            return Qt::black;
+            return TQt::black;
     }
 }
 
-void PlastikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir ) const
+void PlastikHandler::pretile( TQPixmap *&pix, int size, TQt::Orientation dir ) const
 {
     TQPixmap *newpix;
     TQPainter p;
 
-    if ( dir == Qt::Horizontal )
+    if ( dir == TQt::Horizontal )
         newpix = new TQPixmap( size, pix->height() );
     else
         newpix = new TQPixmap( pix->width(), size );
@@ -300,7 +300,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
                 painter.end();
             }
 
-            pretile(pm, 64, Qt::Horizontal);
+            pretile(pm, 64, TQt::Horizontal);
 
             break;
         }
@@ -399,7 +399,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
 
             painter.end();
 
-            pretile(pm, 64, Qt::Vertical);
+            pretile(pm, 64, TQt::Vertical);
 
             break;
         }
@@ -433,7 +433,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
             }
             painter.end();
 
-            pretile(pm, 64, Qt::Vertical);
+            pretile(pm, 64, TQt::Vertical);
 
             break;
         }
@@ -523,7 +523,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
             painter.drawPoint(0, h-1);
             painter.end();
 
-            pretile(pm, 64, Qt::Horizontal);
+            pretile(pm, 64, TQt::Horizontal);
 
             break;
         }
diff --git a/twin/clients/plastik/plastik.desktop b/twin/clients/plastik/plastik.desktop
index cbe609785..564f33e5c 100644
--- a/twin/clients/plastik/plastik.desktop
+++ b/twin/clients/plastik/plastik.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Plastik
-X-TDE-Library=twin3_plastik
+X-TDE-Library=twin_plastik
diff --git a/twin/clients/plastik/plastik.h b/twin/clients/plastik/plastik.h
index a4c1bc5b7..558ac848a 100644
--- a/twin/clients/plastik/plastik.h
+++ b/twin/clients/plastik/plastik.h
@@ -73,7 +73,7 @@ enum ButtonIcon {
 
 class PlastikHandler: public TQObject, public KDecorationFactory
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PlastikHandler();
     ~PlastikHandler();
@@ -93,7 +93,7 @@ public:
     int  borderSize() { return m_borderSize; }
     bool animateButtons() { return m_animateButtons; }
     bool menuClose() { return m_menuClose; }
-    TQ_Alignment titleAlign() { return m_titleAlign; }
+    TQt::AlignmentFlags titleAlign() { return m_titleAlign; }
     bool reverseLayout() { return m_reverse; }
     TQColor getColor(KWinPlastik::ColorType type, const bool active = true);
 
@@ -101,7 +101,7 @@ public:
 private:
     void readConfig();
 
-    void pretile(TQPixmap *&pix, int size, Qt::Orientation dir) const;
+    void pretile(TQPixmap *&pix, int size, TQt::Orientation dir) const;
 
     bool m_coloredBorder;
     bool m_titleShadow;
@@ -113,7 +113,7 @@ private:
     int  m_titleHeightTool;
     TQFont m_titleFont;
     TQFont m_titleFontTool;
-    TQ_Alignment m_titleAlign;
+    TQt::AlignmentFlags m_titleAlign;
 
     // pixmap cache
     TQPixmap *m_pixmaps[2][2][NumPixmaps]; // button pixmaps have normal+pressed state...
diff --git a/twin/clients/plastik/plastikbutton.cpp b/twin/clients/plastik/plastikbutton.cpp
index 3a097be15..3f3f81f62 100644
--- a/twin/clients/plastik/plastikbutton.cpp
+++ b/twin/clients/plastik/plastikbutton.cpp
@@ -51,7 +51,7 @@ PlastikButton::PlastikButton(ButtonType type, PlastikClient *parent, const char
     // no need to reset here as the button will be resetted on first resize.
 
     animTmr = new TQTimer(this);
-    connect(animTmr, TQT_SIGNAL(timeout() ), this, TQT_SLOT(animate() ) );
+    connect(animTmr, TQ_SIGNAL(timeout() ), this, TQ_SLOT(animate() ) );
     animProgress = 0;
 }
 
@@ -170,17 +170,17 @@ void PlastikButton::drawButton(TQPainter *painter)
     if(type() == CloseButton) {
         highlightColor = TQColor(255,64,0);
     } else {
-        highlightColor = Qt::white;
+        highlightColor = TQt::white;
     }
 
     TQColor contourTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active),
-            Qt::black, 215);
+            TQt::black, 215);
     TQColor contourBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active),
-            Qt::black, 215);
+            TQt::black, 215);
     TQColor sourfaceTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active),
-            Qt::white, 210);
+            TQt::white, 210);
     TQColor sourfaceBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active),
-            Qt::white, 210);
+            TQt::white, 210);
 
     int highlightAlpha = static_cast<int>(255-((60/static_cast<double>(ANIMATIONSTEPS))*
                                           static_cast<double>(animProgress) ) );
@@ -190,10 +190,10 @@ void PlastikButton::drawButton(TQPainter *painter)
     sourfaceBottom = alphaBlendColors(sourfaceBottom, highlightColor, highlightAlpha);
 
     if (isDown() ) {
-        contourTop = alphaBlendColors(contourTop, Qt::black, 200);
-        contourBottom = alphaBlendColors(contourBottom, Qt::black, 200);
-        sourfaceTop = alphaBlendColors(sourfaceTop, Qt::black, 200);
-        sourfaceBottom = alphaBlendColors(sourfaceBottom, Qt::black, 200);
+        contourTop = alphaBlendColors(contourTop, TQt::black, 200);
+        contourBottom = alphaBlendColors(contourBottom, TQt::black, 200);
+        sourfaceTop = alphaBlendColors(sourfaceTop, TQt::black, 200);
+        sourfaceBottom = alphaBlendColors(sourfaceBottom, TQt::black, 200);
     }
 
     TQPixmap buffer;
@@ -291,10 +291,10 @@ TQBitmap IconEngine::icon(ButtonIcon icon, int size)
         --size;
 
     TQBitmap bitmap(size,size);
-    bitmap.fill(Qt::color0);
+    bitmap.fill(TQt::color0);
     TQPainter p(&bitmap);
 
-    p.setPen(Qt::color1);
+    p.setPen(TQt::color1);
 
     TQRect r = bitmap.rect();
 
diff --git a/twin/clients/plastik/plastikbutton.h b/twin/clients/plastik/plastikbutton.h
index dbebcf63f..6deaa56f6 100644
--- a/twin/clients/plastik/plastikbutton.h
+++ b/twin/clients/plastik/plastikbutton.h
@@ -37,7 +37,7 @@ class PlastikClient;
 
 class PlastikButton : public KCommonDecorationButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PlastikButton(ButtonType type, PlastikClient *parent, const char *name);
     ~PlastikButton();
@@ -65,7 +65,7 @@ private:
 /**
  * This class creates bitmaps which can be used as icons on buttons. The icons
  * are "hardcoded".
- * Over the previous "Gimp->xpm->QImage->recolor->SmoothScale->TQPixmap" solution
+ * Over the previous "Gimp->xpm->TQImage->recolor->SmoothScale->TQPixmap" solution
  * it has the important advantage that icons are more scalable and at the same
  * time sharp and not blurred.
  */
diff --git a/twin/clients/plastik/plastikclient.cpp b/twin/clients/plastik/plastikclient.cpp
index 31c9e2ad9..bb2c465a6 100644
--- a/twin/clients/plastik/plastikclient.cpp
+++ b/twin/clients/plastik/plastikclient.cpp
@@ -394,7 +394,7 @@ TQRect PlastikClient::captionRect() const
             buttonsLeftWidth() - buttonsRightWidth() -
             marginLeft - marginRight;
 
-    TQ_Alignment a = Handler()->titleAlign();
+    TQt::AlignmentFlags a = Handler()->titleAlign();
 
     int tX, tW; // position/width of the title buffer
     if (caption.width() >  titleWidth) {
@@ -402,10 +402,10 @@ TQRect PlastikClient::captionRect() const
     } else {
         tW = caption.width();
     }
-    if (a == Qt::AlignLeft || (caption.width() > titleWidth) ) {
+    if (a == TQt::AlignLeft || (caption.width() > titleWidth) ) {
         // Align left
         tX = titleLeft;
-    } else if (a == Qt::AlignHCenter) {
+    } else if (a == TQt::AlignHCenter) {
         // Align center
         tX = titleLeft+(titleWidth- caption.width() )/2;
     } else {
diff --git a/twin/clients/quartz/CMakeLists.txt b/twin/clients/quartz/CMakeLists.txt
index 49d56d419..70d9fb49a 100644
--- a/twin/clients/quartz/CMakeLists.txt
+++ b/twin/clients/quartz/CMakeLists.txt
@@ -32,9 +32,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_quartz (module) #####################
+##### twin_quartz (module) #####################
 
-tde_add_kpart( twin3_quartz AUTOMOC
+tde_add_kpart( twin_quartz AUTOMOC
   SOURCES quartz.cpp
   LINK tdecorations-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/quartz/Makefile.am b/twin/clients/quartz/Makefile.am
index 3a5709773..ae69a53a6 100644
--- a/twin/clients/quartz/Makefile.am
+++ b/twin/clients/quartz/Makefile.am
@@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
 SUBDIRS = . config
 
-kde_module_LTLIBRARIES = twin3_quartz.la
+kde_module_LTLIBRARIES = twin_quartz.la
 
-twin3_quartz_la_SOURCES = quartz.cpp
-twin3_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_quartz_la_LIBADD  = $(LIB_TDEUI)  ../../lib/libtdecorations.la
+twin_quartz_la_SOURCES = quartz.cpp
+twin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_quartz_la_LIBADD  = $(LIB_TDEUI)  ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 noinst_HEADERS = quartz.h
diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp
index 70dc87965..106ea28dc 100644
--- a/twin/clients/quartz/config/config.cpp
+++ b/twin/clients/quartz/config/config.cpp
@@ -49,8 +49,8 @@ QuartzConfig::QuartzConfig( TDEConfig* conf, TQWidget* parent )
 	load( conf );
 
 	// Ensure we track user changes properly
-	connect( cbColorBorder, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) );
-	connect( cbExtraSmall,  TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) );
+	connect( cbColorBorder, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged()) );
+	connect( cbExtraSmall,  TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged()) );
 
 	// Make the widgets visible in twindecoration
 	gb->show();
diff --git a/twin/clients/quartz/config/config.h b/twin/clients/quartz/config/config.h
index e43c18179..a468d8703 100644
--- a/twin/clients/quartz/config/config.h
+++ b/twin/clients/quartz/config/config.h
@@ -16,7 +16,7 @@
 
 class QuartzConfig: public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		QuartzConfig( TDEConfig* conf, TQWidget* parent );
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index b9762551c..dff79ff4b 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -463,7 +463,7 @@ void QuartzButton::drawButton(TQPainter *p)
 	{
 		int xOff = (width()-10)/2;
 		int yOff = (height()-10)/2;
-		p->setPen( Qt::black );
+		p->setPen( TQt::black );
 		p->drawPixmap(isDown() ? xOff+2: xOff+1, isDown() ? yOff+2 : yOff+1, *deco);
 		p->setPen( KDecoration::options()->color(KDecoration::ColorButtonBg, decoration()->isActive()).light(150) );
 		p->drawPixmap(isDown() ? xOff+1: xOff, isDown() ? yOff+1 : yOff, *deco);
@@ -723,7 +723,7 @@ void QuartzClient::paintEvent( TQPaintEvent* )
     // Draw the title bar.
     // ===================
     int r_x, r_y, r_x2, r_y2;
-    TQT_TQRECT_OBJECT(widget()->rect()).coords(&r_x, &r_y, &r_x2, &r_y2);
+    widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2);
     const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft);
     const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop);
     const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight);
diff --git a/twin/clients/quartz/quartz.desktop b/twin/clients/quartz/quartz.desktop
index 8083eec1f..ef69ddda3 100644
--- a/twin/clients/quartz/quartz.desktop
+++ b/twin/clients/quartz/quartz.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Quartz
-X-TDE-Library=twin3_quartz
+X-TDE-Library=twin_quartz
diff --git a/twin/clients/quartz/quartz.h b/twin/clients/quartz/quartz.h
index d0ab64faf..d0db8b103 100644
--- a/twin/clients/quartz/quartz.h
+++ b/twin/clients/quartz/quartz.h
@@ -30,7 +30,7 @@ class QuartzClient;
 
 class QuartzHandler: public TQObject, public KDecorationFactory
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		QuartzHandler();
 		~QuartzHandler();
diff --git a/twin/clients/redmond/CMakeLists.txt b/twin/clients/redmond/CMakeLists.txt
index 7240233a0..17a13bac9 100644
--- a/twin/clients/redmond/CMakeLists.txt
+++ b/twin/clients/redmond/CMakeLists.txt
@@ -30,9 +30,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_redmond (module) ####################
+##### twin_redmond (module) ####################
 
-tde_add_kpart( twin3_redmond AUTOMOC
+tde_add_kpart( twin_redmond AUTOMOC
   SOURCES redmond.cpp
   LINK tdecorations-shared tdecore-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/redmond/Makefile.am b/twin/clients/redmond/Makefile.am
index 39985f347..c00af257e 100644
--- a/twin/clients/redmond/Makefile.am
+++ b/twin/clients/redmond/Makefile.am
@@ -1,11 +1,11 @@
 
 INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
-kde_module_LTLIBRARIES = twin3_redmond.la
+kde_module_LTLIBRARIES = twin_redmond.la
 
-twin3_redmond_la_SOURCES = redmond.cpp
-twin3_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la
+twin_redmond_la_SOURCES = redmond.cpp
+twin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 noinst_HEADERS = redmond.h
diff --git a/twin/clients/redmond/redmond.cpp b/twin/clients/redmond/redmond.cpp
index c59cd48d1..6deddeaee 100644
--- a/twin/clients/redmond/redmond.cpp
+++ b/twin/clients/redmond/redmond.cpp
@@ -210,9 +210,9 @@ static void create_pixmaps ()
 
     // Make sure button pixmaps contrast with the current colour scheme.
     if (tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127)
-        btnForeground = new TQColor(Qt::black);
+        btnForeground = new TQColor(TQt::black);
     else
-        btnForeground = new TQColor(Qt::white);
+        btnForeground = new TQColor(TQt::white);
 }
 
 void delete_pixmaps()
@@ -283,7 +283,7 @@ void RedmondButton::setBitmap(const unsigned char *bitmap)
 		deco = TQBitmap(10, 10, bitmap, true);
 	else {
 		deco = TQBitmap(10,10);
-		deco.fill(Qt::color0);
+		deco.fill(TQt::color0);
 	}
 	deco.setMask(deco);
 }
@@ -556,7 +556,7 @@ void RedmondDeco::paintEvent( TQPaintEvent* )
             TQImage image = KImageEffect::gradient(titleBuffer->size(), c1, c2,
                                     KImageEffect::HorizontalGradient);
 
-            titleBuffer->convertFromImage(image, Qt::OrderedDither);
+            titleBuffer->convertFromImage(image, TQt::OrderedDither);
         }
 
         TQPainter p2( titleBuffer, this );
diff --git a/twin/clients/redmond/redmond.desktop b/twin/clients/redmond/redmond.desktop
index d6bf0a9b0..68a360be0 100644
--- a/twin/clients/redmond/redmond.desktop
+++ b/twin/clients/redmond/redmond.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Redmond
-X-TDE-Library=twin3_redmond
+X-TDE-Library=twin_redmond
diff --git a/twin/clients/redmond/redmond.h b/twin/clients/redmond/redmond.h
index 211763535..3ef7337fb 100644
--- a/twin/clients/redmond/redmond.h
+++ b/twin/clients/redmond/redmond.h
@@ -29,7 +29,7 @@ class RedmondDeco;
 
 class RedmondButton : public KCommonDecorationButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	RedmondButton(ButtonType type, RedmondDeco *parent, const char *name);
 	void setBitmap(const unsigned char *bitmap);
@@ -72,7 +72,7 @@ private:
 
 class RedmondDecoFactory : public TQObject, public KDecorationFactory
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
 	RedmondDecoFactory();
 	virtual ~RedmondDecoFactory();
diff --git a/twin/clients/test/Makefile.am b/twin/clients/test/Makefile.am
index 07ac72c02..f25bc0b3e 100644
--- a/twin/clients/test/Makefile.am
+++ b/twin/clients/test/Makefile.am
@@ -1,10 +1,10 @@
 INCLUDES                  = -I$(srcdir)/../../lib $(all_includes)
 
-kde_module_LTLIBRARIES    = twin3_test.la
+kde_module_LTLIBRARIES    = twin_test.la
 
-twin3_test_la_SOURCES   = test.cpp
-twin3_test_la_LDFLAGS   = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_test_la_LIBADD    = $(LIB_TDEUI) ../../lib/libtdecorations.la
+twin_test_la_SOURCES   = test.cpp
+twin_test_la_LDFLAGS   = $(all_libraries) $(KDE_PLUGIN) -module
+twin_test_la_LIBADD    = $(LIB_TDEUI) ../../lib/libtdecorations.la
 #twin_keramik_la_LDFLAGS   = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
 
 METASOURCES               = AUTO
diff --git a/twin/clients/test/test.cpp b/twin/clients/test/test.cpp
index e01d1d98e..0cf45a90b 100644
--- a/twin/clients/test/test.cpp
+++ b/twin/clients/test/test.cpp
@@ -22,9 +22,9 @@ void Decoration::init()
 	{
         button = new TQPushButton( widget());
         button->show();
-        button->setCursor( tqarrowCursor );
+        button->setCursor( TQt::arrowCursor );
 	button->move( 0, 0 );
-        connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( closeWindow()));
+        connect( button, TQ_SIGNAL( clicked()), TQ_SLOT( closeWindow()));
 	TQToolTip::add( button, "Zelva Mana" );
 	}
     }
@@ -100,13 +100,13 @@ TQSize Decoration::minimumSize() const
     
 bool Decoration::eventFilter( TQObject* o, TQEvent* e )
     {
-    if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(widget()))
+    if( o == widget())
         {
         switch( e->type())
             {
             case TQEvent::MouseButtonPress:
 	        { // FRAME
-                processMousePressEvent( TQT_TQMOUSEEVENT( e ));
+                processMousePressEvent( static_cast<TQMouseEvent*>( e ));
         	return true;
 	        }
             case TQEvent::Show:
diff --git a/twin/clients/test/test.desktop b/twin/clients/test/test.desktop
index 04e9ebaeb..17a13bad8 100644
--- a/twin/clients/test/test.desktop
+++ b/twin/clients/test/test.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=KWin test
-X-TDE-Library=twin3_test
+X-TDE-Library=twin_test
diff --git a/twin/clients/test/test.h b/twin/clients/test/test.h
index bfe36fa7c..f735df6c4 100644
--- a/twin/clients/test/test.h
+++ b/twin/clients/test/test.h
@@ -15,7 +15,7 @@ const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET
 class Decoration
     : public KDecoration
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
 	Decoration( KDecorationBridge* bridge, KDecorationFactory* factory );
         virtual void init();
diff --git a/twin/clients/web/CMakeLists.txt b/twin/clients/web/CMakeLists.txt
index 6045bcbb0..5547dabe7 100644
--- a/twin/clients/web/CMakeLists.txt
+++ b/twin/clients/web/CMakeLists.txt
@@ -29,9 +29,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_web (module) ########################
+##### twin_web (module) ########################
 
-tde_add_kpart( twin3_web AUTOMOC
+tde_add_kpart( twin_web AUTOMOC
   SOURCES Web.cpp WebButton.cpp
   LINK tdecorations-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/web/Makefile.am b/twin/clients/web/Makefile.am
index 4855602ca..ba3efcb59 100644
--- a/twin/clients/web/Makefile.am
+++ b/twin/clients/web/Makefile.am
@@ -1,12 +1,12 @@
 INCLUDES                  = -I$(top_srcdir) $(all_includes)
-kde_module_LTLIBRARIES    = twin3_web.la
+kde_module_LTLIBRARIES    = twin_web.la
 
-twin3_web_la_SOURCES      = Web.cpp WebButton.cpp
+twin_web_la_SOURCES      = Web.cpp WebButton.cpp
 
 noinst_HEADERS            = Web.h WebButton.h
 
-twin3_web_la_LDFLAGS      = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_web_la_LIBADD       = $(LIB_TDEUI) ../../lib/libtdecorations.la
+twin_web_la_LDFLAGS      = $(all_libraries) $(KDE_PLUGIN) -module
+twin_web_la_LIBADD       = $(LIB_TDEUI) ../../lib/libtdecorations.la
 METASOURCES               = AUTO
 
 linkdir                   = $(kde_datadir)/twin/
diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp
index 2c0ffc8f9..5c2457e1c 100644
--- a/twin/clients/web/Web.cpp
+++ b/twin/clients/web/Web.cpp
@@ -216,7 +216,7 @@ WebClient::reset( unsigned long changed )
 WebClient::paintEvent(TQPaintEvent * pe)
 {
   int r_x, r_y, r_x2, r_y2;
-  TQT_TQRECT_OBJECT(widget()->rect()).coords(&r_x, &r_y, &r_x2, &r_y2);
+  widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2);
   const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft);
   const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop);
   const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight);
@@ -230,7 +230,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
 
   TQPainter p(widget());
 
-  p.setPen(Qt::black);
+  p.setPen(TQt::black);
   p.setBrush(options()->colorGroup(ColorFrame, isActive()).background());
 
   p.setClipRegion(pe->region() - titleRect);
diff --git a/twin/clients/web/Web.h b/twin/clients/web/Web.h
index d73f370d3..175928c91 100644
--- a/twin/clients/web/Web.h
+++ b/twin/clients/web/Web.h
@@ -69,7 +69,7 @@ namespace Web
 
   class WebFactory : public TQObject, public KDecorationFactory
   {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
diff --git a/twin/clients/web/WebButton.cpp b/twin/clients/web/WebButton.cpp
index f8d1c4add..eb6d8d530 100644
--- a/twin/clients/web/WebButton.cpp
+++ b/twin/clients/web/WebButton.cpp
@@ -170,7 +170,7 @@ WebButton::drawButton(TQPainter *p)
       {
         // Draw edge.
 
-        p->setPen(Qt::black);
+        p->setPen(TQt::black);
 
         p->drawLine(0, 0, width(), 0);
         p->drawLine(0, 1, 0, height() - 1);
@@ -207,7 +207,7 @@ WebButton::drawButton(TQPainter *p)
       {
         // Draw edge.
 
-        p->setPen(Qt::black);
+        p->setPen(TQt::black);
         p->drawLine(0, 0, width(), 0);
         p->drawLine(width() - 1, 1, width() - 1, height() - 1);
         if (shape_)
@@ -244,7 +244,7 @@ WebButton::drawButton(TQPainter *p)
       {
         // Draw edge.
 
-        p->setPen(Qt::black);
+        p->setPen(TQt::black);
         p->drawLine(0, 0, width(), 0);
 
         // Draw highlight.
@@ -266,7 +266,7 @@ WebButton::drawButton(TQPainter *p)
   int bhby2(bitmap_.height() / 2);   // Bitmap Height BY 2
 
   p->setBrush(NoBrush);
-  p->setPen(Qt::black);
+  p->setPen(TQt::black);
 
   p->drawPixmap(center.x() - bwby2 + 1, center.y() - bhby2 + 1, bitmap_);
 }
diff --git a/twin/clients/web/web.desktop b/twin/clients/web/web.desktop
index 10a05ccf1..e850418a4 100644
--- a/twin/clients/web/web.desktop
+++ b/twin/clients/web/web.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Web
-X-TDE-Library=twin3_web
+X-TDE-Library=twin_web
diff --git a/twin/compton-tde/compton.c b/twin/compton-tde/compton.c
index 603402fc6..2e76cb6b3 100644
--- a/twin/compton-tde/compton.c
+++ b/twin/compton-tde/compton.c
@@ -161,7 +161,11 @@ void delete_pid_file()
         printf("compton-tde lost connection to X server, restarting...\n"); fflush(stdout);
         sleep(1);
         char me[2048];
+#ifdef Q_OS_SOLARIS
+        int chars = readlink("/proc/self/path/a.out", me, sizeof(me));
+#else /* default */
         int chars = readlink("/proc/self/exe", me, sizeof(me));
+#endif /* self exe */
         me[chars] = 0;
         me[2047] = 0;
 	execl(me, basename(me), (char*)NULL);
diff --git a/twin/data/CMakeLists.txt b/twin/data/CMakeLists.txt
index 840c5afcf..df0b79f88 100644
--- a/twin/data/CMakeLists.txt
+++ b/twin/data/CMakeLists.txt
@@ -22,13 +22,13 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd
+    twin.upd twinsticky.upd twiniconify.upd
     twin_focus1.upd twinupdatewindowsettings.upd
     twin_focus2.upd twin_fsp_workarounds_1.upd
   DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
 install( PROGRAMS
-    pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh
+    pluginlibFix.pl twin_focus1.sh twin_focus2.sh
   DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
 install( FILES
diff --git a/twin/data/Makefile.am b/twin/data/Makefile.am
index 0a2dab482..64ce6ab81 100644
--- a/twin/data/Makefile.am
+++ b/twin/data/Makefile.am
@@ -16,9 +16,9 @@ METASOURCES = AUTO
 sounddir= $(kde_sounddir)
 sound_DATA = pop.wav
 
-update_DATA = twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd twin_focus1.upd \
+update_DATA = twin.upd twinsticky.upd twiniconify.upd twin_focus1.upd \
         twinupdatewindowsettings.upd twin_focus2.upd twin_fsp_workarounds_1.upd
-update_SCRIPTS = pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh
+update_SCRIPTS = pluginlibFix.pl twin_focus1.sh twin_focus2.sh
 updatedir = $(kde_datadir)/tdeconf_update
 
 twin_default_rules_DATA = fsp_workarounds_1.twinrules
diff --git a/twin/data/twin3_plugin.pl b/twin/data/twin3_plugin.pl
deleted file mode 100644
index f5234bcce..000000000
--- a/twin/data/twin3_plugin.pl
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/perl
-foreach (<>) {
-    if(/^PluginLib=twin_(.*)$/) {
-        print "PluginLib=twin3_$1\n"; 
-        next;
-    }
-    print $_;
-}
diff --git a/twin/data/twin3_plugin.upd b/twin/data/twin3_plugin.upd
deleted file mode 100644
index 7194b5641..000000000
--- a/twin/data/twin3_plugin.upd
+++ /dev/null
@@ -1,4 +0,0 @@
-Id=trinity.2
-File=twinrc
-Options=overwrite
-Script=twin3_plugin.pl,perl
diff --git a/twin/events.cpp b/twin/events.cpp
index e9f8fd484..3d3ba999c 100644
--- a/twin/events.cpp
+++ b/twin/events.cpp
@@ -194,10 +194,10 @@ void RootInfo::changeShowingDesktop( bool showing )
  */
 bool Workspace::workspaceEvent( XEvent * e )
     {
-    if ( mouse_emulation && (e->type == ButtonPress || e->type == ButtonRelease ) ) 
+    if ( mouse_emulation && (e->type == ButtonPress || e->type == ButtonRelease ) )
         {
         mouse_emulation = FALSE;
-        XUngrabKeyboard( tqt_xdisplay(), GET_QT_X_TIME() );
+        XUngrabKeyboard( tqt_xdisplay(), get_tqt_x_time() );
         }
 
     if( e->type == PropertyNotify || e->type == ClientMessage )
@@ -211,7 +211,7 @@ bool Workspace::workspaceEvent( XEvent * e )
         }
 
     // events that should be handled before Clients can get them
-    switch (e->type) 
+    switch (e->type)
         {
         case ButtonPress:
         case ButtonRelease:
@@ -284,7 +284,7 @@ bool Workspace::workspaceEvent( XEvent * e )
             return true;
         }
 
-    switch (e->type) 
+    switch (e->type)
         {
         case CreateNotify:
             if ( e->xcreatewindow.parent == root &&
@@ -292,18 +292,18 @@ bool Workspace::workspaceEvent( XEvent * e )
                  !e->xcreatewindow.override_redirect )
             {
         // see comments for allowClientActivation()
-            Time my_qtx_time = GET_QT_X_TIME();
+            Time my_qtx_time = get_tqt_x_time();
             XChangeProperty(tqt_xdisplay(), e->xcreatewindow.window,
                             atoms->kde_net_wm_user_creation_time, XA_CARDINAL,
                             32, PropModeReplace, (unsigned char *)&my_qtx_time, 1);
-            SET_QT_X_TIME(my_qtx_time);
+            set_tqt_x_time(my_qtx_time);
             }
         break;
 
     case UnmapNotify:
             {
         // check for system tray windows
-            if ( removeSystemTrayWin( e->xunmap.window, true ) ) 
+            if ( removeSystemTrayWin( e->xunmap.window, true ) )
                 {
 	    // If the system tray gets destroyed, the system tray
 	    // icons automatically get unmapped, reparented and mapped
@@ -317,7 +317,7 @@ bool Workspace::workspaceEvent( XEvent * e )
                 if ( XCheckTypedWindowEvent (tqt_xdisplay(), w,
                                              ReparentNotify, &ev) )
                     {
-                    if ( ev.xreparent.parent != root ) 
+                    if ( ev.xreparent.parent != root )
                         {
                         XReparentWindow( tqt_xdisplay(), w, root, 0, 0 );
                         addSystemTrayWin( w );
@@ -351,7 +351,7 @@ bool Workspace::workspaceEvent( XEvent * e )
             // e->xmaprequest.window is different from e->xany.window
             // TODO this shouldn't be necessary now
             Client* c = findClient( WindowMatchPredicate( e->xmaprequest.window ));
-            if ( !c ) 
+            if ( !c )
                 {
 // don't check for the parent being the root window, this breaks when some app unmaps
 // a window, changes something and immediately maps it back, without giving KWin
@@ -364,7 +364,7 @@ bool Workspace::workspaceEvent( XEvent * e )
                 if ( addSystemTrayWin( e->xmaprequest.window ) )
                     return TRUE;
                 c = createClient( e->xmaprequest.window, false );
-                if ( c != NULL && root != tqt_xrootwin() ) 
+                if ( c != NULL && root != tqt_xrootwin() )
                     { // TODO what is this?
                     // TODO may use TQWidget::create
                     XReparentWindow( tqt_xdisplay(), c->frameId(), root, 0, 0 );
@@ -389,7 +389,7 @@ bool Workspace::workspaceEvent( XEvent * e )
                 if ( w )
                     TQWhatsThis::leaveWhatsThisMode();
                 }
-            if( electricBorder(e))
+            if (activeBorderEvent(e))
                 return true;
             break;
             }
@@ -405,7 +405,7 @@ bool Workspace::workspaceEvent( XEvent * e )
             }
         case ConfigureRequest:
             {
-            if ( e->xconfigurerequest.parent == root ) 
+            if ( e->xconfigurerequest.parent == root )
                 {
                 XWindowChanges wc;
                 wc.border_width = e->xconfigurerequest.border_width;
@@ -454,7 +454,7 @@ bool Workspace::workspaceEvent( XEvent * e )
         case FocusOut:
             return true; // always eat these, they would tell Qt that KWin is the active app
         case ClientMessage:
-            if( electricBorder( e ))
+            if (activeBorderEvent(e))
                 return true;
             break;
         default:
@@ -542,7 +542,7 @@ bool Client::windowEvent( XEvent* e )
         }
 
 // TODO move all focus handling stuff to separate file?
-    switch (e->type) 
+    switch (e->type)
         {
         case UnmapNotify:
             unmapNotifyEvent( &e->xunmap );
@@ -785,8 +785,13 @@ void Client::configureRequestEvent( XConfigureRequestEvent* e )
     {
     if( e->window != window())
         return; // ignore frame/wrapper
-    if ( isResize() || isMove())
+    if ( isResize() || isMove() || inhibitConfigureRequests)
+        {
+        // Send a synthetic configure notification to make sure the
+        // window contents get updated by the application
+        sendSyntheticConfigureNotify();
         return; // we have better things to do right now
+        }
 
     if( fullscreen_mode == FullScreenNormal ) // refuse resizing of fullscreen windows
         { // but allow resizing fullscreen hacks in order to let them cancel fullscreen mode
@@ -800,7 +805,7 @@ void Client::configureRequestEvent( XConfigureRequestEvent* e )
         return;
         }
 
-    if ( e->value_mask & CWBorderWidth ) 
+    if ( e->value_mask & CWBorderWidth )
         {
         // first, get rid of a window border
         XWindowChanges wc;
@@ -818,7 +823,7 @@ void Client::configureRequestEvent( XConfigureRequestEvent* e )
         restackWindow( e->above, e->detail, NET::FromApplication, userTime(), false );
 
     // TODO sending a synthetic configure notify always is fine, even in cases where
-    // the ICCCM doesn't require this - it can be though of as 'the WM decided to move
+    // the ICCCM doesn't require this - it can be thought of as 'the WM decided to move
     // the window later'. The client should not cause that many configure request,
     // so this should not have any significant impact. With user moving/resizing
     // the it should be optimized though (see also Client::setGeometry()/plainResize()/move()).
@@ -836,7 +841,7 @@ void Client::propertyNotifyEvent( XPropertyEvent* e )
     {
     if( e->window != window())
         return; // ignore frame/wrapper
-    switch ( e->atom ) 
+    switch ( e->atom )
         {
         case XA_WM_NORMAL_HINTS:
             getWmNormalHints();
@@ -874,14 +879,14 @@ void Client::enterNotifyEvent( XCrossingEvent* e )
         return; // care only about entering the whole frame
     if( e->mode == NotifyNormal ||
          ( !options->focusPolicyIsReasonable() &&
-             e->mode == NotifyUngrab ) ) 
+             e->mode == NotifyUngrab ) )
         {
 
-        if (options->shadeHover && isShade()) 
+        if (options->shadeHover && isShade())
             {
             delete shadeHoverTimer;
             shadeHoverTimer = new TQTimer( this );
-            connect( shadeHoverTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( shadeHover() ));
+            connect( shadeHoverTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( shadeHover() ));
             shadeHoverTimer->start( options->shadeHoverInterval, TRUE );
             }
 
@@ -890,11 +895,11 @@ void Client::enterNotifyEvent( XCrossingEvent* e )
 
         if ( options->autoRaise && !isDesktop() &&
              !isDock() && !isTopMenu() && workspace()->focusChangeEnabled() &&
-             workspace()->topClientOnDesktop( workspace()->currentDesktop()) != this ) 
+             workspace()->topClientOnDesktop( workspace()->currentDesktop()) != this )
             {
             delete autoRaiseTimer;
             autoRaiseTimer = new TQTimer( this );
-            connect( autoRaiseTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoRaise() ) );
+            connect( autoRaiseTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoRaise() ) );
             autoRaiseTimer->start( options->autoRaiseInterval, TRUE  );
             }
 
@@ -919,12 +924,12 @@ void Client::leaveNotifyEvent( XCrossingEvent* e )
     {
     if( e->window != frameId())
         return; // care only about leaving the whole frame
-    if ( e->mode == NotifyNormal ) 
+    if ( e->mode == NotifyNormal )
         {
-        if ( !buttonDown ) 
+        if ( !buttonDown )
             {
             mode = PositionCenter;
-            setCursor( tqarrowCursor );
+            setCursor( TQt::arrowCursor );
             }
         bool lostMouse = !rect().contains( TQPoint( e->x, e->y ) );
         // 'lostMouse' wouldn't work with e.g. B2 or Keramik, which have non-rectangular decorations
@@ -934,7 +939,7 @@ void Client::leaveNotifyEvent( XCrossingEvent* e )
         // TODO this still sucks if a window appears above this one - it should lose the mouse
         // if this window is another client, but not if it's a popup ... maybe after KDE3.1 :(
         // (repeat after me 'AARGHL!')
-        if ( !lostMouse && e->detail != NotifyInferior ) 
+        if ( !lostMouse && e->detail != NotifyInferior )
             {
             int d1, d2, d3, d4;
             unsigned int d5;
@@ -943,7 +948,7 @@ void Client::leaveNotifyEvent( XCrossingEvent* e )
                 || child == None )
                 lostMouse = true; // really lost the mouse
             }
-        if ( lostMouse ) 
+        if ( lostMouse )
             {
             cancelAutoRaise();
             workspace()->cancelDelayFocus();
@@ -963,7 +968,7 @@ void Client::leaveNotifyEvent( XCrossingEvent* e )
 #define XScrL KKeyNative::modXScrollLock()
 void Client::grabButton( int modifier )
     {
-    unsigned int mods[ 8 ] = 
+    unsigned int mods[ 8 ] =
         {
         0, XCapL, XNumL, XNumL | XCapL,
         XScrL, XScrL | XCapL,
@@ -980,7 +985,7 @@ void Client::grabButton( int modifier )
 
 void Client::ungrabButton( int modifier )
     {
-    unsigned int mods[ 8 ] = 
+    unsigned int mods[ 8 ] =
         {
         0, XCapL, XNumL, XNumL | XCapL,
         XScrL, XScrL | XCapL,
@@ -1046,23 +1051,23 @@ void Client::updateMouseGrab()
 
 int qtToX11Button( TQt::ButtonState button )
     {
-    if( button == Qt::LeftButton )
+    if( button == TQt::LeftButton )
         return Button1;
-    else if( button == Qt::MidButton )
+    else if( button == TQt::MidButton )
         return Button2;
-    else if( button == Qt::RightButton )
+    else if( button == TQt::RightButton )
         return Button3;
     return AnyButton;
     }
-    
+
 int qtToX11State( TQt::ButtonState state )
     {
     int ret = 0;
-    if( state & Qt::LeftButton )
+    if( state & TQt::LeftButton )
         ret |= Button1Mask;
-    if( state & Qt::MidButton )
+    if( state & TQt::MidButton )
         ret |= Button2Mask;
-    if( state & Qt::RightButton )
+    if( state & TQt::RightButton )
         ret |= Button3Mask;
     if( state & TQt::ShiftButton )
         ret |= ShiftMask;
@@ -1079,7 +1084,7 @@ int qtToX11State( TQt::ButtonState state )
 // for the decoration window cannot be (easily) intercepted as X11 events
 bool Client::eventFilter( TQObject* o, TQEvent* e )
     {
-    if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(shadowWidget))
+    if (o == shadowWidget)
         {
         if (e->type() == TQEvent::MouseButtonRelease)
             {
@@ -1092,11 +1097,11 @@ bool Client::eventFilter( TQObject* o, TQEvent* e )
             removeShadow();
             switch (qe->button())
                 {
-                case Qt::MidButton:
+                case TQt::MidButton:
                     buttonMask = Button2Mask;
                     buttonPressed = Button2;
                     break;
-                case Qt::RightButton:
+                case TQt::RightButton:
                     buttonMask = Button3Mask;
                     buttonPressed = Button3;
                     break;
@@ -1291,29 +1296,29 @@ bool Client::eventFilter( TQObject* o, TQEvent* e )
             }
         }
     if( decoration == NULL
-        || TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(decoration->widget()))
+        || o != decoration->widget())
         return false;
     if( e->type() == TQEvent::MouseButtonPress )
         {
-        TQMouseEvent* ev = TQT_TQMOUSEEVENT( e );
+        TQMouseEvent* ev = static_cast<TQMouseEvent*>( e );
         return buttonPressEvent( decorationId(), qtToX11Button( ev->button()), qtToX11State( ev->state()),
             ev->x(), ev->y(), ev->globalX(), ev->globalY() );
         }
     if( e->type() == TQEvent::MouseButtonRelease )
         {
-        TQMouseEvent* ev = TQT_TQMOUSEEVENT( e );
+        TQMouseEvent* ev = static_cast<TQMouseEvent*>( e );
         return buttonReleaseEvent( decorationId(), qtToX11Button( ev->button()), qtToX11State( ev->state()),
             ev->x(), ev->y(), ev->globalX(), ev->globalY() );
         }
     if( e->type() == TQEvent::MouseMove ) // FRAME i fake z enter/leave?
         {
-        TQMouseEvent* ev = TQT_TQMOUSEEVENT( e );
+        TQMouseEvent* ev = static_cast<TQMouseEvent*>( e );
         return motionNotifyEvent( decorationId(), qtToX11State( ev->state()),
             ev->x(), ev->y(), ev->globalX(), ev->globalY() );
         }
     if( e->type() == TQEvent::Wheel )
         {
-        TQWheelEvent* ev = TQT_TQWHEELEVENT( e );
+        TQWheelEvent* ev = static_cast<TQWheelEvent*>( e );
         bool r = buttonPressEvent( decorationId(), ev->delta() > 0 ? Button4 : Button5, qtToX11State( ev->state()),
             ev->x(), ev->y(), ev->globalX(), ev->globalY() );
         r = r || buttonReleaseEvent( decorationId(), ev->delta() > 0 ? Button4 : Button5, qtToX11State( ev->state()),
@@ -1322,7 +1327,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e )
         }
     if( e->type() == TQEvent::Resize )
         {
-        TQResizeEvent* ev = TQT_TQRESIZEEVENT( e );
+        TQResizeEvent* ev = static_cast<TQResizeEvent*>( e );
         // Filter out resize events that inform about size different than frame size.
         // This will ensure that decoration->width() etc. and decoration->widget()->width() will be in sync.
         // These events only seem to be delayed events from initial resizing before show() was called
@@ -1348,7 +1353,7 @@ bool Client::buttonPressEvent( Window w, int button, int state, int x, int y, in
           // FRAME something out of this would be processed before it gets decorations
         updateUserTime();
         workspace()->setWasUserInteraction();
-        uint keyModX = (options->keyCmdAllModKey() == Qt::Key_Meta) ?
+        uint keyModX = (options->keyCmdAllModKey() == TQt::Key_Meta) ?
             KKeyNative::modX(KKey::WIN) :
             KKeyNative::modX(KKey::ALT);
         bool bModKeyHeld = keyModX != 0 && ( state & KKeyNative::accelModMaskX()) == keyModX;
@@ -1368,7 +1373,7 @@ bool Client::buttonPressEvent( Window w, int button, int state, int x, int y, in
         if ( bModKeyHeld )
             {
             was_action = true;
-            switch (button) 
+            switch (button)
                 {
                 case Button1:
                     com = options->commandAll1();
@@ -1391,7 +1396,7 @@ bool Client::buttonPressEvent( Window w, int button, int state, int x, int y, in
                 {
                 was_action = true;
                 perform_handled = true;
-                switch (button) 
+                switch (button)
                     {
                     case Button1:
                         com = options->commandWindow1();
@@ -1481,13 +1486,13 @@ void Client::processMousePressEvent( TQMouseEvent* e )
     int button;
     switch( e->button())
         {
-        case Qt::LeftButton:
+        case TQt::LeftButton:
             button = Button1;
           break;
-        case Qt::MidButton:
+        case TQt::MidButton:
             button = Button2;
           break;
-        case Qt::RightButton:
+        case TQt::RightButton:
             button = Button3;
           break;
         default:
@@ -1513,7 +1518,7 @@ bool Client::buttonReleaseEvent( Window w, int /*button*/, int state, int x, int
     if ( (state & ( Button1Mask & Button2Mask & Button3Mask )) == 0 )
         {
         buttonDown = FALSE;
-        if ( moveResizeMode ) 
+        if ( moveResizeMode )
             {
             finishMoveResize( false );
             // mouse position is still relative to old Client position, adjust it
@@ -1550,7 +1555,7 @@ static bool waitingMotionEvent()
 // of processes events reaches the timestamp of the last suitable
 // MotionNotify event in the queue.
     if( next_motion_time != CurrentTime
-        && timestampCompare( GET_QT_X_TIME(), next_motion_time ) < 0 )
+        && timestampCompare( get_tqt_x_time(), next_motion_time ) < 0 )
         return true;
     was_motion = false;
     XSync( tqt_xdisplay(), False ); // this helps to discard more MotionNotify events
@@ -1564,7 +1569,7 @@ bool Client::motionNotifyEvent( Window w, int /*state*/, int x, int y, int x_roo
     {
     if( w != frameId() && w != decorationId() && w != moveResizeGrabWindow())
         return true; // care only about the whole frame
-    if ( !buttonDown ) 
+    if ( !buttonDown )
         {
         Position newmode = mousePosition( TQPoint( x, y ));
         if( newmode != mode )
@@ -1682,7 +1687,7 @@ void Client::NETMoveResize( int x_root, int y_root, NET::Direction direction )
         buttonDown = FALSE;
         setCursor( mode );
     }
-    else if( direction >= NET::TopLeft && direction <= NET::Left ) 
+    else if( direction >= NET::TopLeft && direction <= NET::Left )
         {
         static const Position convert[] =
             {
@@ -1728,12 +1733,12 @@ void Client::keyPressEvent( uint key_code )
     updateUserTime();
     if ( !isMove() && !isResize() )
         return;
-    bool is_control = key_code & Qt::CTRL;
-    bool is_alt = key_code & Qt::ALT;
+    bool is_control = key_code & TQt::CTRL;
+    bool is_alt = key_code & TQt::ALT;
     key_code = key_code & 0xffff;
     int delta = is_control?1:is_alt?32:8;
     TQPoint pos = TQCursor::pos();
-    switch ( key_code ) 
+    switch ( key_code )
         {
         case Key_Left:
             pos.rx() -= delta;
diff --git a/twin/geometry.cpp b/twin/geometry.cpp
index 5c71e7c1f..581c07ac1 100644
--- a/twin/geometry.cpp
+++ b/twin/geometry.cpp
@@ -40,7 +40,7 @@ namespace KWinInternal
   Resizes the workspace after an XRANDR screen size change
  */
 void Workspace::desktopResized()
-    {
+{
     //printf("Workspace::desktopResized()\n");
     TQRect geom = TDEApplication::desktop()->geometry();
     NETSize desktop_geometry;
@@ -49,24 +49,17 @@ void Workspace::desktopResized()
     rootInfo->setDesktopGeometry( -1, desktop_geometry );
 
     updateClientArea( true );
-    checkElectricBorders( true );
-    }
+    destroyActiveBorders();
+    updateActiveBorders();
+}
 
 /*!
   Resizes the workspace after kdesktop signals a desktop resize
  */
 void Workspace::kDestopResized()
-    {
-    //printf("Workspace::kDesktopResized()\n");
-    TQRect geom = TDEApplication::desktop()->geometry();
-    NETSize desktop_geometry;
-    desktop_geometry.width = geom.width();
-    desktop_geometry.height = geom.height();
-    rootInfo->setDesktopGeometry( -1, desktop_geometry );
-
-    updateClientArea( true );
-    checkElectricBorders( true );
-    }
+{
+	desktopResized();
+}
 
 /*!
   Updates the current client areas according to the current clients.
@@ -344,23 +337,23 @@ TQPoint Workspace::adjustClientPosition( Client* c, TQPoint pos )
         int snap = options->borderSnapZone; //snap trigger
         if (snap)
             {
-            if ((sOWO?(cx<xmin):true) && (QABS(xmin-cx)<snap))
+            if ((sOWO?(cx<xmin):true) && (TQABS(xmin-cx)<snap))
                 {
                 deltaX = xmin-cx;
                 nx = xmin;
                 }
-            if ((sOWO?(rx>xmax):true) && (QABS(rx-xmax)<snap) && (QABS(xmax-rx) < deltaX))
+            if ((sOWO?(rx>xmax):true) && (TQABS(rx-xmax)<snap) && (TQABS(xmax-rx) < deltaX))
                 {
                 deltaX = rx-xmax;
                 nx = xmax - cw;
                 }
 
-            if ((sOWO?(cy<ymin):true) && (QABS(ymin-cy)<snap))
+            if ((sOWO?(cy<ymin):true) && (TQABS(ymin-cy)<snap))
                 {
                 deltaY = ymin-cy;
                 ny = ymin;
                 }
-            if ((sOWO?(ry>ymax):true) && (QABS(ry-ymax)<snap) && (QABS(ymax-ry) < deltaY))
+            if ((sOWO?(ry>ymax):true) && (TQABS(ry-ymax)<snap) && (TQABS(ymax-ry) < deltaY))
                 {
                 deltaY =ry-ymax;
                 ny = ymax - ch;
@@ -387,14 +380,14 @@ TQPoint Workspace::adjustClientPosition( Client* c, TQPoint pos )
                          (( ry >= ly  ) && ( ry  <= lry ))  ||
                          (( cy <= ly  ) && ( ry >= lry  )) )
                         {
-                        if ((sOWO?(cx<lrx):true) && (QABS(lrx-cx)<snap) && ( QABS(lrx -cx) < deltaX) )
+                        if ((sOWO?(cx<lrx):true) && (TQABS(lrx-cx)<snap) && ( TQABS(lrx -cx) < deltaX) )
                             {
-                            deltaX = QABS( lrx - cx );
+                            deltaX = TQABS( lrx - cx );
                             nx = lrx;
                             }
-                        if ((sOWO?(rx>lx):true) && (QABS(rx-lx)<snap) && ( QABS( rx - lx )<deltaX) )
+                        if ((sOWO?(rx>lx):true) && (TQABS(rx-lx)<snap) && ( TQABS( rx - lx )<deltaX) )
                             {
-                            deltaX = QABS(rx - lx);
+                            deltaX = TQABS(rx - lx);
                             nx = lx - cw;
                             }
                         }
@@ -403,15 +396,15 @@ TQPoint Workspace::adjustClientPosition( Client* c, TQPoint pos )
                          (( rx >= lx  ) && ( rx  <= lrx ))  ||
                          (( cx <= lx  ) && ( rx >= lrx  )) )
                         {
-                        if ((sOWO?(cy<lry):true) && (QABS(lry-cy)<snap) && (QABS( lry -cy ) < deltaY))
+                        if ((sOWO?(cy<lry):true) && (TQABS(lry-cy)<snap) && (TQABS( lry -cy ) < deltaY))
                             {
-                            deltaY = QABS( lry - cy );
+                            deltaY = TQABS( lry - cy );
                             ny = lry;
                             }
-                  //if ( (QABS( ry-ly ) < snap) && (QABS( ry - ly ) < deltaY ))
-                        if ((sOWO?(ry>ly):true) && (QABS(ry-ly)<snap) && (QABS( ry - ly ) < deltaY ))
+                  //if ( (TQABS( ry-ly ) < snap) && (TQABS( ry - ly ) < deltaY ))
+                        if ((sOWO?(ry>ly):true) && (TQABS(ry-ly)<snap) && (TQABS( ry - ly ) < deltaY ))
                             {
-                            deltaY = QABS( ry - ly );
+                            deltaY = TQABS( ry - ly );
                             ny = ly - ch;
                             }
                         }
@@ -458,30 +451,30 @@ TQRect Workspace::adjustClientSize( Client* c, TQRect moveResizeGeom, int mode )
             deltaY = int(snap);
 
 #define SNAP_BORDER_TOP \
-            if ((sOWO?(newcy<ymin):true) && (QABS(ymin-newcy)<deltaY)) \
+            if ((sOWO?(newcy<ymin):true) && (TQABS(ymin-newcy)<deltaY)) \
               { \
-                deltaY = QABS(ymin-newcy); \
+                deltaY = TQABS(ymin-newcy); \
                 newcy = ymin; \
                }
 
 #define SNAP_BORDER_BOTTOM \
-            if ((sOWO?(newry>ymax):true) && (QABS(ymax-newry)<deltaY)) \
+            if ((sOWO?(newry>ymax):true) && (TQABS(ymax-newry)<deltaY)) \
               { \
-                deltaY = QABS(ymax-newcy); \
+                deltaY = TQABS(ymax-newcy); \
                 newry = ymax; \
                }
 
 #define SNAP_BORDER_LEFT \
-            if ((sOWO?(newcx<xmin):true) && (QABS(xmin-newcx)<deltaX)) \
+            if ((sOWO?(newcx<xmin):true) && (TQABS(xmin-newcx)<deltaX)) \
               { \
-                deltaX = QABS(xmin-newcx); \
+                deltaX = TQABS(xmin-newcx); \
                 newcx = xmin; \
                }
 
 #define SNAP_BORDER_RIGHT \
-            if ((sOWO?(newrx>xmax):true) && (QABS(xmax-newrx)<deltaX)) \
+            if ((sOWO?(newrx>xmax):true) && (TQABS(xmax-newrx)<deltaX)) \
               { \
-                deltaX = QABS(xmax-newrx); \
+                deltaX = TQABS(xmax-newrx); \
                 newrx = xmax; \
                }
                      switch ( mode )
@@ -550,30 +543,30 @@ TQRect Workspace::adjustClientSize( Client* c, TQRect moveResizeGeom, int mode )
 
 #define SNAP_WINDOW_TOP  if ( (sOWO?(newcy<lry):true) \
                   && WITHIN_WIDTH  \
-                  && (QABS( lry - newcy ) < deltaY) ) {  \
-                  deltaY = QABS( lry - newcy ); \
+                  && (TQABS( lry - newcy ) < deltaY) ) {  \
+                  deltaY = TQABS( lry - newcy ); \
                   newcy=lry; \
                   }
 
 #define SNAP_WINDOW_BOTTOM  if ( (sOWO?(newry>ly):true)  \
                      && WITHIN_WIDTH  \
-                     && (QABS( ly - newry ) < deltaY) ) {  \
-                     deltaY = QABS( ly - newry );  \
+                     && (TQABS( ly - newry ) < deltaY) ) {  \
+                     deltaY = TQABS( ly - newry );  \
                      newry=ly;  \
                      }
 
 #define SNAP_WINDOW_LEFT  if ( (sOWO?(newcx<lrx):true)  \
                    && WITHIN_HEIGHT  \
-                   && (QABS( lrx - newcx ) < deltaX)) {  \
-                   deltaX = QABS( lrx - newcx );  \
+                   && (TQABS( lrx - newcx ) < deltaX)) {  \
+                   deltaX = TQABS( lrx - newcx );  \
                    newcx=lrx;  \
                    }
 
 #define SNAP_WINDOW_RIGHT  if ( (sOWO?(newrx>lx):true)  \
                     && WITHIN_HEIGHT  \
-                    && (QABS( lx - newrx ) < deltaX))  \
+                    && (TQABS( lx - newrx ) < deltaX))  \
                     {  \
-                    deltaX = QABS( lx - newrx );  \
+                    deltaX = TQABS( lx - newrx );  \
                     newrx=lx;  \
                     }
 
@@ -686,7 +679,7 @@ void Workspace::updateTopMenuGeometry( Client* c )
         static Atom msg_type_atom = XInternAtom( tqt_xdisplay(), "_KDE_TOPMENU_MINSIZE", False );
         ev.xclient.message_type = msg_type_atom;
         ev.xclient.format = 32;
-        ev.xclient.data.l[0] = GET_QT_X_TIME();
+        ev.xclient.data.l[0] = get_tqt_x_time();
         ev.xclient.data.l[1] = topmenu_space->width();
         ev.xclient.data.l[2] = topmenu_space->height();
         ev.xclient.data.l[3] = 0;
@@ -1458,6 +1451,8 @@ const TQPoint Client::calculateGravitation( bool invert, int gravity ) const
 
 void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, int gravity, bool from_tool )
     {
+    inhibitConfigureRequests = true;
+    configureRequestTimer->start(100, true);
     if( gravity == 0 ) // default (nonsense) value for the argument
         gravity = xSizeHint.win_gravity;
     if( value_mask & ( CWX | CWY ))
@@ -1906,7 +1901,7 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
         if( horizontal )
             max_mode = MaximizeMode( max_mode ^ MaximizeHorizontal );
         }
-        
+
     max_mode = rules()->checkMaximize( max_mode );
     if( !adjust && max_mode == old_mode )
         return;
@@ -1955,9 +1950,9 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
 	    {
 	    max_mode = MaximizeHorizontal;
 	    maxmode_restore = MaximizeRestore;
-	    }	
+	    }
 	}
-    
+
     switch (max_mode)
         {
 
@@ -2223,8 +2218,8 @@ void Client::updateFullScreenHack( const TQRect& geom )
     workspace()->updateClientLayer( this ); // active fullscreens get different layer
     }
 
-static TQRect*       visible_bound  = 0;
-static GeometryTip* geometryTip    = 0;
+static TQRect*       visible_bound  = nullptr;
+static GeometryTip*  geometryTip    = nullptr;
 
 void Client::drawbound( const TQRect& geom )
     {
@@ -2247,7 +2242,7 @@ void Client::doDrawbound( const TQRect& geom, bool clear )
     if( decoration != NULL && decoration->drawbound( geom, clear ))
         return; // done by decoration
     TQPainter p ( workspace()->desktopWidget() );
-    p.setPen( TQPen( Qt::white, 5 ) );
+    p.setPen( TQPen( TQt::white, 5 ) );
     p.setRasterOp( TQt::XorROP );
     // the line is 5 pixel thick, so compensate for the extra two pixels
     // on outside (#88657)
@@ -2265,44 +2260,43 @@ void Client::doDrawbound( const TQRect& geom, bool clear )
     p.drawRect( g );
     }
 
-void Client::positionGeometryTip()
-    {
-    assert( isMove() || isResize());
+void Client::positionGeometryTip() {
+    assert(isMove() || isResize());
+
     // Position and Size display
-    if (options->showGeometryTip())
-        {
-        if( !geometryTip )
-            { // save under is not necessary with opaque, and seem to make things slower
+    if (options->showGeometryTip()) {
+        if (!geometryTip) {
+            // save under is not necessary with opaque, and seem to make things slower
             bool save_under = ( isMove() && rules()->checkMoveResizeMode( options->moveMode ) != Options::Opaque )
-                        || ( isResize() && rules()->checkMoveResizeMode( options->resizeMode ) != Options::Opaque );
+                           || ( isResize() && rules()->checkMoveResizeMode( options->resizeMode ) != Options::Opaque );
             geometryTip = new GeometryTip( &xSizeHint, save_under );
-            }
-        TQRect wgeom( moveResizeGeom ); // position of the frame, size of the window itself
-        wgeom.setWidth( wgeom.width() - ( width() - clientSize().width()));
-        wgeom.setHeight( wgeom.height() - ( height() - clientSize().height()));
-        if( isShade())
-            wgeom.setHeight( 0 );
-        geometryTip->setGeometry( wgeom );
-        if( !geometryTip->isVisible())
-            {
+        }
+
+        // position of the frame, size of the window itself
+        TQRect wgeom(isActiveBorderMaximizing() ? activeBorderMaximizeGeometry() : moveResizeGeom);
+        wgeom.setWidth(wgeom.width() - (width() - clientSize().width()));
+        wgeom.setHeight(isShade() ? 0 : wgeom.height() - (height() - clientSize().height()));
+
+        geometryTip->setGeometry(wgeom);
+        if (!geometryTip->isVisible()) {
             geometryTip->show();
             geometryTip->raise();
-            }
         }
     }
+}
 
 class EatAllPaintEvents
-    : public QObject
+    : public TQObject
     {
     protected:
         virtual bool eventFilter( TQObject* o, TQEvent* e )
-            { return e->type() == TQEvent::Paint && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(geometryTip); }
+            { return e->type() == TQEvent::Paint && o != geometryTip; }
     };
 
 static EatAllPaintEvents* eater = 0;
 
 bool Client::startMoveResize()
-    {
+{
     assert( !moveResizeMode );
     assert( TQWidget::keyboardGrabber() == NULL );
     assert( TQWidget::mouseGrabber() == NULL );
@@ -2319,33 +2313,68 @@ bool Client::startMoveResize()
     XMapRaised( tqt_xdisplay(), move_resize_grab_window );
     if( XGrabPointer( tqt_xdisplay(), move_resize_grab_window, False,
         ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | LeaveWindowMask,
-        GrabModeAsync, GrabModeAsync, move_resize_grab_window, cursor.handle(), GET_QT_X_TIME() ) == Success )
+        GrabModeAsync, GrabModeAsync, move_resize_grab_window, cursor.handle(), get_tqt_x_time() ) == Success )
         has_grab = true;
-    if( XGrabKeyboard( tqt_xdisplay(), frameId(), False, GrabModeAsync, GrabModeAsync, GET_QT_X_TIME() ) == Success )
+    if( XGrabKeyboard( tqt_xdisplay(), frameId(), False, GrabModeAsync, GrabModeAsync, get_tqt_x_time() ) == Success )
         has_grab = true;
     if( !has_grab ) // at least one grab is necessary in order to be able to finish move/resize
-        {
+    {
         XDestroyWindow( tqt_xdisplay(), move_resize_grab_window );
         move_resize_grab_window = None;
         return false;
-        }
-    if ( maximizeMode() != MaximizeRestore )
-        resetMaximize();
+    }
+
     removeShadow();
     moveResizeMode = true;
+    initialMoveResizeGeom = geometry();
+
+    if (activeTiled)
+    {
+        // Restore original geometry
+        activeTiled = false;
+        if (options->resetMaximizedWindowGeometry() && isMove()) {
+            /* Original geometry might be smaller than the tiled one, so the
+             * mouse pointer might appear off-window when untiling.
+             * Here we center the window horizontally under the mouse pointer.
+             * This should work with most window decorations.
+             */
+            activeTiledOrigGeom.moveLeft(TQCursor::pos().x() - (activeTiledOrigGeom.width() / 2));
+            moveOffset.setX(TQCursor::pos().x() - activeTiledOrigGeom.x());
+
+            setGeometry(activeTiledOrigGeom);
+        }
+    }
+
+    if ( maximizeMode() != MaximizeRestore )
+    {
+        if (options->resetMaximizedWindowGeometry() && isMove()) {
+            maximize(MaximizeRestore);
+        }
+        else {
+            resetMaximize();
+        }
+        activeTiled = false;
+    }
+
+    moveResizeGeom = geometry();
     workspace()->setClientIsMoving(this);
-    initialMoveResizeGeom = moveResizeGeom = geometry();
     checkUnrestrictedMoveResize();
+
     // rule out non opaque windows from useless translucency settings, maybe resizes?
     if ((isResize() && options->removeShadowsOnResize) || (isMove() && options->removeShadowsOnMove))
+    {
         setShadowSize(0);
-    if (rules()->checkMoveResizeMode( options->moveMode ) == Options::Opaque){
+    }
+
+    if (rules()->checkMoveResizeMode( options->moveMode ) == Options::Opaque)
+    {
         savedOpacity_ = opacity_;
         setOpacity(options->translucentMovingWindows, options->movingWindowOpacity);
     }
+
     if ( ( isMove() && rules()->checkMoveResizeMode( options->moveMode ) != Options::Opaque )
       || ( isResize() && rules()->checkMoveResizeMode( options->resizeMode ) != Options::Opaque ) )
-        {
+    {
         grabXServer();
         kapp->sendPostedEvents();
         // we have server grab -> nothing should cause paint events
@@ -2353,27 +2382,59 @@ bool Client::startMoveResize()
         // paint events on some widgets due to FocusIn(?)
         // eat them, otherwise XOR painting will be broken (#58054)
         // paint events for the geometrytip need to be allowed, though
-        eater = new EatAllPaintEvents;
+        // eater = new EatAllPaintEvents;
 // not needed anymore?        kapp->installEventFilter( eater );
-        }
+    }
     Notify::raise( isResize() ? Notify::ResizeStart : Notify::MoveStart );
-    return true;
+
+    if (options->activeBorders() == Options::ActiveSwitchOnMove ||
+        options->activeBorders() == Options::ActiveTileMaximize ||
+        options->activeBorders() == Options::ActiveTileOnly)
+
+    {
+        workspace()->reserveActiveBorderSwitching(true);
     }
 
+    return true;
+}
+
 void Client::finishMoveResize( bool cancel )
-    {
+{
     leaveMoveResize();
-    if( cancel )
-        setGeometry( initialMoveResizeGeom );
+
+    if (!isActiveBorderMaximizing()) {
+        setGeometry(cancel ? initialMoveResizeGeom : moveResizeGeom);
+    }
+
     else
-        setGeometry( moveResizeGeom );
+    {
+        kdDebug() <<"finishing moveresize in active mode, cancel is " << cancel << endl;
+        activeMaximizing = false;
+        activeTiled = true;
+        activeTiledOrigGeom = initialMoveResizeGeom;
+        switch (activeMode)
+        {
+            case ActiveMaximizeMode: {
+                if (!cancel) {
+                    bool full = (maximizeMode() == MaximizeFull);
+                    setMaximize(!full, !full);
+                }
+                break;
+            }
+            default:
+                setGeometry(cancel ? initialMoveResizeGeom
+                                   : activeBorderMaximizeGeometry());
+        }
+        activeTiledOrigGeom.moveTopLeft(rect().topLeft());
+    }
+
     checkMaximizeGeometry();
 // FRAME    update();
     Notify::raise( isResize() ? Notify::ResizeEnd : Notify::MoveEnd );
-    }
+}
 
 void Client::leaveMoveResize()
-    {
+{
     // rule out non opaque windows from useless translucency settings, maybe resizes?
     if (rules()->checkMoveResizeMode( options->moveMode ) == Options::Opaque)
         setOpacity(true, savedOpacity_);
@@ -2389,8 +2450,8 @@ void Client::leaveMoveResize()
     if ( ( isMove() && rules()->checkMoveResizeMode( options->moveMode ) != Options::Opaque )
       || ( isResize() && rules()->checkMoveResizeMode( options->resizeMode ) != Options::Opaque ) )
         ungrabXServer();
-    XUngrabKeyboard( tqt_xdisplay(), GET_QT_X_TIME() );
-    XUngrabPointer( tqt_xdisplay(), GET_QT_X_TIME() );
+    XUngrabKeyboard( tqt_xdisplay(), get_tqt_x_time() );
+    XUngrabPointer( tqt_xdisplay(), get_tqt_x_time() );
     XDestroyWindow( tqt_xdisplay(), move_resize_grab_window );
     move_resize_grab_window = None;
     workspace()->setClientIsMoving(0);
@@ -2401,12 +2462,19 @@ void Client::leaveMoveResize()
     delete eater;
     eater = 0;
     if (options->shadowEnabled(isActive()))
-        {
+    {
         drawIntersectingShadows();
         updateOpacityCache();
-        }
     }
 
+    if (options->activeBorders() == Options::ActiveSwitchOnMove ||
+        options->activeBorders() == Options::ActiveTileMaximize ||
+        options->activeBorders() == Options::ActiveTileOnly)
+    {
+        workspace()->reserveActiveBorderSwitching(false);
+    }
+}
+
 // This function checks if it actually makes sense to perform a restricted move/resize.
 // If e.g. the titlebar is already outside of the workarea, there's no point in performing
 // a restricted move resize, because then e.g. resize would also move the window (#74555).
@@ -2417,7 +2485,7 @@ void Client::checkUnrestrictedMoveResize()
         return;
     TQRect desktopArea = workspace()->clientArea( WorkArea, moveResizeGeom.center(), desktop());
     int left_marge, right_marge, top_marge, bottom_marge, titlebar_marge;
-    // restricted move/resize - keep at least part of the titlebar always visible 
+    // restricted move/resize - keep at least part of the titlebar always visible
     // how much must remain visible when moved away in that direction
     left_marge = KMIN( 100 + border_right, moveResizeGeom.width());
     right_marge = KMIN( 100 + border_left, moveResizeGeom.width());
@@ -2452,27 +2520,22 @@ void Client::checkUnrestrictedMoveResize()
         }
     }
 
-void Client::handleMoveResize( int x, int y, int x_root, int y_root )
-    {
-    if(( mode == PositionCenter && !isMovable())
-        || ( mode != PositionCenter && ( isShade() || !isResizable())))
+void Client::handleMoveResize(int x, int y, int x_root, int y_root) {
+    if ( (mode == PositionCenter && !isMovable())
+        || (mode != PositionCenter && (isShade() || !isResizable())) )
         return;
 
-    if ( !moveResizeMode )
-        {
-        TQPoint p( TQPoint( x, y ) - moveOffset );
-        if (p.manhattanLength() >= 6)
-            {
-            if( !startMoveResize())
-                {
+    if (!moveResizeMode) {
+        TQPoint p(TQPoint( x, y ) - moveOffset);
+        if (p.manhattanLength() >= 6) {
+            if (!startMoveResize()) {
                 buttonDown = false;
                 setCursor( mode );
                 return;
-                }
             }
-        else
-            return;
         }
+        else return;
+    }
 
     // ShadeHover or ShadeActive, ShadeNormal was already avoided above
     if ( mode != PositionCenter && shade_mode != ShadeNone )
@@ -2493,8 +2556,8 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
     int left_marge, right_marge, top_marge, bottom_marge, titlebar_marge;
     if( unrestrictedMoveResize ) // unrestricted, just don't let it go out completely
         left_marge = right_marge = top_marge = bottom_marge = titlebar_marge = 5;
-    else // restricted move/resize - keep at least part of the titlebar always visible 
-        {        
+    else // restricted move/resize - keep at least part of the titlebar always visible
+    {
         // how much must remain visible when moved away in that direction
         left_marge = KMIN( 100 + border_right, moveResizeGeom.width());
         right_marge = KMIN( 100 + border_left, moveResizeGeom.width());
@@ -2502,16 +2565,16 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
         titlebar_marge = initialMoveResizeGeom.height();
         top_marge = border_bottom;
         bottom_marge = border_top;
-        }
+    }
 
     bool update = false;
-    if( isResize())
-        {
+    if (isResize())
+    {
         // first resize (without checking constraints), then snap, then check bounds, then check constraints
         TQRect orig = initialMoveResizeGeom;
         Sizemode sizemode = SizemodeAny;
         switch ( mode )
-            {
+        {
             case PositionTopLeft:
                 moveResizeGeom =  TQRect( topleft, orig.bottomRight() ) ;
                 break;
@@ -2544,7 +2607,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
             default:
                 assert( false );
                 break;
-            }
+        }
 
         // adjust new size to snap to other windows/borders
         moveResizeGeom = workspace()->adjustClientSize( this, moveResizeGeom, mode );
@@ -2567,7 +2630,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
         bottomright = TQPoint( moveResizeGeom.left() + size.width() - 1, moveResizeGeom.top() + size.height() - 1 );
         orig = moveResizeGeom;
         switch ( mode )
-            { // these 4 corners ones are copied from above
+        { // these 4 corners ones are copied from above
             case PositionTopLeft:
                 moveResizeGeom =  TQRect( topleft, orig.bottomRight() ) ;
                 break;
@@ -2599,12 +2662,12 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
             default:
                 assert( false );
                 break;
-            }
-        if( moveResizeGeom.size() != previousMoveResizeGeom.size())
-            update = true;
         }
-    else if( isMove())
-        {
+        if (moveResizeGeom.size() != previousMoveResizeGeom.size())
+            update = true;
+    }
+    else if (isMove())
+    {
         assert( mode == PositionCenter );
         // first move, then snap, then check bounds
         moveResizeGeom.moveTopLeft( topleft );
@@ -2621,29 +2684,160 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
             moveResizeGeom.moveLeft(desktopArea.right() - right_marge );
         if( moveResizeGeom.topLeft() != previousMoveResizeGeom.topLeft())
             update = true;
-        }
+    }
     else
-        assert( false );
+        assert(false);
 
-    if( update )
+    if (update)
+    {
+        bool active = isActiveBorderMaximizing();
+        auto mode = active ? options->tilingMode
+                  : isResize() ? options->resizeMode : options->moveMode;
+
+        if (rules()->checkMoveResizeMode(mode) == Options::Opaque)
         {
-        if( rules()->checkMoveResizeMode
-            ( isResize() ? options->resizeMode : options->moveMode ) == Options::Opaque )
-            {
-            setGeometry( moveResizeGeom );
+            setGeometry(active ? activeBorderMaximizeGeometry() : moveResizeGeom);
             positionGeometryTip();
-            }
-        else if( rules()->checkMoveResizeMode
-            ( isResize() ? options->resizeMode : options->moveMode ) == Options::Transparent )
+        }
+        else if (rules()->checkMoveResizeMode(mode) == Options::Transparent)
+        {
+        /* It's necessary to move the geometry tip when there's no outline
+         * shown, otherwise it would cause repaint problems in case
+         * they overlap; the paint event will come after this,
+         * so the geometry tip will be painted above the outline
+         */
+            clearbound();
+            positionGeometryTip();
+            drawbound(active ? activeBorderMaximizeGeometry() : moveResizeGeom);
+        }
+    }
+    if (isMove()) {
+        workspace()->checkActiveBorder(globalPos, get_tqt_x_time());
+    }
+}
+
+void Client::setActiveBorderMode( ActiveMaximizingMode mode )
+{
+    activeMode = mode;
+}
+
+ActiveMaximizingMode Client::activeBorderMode() const
+{
+    return activeMode;
+}
+
+void Client::setActiveBorder(ActiveBorder border) {
+    currentActiveBorder = border;
+}
+
+ActiveBorder Client::activeBorder() const {
+    return currentActiveBorder;
+}
+
+bool Client::isActiveBorderMaximizing() const
+{
+    return activeMaximizing;
+}
+
+void Client::setActiveBorderMaximizing( bool maximizing )
+{
+    activeMaximizing = maximizing;
+    bool opaque = rules()->checkMoveResizeMode(options->tilingMode) == Options::Opaque;
+
+    if (maximizing || opaque) {
+        clearbound();
+    }
+
+    if (maximizing && !opaque) {
+        drawbound(activeBorderMaximizeGeometry());
+    }
+}
+
+void Client::cancelActiveBorderMaximizing() {
+    if (!activeMaximizing) return;
+    activeMaximizing = false;
+
+    // If we are in transparent mode, we need to clear out the bound we had drawn
+    if (rules()->checkMoveResizeMode(options->tilingMode) == Options::Transparent) {
+        clearbound();
+    }
+}
+
+TQRect Client::activeBorderMaximizeGeometry()
+{
+    TQRect ret;
+    TQRect max = workspace()->clientArea(MaximizeArea, TQCursor::pos(), workspace()->currentDesktop());
+    switch (activeBorderMode())
+    {
+        case ActiveMaximizeMode:
+        {
+            if (maximizeMode() == MaximizeFull)
+                ret = geometryRestore();
+            else
+                ret = max;
+            break;
+        }
+
+        case ActiveTilingMode:
+        {
+            switch (activeBorder())
             {
-            clearbound();  // it's necessary to move the geometry tip when there's no outline
-            positionGeometryTip(); // shown, otherwise it would cause repaint problems in case
-            drawbound( moveResizeGeom ); // they overlap; the paint event will come after this,
-            }                               // so the geometry tip will be painted above the outline
+                case ActiveLeft:
+                {
+                    ret = TQRect( max.x(), max.y(), max.width()/2, max.height() );
+                    break;
+                }
+                case ActiveRight:
+                {
+                    ret = TQRect( max.x() + max.width()/2, max.y(), max.width()/2, max.height() );
+                    break;
+                }
+                case ActiveTop:
+                {
+                    ret = TQRect( max.x(), max.y(), max.width(), max.height()/2 );
+                    break;
+                }
+                case ActiveBottom:
+                {
+                    ret = TQRect( max.x(), max.y() + max.height()/2, max.width(), max.height()/2 );
+                    break;
+                }
+                case ActiveTopLeft:
+                {
+                    ret = TQRect( max.x(), max.y(), max.width()/2, max.height()/2 );
+                    break;
+                }
+                case ActiveTopRight:
+                {
+                    ret = TQRect( max.x() + max.width()/2, max.y(), max.width()/2, max.height()/2 );
+                    break;
+                }
+                case ActiveBottomLeft:
+                {
+                    ret = TQRect( max.x(), max.y() + max.height()/2, max.width()/2, max.height()/2 );
+                    break;
+                }
+                case ActiveBottomRight:
+                {
+                    ret = TQRect( max.x() + max.width()/2, max.y() + max.height()/2, max.width()/2, max.height()/2);
+                    break;
+                }
+            }
         }
-    if ( isMove() )
-      workspace()->clientMoved(globalPos, GET_QT_X_TIME());
     }
+    return ret;
+}
 
+void Client::tileToBorder(ActiveBorder border) {
+    if (!isResizable()) return;
+    activeTiled = true;
+    setActiveBorderMode(ActiveTilingMode);
+    setActiveBorder(border);
+    TQRect geo = activeBorderMaximizeGeometry();
+    if (geo.isValid() && !geo.isEmpty()) {
+        setGeometry(geo);
+    }
+    workspace()->raiseClient(this);
+}
 
 } // namespace
diff --git a/twin/geometrytip.h b/twin/geometrytip.h
index a9c194250..40c2a63eb 100644
--- a/twin/geometrytip.h
+++ b/twin/geometrytip.h
@@ -19,7 +19,7 @@ namespace KWinInternal
 
 class GeometryTip: public TQLabel
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         GeometryTip( const XSizeHints* xSizeHints, bool save_under );
         ~GeometryTip();
diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp
index 17381247a..0a3c6331e 100644
--- a/twin/kcmtwin/twindecoration/buttons.cpp
+++ b/twin/kcmtwin/twindecoration/buttons.cpp
@@ -606,7 +606,7 @@ void ButtonDropSite::drawContents( TQPainter* p )
 
 	TQColor c1( 0x0A, 0x5F, 0x89 );		// KDE 2 titlebar default colour
 	p->fillRect( r, c1 );
-	p->setPen( Qt::white );
+	p->setPen( TQt::white );
 	p->setFont( TQFont( TDEGlobalSettings::generalFont().family(), 12, TQFont::Bold) );
 	p->drawText( r, AlignLeft | AlignVCenter, i18n("TDE") );
 
@@ -689,11 +689,11 @@ ButtonPositionWidget::ButtonPositionWidget(TQWidget *parent, const char* name)
 	layout->addWidget(m_dropSite);
 	layout->addWidget(m_buttonSource);
 
-	connect( m_dropSite, TQT_SIGNAL(buttonAdded(TQChar)), m_buttonSource, TQT_SLOT(hideButton(TQChar)) );
-	connect( m_dropSite, TQT_SIGNAL(buttonRemoved(TQChar)), m_buttonSource, TQT_SLOT(showButton(TQChar)) );
-	connect( m_buttonSource, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), m_dropSite, TQT_SLOT(removeSelectedButton()) );
+	connect( m_dropSite, TQ_SIGNAL(buttonAdded(TQChar)), m_buttonSource, TQ_SLOT(hideButton(TQChar)) );
+	connect( m_dropSite, TQ_SIGNAL(buttonRemoved(TQChar)), m_buttonSource, TQ_SLOT(showButton(TQChar)) );
+	connect( m_buttonSource, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), m_dropSite, TQ_SLOT(removeSelectedButton()) );
 
-	connect( m_dropSite, TQT_SIGNAL(changed()), TQT_SIGNAL(changed()) );
+	connect( m_dropSite, TQ_SIGNAL(changed()), TQ_SIGNAL(changed()) );
 
 	// insert all possible buttons into the source (backwards to keep the preferred order...)
 	bool dummy;
diff --git a/twin/kcmtwin/twindecoration/buttons.h b/twin/kcmtwin/twindecoration/buttons.h
index 0564d8915..c9f562208 100644
--- a/twin/kcmtwin/twindecoration/buttons.h
+++ b/twin/kcmtwin/twindecoration/buttons.h
@@ -111,7 +111,7 @@ class ButtonSourceItem : public TQListViewItem
  */
 class ButtonSource : public TDEListView
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ButtonSource(TQWidget *parent = 0, const char* name = 0);
@@ -138,7 +138,7 @@ typedef TQValueList<ButtonDropSiteItem*> ButtonList;
  */
 class ButtonDropSite: public TQFrame
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ButtonDropSite( TQWidget* parent=0, const char* name=0 );
@@ -191,7 +191,7 @@ class ButtonDropSite: public TQFrame
 
 class ButtonPositionWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ButtonPositionWidget(TQWidget *parent = 0, const char* name = 0);
diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp
index 954ff1774..a1c92c8cb 100644
--- a/twin/kcmtwin/twindecoration/preview.cpp
+++ b/twin/kcmtwin/twindecoration/preview.cpp
@@ -234,7 +234,7 @@ TQWidget* KDecorationPreviewBridge::initialParentWidget() const
     return preview;
     }
 
-Qt::WFlags KDecorationPreviewBridge::initialWFlags() const
+TQt::WFlags KDecorationPreviewBridge::initialWFlags() const
     {
     return 0;
     }
diff --git a/twin/kcmtwin/twindecoration/preview.h b/twin/kcmtwin/twindecoration/preview.h
index 56a342cfc..9d9f09402 100644
--- a/twin/kcmtwin/twindecoration/preview.h
+++ b/twin/kcmtwin/twindecoration/preview.h
@@ -32,7 +32,7 @@ class KDecorationPreviewOptions;
 class KDecorationPreview
     : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         // Note: Windows can't be added or removed without making changes to
         //       the code, since parts of it assume there's just an active
@@ -106,7 +106,7 @@ class KDecorationPreviewBridge
         virtual void setKeepBelow( bool );
         virtual int currentDesktop() const;
         virtual TQWidget* initialParentWidget() const;
-        virtual Qt::WFlags initialWFlags() const;
+        virtual TQt::WFlags initialWFlags() const;
         virtual void helperShowHide( bool show );
         virtual void grabXServer( bool grab );
     private:
diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp
index 79a72aafd..265fe2a1c 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.cpp
+++ b/twin/kcmtwin/twindecoration/twindecoration.cpp
@@ -98,7 +98,7 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	pluginLayout->addWidget(decorationList);
 
 	TQGroupBox *pluginSettingsGrp = new TQGroupBox( i18n("Decoration Options"), pluginPage );
-	pluginSettingsGrp->setColumnLayout( 0, Qt::Vertical );
+	pluginSettingsGrp->setColumnLayout( 0, TQt::Vertical );
 	pluginSettingsGrp->setFlat( true );
 	pluginSettingsGrp->layout()->setMargin( 0 );
 	pluginSettingsGrp->layout()->setSpacing( KDialog::spacingHint() );
@@ -184,77 +184,77 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 			i18n("Enabling this checkbox will allow you to choose a kind of "
 				 "drop shadow to draw under each window."));
 
-	activeShadowSettings = new TQGroupBox(1, Qt::Horizontal,
+	activeShadowSettings = new TQGroupBox(1, TQt::Horizontal,
 			i18n("Active Window Shadow"), shadowPage);
-	inactiveShadowSettings = new TQGroupBox(1, Qt::Horizontal,
+	inactiveShadowSettings = new TQGroupBox(1, TQt::Horizontal,
 			i18n("Inactive Window Shadows"), shadowPage);
-	whichShadowSettings = new TQGroupBox(3, Qt::Horizontal,
-			i18n("Draw Shadow Under Normal Windows And..."), shadowPage);
+	whichShadowSettings = new TQGroupBox(3, TQt::Horizontal,
+			i18n("Draw Shadow Under Normal Windows And…"), shadowPage);
 
 	cbShadowDocks = new TQCheckBox(i18n("Docks and &panels"),
 			whichShadowSettings);
-	connect(cbShadowDocks, TQT_SIGNAL(toggled(bool)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(cbShadowDocks, TQ_SIGNAL(toggled(bool)),
+			TQ_SLOT(slotSelectionChanged()));
 	cbShadowOverrides = new TQCheckBox(i18n("O&verride windows"),
 			whichShadowSettings);
-	connect(cbShadowOverrides, TQT_SIGNAL(toggled(bool)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(cbShadowOverrides, TQ_SIGNAL(toggled(bool)),
+			TQ_SLOT(slotSelectionChanged()));
 	cbShadowTopMenus = new TQCheckBox(i18n("&Top menu"),
 			whichShadowSettings);
-	connect(cbShadowTopMenus, TQT_SIGNAL(toggled(bool)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(cbShadowTopMenus, TQ_SIGNAL(toggled(bool)),
+			TQ_SLOT(slotSelectionChanged()));
 	cbInactiveShadow = new TQCheckBox(
 			i18n("Draw shadow under &inactive windows"), inactiveShadowSettings);
-	connect(cbInactiveShadow, TQT_SIGNAL(toggled(bool)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(cbInactiveShadow, TQ_SIGNAL(toggled(bool)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	shadowColourHBox = new TQHBox(activeShadowSettings);
 	shadowColourHBox->setSpacing(KDialog::spacingHint());
 	shadowColourLabel = new TQLabel(i18n("Colour:"), shadowColourHBox);
 	shadowColourButton = new KColorButton(shadowColourHBox);
-	connect(shadowColourButton, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotSelectionChanged()));
+	connect(shadowColourButton, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotSelectionChanged()));
 
 	inactiveShadowColourHBox = new TQHBox(inactiveShadowSettings);
 	inactiveShadowColourHBox->setSpacing(KDialog::spacingHint());
 	inactiveShadowColourLabel = new TQLabel(i18n("Colour:"), inactiveShadowColourHBox);
 	inactiveShadowColourButton = new KColorButton(inactiveShadowColourHBox);
-	connect(inactiveShadowColourButton, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotSelectionChanged()));
+	connect(inactiveShadowColourButton, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotSelectionChanged()));
 
 	shadowOpacityHBox = new TQHBox(activeShadowSettings);
 	shadowOpacityHBox->setSpacing(KDialog::spacingHint());
 	shadowOpacityLabel = new TQLabel(i18n("Maximum opacity:"), shadowOpacityHBox);
-	shadowOpacitySlider = new TQSlider(1, 100, 10, 50, Qt::Horizontal,
+	shadowOpacitySlider = new TQSlider(1, 100, 10, 50, TQt::Horizontal,
 			shadowOpacityHBox);
 	shadowOpacitySlider->setTickmarks(TQSlider::Below);
 	shadowOpacitySlider->setTickInterval(10);
 	shadowOpacitySpinBox = new TQSpinBox(1, 100, 1, shadowOpacityHBox);
 	shadowOpacitySpinBox->setSuffix(" %");
-	connect(shadowOpacitySlider, TQT_SIGNAL(valueChanged(int)), shadowOpacitySpinBox,
-			TQT_SLOT(setValue(int)));
-	connect(shadowOpacitySpinBox, TQT_SIGNAL(valueChanged(int)), shadowOpacitySlider,
-			TQT_SLOT(setValue(int)));
-	connect(shadowOpacitySlider, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(shadowOpacitySlider, TQ_SIGNAL(valueChanged(int)), shadowOpacitySpinBox,
+			TQ_SLOT(setValue(int)));
+	connect(shadowOpacitySpinBox, TQ_SIGNAL(valueChanged(int)), shadowOpacitySlider,
+			TQ_SLOT(setValue(int)));
+	connect(shadowOpacitySlider, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	inactiveShadowOpacityHBox = new TQHBox(inactiveShadowSettings);
 	inactiveShadowOpacityHBox->setSpacing(KDialog::spacingHint());
 	inactiveShadowOpacityLabel = new TQLabel(i18n("Maximum opacity:"),
 			inactiveShadowOpacityHBox);
-	inactiveShadowOpacitySlider = new TQSlider(1, 100, 10, 50, Qt::Horizontal,
+	inactiveShadowOpacitySlider = new TQSlider(1, 100, 10, 50, TQt::Horizontal,
 			inactiveShadowOpacityHBox);
 	inactiveShadowOpacitySlider->setTickmarks(TQSlider::Below);
 	inactiveShadowOpacitySlider->setTickInterval(10);
 	inactiveShadowOpacitySpinBox = new TQSpinBox(1, 100, 1,
 			inactiveShadowOpacityHBox);
 	inactiveShadowOpacitySpinBox->setSuffix(" %");
-	connect(inactiveShadowOpacitySlider, TQT_SIGNAL(valueChanged(int)),
+	connect(inactiveShadowOpacitySlider, TQ_SIGNAL(valueChanged(int)),
 			inactiveShadowOpacitySpinBox,
-			TQT_SLOT(setValue(int)));
-	connect(inactiveShadowOpacitySpinBox, TQT_SIGNAL(valueChanged(int)),
+			TQ_SLOT(setValue(int)));
+	connect(inactiveShadowOpacitySpinBox, TQ_SIGNAL(valueChanged(int)),
 			inactiveShadowOpacitySlider,
-			TQT_SLOT(setValue(int)));
-	connect(inactiveShadowOpacitySlider, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+			TQ_SLOT(setValue(int)));
+	connect(inactiveShadowOpacitySlider, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	shadowXOffsetHBox = new TQHBox(activeShadowSettings);
 	shadowXOffsetHBox->setSpacing(KDialog::spacingHint());
@@ -263,8 +263,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 			shadowXOffsetHBox);
 	shadowXOffsetSpinBox = new TQSpinBox(-1024, 1024, 1, shadowXOffsetHBox);
 	shadowXOffsetSpinBox->setSuffix(i18n(" pixels"));
-	connect(shadowXOffsetSpinBox, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(shadowXOffsetSpinBox, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	inactiveShadowXOffsetHBox = new TQHBox(inactiveShadowSettings);
 	inactiveShadowXOffsetHBox->setSpacing(KDialog::spacingHint());
@@ -274,8 +274,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	inactiveShadowXOffsetSpinBox = new TQSpinBox(-1024, 1024, 1,
 			inactiveShadowXOffsetHBox);
 	inactiveShadowXOffsetSpinBox->setSuffix(i18n(" pixels"));
-	connect(inactiveShadowXOffsetSpinBox, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(inactiveShadowXOffsetSpinBox, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	shadowYOffsetHBox = new TQHBox(activeShadowSettings);
 	shadowYOffsetHBox->setSpacing(KDialog::spacingHint());
@@ -284,8 +284,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 			shadowYOffsetHBox);
 	shadowYOffsetSpinBox = new TQSpinBox(-1024, 1024, 1, shadowYOffsetHBox);
 	shadowYOffsetSpinBox->setSuffix(i18n(" pixels"));
-	connect(shadowYOffsetSpinBox, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(shadowYOffsetSpinBox, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	inactiveShadowYOffsetHBox = new TQHBox(inactiveShadowSettings);
 	inactiveShadowYOffsetHBox->setSpacing(KDialog::spacingHint());
@@ -295,8 +295,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	inactiveShadowYOffsetSpinBox = new TQSpinBox(-1024, 1024, 1,
 			inactiveShadowYOffsetHBox);
 	inactiveShadowYOffsetSpinBox->setSuffix(i18n(" pixels"));
-	connect(inactiveShadowYOffsetSpinBox, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(inactiveShadowYOffsetSpinBox, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	shadowThicknessHBox = new TQHBox(activeShadowSettings);
 	shadowThicknessHBox->setSpacing(KDialog::spacingHint());
@@ -306,8 +306,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	shadowThicknessSpinBox = new TQSpinBox(1, 100, 1,
 			shadowThicknessHBox);
 	shadowThicknessSpinBox->setSuffix(i18n(" pixels"));
-	connect(shadowThicknessSpinBox, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(shadowThicknessSpinBox, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	inactiveShadowThicknessHBox = new TQHBox(inactiveShadowSettings);
 	inactiveShadowThicknessHBox->setSpacing(KDialog::spacingHint());
@@ -317,8 +317,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	inactiveShadowThicknessSpinBox = new TQSpinBox(1, 100, 1,
 			inactiveShadowThicknessHBox);
 	inactiveShadowThicknessSpinBox->setSuffix(i18n(" pixels"));
-	connect(inactiveShadowThicknessSpinBox, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(inactiveShadowThicknessSpinBox, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	// Page 4 (WM selector)
 	windowmanagerPage = new TQWidget( tabWidget );
@@ -355,25 +355,25 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	tabWidget->insertTab( shadowPage, i18n("&Shadows") );
 	tabWidget->insertTab( windowmanagerPage, i18n("&Window Manager") );
 
-	connect( buttonPositionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(slotButtonsChanged()) ); // update preview etc.
-	connect( buttonPositionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) ); // emit changed()...
-	connect( decorationList, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotSelectionChanged()) );
-	connect( decorationList, TQT_SIGNAL(activated(const TQString&)),
-								TQT_SLOT(slotChangeDecoration(const TQString&)) );
-	connect( cbUseCustomButtonPositions, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
-	connect(cbUseCustomButtonPositions, TQT_SIGNAL(toggled(bool)), buttonPositionWidget, TQT_SLOT(setEnabled(bool)));
-	connect(cbUseCustomButtonPositions, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotButtonsChanged()) );
- 	connect(cbWindowShadow, TQT_SIGNAL(toggled(bool)), activeShadowSettings, TQT_SLOT(setEnabled(bool)));
- 	connect(cbWindowShadow, TQT_SIGNAL(toggled(bool)), inactiveShadowSettings, TQT_SLOT(setEnabled(bool)));
- 	connect(cbWindowShadow, TQT_SIGNAL(toggled(bool)), whichShadowSettings, TQT_SLOT(setEnabled(bool)));
-
-	connect( cbShowToolTips, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
-	connect( cbWindowShadow, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
-	connect( cBorder, TQT_SIGNAL( activated( int )), TQT_SLOT( slotBorderChanged( int )));
-//	connect( cbUseMiniWindows, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
-
-	connect( thirdpartyWMList, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotSelectionChanged()) );
-	connect( thirdpartyWMArguments, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSelectionChanged()) );
+	connect( buttonPositionWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(slotButtonsChanged()) ); // update preview etc.
+	connect( buttonPositionWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(slotSelectionChanged()) ); // emit changed()...
+	connect( decorationList, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotSelectionChanged()) );
+	connect( decorationList, TQ_SIGNAL(activated(const TQString&)),
+								TQ_SLOT(slotChangeDecoration(const TQString&)) );
+	connect( cbUseCustomButtonPositions, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+	connect(cbUseCustomButtonPositions, TQ_SIGNAL(toggled(bool)), buttonPositionWidget, TQ_SLOT(setEnabled(bool)));
+	connect(cbUseCustomButtonPositions, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotButtonsChanged()) );
+ 	connect(cbWindowShadow, TQ_SIGNAL(toggled(bool)), activeShadowSettings, TQ_SLOT(setEnabled(bool)));
+ 	connect(cbWindowShadow, TQ_SIGNAL(toggled(bool)), inactiveShadowSettings, TQ_SLOT(setEnabled(bool)));
+ 	connect(cbWindowShadow, TQ_SIGNAL(toggled(bool)), whichShadowSettings, TQ_SLOT(setEnabled(bool)));
+
+	connect( cbShowToolTips, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+	connect( cbWindowShadow, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+	connect( cBorder, TQ_SIGNAL( activated( int )), TQ_SLOT( slotBorderChanged( int )));
+//	connect( cbUseMiniWindows, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+
+	connect( thirdpartyWMList, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotSelectionChanged()) );
+	connect( thirdpartyWMArguments, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSelectionChanged()) );
 
 	// Allow twin dcop signal to update our selection list
 	connectDCOPSignal("twin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false);
@@ -414,7 +414,7 @@ void KWinDecorationModule::findDecorations()
 					KDesktopFile desktopFile(filename);
 					TQString libName = desktopFile.readEntry("X-TDE-Library");
 
-					if (!libName.isEmpty() && libName.startsWith( "twin3_" ))
+					if (!libName.isEmpty() && libName.startsWith("twin_") || libName.startsWith("twin3_"))
 					{
 						DecorationInfo di;
 						di.name = desktopFile.readName();
@@ -614,7 +614,7 @@ TQString KWinDecorationModule::decorationLibName( const TQString& name )
 void KWinDecorationModule::resetPlugin( TDEConfig* conf, const TQString& currentDecoName )
 {
 	// Config names are "twin_icewm_config"
-	// for "twin3_icewm" twin client
+	// for "twin_icewm" twin client
 
 	TQString oldName = styleToConfigLib( oldLibraryName );
 
@@ -660,10 +660,10 @@ void KWinDecorationModule::resetPlugin( TDEConfig* conf, const TQString& current
 			pluginObject = (TQObject*)(allocatePlugin( conf, pluginConfigWidget ));
 
 			// connect required signals and slots together...
-			connect( pluginObject, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) );
-			connect( this, TQT_SIGNAL(pluginLoad(TDEConfig*)), pluginObject, TQT_SLOT(load(TDEConfig*)) );
-			connect( this, TQT_SIGNAL(pluginSave(TDEConfig*)), pluginObject, TQT_SLOT(save(TDEConfig*)) );
-			connect( this, TQT_SIGNAL(pluginDefaults()), pluginObject, TQT_SLOT(defaults()) );
+			connect( pluginObject, TQ_SIGNAL(changed()), this, TQ_SLOT(slotSelectionChanged()) );
+			connect( this, TQ_SIGNAL(pluginLoad(TDEConfig*)), pluginObject, TQ_SLOT(load(TDEConfig*)) );
+			connect( this, TQ_SIGNAL(pluginSave(TDEConfig*)), pluginObject, TQ_SLOT(save(TDEConfig*)) );
+			connect( this, TQ_SIGNAL(pluginDefaults()), pluginObject, TQ_SLOT(defaults()) );
 			pluginConfigWidget->show();
 			return;
 		}
@@ -895,7 +895,7 @@ void KWinDecorationModule::defaults()
         border_size = BorderNormal;
         checkSupportedBorderSizes();
 
-	shadowColourButton->setColor(Qt::black);
+	shadowColourButton->setColor(TQt::black);
 	shadowOpacitySlider->setValue(70);
 	shadowXOffsetSpinBox->setValue(0);
 	shadowYOffsetSpinBox->setValue(10);
@@ -904,7 +904,7 @@ void KWinDecorationModule::defaults()
 	cbShadowOverrides->setChecked(false);
 	cbShadowTopMenus->setChecked(false);
 	cbInactiveShadow->setChecked(false);
-	inactiveShadowColourButton->setColor(Qt::black);
+	inactiveShadowColourButton->setColor(TQt::black);
 	inactiveShadowOpacitySlider->setValue(70);
 	inactiveShadowXOffsetSpinBox->setValue(0);
 	inactiveShadowYOffsetSpinBox->setValue(5);
@@ -938,10 +938,7 @@ void KWinDecorationModule::checkSupportedBorderSizes()
 
 TQString KWinDecorationModule::styleToConfigLib( TQString& styleLib )
 {
-        if( styleLib.startsWith( "twin3_" ))
-            return "twin_" + styleLib.mid( 6 ) + "_config";
-        else
-            return styleLib + "_config";
+        return styleLib + "_config";
 }
 
 TQString KWinDecorationModule::quickHelp() const
@@ -951,7 +948,7 @@ TQString KWinDecorationModule::quickHelp() const
 		"as well as titlebar button positions and custom decoration options.</p>"
 		"To choose a theme for your window decoration click on its name and apply your choice by clicking the \"Apply\" button below."
 		" If you do not want to apply your choice you can click the \"Reset\" button to discard your changes."
-		"<p>You can configure each theme in the \"Configure [...]\" tab. There are different options specific for each theme.</p>"
+		"<p>You can configure each theme in the \"Configure […]\" tab. There are different options specific for each theme.</p>"
 		"<p>In \"General Options (if available)\" you can activate the \"Buttons\" tab by checking the \"Use custom titlebar button positions\" box."
 		" In the \"Buttons\" tab you can change the positions of the buttons to your liking.</p>" );
 }
diff --git a/twin/kcmtwin/twindecoration/twindecoration.h b/twin/kcmtwin/twindecoration/twindecoration.h
index 5f5f94ab9..b55455c12 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.h
+++ b/twin/kcmtwin/twindecoration/twindecoration.h
@@ -61,7 +61,7 @@ struct DecorationInfo
 
 class KWinDecorationModule : public TDECModule, virtual public KWinDecorationIface, public KDecorationDefines
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		KWinDecorationModule(TQWidget* parent, const char* name, const TQStringList &);
diff --git a/twin/kcmtwin/twinoptions/CMakeLists.txt b/twin/kcmtwin/twinoptions/CMakeLists.txt
index b991bac96..6686f99b1 100644
--- a/twin/kcmtwin/twinoptions/CMakeLists.txt
+++ b/twin/kcmtwin/twinoptions/CMakeLists.txt
@@ -31,7 +31,7 @@ tde_create_translated_desktop(
 tde_create_translated_desktop(
   SOURCE
     twinactions.desktop twinadvanced.desktop twinfocus.desktop
-    twinmoving.desktop twintranslucency.desktop
+    twinmoving.desktop twintranslucency.desktop twinactiveborders.desktop
   DESTINATION ${APPS_INSTALL_DIR}/.hidden
   PO_DIR twin-desktops
 )
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index 8ed52b067..2ce258c3c 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -59,6 +59,13 @@ extern "C"
 		return new KMovingConfig(true, c, parent, name);
 	}
 
+	KDE_EXPORT TDECModule *create_twinaborders(TQWidget *parent, const char *name)
+	{
+	   TDEGlobal::locale()->insertCatalogue("kcmkwm");
+	   TDEConfig *c = new TDEConfig("twinrc", false, true);
+	   return new KActiveBorderConfig(true, c, parent, name);
+	}
+
 	KDE_EXPORT TDECModule *create_twinadvanced(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
@@ -66,7 +73,7 @@ extern "C"
 		TDEConfig *c = new TDEConfig("twinrc", false, true);
 		return new KAdvancedConfig(true, c, parent, name);
 	}
-        
+
 	KDE_EXPORT TDECModule *create_twintranslucency(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
@@ -95,33 +102,38 @@ KWinOptions::KWinOptions(TQWidget *parent, const char *name)
   mFocus = new KFocusConfig(false, mConfig, this, "TWin Focus Config");
   mFocus->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mFocus, i18n("&Focus"));
-  connect(mFocus, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mFocus, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "TWin TitleBar Actions");
   mTitleBarActions->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mTitleBarActions, i18n("&Titlebar Actions"));
-  connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mTitleBarActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   mWindowActions = new KWindowActionsConfig(false, mConfig, this, "TWin Window Actions");
   mWindowActions->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mWindowActions, i18n("Window Actio&ns"));
-  connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mWindowActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   mMoving = new KMovingConfig(false, mConfig, this, "TWin Moving");
   mMoving->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mMoving, i18n("&Moving"));
-  connect(mMoving, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mMoving, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
+
+  mABorders = new KActiveBorderConfig(false, mConfig, this, "TWin Active Borders");
+  mABorders->layout()->setMargin(KDialog::marginHint());
+  tab->addTab(mABorders, i18n("Active &Borders"));
+  connect(mABorders, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   mAdvanced = new KAdvancedConfig(false, mConfig, this, "TWin Advanced");
   mAdvanced->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mAdvanced, i18n("Ad&vanced"));
-  connect(mAdvanced, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mAdvanced, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   mTranslucency = new KTranslucencyConfig(false, mConfig, this, "TWin Translucency");
   mTranslucency->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mTranslucency, i18n("&Translucency"));
-  connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
-    
+  connect(mTranslucency, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
+
   TDEAboutData *about =
     new TDEAboutData(I18N_NOOP("kcmtwinoptions"), I18N_NOOP("Window Behavior Configuration Module"),
                   0, 0, TDEAboutData::License_GPL,
@@ -151,6 +163,7 @@ void KWinOptions::load()
   mTitleBarActions->load();
   mWindowActions->load();
   mMoving->load();
+  mABorders->load();
   mAdvanced->load();
   mTranslucency->load();
   emit TDECModule::changed( false );
@@ -163,6 +176,7 @@ void KWinOptions::save()
   mTitleBarActions->save();
   mWindowActions->save();
   mMoving->save();
+  mABorders->save();
   mAdvanced->save();
   mTranslucency->save();
 
@@ -181,6 +195,7 @@ void KWinOptions::defaults()
   mTitleBarActions->defaults();
   mWindowActions->defaults();
   mMoving->defaults();
+  mABorders->defaults();
   mAdvanced->defaults();
   mTranslucency->defaults();
 }
@@ -222,10 +237,14 @@ TQString KWinOptions::handbookSection() const
     }
     else if (index == 4)
     {
-        return "advanced";
+        return "active-borders";
     }
     else if (index == 5)
     {
+        return "advanced";
+    }
+    else if (index == 6)
+    {
         return "translucency";
     }
     else
@@ -247,12 +266,12 @@ TDEActionsOptions::TDEActionsOptions(TQWidget *parent, const char *name)
   mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "TWin TitleBar Actions");
   mTitleBarActions->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mTitleBarActions, i18n("&Titlebar Actions"));
-  connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mTitleBarActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   mWindowActions = new KWindowActionsConfig(false, mConfig, this, "TWin Window Actions");
   mWindowActions->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mWindowActions, i18n("Window Actio&ns"));
-  connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mWindowActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 }
 
 TDEActionsOptions::~TDEActionsOptions()
diff --git a/twin/kcmtwin/twinoptions/main.h b/twin/kcmtwin/twinoptions/main.h
index 554b7b761..18464ac79 100644
--- a/twin/kcmtwin/twinoptions/main.h
+++ b/twin/kcmtwin/twinoptions/main.h
@@ -32,12 +32,13 @@ class TDEConfig;
 class KFocusConfig;
 class KTitleBarActionsConfig;
 class KWindowActionsConfig;
+class KActiveBorderConfig;
 class KAdvancedConfig;
 class KTranslucencyConfig;
 
 class KWinOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -64,6 +65,7 @@ private:
   KTitleBarActionsConfig *mTitleBarActions;
   KWindowActionsConfig *mWindowActions;
   KMovingConfig *mMoving;
+  KActiveBorderConfig *mABorders;
   KAdvancedConfig *mAdvanced;
   KTranslucencyConfig *mTranslucency;
 
@@ -72,7 +74,7 @@ private:
 
 class TDEActionsOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp
index 51a3b8a9f..0e197071c 100644
--- a/twin/kcmtwin/twinoptions/mouse.cpp
+++ b/twin/kcmtwin/twinoptions/mouse.cpp
@@ -164,7 +164,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
   combo->insertItem(i18n("On All Desktops"));
   combo->insertItem(i18n("Nothing"));
   combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   hlayout->addWidget(combo);
   coTiDbl = combo;
   TQWhatsThis::add(combo, i18n("Behavior on <em>double</em> click into the titlebar."));
@@ -189,14 +189,14 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
   comboW->insertItem(i18n("Change Opacity"));
   comboW->insertItem(i18n("Nothing"));
   comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
-  connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(comboW, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   hlayoutW->addWidget(comboW);
   coTiW = comboW;
   TQWhatsThis::add(comboW, txtButton4);
   label->setBuddy(comboW);
 
   cbTiRevW = new TQCheckBox(i18n("Reverse wheel direction"), this);
-  connect(cbTiRevW, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+  connect(cbTiRevW, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
   TQWhatsThis::add( cbTiRevW, i18n("Use this to reverse the action of the mouse wheel.") );
   hlayoutW->addWidget(cbTiRevW);
 
@@ -209,7 +209,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
   TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on the"
                              " titlebar or the frame of a window.") );
 
-  grid = new TQGrid(4, Qt::Vertical, box);
+  grid = new TQGrid(4, TQt::Vertical, box);
 
 
   new TQLabel(grid); // dummy
@@ -244,15 +244,12 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
   TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar"
                                " or the frame of an active window.") );
 
-  // Titlebar and frame, active, mouse button 1
-  combo = new TQComboBox(grid);
-  combo->insertItem(i18n("Raise"));
-  combo->insertItem(i18n("Lower"));
-  combo->insertItem(i18n("Operations Menu"));
-  combo->insertItem(i18n("Toggle Raise & Lower"));
-  combo->insertItem(i18n("Nothing"));
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-  coTiAct1 = combo;
+  items << i18n("Raise")
+        << i18n("Lower")
+        << i18n("Operations Menu")
+        << i18n("Toggle Raise & Lower")
+        << i18n("Nothing")
+        << i18n("Shade");
 
   txtButton1 = i18n("Behavior on <em>left</em> click into the titlebar or frame of an "
      "<em>active</em> window.");
@@ -261,29 +258,29 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
      "<em>active</em> window.");
 
   // Be nice to left handed users
-  if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3);
+  if (leftHandedMouse)
+  {
+    tqSwap(txtButton1, txtButton3);
+  }
 
+  // Titlebar and frame, active, mouse button 1
+  combo = new TQComboBox(grid);
+  combo->insertStringList(items);
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
+  coTiAct1 = combo;
   TQWhatsThis::add(combo, txtButton1);
 
   // Titlebar and frame, active, mouse button 2
-
-  items << i18n("Raise")
-        << i18n("Lower")
-        << i18n("Operations Menu")
-        << i18n("Toggle Raise & Lower")
-        << i18n("Nothing")
-        << i18n("Shade");
-
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coTiAct2 = combo;
   TQWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>active</em> window."));
 
   // Titlebar and frame, active, mouse button 3
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coTiAct3 =  combo;
   TQWhatsThis::add(combo, txtButton3 );
 
@@ -313,19 +310,19 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coTiInAct1 = combo;
   TQWhatsThis::add(combo, txtButton1);
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coTiInAct2 = combo;
   TQWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>inactive</em> window."));
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coTiInAct3 = combo;
   TQWhatsThis::add(combo, txtButton3);
 
@@ -365,13 +362,13 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
 
     coMax[b] = new ToolTipComboBox(box, tbl_Max);
     for (int t = 0; t < 3; ++t) coMax[b]->insertItem(maxButtonPixmaps[t]);
-    connect(coMax[b], TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-    connect(coMax[b], TQT_SIGNAL(activated(int)), coMax[b], TQT_SLOT(changed()));
+    connect(coMax[b], TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
+    connect(coMax[b], TQ_SIGNAL(activated(int)), coMax[b], TQ_SLOT(changed()));
     TQWhatsThis::add( coMax[b], txtButton[b] );
     coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
   }
 
-  connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
+  connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
 
   layout->addStretch();
 
@@ -614,7 +611,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config
   TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on an inactive"
                              " inner window ('inner' means: not titlebar, not frame).") );
 
-  grid = new TQGrid(3, Qt::Vertical, box);
+  grid = new TQGrid(3, TQt::Vertical, box);
 
   strMouseButton1 = i18n("Left button:");
   txtButton1 = i18n("In this row you can customize left click behavior when clicking into"
@@ -658,19 +655,19 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config
 
   TQComboBox* combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coWin1 = combo;
   TQWhatsThis::add( combo, strWin1 );
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coWin2 = combo;
   TQWhatsThis::add( combo, strWin2 );
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coWin3 = combo;
   TQWhatsThis::add( combo, strWin3 );
 
@@ -684,7 +681,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config
   TQWhatsThis::add( box, i18n("Here you can customize TDE's behavior when clicking somewhere into"
                              " a window while pressing a modifier key."));
 
-  grid = new TQGrid(6, Qt::Vertical, box);
+  grid = new TQGrid(6, TQt::Vertical, box);
 
   // Labels
   label = new TQLabel(i18n("Modifier key:"), grid);
@@ -730,7 +727,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config
   combo = new TQComboBox(grid);
   combo->insertItem(i18n("Meta"));
   combo->insertItem(i18n("Alt"));
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coAllKey = combo;
   TQWhatsThis::add( combo, strAllKey );
 
@@ -746,19 +743,19 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coAll1 = combo;
   TQWhatsThis::add( combo, strAll1 );
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coAll2 = combo;
   TQWhatsThis::add( combo, strAll2 );
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coAll3 =  combo;
   TQWhatsThis::add( combo, strAll3 );
 
@@ -770,12 +767,12 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config
   combo->insertItem(i18n("Move to Previous/Next Desktop"));
   combo->insertItem(i18n("Change Opacity"));
   combo->insertItem(i18n("Nothing"));
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coAllW =  combo;
   TQWhatsThis::add( combo, strAllW );
 
   cbAllRevW = new TQCheckBox(i18n("Reverse wheel direction"), grid);
-  connect(cbAllRevW, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+  connect(cbAllRevW, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
   TQWhatsThis::add( cbAllRevW, i18n("Use this to reverse the action of the mouse wheel.") );
 
   layout->addStretch();
diff --git a/twin/kcmtwin/twinoptions/mouse.h b/twin/kcmtwin/twinoptions/mouse.h
index 5dd3b8402..2a57fc534 100644
--- a/twin/kcmtwin/twinoptions/mouse.h
+++ b/twin/kcmtwin/twinoptions/mouse.h
@@ -33,7 +33,7 @@ class TDEConfig;
 
 class ToolTipComboBox: public TQComboBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   ToolTipComboBox(TQWidget * owner, char const * const * toolTips_)
@@ -51,7 +51,7 @@ protected:
 
 class KTitleBarActionsConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -97,7 +97,7 @@ private slots:
 
 class KWindowActionsConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/twin/kcmtwin/twinoptions/twinactiveborders.desktop b/twin/kcmtwin/twinoptions/twinactiveborders.desktop
new file mode 100644
index 000000000..54e7d0731
--- /dev/null
+++ b/twin/kcmtwin/twinoptions/twinactiveborders.desktop
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Icon=kcmkwm
+Type=Application
+Exec=tdecmshell twinoptions
+X-DocPath=kcontrol/windowbehavior/index.html
+
+X-TDE-ModuleType=Library
+X-TDE-Library=twinoptions
+X-TDE-FactoryName=twinaborders
+
+Name=Active Borders
+
+Comment=Configure active borders/corners feature
+
+Keywords=window behavior;windows;frame;titlebar;borders;corners;active borders;aerosnap;
+
+Categories=Qt;TDE;X-TDE-settings-desktop;
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index 66249d474..9d8e8d617 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -29,6 +29,7 @@
 #include <tqslider.h>
 #include <tqwhatsthis.h>
 #include <tqvbuttongroup.h>
+#include <tqvbox.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqlabel.h>
@@ -55,34 +56,39 @@
 
 
 // twin config keywords
-#define KWIN_FOCUS                 "FocusPolicy"
-#define KWIN_PLACEMENT             "Placement"
-#define KWIN_MOVE                  "MoveMode"
-#define KWIN_MINIMIZE_ANIM         "AnimateMinimize"
-#define KWIN_MINIMIZE_ANIM_SPEED   "AnimateMinimizeSpeed"
-#define KWIN_RESIZE_OPAQUE         "ResizeMode"
-#define KWIN_GEOMETRY              "GeometryTip"
-#define KWIN_AUTORAISE_INTERVAL    "AutoRaiseInterval"
-#define KWIN_AUTORAISE             "AutoRaise"
-#define KWIN_DELAYFOCUS_INTERVAL   "DelayFocusInterval"
-#define KWIN_DELAYFOCUS            "DelayFocus"
-#define KWIN_CLICKRAISE            "ClickRaise"
-#define KWIN_ANIMSHADE             "AnimateShade"
-#define KWIN_MOVE_RESIZE_MAXIMIZED "MoveResizeMaximizedWindows"
-#define KWIN_ALTTABMODE            "AltTabStyle"
-#define KWIN_TRAVERSE_ALL          "TraverseAll"
-#define KWIN_SHOW_POPUP            "ShowPopup"
-#define KWIN_ROLL_OVER_DESKTOPS    "RollOverDesktops"
-#define KWIN_SHADEHOVER            "ShadeHover"
-#define KWIN_SHADEHOVER_INTERVAL   "ShadeHoverInterval"
-#define KWIN_FOCUS_STEALING        "FocusStealingPreventionLevel"
-#define KWIN_HIDE_UTILITY          "HideUtilityWindowsForInactive"
-#define KWIN_SEPARATE_SCREEN_FOCUS "SeparateScreenFocus"
-#define KWIN_ACTIVE_MOUSE_SCREEN   "ActiveMouseScreen"
-
-// kwm config keywords
-#define KWM_ELECTRIC_BORDER                  "ElectricBorders"
-#define KWM_ELECTRIC_BORDER_DELAY            "ElectricBorderDelay"
+#define KWIN_FOCUS                  "FocusPolicy"
+#define KWIN_PLACEMENT              "Placement"
+#define KWIN_MOVE_MODE              "MoveMode"
+#define KWIN_RESIZE_MODE            "ResizeMode"
+#define KWIN_TILING_MODE            "TilingMode"
+#define KWIN_MINIMIZE_ANIM          "AnimateMinimize"
+#define KWIN_MINIMIZE_ANIM_SPEED    "AnimateMinimizeSpeed"
+#define KWIN_GEOMETRY               "GeometryTip"
+#define KWIN_AUTORAISE_INTERVAL     "AutoRaiseInterval"
+#define KWIN_AUTORAISE              "AutoRaise"
+#define KWIN_DELAYFOCUS_INTERVAL    "DelayFocusInterval"
+#define KWIN_DELAYFOCUS             "DelayFocus"
+#define KWIN_CLICKRAISE             "ClickRaise"
+#define KWIN_ANIMSHADE              "AnimateShade"
+#define KWIN_MOVE_RESIZE_MAXIMIZED  "MoveResizeMaximizedWindows"
+#define KWIN_RESET_MAX_WIN_GEOM     "ResetMaximizedWindowGeometry"
+#define KWIN_ALTTABMODE             "AltTabStyle"
+#define KWIN_TRAVERSE_ALL           "TraverseAll"
+#define KWIN_SHOW_POPUP             "ShowPopup"
+#define KWIN_ROLL_OVER_DESKTOPS     "RollOverDesktops"
+#define KWIN_SHADEHOVER             "ShadeHover"
+#define KWIN_SHADEHOVER_INTERVAL    "ShadeHoverInterval"
+#define KWIN_FOCUS_STEALING         "FocusStealingPreventionLevel"
+#define KWIN_HIDE_UTILITY           "HideUtilityWindowsForInactive"
+#define KWIN_SEPARATE_SCREEN_FOCUS  "SeparateScreenFocus"
+#define KWIN_ACTIVE_MOUSE_SCREEN    "ActiveMouseScreen"
+#define KWIN_ACTIVE_BORDERS         "ActiveBorders"
+#define KWIN_ACTIVE_BORDER_DELAY    "ActiveBorderDelay"
+#define KWIN_ACTIVE_BORDER_DISTANCE "ActiveBorderDistance"
+
+// legacy options
+#define KWIN_OLD_ACTIVE_BORDERS      "ElectricBorders"
+#define KWIN_OLD_ACTIVE_BORDER_DELAY "ElectricBorderDelay"
 
 //CT 15mar 98 - magics
 #define KWM_BRDR_SNAP_ZONE                   "BorderSnapZone"
@@ -124,7 +130,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
 
     // focus policy
     fcsBox = new TQButtonGroup(i18n("Focus"),this);
-    fcsBox->setColumnLayout( 0, Qt::Horizontal );
+    fcsBox->setColumnLayout( 0, TQt::Horizontal );
 
     TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(),
         KDialog::spacingHint());
@@ -137,7 +143,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
     focusCombo->insertItem(i18n("Focus Follows Mouse"), FOCUS_FOLLOWS_MOUSE);
     focusCombo->insertItem(i18n("Focus Under Mouse"), FOCUS_UNDER_MOUSE);
     focusCombo->insertItem(i18n("Focus Strictly Under Mouse"), FOCUS_STRICTLY_UNDER_MOUSE);
-    cLay->addWidget(focusCombo,1 ,Qt::AlignLeft);
+    cLay->addWidget(focusCombo,1 ,TQt::AlignLeft);
     fLabel->setBuddy(focusCombo);
 
     // FIXME, when more policies have been added to TWin
@@ -163,35 +169,35 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
     TQWhatsThis::add( focusCombo, wtstr);
     TQWhatsThis::add(fLabel, wtstr);
 
-    connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setAutoRaiseEnabled()) );
+    connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setAutoRaiseEnabled()) );
 
     // autoraise delay
     autoRaiseOn = new TQCheckBox(i18n("Auto &raise"), fcsBox);
     fLay->addWidget(autoRaiseOn);
-    connect(autoRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(autoRaiseOnTog(bool)));
+    connect(autoRaiseOn,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(autoRaiseOnTog(bool)));
 
     autoRaise = new KIntNumInput(500, fcsBox);
-    autoRaise->setLabel(i18n("Dela&y:"), Qt::AlignVCenter|Qt::AlignLeft);
+    autoRaise->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft);
     autoRaise->setRange(0, 3000, 100, true);
     autoRaise->setSteps(100,100);
     autoRaise->setSuffix(i18n(" msec"));
     fLay->addWidget(autoRaise);
 
-    connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDelayFocusEnabled()) );
+    connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setDelayFocusEnabled()) );
 
     delayFocusOn = new TQCheckBox(i18n("Delay focus"), fcsBox);
     fLay->addWidget(delayFocusOn);
-    connect(delayFocusOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(delayFocusOnTog(bool)));
+    connect(delayFocusOn,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(delayFocusOnTog(bool)));
 
     delayFocus = new KIntNumInput(500, fcsBox);
-    delayFocus->setLabel(i18n("Dela&y:"), Qt::AlignVCenter|Qt::AlignLeft);
+    delayFocus->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft);
     delayFocus->setRange(0, 3000, 100, true);
     delayFocus->setSteps(100,100);
     delayFocus->setSuffix(i18n(" msec"));
     fLay->addWidget(delayFocus);
 
     clickRaiseOn = new TQCheckBox(i18n("Click &raises active window"), fcsBox);
-    connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool)));
+    connect(clickRaiseOn,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(clickRaiseOnTog(bool)));
     fLay->addWidget(clickRaiseOn);
 
 //     fLay->addColSpacing(0,TQMAX(autoRaiseOn->sizeHint().width(),
@@ -206,7 +212,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
     focusStealing->insertItem( i18n( "Focus Stealing Prevention Level", "High" ));
     focusStealing->insertItem( i18n( "Focus Stealing Prevention Level", "Extreme" ));
     focusStealingLabel->setBuddy( focusStealing );
-    cLay->addWidget(focusStealing,2 ,Qt::AlignLeft);
+    cLay->addWidget(focusStealing,2 ,TQt::AlignLeft);
     wtstr = i18n( "<p>This option specifies how much TWin will try to prevent unwanted focus stealing "
                   "caused by unexpected activation of new windows. (Note: This feature does not "
                   "work with the Focus Under Mouse or Focus Strictly Under Mouse focus policies.)"
@@ -228,7 +234,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
                   "in the Notifications control module.</p>" );
     TQWhatsThis::add( focusStealing, wtstr );
     TQWhatsThis::add( focusStealingLabel, wtstr );
-    
+
     TQWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically"
                                        " come to the front when the mouse pointer has been over it for some time.") );
     wtstr = i18n("This is the delay after which the window that the mouse pointer is over will automatically"
@@ -257,10 +263,10 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
                   " with the focused window. This option is by default disabled for Click to focus and"
                   " enabled for other focus policies." );
     TQWhatsThis::add( activeMouseScreen, wtstr );
-    connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateActiveMouseScreen()));
+    connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateActiveMouseScreen()));
 
     if (!TQApplication::desktop()->isVirtualDesktop() ||
-        TQApplication::desktop()->numScreens() == 1) // No Ximerama 
+        TQApplication::desktop()->numScreens() == 1) // No Ximerama
     {
         separateScreenFocus->hide();
         activeMouseScreen->hide();
@@ -269,7 +275,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
     lay->addWidget(fcsBox);
 
     kbdBox = new TQButtonGroup(i18n("Navigation"), this);
-    kbdBox->setColumnLayout( 0, Qt::Horizontal );
+    kbdBox->setColumnLayout( 0, TQt::Horizontal );
     TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), KDialog::spacingHint());
 
     altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox );
@@ -285,7 +291,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
                  " is pressed, with no popup widget.  In addition, the previously"
                  " activated window will be sent to the back in this mode.");
     TQWhatsThis::add( altTabPopup, wtstr );
-    connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateAltTabMode()));
+    connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateAltTabMode()));
 
     traverseAll = new TQCheckBox( i18n( "&Traverse windows on all desktops" ), kbdBox );
     kLay->addWidget( traverseAll );
@@ -313,17 +319,17 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
     lay->addStretch();
 
     // Any changes goes to slotChanged()
-    connect(focusCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-    connect(fcsBox, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed()));
-    connect(autoRaise, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-    connect(delayFocus, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-    connect(separateScreenFocus, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect(activeMouseScreen, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect(altTabPopup, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect(traverseAll, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect(rollOverDesktops, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect(showPopupinfo, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect(focusStealing, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+    connect(focusCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
+    connect(fcsBox, TQ_SIGNAL(clicked(int)), TQ_SLOT(changed()));
+    connect(autoRaise, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+    connect(delayFocus, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+    connect(separateScreenFocus, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect(activeMouseScreen, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect(altTabPopup, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect(traverseAll, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect(rollOverDesktops, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect(showPopupinfo, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect(focusStealing, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
 
     load();
 }
@@ -493,7 +499,7 @@ void KFocusConfig::load( void )
     setClickRaise(key != "off");
     setAutoRaiseEnabled();      // this will disable/hide the auto raise delay widget if focus==click
     setDelayFocusEnabled();
-    
+
     setSeparateScreenFocus( config->readBoolEntry(KWIN_SEPARATE_SCREEN_FOCUS, false));
     // on by default for non click to focus policies
     setActiveMouseScreen( config->readBoolEntry(KWIN_ACTIVE_MOUSE_SCREEN, focusCombo->currentItem() != 0 ));
@@ -607,6 +613,220 @@ void KFocusConfig::defaults()
     emit TDECModule::changed(true);
 }
 
+KActiveBorderConfig::~KActiveBorderConfig() {
+    if (standAlone) delete config;
+}
+
+KActiveBorderConfig::KActiveBorderConfig(bool _standAlone, TDEConfig *_config, TQWidget *parent, const char*)
+    : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) {
+
+    TQBoxLayout *lay = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+
+    active_box = new TQButtonGroup(i18n("Active Desktop Borders"), this);
+    TQVBoxLayout *active_vbox = new TQVBoxLayout(active_box);
+    active_vbox->setSpacing(5);
+    active_vbox->setMargin(15);
+    TQWhatsThis::add( active_box, i18n("If this option is enabled, moving the mouse to a screen border"
+       " will perform an action. It will either change your desktop or tile the window that is currently"
+       " dragged.") );
+
+    TQLabel *active_func_label = new TQLabel(i18n("Function:"), active_box);
+
+    active_disable = new TQRadioButton(i18n("D&isabled"), active_box);
+
+    active_desktop = new TQRadioButton(i18n("Switch &desktop"), active_box);
+    active_desktop_conf = new TQWidget(active_box);
+    TQHBoxLayout *active_desktop_conf_hbox = new TQHBoxLayout(active_desktop_conf);
+    active_desktop_conf_hbox->addSpacing(20);
+    active_desktop_conf_hbox->setAutoAdd(true);
+    active_move = new TQCheckBox(i18n("Switch desktop only when &moving a window"), active_desktop_conf);
+
+    active_tile = new TQRadioButton(i18n("Tile &window"), active_box);
+    active_tile_conf = new TQWidget(active_box);
+    TQHBoxLayout *active_tile_conf_hbox = new TQHBoxLayout(active_tile_conf);
+    active_tile_conf_hbox->addSpacing(20);
+    TQVBox *active_tile_conf_vbox = new TQVBox(active_tile_conf);
+    active_tile_conf_hbox->addWidget(active_tile_conf_vbox);
+    active_maximize = new TQCheckBox(i18n("Maximize windows by dragging them to the &top of the screen"), active_tile_conf_vbox);
+    tilingOpaque = new TQCheckBox(i18n("Display content &while tiling windows"), active_tile_conf_vbox);
+    TQWhatsThis::add(tilingOpaque, i18n("Enable this option if you want a window's"
+                                       " content to be shown while tiling it,"
+                                       " instead of just showing a window"
+                                       " 'skeleton'. The result may not be "
+                                       " satisfying on slow machines."));
+
+    delays = new KIntNumInput(10, active_box);
+    delays->setRange(0, MAX_EDGE_RES, 50, true);
+    delays->setSuffix(i18n(" msec"));
+    delays->setLabel(i18n("Border &activation delay:"));
+    TQWhatsThis::add( delays, i18n("Here you can set a delay for the activation of"
+       " active borders feature. The selected action will be performed after the mouse "
+       " has been pushed against a screen border for the specified number of milliseconds.") );
+
+    distance = new KIntNumInput(10, active_box);
+    distance->setRange(1, 100, 1, true);
+    distance->setSuffix(i18n(" px"));
+    distance->setLabel(i18n("Border &activation distance:"));
+    TQWhatsThis::add( distance, i18n("The distance from which an active border can"
+       " be activated. A lower value requires you to push repeatedly into the edge."
+       " Setting this to a higher value (e.g. 30) activates the borders when the"
+       " mouse is close enough, making them easier to activate but also more prone"
+       " to false activations."));
+
+    active_vbox->addSpacing(10);
+    active_vbox->addWidget(active_func_label);
+    active_vbox->addWidget(active_disable);
+    active_vbox->addWidget(active_desktop);
+    active_vbox->addWidget(active_desktop_conf);
+    active_vbox->addWidget(active_tile);
+    active_vbox->addWidget(active_tile_conf);
+    active_vbox->addSpacing(15);
+    active_vbox->addWidget(delays);
+    active_vbox->addWidget(distance);
+    active_vbox->addSpacing(15);
+    active_vbox->addWidget(tilingOpaque);
+
+    connect(active_box, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateActiveBorders()));
+
+    // Any changes go to slotChanged()
+    connect(active_box,      TQ_SIGNAL(clicked(int)),      this, TQ_SLOT(changed()));
+    connect(active_move,     TQ_SIGNAL(clicked()),         this, TQ_SLOT(changed()));
+    connect(active_maximize, TQ_SIGNAL(clicked()),         this, TQ_SLOT(changed()));
+    connect(delays,          TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+    connect(distance,        TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+    connect(tilingOpaque,    TQ_SIGNAL(clicked()),         this, TQ_SLOT(changed()));
+
+    lay->addWidget(active_box);
+    lay->addStretch();
+    load();
+}
+
+void KActiveBorderConfig::load() {
+    config->setGroup("Windows");
+
+    // compatibility with old option names
+    int active_borders = config->readNumEntry(KWIN_ACTIVE_BORDERS, -1);
+    if (active_borders == -1) {
+        active_borders = config->readNumEntry(KWIN_OLD_ACTIVE_BORDERS, 0);
+    }
+
+    int active_borders_delay = config->readNumEntry(KWIN_ACTIVE_BORDER_DELAY, -1);
+    if (active_borders_delay == -1) {
+        active_borders_delay = config->readNumEntry(KWIN_OLD_ACTIVE_BORDER_DELAY, 150);
+    }
+
+    setActiveBorders(active_borders);
+    setActiveBorderDelay(active_borders_delay);
+    setActiveBorderDistance(config->readNumEntry(KWIN_ACTIVE_BORDER_DISTANCE, 10));
+
+    TQString tilingMode = config->readEntry(KWIN_TILING_MODE, "Opaque");
+    if (tilingMode == "Opaque")
+        setTilingMode(OPAQUE);
+    else if (tilingMode == "Transparent")
+        setTilingMode(TRANSPARENT);
+
+    emit TDECModule::changed(false);
+}
+
+void KActiveBorderConfig::save() {
+    config->setGroup("Windows");
+
+    config->writeEntry(KWIN_ACTIVE_BORDERS, getActiveBorders());
+    config->writeEntry(KWIN_ACTIVE_BORDER_DELAY, getActiveBorderDelay());
+    config->writeEntry(KWIN_ACTIVE_BORDER_DISTANCE, getActiveBorderDistance());
+
+    // remove replaced legacy entries
+    config->deleteEntry(KWIN_OLD_ACTIVE_BORDERS);
+    config->deleteEntry(KWIN_OLD_ACTIVE_BORDER_DELAY);
+
+    int tilingMode = getTilingMode();
+    if (tilingMode == OPAQUE)
+        config->writeEntry(KWIN_TILING_MODE, "Opaque");
+    else
+        config->writeEntry(KWIN_TILING_MODE, "Transparent");
+
+    if (standAlone)
+    {
+        config->sync();
+        if (!kapp->dcopClient()->isAttached())
+            kapp->dcopClient()->attach();
+        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+    }
+    emit TDECModule::changed(false);
+}
+
+void KActiveBorderConfig::defaults() {
+    setActiveBorders(0);
+    setActiveBorderDelay(150);
+    setActiveBorderDistance(10);
+    setTilingMode(TRANSPARENT);
+    emit TDECModule::changed(true);
+}
+
+int KActiveBorderConfig::getTilingMode() {
+    return tilingOpaque->isChecked() ? OPAQUE : TRANSPARENT;
+}
+
+void KActiveBorderConfig::setTilingMode(int opaque) {
+    tilingOpaque->setChecked(opaque == OPAQUE);
+}
+
+void KActiveBorderConfig::updateActiveBorders() {
+    active_desktop_conf->setEnabled(active_desktop->isChecked());
+    active_tile_conf->setEnabled(active_tile->isChecked());
+}
+
+int KActiveBorderConfig::getActiveBorders() {
+    if (active_desktop->isChecked())
+    {
+        return active_move->isChecked() ? 1 : 2;
+    }
+
+    if (active_tile->isChecked())
+    {
+        return active_maximize->isChecked() ? 4 : 3;
+    }
+
+    return 0;
+}
+
+int KActiveBorderConfig::getActiveBorderDelay() {
+    return delays->value();
+}
+
+int KActiveBorderConfig::getActiveBorderDistance() {
+    return distance->value();
+}
+
+void KActiveBorderConfig::setActiveBorders(int i) {
+    switch(i)
+    {
+      case 1:
+          active_move->setChecked(true);
+      case 2:
+          active_desktop->setChecked(true);
+          break;
+      case 4:
+          active_maximize->setChecked(true);
+      case 3:
+          active_tile->setChecked(true);
+          break;
+      default:
+          active_disable->setChecked(true);
+          break;
+    }
+    updateActiveBorders();
+}
+
+void KActiveBorderConfig::setActiveBorderDelay(int delay)
+{
+    delays->setValue(delay);
+}
+
+void KActiveBorderConfig::setActiveBorderDistance(int d) {
+    distance->setValue(d);
+}
+
 KAdvancedConfig::~KAdvancedConfig ()
 {
     if (standAlone)
@@ -640,10 +860,10 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, TDEConfig *_config, TQWidget
 
     shadeHoverOn = new TQCheckBox(i18n("&Enable hover"), shBox);
 
-    connect(shadeHoverOn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shadeHoverChanged(bool)));
+    connect(shadeHoverOn, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(shadeHoverChanged(bool)));
 
     shadeHover = new KIntNumInput(500, shBox);
-    shadeHover->setLabel(i18n("Dela&y:"), Qt::AlignVCenter|Qt::AlignLeft);
+    shadeHover->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft);
     shadeHover->setRange(0, 3000, 100, true);
     shadeHover->setSteps(100, 100);
     shadeHover->setSuffix(i18n(" msec"));
@@ -658,42 +878,16 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, TDEConfig *_config, TQWidget
     lay->addWidget(shBox);
 
     // Any changes goes to slotChanged()
-    connect(animateShade, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-    connect(shadeHoverOn, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-    connect(shadeHover, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-
-    electricBox = new TQVButtonGroup(i18n("Active Desktop Borders"), this);
-    electricBox->setMargin(15);
-
-    TQWhatsThis::add( electricBox, i18n("If this option is enabled, moving the mouse to a screen border"
-       " will change your desktop. This is e.g. useful if you want to drag windows from one desktop"
-       " to the other.") );
-    active_disable = new TQRadioButton(i18n("D&isabled"), electricBox);
-    active_move    = new TQRadioButton(i18n("Only &when moving windows"), electricBox);
-    active_always  = new TQRadioButton(i18n("A&lways enabled"), electricBox);
-
-    delays = new KIntNumInput(10, electricBox);
-    delays->setRange(0, MAX_EDGE_RES, 50, true);
-    delays->setSuffix(i18n(" msec"));
-    delays->setLabel(i18n("Desktop &switch delay:"));
-    TQWhatsThis::add( delays, i18n("Here you can set a delay for switching desktops using the active"
-       " borders feature. Desktops will be switched after the mouse has been pushed against a screen border"
-       " for the specified number of milliseconds.") );
-
-    connect( electricBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setEBorders()));
-
-    // Any changes goes to slotChanged()
-    connect(electricBox, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed()));
-    connect(delays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-
-    lay->addWidget(electricBox);
+    connect(animateShade, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+    connect(shadeHoverOn, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+    connect(shadeHover, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
 
     hideUtilityWindowsForInactive = new TQCheckBox( i18n( "Hide utility windows for inactive applications" ), this );
     TQWhatsThis::add( hideUtilityWindowsForInactive,
-        i18n( "When turned on, utility windows (tool windows, torn-off menus,...) of inactive applications will be"
+        i18n( "When turned on, utility windows (tool windows, torn-off menus,…) of inactive applications will be"
               " hidden and will be shown only when the application becomes active. Note that applications"
               " have to mark the windows with the proper window type for this feature to work." ));
-    connect(hideUtilityWindowsForInactive, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+    connect(hideUtilityWindowsForInactive, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
     lay->addWidget( hideUtilityWindowsForInactive );
 
     lay->addStretch();
@@ -736,9 +930,6 @@ void KAdvancedConfig::load( void )
     setShadeHover(config->readBoolEntry(KWIN_SHADEHOVER, false));
     setShadeHoverInterval(config->readNumEntry(KWIN_SHADEHOVER_INTERVAL, 250));
 
-    setElectricBorders(config->readNumEntry(KWM_ELECTRIC_BORDER, 0));
-    setElectricBorderDelay(config->readNumEntry(KWM_ELECTRIC_BORDER_DELAY, 150));
-
     setHideUtilityWindowsForInactive( config->readBoolEntry( KWIN_HIDE_UTILITY, true ));
 
     emit TDECModule::changed(false);
@@ -758,10 +949,6 @@ void KAdvancedConfig::save( void )
     v = getShadeHoverInterval();
     if (v<0) v = 0;
     config->writeEntry(KWIN_SHADEHOVER_INTERVAL, v);
-
-    config->writeEntry(KWM_ELECTRIC_BORDER, getElectricBorders());
-    config->writeEntry(KWM_ELECTRIC_BORDER_DELAY,getElectricBorderDelay());
-
     config->writeEntry(KWIN_HIDE_UTILITY, hideUtilityWindowsForInactive->isChecked());
 
     if (standAlone)
@@ -779,47 +966,10 @@ void KAdvancedConfig::defaults()
     setAnimateShade(true);
     setShadeHover(false);
     setShadeHoverInterval(250);
-    setElectricBorders(0);
-    setElectricBorderDelay(150);
     setHideUtilityWindowsForInactive( true );
     emit TDECModule::changed(true);
 }
 
-void KAdvancedConfig::setEBorders()
-{
-    delays->setEnabled(!active_disable->isChecked());
-}
-
-int KAdvancedConfig::getElectricBorders()
-{
-    if (active_move->isChecked())
-       return 1;
-    if (active_always->isChecked())
-       return 2;
-    return 0;
-}
-
-int KAdvancedConfig::getElectricBorderDelay()
-{
-    return delays->value();
-}
-
-void KAdvancedConfig::setElectricBorders(int i){
-    switch(i)
-    {
-      case 1: active_move->setChecked(true); break;
-      case 2: active_always->setChecked(true); break;
-      default: active_disable->setChecked(true); break;
-    }
-    setEBorders();
-}
-
-void KAdvancedConfig::setElectricBorderDelay(int delay)
-{
-    delays->setValue(delay);
-}
-
-
 KMovingConfig::~KMovingConfig ()
 {
     if (standAlone)
@@ -833,24 +983,24 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa
     TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint());
 
     windowsBox = new TQButtonGroup(i18n("Windows"), this);
-    windowsBox->setColumnLayout( 0, Qt::Horizontal );
+    windowsBox->setColumnLayout( 0, TQt::Horizontal );
 
     TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint());
 
     TQBoxLayout *bLay = new TQVBoxLayout;
     wLay->addLayout(bLay);
 
-    opaque = new TQCheckBox(i18n("Di&splay content in moving windows"), windowsBox);
-    bLay->addWidget(opaque);
-    TQWhatsThis::add( opaque, i18n("Enable this option if you want a window's content to be fully shown"
-                                  " while moving it, instead of just showing a window 'skeleton'. The result may not be satisfying"
-                                  " on slow machines without graphic acceleration.") );
+    moveOpaque = new TQCheckBox(i18n("Di&splay content in moving windows"), windowsBox);
+    bLay->addWidget(moveOpaque);
+    TQWhatsThis::add(moveOpaque, i18n("Enable this option if you want a window's content to be fully shown"
+                                     " while moving it, instead of just showing a window 'skeleton'. The result may not be satisfying"
+                                     " on slow machines without graphic acceleration."));
 
-    resizeOpaqueOn = new TQCheckBox(i18n("Display content in &resizing windows"), windowsBox);
-    bLay->addWidget(resizeOpaqueOn);
-    TQWhatsThis::add( resizeOpaqueOn, i18n("Enable this option if you want a window's content to be shown"
-                                          " while resizing it, instead of just showing a window 'skeleton'. The result may not be satisfying"
-                                          " on slow machines.") );
+    resizeOpaque = new TQCheckBox(i18n("Display content in &resizing windows"), windowsBox);
+    bLay->addWidget(resizeOpaque);
+    TQWhatsThis::add(resizeOpaque, i18n("Enable this option if you want a window's content to be shown"
+                                       " while resizing it, instead of just showing a window 'skeleton'. The result may not be satisfying"
+                                       " on slow machines."));
 
     geometryTipOn = new TQCheckBox(i18n("Display window &geometry when moving or resizing"), windowsBox);
     bLay->addWidget(geometryTipOn);
@@ -860,7 +1010,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa
                                         " its size."));
 
     TQGridLayout *rLay = new TQGridLayout(2,3);
-    bLay->addLayout(TQT_TQLAYOUT(rLay));
+    bLay->addLayout(rLay);
     rLay->setColStretch(0,0);
     rLay->setColStretch(1,1);
 
@@ -870,22 +1020,22 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa
                                           " windows are minimized or restored." ) );
     rLay->addWidget(minimizeAnimOn,0,0);
 
-    minimizeAnimSlider = new TQSlider(0,10,10,0,Qt::Horizontal, windowsBox);
+    minimizeAnimSlider = new TQSlider(0,10,10,0,TQt::Horizontal, windowsBox);
     minimizeAnimSlider->setSteps(1, 1);
     // TQSlider::Below clashes with a X11/X.h #define
     #undef Below
     minimizeAnimSlider->setTickmarks(TQSlider::Below);
     rLay->addMultiCellWidget(minimizeAnimSlider,0,0,1,2);
 
-    connect(minimizeAnimOn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setMinimizeAnim(bool)));
-    connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int)));
+    connect(minimizeAnimOn, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setMinimizeAnim(bool)));
+    connect(minimizeAnimSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setMinimizeAnimSpeed(int)));
 
     minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox);
-    minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft);
+    minimizeAnimSlowLabel->setAlignment(TQt::AlignTop|TQt::AlignLeft);
     rLay->addWidget(minimizeAnimSlowLabel,1,1);
 
     minimizeAnimFastLabel= new TQLabel(i18n("Fast"),windowsBox);
-    minimizeAnimFastLabel->setAlignment(Qt::AlignTop|Qt::AlignRight);
+    minimizeAnimFastLabel->setAlignment(TQt::AlignTop|TQt::AlignRight);
     rLay->addWidget(minimizeAnimFastLabel,1,2);
 
     wtstr = i18n("Here you can set the speed of the animation shown when windows are"
@@ -900,6 +1050,11 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa
                                               " and allows you to move or resize them,"
                                               " just like for normal windows"));
 
+    resetMaximizedWindowGeometry = new TQCheckBox( i18n("Restore size of maximized/tiled windows when moving"), windowsBox);
+    bLay->addWidget(resetMaximizedWindowGeometry);
+    TQWhatsThis::add(resetMaximizedWindowGeometry, i18n("If this feature is enabled, dragging a maximized or tiled window"
+                                                        " will restore the window to its original size."));
+
     TQBoxLayout *vLay = new TQHBoxLayout(bLay);
 
     TQLabel *plcLabel = new TQLabel(i18n("&Placement:"),windowsBox);
@@ -935,7 +1090,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa
 
     plcLabel->setBuddy(placementCombo);
     vLay->addWidget(plcLabel, 0);
-    vLay->addWidget(placementCombo, 1, Qt::AlignLeft);
+    vLay->addWidget(placementCombo, 1, TQt::AlignLeft);
 
     bLay->addSpacing(10);
 
@@ -988,34 +1143,25 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa
     load();
 
     // Any changes goes to slotChanged()
-    connect( opaque, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect( resizeOpaqueOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect( geometryTipOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect( minimizeAnimOn, TQT_SIGNAL(clicked() ), TQT_SLOT(changed()));
-    connect( minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-    connect( moveResizeMaximized, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-    connect( placementCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-    connect( BrdrSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-    connect( BrdrSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotBrdrSnapChanged(int)));
-    connect( WndwSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-    connect( WndwSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWndwSnapChanged(int)));
-    connect( OverlapSnap, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+    connect( moveOpaque, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect( resizeOpaque, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect( geometryTipOn, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect( minimizeAnimOn, TQ_SIGNAL(clicked() ), TQ_SLOT(changed()));
+    connect( minimizeAnimSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+    connect( moveResizeMaximized, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+    connect( resetMaximizedWindowGeometry, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+    connect( placementCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
+    connect( BrdrSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+    connect( BrdrSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotBrdrSnapChanged(int)));
+    connect( WndwSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+    connect( WndwSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotWndwSnapChanged(int)));
+    connect( OverlapSnap, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
 
     // To get suffix to BrdrSnap and WndwSnap inputs with default values.
     slotBrdrSnapChanged(BrdrSnap->value());
     slotWndwSnapChanged(WndwSnap->value());
 }
 
-int KMovingConfig::getMove()
-{
-    return (opaque->isChecked())? OPAQUE : TRANSPARENT;
-}
-
-void KMovingConfig::setMove(int trans)
-{
-    opaque->setChecked(trans == OPAQUE);
-}
-
 void KMovingConfig::setGeometryTip(bool showGeometryTip)
 {
     geometryTipOn->setChecked(showGeometryTip);
@@ -1060,20 +1206,33 @@ void KMovingConfig::setMinimizeAnimSpeed(int speed)
     minimizeAnimSlider->setValue(speed);
 }
 
-int KMovingConfig::getResizeOpaque()
+int KMovingConfig::getMoveMode() {
+    return moveOpaque->isChecked() ? OPAQUE : TRANSPARENT;
+}
+
+void KMovingConfig::setMoveMode(int opaque)
+{
+    moveOpaque->setChecked(opaque == OPAQUE);
+}
+
+int KMovingConfig::getResizeMode()
 {
-    return (resizeOpaqueOn->isChecked())? RESIZE_OPAQUE : RESIZE_TRANSPARENT;
+    return resizeOpaque->isChecked() ? OPAQUE : TRANSPARENT;
 }
 
-void KMovingConfig::setResizeOpaque(int opaque)
+void KMovingConfig::setResizeMode(int opaque)
 {
-    resizeOpaqueOn->setChecked(opaque == RESIZE_OPAQUE);
+    resizeOpaque->setChecked(opaque == OPAQUE);
 }
 
 void KMovingConfig::setMoveResizeMaximized(bool a) {
     moveResizeMaximized->setChecked(a);
 }
 
+void KMovingConfig::setResetMaximizedWindowGeometry(bool a) {
+    resetMaximizedWindowGeometry->setChecked(a);
+}
+
 void KMovingConfig::slotBrdrSnapChanged(int value) {
     BrdrSnap->setSuffix(i18n(" pixel", " pixels", value));
 }
@@ -1088,11 +1247,18 @@ void KMovingConfig::load( void )
 
     config->setGroup( "Windows" );
 
-    key = config->readEntry(KWIN_MOVE, "Opaque");
-    if( key == "Transparent")
-        setMove(TRANSPARENT);
-    else if( key == "Opaque")
-        setMove(OPAQUE);
+    // DF: please keep the default consistent with twin (options.cpp)
+    key = config->readEntry(KWIN_MOVE_MODE, "Opaque");
+    if (key == "Opaque")
+        setMoveMode(OPAQUE);
+    else if (key == "Transparent")
+        setMoveMode(TRANSPARENT);
+
+    key = config->readEntry(KWIN_RESIZE_MODE, "Opaque");
+    if (key == "Opaque")
+        setResizeMode(OPAQUE);
+    else if (key == "Transparent")
+        setResizeMode(TRANSPARENT);
 
     //CT 17Jun1998 - variable animation speed from 0 (none!!) to 10 (max)
     bool anim = config->readBoolEntry(KWIN_MINIMIZE_ANIM, true );
@@ -1102,13 +1268,6 @@ void KMovingConfig::load( void )
     setMinimizeAnim( anim );
     setMinimizeAnimSpeed( animSpeed );
 
-    // DF: please keep the default consistent with twin (options.cpp line 145)
-    key = config->readEntry(KWIN_RESIZE_OPAQUE, "Opaque");
-    if( key == "Opaque")
-        setResizeOpaque(RESIZE_OPAQUE);
-    else if ( key == "Transparent")
-        setResizeOpaque(RESIZE_TRANSPARENT);
-
     //KS 10Jan2003 - Geometry Tip during window move/resize
     bool showGeomTip = config->readBoolEntry(KWIN_GEOMETRY, false);
     setGeometryTip( showGeomTip );
@@ -1149,6 +1308,7 @@ void KMovingConfig::load( void )
 //  }
 
     setMoveResizeMaximized(config->readBoolEntry(KWIN_MOVE_RESIZE_MAXIMIZED, false));
+    setResetMaximizedWindowGeometry(config->readBoolEntry(KWIN_RESET_MAX_WIN_GEOM, false));
 
     int v;
 
@@ -1172,16 +1332,22 @@ void KMovingConfig::save( void )
 
     config->setGroup( "Windows" );
 
-    v = getMove();
-    if (v == TRANSPARENT)
-        config->writeEntry(KWIN_MOVE,"Transparent");
+    v = getMoveMode();
+    if (v == OPAQUE)
+        config->writeEntry(KWIN_MOVE_MODE, "Opaque");
+    else
+        config->writeEntry(KWIN_MOVE_MODE, "Transparent");
+
+    v = getResizeMode();
+    if (v == OPAQUE)
+        config->writeEntry(KWIN_RESIZE_MODE, "Opaque");
     else
-        config->writeEntry(KWIN_MOVE,"Opaque");
+        config->writeEntry(KWIN_RESIZE_MODE, "Transparent");
 
     config->writeEntry(KWIN_GEOMETRY, getGeometryTip());
 
     // placement policy --- CT 31jan98 ---
-    v =getPlacement();
+    v = getPlacement();
     if (v == RANDOM_PLACEMENT)
         config->writeEntry(KWIN_PLACEMENT, "Random");
     else if (v == CASCADE_PLACEMENT)
@@ -1205,13 +1371,8 @@ void KMovingConfig::save( void )
     config->writeEntry(KWIN_MINIMIZE_ANIM, getMinimizeAnim());
     config->writeEntry(KWIN_MINIMIZE_ANIM_SPEED, getMinimizeAnimSpeed());
 
-    v = getResizeOpaque();
-    if (v == RESIZE_OPAQUE)
-        config->writeEntry(KWIN_RESIZE_OPAQUE, "Opaque");
-    else
-        config->writeEntry(KWIN_RESIZE_OPAQUE, "Transparent");
-
     config->writeEntry(KWIN_MOVE_RESIZE_MAXIMIZED, moveResizeMaximized->isChecked());
+    config->writeEntry(KWIN_RESET_MAX_WIN_GEOM, resetMaximizedWindowGeometry->isChecked());
 
 
     config->writeEntry(KWM_BRDR_SNAP_ZONE,getBorderSnapZone());
@@ -1230,11 +1391,12 @@ void KMovingConfig::save( void )
 
 void KMovingConfig::defaults()
 {
-    setMove(OPAQUE);
-    setResizeOpaque(RESIZE_TRANSPARENT);
+    setMoveMode(OPAQUE);
+    setResizeMode(TRANSPARENT);
     setGeometryTip(false);
     setPlacement(SMART_PLACEMENT);
     setMoveResizeMaximized(false);
+    setResetMaximizedWindowGeometry(false);
 
     //copied from kcontrol/konq/twindesktop, aleXXX
     setWindowSnapZone(KWM_WNDW_SNAP_ZONE_DEFAULT);
@@ -1297,12 +1459,12 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config,
   TQWidget *tGroup = new TQWidget(tabW);
   TQVBoxLayout *vLay = new TQVBoxLayout (tGroup,KDialog::marginHint(), KDialog::spacingHint());
   vLay->addSpacing(11); // to get the proper gb top offset
-  
+
   onlyDecoTranslucent = new TQCheckBox(i18n("Apply translucency only to decoration"),tGroup);
   vLay->addWidget(onlyDecoTranslucent);
-  
+
   vLay->addSpacing(11);
-  
+
   TQGridLayout *gLay = new TQGridLayout(vLay,4,2,KDialog::spacingHint());
   gLay->setColStretch(1,1);
 
@@ -1440,7 +1602,7 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config,
 
   TQLabel *label6 = new TQLabel(i18n("Shadow color:"),sGroup);
   gLay2->addWidget(label6,7,0);
-  shadowColor = new KColorButton(Qt::black,sGroup);
+  shadowColor = new KColorButton(TQt::black,sGroup);
   gLay2->addWidget(shadowColor,7,1);
   gLay2->setColStretch(1,1);
   vLay2->addSpacing(11);
@@ -1478,84 +1640,84 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config,
   lay->addWidget(useTranslucency);
   lay->addWidget(tabW);
 
-  connect(useTranslucency, TQT_SIGNAL(toggled(bool)), tabW, TQT_SLOT(setEnabled(bool)));
-
-  connect(activeWindowTransparency, TQT_SIGNAL(toggled(bool)), activeWindowOpacity, TQT_SLOT(setEnabled(bool)));
-  connect(inactiveWindowTransparency, TQT_SIGNAL(toggled(bool)), inactiveWindowOpacity, TQT_SLOT(setEnabled(bool)));
-  connect(movingWindowTransparency, TQT_SIGNAL(toggled(bool)), movingWindowOpacity, TQT_SLOT(setEnabled(bool)));
-  connect(dockWindowTransparency, TQT_SIGNAL(toggled(bool)), dockWindowOpacity, TQT_SLOT(setEnabled(bool)));
-
-  connect(useTranslucency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(onlyDecoTranslucent, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(activeWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(inactiveWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(movingWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(dockWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(keepAboveAsActive, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(disableARGB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useOpenGL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useOpenGL, TQT_SIGNAL(toggled(bool)), blurBackground, TQT_SLOT(setEnabled(bool)));
-  connect(blurBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useOpenGL, TQT_SIGNAL(toggled(bool)), greyscaleBackground, TQT_SLOT(setEnabled(bool)));
-  connect(greyscaleBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useShadowsOnMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useShadowsOnToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useShadowsOnDockWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(removeShadowsOnResize, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(removeShadowsOnMove, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-
-  connect(activeWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(inactiveWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(movingWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(dockWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(dockWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(menuWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(activeWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(inactiveWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(baseShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(shadowTopOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(shadowLeftOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(shadowColor, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(changed()));
-  connect(fadeInWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(fadeInMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(fadeInToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(fadeOnOpacityChange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(fadeInSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(fadeOutSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-
-  connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts()));
-  connect(useShadowsOnMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts()));
-  connect(useShadowsOnToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts()));
-  connect(useShadowsOnDockWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts()));
+  connect(useTranslucency, TQ_SIGNAL(toggled(bool)), tabW, TQ_SLOT(setEnabled(bool)));
+
+  connect(activeWindowTransparency, TQ_SIGNAL(toggled(bool)), activeWindowOpacity, TQ_SLOT(setEnabled(bool)));
+  connect(inactiveWindowTransparency, TQ_SIGNAL(toggled(bool)), inactiveWindowOpacity, TQ_SLOT(setEnabled(bool)));
+  connect(movingWindowTransparency, TQ_SIGNAL(toggled(bool)), movingWindowOpacity, TQ_SLOT(setEnabled(bool)));
+  connect(dockWindowTransparency, TQ_SIGNAL(toggled(bool)), dockWindowOpacity, TQ_SLOT(setEnabled(bool)));
+
+  connect(useTranslucency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(onlyDecoTranslucent, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(activeWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(inactiveWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(movingWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(dockWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(keepAboveAsActive, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(disableARGB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useOpenGL, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useOpenGL, TQ_SIGNAL(toggled(bool)), blurBackground, TQ_SLOT(setEnabled(bool)));
+  connect(blurBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useOpenGL, TQ_SIGNAL(toggled(bool)), greyscaleBackground, TQ_SLOT(setEnabled(bool)));
+  connect(greyscaleBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useShadows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useShadowsOnMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useShadowsOnToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useShadowsOnDockWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(removeShadowsOnResize, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(removeShadowsOnMove, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+
+  connect(activeWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(inactiveWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(movingWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(dockWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(dockWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(menuWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(activeWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(inactiveWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(baseShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(shadowTopOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(shadowLeftOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(shadowColor, TQ_SIGNAL(changed(const TQColor&)), TQ_SLOT(changed()));
+  connect(fadeInWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(fadeInMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(fadeInToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(fadeOnOpacityChange, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(fadeInSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(fadeOutSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+
+  connect(useShadows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts()));
+  connect(useShadowsOnMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts()));
+  connect(useShadowsOnToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts()));
+  connect(useShadowsOnDockWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts()));
 
   load();
 
   tabW->setEnabled(useTranslucency->isChecked());
 
-  connect(useTranslucency, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showWarning(bool)));
+  connect(useTranslucency, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showWarning(bool)));
 
   // handle kompmgr restarts if necessary
-  connect(useTranslucency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(disableARGB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(useOpenGL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(blurBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(greyscaleBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(useShadowsOnMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(useShadowsOnToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(useShadowsOnDockWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(inactiveWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
-  connect(baseShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
-  connect(shadowTopOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
-  connect(shadowLeftOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
-  connect(shadowColor, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(resetKompmgr()));
-  connect(fadeInWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(fadeInMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(fadeInToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(fadeOnOpacityChange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(fadeInSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
-  connect(fadeOutSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
+  connect(useTranslucency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(disableARGB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(useOpenGL, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(blurBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(greyscaleBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(useShadows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(useShadowsOnMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(useShadowsOnToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(useShadowsOnDockWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(inactiveWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr()));
+  connect(baseShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr()));
+  connect(shadowTopOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr()));
+  connect(shadowLeftOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr()));
+  connect(shadowColor, TQ_SIGNAL(changed(const TQColor&)), TQ_SLOT(resetKompmgr()));
+  connect(fadeInWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(fadeInMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(fadeInToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(fadeOnOpacityChange, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(fadeInSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr()));
+  connect(fadeOutSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr()));
 
   }
 }
@@ -1642,7 +1804,7 @@ void KTranslucencyConfig::load( void )
   r = g = b = 256;
 
   if (sscanf(hex.latin1(), "0x%02x%02x%02x", &r, &g, &b)!=3 || r > 255 || g > 255 || b > 255)
-    shadowColor->setColor(Qt::black);
+    shadowColor->setColor(TQt::black);
   else
     shadowColor->setColor(TQColor(r,g,b));
 
@@ -1850,7 +2012,7 @@ void KTranslucencyConfig::defaults()
   useShadowsOnDockWindows->setChecked(FALSE);
   removeShadowsOnMove->setChecked(FALSE);
   removeShadowsOnResize->setChecked(FALSE);
-  shadowColor->setColor(Qt::black);
+  shadowColor->setColor(TQt::black);
   fadeInWindows->setChecked(FALSE);
   fadeInMenuWindows->setChecked(TRUE);
   fadeInToolTipWindows->setChecked(TRUE);
diff --git a/twin/kcmtwin/twinoptions/windows.h b/twin/kcmtwin/twinoptions/windows.h
index d4d358e9a..80c9e76d7 100644
--- a/twin/kcmtwin/twinoptions/windows.h
+++ b/twin/kcmtwin/twinoptions/windows.h
@@ -50,9 +50,6 @@ class KIntNumInput;
 #define TITLEBAR_PLAIN  0
 #define TITLEBAR_SHADED 1
 
-#define RESIZE_TRANSPARENT  0
-#define RESIZE_OPAQUE       1
-
 #define SMART_PLACEMENT        0
 #define MAXIMIZING_PLACEMENT   1
 #define CASCADE_PLACEMENT      2
@@ -68,10 +65,11 @@ class KIntNumInput;
 #define  FOCUS_STRICTLY_UNDER_MOUSE   3
 
 class TQSpinBox;
+class TQHBox;
 
 class KFocusConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KFocusConfig( bool _standAlone, TDEConfig *_config, TQWidget *parent=0, const char* name=0 );
   ~KFocusConfig();
@@ -88,7 +86,7 @@ private slots:
   void clickRaiseOnTog(bool);
   void updateAltTabMode();
   void updateActiveMouseScreen();
-	void changed() { emit TDECModule::changed(true); }
+  void changed() { emit TDECModule::changed(true); }
 
 
 private:
@@ -134,7 +132,7 @@ private:
 
 class KMovingConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KMovingConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 );
   ~KMovingConfig();
@@ -146,32 +144,34 @@ public:
 private slots:
   void setMinimizeAnim( bool );
   void setMinimizeAnimSpeed( int );
-	void changed() { emit TDECModule::changed(true); }
+  void changed() { emit TDECModule::changed(true); }
   void slotBrdrSnapChanged( int );
   void slotWndwSnapChanged( int );
 
 private:
-  int getMove( void );
+  int  getMoveMode( void );
+  int  getResizeMode ( void );
   bool getMinimizeAnim( void );
-  int getMinimizeAnimSpeed( void );
-  int getResizeOpaque ( void );
+  int  getMinimizeAnimSpeed( void );
   bool getGeometryTip( void ); //KS
-  int getPlacement( void ); //CT
+  int  getPlacement( void ); //CT
 
-  void setMove(int);
-  void setResizeOpaque(int);
+  void setMoveMode(int);
+  void setResizeMode(int);
   void setGeometryTip(bool); //KS
   void setPlacement(int); //CT
   void setMoveResizeMaximized(bool);
+  void setResetMaximizedWindowGeometry(bool);
 
   TQButtonGroup *windowsBox;
-  TQCheckBox *opaque;
-  TQCheckBox *resizeOpaqueOn;
+  TQCheckBox *moveOpaque;
+  TQCheckBox *resizeOpaque;
   TQCheckBox *geometryTipOn;
-  TQCheckBox* minimizeAnimOn;
+  TQCheckBox *minimizeAnimOn;
   TQSlider *minimizeAnimSlider;
   TQLabel *minimizeAnimSlowLabel, *minimizeAnimFastLabel;
   TQCheckBox *moveResizeMaximized;
+  TQCheckBox *resetMaximizedWindowGeometry;
 
   TQComboBox *placementCombo;
 
@@ -189,9 +189,54 @@ private:
 
 };
 
+class KActiveBorderConfig : public TDECModule
+{
+    TQ_OBJECT
+    public:
+        KActiveBorderConfig(bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char *name = 0);
+        ~KActiveBorderConfig();
+
+        void load();
+        void save();
+        void defaults();
+
+    private slots:
+        // copied from kcontrol/konq/twindesktop, aleXXX
+        // original name: setEBorders()
+        void updateActiveBorders();
+
+        void changed() { emit TDECModule::changed(true); }
+
+    private:
+        int getActiveBorders();
+        int getActiveBorderDelay();
+        int getActiveBorderDistance();
+        int getTilingMode();
+
+        void setActiveBorders(int);
+        void setActiveBorderDelay(int);
+        void setActiveBorderDistance(int);
+        void setTilingMode(int);
+
+        TQButtonGroup *active_box;
+        TQRadioButton *active_disable;
+        TQRadioButton *active_desktop;
+        TQCheckBox *active_move;
+        TQRadioButton *active_tile;
+        TQCheckBox *active_maximize;
+        KIntNumInput *delays;
+        KIntNumInput *distance;
+        TQWidget *active_desktop_conf;
+        TQWidget *active_tile_conf;
+        TQCheckBox *tilingOpaque;
+
+        TDEConfig *config;
+        bool standAlone;
+};
+
 class KAdvancedConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KAdvancedConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 );
   ~KAdvancedConfig();
@@ -203,9 +248,6 @@ public:
 private slots:
   void shadeHoverChanged(bool);
 
-  //copied from kcontrol/konq/twindesktop, aleXXX
-  void setEBorders();
-
   void changed() { emit TDECModule::changed(true); }
 
 private:
@@ -223,17 +265,6 @@ private:
   TDEConfig *config;
   bool     standAlone;
 
-  int getElectricBorders( void );
-  int getElectricBorderDelay();
-  void setElectricBorders( int );
-  void setElectricBorderDelay( int );
-
-  TQVButtonGroup *electricBox;
-  TQRadioButton *active_disable;
-  TQRadioButton *active_move;
-  TQRadioButton *active_always;
-  KIntNumInput *delays;
-  
   void setHideUtilityWindowsForInactive( bool );
 
   TQCheckBox* hideUtilityWindowsForInactive;
@@ -242,15 +273,15 @@ private:
 class TDEProcess;
 class KTranslucencyConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KTranslucencyConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 );
   ~KTranslucencyConfig();
-  
+
   void load();
   void save();
   void defaults();
-  
+
 private:
   TQCheckBox *useTranslucency;
   TQCheckBox *activeWindowTransparency;
diff --git a/twin/kcmtwin/twinrules/detectwidget.cpp b/twin/kcmtwin/twinrules/detectwidget.cpp
index f450938bc..b01066403 100644
--- a/twin/kcmtwin/twinrules/detectwidget.cpp
+++ b/twin/kcmtwin/twinrules/detectwidget.cpp
@@ -164,19 +164,19 @@ void DetectDialog::selectWindow()
     grabber = new TQDialog( NULL, NULL, true, (WFlags)WX11BypassWM );
     grabber->move( -1000, -1000 );
     grabber->show();
-    grabber->grabMouse( tqcrossCursor );
+    grabber->grabMouse( TQt::crossCursor );
     grabber->installEventFilter( this );
     }
 
 bool DetectDialog::eventFilter( TQObject* o, TQEvent* e )
     {
-    if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(grabber) )
+    if( o != grabber )
         return false;
     if( e->type() != TQEvent::MouseButtonRelease )
         return false;
     delete grabber;
     grabber = NULL;
-    if( TQT_TQMOUSEEVENT( e )->button() != Qt::LeftButton )
+    if( static_cast<TQMouseEvent*>( e )->button() != TQt::LeftButton )
         {
         emit detectionDone( false );
         return true;
diff --git a/twin/kcmtwin/twinrules/detectwidget.h b/twin/kcmtwin/twinrules/detectwidget.h
index 75e725f5f..ecd608ea7 100644
--- a/twin/kcmtwin/twinrules/detectwidget.h
+++ b/twin/kcmtwin/twinrules/detectwidget.h
@@ -33,7 +33,7 @@ namespace KWinInternal
 class DetectWidget
     : public DetectWidgetBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         DetectWidget( TQWidget* parent = NULL, const char* name = NULL );
     };
@@ -41,7 +41,7 @@ class DetectWidget
 class DetectDialog
     : public KDialogBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         DetectDialog( TQWidget* parent = NULL, const char* name = NULL );
         void detect( WId window );
diff --git a/twin/kcmtwin/twinrules/editshortcutbase.ui b/twin/kcmtwin/twinrules/editshortcutbase.ui
index 793784c42..8a9339c16 100644
--- a/twin/kcmtwin/twinrules/editshortcutbase.ui
+++ b/twin/kcmtwin/twinrules/editshortcutbase.ui
@@ -155,10 +155,10 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
         <slot>clearShortcut()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">editShortcut()</slot>
     <slot access="protected" specifier="pure virtual">clearShortcut()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp
index 2f28bc5dd..fb7451626 100644
--- a/twin/kcmtwin/twinrules/kcm.cpp
+++ b/twin/kcmtwin/twinrules/kcm.cpp
@@ -44,8 +44,8 @@ KCMRules::KCMRules( TQWidget *parent, const char *name )
     {
     TQVBoxLayout *layout = new TQVBoxLayout( this );
     widget = new KCMRulesList( this );
-    layout->addWidget( TQT_TQWIDGET(widget) );
-    connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool )));
+    layout->addWidget( widget );
+    connect( widget, TQ_SIGNAL( changed( bool )), TQ_SLOT( moduleChanged( bool )));
     TDEAboutData *about = new TDEAboutData(I18N_NOOP( "kcmtwinrules" ),
         I18N_NOOP( "Window-Specific Settings Configuration Module" ),
         0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" ));
diff --git a/twin/kcmtwin/twinrules/kcm.h b/twin/kcmtwin/twinrules/kcm.h
index 5e89a7773..54e044845 100644
--- a/twin/kcmtwin/twinrules/kcm.h
+++ b/twin/kcmtwin/twinrules/kcm.h
@@ -34,7 +34,7 @@ class KCMRulesList;
 class KCMRules
     : public TDECModule
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         KCMRules( TQWidget *parent, const char *name );
         virtual void load();
diff --git a/twin/kcmtwin/twinrules/ruleslist.cpp b/twin/kcmtwin/twinrules/ruleslist.cpp
index 8961874ae..a9238c178 100644
--- a/twin/kcmtwin/twinrules/ruleslist.cpp
+++ b/twin/kcmtwin/twinrules/ruleslist.cpp
@@ -33,22 +33,22 @@ KCMRulesList::KCMRulesList( TQWidget* parent, const char* name )
 : KCMRulesListBase( parent, name )
     {
     // connect both current/selected, so that current==selected (stupid TQListBox :( )
-    connect( rules_listbox, TQT_SIGNAL( currentChanged( TQListBoxItem* )),
-        TQT_SLOT( activeChanged( TQListBoxItem*)));
-    connect( rules_listbox, TQT_SIGNAL( selectionChanged( TQListBoxItem* )),
-        TQT_SLOT( activeChanged( TQListBoxItem*)));
-    connect( new_button, TQT_SIGNAL( clicked()),
-        TQT_SLOT( newClicked()));
-    connect( modify_button, TQT_SIGNAL( clicked()),
-        TQT_SLOT( modifyClicked()));
-    connect( delete_button, TQT_SIGNAL( clicked()),
-        TQT_SLOT( deleteClicked()));
-    connect( moveup_button, TQT_SIGNAL( clicked()),
-        TQT_SLOT( moveupClicked()));
-    connect( movedown_button, TQT_SIGNAL( clicked()),
-        TQT_SLOT( movedownClicked()));
-    connect( rules_listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ),
-            TQT_SLOT( modifyClicked()));
+    connect( rules_listbox, TQ_SIGNAL( currentChanged( TQListBoxItem* )),
+        TQ_SLOT( activeChanged( TQListBoxItem*)));
+    connect( rules_listbox, TQ_SIGNAL( selectionChanged( TQListBoxItem* )),
+        TQ_SLOT( activeChanged( TQListBoxItem*)));
+    connect( new_button, TQ_SIGNAL( clicked()),
+        TQ_SLOT( newClicked()));
+    connect( modify_button, TQ_SIGNAL( clicked()),
+        TQ_SLOT( modifyClicked()));
+    connect( delete_button, TQ_SIGNAL( clicked()),
+        TQ_SLOT( deleteClicked()));
+    connect( moveup_button, TQ_SIGNAL( clicked()),
+        TQ_SLOT( moveupClicked()));
+    connect( movedown_button, TQ_SIGNAL( clicked()),
+        TQ_SLOT( movedownClicked()));
+    connect( rules_listbox, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ),
+            TQ_SLOT( modifyClicked()));
     load();
     }
 
diff --git a/twin/kcmtwin/twinrules/ruleslist.h b/twin/kcmtwin/twinrules/ruleslist.h
index f7e7fb541..837ad6840 100644
--- a/twin/kcmtwin/twinrules/ruleslist.h
+++ b/twin/kcmtwin/twinrules/ruleslist.h
@@ -34,7 +34,7 @@ namespace KWinInternal
 class KCMRulesList
     : public KCMRulesListBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         KCMRulesList( TQWidget* parent = NULL, const char* name = NULL );
         virtual ~KCMRulesList();
diff --git a/twin/kcmtwin/twinrules/ruleslistbase.ui b/twin/kcmtwin/twinrules/ruleslistbase.ui
index f079dcda3..233290e38 100644
--- a/twin/kcmtwin/twinrules/ruleslistbase.ui
+++ b/twin/kcmtwin/twinrules/ruleslistbase.ui
@@ -29,7 +29,7 @@
                 <cstring>new_button</cstring>
             </property>
             <property name="text">
-                <string>&amp;New...</string>
+                <string>&amp;New…</string>
             </property>
         </widget>
         <widget class="KPushButton" row="1" column="1">
@@ -37,7 +37,7 @@
                 <cstring>modify_button</cstring>
             </property>
             <property name="text">
-                <string>&amp;Modify...</string>
+                <string>&amp;Modify…</string>
             </property>
         </widget>
         <widget class="KPushButton" row="2" column="1">
@@ -47,9 +47,6 @@
             <property name="text">
                 <string>Delete</string>
             </property>
-            <property name="accel">
-                <string></string>
-            </property>
         </widget>
         <widget class="KPushButton" row="3" column="1">
             <property name="name">
diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp
index 334001bf7..116ac8b41 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.cpp
+++ b/twin/kcmtwin/twinrules/ruleswidget.cpp
@@ -41,9 +41,9 @@ namespace KWinInternal
 {
 
 #define SETUP( var, type ) \
-    connect( enable_##var, TQT_SIGNAL( toggled( bool )), rule_##var, TQT_SLOT( setEnabled( bool ))); \
-    connect( enable_##var, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( updateEnable##var())); \
-    connect( rule_##var, TQT_SIGNAL( activated( int )), this, TQT_SLOT( updateEnable##var())); \
+    connect( enable_##var, TQ_SIGNAL( toggled( bool )), rule_##var, TQ_SLOT( setEnabled( bool ))); \
+    connect( enable_##var, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( updateEnable##var())); \
+    connect( rule_##var, TQ_SIGNAL( activated( int )), this, TQ_SLOT( updateEnable##var())); \
     TQWhatsThis::add( enable_##var, enableDesc ); \
     TQWhatsThis::add( rule_##var, type##RuleDesc );
 
@@ -550,7 +550,7 @@ void RulesWidget::detectClicked()
     {
     assert( detect_dlg == NULL );
     detect_dlg = new DetectDialog;
-    connect( detect_dlg, TQT_SIGNAL( detectionDone( bool )), this, TQT_SLOT( detected( bool )));
+    connect( detect_dlg, TQ_SIGNAL( detectionDone( bool )), this, TQ_SLOT( detected( bool )));
     detect_dlg->detect( 0 );
     }
 
@@ -702,7 +702,7 @@ Rules* RulesDialog::edit( Rules* r, WId window, bool show_hints )
     if( window != 0 )
         widget->prepareWindowSpecific( window );
     if( show_hints )
-        TQTimer::singleShot( 0, this, TQT_SLOT( displayHints()));
+        TQTimer::singleShot( 0, this, TQ_SLOT( displayHints()));
     exec();
     return rules;
     }
diff --git a/twin/kcmtwin/twinrules/ruleswidget.h b/twin/kcmtwin/twinrules/ruleswidget.h
index 4d22e1826..4c4ef4be0 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.h
+++ b/twin/kcmtwin/twinrules/ruleswidget.h
@@ -36,7 +36,7 @@ class DetectDialog;
 class RulesWidget
     : public RulesWidgetBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         RulesWidget( TQWidget* parent = NULL, const char* name = NULL );
         void setRules( Rules* r );
@@ -97,7 +97,7 @@ class RulesWidget
 class RulesDialog
     : public KDialogBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         RulesDialog( TQWidget* parent = NULL, const char* name = NULL );
         Rules* edit( Rules* r, WId window, bool show_hints );
@@ -113,7 +113,7 @@ class RulesDialog
 class EditShortcut
     : public EditShortcutBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         EditShortcut( TQWidget* parent = NULL, const char* name = NULL );
     protected:
@@ -124,7 +124,7 @@ class EditShortcut
 class EditShortcutDialog
     : public KDialogBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         EditShortcutDialog( TQWidget* parent = NULL, const char* name = NULL );
         void setShortcut( const TQString& cut );
@@ -137,7 +137,7 @@ class EditShortcutDialog
 class ShortcutDialog
     : public TDEShortcutDialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         ShortcutDialog( const TDEShortcut& cut, TQWidget* parent = NULL, const char* name = NULL );
         virtual void accept();
diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
index 352a26762..356a99676 100644
--- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui
+++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
@@ -216,9 +216,6 @@
                         <property name="text">
                             <string>Edit</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <spacer row="4" column="3" rowspan="1" colspan="2">
                         <property name="name">
@@ -487,9 +484,6 @@
                         <property name="text">
                             <string>Edit</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <spacer row="4" column="3">
                         <property name="name">
@@ -560,9 +554,6 @@
                         <property name="text">
                             <string>Edit</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <spacer row="7" column="3">
                         <property name="name">
@@ -633,9 +624,6 @@
                         <property name="text">
                             <string>Edit</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <spacer row="10" column="3">
                         <property name="name">
@@ -1869,9 +1857,6 @@
                         <property name="text">
                             <string>Shortcut</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <widget class="KComboBox" row="9" column="1">
                         <item>
@@ -1916,7 +1901,7 @@
                             <cstring>shortcut_edit</cstring>
                         </property>
                         <property name="text">
-                            <string>Edit...</string>
+                            <string>Edit…</string>
                         </property>
                     </widget>
                     <widget class="KRestrictedLine" row="9" column="2" rowspan="1" colspan="3">
@@ -2292,9 +2277,6 @@
                         <property name="text">
                             <string>Strictly obey geometry</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <widget class="KComboBox" row="6" column="1">
                         <item>
@@ -2348,9 +2330,6 @@
                         <property name="text">
                             <string>Block global shortcuts</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <widget class="KComboBox" row="7" column="1">
                         <item>
@@ -2530,7 +2509,7 @@
     <tabstop>rule_disableglobalshortcuts</tabstop>
     <tabstop>disableglobalshortcuts</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">detectClicked()</slot>
     <slot access="protected" specifier="pure virtual">wmclassMatchChanged()</slot>
     <slot access="protected" specifier="pure virtual">roleMatchChanged()</slot>
@@ -2538,7 +2517,7 @@
     <slot access="protected" specifier="pure virtual">extraMatchChanged()</slot>
     <slot access="protected" specifier="pure virtual">machineMatchChanged()</slot>
     <slot access="protected" specifier="pure virtual">shortcutEditClicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
diff --git a/twin/layers.cpp b/twin/layers.cpp
index 143d826d5..adc9bd436 100644
--- a/twin/layers.cpp
+++ b/twin/layers.cpp
@@ -129,43 +129,50 @@ void Workspace::updateStackingOrder( bool propagate_new_clients )
 void Workspace::propagateClients( bool propagate_new_clients )
     {
     Window *cl; // MW we should not assume WId and Window to be compatible
-                                // when passig pointers around.
+                                // when passing pointers around.
 
     // restack the windows according to the stacking order
-#if 0
-    Window* new_stack = new Window[ stacking_order.count() + 2 ];
-    int pos = 0;
-#endif
     NET::WindowType t;
     Window shadow;
     Window *dock_shadow_stack, *window_stack;
     int i, numDocks, pos, topmenu_space_pos;
- 
+
+    // Dock Stack size magic number explanation:
+    // -> (count * 2) because we might need to also store the shadow window
+    //    for each dock window (Chakra shadow patch, introduced in 9cc1e2c1aa)
     dock_shadow_stack = new Window[ stacking_order.count() * 2 ];
-    window_stack = new Window[ stacking_order.count() * 2 + 2 ];
+
+    // Window Stack size magic number explanation:
+    // -> (count * 2) because we might need to store shadow windows (see above)
+    // -> + 1 for supportWindow
+    // -> + 1 for topmenu_space
+    // -> + 8 for active borders
+    window_stack = new Window[ stacking_order.count() * 2 + 1 + 1 + 8 ];
     i = 0;
     pos = 0;
     topmenu_space_pos = 1; // not 0, that's supportWindow !!!
 
-    // Stack all windows under the support window. The support window is
-    // not used for anything (besides the NETWM property), and it's not shown,
-    // but it was lowered after twin startup. Stacking all clients below
-    // it ensures that no client will be ever shown above override-redirect
-    // windows (e.g. popups).
-#if 0
-    new_stack[ pos++ ] = supportWindow->winId();
-    int topmenu_space_pos = 1; // not 0, that's supportWindow !!!
-#endif
+    // Stack active windows under the support window.
+    /* The support window is not used for anything (besides the NETWM property),
+     * and it's not shown, but it was lowered after TWin startup.
+     * Stacking all clients below it ensures that no client will be ever shown
+     * above override-redirect windows (e.g. popups).
+     */
+    for (int i = 0; i < ACTIVE_BORDER_COUNT; ++i)
+    {
+        if (active_windows[i] != None)
+        {
+            window_stack[pos++] = active_windows[i];
+        }
+    }
+
+    // Stack all windows under the support and active borders windows.
     window_stack[pos++] = supportWindow->winId();
     for( ClientList::ConstIterator it = stacking_order.fromLast();
          it != stacking_order.end();
          --it )
         {
-#if 0
-        new_stack[ pos++ ] = (*it)->frameId();
-        if( (*it)->belongsToLayer() >= DockLayer )
-            topmenu_space_pos = pos;
-#endif
+
 	t = (*it)->windowType();
 	switch (t)
 		{
@@ -202,15 +209,14 @@ void Workspace::propagateClients( bool propagate_new_clients )
         new_stack[ topmenu_space_pos ] = topmenu_space->winId();
 #endif
             window_stack[ i ] = window_stack[ i - 1 ];
-	window_stack[ topmenu_space_pos ] = topmenu_space->winId();
-        ++pos;
+            window_stack[ topmenu_space_pos ] = topmenu_space->winId();
+            ++pos;
         }
 #if 0
     // TODO isn't it too inefficient to restart always all clients?
     // TODO don't restack not visible windows?
     assert( new_stack[ 0 ] = supportWindow->winId());
-#endif
-#if 0
+
     XRestackWindows(tqt_xdisplay(), new_stack, pos);
     delete [] new_stack;
 #endif
@@ -418,7 +424,7 @@ void Workspace::raiseClientWithinApplication( Client* c )
 
     StackingUpdatesBlocker blocker( this );
     // ignore mainwindows
-    
+
     // first try to put it above the top-most window of the application
     for( ClientList::Iterator it = unconstrained_stacking_order.fromLast();
          it != unconstrained_stacking_order.end();
@@ -590,10 +596,10 @@ ClientList Workspace::constrainedStackingOrder()
         minimum_layer[ (*it)->group() ] = l;
         layer[ l ].append( *it );
         }
-    ClientList stacking;    
+    ClientList stacking;
     for( Layer lay = FirstLayer;
          lay < NumLayers;
-         ++lay )    
+         ++lay )
         stacking += layer[ lay ];
 #if 0
     kdDebug() << "stacking2:" << endl;
@@ -751,7 +757,7 @@ void Client::restackWindow( Window /*above TODO */, int detail, NET::RequestSour
     if( send_event )
         sendSyntheticConfigureNotify();
     }
-    
+
 void Client::setKeepAbove( bool b )
     {
     b = rules()->checkKeepAbove( b );
diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp
index 54ee415e2..d8a22458b 100644
--- a/twin/lib/kcommondecoration.cpp
+++ b/twin/lib/kcommondecoration.cpp
@@ -122,8 +122,8 @@ void KCommonDecoration::init()
 
     resetLayout();
 
-    connect(this, TQT_SIGNAL(keepAboveChanged(bool) ), TQT_SLOT(keepAboveChange(bool) ) );
-    connect(this, TQT_SIGNAL(keepBelowChanged(bool) ), TQT_SLOT(keepBelowChange(bool) ) );
+    connect(this, TQ_SIGNAL(keepAboveChanged(bool) ), TQ_SLOT(keepAboveChange(bool) ) );
+    connect(this, TQ_SIGNAL(keepBelowChanged(bool) ), TQ_SLOT(keepBelowChange(bool) ) );
 
     updateCaption();
 }
@@ -203,7 +203,7 @@ void KCommonDecoration::updateLayout() const
             if (*it) {
                 if (!(*it)->isHidden() ) {
                     moveWidget(x,y, *it);
-                    x += layoutMetric(LM_ButtonWidth, true, ::tqqt_cast<KCommonDecorationButton*>(*it) );
+                    x += layoutMetric(LM_ButtonWidth, true, ::tqt_cast<KCommonDecorationButton*>(*it) );
                     elementLayouted = true;
                 }
             } else {
@@ -226,7 +226,7 @@ void KCommonDecoration::updateLayout() const
             if (*it) {
                 if (!(*it)->isHidden() ) {
                     moveWidget(x,y, *it);
-                    x += layoutMetric(LM_ButtonWidth, true, ::tqqt_cast<KCommonDecorationButton*>(*it) );;
+                    x += layoutMetric(LM_ButtonWidth, true, ::tqt_cast<KCommonDecorationButton*>(*it) );;
                     elementLayouted = true;
                 }
             } else {
@@ -349,9 +349,9 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                           btn = createButton(MenuButton);
                           if (!btn) break;
                           btn->setTipText(i18n("Menu") );
-                          btn->setRealizeButtons(Qt::LeftButton|Qt::RightButton);
-                          connect(btn, TQT_SIGNAL(pressed()), TQT_SLOT(menuButtonPressed()));
-                          connect(btn, TQT_SIGNAL(released()), this, TQT_SLOT(menuButtonReleased()));
+                          btn->setRealizeButtons(TQt::LeftButton|TQt::RightButton);
+                          connect(btn, TQ_SIGNAL(pressed()), TQ_SLOT(menuButtonPressed()));
+                          connect(btn, TQ_SIGNAL(released()), this, TQ_SLOT(menuButtonReleased()));
 
                           m_button[MenuButton] = btn;
                       }
@@ -366,7 +366,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                           btn->setTipText(oad?i18n("Not on all desktops"):i18n("On all desktops") );
                           btn->setToggleButton(true);
                           btn->setOn( oad );
-                          connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(toggleOnAllDesktops()));
+                          connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(toggleOnAllDesktops()));
 
                           m_button[OnAllDesktopsButton] = btn;
                       }
@@ -377,7 +377,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                       btn = createButton(HelpButton);
                       if (!btn) break;
                       btn->setTipText(i18n("Help") );
-                      connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(showContextHelp()));
+                      connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(showContextHelp()));
 
                       m_button[HelpButton] = btn;
                   }
@@ -387,7 +387,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                       btn = createButton(MinButton);
                       if (!btn) break;
                       btn->setTipText(i18n("Minimize") );
-                      connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(minimize()));
+                      connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(minimize()));
 
                       m_button[MinButton] = btn;
                   }
@@ -396,12 +396,12 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                   if ((!m_button[MaxButton]) && isMaximizable()){
                       btn = createButton(MaxButton);
                       if (!btn) break;
-                      btn->setRealizeButtons(Qt::LeftButton|Qt::MidButton|Qt::RightButton);
+                      btn->setRealizeButtons(TQt::LeftButton|TQt::MidButton|TQt::RightButton);
                       const bool max = maximizeMode()==MaximizeFull;
                       btn->setTipText(max?i18n("Restore"):i18n("Maximize") );
                       btn->setToggleButton(true);
                       btn->setOn( max );
-                      connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotMaximize()));
+                      connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotMaximize()));
 
                       m_button[MaxButton] = btn;
                   }
@@ -411,7 +411,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                       btn = createButton(CloseButton);
                       if (!btn) break;
                       btn->setTipText(i18n("Close") );
-                      connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(closeWindow()));
+                      connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(closeWindow()));
 
                       m_button[CloseButton] = btn;
                   }
@@ -424,7 +424,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                       btn->setTipText(above?i18n("Do not keep above others"):i18n("Keep above others") );
                       btn->setToggleButton(true);
                       btn->setOn( above );
-                      connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepAbove()));
+                      connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotKeepAbove()));
 
                       m_button[AboveButton] = btn;
                   }
@@ -437,7 +437,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                       btn->setTipText(below?i18n("Do not keep below others"):i18n("Keep below others") );
                       btn->setToggleButton(true);
                       btn->setOn( below );
-                      connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepBelow()));
+                      connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotKeepBelow()));
 
                       m_button[BelowButton] = btn;
                   }
@@ -450,7 +450,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                       btn->setTipText(shaded?i18n("Unshade"):i18n("Shade") );
                       btn->setToggleButton(true);
                       btn->setOn( shaded );
-                      connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotShade()));
+                      connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotShade()));
 
                       m_button[ShadeButton] = btn;
                   }
@@ -710,7 +710,7 @@ void KCommonDecoration::resizeWidget(int w, int h, TQWidget *widget) const
 
 void KCommonDecoration::mouseDoubleClickEvent(TQMouseEvent *e)
 {
-    if( e->button() != Qt::LeftButton )
+    if( e->button() != TQt::LeftButton )
         return;
 
     int tb = layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeBottom);
@@ -844,24 +844,24 @@ void KCommonDecoration::updateWindowShape()
 
 bool KCommonDecoration::eventFilter( TQObject* o, TQEvent* e )
 {
-    if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()))
+    if( o != widget())
         return false;
     switch( e->type())
     {
         case TQEvent::Resize:
-            resizeEvent(TQT_TQRESIZEEVENT(e) );
+            resizeEvent(static_cast<TQResizeEvent*>(e) );
             return true;
         case TQEvent::Paint:
-            paintEvent(TQT_TQPAINTEVENT( e ));
+            paintEvent(static_cast<TQPaintEvent*>( e ));
             return true;
         case TQEvent::MouseButtonDblClick:
-            mouseDoubleClickEvent(TQT_TQMOUSEEVENT( e ));
+            mouseDoubleClickEvent(static_cast<TQMouseEvent*>( e ));
             return true;
         case TQEvent::MouseButtonPress:
-            processMousePressEvent(TQT_TQMOUSEEVENT( e ));
+            processMousePressEvent(static_cast<TQMouseEvent*>( e ));
             return true;
         case TQEvent::Wheel:
-            wheelEvent(TQT_TQWHEELEVENT( e ));
+            wheelEvent(static_cast<TQWheelEvent*>( e ));
             return true;
         default:
             return false;
@@ -881,7 +881,7 @@ bool KCommonDecoration::isToolWindow() const
 TQRect KCommonDecoration::titleRect() const
 {
     int r_x, r_y, r_x2, r_y2;
-    TQT_TQRECT_OBJECT(widget()->rect()).coords(&r_x, &r_y, &r_x2, &r_y2);
+    widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2);
     const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft);
     const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop);
     const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight);
@@ -900,8 +900,8 @@ KCommonDecorationButton::KCommonDecorationButton(ButtonType type, KCommonDecorat
     : TQButton(parent->widget(), name),
         m_decoration(parent),
         m_type(type),
-        m_realizeButtons(Qt::LeftButton),
-        m_lastMouse(Qt::NoButton),
+        m_realizeButtons(TQt::LeftButton),
+        m_lastMouse(TQt::NoButton),
         m_isLeft(true)
 {
     setCursor(ArrowCursor);
@@ -975,7 +975,7 @@ void KCommonDecorationButton::mousePressEvent(TQMouseEvent* e)
     m_lastMouse = e->button();
     // pass on event after changing button to LeftButton
     TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
-                   (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state());
+                   (e->button()&m_realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state());
 
     TQButton::mousePressEvent(&me);
 }
@@ -985,7 +985,7 @@ void KCommonDecorationButton::mouseReleaseEvent(TQMouseEvent* e)
     m_lastMouse = e->button();
     // pass on event after changing button to LeftButton
     TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
-                   (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state());
+                   (e->button()&m_realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state());
 
     TQButton::mouseReleaseEvent(&me);
 }
diff --git a/twin/lib/kcommondecoration.h b/twin/lib/kcommondecoration.h
index c914628e6..1ef9b1bba 100644
--- a/twin/lib/kcommondecoration.h
+++ b/twin/lib/kcommondecoration.h
@@ -58,7 +58,7 @@ class KCommonDecorationPrivate;
  */
 class KWIN_EXPORT KCommonDecoration : public KDecoration
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         KCommonDecoration(KDecorationBridge* bridge, KDecorationFactory* factory);
@@ -293,7 +293,7 @@ class KWIN_EXPORT KCommonDecorationButton : public TQButton
 {
     friend class KCommonDecoration;
 
-    Q_OBJECT
+    TQ_OBJECT
     
 
     public:
diff --git a/twin/lib/kdecoration.cpp b/twin/lib/kdecoration.cpp
index b2332c514..b9a8e7a36 100644
--- a/twin/lib/kdecoration.cpp
+++ b/twin/lib/kdecoration.cpp
@@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE.
 #include <tqapplication.h>
 #include <tdeglobal.h>
 #include <assert.h>
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <X11/Xlib.h>
 #include <fixx11h.h>
 #endif
@@ -393,9 +393,9 @@ const TQColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active)
     int idx = type + (active ? 0 : NUM_COLORS);
     if(d->cg[idx])
         return(*d->cg[idx]);
-    d->cg[idx] = new TQColorGroup(Qt::black, d->colors[idx], d->colors[idx].light(150),
+    d->cg[idx] = new TQColorGroup(TQt::black, d->colors[idx], d->colors[idx].light(150),
                               d->colors[idx].dark(), d->colors[idx].dark(120),
-                              Qt::black, TQApplication::palette().active().
+                              TQt::black, TQApplication::palette().active().
                               base());
     return(*d->cg[idx]);
 }
@@ -436,8 +436,8 @@ bool KDecorationOptions::moveResizeMaximizedWindows() const
 
 KDecorationDefines::WindowOperation KDecorationOptions::operationMaxButtonClick( TQt::ButtonState button ) const
     {
-    return button == Qt::RightButton? d->OpMaxButtonRightClick : 
-           button == Qt::MidButton?   d->OpMaxButtonMiddleClick :
+    return button == TQt::RightButton? d->OpMaxButtonRightClick : 
+           button == TQt::MidButton?   d->OpMaxButtonMiddleClick :
                                       d->OpMaxButtonLeftClick;
     }
 
diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h
index 693007a03..03e1c863e 100644
--- a/twin/lib/kdecoration.h
+++ b/twin/lib/kdecoration.h
@@ -51,7 +51,7 @@ public:
      * These values represent positions inside an area
      */
     enum Position
-        { // without prefix, they'd conflict with Qt::TopLeft etc. :(
+        { // without prefix, they'd conflict with TQt::TopLeft etc. :(
         PositionCenter         = 0x00,
         PositionLeft           = 0x01,
         PositionRight          = 0x02,
@@ -313,7 +313,7 @@ protected:
 class KWIN_EXPORT KDecoration
     : public TQObject, public KDecorationDefines
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
 	/**
 	 * Constructs a KDecoration object. Both the arguments are passed from
diff --git a/twin/lib/kdecoration_p.h b/twin/lib/kdecoration_p.h
index 2634ea140..b396509b6 100644
--- a/twin/lib/kdecoration_p.h
+++ b/twin/lib/kdecoration_p.h
@@ -103,7 +103,7 @@ class KDecorationBridge : public KDecorationDefines
         // not part of public API
         virtual int currentDesktop() const = 0;
         virtual TQWidget* initialParentWidget() const = 0;
-        virtual Qt::WFlags initialWFlags() const = 0;
+        virtual TQt::WFlags initialWFlags() const = 0;
         virtual void helperShowHide( bool ) = 0;
         virtual void grabXServer( bool grab ) = 0;
     };
diff --git a/twin/lib/kdecoration_plugins_p.cpp b/twin/lib/kdecoration_plugins_p.cpp
index 0e2bc0d04..31de52e6d 100644
--- a/twin/lib/kdecoration_plugins_p.cpp
+++ b/twin/lib/kdecoration_plugins_p.cpp
@@ -42,7 +42,7 @@ KDecorationPlugins::KDecorationPlugins( TDEConfig* cfg )
         fact( NULL ),
         old_library( NULL ),
         old_fact( NULL ),
-        pluginStr( "twin3_undefined " ),
+        pluginStr( "twin_undefined " ),
         config( cfg )
     {
     }
@@ -98,9 +98,6 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr )
         TDEConfigGroupSaver saver( config, "Style" );
         nameStr = config->readEntry("PluginLib", defaultPlugin );
         }
-    // make sure people can switch between HEAD and twin_iii branch
-    if( nameStr.startsWith( "twin_" ))
-	nameStr = "twin3_" + nameStr.mid( 5 );
 
     KLibrary *oldLibrary = library;
     KDecorationFactory* oldFactory = fact;
diff --git a/twin/main.cpp b/twin/main.cpp
index 4fd81d245..61fb82847 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -84,10 +84,6 @@ int x11ErrorHandler(Display *d, XErrorEvent *e)
 Application::Application( )
 : TDEApplication( ), owner( screen_number )
     {
-#ifdef USE_QT4
-    // I'm special...
-    setQuitOnLastWindowClosed(false);
-#endif // USE_QT4
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     if (!config()->isImmutable() && args->isSet("lock"))
         {
@@ -150,7 +146,7 @@ Application::Application( )
             ::exit(1);
             }
         }
-    connect( &owner, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection()));
+    connect( &owner, TQ_SIGNAL( lostOwnership()), TQ_SLOT( lostSelection()));
     
     // if there was already twin running, it saved its configuration after loosing the selection -> reread
     config()->reparseConfiguration();
@@ -198,7 +194,7 @@ Application::~Application()
     delete Workspace::self();
     if( owner.ownerWindow() != None ) // if there was no --replace (no new WM)
         {
-        XSetInputFocus( tqt_xdisplay(), PointerRoot, RevertToPointerRoot, GET_QT_X_TIME() );
+        XSetInputFocus( tqt_xdisplay(), PointerRoot, RevertToPointerRoot, get_tqt_x_time() );
         DCOPRef ref( "kded", "kded" );
         if( !ref.send( "loadModule", TQCString( "kdetrayproxy" )))
             kdWarning( 176 ) << "Loading of kdetrayproxy failed." << endl;
@@ -346,6 +342,8 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
     else
         appname.sprintf("twin-screen-%d", KWinInternal::screen_number);
 
+    TDEGlobal::locale()->insertCatalogue("twin_lib");
+
     DCOPClient* client = a.dcopClient();
     client->registerAs( appname.data(), false);
     client->setDefaultObject( "KWinInterface" );
diff --git a/twin/main.h b/twin/main.h
index d1fb59c6e..f8f27427a 100644
--- a/twin/main.h
+++ b/twin/main.h
@@ -21,7 +21,7 @@ namespace KWinInternal
 
 class Application : public  TDEApplication
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Application();
         ~Application();
diff --git a/twin/manage.cpp b/twin/manage.cpp
index ec6a5d675..8b96c070e 100644
--- a/twin/manage.cpp
+++ b/twin/manage.cpp
@@ -520,9 +520,9 @@ bool Client::manage( Window w, bool isMapped )
 
     if( user_time == CurrentTime || user_time == -1U ) // no known user time, set something old
         {
-        user_time = GET_QT_X_TIME() - 1000000;
+        user_time = get_tqt_x_time() - 1000000;
         if( user_time == CurrentTime || user_time == -1U ) // let's be paranoid
-            user_time = GET_QT_X_TIME() - 1000000 + 10;
+            user_time = get_tqt_x_time() - 1000000 + 10;
         }
 
     updateWorkareaDiffs();
@@ -577,9 +577,9 @@ void Client::embedClient( Window w, const XWindowAttributes &attr )
 		    attr.depth, InputOutput, attr.visual,
 		    CWColormap | CWBackPixmap | CWBorderPixel, &swa );
 
-    XDefineCursor( tqt_xdisplay(), frame, tqarrowCursor.handle());
+    XDefineCursor( tqt_xdisplay(), frame, TQt::arrowCursor.handle());
     // some apps are stupid and don't define their own cursor - set the arrow one for them
-    XDefineCursor( tqt_xdisplay(), wrapper, tqarrowCursor.handle());
+    XDefineCursor( tqt_xdisplay(), wrapper, TQt::arrowCursor.handle());
     XReparentWindow( tqt_xdisplay(), client, wrapper, 0, 0 );
     XSelectInput( tqt_xdisplay(), frame,
             KeyPressMask | KeyReleaseMask |
diff --git a/twin/options.cpp b/twin/options.cpp
index ce35f6d06..46c557b4a 100644
--- a/twin/options.cpp
+++ b/twin/options.cpp
@@ -31,8 +31,8 @@ namespace KWinInternal
 #ifndef KCMRULES
 
 Options::Options()
-    :   electric_borders( 0 ),
-        electric_border_delay(0)
+    :   active_borders( 0 ),
+        active_border_delay(0)
     {
     d = new KDecorationOptionsPrivate;
     d->defaultKWinSettings();
@@ -51,9 +51,11 @@ unsigned long Options::updateSettings()
     changed |= d->updateKWinSettings( config ); // read decoration settings
 
     config->setGroup( "Windows" );
-    moveMode = stringToMoveResizeMode( config->readEntry("MoveMode", "Opaque" ));
-    resizeMode = stringToMoveResizeMode( config->readEntry("ResizeMode", "Opaque" ));
+    moveMode   = stringToMoveResizeMode(config->readEntry("MoveMode",   "Opaque"));
+    resizeMode = stringToMoveResizeMode(config->readEntry("ResizeMode", "Opaque"));
+    tilingMode = stringToMoveResizeMode(config->readEntry("TilingMode", "Opaque"));
     show_geometry_tip = config->readBoolEntry("GeometryTip", false);
+    reset_maximized_window_geometry = config->readBoolEntry("ResetMaximizedWindowGeometry", false);
     tabboxOutline = config->readBoolEntry("TabboxOutline", true);
 
     TQString val;
@@ -125,8 +127,17 @@ unsigned long Options::updateSettings()
     borderSnapZone = config->readNumEntry("BorderSnapZone", 10);
     windowSnapZone = config->readNumEntry("WindowSnapZone", 10);
     snapOnlyWhenOverlapping=config->readBoolEntry("SnapOnlyWhenOverlapping",FALSE);
-    electric_borders = config->readNumEntry("ElectricBorders", 0);
-    electric_border_delay = config->readNumEntry("ElectricBorderDelay", 150);
+
+    // active borders: compatibility with old option names (Electric*)
+    active_borders = config->readNumEntry("ActiveBorders", -1);
+    if (active_borders == -1) {
+        active_borders = config->readNumEntry("ElectricBorders", 0);
+    }
+    active_border_delay = config->readNumEntry("ActiveBorderDelay", -1);
+    if (active_border_delay == -1) {
+        active_border_delay = config->readNumEntry("ElectricBorderDelay", 150);
+    }
+    active_border_distance = config->readNumEntry("ActiveBorderDistance", 10);
 
     OpTitlebarDblClick = windowOperation( config->readEntry("TitlebarDoubleClickCommand", "Shade"), true );
     d->OpMaxButtonLeftClick = windowOperation( config->readEntry("MaximizeButtonLeftClickCommand", "Maximize"), true );
@@ -163,7 +174,7 @@ unsigned long Options::updateSettings()
     CmdWindow1 = mouseCommand(config->readEntry("CommandWindow1","Activate, raise and pass click"), false );
     CmdWindow2 = mouseCommand(config->readEntry("CommandWindow2","Activate and pass click"), false );
     CmdWindow3 = mouseCommand(config->readEntry("CommandWindow3","Activate and pass click"), false );
-    CmdAllModKey = (config->readEntry("CommandAllKey","Alt") == "Meta") ? Qt::Key_Meta : Qt::Key_Alt;
+    CmdAllModKey = (config->readEntry("CommandAllKey","Alt") == "Meta") ? TQt::Key_Meta : TQt::Key_Alt;
     CmdAll1 = mouseCommand(config->readEntry("CommandAll1","Move"), false );
     CmdAll2 = mouseCommand(config->readEntry("CommandAll2","Toggle raise and lower"), false );
     CmdAll3 = mouseCommand(config->readEntry("CommandAll3","Resize"), false );
@@ -308,6 +319,11 @@ bool Options::showGeometryTip()
     return show_geometry_tip;
     }
 
+bool Options::resetMaximizedWindowGeometry()
+    {
+    return reset_maximized_window_geometry;
+    }
+
 TQColor &Options::shadowColour(bool active)
     {
     return active ? shadow_colour : shadow_inactive_colour;
@@ -373,14 +389,19 @@ int Options::shadowYOffset(bool active)
     return active ? shadow_y_offset : shadow_inactive_y_offset;
     }
 
-int Options::electricBorders()
+int Options::activeBorders()
+    {
+    return active_borders;
+    }
+
+int Options::activeBorderDelay()
     {
-    return electric_borders;
+    return active_border_delay;
     }
 
-int Options::electricBorderDelay()
+int Options::borderActivationDistance()
     {
-    return electric_border_delay;
+    return active_border_distance;
     }
 
 bool Options::checkIgnoreFocusStealing( const Client* c )
diff --git a/twin/options.h b/twin/options.h
index 113e6b9e6..41d1340a7 100644
--- a/twin/options.h
+++ b/twin/options.h
@@ -147,8 +147,9 @@ class Options : public KDecorationOptions
          */
         enum MoveResizeMode { Transparent, Opaque };
 
-        MoveResizeMode resizeMode;
         MoveResizeMode moveMode;
+        MoveResizeMode resizeMode;
+        MoveResizeMode tilingMode;
 
         static MoveResizeMode stringToMoveResizeMode( const TQString& s );
         static const char* moveResizeModeToString( MoveResizeMode mode );
@@ -269,6 +270,13 @@ class Options : public KDecorationOptions
         bool showGeometryTip();
 
         /**
+        * @returns true if a maximized or tiled window should be reset to its original
+        *          size when dragging it.
+        * @since R14.1.1
+        */
+        bool resetMaximizedWindowGeometry();
+
+        /**
         * @returns A TQColor representing the colour that window drop shadows should
         *          be.
         */
@@ -307,18 +315,24 @@ class Options : public KDecorationOptions
         */
         int shadowYOffset(bool active=true);
 
-        enum { ElectricDisabled = 0, ElectricMoveOnly = 1, ElectricAlways = 2 };
+        enum { ActiveDisabled = 0,
+               ActiveSwitchOnMove = 1,
+               ActiveSwitchAlways = 2,
+               ActiveTileOnly = 3,
+               ActiveTileMaximize = 4 };
         /**
-        * @returns true if electric borders are enabled. With electric borders
+        * @returns true if active borders are enabled. With active borders
         * you can change desktop by moving the mouse pointer towards the edge
         * of the screen
         */
-        int electricBorders();
+        int activeBorders();
+
+        int borderActivationDistance();
 
         /**
-        * @returns the activation delay for electric borders in milliseconds.
+        * @returns the activation delay for active borders in milliseconds.
         */
-        int electricBorderDelay();
+        int activeBorderDelay();
 
         bool topMenuEnabled() const { return topmenus; }
         bool desktopTopMenu() const { return desktop_topmenu; }
@@ -373,9 +387,11 @@ class Options : public KDecorationOptions
         bool CmdAllRevWheel;
         uint CmdAllModKey;
 
-        int electric_borders;
-        int electric_border_delay;
+        int active_borders;
+        int active_border_delay;
+        int active_border_distance;
         bool show_geometry_tip;
+        bool reset_maximized_window_geometry;
         bool topmenus;
         bool desktop_topmenu;
         TQColor shadow_colour;
diff --git a/twin/plugins.cpp b/twin/plugins.cpp
index 5f20b7018..6df451dc3 100644
--- a/twin/plugins.cpp
+++ b/twin/plugins.cpp
@@ -23,14 +23,14 @@ PluginMgr::PluginMgr()
     : KDecorationPlugins( TDEGlobal::config())
     {
     defaultPlugin = (TQPixmap::defaultDepth() > 8) ?
-            "twin3_plastik" : "twin3_quartz";
+            "twin_plastik" : "twin_quartz";
     loadPlugin( "" ); // load the plugin specified in cfg file
     }
 
 void PluginMgr::error( const TQString &error_msg )
     {
     tqWarning( "%s", (i18n("TWin: ") + error_msg +
-                    i18n("\nTWin will now exit...")).local8Bit().data() );
+                    i18n("\nTWin will now exit…")).local8Bit().data() );
     exit(1);
     }
 
diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp
index 740de7cb6..d86037a84 100644
--- a/twin/popupinfo.cpp
+++ b/twin/popupinfo.cpp
@@ -39,7 +39,7 @@ PopupInfo::PopupInfo( Workspace* ws, const char *name )
     m_shown = false;
     reset();
     reconfigure();
-    connect(&m_delayedHideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hide()));
+    connect(&m_delayedHideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hide()));
 
     TQFont f = font();
     f.setBold( TRUE );
@@ -74,7 +74,7 @@ void PopupInfo::reset()
 void PopupInfo::paintEvent( TQPaintEvent* )
     {
     TQPainter p( this );
-    style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ),
+    style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ),
           colorGroup(), TQStyle::Style_Default );
     paintContents();
     }
@@ -92,9 +92,9 @@ void PopupInfo::paintContents()
     p.fillRect( r, colorGroup().brush( TQColorGroup::Background ) );
 
     /*
-    p.setPen(Qt::white);
+    p.setPen(TQt::white);
     p.drawText( r, AlignCenter, m_infoString );
-    p.setPen(Qt::black);
+    p.setPen(TQt::black);
     r.moveBy( -1, -1 );
     p.drawText( r, AlignCenter, m_infoString );
     r.moveBy( -1, 0 );
diff --git a/twin/popupinfo.h b/twin/popupinfo.h
index 30ff76b30..40bdfe5c8 100644
--- a/twin/popupinfo.h
+++ b/twin/popupinfo.h
@@ -22,7 +22,7 @@ class Workspace;
 
 class PopupInfo : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         PopupInfo( Workspace* ws, const char *name=0 );
         ~PopupInfo();
diff --git a/twin/rules.cpp b/twin/rules.cpp
index 63fc0e37b..7bd2cd469 100644
--- a/twin/rules.cpp
+++ b/twin/rules.cpp
@@ -1008,7 +1008,7 @@ void Workspace::gotTemporaryRulesMessage( const TQString& message )
     Rules* rule = new Rules( message, true );
     rules.prepend( rule ); // highest priority first
     if( !was_temporary )
-        TQTimer::singleShot( 60000, this, TQT_SLOT( cleanupTemporaryRules()));
+        TQTimer::singleShot( 60000, this, TQ_SLOT( cleanupTemporaryRules()));
     }
 
 void Workspace::cleanupTemporaryRules()
@@ -1028,7 +1028,7 @@ void Workspace::cleanupTemporaryRules()
             }
         }
     if( has_temporary )
-        TQTimer::singleShot( 60000, this, TQT_SLOT( cleanupTemporaryRules()));
+        TQTimer::singleShot( 60000, this, TQ_SLOT( cleanupTemporaryRules()));
     }
 
 void Workspace::discardUsedWindowRules( Client* c, bool withdrawn )
diff --git a/twin/sm.cpp b/twin/sm.cpp
index 53d2a5f29..00cdb6a22 100644
--- a/twin/sm.cpp
+++ b/twin/sm.cpp
@@ -416,8 +416,8 @@ SessionSaveDoneHelper::SessionSaveDoneHelper()
     SmProp* p[ 5 ] = { &props[ 0 ], &props[ 1 ], &props[ 2 ], &props[ 3 ], &props[ 4 ] };
     SmcSetProperties( conn, 5, p );
     notifier = new TQSocketNotifier( IceConnectionNumber( SmcGetIceConnection( conn )),
-        TQSocketNotifier::Read, TQT_TQOBJECT(this) );
-    connect( notifier, TQT_SIGNAL( activated( int )), TQT_SLOT( processData()));
+        TQSocketNotifier::Read, this );
+    connect( notifier, TQ_SIGNAL( activated( int )), TQ_SLOT( processData()));
     }
 
 SessionSaveDoneHelper::~SessionSaveDoneHelper()
diff --git a/twin/sm.h b/twin/sm.h
index 66cca9396..951db4e32 100644
--- a/twin/sm.h
+++ b/twin/sm.h
@@ -59,9 +59,9 @@ enum SMSavePhase
     };
     
 class SessionSaveDoneHelper
-    : public QObject
+    : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         SessionSaveDoneHelper();
         virtual ~SessionSaveDoneHelper();
diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp
index d88146f22..feca2d77d 100644
--- a/twin/tabbox.cpp
+++ b/twin/tabbox.cpp
@@ -53,7 +53,7 @@ TabBox::TabBox( Workspace *ws, const char *name )
     m = DesktopMode; // init variables
     reconfigure();
     reset();
-    connect(&delayedShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(show()));
+    connect(&delayedShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(show()));
     
     XSetWindowAttributes attr;
     attr.override_redirect = 1;
@@ -474,7 +474,7 @@ void TabBox::drawContents( TQPainter * )
                     p.setPen(colorGroup().text());
 
                   p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight,
-                              Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine, s);
+                              TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, s);
 
                   y += lineHeight;
                   }
@@ -521,7 +521,7 @@ void TabBox::drawContents( TQPainter * )
             // draw desktop-number
             p.setFont(f);
             TQString num = TQString::number(iDesktop);
-            p.drawText(x+5, y+2, iconWidth, iconHeight, Qt::AlignCenter, num);
+            p.drawText(x+5, y+2, iconWidth, iconHeight, TQt::AlignCenter, num);
 
             p.restore();
 
@@ -532,7 +532,7 @@ void TabBox::drawContents( TQPainter * )
               p.setPen(colorGroup().text());
 
             p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight,
-                       Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine,
+                       TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
                        workspace()->desktopName(iDesktop));
 
             // show mini icons from that desktop aligned to each other
@@ -708,7 +708,7 @@ void TabBox::delayedShow()
 
 void TabBox::handleMouseEvent( XEvent* e )
     {
-    XAllowEvents( tqt_xdisplay(), AsyncPointer, GET_QT_X_TIME() );
+    XAllowEvents( tqt_xdisplay(), AsyncPointer, get_tqt_x_time() );
     if( e->type != ButtonPress )
         return;
     TQPoint pos( e->xbutton.x_root, e->xbutton.y_root );
@@ -866,7 +866,7 @@ void Workspace::slotWalkThroughWindows()
         return;
     if ( options->altTabStyle == Options::CDE || !options->focusPolicyIsReasonable())
         {
-        //XUngrabKeyboard(tqt_xdisplay(), GET_QT_X_TIME()); // need that because of accelerator raw mode
+        //XUngrabKeyboard(tqt_xdisplay(), get_tqt_x_time()); // need that because of accelerator raw mode
         // CDE style raise / lower
         CDEWalkThroughWindows( true );
         }
@@ -1180,7 +1180,7 @@ void Workspace::tabBoxKeyPress( const KKeyNative& keyX )
     if (control_grab || tab_grab)
         {
         uint keyQt = keyX.keyCodeQt();
-        if ( ((keyQt & 0xffff) == Qt::Key_Escape)
+        if ( ((keyQt & 0xffff) == TQt::Key_Escape)
             && !(forward || backward) )
             { // if Escape is part of the shortcut, don't cancel
             closeTabBox();
@@ -1360,7 +1360,7 @@ Client* Workspace::previousStaticClient( Client* c ) const
 bool Workspace::establishTabBoxGrab()
     {
     if( XGrabKeyboard( tqt_xdisplay(), root, FALSE,
-        GrabModeAsync, GrabModeAsync, GET_QT_X_TIME()) != GrabSuccess )
+        GrabModeAsync, GrabModeAsync, get_tqt_x_time()) != GrabSuccess )
         return false;
     // Don't try to establish a global mouse grab using XGrabPointer, as that would prevent
     // using Alt+Tab while DND (#44972). However force passive grabs on all windows
@@ -1376,7 +1376,7 @@ bool Workspace::establishTabBoxGrab()
 
 void Workspace::removeTabBoxGrab()
     {
-    XUngrabKeyboard(tqt_xdisplay(), GET_QT_X_TIME());
+    XUngrabKeyboard(tqt_xdisplay(), get_tqt_x_time());
     assert( forced_global_mouse_grab );
     forced_global_mouse_grab = false;
     if( active_client != NULL )
diff --git a/twin/tabbox.h b/twin/tabbox.h
index f9e3a8e0f..3fd419ad7 100644
--- a/twin/tabbox.h
+++ b/twin/tabbox.h
@@ -27,7 +27,7 @@ class Client;
 
 class TabBox : public TQFrame
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         TabBox( Workspace *ws, const char *name=0 );
         ~TabBox();
diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp
index 341b7ce44..d4930ee84 100644
--- a/twin/tools/decobenchmark/main.cpp
+++ b/twin/tools/decobenchmark/main.cpp
@@ -39,7 +39,7 @@
 
 static TDECmdLineOptions options[] =
 {
-	{ "+decoration", "Decoration library to use, such as twin3_plastik.", 0 },
+	{ "+decoration", "Decoration library to use, such as twin_plastik.", 0 },
 	{ "+tests", "Which test should be executed ('all', 'repaint', 'caption', 'resize', 'recreation')", 0 },
 	{ "+repetitions", "Number of test repetitions.", 0 },
 	{ 0, 0, 0 }
@@ -130,7 +130,7 @@ int main(int argc, char** argv)
 
 	DecoBenchApplication app(library, test, count);
 
-	TQTimer::singleShot(0, &app, TQT_SLOT(executeTest()));
+	TQTimer::singleShot(0, &app, TQ_SLOT(executeTest()));
 	app.exec();
 }
 #include "main.moc"
diff --git a/twin/tools/decobenchmark/main.h b/twin/tools/decobenchmark/main.h
index 41f4ff691..3745697f0 100644
--- a/twin/tools/decobenchmark/main.h
+++ b/twin/tools/decobenchmark/main.h
@@ -31,7 +31,7 @@ enum Tests {
 
 class DecoBenchApplication : public TDEApplication
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	DecoBenchApplication(const TQString &library, Tests tests, int count);
 	~DecoBenchApplication();
diff --git a/twin/tools/decobenchmark/preview.cpp b/twin/tools/decobenchmark/preview.cpp
index 6034a613e..c706eb5df 100644
--- a/twin/tools/decobenchmark/preview.cpp
+++ b/twin/tools/decobenchmark/preview.cpp
@@ -188,7 +188,7 @@ TQWidget* KDecorationPreviewBridge::initialParentWidget() const
     return preview;
     }
 
-Qt::WFlags KDecorationPreviewBridge::initialWFlags() const
+TQt::WFlags KDecorationPreviewBridge::initialWFlags() const
     {
     return 0;
     }
diff --git a/twin/tools/decobenchmark/preview.h b/twin/tools/decobenchmark/preview.h
index 2138c51b7..38cd08b19 100644
--- a/twin/tools/decobenchmark/preview.h
+++ b/twin/tools/decobenchmark/preview.h
@@ -30,7 +30,7 @@ class KDecorationPreviewBridge;
 class KDecorationPreviewOptions;
 
 class KDecorationPreview
-    : public QWidget
+    : public TQWidget
     {
     public:
         KDecorationPreview( KDecorationPlugins* plugin, TQWidget* parent = NULL, const char* name = NULL );
@@ -101,7 +101,7 @@ class KDecorationPreviewBridge
         virtual void setKeepBelow( bool );
         virtual int currentDesktop() const;
         virtual TQWidget* initialParentWidget() const;
-        virtual Qt::WFlags initialWFlags() const;
+        virtual TQt::WFlags initialWFlags() const;
         virtual void helperShowHide( bool show );
         virtual void grabXServer( bool grab );
     private:
diff --git a/twin/twinbindings.cpp b/twin/twinbindings.cpp
index 5e468d34b..7e918f49f 100644
--- a/twin/twinbindings.cpp
+++ b/twin/twinbindings.cpp
@@ -1,8 +1,8 @@
 #ifndef NOSLOTS
 # define DEF2( name, descr, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(descr), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(descr), TQString::null, key3, key4, this, TQ_SLOT(fnSlot) )
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQ_SLOT(fnSlot) )
 #else
 # define DEF2( name, descr, key3, key4, fnSlot ) \
    keys->insert( name, i18n(descr), TQString::null, key3, key4 )
@@ -18,29 +18,29 @@
 	keys->insert( "Program:twin", i18n("System") );
 
 	keys->insert( "Group:Navigation", i18n("Navigation") );
-	DEF( I18N_NOOP("Walk Through Windows"),                ALT+Qt::Key_Tab, ALT+Qt::Key_Tab, slotWalkThroughWindows() );
-	DEF( I18N_NOOP("Walk Through Windows (Reverse)"),      ALT+SHIFT+Qt::Key_Tab, ALT+SHIFT+Qt::Key_Tab, slotWalkBackThroughWindows() );
-  DEF( I18N_NOOP("Walk Through Windows of Same Application"),                ALT+Qt::Key_QuoteLeft, ALT+Qt::Key_QuoteLeft, slotWalkThroughApps() );
-  DEF( I18N_NOOP("Walk Through Windows of Same Application (Reverse)"),      ALT+Qt::Key_AsciiTilde, ALT+Qt::Key_AsciiTilde, slotWalkBackThroughApps() );
-	DEF( I18N_NOOP("Walk Through Desktops"),               0, WIN+Qt::Key_Tab, slotWalkThroughDesktops() );
-	DEF( I18N_NOOP("Walk Through Desktops (Reverse)"),     0, WIN+SHIFT+Qt::Key_Tab, slotWalkBackThroughDesktops() );
+	DEF( I18N_NOOP("Walk Through Windows"),                ALT+TQt::Key_Tab, ALT+TQt::Key_Tab, slotWalkThroughWindows() );
+	DEF( I18N_NOOP("Walk Through Windows (Reverse)"),      ALT+SHIFT+TQt::Key_Tab, ALT+SHIFT+TQt::Key_Tab, slotWalkBackThroughWindows() );
+  DEF( I18N_NOOP("Walk Through Windows of Same Application"),                ALT+TQt::Key_QuoteLeft, ALT+TQt::Key_QuoteLeft, slotWalkThroughApps() );
+  DEF( I18N_NOOP("Walk Through Windows of Same Application (Reverse)"),      ALT+TQt::Key_AsciiTilde, ALT+TQt::Key_AsciiTilde, slotWalkBackThroughApps() );
+	DEF( I18N_NOOP("Walk Through Desktops"),               0, WIN+TQt::Key_Tab, slotWalkThroughDesktops() );
+	DEF( I18N_NOOP("Walk Through Desktops (Reverse)"),     0, WIN+SHIFT+TQt::Key_Tab, slotWalkBackThroughDesktops() );
 	DEF( I18N_NOOP("Walk Through Desktop List"),           0, 0, slotWalkThroughDesktopList() );
 	DEF( I18N_NOOP("Walk Through Desktop List (Reverse)"), 0, 0, slotWalkBackThroughDesktopList() );
 
 	keys->insert( "Group:Windows", i18n("Windows") );
-	DEF( I18N_NOOP("Window Operations Menu"),              ALT+Qt::Key_F3, ALT+Qt::Key_Menu, slotWindowOperations() );
+	DEF( I18N_NOOP("Window Operations Menu"),              ALT+TQt::Key_F3, ALT+TQt::Key_Menu, slotWindowOperations() );
 	DEF2( "Window Close", I18N_NOOP("Close Window"),
-            ALT+Qt::Key_F4, "Alt+Escape;Alt+F4", slotWindowClose() );
+            ALT+TQt::Key_F4, "Alt+Escape;Alt+F4", slotWindowClose() );
 	DEF2( "Window Maximize", I18N_NOOP("Maximize Window"),
-            0, WIN+Qt::Key_Plus, slotWindowMaximize() );
+            0, WIN+TQt::Key_Plus, slotWindowMaximize() );
 	DEF2( "Window Maximize Vertical", I18N_NOOP("Maximize Window Vertically"),
-            0, WIN+Qt::Key_Bar, slotWindowMaximizeVertical() );
+            0, WIN+TQt::Key_Bar, slotWindowMaximizeVertical() );
 	DEF2( "Window Maximize Horizontal", I18N_NOOP("Maximize Window Horizontally"),
-            0, WIN+Qt::Key_Equal, slotWindowMaximizeHorizontal() );
+            0, WIN+TQt::Key_Equal, slotWindowMaximizeHorizontal() );
 	DEF2( "Window Minimize", I18N_NOOP("Minimize Window"),
-            0, WIN+Qt::Key_Minus, slotWindowMinimize() );
+            0, WIN+TQt::Key_Minus, slotWindowMinimize() );
 	DEF2( "Window Shade", I18N_NOOP("Shade Window"),
-            0, WIN+Qt::Key_Underscore, slotWindowShade() );
+            0, WIN+TQt::Key_Underscore, slotWindowShade() );
 	DEF2( "Window Move", I18N_NOOP("Move Window"),
             0, 0, slotWindowMove() );
 	DEF2( "Window Resize", I18N_NOOP("Resize Window"),
@@ -58,7 +58,7 @@
             0, 0, slotWindowAbove() );
         DEF2( "Window Below Other Windows", I18N_NOOP("Keep Window Below Others"),
             0, 0, slotWindowBelow() );
-        DEF( I18N_NOOP("Activate Window Demanding Attention"), CTRL+ALT+Qt::Key_A, 0, slotActivateAttentionWindow());
+        DEF( I18N_NOOP("Activate Window Demanding Attention"), CTRL+ALT+TQt::Key_A, 0, slotActivateAttentionWindow());
         DEF( I18N_NOOP("Setup Window Shortcut"), 0, 0, slotSetupWindowShortcut());
         DEF2( "Window Pack Right", I18N_NOOP("Pack Window to the Right"),
             0, 0, slotWindowPackRight() );
@@ -80,16 +80,16 @@
 	keys->insert( "Group:Window Desktop", i18n("Window & Desktop") );
         DEF2( "Window On All Desktops", I18N_NOOP("Keep Window on All Desktops"),
             0, 0, slotWindowOnAllDesktops() );
-	DEF( I18N_NOOP("Window to Desktop 1"),                 0, WIN+ALT+Qt::Key_F1, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 2"),                 0, WIN+ALT+Qt::Key_F2, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 3"),                 0, WIN+ALT+Qt::Key_F3, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 4"),                 0, WIN+ALT+Qt::Key_F4, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 5"),                 0, WIN+ALT+Qt::Key_F5, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 6"),                 0, WIN+ALT+Qt::Key_F6, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 7"),                 0, WIN+ALT+Qt::Key_F7, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 8"),                 0, WIN+ALT+Qt::Key_F8, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 9"),                 0, WIN+ALT+Qt::Key_F9, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 10"),                0, WIN+ALT+Qt::Key_F10, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 1"),                 0, WIN+ALT+TQt::Key_F1, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 2"),                 0, WIN+ALT+TQt::Key_F2, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 3"),                 0, WIN+ALT+TQt::Key_F3, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 4"),                 0, WIN+ALT+TQt::Key_F4, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 5"),                 0, WIN+ALT+TQt::Key_F5, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 6"),                 0, WIN+ALT+TQt::Key_F6, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 7"),                 0, WIN+ALT+TQt::Key_F7, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 8"),                 0, WIN+ALT+TQt::Key_F8, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 9"),                 0, WIN+ALT+TQt::Key_F9, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 10"),                0, WIN+ALT+TQt::Key_F10, slotWindowToDesktop(int) );
 	DEF( I18N_NOOP("Window to Desktop 11"),                0, 0, slotWindowToDesktop(int) );
 	DEF( I18N_NOOP("Window to Desktop 12"),                0, 0, slotWindowToDesktop(int) );
 	DEF( I18N_NOOP("Window to Desktop 13"),                0, 0, slotWindowToDesktop(int) );
@@ -117,26 +117,26 @@
 	DEF( I18N_NOOP("Window to Next Screen"),               0, 0, slotWindowToNextScreen() );
 
 	keys->insert( "Group:Desktop Switching", i18n("Desktop Switching") );
-	DEF( I18N_NOOP("Switch to Desktop 1"),  CTRL+Qt::Key_F1, WIN+Qt::Key_F1, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 2"),  CTRL+Qt::Key_F2, WIN+Qt::Key_F2, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 3"),  CTRL+Qt::Key_F3, WIN+Qt::Key_F3, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 4"),  CTRL+Qt::Key_F4, WIN+Qt::Key_F4, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 5"),  CTRL+Qt::Key_F5, WIN+Qt::Key_F5, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 6"),  CTRL+Qt::Key_F6, WIN+Qt::Key_F6, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 7"),  CTRL+Qt::Key_F7, WIN+Qt::Key_F7, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 8"),  CTRL+Qt::Key_F8, WIN+Qt::Key_F8, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 9"),  CTRL+Qt::Key_F9, WIN+Qt::Key_F9, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 10"),  CTRL+Qt::Key_F10, WIN+Qt::Key_F10, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 11"),  CTRL+Qt::Key_F11, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 12"),  CTRL+Qt::Key_F12, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 13"),  CTRL+SHIFT+Qt::Key_F1, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 14"),  CTRL+SHIFT+Qt::Key_F2, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 15"),  CTRL+SHIFT+Qt::Key_F3, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 16"),  CTRL+SHIFT+Qt::Key_F4, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 17"),  CTRL+SHIFT+Qt::Key_F5, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 18"),  CTRL+SHIFT+Qt::Key_F6, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 19"),  CTRL+SHIFT+Qt::Key_F7, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 20"),  CTRL+SHIFT+Qt::Key_F8, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 1"),  CTRL+TQt::Key_F1, WIN+TQt::Key_F1, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 2"),  CTRL+TQt::Key_F2, WIN+TQt::Key_F2, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 3"),  CTRL+TQt::Key_F3, WIN+TQt::Key_F3, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 4"),  CTRL+TQt::Key_F4, WIN+TQt::Key_F4, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 5"),  CTRL+TQt::Key_F5, WIN+TQt::Key_F5, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 6"),  CTRL+TQt::Key_F6, WIN+TQt::Key_F6, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 7"),  CTRL+TQt::Key_F7, WIN+TQt::Key_F7, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 8"),  CTRL+TQt::Key_F8, WIN+TQt::Key_F8, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 9"),  CTRL+TQt::Key_F9, WIN+TQt::Key_F9, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 10"),  CTRL+TQt::Key_F10, WIN+TQt::Key_F10, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 11"),  CTRL+TQt::Key_F11, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 12"),  CTRL+TQt::Key_F12, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 13"),  CTRL+SHIFT+TQt::Key_F1, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 14"),  CTRL+SHIFT+TQt::Key_F2, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 15"),  CTRL+SHIFT+TQt::Key_F3, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 16"),  CTRL+SHIFT+TQt::Key_F4, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 17"),  CTRL+SHIFT+TQt::Key_F5, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 18"),  CTRL+SHIFT+TQt::Key_F6, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 19"),  CTRL+SHIFT+TQt::Key_F7, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 20"),  CTRL+SHIFT+TQt::Key_F8, 0, slotSwitchToDesktop(int) );
 	DEF( I18N_NOOP("Switch to Next Desktop"),              0, 0, slotSwitchDesktopNext() );
 	DEF( I18N_NOOP("Switch to Previous Desktop"),          0, 0, slotSwitchDesktopPrevious() );
 	DEF( I18N_NOOP("Switch One Desktop to the Right"),     0, 0, slotSwitchDesktopRight() );
@@ -154,10 +154,10 @@
 	DEF( I18N_NOOP("Switch to Next Screen"),               0, 0, slotSwitchToNextScreen() );
 
 	keys->insert( "Group:Miscellaneous", i18n("Miscellaneous") );
-	DEF( I18N_NOOP("Mouse Emulation"),                     ALT+Qt::Key_F12, 0, slotMouseEmulation() );
-	DEF( I18N_NOOP("Kill Window"),                         ALT+CTRL+Qt::Key_Escape, WIN+CTRL+Qt::Key_Delete, slotKillWindow() );
-	DEF( I18N_NOOP("Window Screenshot"),                   ALT+Qt::Key_Print, ALT+Qt::Key_Print, slotGrabWindow() );
-	DEF( I18N_NOOP("Desktop Screenshot"),                  CTRL+Qt::Key_Print, WIN+Qt::Key_Print, slotGrabDesktop() );
+	DEF( I18N_NOOP("Mouse Emulation"),                     ALT+TQt::Key_F12, 0, slotMouseEmulation() );
+	DEF( I18N_NOOP("Kill Window"),                         ALT+CTRL+TQt::Key_Escape, WIN+CTRL+TQt::Key_Delete, slotKillWindow() );
+	DEF( I18N_NOOP("Window Screenshot"),                   ALT+TQt::Key_Print, ALT+TQt::Key_Print, slotGrabWindow() );
+	DEF( I18N_NOOP("Desktop Screenshot"),                  CTRL+TQt::Key_Print, WIN+TQt::Key_Print, slotGrabDesktop() );
 #ifdef IN_KWIN
         {
         TDEGlobalAccel* keys = disable_shortcuts_keys;
@@ -169,28 +169,28 @@
 
 /*This belongs in taskbar rather than here, so it'll have to wait until after 2.2 is done.
   -- ellis
-DEF( I18N_NOOP("Switch to Window 1", WIN+Qt::Key_1"));
-DEF( I18N_NOOP("Switch to Window 2", WIN+Qt::Key_2"));
-DEF( I18N_NOOP("Switch to Window 3", WIN+Qt::Key_3"));
-DEF( I18N_NOOP("Switch to Window 4", WIN+Qt::Key_4"));
-DEF( I18N_NOOP("Switch to Window 5", WIN+Qt::Key_5"));
-DEF( I18N_NOOP("Switch to Window 6", WIN+Qt::Key_6"));
-DEF( I18N_NOOP("Switch to Window 7", WIN+Qt::Key_7"));
-DEF( I18N_NOOP("Switch to Window 8", WIN+Qt::Key_8"));
-DEF( I18N_NOOP("Switch to Window 9", WIN+Qt::Key_9"));
+DEF( I18N_NOOP("Switch to Window 1", WIN+TQt::Key_1"));
+DEF( I18N_NOOP("Switch to Window 2", WIN+TQt::Key_2"));
+DEF( I18N_NOOP("Switch to Window 3", WIN+TQt::Key_3"));
+DEF( I18N_NOOP("Switch to Window 4", WIN+TQt::Key_4"));
+DEF( I18N_NOOP("Switch to Window 5", WIN+TQt::Key_5"));
+DEF( I18N_NOOP("Switch to Window 6", WIN+TQt::Key_6"));
+DEF( I18N_NOOP("Switch to Window 7", WIN+TQt::Key_7"));
+DEF( I18N_NOOP("Switch to Window 8", WIN+TQt::Key_8"));
+DEF( I18N_NOOP("Switch to Window 9", WIN+TQt::Key_9"));
 
 #ifdef WITH_LABELS
 DEF( I18N_NOOP("Window & Taskbar"Group:Window Desktop", 0);
 #endif
-DEF( I18N_NOOP("Window to Taskbar Position 1", WIN+Qt::Key_Alt+1"));
-DEF( I18N_NOOP("Window to Taskbar Position 2", WIN+Qt::Key_Alt+2"));
-DEF( I18N_NOOP("Window to Taskbar Position 3", WIN+Qt::Key_Alt+3"));
-DEF( I18N_NOOP("Window to Taskbar Position 4", WIN+Qt::Key_Alt+4"));
-DEF( I18N_NOOP("Window to Taskbar Position 5", WIN+Qt::Key_Alt+5"));
-DEF( I18N_NOOP("Window to Taskbar Position 6", WIN+Qt::Key_Alt+6"));
-DEF( I18N_NOOP("Window to Taskbar Position 7", WIN+Qt::Key_Alt+7"));
-DEF( I18N_NOOP("Window to Taskbar Position 8", WIN+Qt::Key_Alt+8"));
-DEF( I18N_NOOP("Window to Taskbar Position 9", WIN+Qt::Key_Alt+9"));
+DEF( I18N_NOOP("Window to Taskbar Position 1", WIN+TQt::Key_Alt+1"));
+DEF( I18N_NOOP("Window to Taskbar Position 2", WIN+TQt::Key_Alt+2"));
+DEF( I18N_NOOP("Window to Taskbar Position 3", WIN+TQt::Key_Alt+3"));
+DEF( I18N_NOOP("Window to Taskbar Position 4", WIN+TQt::Key_Alt+4"));
+DEF( I18N_NOOP("Window to Taskbar Position 5", WIN+TQt::Key_Alt+5"));
+DEF( I18N_NOOP("Window to Taskbar Position 6", WIN+TQt::Key_Alt+6"));
+DEF( I18N_NOOP("Window to Taskbar Position 7", WIN+TQt::Key_Alt+7"));
+DEF( I18N_NOOP("Window to Taskbar Position 8", WIN+TQt::Key_Alt+8"));
+DEF( I18N_NOOP("Window to Taskbar Position 9", WIN+TQt::Key_Alt+9"));
 */
 
 #undef DEF
diff --git a/twin/useractions.cpp b/twin/useractions.cpp
index 85e76e4cd..567255fa5 100644
--- a/twin/useractions.cpp
+++ b/twin/useractions.cpp
@@ -51,13 +51,13 @@ TQPopupMenu* Workspace::clientPopup()
         popup = new TQPopupMenu;
         popup->setCheckable( TRUE );
         popup->setFont(TDEGlobalSettings::menuFont());
-        connect( popup, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( clientPopupAboutToShow() ) );
-        connect( popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( clientPopupActivated(int) ) );
+        connect( popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( clientPopupAboutToShow() ) );
+        connect( popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( clientPopupActivated(int) ) );
       
         advanced_popup = new TQPopupMenu( popup );
         advanced_popup->setCheckable( TRUE );
         advanced_popup->setFont(TDEGlobalSettings::menuFont());
-        connect( advanced_popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( clientPopupActivated(int) ) );
+        connect( advanced_popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( clientPopupActivated(int) ) );
         advanced_popup->insertItem( SmallIconSet( "go-up" ),
             i18n("Keep &Above Others")+'\t'+keys->shortcut("Window Above Other Windows").seq(0).toString(), Options::KeepAboveOp );
         advanced_popup->insertItem( SmallIconSet( "go-down" ),
@@ -67,13 +67,13 @@ TQPopupMenu* Workspace::clientPopup()
         advanced_popup->insertItem( i18n("&No Border")+'\t'+keys->shortcut("Window No Border").seq(0).toString(), Options::NoBorderOp );
 	advanced_popup->insertItem( i18n("Shad&ow"), Options::ShadowOp );
         advanced_popup->insertItem( SmallIconSet("key_bindings"),
-            i18n("Window &Shortcut...")+'\t'+keys->shortcut("Setup Window Shortcut").seq(0).toString(), Options::SetupWindowShortcutOp );
+            i18n("Window &Shortcut…")+'\t'+keys->shortcut("Setup Window Shortcut").seq(0).toString(), Options::SetupWindowShortcutOp );
         advanced_popup->insertSeparator();
         advanced_popup->insertItem( SmallIconSet( "suspend" ), i18n("&Suspend Application"), Options::SuspendWindowOp );
         advanced_popup->insertItem( SmallIconSet( "application-x-executable" ), i18n("&Resume Application"), Options::ResumeWindowOp );
         advanced_popup->insertSeparator();
-        advanced_popup->insertItem( SmallIconSet( "wizard" ), i18n("&Special Window Settings..."), Options::WindowRulesOp );
-        advanced_popup->insertItem( SmallIconSet( "wizard" ), i18n("&Special Application Settings..."), Options::ApplicationRulesOp );
+        advanced_popup->insertItem( SmallIconSet( "wizard" ), i18n("&Special Window Settings…"), Options::WindowRulesOp );
+        advanced_popup->insertItem( SmallIconSet( "wizard" ), i18n("&Special Application Settings…"), Options::ApplicationRulesOp );
 
         popup->insertItem(i18n("Ad&vanced"), advanced_popup );
         desk_popup_index = popup->count();
@@ -83,13 +83,13 @@ TQPopupMenu* Workspace::clientPopup()
             TQVBox *transBox = new TQVBox(trans_popup);
             transButton = new TQPushButton(transBox, "transButton");
             TQToolTip::add(transButton, i18n("Reset opacity to default value"));
-            transSlider = new TQSlider(0, 100, 1, 100, Qt::Horizontal, transBox, "transSlider");
+            transSlider = new TQSlider(0, 100, 1, 100, TQt::Horizontal, transBox, "transSlider");
             TQToolTip::add(transSlider, i18n("Slide this to set the window's opacity"));
-            connect(transButton, TQT_SIGNAL(clicked()), TQT_SLOT(resetClientOpacity()));
-            connect(transButton, TQT_SIGNAL(clicked()), trans_popup, TQT_SLOT(hide()));
-            connect(transSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setTransButtonText(int)));
-            connect(transSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setPopupClientOpacity(int)));
-//             connect(transSlider, TQT_SIGNAL(sliderReleased()), trans_popup, TQT_SLOT(hide()));
+            connect(transButton, TQ_SIGNAL(clicked()), TQ_SLOT(resetClientOpacity()));
+            connect(transButton, TQ_SIGNAL(clicked()), trans_popup, TQ_SLOT(hide()));
+            connect(transSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(setTransButtonText(int)));
+            connect(transSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setPopupClientOpacity(int)));
+//             connect(transSlider, TQ_SIGNAL(sliderReleased()), trans_popup, TQ_SLOT(hide()));
             trans_popup->insertItem(transBox);
             popup->insertItem(i18n("&Opacity"), trans_popup );
         }
@@ -105,7 +105,7 @@ TQPopupMenu* Workspace::clientPopup()
         if (!TDEGlobal::config()->isImmutable() && 
             !kapp->authorizeControlModules(Workspace::configModules(true)).isEmpty())
             {
-            popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior..."), this, TQT_SLOT( configureWM() ));
+            popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior…"), this, TQ_SLOT( configureWM() ));
             popup->insertSeparator();
             }
 
@@ -201,10 +201,10 @@ void Workspace::initDesktopPopup()
     desk_popup = new TQPopupMenu( popup );
     desk_popup->setCheckable( TRUE );
     desk_popup->setFont(TDEGlobalSettings::menuFont());
-    connect( desk_popup, TQT_SIGNAL( activated(int) ),
-             this, TQT_SLOT( slotSendToDesktop(int) ) );
-    connect( desk_popup, TQT_SIGNAL( aboutToShow() ),
-             this, TQT_SLOT( desktopPopupAboutToShow() ) );
+    connect( desk_popup, TQ_SIGNAL( activated(int) ),
+             this, TQ_SLOT( slotSendToDesktop(int) ) );
+    connect( desk_popup, TQ_SIGNAL( aboutToShow() ),
+             this, TQ_SLOT( desktopPopupAboutToShow() ) );
 
     popup->insertItem(i18n("To &Desktop"), desk_popup, -1, desk_popup_index );
     }
@@ -299,7 +299,7 @@ void Workspace::setupWindowShortcut( Client* c )
     client_keys->suspend( true );
     client_keys_dialog = new ShortcutDialog( c->shortcut());
     client_keys_client = c;
-    connect( client_keys_dialog, TQT_SIGNAL( dialogDone( bool )), TQT_SLOT( setupWindowShortcutDone( bool )));
+    connect( client_keys_dialog, TQ_SIGNAL( dialogDone( bool )), TQ_SLOT( setupWindowShortcutDone( bool )));
     TQRect r = clientArea( ScreenArea, c );
     TQSize size = client_keys_dialog->sizeHint();
     TQPoint pos = c->pos() + c->clientPos();
@@ -336,7 +336,7 @@ void Workspace::clientShortcutUpdated( Client* c )
         {
         client_keys->insert( key, key );
         client_keys->setShortcut( key, c->shortcut());
-        client_keys->setSlot( key, c, TQT_SLOT( shortcutActivated()));
+        client_keys->setSlot( key, c, TQ_SLOT( shortcutActivated()));
         client_keys->setActionEnabled( key, true );
         }
     client_keys->updateConnections();
@@ -647,12 +647,70 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP
     return replay;
     }
 
-// KDE4 remove me
-void Workspace::showWindowMenuAt( unsigned long, int, int )
+void Workspace::showWindowMenuAt( unsigned long window, int x, int y )
     {
-    slotWindowOperations();
+    Client *client;
+    if ((client = findClient(WindowMatchPredicate((WId)window))))
+        showWindowMenu( x, y, client );
     }
 
+void Workspace::showWindowMenu( unsigned long window )
+    {
+    Client *client;
+    if ((client = findClient(WindowMatchPredicate((WId)window))))
+        {
+        TQPoint pos = client->pos() + client->clientPos();
+        showWindowMenu( pos, client );
+        }
+    }
+
+void Workspace::tileWindowToBorder(unsigned long w1, int location) {
+    if (location < ActiveTop || location >= ACTIVE_BORDER_COUNT) return;
+
+    Client *c1 = findClient(WindowMatchPredicate((WId)w1));
+    if (!c1) return;
+
+    c1->tileToBorder((ActiveBorder)location);
+}
+
+void Workspace::tileTwoWindowsHorizontally(unsigned long w1, unsigned long w2) {
+    if (w1 == w2) return;
+
+    Client *c1 = findClient(WindowMatchPredicate((WId)w1));
+    Client *c2 = findClient(WindowMatchPredicate((WId)w2));
+    if (!c1 || !c2) return;
+
+    c1->tileToBorder(ActiveTop);
+    c2->tileToBorder(ActiveBottom);
+}
+
+void Workspace::tileTwoWindowsVertically(unsigned long w1, unsigned long w2) {
+    if (w1 == w2) return;
+
+    Client *c1 = findClient(WindowMatchPredicate((WId)w1));
+    Client *c2 = findClient(WindowMatchPredicate((WId)w2));
+    if (!c1 || !c2) return;
+
+    c1->tileToBorder(ActiveLeft);
+    c2->tileToBorder(ActiveRight);
+}
+
+void Workspace::tileFourWindowsInGrid(unsigned long w1, unsigned long w2, unsigned long w3, unsigned long w4) {
+    if (w1 == w2 || w1 == w3 || w1 == w4 || w2 == w3 || w2 == w4 || w3 == w4)
+        return;
+
+    Client *c1 = findClient(WindowMatchPredicate((WId)w1));
+    Client *c2 = findClient(WindowMatchPredicate((WId)w2));
+    Client *c3 = findClient(WindowMatchPredicate((WId)w3));
+    Client *c4 = findClient(WindowMatchPredicate((WId)w4));
+    if (!c1 || !c2 || !c3 || !c4) return;
+
+    c1->tileToBorder(ActiveTopLeft);
+    c2->tileToBorder(ActiveTopRight);
+    c3->tileToBorder(ActiveBottomLeft);
+    c4->tileToBorder(ActiveBottomRight);
+}
+
 void Workspace::slotActivateAttentionWindow()
     {
     if( attention_chain.count() > 0 )
@@ -1070,17 +1128,21 @@ void Workspace::showWindowMenu( const TQRect &pos, Client* cl )
     active_popup = p;
     int x = pos.left();
     int y = pos.bottom();
-    if (y == pos.top())
-	p->exec( TQPoint( x, y ) );
+    clientPopupAboutToShow(); // needed for sizeHint() to be correct :-/
+
+    TQRect area = clientArea(ScreenArea, TQPoint(x, y), currentDesktop());
+    TQSize hint = p->sizeHint();
+    if (x < 0) x = area.right() - hint.width() + x;
+    if (y < 0) y = area.bottom() - hint.height() + y;
+
+    if (pos.bottom() == pos.top())
+        p->exec( TQPoint( x, y ) );
     else
         {
-	TQRect area = clientArea(ScreenArea, TQPoint(x, y), currentDesktop());
-        clientPopupAboutToShow(); // needed for sizeHint() to be correct :-/
-	int popupHeight = p->sizeHint().height();
-	if (y + popupHeight < area.height())
-	    p->exec( TQPoint( x, y ) );
-	else
-	    p->exec( TQPoint( x, pos.top() - popupHeight ) );
+        if (y + hint.height() < area.height())
+            p->exec( TQPoint( x, y ) );
+        else
+            p->exec( TQPoint( x, pos.top() - hint.height() ) );
         }
     // active popup may be already changed (e.g. the window shortcut dialog)
     if( active_popup == p )
diff --git a/twin/utils.cpp b/twin/utils.cpp
index e7e5c7d32..bc44eee56 100644
--- a/twin/utils.cpp
+++ b/twin/utils.cpp
@@ -37,10 +37,6 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "atoms.h"
 #include "notifications.h"
 
-#ifdef USE_QT4
-#include <Qt/qx11info_x11.h>
-#endif // USE_QT4
-
 #endif
 
 namespace KWinInternal
@@ -278,7 +274,7 @@ void updateXTime()
         XCheckIfEvent( tqt_xdisplay(), &dummy, update_x_time_predicate, NULL );
         }
     assert( next_x_time != CurrentTime );
-    SET_QT_X_TIME(next_x_time);
+    set_tqt_x_time(next_x_time);
     XEvent ev; // remove the PropertyNotify event from the events queue
     XWindowEvent( tqt_xdisplay(), w->winId(), PropertyChangeMask, &ev );
     }
diff --git a/twin/utils.h b/twin/utils.h
index e8bc09a46..da2f9c2e3 100644
--- a/twin/utils.h
+++ b/twin/utils.h
@@ -108,7 +108,28 @@ enum ShadeMode
     ShadeActivated // "shaded", but visible due to alt+tab to the window
     };
 
-class Shape 
+enum ActiveBorder
+    {
+    ActiveTop = 0,
+    ActiveTopRight,
+    ActiveRight,
+    ActiveBottomRight,
+    ActiveBottom,
+    ActiveBottomLeft,
+    ActiveLeft,
+    ActiveTopLeft,
+    ACTIVE_BORDER_COUNT,
+    ActiveNone
+    };
+
+enum ActiveMaximizingMode
+{
+    ActiveNoMode,
+    ActiveTilingMode,
+    ActiveMaximizeMode
+};
+
+class Shape
     {
     public:
         static bool available() { return twin_shape_version > 0; }
@@ -126,12 +147,12 @@ class Shape
 const int ShapeInput = 2;
 #endif
 
-class Motif 
+class Motif
     {
     public:
         static void readFlags( WId w, bool& noborder, bool& resize, bool& move,
             bool& minimize, bool& maximize, bool& close );
-        struct MwmHints 
+        struct MwmHints
             {
             ulong flags;
             ulong functions;
@@ -155,7 +176,7 @@ class Motif
 class KWinSelectionOwner
     : public TDESelectionOwner
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         KWinSelectionOwner( int screen );
     protected:
@@ -227,7 +248,7 @@ KWIN_CHECK_PREDICATE( TruePredicate, cl == cl /*true, avoid warning about 'cl' *
 template< typename T >
 Client* findClientInList( const ClientList& list, T predicate )
     {
-    for ( ClientList::ConstIterator it = list.begin(); it != list.end(); ++it) 
+    for ( ClientList::ConstIterator it = list.begin(); it != list.end(); ++it)
         {
         if ( predicate( const_cast< const Client* >( *it)))
             return *it;
@@ -256,7 +277,7 @@ void checkNonExistentClients();
 class ShortcutDialog
     : public TDEShortcutDialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         ShortcutDialog( const TDEShortcut& cut );
         virtual void accept();
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index 8cddbb72e..23661e6a0 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -167,13 +167,8 @@ Workspace::Workspace( bool restore )
     global_shortcuts_disabled_for_client( false ),
     root              (0),
     workspaceInit     (true),
-    startup(0), electric_have_borders(false),
-    electric_current_border(0),
-    electric_top_border(None),
-    electric_bottom_border(None),
-    electric_left_border(None),
-    electric_right_border(None),
-    layoutOrientation(Qt::Vertical),
+    startup(0),
+    layoutOrientation(TQt::Vertical),
     layoutX(-1),
     layoutY(2),
     workarea(NULL),
@@ -194,16 +189,22 @@ Workspace::Workspace( bool restore )
     installed_colormap = default_colormap;
     session.setAutoDelete( TRUE );
 
-    connect( &temporaryRulesMessages, TQT_SIGNAL( gotMessage( const TQString& )),
-        this, TQT_SLOT( gotTemporaryRulesMessage( const TQString& )));
-    connect( &rulesUpdatedTimer, TQT_SIGNAL( timeout()), this, TQT_SLOT( writeWindowRules()));
+    for (int i = 0; i < ACTIVE_BORDER_COUNT; ++i)
+    {
+        active_reserved[i] = 0;
+        active_windows[i] = None;
+    }
+
+    connect( &temporaryRulesMessages, TQ_SIGNAL( gotMessage( const TQString& )),
+        this, TQ_SLOT( gotTemporaryRulesMessage( const TQString& )));
+    connect( &rulesUpdatedTimer, TQ_SIGNAL( timeout()), this, TQ_SLOT( writeWindowRules()));
 
     updateXTime(); // needed for proper initialization of user_time in Client ctor
 
-    delayFocusTimer = 0; 
-    
-    electric_time_first = GET_QT_X_TIME();
-    electric_time_last = GET_QT_X_TIME();
+    delayFocusTimer = 0;
+
+    active_time_first = get_tqt_x_time();
+    active_time_last = get_tqt_x_time();
 
     if ( restore )
       loadSessionInfo();
@@ -258,7 +259,7 @@ Workspace::Workspace( bool restore )
     init();
 
 #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
-    connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
+    connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
 #endif
 
     if (!supportsCompMgr()) {
@@ -273,7 +274,7 @@ Workspace::Workspace( bool restore )
     if (options->useTranslucency)
         {
         kompmgr = new TDEProcess;
-        connect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int)));
+        connect(kompmgr, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQ_SLOT(handleKompmgrOutput(TDEProcess*, char*, int)));
         *kompmgr << TDE_COMPOSITOR_BINARY;
         if (kompmgrpid)
             {
@@ -304,13 +305,17 @@ Workspace::Workspace( bool restore )
 
 
 void Workspace::init()
+{
+    if (options->activeBorders() == Options::ActiveSwitchAlways)
     {
-    checkElectricBorders();
+        reserveActiveBorderSwitching(true);
+    }
+    updateActiveBorders();
 
 // not used yet
 //     topDock = 0L;
 //     maximizedWindowCounter = 0;
-    
+
     supportWindow = new TQWidget;
     XLowerWindow( tqt_xdisplay(), supportWindow->winId()); // see usage in layers.cpp
 
@@ -422,15 +427,15 @@ void Workspace::init()
     // now we know how many desktops we'll, thus, we initialise the positioning object
     initPositioning = new Placement(this);
 
-    connect(&reconfigureTimer, TQT_SIGNAL(timeout()), this,
-            TQT_SLOT(slotReconfigure()));
-    connect( &updateToolWindowsTimer, TQT_SIGNAL( timeout()), this, TQT_SLOT( slotUpdateToolWindows()));
+    connect(&reconfigureTimer, TQ_SIGNAL(timeout()), this,
+            TQ_SLOT(slotReconfigure()));
+    connect( &updateToolWindowsTimer, TQ_SIGNAL( timeout()), this, TQ_SLOT( slotUpdateToolWindows()));
 
-    connect(kapp, TQT_SIGNAL(appearanceChanged()), this,
-            TQT_SLOT(slotReconfigure()));
-    connect(kapp, TQT_SIGNAL(settingsChanged(int)), this,
-            TQT_SLOT(slotSettingsChanged(int)));
-    connect(kapp, TQT_SIGNAL( kipcMessage( int, int )), this, TQT_SLOT( kipcMessage( int, int )));
+    connect(kapp, TQ_SIGNAL(appearanceChanged()), this,
+            TQ_SLOT(slotReconfigure()));
+    connect(kapp, TQ_SIGNAL(settingsChanged(int)), this,
+            TQ_SLOT(slotSettingsChanged(int)));
+    connect(kapp, TQ_SIGNAL( kipcMessage( int, int )), this, TQ_SLOT( kipcMessage( int, int )));
 
     active_client = NULL;
     rootInfo->setActiveWindow( None );
@@ -456,7 +461,7 @@ void Workspace::init()
         unsigned int i, nwins;
         Window root_return, parent_return, *wins;
         XQueryTree(tqt_xdisplay(), root, &root_return, &parent_return, &wins, &nwins);
-        for (i = 0; i < nwins; i++) 
+        for (i = 0; i < nwins; i++)
             {
             XWindowAttributes attr;
             XGetWindowAttributes(tqt_xdisplay(), wins[i], &attr);
@@ -464,12 +469,12 @@ void Workspace::init()
                 continue;
             if( topmenu_space && topmenu_space->winId() == wins[ i ] )
                 continue;
-            if (attr.map_state != IsUnmapped) 
+            if (attr.map_state != IsUnmapped)
                 {
                 if ( addSystemTrayWin( wins[i] ) )
                     continue;
                 Client* c = createClient( wins[i], true );
-                if ( c != NULL && root != tqt_xrootwin() ) 
+                if ( c != NULL && root != tqt_xrootwin() )
                     { // TODO what is this?
                 // TODO may use TQWidget:.create
                     XReparentWindow( tqt_xdisplay(), c->frameId(), root, 0, 0 );
@@ -483,7 +488,6 @@ void Workspace::init()
         updateStackingOrder( true );
 
         updateClientArea();
-        raiseElectricBorders();
 
     // NETWM spec says we have to set it to (0,0) if we don't support it
         NETPoint* viewports = new NETPoint[ number_of_desktops ];
@@ -514,12 +518,27 @@ void Workspace::init()
         }
     if( new_active_client != NULL )
         activateClient( new_active_client );
+
+    // outline windows for active border maximize window mode
+    outline_left = XCreateWindow(tqt_xdisplay(), rootWin(), 0, 0, 1, 1, 0,
+                                 CopyFromParent, CopyFromParent, CopyFromParent,
+                                 CWOverrideRedirect, &attr);
+    outline_right = XCreateWindow(tqt_xdisplay(), rootWin(), 0, 0, 1, 1, 0,
+                                  CopyFromParent, CopyFromParent, CopyFromParent,
+                                  CWOverrideRedirect, &attr);
+    outline_top = XCreateWindow(tqt_xdisplay(), rootWin(), 0, 0, 1, 1, 0,
+                                CopyFromParent, CopyFromParent, CopyFromParent,
+                                CWOverrideRedirect, &attr);
+    outline_bottom = XCreateWindow(tqt_xdisplay(), rootWin(), 0, 0, 1, 1, 0,
+                                   CopyFromParent, CopyFromParent, CopyFromParent,
+                                   CWOverrideRedirect, &attr);
+
     // SELI TODO this won't work with unreasonable focus policies,
     // and maybe in rare cases also if the selected client doesn't
     // want focus
     workspaceInit = false;
 // TODO ungrabXServer()
-    }
+}
 
 Workspace::~Workspace()
     {
@@ -550,6 +569,12 @@ Workspace::~Workspace()
     writeWindowRules();
     TDEGlobal::config()->sync();
 
+    // destroy outline windows for active border maximize window mode
+    XDestroyWindow(tqt_xdisplay(), outline_left);
+    XDestroyWindow(tqt_xdisplay(), outline_right);
+    XDestroyWindow(tqt_xdisplay(), outline_top);
+    XDestroyWindow(tqt_xdisplay(), outline_bottom);
+
     delete rootInfo;
     delete supportWindow;
     delete mgr;
@@ -785,7 +810,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change )
 void Workspace::updateOverlappingShadows(unsigned long window)
     {
     Client *client;
-    
+
     if ((client = findClient(WindowMatchPredicate((WId)window))))
         // Redraw overlapping shadows without waiting for the specified window
         // to redraw its own shadow
@@ -795,7 +820,7 @@ void Workspace::updateOverlappingShadows(unsigned long window)
 void Workspace::setShadowed(unsigned long window, bool shadowed)
     {
     Client *client;
-    
+
     if ((client = findClient(WindowMatchPredicate((WId)window))))
         client->setShadowed(shadowed);
     }
@@ -891,7 +916,7 @@ void Workspace::updateCurrentTopMenu()
         }
 
     // ... then hide the other ones. Avoids flickers.
-    for ( ClientList::ConstIterator it = clients.begin(); it != clients.end(); ++it) 
+    for ( ClientList::ConstIterator it = clients.begin(); it != clients.end(); ++it)
         {
         if( (*it)->isTopMenu() && (*it) != menubar )
             (*it)->hideClient( true );
@@ -1008,7 +1033,7 @@ void Workspace::updateColormap()
     Colormap cmap = default_colormap;
     if ( activeClient() && activeClient()->colormap() != None )
         cmap = activeClient()->colormap();
-    if ( cmap != installed_colormap ) 
+    if ( cmap != installed_colormap )
         {
         XInstallColormap(tqt_xdisplay(), cmap );
         installed_colormap = cmap;
@@ -1038,6 +1063,11 @@ void Workspace::slotReconfigure()
     kdDebug(1212) << "Workspace::slotReconfigure()" << endl;
     reconfigureTimer.stop();
 
+    if (options->activeBorders() == Options::ActiveSwitchAlways)
+    {
+        reserveActiveBorderSwitching(false);
+    }
+
     TDEGlobal::config()->reparseConfiguration();
     unsigned long changed = options->updateSettings();
     tab_box->reconfigure();
@@ -1068,7 +1098,10 @@ void Workspace::slotReconfigure()
         forEachClient( CheckBorderSizesProcedure());
         }
 
-    checkElectricBorders();
+    if (options->activeBorders() == Options::ActiveSwitchAlways)
+    {
+        reserveActiveBorderSwitching(true);
+    }
 
     if( options->topMenuEnabled() && !managingTopMenus())
         {
@@ -1155,10 +1188,10 @@ void Workspace::slotReconfigure()
                 if (!kompmgr)
                     {
                     kompmgr = new TDEProcess;
-                    connect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int)));
+                    connect(kompmgr, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQ_SLOT(handleKompmgrOutput(TDEProcess*, char*, int)));
                     *kompmgr << TDE_COMPOSITOR_BINARY;
                     }
-                TQTimer::singleShot( 200, this, TQT_SLOT(startKompmgr()) ); // wait some time to ensure system's ready for restart
+                TQTimer::singleShot( 200, this, TQ_SLOT(startKompmgr()) ); // wait some time to ensure system's ready for restart
                 }
             }
         else
@@ -1195,7 +1228,7 @@ void Workspace::loadDesktopSettings()
     desktop_focus_chain.resize( n );
     // make it +1, so that it can be accessed as [1..numberofdesktops]
     focus_chain.resize( n + 1 );
-    for(int i = 1; i <= n; i++) 
+    for(int i = 1; i <= n; i++)
         {
         TQString s = c->readEntry(TQString("Name_%1").arg(i),
                                 i18n("Desktop %1").arg(i));
@@ -1215,21 +1248,21 @@ void Workspace::saveDesktopSettings()
     TDEConfigGroupSaver saver(c,groupname);
 
     c->writeEntry("Number", number_of_desktops );
-    for(int i = 1; i <= number_of_desktops; i++) 
+    for(int i = 1; i <= number_of_desktops; i++)
         {
         TQString s = desktopName( i );
         TQString defaultvalue = i18n("Desktop %1").arg(i);
-        if ( s.isEmpty() ) 
+        if ( s.isEmpty() )
             {
             s = defaultvalue;
             rootInfo->setDesktopName( i, s.utf8().data() );
             }
 
-        if (s != defaultvalue) 
+        if (s != defaultvalue)
             {
             c->writeEntry( TQString("Name_%1").arg(i), s );
             }
-        else 
+        else
             {
             TQString currentvalue = c->readEntry(TQString("Name_%1").arg(i));
             if (currentvalue != defaultvalue)
@@ -1267,10 +1300,10 @@ void Workspace::doNotManage( TQString title )
  */
 bool Workspace::isNotManaged( const TQString& title )
     {
-    for ( TQStringList::Iterator it = doNotManageList.begin(); it != doNotManageList.end(); ++it ) 
+    for ( TQStringList::Iterator it = doNotManageList.begin(); it != doNotManageList.end(); ++it )
         {
         TQRegExp r( (*it) );
-        if (r.search(title) != -1) 
+        if (r.search(title) != -1)
             {
             doNotManageList.remove( it );
             return TRUE;
@@ -1282,7 +1315,7 @@ bool Workspace::isNotManaged( const TQString& title )
 /*!
   Refreshes all the client windows
  */
-void Workspace::refresh() 
+void Workspace::refresh()
     {
     TQWidget w;
     w.setGeometry( TQApplication::desktop()->geometry() );
@@ -1319,7 +1352,7 @@ void ObscuringWindows::create( Client* c )
     Window obs_win;
     XWindowChanges chngs;
     int mask = CWSibling | CWStackMode;
-    if( cached->count() > 0 ) 
+    if( cached->count() > 0 )
         {
         cached->remove( obs_win = cached->first());
         chngs.x = c->x();
@@ -1328,7 +1361,7 @@ void ObscuringWindows::create( Client* c )
         chngs.height = c->height();
         mask |= CWX | CWY | CWWidth | CWHeight;
         }
-    else 
+    else
         {
         XSetWindowAttributes a;
         a.background_pixmap = None;
@@ -1349,7 +1382,7 @@ ObscuringWindows::~ObscuringWindows()
     max_cache_size = TQMAX( max_cache_size, obscuring_windows.count() + 4 ) - 1;
     for( TQValueList<Window>::ConstIterator it = obscuring_windows.begin();
          it != obscuring_windows.end();
-         ++it ) 
+         ++it )
         {
         XUnmapWindow( tqt_xdisplay(), *it );
         if( cached->count() < max_cache_size )
@@ -1377,7 +1410,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
     StackingUpdatesBlocker blocker( this );
 
     int old_desktop = current_desktop;
-    if (new_desktop != current_desktop) 
+    if (new_desktop != current_desktop)
         {
         ++block_showing_desktop;
         /*
@@ -1416,7 +1449,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
         }
 
         if (desktopHasCompositing) {
-            // If composition is in use then we cannot hide the old windows before showing the new ones, 
+            // If composition is in use then we cannot hide the old windows before showing the new ones,
             // unless you happen to like the "flicker annoyingly to desktop" effect... :-P
             XSync( tqt_xdisplay(), false);	// Make absolutely certain all new windows are shown before hiding the old ones
             for ( ClientList::ConstIterator it = stacking_order.begin(); it != stacking_order.end(); ++it) {
@@ -1439,7 +1472,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
     --block_focus;
     Client* c = 0;
 
-    if ( options->focusPolicyIsReasonable()) 
+    if ( options->focusPolicyIsReasonable())
         {
         // Search in focus chain
         if ( movingClient != NULL && active_client == movingClient
@@ -1448,7 +1481,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
             {
             c = active_client; // the requestFocus below will fail, as the client is already active
             }
-        if ( !c ) 
+        if ( !c )
             {
             for( ClientList::ConstIterator it = focus_chain[currentDesktop()].fromLast();
                  it != focus_chain[currentDesktop()].end();
@@ -1475,9 +1508,9 @@ bool Workspace::setCurrentDesktop( int new_desktop )
     if( c != active_client )
         setActiveClient( NULL, Allowed );
 
-    if ( c ) 
+    if ( c )
         requestFocus( c );
-    else 
+    else
         focusToNull();
 
     updateCurrentTopMenu();
@@ -1520,10 +1553,10 @@ int Workspace::desktopToRight( int desktop ) const
     int x,y;
     calcDesktopLayout(x,y);
     int dt = desktop-1;
-    if (layoutOrientation == Qt::Vertical)
+    if (layoutOrientation == TQt::Vertical)
         {
         dt += y;
-        if ( dt >= numberOfDesktops() ) 
+        if ( dt >= numberOfDesktops() )
             {
             if ( options->rollOverDesktops )
               dt -= numberOfDesktops();
@@ -1534,7 +1567,7 @@ int Workspace::desktopToRight( int desktop ) const
     else
         {
         int d = (dt % x) + 1;
-        if ( d >= x ) 
+        if ( d >= x )
             {
             if ( options->rollOverDesktops )
               d -= x;
@@ -1551,10 +1584,10 @@ int Workspace::desktopToLeft( int desktop ) const
     int x,y;
     calcDesktopLayout(x,y);
     int dt = desktop-1;
-    if (layoutOrientation == Qt::Vertical)
+    if (layoutOrientation == TQt::Vertical)
         {
         dt -= y;
-        if ( dt < 0 ) 
+        if ( dt < 0 )
             {
             if ( options->rollOverDesktops )
               dt += numberOfDesktops();
@@ -1565,7 +1598,7 @@ int Workspace::desktopToLeft( int desktop ) const
     else
         {
         int d = (dt % x) - 1;
-        if ( d < 0 ) 
+        if ( d < 0 )
             {
             if ( options->rollOverDesktops )
               d += x;
@@ -1582,10 +1615,10 @@ int Workspace::desktopUp( int desktop ) const
     int x,y;
     calcDesktopLayout(x,y);
     int dt = desktop-1;
-    if (layoutOrientation == Qt::Horizontal)
+    if (layoutOrientation == TQt::Horizontal)
         {
         dt -= x;
-        if ( dt < 0 ) 
+        if ( dt < 0 )
             {
             if ( options->rollOverDesktops )
               dt += numberOfDesktops();
@@ -1596,7 +1629,7 @@ int Workspace::desktopUp( int desktop ) const
     else
         {
         int d = (dt % y) - 1;
-        if ( d < 0 ) 
+        if ( d < 0 )
             {
             if ( options->rollOverDesktops )
               d += y;
@@ -1613,10 +1646,10 @@ int Workspace::desktopDown( int desktop ) const
     int x,y;
     calcDesktopLayout(x,y);
     int dt = desktop-1;
-    if (layoutOrientation == Qt::Horizontal)
+    if (layoutOrientation == TQt::Horizontal)
         {
         dt += x;
-        if ( dt >= numberOfDesktops() ) 
+        if ( dt >= numberOfDesktops() )
             {
             if ( options->rollOverDesktops )
               dt -= numberOfDesktops();
@@ -1627,7 +1660,7 @@ int Workspace::desktopDown( int desktop ) const
     else
         {
         int d = (dt % y) + 1;
-        if ( d >= y ) 
+        if ( d >= y )
             {
             if ( options->rollOverDesktops )
               d -= y;
@@ -1655,7 +1688,7 @@ void Workspace::setNumberOfDesktops( int n )
 
     // if increasing the number, do the resizing now,
     // otherwise after the moving of windows to still existing desktops
-    if( old_number_of_desktops < number_of_desktops ) 
+    if( old_number_of_desktops < number_of_desktops )
         {
         rootInfo->setNumberOfDesktops( number_of_desktops );
         NETPoint* viewports = new NETPoint[ number_of_desktops ];
@@ -1667,17 +1700,17 @@ void Workspace::setNumberOfDesktops( int n )
 
     // if the number of desktops decreased, move all
     // windows that would be hidden to the last visible desktop
-    if( old_number_of_desktops > number_of_desktops ) 
+    if( old_number_of_desktops > number_of_desktops )
         {
         for( ClientList::ConstIterator it = clients.begin();
               it != clients.end();
-              ++it) 
+              ++it)
             {
             if( !(*it)->isOnAllDesktops() && (*it)->desktop() > numberOfDesktops())
                 sendClientToDesktop( *it, numberOfDesktops(), true );
             }
         }
-    if( old_number_of_desktops > number_of_desktops ) 
+    if( old_number_of_desktops > number_of_desktops )
         {
         rootInfo->setNumberOfDesktops( number_of_desktops );
         NETPoint* viewports = new NETPoint[ number_of_desktops ];
@@ -1717,7 +1750,7 @@ void Workspace::sendClientToDesktop( Client* c, int desk, bool dont_activate )
         else
             restackClientUnderActive( c );
         }
-    else 
+    else
         {
         raiseClient( c );
         }
@@ -1813,7 +1846,7 @@ void Workspace::updateDesktopLayout()
     {
     // rootInfo->desktopLayoutCorner(); // I don't find this worth bothering, feel free to
     layoutOrientation = ( rootInfo->desktopLayoutOrientation() == NET::OrientationHorizontal
-        ? Qt::Horizontal : Qt::Vertical );
+        ? TQt::Horizontal : TQt::Vertical );
     layoutX = rootInfo->desktopLayoutColumnsRows().width();
     layoutY = rootInfo->desktopLayoutColumnsRows().height();
     if( layoutX == 0 && layoutY == 0 ) // not given, set default layout
@@ -1904,7 +1937,7 @@ void Workspace::propagateSystemTrayWins()
     Window *cl = new Window[ systemTrayWins.count()];
 
     int i = 0;
-    for ( SystemTrayWindowList::ConstIterator it = systemTrayWins.begin(); it != systemTrayWins.end(); ++it ) 
+    for ( SystemTrayWindowList::ConstIterator it = systemTrayWins.begin(); it != systemTrayWins.end(); ++it )
         {
         cl[i++] =  (*it).win;
         }
@@ -1920,7 +1953,7 @@ void Workspace::killWindowId( Window window_to_kill )
         return;
     Window window = window_to_kill;
     Client* client = NULL;
-    for(;;) 
+    for(;;)
         {
         client = findClient( FrameIdMatchPredicate( window ));
         if( client != NULL ) // found the client
@@ -2053,12 +2086,12 @@ void Workspace::sendTakeActivity( Client* c, Time timestamp, long flags )
 */
 void Workspace::slotGrabWindow()
     {
-    if ( active_client ) 
+    if ( active_client )
         {
         TQPixmap snapshot = TQPixmap::grabWindow( active_client->frameId() );
 
 	//No XShape - no work.
-        if( Shape::available()) 
+        if( Shape::available())
             {
 	    //As the first step, get the mask from XShape.
             int count, order;
@@ -2068,7 +2101,7 @@ void Workspace::slotGrabWindow()
 	    //ShapeBounding - ShapeClipping is defined to be the border.
 	    //Since the border area is part of the window, we use bounding
 	    // to limit our work region
-            if (rects) 
+            if (rects)
                 {
 		//Create a TQRegion from the rectangles describing the bounding mask.
                 TQRegion contents;
@@ -2087,9 +2120,9 @@ void Workspace::slotGrabWindow()
 		//Construct a bitmap mask from the rectangles
                 TQBitmap mask( snapshot.width(), snapshot.height());
                 TQPainter p(&mask);
-                p.fillRect(0, 0, mask.width(), mask.height(), Qt::color1);
+                p.fillRect(0, 0, mask.width(), mask.height(), TQt::color1);
                 for (uint pos = 0; pos < maskedAwayRects.count(); pos++)
-                    p.fillRect(maskedAwayRects[pos], Qt::color0);
+                    p.fillRect(maskedAwayRects[pos], TQt::color0);
                 p.end();
                 snapshot.setMask(mask);
                 }
@@ -2119,9 +2152,9 @@ void Workspace::slotGrabDesktop()
 void Workspace::slotMouseEmulation()
     {
 
-    if ( mouse_emulation ) 
+    if ( mouse_emulation )
         {
-        XUngrabKeyboard(tqt_xdisplay(), GET_QT_X_TIME());
+        XUngrabKeyboard(tqt_xdisplay(), get_tqt_x_time());
         mouse_emulation = FALSE;
         return;
         }
@@ -2129,7 +2162,7 @@ void Workspace::slotMouseEmulation()
     if ( XGrabKeyboard(tqt_xdisplay(),
                        root, FALSE,
                        GrabModeAsync, GrabModeAsync,
-                       GET_QT_X_TIME()) == GrabSuccess ) 
+                       get_tqt_x_time()) == GrabSuccess )
         {
         mouse_emulation = TRUE;
         mouse_emulation_state = 0;
@@ -2151,7 +2184,7 @@ WId Workspace::getMouseEmulationWindow()
     uint state;
     Window w;
     Client * c = 0;
-    do 
+    do
         {
         w = child;
         if (!c)
@@ -2173,19 +2206,19 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
     if ( !w )
         return state;
     TQWidget* widget = TQWidget::find( w );
-    if ( (!widget ||  widget->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) ) && !findClient( WindowMatchPredicate( w )) ) 
+    if ( (!widget ||  widget->inherits("TQToolButton") ) && !findClient( WindowMatchPredicate( w )) )
         {
         int x, y;
         Window xw;
         XTranslateCoordinates( tqt_xdisplay(), tqt_xrootwin(), w, pos.x(), pos.y(), &x, &y, &xw );
-        if ( type == EmuMove ) 
+        if ( type == EmuMove )
             { // motion notify events
             XEvent e;
             e.type = MotionNotify;
             e.xmotion.window = w;
             e.xmotion.root = tqt_xrootwin();
             e.xmotion.subwindow = w;
-            e.xmotion.time = GET_QT_X_TIME();
+            e.xmotion.time = get_tqt_x_time();
             e.xmotion.x = x;
             e.xmotion.y = y;
             e.xmotion.x_root = pos.x();
@@ -2194,14 +2227,14 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
             e.xmotion.is_hint = NotifyNormal;
             XSendEvent( tqt_xdisplay(), w, TRUE, ButtonMotionMask, &e );
             }
-        else 
+        else
             {
             XEvent e;
             e.type = type == EmuRelease ? ButtonRelease : ButtonPress;
             e.xbutton.window = w;
             e.xbutton.root = tqt_xrootwin();
             e.xbutton.subwindow = w;
-            e.xbutton.time = GET_QT_X_TIME();
+            e.xbutton.time = get_tqt_x_time();
             e.xbutton.x = x;
             e.xbutton.y = y;
             e.xbutton.x_root = pos.x();
@@ -2210,9 +2243,9 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
             e.xbutton.button = button;
             XSendEvent( tqt_xdisplay(), w, TRUE, ButtonPressMask, &e );
 
-            if ( type == EmuPress ) 
+            if ( type == EmuPress )
                 {
-                switch ( button ) 
+                switch ( button )
                     {
                     case 2:
                         state |= Button2Mask;
@@ -2225,9 +2258,9 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
                         break;
                     }
                 }
-            else 
+            else
                 {
-                switch ( button ) 
+                switch ( button )
                     {
                     case 2:
                         state &= ~Button2Mask;
@@ -2261,7 +2294,7 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev )
     int delta = is_control?1:is_alt?32:8;
     TQPoint pos = TQCursor::pos();
 
-    switch ( kc ) 
+    switch ( kc )
         {
         case XK_Left:
         case XK_KP_Left:
@@ -2306,16 +2339,16 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev )
         case XK_Return:
         case XK_space:
         case XK_KP_Enter:
-        case XK_KP_Space: 
+        case XK_KP_Space:
             {
-            if ( !mouse_emulation_state ) 
+            if ( !mouse_emulation_state )
                 {
             // nothing was pressed, fake a LMB click
                 mouse_emulation_window = getMouseEmulationWindow();
                 mouse_emulation_state = sendFakedMouseEvent( pos, mouse_emulation_window, EmuPress, Button1, mouse_emulation_state );
                 mouse_emulation_state = sendFakedMouseEvent( pos, mouse_emulation_window, EmuRelease, Button1, mouse_emulation_state );
                 }
-            else 
+            else
                 { // release all
                 if ( mouse_emulation_state & Button1Mask )
                     mouse_emulation_state = sendFakedMouseEvent( pos, mouse_emulation_window, EmuRelease, Button1, mouse_emulation_state );
@@ -2327,7 +2360,7 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev )
             }
     // fall through
         case XK_Escape:
-            XUngrabKeyboard(tqt_xdisplay(), GET_QT_X_TIME());
+            XUngrabKeyboard(tqt_xdisplay(), get_tqt_x_time());
             mouse_emulation = FALSE;
             return TRUE;
         default:
@@ -2357,292 +2390,393 @@ void Workspace::delayFocus()
     requestFocus( delayfocus_client );
     cancelDelayFocus();
     }
-    
+
 void Workspace::requestDelayFocus( Client* c )
     {
     delayfocus_client = c;
     delete delayFocusTimer;
     delayFocusTimer = new TQTimer( this );
-    connect( delayFocusTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( delayFocus() ) );
+    connect( delayFocusTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( delayFocus() ) );
     delayFocusTimer->start( options->delayFocusInterval, TRUE  );
     }
-    
+
 void Workspace::cancelDelayFocus()
     {
     delete delayFocusTimer;
     delayFocusTimer = 0;
     }
 
-// Electric Borders
-//========================================================================//
-// Electric Border Window management. Electric borders allow a user
-// to change the virtual desktop by moving the mouse pointer to the
-// borders. Technically this is done with input only windows. Since
-// electric borders can be switched on and off, we have these two
-// functions to create and destroy them.
-void Workspace::checkElectricBorders( bool force )
+/* Active (Electric) Borders
+ * ========================================================================
+ * Active Border Window management. Active borders allow a user to switch
+ * to another virtual desktop or activate other features by moving
+ * the mouse pointer to the borders or corners of the workspace.
+ * Technically this is done with input only windows.
+ */
+void Workspace::updateActiveBorders()
     {
-    if( force )
-        destroyBorderWindows();
-    
-    electric_current_border = 0;
-
+    active_time_first = get_tqt_x_time();
+    active_time_last = get_tqt_x_time();
+    active_time_last_trigger = get_tqt_x_time();
+    active_current_border = ActiveNone;
     TQRect r = TQApplication::desktop()->geometry();
-    electricTop = r.top();
-    electricBottom = r.bottom();
-    electricLeft = r.left();
-    electricRight = r.right();
+    activeTop = r.top();
+    activeBottom = r.bottom();
+    activeLeft = r.left();
+    activeRight = r.right();
 
-    if (options->electricBorders() == Options::ElectricAlways)
-       createBorderWindows();
-    else
-       destroyBorderWindows();
+    for (int pos = 0; pos < ACTIVE_BORDER_COUNT; ++pos)
+    {
+        if (active_reserved[pos] == 0)
+        {
+            if (active_windows[pos] != None)
+            {
+                XDestroyWindow( tqt_xdisplay(), active_windows[pos] );
+            }
+            active_windows[pos] = None;
+            continue;
+        }
+
+        if (active_windows[pos] != None)
+        {
+            continue;
+        }
+
+        XSetWindowAttributes attributes;
+        attributes.override_redirect = True;
+        attributes.event_mask = EnterWindowMask;
+        unsigned long valuemask = CWOverrideRedirect | CWEventMask;
+        int xywh[ ACTIVE_BORDER_COUNT ][ 4 ] =
+            {
+                { r.left() + 1, r.top(), r.width() - 2, 1 }, // top
+                { r.right(), r.top(), 1, 1 }, // topright
+                { r.right(), r.top() + 1, 1, r.height() - 2 }, // etc.
+                { r.right(), r.bottom(), 1, 1 },
+                { r.left() + 1, r.bottom(), r.width() - 2, 1 },
+                { r.left(), r.bottom(), 1, 1 },
+                { r.left(), r.top() + 1, 1, r.height() - 2 },
+                { r.left(), r.top(), 1, 1 }
+            };
+        active_windows[pos] = XCreateWindow(tqt_xdisplay(), tqt_xrootwin(),
+                                              xywh[pos][0], xywh[pos][1],
+                                              xywh[pos][2], xywh[pos][3],
+                                              0, CopyFromParent, InputOnly,
+                                              CopyFromParent, valuemask,
+                                              &attributes);
+        XMapWindow(tqt_xdisplay(), active_windows[pos]);
+
+        // Set XdndAware on the windows, so that DND enter events are received (#86998)
+        Atom version = 4; // XDND version
+        XChangeProperty(tqt_xdisplay(), active_windows[pos],
+                        atoms->xdnd_aware, XA_ATOM, 32, PropModeReplace,
+                        (unsigned char*)&version, 1);
     }
+}
 
-void Workspace::createBorderWindows()
+void Workspace::destroyActiveBorders()
+{
+    for (int pos = 0; pos < ACTIVE_BORDER_COUNT; ++pos)
+    {
+        if (active_windows[ pos ] != None)
+        {
+            XDestroyWindow( tqt_xdisplay(), active_windows[ pos ] );
+        }
+        active_windows[ pos ] = None;
+    }
+}
+
+void Workspace::reserveActiveBorderSwitching( bool reserve )
+{
+    for (int pos = 0; pos < ACTIVE_BORDER_COUNT; ++pos)
     {
-    if ( electric_have_borders )
+        if (reserve)
+        {
+            reserveActiveBorder(static_cast<ActiveBorder>(pos));
+        }
+        else
+        {
+            unreserveActiveBorder(static_cast<ActiveBorder>(pos));
+        }
+    }
+}
+
+void Workspace::reserveActiveBorder( ActiveBorder border )
+{
+    if (border == ActiveNone)
         return;
 
-    electric_have_borders = true;
+    if (active_reserved[border]++ == 0)
+        TQTimer::singleShot(0, this, TQ_SLOT(updateActiveBorders()));
+}
 
-    TQRect r = TQApplication::desktop()->geometry();
-    XSetWindowAttributes attributes;
-    unsigned long valuemask;
-    attributes.override_redirect = True;
-    attributes.event_mask =  ( EnterWindowMask | LeaveWindowMask );
-    valuemask=  (CWOverrideRedirect | CWEventMask | CWCursor );
-    attributes.cursor = XCreateFontCursor(tqt_xdisplay(),
-                                          XC_sb_up_arrow);
-    electric_top_border = XCreateWindow (tqt_xdisplay(), tqt_xrootwin(),
-                                0,0,
-                                r.width(),1,
-                                0,
-                                CopyFromParent, InputOnly,
-                                CopyFromParent,
-                                valuemask, &attributes);
-    XMapWindow(tqt_xdisplay(), electric_top_border);
-
-    attributes.cursor = XCreateFontCursor(tqt_xdisplay(),
-                                          XC_sb_down_arrow);
-    electric_bottom_border = XCreateWindow (tqt_xdisplay(), tqt_xrootwin(),
-                                   0,r.height()-1,
-                                   r.width(),1,
-                                   0,
-                                   CopyFromParent, InputOnly,
-                                   CopyFromParent,
-                                   valuemask, &attributes);
-    XMapWindow(tqt_xdisplay(), electric_bottom_border);
-
-    attributes.cursor = XCreateFontCursor(tqt_xdisplay(),
-                                          XC_sb_left_arrow);
-    electric_left_border = XCreateWindow (tqt_xdisplay(), tqt_xrootwin(),
-                                 0,0,
-                                 1,r.height(),
-                                 0,
-                                 CopyFromParent, InputOnly,
-                                 CopyFromParent,
-                                 valuemask, &attributes);
-    XMapWindow(tqt_xdisplay(), electric_left_border);
-
-    attributes.cursor = XCreateFontCursor(tqt_xdisplay(),
-                                          XC_sb_right_arrow);
-    electric_right_border = XCreateWindow (tqt_xdisplay(), tqt_xrootwin(),
-                                  r.width()-1,0,
-                                  1,r.height(),
-                                  0,
-                                  CopyFromParent, InputOnly,
-                                  CopyFromParent,
-                                  valuemask, &attributes);
-    XMapWindow(tqt_xdisplay(),  electric_right_border);
-    // Set XdndAware on the windows, so that DND enter events are received (#86998)
-    Atom version = 4; // XDND version
-    XChangeProperty( tqt_xdisplay(), electric_top_border, atoms->xdnd_aware, XA_ATOM,
-        32, PropModeReplace, ( unsigned char* )&version, 1 );
-    XChangeProperty( tqt_xdisplay(), electric_bottom_border, atoms->xdnd_aware, XA_ATOM,
-        32, PropModeReplace, ( unsigned char* )&version, 1 );
-    XChangeProperty( tqt_xdisplay(), electric_left_border, atoms->xdnd_aware, XA_ATOM,
-        32, PropModeReplace, ( unsigned char* )&version, 1 );
-    XChangeProperty( tqt_xdisplay(), electric_right_border, atoms->xdnd_aware, XA_ATOM,
-        32, PropModeReplace, ( unsigned char* )&version, 1 );
-    }
-
-
-// Electric Border Window management. Electric borders allow a user
-// to change the virtual desktop by moving the mouse pointer to the
-// borders. Technically this is done with input only windows. Since
-// electric borders can be switched on and off, we have these two
-// functions to create and destroy them.
-void Workspace::destroyBorderWindows()
-    {
-    if( !electric_have_borders)
-      return;
+void Workspace::unreserveActiveBorder( ActiveBorder border )
+{
+    if (border == ActiveNone)
+        return;
 
-    electric_have_borders = false;
+    assert(active_reserved[ border ] > 0);
+    if (--active_reserved[ border ] == 0)
+        TQTimer::singleShot(0, this, TQ_SLOT(updateActiveBorders()));
+}
 
-    if(electric_top_border)
-      XDestroyWindow(tqt_xdisplay(),electric_top_border);
-    if(electric_bottom_border)
-      XDestroyWindow(tqt_xdisplay(),electric_bottom_border);
-    if(electric_left_border)
-      XDestroyWindow(tqt_xdisplay(),electric_left_border);
-    if(electric_right_border)
-      XDestroyWindow(tqt_xdisplay(),electric_right_border);
+void Workspace::checkActiveBorder(const TQPoint &pos, Time now)
+{
+    Time treshold_set = options->activeBorderDelay(); // set timeout
+    Time treshold_trigger = 250; // Minimum time between triggers
+    Time treshold_reset = 250; // reset timeout
+    int activation_distance = options->borderActivationDistance();
 
-    electric_top_border    = None;
-    electric_bottom_border = None;
-    electric_left_border   = None;
-    electric_right_border  = None;
+    bool have_borders = false;
+    for (int i = 0; i < ACTIVE_BORDER_COUNT; ++i)
+    {
+        if (active_windows[ i ] != None)
+        {
+            have_borders = true;
+        }
     }
+    if (!have_borders) {
+        return;
+    }
+
+    // Mouse should not move more than this many pixels
+    int distance_reset = activation_distance + 10;
 
-void Workspace::clientMoved(const TQPoint &pos, Time now)
+    // Leave active maximizing mode when window moved away
+    if (active_current_border != ActiveNone &&
+       (pos.x() > activeLeft   + distance_reset) &&
+       (pos.x() < activeRight  - distance_reset) &&
+       (pos.y() > activeTop    + distance_reset) &&
+       (pos.y() < activeBottom - distance_reset))
     {
-    if (options->electricBorders() == Options::ElectricDisabled)
-       return;
+        if (movingClient &&
+           (options->activeBorders() == Options::ActiveTileMaximize ||
+            options->activeBorders() == Options::ActiveTileOnly))
+        {
+            movingClient->cancelActiveBorderMaximizing();
+            return;
+        }
+    }
+
+    // These checks take activation distance into account, creating a
+    // virtual "activation band" for easier border/corner activation.
+    bool active_left   = pos.x() < activeLeft   + activation_distance;
+    bool active_right  = pos.x() > activeRight  - activation_distance;
+    bool active_top    = pos.y() < activeTop    + activation_distance;
+    bool active_bottom = pos.y() > activeBottom - activation_distance;
 
-    if ((pos.x() != electricLeft) &&
-        (pos.x() != electricRight) &&
-        (pos.y() != electricTop) &&
-        (pos.y() != electricBottom))
+    if (!active_left && !active_right && !active_top && !active_bottom)
        return;
 
-    Time treshold_set = options->electricBorderDelay(); // set timeout
-    Time treshold_reset = 250; // reset timeout
-    int distance_reset = 30; // Mouse should not move more than this many pixels
+    // These checks are used to make corner activation easier: we assume
+    // a 25% zone on the edge of each border where instead of half size
+    // tiling we perform quarter size tiling. The rest 50% is left for
+    // normal half size tiling.
+    // These options make sense only for the tiling mode.
+    int active_width_quart  = (activeRight - activeLeft) / 4;
+    int active_height_quart = (activeBottom - activeTop) / 4;
 
-    int border = 0;
-    if (pos.x() == electricLeft)
-       border = 1;
-    else if (pos.x() == electricRight)
-       border = 2;
-    else if (pos.y() == electricTop)
-       border = 3;
-    else if (pos.y() == electricBottom)
-       border = 4;
+    bool active_qleft   = false;
+    bool active_qright  = false;
+    bool active_qtop    = false;
+    bool active_qbottom = false;
+    if (options->activeBorders() == Options::ActiveTileMaximize ||
+        options->activeBorders() == Options::ActiveTileOnly)
+    {
+      active_qleft   = pos.x() < activeLeft   + active_width_quart;
+      active_qright  = pos.x() > activeRight  - active_width_quart;
+      active_qtop    = pos.y() < activeTop    + active_height_quart;
+      active_qbottom = pos.y() > activeBottom - active_height_quart;
+    }
 
-    if ((electric_current_border == border) &&
-        (timestampDiff(electric_time_last, now) < treshold_reset) &&
-        ((pos-electric_push_point).manhattanLength() < distance_reset))
-        {
-        electric_time_last = now;
+    ActiveBorder border = ActiveNone;
+    if ((active_left && active_qtop) || (active_top && active_qleft))
+    {
+      border = ActiveTopLeft;
+    }
+    else if ((active_right && active_qtop) || (active_top && active_qright))
+    {
+      border = ActiveTopRight;
+    }
+    else if ((active_left && active_qbottom) || (active_bottom && active_qleft))
+    {
+      border = ActiveBottomLeft;
+    }
+    else if ((active_right && active_qbottom) || (active_bottom && active_qright))
+    {
+      border = ActiveBottomRight;
+    }
+    else if (active_left)
+    {
+      border = ActiveLeft;
+    }
+    else if (active_right)
+    {
+      border = ActiveRight;
+    }
+    else if (active_top)
+    {
+      border = ActiveTop;
+    }
+    else if (active_bottom)
+    {
+      border = ActiveBottom;
+    }
+    else
+    {
+      // Should never happen
+      abort();
+    }
 
-        if (timestampDiff(electric_time_first, now) > treshold_set)
-            {
-            electric_current_border = 0;
+    if( active_windows[border] == None )
+    {
+      return;
+    }
 
-            TQRect r = TQApplication::desktop()->geometry();
-            int offset;
+    if ((active_current_border == border) &&
+        (timestampDiff(active_time_last, now) < treshold_reset) &&
+        (timestampDiff(active_time_last_trigger, now) > treshold_trigger) &&
+        ((pos-active_push_point).manhattanLength() < distance_reset))
+    {
+        active_time_last = now;
+        if (timestampDiff(active_time_first, now) > treshold_set)
+        {
+            active_time_last_trigger = now;
+            active_current_border = ActiveNone;
+            bool isSide = (border == ActiveTop || border == ActiveRight ||
+                           border == ActiveBottom || border == ActiveLeft);
 
-            int desk_before = currentDesktop();
-            switch(border)
+            if (movingClient)
+            {
+                // Desktop switching
+                if (options->activeBorders() == Options::ActiveSwitchAlways ||
+                    options->activeBorders() == Options::ActiveSwitchOnMove)
                 {
-                case 1:
-                 slotSwitchDesktopLeft();
-                 if (currentDesktop() != desk_before) 
-                    {
-                    offset = r.width() / 5;
-                    TQCursor::setPos(r.width() - offset, pos.y());
-                    }
-                break;
+                    activeBorderSwitchDesktop(border, pos);
+                    return; // Don't reset cursor position
+                }
 
-               case 2:
-                slotSwitchDesktopRight();
-                if (currentDesktop() != desk_before) 
-                    {
-                    offset = r.width() / 5;
-                    TQCursor::setPos(offset, pos.y());
-                    }
-                break;
+                // Tiling maximize
+                else if (options->activeBorders() == Options::ActiveTileMaximize &&
+                         border == ActiveTop && movingClient->isMaximizable())
+                {
+                    if (!movingClient->isResizable()) return;
+                    movingClient->setActiveBorderMode(ActiveMaximizeMode);
+                    movingClient->setActiveBorder(ActiveNone);
+                    movingClient->setActiveBorderMaximizing(true);
+                }
 
-               case 3:
-                slotSwitchDesktopUp();
-                if (currentDesktop() != desk_before) 
-                    {
-                    offset = r.height() / 5;
-                    TQCursor::setPos(pos.x(), r.height() - offset);
-                    }
-                break;
+                // Tiling
+                else if ((options->activeBorders() == Options::ActiveTileMaximize ||
+                          options->activeBorders() == Options::ActiveTileOnly))
+                {
+                    if (!movingClient->isResizable()) return;
+                    movingClient->setActiveBorderMode(ActiveTilingMode);
+                    movingClient->setActiveBorder(border);
+                    movingClient->setActiveBorderMaximizing(true);
+                }
 
-               case 4:
-                slotSwitchDesktopDown();
-                if (currentDesktop() != desk_before) 
-                    {
-                    offset = r.height() / 5;
-                    TQCursor::setPos(pos.x(), offset);
-                    }
-                break;
+                else
+                {
+                    return; // Don't reset cursor position
+                }
+            }
+            else
+            {
+                // Desktop switching
+                if (options->activeBorders() == Options::ActiveSwitchAlways && isSide)
+                {
+                    activeBorderSwitchDesktop(border, pos);
+                    return; // Don't reset cursor position
                 }
-            return;
             }
         }
-    else 
-        {
-        electric_current_border = border;
-        electric_time_first = now;
-        electric_time_last = now;
-        electric_push_point = pos;
-        }
+    }
+    else
+    {
+        active_current_border = border;
+        active_time_first = now;
+        active_time_last = now;
+        active_push_point = pos;
+    }
 
-    int mouse_warp = 1;
+    if ((options->activeBorders() == Options::ActiveSwitchAlways && !movingClient) ||
+        activation_distance < 2)
+    {
+        // Reset the pointer to find out whether the user is really pushing
+        // (ordered according to enum ActiveBorder minus ActiveNone)
+        const int xdiff[ ACTIVE_BORDER_COUNT ] = { 0, -1, -1, -1, 0, 1, 1, 1 };
+        const int ydiff[ ACTIVE_BORDER_COUNT ] = { 1, 1, 0, -1, -1, -1, 0, 1 };
+        TQCursor::setPos(pos.x() + xdiff[border], pos.y() + ydiff[border]);
+    }
+}
 
-  // reset the pointer to find out wether the user is really pushing
-    switch( border)
-        {
-        case 1: TQCursor::setPos(pos.x()+mouse_warp, pos.y()); break;
-        case 2: TQCursor::setPos(pos.x()-mouse_warp, pos.y()); break;
-        case 3: TQCursor::setPos(pos.x(), pos.y()+mouse_warp); break;
-        case 4: TQCursor::setPos(pos.x(), pos.y()-mouse_warp); break;
-        }
+void Workspace::activeBorderSwitchDesktop(ActiveBorder border, const TQPoint& _pos)
+{
+    TQPoint pos = _pos;
+    TQRect r = TQApplication::desktop()->geometry();
+    const int offset = 5;
+
+    int desk_before = currentDesktop();
+    if (border == ActiveLeft || border == ActiveTopLeft || border == ActiveBottomLeft)
+    {
+            slotSwitchDesktopLeft();
+            pos.setX(r.width() - offset);
+    }
+    if (border == ActiveRight || border == ActiveTopRight || border == ActiveBottomRight)
+    {
+            slotSwitchDesktopRight();
+            pos.setX(offset);
     }
 
-// this function is called when the user entered an electric border
+    if (border == ActiveTop || border == ActiveTopLeft || border == ActiveTopRight)
+    {
+            slotSwitchDesktopUp();
+            pos.setY(r.height() - offset);
+    }
+    if (border == ActiveBottom || border == ActiveBottomLeft || border == ActiveBottomRight)
+    {
+            slotSwitchDesktopDown();
+            pos.setY(offset);
+    }
+
+    if (currentDesktop() != desk_before)
+    {
+        TQCursor::setPos(pos);
+    }
+}
+
+// this function is called when the user entered an active border
 // with the mouse. It may switch to another virtual desktop
-bool Workspace::electricBorder(XEvent *e)
+bool Workspace::activeBorderEvent(XEvent *e)
+{
+    if (e->type == EnterNotify)
     {
-    if( !electric_have_borders )
-        return false;
-    if( e->type == EnterNotify )
-        {
-        if( e->xcrossing.window == electric_top_border ||
-            e->xcrossing.window == electric_left_border ||
-            e->xcrossing.window == electric_bottom_border ||
-            e->xcrossing.window == electric_right_border)
-            // the user entered an electric border
-            {
-            clientMoved( TQPoint( e->xcrossing.x_root, e->xcrossing.y_root ), e->xcrossing.time );
-            return true;
-            }
-        }
-    if( e->type == ClientMessage )
+        for (int i = 0; i < ACTIVE_BORDER_COUNT; ++i)
         {
-        if( e->xclient.message_type == atoms->xdnd_position
-            && ( e->xclient.window == electric_top_border
-                 || e->xclient.window == electric_bottom_border
-                 || e->xclient.window == electric_left_border
-                 || e->xclient.window == electric_right_border ))
-            {
-            updateXTime();
-            clientMoved( TQPoint( e->xclient.data.l[2]>>16, e->xclient.data.l[2]&0xffff), GET_QT_X_TIME() );
-            return true;
+            if (active_windows[i] != None && e->xcrossing.window == active_windows[i])
+            { // the user entered an active border
+                checkActiveBorder(TQPoint(e->xcrossing.x_root, e->xcrossing.y_root), e->xcrossing.time);
+                return true;
             }
         }
-    return false;
     }
-
-// electric borders (input only windows) have to be always on the
-// top. For that reason kwm calls this function always after some
-// windows have been raised.
-void Workspace::raiseElectricBorders()
+    if (e->type == ClientMessage)
     {
-
-    if(electric_have_borders)
+        if (e->xclient.message_type == atoms->xdnd_position)
         {
-        XRaiseWindow(tqt_xdisplay(), electric_top_border);
-        XRaiseWindow(tqt_xdisplay(), electric_left_border);
-        XRaiseWindow(tqt_xdisplay(), electric_bottom_border);
-        XRaiseWindow(tqt_xdisplay(), electric_right_border);
+            for (int i = 0; i < ACTIVE_BORDER_COUNT; ++i)
+            {
+                if (active_windows[i] != None && e->xclient.window == active_windows[i])
+                {
+                    updateXTime();
+                    checkActiveBorder(TQPoint(e->xclient.data.l[2]>>16, e->xclient.data.l[2]&0xffff), get_tqt_x_time());
+                    return true;
+                }
+            }
         }
     }
+    return false;
+}
 
 void Workspace::addTopMenu( Client* c )
     {
@@ -2678,12 +2812,12 @@ void Workspace::lostTopMenuSelection()
     {
 //    kdDebug() << "lost TopMenu selection" << endl;
     // make sure this signal is always set when not owning the selection
-    disconnect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner()));
-    connect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner()));
+    disconnect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner()));
+    connect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner()));
     if( !managing_topmenus )
         return;
-    connect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner()));
-    disconnect( topmenu_selection, TQT_SIGNAL( lostOwnership()), this, TQT_SLOT( lostTopMenuSelection()));
+    connect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner()));
+    disconnect( topmenu_selection, TQ_SIGNAL( lostOwnership()), this, TQ_SLOT( lostTopMenuSelection()));
     managing_topmenus = false;
     delete topmenu_space;
     topmenu_space = NULL;
@@ -2712,8 +2846,8 @@ void Workspace::setupTopMenuHandling()
     {
     if( managing_topmenus )
         return;
-    connect( topmenu_selection, TQT_SIGNAL( lostOwnership()), this, TQT_SLOT( lostTopMenuSelection()));
-    disconnect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner()));
+    connect( topmenu_selection, TQ_SIGNAL( lostOwnership()), this, TQ_SLOT( lostTopMenuSelection()));
+    disconnect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner()));
     managing_topmenus = true;
     topmenu_space = new TQWidget;
     Window stack[ 2 ];
@@ -2758,7 +2892,7 @@ bool Workspace::checkStartupNotification( Window w, TDEStartupInfoId& id, TDESta
  */
 void Workspace::focusToNull()
     {
-    XSetInputFocus(tqt_xdisplay(), null_focus_window, RevertToPointerRoot, GET_QT_X_TIME() );
+    XSetInputFocus(tqt_xdisplay(), null_focus_window, RevertToPointerRoot, get_tqt_x_time() );
     }
 
 void Workspace::helperDialog( const TQString& message, const Client* c )
@@ -2824,7 +2958,7 @@ void Workspace::startKompmgr()
     }
     else {
         // Try again a bit later!
-        TQTimer::singleShot( 200, this, TQT_SLOT(startKompmgr()) );
+        TQTimer::singleShot( 200, this, TQ_SLOT(startKompmgr()) );
         return;
     }
     pid_t kompmgrpid = getCompositorPID();
@@ -2852,12 +2986,12 @@ void Workspace::startKompmgr()
         char selection_name[ 100 ];
         sprintf( selection_name, "_NET_WM_CM_S%d", DefaultScreen( tqt_xdisplay()));
         kompmgr_selection = new TDESelectionOwner( selection_name );
-        connect( kompmgr_selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( stopKompmgr()));
+        connect( kompmgr_selection, TQ_SIGNAL( lostOwnership()), TQ_SLOT( stopKompmgr()));
         kompmgr_selection->claim( true );
-        connect(kompmgr, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(restartKompmgr(TDEProcess*)));
+        connect(kompmgr, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(restartKompmgr(TDEProcess*)));
         options->useTranslucency = TRUE;
         //allowKompmgrRestart = FALSE;
-        //TQTimer::singleShot( 60000, this, TQT_SLOT(unblockKompmgrRestart()) );
+        //TQTimer::singleShot( 60000, this, TQ_SLOT(unblockKompmgrRestart()) );
         TQByteArray ba;
         TQDataStream arg(ba, IO_WriteOnly);
         arg << "";
@@ -2873,7 +3007,7 @@ void Workspace::stopKompmgr()
     }
     delete kompmgr_selection;
     kompmgr_selection = NULL;
-    kompmgr->disconnect(this, TQT_SLOT(restartKompmgr(TDEProcess*)));
+    kompmgr->disconnect(this, TQ_SLOT(restartKompmgr(TDEProcess*)));
     options->useTranslucency = FALSE;
     if (popup){ delete popup; popup = 0L; } // to add/remove opacity slider
     kompmgr->kill(SIGKILL);
@@ -2902,7 +3036,7 @@ void Workspace::unblockKompmgrRestart()
 }
 
 void Workspace::restartKompmgr( TDEProcess *proc )
-// this is for inernal purpose (crashhandling) only, usually you want to use workspace->stopKompmgr(); TQTimer::singleShot(200, workspace, TQT_SLOT(startKompmgr()));
+// this is for inernal purpose (crashhandling) only, usually you want to use workspace->stopKompmgr(); TQTimer::singleShot(200, workspace, TQ_SLOT(startKompmgr()));
 {
     bool crashed;
     if (proc->signalled()) {	// looks like kompmgr may have crashed
@@ -2951,7 +3085,7 @@ void Workspace::restartKompmgr( TDEProcess *proc )
         else
         {
             allowKompmgrRestart = FALSE;
-            TQTimer::singleShot( 60000, this, TQT_SLOT(unblockKompmgrRestart()) );
+            TQTimer::singleShot( 60000, this, TQ_SLOT(unblockKompmgrRestart()) );
         }
     }
 }
@@ -2978,7 +3112,7 @@ void Workspace::handleKompmgrOutput( TDEProcess* , char *buffer, int buflen)
     else return; //skip others
     // kompmgr startup failed or succeeded, release connection
     kompmgr->closeStderr();
-    disconnect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int)));
+    disconnect(kompmgr, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(handleKompmgrOutput(TDEProcess*, char*, int)));
     if( !message.isEmpty())
         {
         TDEProcess proc;
@@ -2988,8 +3122,7 @@ void Workspace::handleKompmgrOutput( TDEProcess* , char *buffer, int buflen)
         proc.start(TDEProcess::DontCare);
         }
 }
-    
-        
+
 void Workspace::setOpacity(unsigned long winId, unsigned int opacityPercent)
 {
     if (opacityPercent > 100) opacityPercent = 100;
diff --git a/twin/workspace.h b/twin/workspace.h
index e88e68c85..9c5e55203 100644
--- a/twin/workspace.h
+++ b/twin/workspace.h
@@ -72,7 +72,7 @@ typedef TQValueList<SystemTrayWindow> SystemTrayWindowList;
 
 class Workspace : public TQObject, public KWinInterface, public KDecorationDefines
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Workspace( bool restore = FALSE );
         virtual ~Workspace();
@@ -156,7 +156,10 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void clientHidden( Client*  );
         void clientAttentionChanged( Client* c, bool set );
 
-        void clientMoved(const TQPoint &pos, Time time);
+        void checkActiveBorder(const TQPoint &pos, Time time);
+        void reserveActiveBorder(ActiveBorder border);
+        void unreserveActiveBorder(ActiveBorder border);
+        void reserveActiveBorderSwitching(bool reserve);
 
         /**
          * Returns the current virtual desktop of this workspace
@@ -167,7 +170,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
          */
         int numberOfDesktops() const;
         void setNumberOfDesktops( int n );
-        
+
         int activeScreen() const;
         int numScreens() const;
         void checkActiveScreen( const Client* c );
@@ -201,8 +204,13 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void windowToNextDesktop( Client* c );
         void sendClientToScreen( Client* c, int screen );
 
-    // KDE4 remove me - and it's also in the DCOP interface :(
         void showWindowMenuAt( unsigned long id, int x, int y );
+        void showWindowMenu( unsigned long id );
+
+        void tileWindowToBorder(unsigned long w1, int location);
+        void tileTwoWindowsHorizontally(unsigned long w1, unsigned long w2);
+        void tileTwoWindowsVertically(unsigned long w1, unsigned long w2);
+        void tileFourWindowsInGrid(unsigned long w1, unsigned long w2, unsigned long w3, unsigned long w4);
         void kDestopResized();
 
         /**
@@ -254,7 +262,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
 
         void sendPingToWindow( Window w, Time timestamp ); // called from Client::pingWindow()
         void sendTakeActivity( Client* c, Time timestamp, long flags ); // called from Client::takeActivity()
-        
+
         bool kompmgrIsRunning();
         void setOpacity(unsigned long winId, unsigned int opacityPercent);
         void setShadowSize(unsigned long winId, unsigned int shadowSizePercent);
@@ -273,7 +281,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void focusToNull(); // SELI public?
         enum FocusChainChange { FocusChainMakeFirst, FocusChainMakeLast, FocusChainUpdate };
         void updateFocusChains( Client* c, FocusChainChange change );
-        
+
         bool forcedGlobalMouseGrab() const;
         void clientShortcutUpdated( Client* c );
         bool shortcutAvailable( const TDEShortcut& cut, Client* ignore = NULL ) const;
@@ -302,7 +310,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void requestDelayFocus( Client* );
         void updateFocusMousePosition( const TQPoint& pos );
         TQPoint focusMousePosition() const;
-        
+
         void toggleTopDockShadows(bool on);
 
     public slots:
@@ -387,7 +395,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void setupWindowShortcutDone( bool );
 
         void updateClientArea();
-        
+
         // kompmgr, also dcop
         void startKompmgr();
 
@@ -406,6 +414,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void cleanupTemporaryRules();
         void writeWindowRules();
         void kipcMessage( int id, int data );
+        void updateActiveBorders();
         // kompmgr
         void setPopupClientOpacity(int v);
         void resetClientOpacity();
@@ -486,15 +495,13 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void tabBoxKeyPress( const KKeyNative& keyX );
         void tabBoxKeyRelease( const XKeyEvent& ev );
 
-    // electric borders
-        void checkElectricBorders( bool force = false );
-        void createBorderWindows();
-        void destroyBorderWindows();
-        bool electricBorder(XEvent * e);
-        void raiseElectricBorders();
+    // active borders
+        void destroyActiveBorders();
+        bool activeBorderEvent(XEvent *e);
+        void activeBorderSwitchDesktop(ActiveBorder border, const TQPoint& pos);
 
     // ------------------
-    
+
         void helperDialog( const TQString& message, const Client* c );
 
         void calcDesktopLayout(int &x, int &y) const;
@@ -550,7 +557,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         ClientList global_focus_chain; // this one is only for things like tabbox's MRU
         ClientList should_get_focus; // last is most recent
         ClientList attention_chain;
-        
+
         bool showing_desktop;
         ClientList showing_desktop_clients;
         int block_showing_desktop;
@@ -617,21 +624,19 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
 
         TDEStartupInfo* startup;
 
-        bool electric_have_borders;
-        int electric_current_border;
-        WId electric_top_border;
-        WId electric_bottom_border;
-        WId electric_left_border;
-        WId electric_right_border;
-        int electricLeft;
-        int electricRight;
-        int electricTop;
-        int electricBottom;
-        Time electric_time_first;
-        Time electric_time_last;
-        TQPoint electric_push_point;
-
-        Qt::Orientation layoutOrientation;
+        ActiveBorder active_current_border;
+        Window active_windows[ ACTIVE_BORDER_COUNT ];
+        int activeLeft;
+        int activeRight;
+        int activeTop;
+        int activeBottom;
+        Time active_time_first;
+        Time active_time_last;
+        Time active_time_last_trigger;
+        TQPoint active_push_point;
+        int active_reserved[ ACTIVE_BORDER_COUNT ]; // corners/edges used by something
+
+        TQt::Orientation layoutOrientation;
         int layoutX;
         int layoutY;
 
@@ -654,7 +659,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         bool forced_global_mouse_grab;
         friend class StackingUpdatesBlocker;
         friend class Client;
-        
+
         //kompmgr
         TQSlider *transSlider;
         TQPushButton *transButton;
@@ -663,7 +668,11 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         int maximizedWindowCounter;
         int topDockShadowSize;*/
         //end
-        
+
+        Window outline_left;
+        Window outline_right;
+        Window outline_top;
+        Window outline_bottom;
      signals:
         void kompmgrStarted();
         void kompmgrStopped();