summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2013-01-07 22:09:27 +0100
committerFrancois Andriot <francois.andriot@free.fr>2013-01-07 22:09:27 +0100
commit08897cbabbbda793fbb6039b367c1ae12fe342a5 (patch)
tree52d2d41cca288b7819f29dd51f4613fe5ddb9008
parent0b6cf1d91af0dc06ac1aedf6d6eba438c18c7e8f (diff)
downloadtde-packaging-08897cbabbbda793fbb6039b367c1ae12fe342a5.tar.gz
tde-packaging-08897cbabbbda793fbb6039b367c1ae12fe342a5.zip
RPM Packaging: more forgotten files
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop-3.5.13.tar.gz0
-rw-r--r--redhat/extras/trinity-live/trinity-live-3.5.13.tar.gz0
-rw-r--r--redhat/kdeaddons/kdeaddons-3.5.13-sru-20120809.patch.gzbin0 -> 56127 bytes
-rw-r--r--redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec2
-rw-r--r--redhat/kdebase/kdebase-3.5.13-sru-20120806.patch36954
-rw-r--r--redhat/kdebase/kdebase-3.5.13-sru-20120912.patch37439
-rw-r--r--redhat/kdebase/kdebase-3.5.13-upgrade_to_sru_20120806.patch.gzbin0 -> 302981 bytes
-rw-r--r--redhat/kdebase/trinity-kdebase-3.5.13.spec2
-rw-r--r--redhat/kdegames/kdegames-3.5.13-sru-20120827.patch.gzbin0 -> 129535 bytes
-rw-r--r--redhat/kdegames/trinity-kdegames-3.5.13.spec2
-rw-r--r--redhat/libraries/libtdeldap/trinity-libtdeldap-r14.spec142
11 files changed, 145 insertions, 74396 deletions
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.tar.gz b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.tar.gz
deleted file mode 100644
index e69de29bb..000000000
--- a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.tar.gz
+++ /dev/null
diff --git a/redhat/extras/trinity-live/trinity-live-3.5.13.tar.gz b/redhat/extras/trinity-live/trinity-live-3.5.13.tar.gz
deleted file mode 100644
index e69de29bb..000000000
--- a/redhat/extras/trinity-live/trinity-live-3.5.13.tar.gz
+++ /dev/null
diff --git a/redhat/kdeaddons/kdeaddons-3.5.13-sru-20120809.patch.gz b/redhat/kdeaddons/kdeaddons-3.5.13-sru-20120809.patch.gz
new file mode 100644
index 000000000..47b2c4451
--- /dev/null
+++ b/redhat/kdeaddons/kdeaddons-3.5.13-sru-20120809.patch.gz
Binary files differ
diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
index 6f24499b2..f9c2db0ac 100644
--- a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
+++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
@@ -42,7 +42,7 @@ Source1: metabar-fedora.tar.bz2
Source2: metabarrc
# [tdeaddons] Updates from v3.5.13-sru branch
-Patch0: kdeaddons-3.5.13-sru-20120809.patch
+Patch0: kdeaddons-3.5.13-sru-20120809.patch.gz
BuildRequires: autoconf automake libtool m4
BuildRequires: trinity-arts-devel
diff --git a/redhat/kdebase/kdebase-3.5.13-sru-20120806.patch b/redhat/kdebase/kdebase-3.5.13-sru-20120806.patch
deleted file mode 100644
index b1c1ba2d5..000000000
--- a/redhat/kdebase/kdebase-3.5.13-sru-20120806.patch
+++ /dev/null
@@ -1,36954 +0,0 @@
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/applnk/kde-settings.menu v3.5.13-sru/applnk/kde-settings.menu
---- /tmp/stable//kdebase/applnk/kde-settings.menu 2010-08-12 05:28:24.000000000 +0200
-+++ v3.5.13-sru/applnk/kde-settings.menu 2012-07-31 17:17:50.000000000 +0200
-@@ -46,12 +46,19 @@
- </Menu>
- </Menu>
- <Menu>
-- <Name>Peripherals</Name>
-- <Directory>kde-settings-peripherals.directory</Directory><!-- Rename KDE4? -->
-+ <Name>Hardware</Name>
-+ <Directory>kde-settings-hardware.directory</Directory>
- <Include>
-- <Category>X-KDE-settings-peripherals</Category><!-- Remove KDE4 -->
-+ <Category>X-KDE-settings-peripherals</Category>
- <Category>X-KDE-settings-hardware</Category>
- </Include>
-+ <Menu>
-+ <Name>Information</Name>
-+ <Directory>kde-settings-information.directory</Directory>
-+ <Include>
-+ <Category>X-KDE-settings-information</Category>
-+ </Include>
-+ </Menu>
- </Menu>
- <Menu>
- <Name>PowerControl</Name>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/CMakeLists.txt v3.5.13-sru/CMakeLists.txt
---- /tmp/stable//kdebase/CMakeLists.txt 2011-10-24 02:08:24.000000000 +0200
-+++ v3.5.13-sru/CMakeLists.txt 2012-07-31 17:17:50.000000000 +0200
-@@ -27,6 +27,7 @@
- include( CheckLibraryExists )
- include( CheckFunctionExists )
- include( CheckStructHasMember )
-+include( CheckTypeSize )
-
-
- ##### include our cmake modules #################
-@@ -65,6 +66,9 @@
- option( WITH_XRENDER "Enable xrender support" OFF )
- option( WITH_XDAMAGE "Enable xdamage support" OFF )
- option( WITH_XEXT "Enable xext support" OFF )
-+option( WITH_XTEST "Enable xext support" OFF )
-+option( WITH_XSCREENSAVER "Enable xscreensaver support" OFF )
-+option( WITH_LIBART "Enable libart support (for SVG icons and wallpapers)" OFF )
- option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF )
- option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF )
- option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF )
-@@ -149,6 +153,8 @@
- set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
- set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
-
-+check_type_size( "long long" LONG_LONG )
-+
-
- ##### kdebase directories #######################
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/config.h.cmake v3.5.13-sru/config.h.cmake
---- /tmp/stable//kdebase/config.h.cmake 2011-10-29 23:02:15.000000000 +0200
-+++ v3.5.13-sru/config.h.cmake 2012-07-31 17:17:50.000000000 +0200
-@@ -1,5 +1,8 @@
- #define VERSION "@VERSION@"
-
-+// Defined if compiler supports long long type.
-+#cmakedefine HAVE_LONG_LONG 1
-+
- // konsole
- #cmakedefine HAVE_PROC_CWD 1
-
-@@ -15,6 +18,15 @@
- // konsole, kdm, kxkb
- #cmakedefine HAVE_XKB 1
-
-+// kxkb
-+#cmakedefine HAVE_XTEST 1
-+
-+// xscreensaver
-+#cmakedefine HAVE_XSCREENSAVER 1
-+
-+// libart
-+#cmakedefine HAVE_LIBART 1
-+
- // kdm, kioslave
- #cmakedefine HAVE_TERMIOS_H 1
-
-@@ -114,6 +126,7 @@
- #cmakedefine HAVE_SYSINFO 1
- #cmakedefine HAVE_STRNLEN 1
- #cmakedefine HAVE_GETIFADDRS 1
-+#cmakedefine HAVE_CRYPT 1
-
- #cmakedefine HAVE_SETUSERCONTEXT 1
- #cmakedefine HAVE_GETUSERSHELL 1
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ConfigureChecks.cmake v3.5.13-sru/ConfigureChecks.cmake
---- /tmp/stable//kdebase/ConfigureChecks.cmake 2011-09-08 04:06:01.000000000 +0200
-+++ v3.5.13-sru/ConfigureChecks.cmake 2012-07-31 17:17:50.000000000 +0200
-@@ -9,6 +9,8 @@
- #
- #################################################
-
-+tde_setup_architecture_flags( )
-+
- # termios.h (kdm, kioslave)
- if( BUILD_KDM OR BUILD_KIOSLAVES )
- check_include_file( termios.h HAVE_TERMIOS_H )
-@@ -44,6 +46,15 @@
- endif( )
-
-
-+# udev (tsak)
-+if( BUILD_TSAK )
-+ pkg_search_module( UDEV libudev )
-+ if( NOT UDEV_FOUND )
-+ tde_message_fatal( "udev is required, but was not found on your system" )
-+ endif( )
-+endif( )
-+
-+
- # xrender (kdesktop, konsole, kcontrol, kicker, kwin)
- if( WITH_XRENDER OR BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_KICKER )
- pkg_search_module( XRENDER xrender )
-@@ -100,12 +111,45 @@
- # xext (kwin/kompmgr)
- if( WITH_XEXT )
- pkg_search_module( XEXT xext )
-- if( NOT XEXT_FOUND )
-+ if( XEXT_FOUND )
-+ set( HAVE_XEXT 1 )
-+ else( XEXT_FOUND )
- tde_message_fatal( "xext is requested, but was not found on your system" )
- endif( )
- endif( )
-
-
-+# xtest (kxkb)
-+if( WITH_XTEST )
-+ pkg_search_module( XTEST xtst )
-+ if( XTEST_FOUND )
-+ set( HAVE_XTEST 1 )
-+ else( XTEST_FOUND )
-+ tde_message_fatal( "xtest is requested, but was not found on your system" )
-+ endif( )
-+endif( )
-+
-+
-+# xscreensaver ()
-+if( WITH_XSCREENSAVER )
-+ check_library_exists( Xss XScreenSaverQueryInfo "" HAVE_XSSLIB )
-+ if( HAVE_XSSLIB )
-+ pkg_search_module( XSS xscrnsaver )
-+ else( )
-+ check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
-+ if( HAVE_XSSLIB )
-+ pkg_search_module( XSS xext )
-+ endif( )
-+ endif( )
-+ check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )
-+ if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
-+ set( HAVE_XSCREENSAVER 1 )
-+ else( )
-+ tde_message_fatal( "xscreensaver is requested, but was not found on your system" )
-+ endif( )
-+endif( )
-+
-+
- # GL
- if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_KSCREENSAVER )
- check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )
-@@ -173,6 +217,16 @@
- set( WITHOUT_ARTS 1 )
- endif( )
-
-+# libart
-+
-+if( WITH_LIBART )
-+ pkg_search_module( LIBART libart-2.0 )
-+ if( NOT LIBART_FOUND )
-+ message(FATAL_ERROR "\nlibart-2.0 support are requested, but not found on your system" )
-+ endif( NOT LIBART_FOUND )
-+ set( HAVE_LIBART 1 )
-+endif( WITH_LIBART )
-+
-
- # required stuff
- find_package( TQt )
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/doc/kcontrol/kcmaccess/index.docbook v3.5.13-sru/doc/kcontrol/kcmaccess/index.docbook
---- /tmp/stable//kdebase/doc/kcontrol/kcmaccess/index.docbook 2010-08-12 05:29:46.000000000 +0200
-+++ v3.5.13-sru/doc/kcontrol/kcmaccess/index.docbook 2012-07-31 17:17:50.000000000 +0200
-@@ -103,8 +103,8 @@
- If this option is enabled, you can press and release the &Shift;,
- &Alt; or &Ctrl; keys, and then press another key to get a key combo
- (example: <keycombo action="simul">&Ctrl; &Alt;
--<keycap>Del</keycap></keycombo> could be done with &Ctrl; then &Alt;
--then <keycap>Del</keycap>).
-+<keycap>Delete</keycap></keycombo> could be done with &Ctrl; then &Alt;
-+then <keycap>Delete</keycap>).
- </para>
-
- <para>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/doc/kdm/index.docbook v3.5.13-sru/doc/kdm/index.docbook
---- /tmp/stable//kdebase/doc/kdm/index.docbook 2011-08-21 09:08:15.000000000 +0200
-+++ v3.5.13-sru/doc/kdm/index.docbook 2012-07-31 17:17:50.000000000 +0200
-@@ -18,9 +18,9 @@
- <title>The &kdm; Handbook</title>
-
- <authorgroup>
--<author>
--&Oswald.Buddenhagen; &Oswald.Buddenhagen.mail;
--</author><!--
-+<corpauthor>
-+The &kde; Documentation Team
-+</corpauthor><!--
- <othercredit role="developer">
- &Oswald.Buddenhagen; &Oswald.Buddenhagen.mail;
- <contrib>Developer</contrib>
-@@ -49,16 +49,21 @@
- <holder>&Lauri.Watts;</holder>
- </copyright>
-
--<date>2003-03-01</date>
--<releaseinfo>0.05.02</releaseinfo>
-+<copyright>
-+<year>2011</year>
-+<holder>The TDE Documentation Team</holder>
-+</copyright>
-+
-+<date>2011-11-01</date>
-+<releaseinfo>3.5.13</releaseinfo>
-
- <abstract>
--<para>This document describes &kdm; the &kde; Display Manager. &kdm;
-+<para>This document describes &kdm;, the &kde; Display Manager. &kdm;
- is also known as the <quote>Login Manager</quote>.</para>
- </abstract>
-
- <keywordset>
--<keyword>KDE</keyword>
-+<keyword>TDE</keyword>
- <keyword>kdm</keyword>
- <keyword>xdm</keyword>
- <keyword>display manager</keyword>
-@@ -72,13 +77,13 @@
-
- <para>&kdm; provides a graphical interface that allows you to log in to a
- system. It prompts for login (username) and password, authenticates the user
--and starts a <quote>session</quote>. &kdm; is superior to &xdm;, the X
-+and starts a <quote>session</quote>. &kdm; is superior to &xdm;, the X
- Display Manager, in a number of ways.</para>
-
- </chapter>
-
- <!-- Chapters to write -->
--<!-- * Just enough config to get it to run and login to KDE
-+<!-- * Just enough config to get it to run and login to TDE
- * Adding more session types (GNOME, etc)
- * Adding other customizations to XSession (ssh/gpg-agent, etc)
- * Further customization to KDM (via the kcontrol module, and by
-@@ -136,7 +141,7 @@
- </procedure>
-
- <para>At this point, typing <userinput><command>startx</command></userinput>
--on the commandline should start X, with a &kde; session. The next task is
-+on the commandline should start X, with a &kde; session. The next task is
- to try &kdm;.</para>
-
- <para>As <systemitem class="username">root</systemitem>, type
-@@ -153,9 +158,9 @@
- above for each of them.</para>
-
- <note>
--<para>This is a quick guide to getting up and running only. You probably
-+<para>This is a quick guide to getting up and running only. You probably
- will want to customize &kdm; further, for example, to hide the names of the
--system accounts, to allow further sessions, and much more. Please read
-+system accounts, to allow further sessions, and much more. Please read
- through the rest of this manual to find out how to do these things.</para>
- </note>
-
-@@ -164,8 +169,15 @@
- <chapter id="login">
- <title>The Login Window</title>
-
--<para> The user interface to &kdm; consists of two dialog boxes. The main
--dialog box has these controls:</para>
-+<para>The &kdm; interface consists of two dialog boxes: a login dialog
-+and a shutdown dialog.</para>
-+
-+<note><para>The &kdm; interface might be protected by the Trinity Secure Access
-+Key (SAK) mechanism. When the SAK is enabled, users are prompted to press
-+<keycombo action="simul">&Ctrl; &Alt;<keycap>Delete</keycap></keycombo>
-+to obtain access to the &kdm; interface.</para></note>
-+
-+<para>The main login dialog box has these controls:</para>
-
- <itemizedlist>
- <listitem>
-@@ -296,43 +308,41 @@
- <para>This chapter assumes that &kdm; is already up and running on your
- system, and that you simply want to change its behavior in some way.</para>
-
--<para>When &kdm; starts up, it reads its configuration from the folder
-+<para>Upon starting, &kdm; reads its configuration from the folder
- <filename class="directory">$KDEDIR/share/config/kdm/</filename> (this may
- be <filename class="directory">/etc/trinity/kdm/</filename> or something else
- on your system).</para>
-
- <para>The main configuration file is &kdmrc;; all other files are
- referenced from there and could be stored under any name anywhere on
--the system - but usually that would not make much sense for obvious
-+the system. Usually that would not make much sense for obvious
- reasons (one particular exception is referencing configuration files
--of an already installed &xdm; - however when a new &kdm; is installed,
-+of an already installed &xdm;. However, when a new &kdm; is installed,
- it will import settings from those files if it finds an already installed
- &xdm;).</para>
-
- <para>Since &kdm; must run before any user is logged in, it is not
- associated with any particular user. Therefore, it is not possible to have
--user-specific configuration files; all users share the common &kdmrc;. It
-+user-specific configuration files; all users share the common &kdmrc;. It
- follows from this that the configuration of &kdm; can only be altered by
--those users that have write access to
-+those users who have write access to
- <filename>$<envar>KDEDIR</envar>/share/config/kdm/kdmrc</filename> (normally
- restricted to system administrators logged in as <systemitem
- class="username">root</systemitem>).</para>
-
- <para>You can view the &kdmrc; file currently in use on your system, and you
--can configure &kdm; by editing this file. Alternatively, you can use the
-+can configure &kdm; by editing that file. Alternately, you can use the
- graphical configuration tool provided by the &kcontrolcenter; (under
- <menuchoice><guisubmenu>System Administration</guisubmenu><guimenuitem>Login
--Manager</guimenuitem></menuchoice>), which is described in <ulink
--url="help:/kcontrol/login-manager.html">the &kcontrolcenter; help files</ulink>.
-+Manager</guimenuitem></menuchoice>), which is described in the next section.
- </para>
-
--<para>The remainder of this chapter describes configuration of &kdm;
--via the &kcontrolcenter; module, and the <link linkend="kdm-files">next
-+<para>The remainder of this chapter describes configuring &kdm;
-+using the &kcontrolcenter; module, and the <link linkend="kdm-files">next
- chapter</link> describes the options available in &kdmrc; itself. If
- you only need to configure for local users, the &kcontrolcenter; module
--should be sufficient for your needs. If you need to configure remote
--logins, or have multiple &kdm; sessions running, you will need to read
--on.</para>
-+should be sufficient for your needs. If you need to configure remote
-+logins, or have multiple &kdm; sessions running, you will need to continue reading.</para>
-
- <sect1 id="kdm-kcontrol-module">
- <sect1info>
-@@ -346,14 +356,15 @@
- <title>The Login Manager &kcontrolcenter; Module</title>
-
- <para>Using this module, you can configure the &kde; graphical login
--manager, &kdm;. You can change how the login screen looks, who has
-+manager, &kdm;. You can change how the login screen looks, who has
- access using the login manager and who can shutdown the
- computer.</para>
-
- <note><para>All settings will be written to the configuration file
- &kdmrc;, which in its original state has many comments to help you
--configure &kdm;. Using this &kcontrolcenter; module will strip these
--comments from the file. All available options in &kdmrc; are covered
-+configure &kdm;. Using this &kcontrolcenter; module will strip these
-+comments from the file. Consider making a backup of &kdmrc; before
-+making changes. All available options in &kdmrc; are covered
- in <xref linkend="kdm-files"/>.</para>
-
- <para>The options listed in this chapter are cross referenced with
-@@ -376,8 +387,8 @@
- the window.</para>
-
- <note><para>If you are not currently logged in as a superuser, you
--will need to click the <guibutton>Administrator Mode...</guibutton>
--Button. You will then be asked for a superuser password. Entering a
-+will need to select the <guibutton>Administrator Mode...</guibutton>
-+Button. You will then be asked for a superuser password. Entering a
- correct password will allow you to modify the settings of this
- module.</para></note>
-
-@@ -388,15 +399,15 @@
- &kde;'s graphical login manager.</para>
-
- <para>The <guilabel>Greeting:</guilabel> is the title of the login
-- screen. Setting this is especially useful if you have many servers users
-- may log in to. You may use various placeholders, which are described
-+ screen. Setting this is especially useful if you have many servers users
-+ may log in to. You may use various placeholders, which are described
- along with the corresponding key
- <link linkend="option-greetstring"><option>GreetString</option></link>
- in &kdmrc;.
- </para>
-
- <para>You can then choose to show either the current system time, a logo or
--nothing special in the login box. Make your choice in the radio buttons
-+nothing special in the login box. Make your choice in the radio buttons
- labeled <guilabel>Logo area:</guilabel>. This corresponds to <link
- linkend="option-logoarea"><option>LogoArea</option></link> in &kdmrc;</para>
-
-@@ -417,9 +428,9 @@
- <filename>$<envar>KDEDIR</envar>/share/apps/kdm/pics/kdelogo.xpm</filename>
- will be displayed.</para>
-
--<para>Normally the login box is centered on the screen. Use the
-+<para>Normally the login box is centered on the screen. Use the
- <guilabel>Position:</guilabel> options if you want it to appear
--elsewhere on the screen. You can specify the relative position
-+elsewhere on the screen. You can specify the relative position
- (percentage of the screen size) for the center of the login window,
- relative to the top left of the display, in the fields labeled
- <guilabel>X:</guilabel> and <guilabel>Y:</guilabel> respectively.
-@@ -439,18 +450,61 @@
- your login box, corresponding to setting <option>Language</option> in
- &kdmrc;.</para>
-
-+<para>In this same section &kdm; can be configured to use a <guilabel>Secure
-+Attention Key</guilabel> (SAK). A Secure Attention Key is a special key press
-+to which only certain privileged applications are able to respond, such as the
-+login and screen unlock dialogs. This mechanism prevents a malevolent user
-+from creating an exact copy of the login screen to "sniff" or "phish" passwords
-+or other sensitive information. The unprivileged copy is unable to detect the
-+SAK key press, thereby providing a visible difference in operation to the
-+user.</para>
-+
-+<para>When the Trinity SAK is enabled, users are prompted to press
-+<keycombo action="simul">&Ctrl; &Alt;<keycap>Delete</keycap></keycombo>
-+before sensitive information is requested.
-+
-+<screenshot>
-+<screeninfo>The Trinity Secure Attention Key dialog</screeninfo>
-+<mediaobject>
-+<imageobject>
-+<imagedata fileref="tsak.png" format="PNG"/>
-+</imageobject>
-+<textobject><phrase>The Trinity Secure Attention Key dialog</phrase>
-+</textobject>
-+</mediaobject>
-+</screenshot>
-+</para>
-+
-+<para>When SAK is enabled, and the
-+<keycombo action="simul">&Ctrl; &Alt;<keycap>Delete</keycap></keycombo>
-+dialog does not appear before sensitive information is requested, someone might
-+be attempting to "phish" for that information. A prudent course of action would
-+be to terminate the active X11 session via <keycombo action="simul">&Ctrl; &Alt;
-+<keycap>Backspace</keycap></keycombo> or any other distribution-specific key press
-+for this action, thereby restoring control to the kernel and base system.</para>
-+
-+<para>Generally, using the Trinity SAK is a good idea when supporting many
-+graphical login accounts on a machine. For example, in enterprise environments
-+or computer laboratories. When only one graphical login account is used, or
-+only a few accounts in a controlled environment, such as with a home computer,
-+Trinity SAK will not provide tangible benefits over the standard login
-+methods.</para>
-+
-+<note><para>Trinity SAK requires evdev to be running and the Linux uinput kernel
-+module to be loaded.</para></note>
-+
- </sect2>
-
- <sect2 id="kdmconfig-font">
- <title>Font</title>
-
- <para>From this section of the module you can change the fonts used in the
--login window. Only fonts available to all users are available here, not
-+login window. Only fonts available to all users are available here, not
- fonts you have installed on a per user basis.</para>
-
- <para>You can select three different font styles from the drop down box
- (<guilabel>General:</guilabel>, <guilabel>Failures:</guilabel>,
--<guilabel>Greeting:</guilabel>). When you click on the
-+<guilabel>Greeting:</guilabel>). When you click on the
- <guibutton>Choose...</guibutton> button a dialog appears from which you can
- select the new characteristics for the font style.</para>
-
-@@ -492,8 +546,8 @@
- the color buttons and select a new color.</para>
-
- <para>The drop down box above the color buttons provides you with several
--different blend effects. Choose one from the list, and it will be
--previewed on the small monitor at the top of the window. Your choices
-+different blend effects. Choose one from the list, and it will be
-+previewed on the small monitor at the top of the window. Your choices
- are:</para>
-
- <variablelist>
-@@ -507,24 +561,24 @@
- <term>Pattern</term>
- <listitem><para>By choosing this mode, you select two colors (using both color
- buttons). </para> <para>You then select a pattern by clicking
--<guilabel>Setup</guilabel>. This opens a new dialog window, which gives you
--the opportunity to select a pattern. Simply click once on the pattern of your
-+<guilabel>Setup</guilabel>. This opens a new dialog window, which gives you
-+the opportunity to select a pattern. Simply click once on the pattern of your
- choice, then click on <guilabel>OK</guilabel>, and &kde; will render the pattern
--you selected using the two colors you selected. For more on patterns, see the
-+you selected using the two colors you selected. For more on patterns, see the
- section <ulink url="help:/kcontrol/background/index.html#bkgnd-patterns">Background: Adding, Removing and Modifying
- Patterns</ulink>.</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>Background Program</term>
- <listitem><para>By selecting this option, you can have &kde; use an external
--program to determine the background. This can be any program of your choosing.
-+program to determine the background. This can be any program of your choosing.
- For more information on this option, see the section entitled <ulink
- url="help:/kcontrol/background/index.html#bkgnd-programs">Background: Using an external program</ulink>.</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>Horizontal Gradient</term>
- <listitem><para>By choosing this mode, you select two colors (using both color
--buttons). &kde; will then start with the color selected by <guilabel>Color
-+buttons). &kde; will then start with the color selected by <guilabel>Color
- 1</guilabel> on the left edge of the screen, and slowly transform into the
- color selected by <guilabel>Color 2</guilabel> by the time it gets to the
- right edge of the screen.</para></listitem>
-@@ -532,7 +586,7 @@
- <varlistentry>
- <term>Vertical Gradient</term>
- <listitem><para>By choosing this mode, you select two colors (using both color
--buttons). &kde; will then start with the color selected by <guilabel>Color
-+buttons). &kde; will then start with the color selected by <guilabel>Color
- 1</guilabel> on the top edge of the screen, and slowly transform into the color
- selected by <guilabel>Color 2</guilabel> as it moves to the bottom of the
- screen.</para></listitem>
-@@ -540,7 +594,7 @@
- <varlistentry>
- <term>Pyramid Gradient</term>
- <listitem><para>By choosing this mode, you select two colors (using both color
--buttons). &kde; will then start with the color selected by <guilabel>Color
-+buttons). &kde; will then start with the color selected by <guilabel>Color
- 1</guilabel> in each corner of the screen, and slowly transform into the color
- selected by <guilabel>Color 2</guilabel> as it moves to the center of the
- screen.</para></listitem>
-@@ -548,7 +602,7 @@
- <varlistentry>
- <term>Pipecross Gradient</term>
- <listitem><para>By choosing this mode, you select two colors (using both color
--buttons). &kde; will then start with the color selected by <guilabel>Color
-+buttons). &kde; will then start with the color selected by <guilabel>Color
- 1</guilabel> in each corner of the screen, and slowly transform into the color
- selected by <guilabel>Color 2</guilabel> as it moves to the center of the
- screen. The <quote>shape</quote> of this gradient is different then the pyramid
-@@ -557,7 +611,7 @@
- <varlistentry>
- <term>Elliptic Gradient</term>
- <listitem><para>By choosing this mode, you select two colors (using both color
--buttons). &kde; will then start with the color selected by <guilabel>Color
-+buttons). &kde; will then start with the color selected by <guilabel>Color
- 2</guilabel> in the center of the screen, and slowly transform into the color
- selected by <guilabel>Color 1</guilabel> as it moves to the edges, in an
- elliptical pattern.</para></listitem>
-@@ -565,7 +619,7 @@
- </variablelist>
-
- <para>The setup button is only needed for if you select <guilabel>Background
--program</guilabel> or <guilabel>Patterns</guilabel>. In these instances,
-+program</guilabel> or <guilabel>Patterns</guilabel>. In these instances,
- another window will appear to configure the specifics.</para>
- <para><emphasis>Wallpaper</emphasis></para>
- <para>To select a new background image first, click on the
-@@ -577,11 +631,11 @@
- <variablelist>
- <varlistentry>
- <term>No wallpaper</term>
--<listitem><para>No image is displayed. Just the background colors.</para>
-+<listitem><para>No image is displayed. Just the background colors.</para>
- </listitem></varlistentry>
- <varlistentry>
- <term>Centered</term>
--<listitem><para>The image will be centered on the screen. The background colors
-+<listitem><para>The image will be centered on the screen. The background colors
- will be present anywhere the image does not cover.</para> </listitem>
- </varlistentry>
- <varlistentry>
-@@ -598,14 +652,14 @@
- </varlistentry>
- <varlistentry>
- <term>Centered Maxpect</term>
--<listitem><para>The image will be placed in the center of the screen. It will
-+<listitem><para>The image will be placed in the center of the screen. It will
- be scaled to fit the desktop, but it will not change the aspect ratio of the
--original image. This will provide you with an image that is not distorted.
-+original image. This will provide you with an image that is not distorted.
- </para> </listitem>
- </varlistentry>
- <varlistentry>
- <term>Scaled</term>
--<listitem><para>The image will be scaled to fit the desktop. It will be
-+<listitem><para>The image will be scaled to fit the desktop. It will be
- stretched to fit all four corners.</para> </listitem>
- </varlistentry>
- </variablelist>
-@@ -620,7 +674,7 @@
- <itemizedlist>
- <listitem>
- <para><guilabel>Nobody</guilabel>: No one can shutdown the computer using
--&kdm;. You must be logged in, and execute a command.</para>
-+&kdm;. You must be logged in, and execute a command.</para>
- </listitem>
- <listitem>
- <para><guilabel>Everybody</guilabel>: Everyone can shutdown the computer using
-@@ -639,14 +693,14 @@
- define the exact shutdown command.</para> <para>The
- <guilabel>Halt:</guilabel> command defaults to <!-- Are these defaults still
- correct? they disagree with what's in --> <!-- kdmrc -->
--<command>/sbin/halt</command>. The <guilabel>Restart:</guilabel> command
-+<command>/sbin/halt</command>. The <guilabel>Restart:</guilabel> command
- defaults to
- <command>/sbin/reboot</command>.</para>
-
- <para>When <guilabel>Show boot options</guilabel> is enabled, &kdm;
- will on reboot offer you options for the lilo boot manager. For this
- feature to work, you will need to supply the correct paths to your
--<command>lilo</command> command and to lilo's map file. Note that this
-+<command>lilo</command> command and to lilo's map file. Note that this
- option is not available on all operating systems.</para>
-
- </sect2>
-@@ -658,7 +712,7 @@
- login window.</para>
-
- <para>You may disable the user list in &kdm; entirely in the
--<guilabel>Show Users</guilabel> section. You can choose from:</para>
-+<guilabel>Show Users</guilabel> section. You can choose from:</para>
-
- <variablelist>
- <varlistentry>
-@@ -685,18 +739,18 @@
-
- <para>Independently of the users you specify by name, you can use the
- <guilabel>System UIDs</guilabel> to specify a range of valid
--<acronym>UID</acronym>s that are shown in the list. By default user
-+<acronym>UID</acronym>s that are shown in the list. By default user
- id's under 1000, which are often system or daemon users, and user id's
- over 65000, are not shown.</para>
-
- <para>You can also enable the <guilabel>Sort users</guilabel>
--checkbox, to have the user list sorted alphabetically. If this is
-+checkbox, to have the user list sorted alphabetically. If this is
- disabled, users will appear in the order they are listed in the
--password file. &kdm; will also autocomplete user names if you enable the
-+password file. &kdm; will also autocomplete user names if you enable the
- <guilabel>Autocompletion</guilabel> option.</para>
-
- <para>If you choose to show users, then the login window will show
--images (which you select), of a list of users. When someone is ready
-+images (which you select), of a list of users. When someone is ready
- to login, they may select their user name/image, enter their password,
- and they are granted access.</para>
-
-@@ -704,12 +758,12 @@
- for those images.</para>
-
- <para>You can configure the admin picture here, for each user on the
--system. Depending on the order selected above, users may be able to
-+system. Depending on the order selected above, users may be able to
- override your selection.</para>
-
- <para>If you choose not to show users, then the login window will be
--more traditional. Users will need to type their username and password
--to gain entrance. This is the preferred way if you have many users on
-+more traditional. Users will need to type their username and password
-+to gain entrance. This is the preferred way if you have many users on
- this terminal.</para>
-
- </sect2>
-@@ -725,13 +779,13 @@
- options. Every option in the <guilabel>Convenience</guilabel> tab is
- well-suited to seriously compromise your system security. Practically,
- these options are only to be used in a completely non-critical
--environment, &eg; a private computer at home. </para></important>
-+environment, &eg; a private computer at home. </para></important>
-
- <sect3 id="loginmanager-convenience-autologin">
- <title>Automatic Login</title>
-
- <para>Automatic login will give anyone access to a certain account on
--your system without doing any authentication. You can enable it using
-+your system without doing any authentication. You can enable it using
- the option <guilabel>Enable Auto-login</guilabel>.</para>
-
- <para>You can choose the account to be used for automatic login from
-@@ -748,7 +802,7 @@
-
- <para>Below this option you'll see a list of users on the system.
- Enable password-less login for specific users by checking the checkbox
--next to the login names. By default, this feature is disabled for
-+next to the login names. By default, this feature is disabled for
- all users.</para>
-
- <important><para>Again, this option should only be used in a safe
-@@ -762,7 +816,7 @@
- can choose <guilabel>Previous</guilabel> to have &kdm; default to the
- last successfully logged in user, or you can
- <guilabel>Specify</guilabel> a particular user to always be selected
--from the list. You can also have &kdm; set the focus to the password
-+from the list. You can also have &kdm; set the focus to the password
- field, so that when you reach the &kdm; login screen, you can type the
- password immediately.</para>
-
-@@ -793,7 +847,7 @@
-
- <para>The fundamental thing that controls whether your computer boots to a
- terminal prompt (console mode) or a graphical login prompt is the default
--runlevel. The runlevel is set by the program <application> <ulink
-+runlevel. The runlevel is set by the program <application> <ulink
- url="man:init">/sbin/init</ulink></application> under the control of the
- configuration file <filename>/etc/inittab</filename>. The default runlevels
- used by different &UNIX; systems (and different &Linux; distributions) vary,
-@@ -860,7 +914,7 @@
- </screen>
-
- <para>If you get a &kdm; login dialog and you are able to log in,
--things are going well. The main thing that can go wrong here is that
-+things are going well. The main thing that can go wrong here is that
- the run-time linker might not find the shared &Qt; or &kde; libraries.
- If you have a binary distribution of the &kde; libraries, make sure
- &kdm; is installed where the libraries believe &kde; is installed and
-@@ -954,7 +1008,7 @@
-
- <para>If this step is unsuccessful the most likely problem is that the
- environment used at boot time differs from the environment that you used for
--testing at the command line. If you are trying to get two versions of &kde;
-+testing at the command line. If you are trying to get two versions of &kde;
- to co-exist, be particularly careful that the settings you use for your
- <envar>PATH</envar> and <envar>LD_LIBRARY_PATH</envar> environment variables
- are consistent, and that the startup scripts are not over-riding them in
-@@ -968,7 +1022,7 @@
- <title>Supporting multiple window managers</title>
-
- <para>&kdm; detects most available window manager and desktop environments when
--it is run. Installing a new one should make it automatically available in
-+it is run. Installing a new one should make it automatically available in
- the &kdm; main dialog <guilabel>Session Type:</guilabel>.</para>
-
- <para>If you have a very new window manager, or something that &kdm; does
-@@ -1031,9 +1085,9 @@
- <para>To override a session type, copy the .desktop file from the data dir
- to the config dir and edit it at will. Removing the shipped session types
- can be accomplished by <quote>shadowing</quote> them with .desktop files
--containing Hidden=true. For the magic session types no .desktop files exist
-+containing Hidden=true. For the magic session types no .desktop files exist
- by default, but &kdm; pretends they would, so you can override them like any
--other type. I guess you already know how to add a new session type by
-+other type. I guess you already know how to add a new session type by
- now. ;-)</para>
-
- </chapter>
-@@ -1042,20 +1096,20 @@
- <title>Using &kdm; for Remote Logins (&XDMCP;)</title>
-
- <para>&XDMCP; is the Open Group standard, the <quote>X Display Manager
--Control Protocol</quote>. This is used to set up connections between
-+Control Protocol</quote>. This is used to set up connections between
- remote systems over the network.</para>
-
- <para>&XDMCP; is useful in multiuser situations where there are users
- with workstations and a more powerful server that can provide the
--resources to run multiple X sessions. For example, &XDMCP; is a good
-+resources to run multiple X sessions. For example, &XDMCP; is a good
- way to reuse old computers - a Pentium or even 486 computer with 16 Mb
- RAM is sufficient to run X itself, and using &XDMCP; such a computer can
--run a full modern &kde; session from a server. For the server part,
-+run a full modern &kde; session from a server. For the server part,
- once a single &kde; (or other environment) session is running, running
- another one requires very few extra resources.</para>
-
- <para>However, allowing another method of login to your machine
--obviously has security implications. You should run this service only
-+obviously has security implications. You should run this service only
- if you need to allow remote X Servers to start login sessions on your
- system. Users with a single &UNIX; computer should not need to run
- this.</para>
-@@ -1079,8 +1133,8 @@
- <literal>rw-rw-rw-</literal> (0666). This is because some systems don't care
- for the file permission of the socket files.</para>
-
--<para>There are two types of sockets: the global one (dmctl) and the
--per-display ones (dmctl-&lt;display&gt;).</para>
-+<para>There are two types of sockets: the global one (kdmctl) and the
-+per-display ones (kdmctl-&lt;display&gt;).</para>
-
- <para>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
-@@ -1201,9 +1255,9 @@
- <term><command>list</command> [<parameter>all</parameter> |
- <parameter>alllocal</parameter>]</term>
- <listitem>
--<para>Return a list of running sessions. By default all active sessions are
--listed. if <parameter>all</parameter> is specified, passive sessions are
--listed as well. If <parameter>alllocal</parameter> is specified, passive
-+<para>Return a list of running sessions. By default all active sessions are
-+listed. if <parameter>all</parameter> is specified, passive sessions are
-+listed as well. If <parameter>alllocal</parameter> is specified, passive
- sessions are listed as well, but all incoming remote sessions are
- skipped.</para>
- <para>Each session entry is a comma separated tuple of:</para>
-@@ -1272,14 +1326,14 @@
- <para>An OS choice for the next boot may be specified from the list returned
- by <command>listbootoptions</command></para>
- <para>Shutdowns requested from per-display sockets are executed when the
--current sessino on that display exits. Such a request may pop up a dialog
-+current sessino on that display exits. Such a request may pop up a dialog
- asking for confirmation and/or authentication</para>
- <para><parameter>start</parameter> is the time for which the shutdown is
--scheduled. If it starts with a plus-sign, the current time is added. Zero
-+scheduled. If it starts with a plus-sign, the current time is added. Zero
- means immediately.</para>
- <para><parameter>end</parameter> 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. -1 means wait infinitely. If end is
-+should be performed if active sessions are still running. If it starts with
-+a plus-sign, the start time is added. -1 means wait infinitely. If end is
- through and active sessions are still running, &kdm; can do one of the
- following:</para>
- <itemizedlist>
-@@ -1288,7 +1342,7 @@
- <listitem><para><parameter>force</parameter> - shut down
- nonetheless</para></listitem>
- <listitem><para><parameter>forcemy</parameter> - shut down nonetheless if
--all active sessions belong to the requesting user. Only for per-display sockets.</para></listitem>
-+all active sessions belong to the requesting user. Only for per-display sockets.</para></listitem>
- </itemizedlist>
- <para><parameter>start</parameter> and <parameter>end</parameter> are
- specified in seconds since the &UNIX; epoch.</para>
-@@ -1297,7 +1351,7 @@
- force</parameter> and <parameter>schedule</parameter> for <parameter>0
- -1</parameter>.</para>
- <para><parameter>ask</parameter> attempts an immediate shutdown and
--interacts with the user if active sessions are still running. Only for
-+interacts with the user if active sessions are still running. Only for
- per-display sockets.</para>
- </listitem>
- </varlistentry>
-@@ -1378,9 +1432,9 @@
- <sect1 id="dm-themes">
- <title>Themes</title>
-
--&kdm; has limited support for desktop manager themes. You may enable them
-+&kdm; has limited support for desktop manager themes. You may enable them
- by adding <userinput>UseTheme=true</userinput> to <filename>kdmrc</filename>
--and <userinput>Theme=/path/to/theme.xml</userinput>.
-+and <userinput>Theme=/path/to/theme.xml</userinput>.
- </sect1>
- -->
- </chapter>
-@@ -1405,8 +1459,8 @@
- <para>&kdm; is derived from, and includes code from,
- &xdm; (C) Keith Packard, MIT X Consortium.</para>
-
--<para>&kdm; 0.1 was written by &Matthias.Ettrich;. Later versions till &kde;
--2.0.x were written by &Steffen.Hansen;. Some new features for &kde; 2.1.x and
-+<para>&kdm; 0.1 was written by &Matthias.Ettrich;. Later versions till &kde;
-+2.0.x were written by &Steffen.Hansen;. Some new features for &kde; 2.1.x and
- a major rewrite for &kde; 2.2.x made by &Oswald.Buddenhagen;.</para>
-
- <para>Other parts of the &kdm; code are copyright by the authors, and
-@@ -1428,7 +1482,7 @@
-
- <listitem><para>Documentation revised for &kde; 2 by &Neal.Crook; &Neal.Crook.mail;. Last update August 6, 2000</para></listitem>
-
--<listitem><para>Documentation extended and revised for &kde; 2.2 by &Oswald.Buddenhagen; &Oswald.Buddenhagen.mail;. Last update August,
-+<listitem><para>Documentation extended and revised for &kde; 2.2 by &Oswald.Buddenhagen; &Oswald.Buddenhagen.mail;. Last update August,
- 2001</para></listitem>
-
- </itemizedlist></para>
-@@ -1457,7 +1511,7 @@
- <glossentry>
- <glossterm id="gloss-entropy">entropy</glossterm>
- <glossdef><para>The entropy of a system is the measure of its
--unpredictability. This is used during the generation of random numbers.</para></glossdef>
-+unpredictability. This is used during the generation of random numbers.</para></glossdef>
- </glossentry>
-
- </glossary>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/doc/kdm/tsak.png v3.5.13-sru/doc/kdm/tsak.png
---- /tmp/stable//kdebase/doc/kdm/tsak.png 1970-01-01 01:00:00.000000000 +0100
-+++ v3.5.13-sru/doc/kdm/tsak.png 2012-07-31 17:17:50.000000000 +0200
-@@ -0,0 +1,69 @@
-+PNG
-+
-+
-+2
-+A$+0tBЦ#IMGtA C8=gnS6iA߉Թ Sz'^
-+c9|p@J۷OޖmРk\
-+V^>x*տu*wn/6A^> ]2M+_u2W7OU_WB1RUMzx1q CV6n.qjzT-
-+ @)5R&EAafU
-+e,FSC
-+ӧ6Al<upPZzK >:]DՍξ]}s@]JcϞ}k
-+B!]R
-+fDK$:oB} >'d~ŀ(!fX*A M,H(xR7% |RE(UT?wYJRgO>#C!S(A$3|Ru"_<}hFQ<% +W B3<s [qɕpJR@c"adJwϘE,1HV4;DIk'FADp1M;/%9>f|˼\Aqf{mj5  ^Ц#8hA tAm: 6Ay@ <MGqЦ#8Xp #<JPkyBR= pj/%$505 !OzLjĆUR&
-+~Y
-+
-+@ 69
-+O9
-+<&́R
-+!a%8NG1q:`VI7mIsY;nNqNS,a6A )"cϽ5Eiu|RM7 !#X
-+0 5dHMv=\J( #
-+}Q2y܅Sq#؝زAױ:>%4+9è9ZGފsRQ.rf\c7 Ny 2BCazRr'"\J2cnKAxꬑ?/u,[B+_}ݵsH%UIDJey;8DLt2rrL aaVzQӴrtۦvMtl>)h9hVʫw?9C,^&:BfO?{{{PJ96>:Ntԝ[6e2~Siq2PmDp=R! &(,rI
-+(E~ Tw╻ϼV(}Ȉ͊]/c#{a2zJ goQ>FԛW pLd
-+f֠y'_ Oo_6ӆ RQK1M&'QO GFa
-+ P(CBe̳a<
-+pQ{Lmr6EŇ+g A{\ /^{vȍsw.WW
-+>`xEΰBX gDW
-+?Ͻ~")y)xBӏ %:=qa_/8zbRd " : ca4ܭԒ _:r#Kd
-+)U_n`"_t?xmx
-+NnK!c81Qa;y:#z
-+:t<hyP^Hx
-+um\on&&P8F4Wr\/l@:Etw?E{]]9
-+rqa k>K.WD9
-+
-+rQwOKIG/13Hԁ<_R^|➬;⧉
-+<c/c -P.{`z^J
-+׬2e=
-+jX4#x x}y
-+v>[ң]=4'xV] ᡻
-+rDQ ]ux7nk||^(
-+/
-+-WCebv`q7;r5FMm_,DVpIן x]G+ǿ8c͕H.{.v`
-+A=ڕ
-+Q 7c/{q`o
-+<<NWغWۺ_cT&YȽt`xm8%PJ 9U# aA߈#(
-+x'|0gڮ ȿ^qA`,9~憳uz==|GaXfVx՞\W~|mbxG&ix
-+o1jEDs>Cr;4x?1BMy{F
-+<,,,1pi?a=Gi\0b4κ8=;!۱sE0%POAFg,O.Xs"x_7
-+y9/abܢbOg>r "7Ow1݅L̯jX$tAK9%Opi,A$v `Ц#8hA tA}/F 9lA- 6Ay@ <MGqЦ#8hA tAm: 6Ay@ <MGqGjz4#0ro@PH.cR_<6QXz͞U*>8dņ9+׊g"TPieC]b<uoXJbf
-+B
-+hm*Jj-DzΙ!E<II~7=*6#~;t·$=zu2l{߶==N4?3,euuY
-+I8hD߉uใ'u
-+!\PUV(
-+
-+iD
-+G%[$s)8'
-+UZ+Ԋ~ܕW.~{#,2sQk7O9+F {:N;d@fSfJϕ^~
-+#V0p?8Ay@ <MGqЦ#8hA tAm: 6Ay@ <MGqЦ#8hA tAm: 6AyQD nx'"փꛅ_k;_HVaM7U;As/ Cwحr2 Vm[!tUC7,_M3Ÿ%YͪLpgǶ~۲}Mt[Өۖ7 i]z]V
-+Oow5'^f=zWѤqqMuvO]*UoZu'_g(DEBP)u.)o n+JDSR>|Yi{0de,!V,mhƥvX-RvG'N+Dտ4h"NG[]݊_ȰvUxs)_5i[# ޏ6vPQHAKz;_}?4k;WOl"ؾlv➦_o Nj4G3oӦ+'
-+B]
-+oW;KTT$6mjP)
-+B]
-+{y kgV ϝڬB>9(Y3jت-9ѶidMR=4:"l<NH6^WxciʭVMK\[Bz!UQ.9pY(r]RBPSl]
-+z11(\pQ<pldB#.tm5Hتtn8ܺdž0O &#rҩLh Ž(>Ǭ-%[}_(Qx%5k݅(-e
-+$U5[rt‹c&DEErYlӥ|'N
-+o )g(
-+>.@2K.5u-LQx3Y"9`6j9x
-+
-+"ބ%zCi(%[VĮ26]7|r;Wެn/~hS6W 1k3Dj!%C3FY4 /ձkjMj뮛> Y'pH-ޖx+hmm{QqpN3luv|- FѬ޴K.ǹWVbn^D5QK6۱Vz!YI'<q^®ryr} LZЯIow^Ì|{Zb /yc۾hH}gWcZz=˪S)cni?ĤTQ6)iaM7nʛF݄k!.+GG Y[M-މf_hxu[pEA N4bWjPI!^ 2- Ϥ7G6vs?txc>.]'*"!Q<
-+aKynޑΫYB/42q$ڨ /QȬ"{2JwmˡmݮvB$wBW-*'EUwcRm;cDs{Tw")8J%9
-+>f"7dC&Jd-p"}1[m:6+fu*1sA#g/f#7d?'&6=9*1;CN^5;XĻHi.wF4W.o%(Ɣ Y^8J$޽k=2YhD1~O?zl'lMH܁FIĖ㶫9wf^3o@yEXܡ*_HL/EZΚs,X$C4b;c#v?n۲t65Ɣ Y^8J$޽k=SES蘈FITS'<r(ffYM)1sA#'[#ۮ::M7}L_WKU#6>/9\ώ1 ȧu&\I?3;|npϱzɨK7"AC ky̢>Pipr8hqAr&~B~[qD/s/ tAm: 6Ay@ <MGqЦ#8hA tAm: 6AyH;g־L99DA>1nQDAA<
-\ Pas de fin de ligne à la fin du fichier
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/doc/konqueror/filemanager.docbook v3.5.13-sru/doc/konqueror/filemanager.docbook
---- /tmp/stable//kdebase/doc/konqueror/filemanager.docbook 2010-08-12 05:29:49.000000000 +0200
-+++ v3.5.13-sru/doc/konqueror/filemanager.docbook 2012-07-31 17:17:50.000000000 +0200
-@@ -355,9 +355,9 @@
- <quote><guimenuitem>Move to Trash</guimenuitem></quote> and
- <quote><guimenuitem>Delete</guimenuitem></quote> options.</para>
-
--<para><keycap>Del</keycap> will move the selected item or items to Trash.</para>
-+<para><keycap>Delete</keycap> will move the selected item or items to Trash.</para>
-
--<para><keycombo action="simul">&Shift;<keycap>Del</keycap></keycombo>
-+<para><keycombo action="simul">&Shift;<keycap>Delete</keycap></keycombo>
- will really, truly and irrevocably delete the selected item or
- items.</para>
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/drkonqi/backtrace.cpp v3.5.13-sru/drkonqi/backtrace.cpp
---- /tmp/stable//kdebase/drkonqi/backtrace.cpp 2011-08-11 07:25:54.000000000 +0200
-+++ v3.5.13-sru/drkonqi/backtrace.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -42,7 +42,7 @@
- BackTrace::BackTrace(const KrashConfig *krashconf, TQObject *parent,
- const char *name)
- : TQObject(parent, name),
-- m_krashconf(krashconf), m_temp(0)
-+ m_krashconf(krashconf), m_temp(NULL), m_temp_cmd(NULL)
- {
- m_proc = new KProcess;
- }
-@@ -64,6 +64,7 @@
- }
-
- delete m_temp;
-+ delete m_temp_cmd;
- }
-
- void BackTrace::start()
-@@ -92,14 +93,45 @@
- ::write(handle, "\n", 1);
- ::fsync(handle);
-
-+ // build the debugger command
-+ TQString str = m_krashconf->debuggerBatch();
-+ m_krashconf->expandString(str, true, m_temp->name());
-+
-+ // write the debugger command
-+ m_temp_cmd = new KTempFile(TQString::null, TQString::null, 0700);
-+ m_temp_cmd->setAutoDelete(TRUE);
-+ handle = m_temp_cmd->handle();
-+ const char* dbgcommand = str.latin1();
-+ ::write(handle, dbgcommand, strlen(dbgcommand)); // the command to execute the debugger
-+ ::write(handle, "\n", 1);
-+ ::fsync(handle);
-+ m_temp_cmd->close();
-+
-+ // determine if yama has been used to prevent ptrace as normal user
-+ bool need_root_access = false;
-+ TQFile yamactl("/proc/sys/kernel/yama/ptrace_scope");
-+ if (yamactl.exists()) {
-+ if (yamactl.open(IO_ReadOnly)) {
-+ TQTextStream stream(&yamactl);
-+ TQString line;
-+ line = stream.readLine();
-+ if (line.toInt() != 0) {
-+ need_root_access = true;
-+ }
-+ yamactl.close();
-+ }
-+ }
-+
- // start the debugger
- m_proc = new KProcess;
- m_proc->setUseShell(true);
-
-- TQString str = m_krashconf->debuggerBatch();
-- m_krashconf->expandString(str, true, m_temp->name());
--
-- *m_proc << str;
-+ if (need_root_access == false) {
-+ *m_proc << m_temp_cmd->name();
-+ }
-+ else {
-+ *m_proc << "kdesu -t --comment \"" << i18n("Administrative access is required to generate a backtrace") << "\" -c \"" << m_temp_cmd->name() << "\"";
-+ }
-
- connect(m_proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- TQT_SLOT(slotReadInput(KProcess*, char*, int)));
-@@ -112,9 +144,16 @@
- void BackTrace::slotReadInput(KProcess *, char* buf, int buflen)
- {
- TQString newstr = TQString::fromLocal8Bit(buf, buflen);
-- m_strBt.append(newstr);
--
-- emit append(newstr);
-+ newstr.replace("\n\n", "\n");
-+ if (m_strBt.isEmpty()) {
-+ if (newstr == "\n") {
-+ newstr = "";
-+ }
-+ }
-+ if (!newstr.startsWith(": ")) {
-+ m_strBt.append(newstr);
-+ emit append(newstr);
-+ }
- }
-
- void BackTrace::slotProcessExited(KProcess *proc)
-@@ -175,7 +214,7 @@
- --len;
- }
- m_strBt.remove( pos, len );
-- m_strBt.insert( pos, TQString::tqfromLatin1( "[KCrash handler]\n" ));
-+ m_strBt.insert( pos, TQString::fromLatin1( "[KCrash handler]\n" ));
- }
- }
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/drkonqi/backtrace.h v3.5.13-sru/drkonqi/backtrace.h
---- /tmp/stable//kdebase/drkonqi/backtrace.h 2011-03-12 07:58:20.000000000 +0100
-+++ v3.5.13-sru/drkonqi/backtrace.h 2012-07-31 17:17:50.000000000 +0200
-@@ -61,6 +61,7 @@
- KProcess *m_proc;
- const KrashConfig *m_krashconf;
- KTempFile *m_temp;
-+ KTempFile *m_temp_cmd;
- TQString m_strBt;
- };
- #endif
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/drkonqi/debugger.cpp v3.5.13-sru/drkonqi/debugger.cpp
---- /tmp/stable//kdebase/drkonqi/debugger.cpp 2011-08-11 07:25:54.000000000 +0200
-+++ v3.5.13-sru/drkonqi/debugger.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -60,9 +60,9 @@
- TQWidget *w = new TQWidget( this );
- ( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true );
- m_status = new TQLabel( w );
-- m_status->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
-+ m_status->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
- //m_copyButton = new KPushButton( KStdGuiItem::copy(), w );
-- KGuiItem item( i18n( "C&opy" ), TQString::tqfromLatin1( "editcopy" ) );
-+ KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "editcopy" ) );
- m_copyButton = new KPushButton( item, w );
- connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) );
- m_copyButton->setEnabled( false );
-@@ -109,7 +109,7 @@
- }
- else
- {
-- TQString defname = m_krashconf->execName() + TQString::tqfromLatin1( ".kcrash" );
-+ TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" );
- if( defname.contains( '/' ))
- defname = defname.mid( defname.findRev( '/' ) + 1 );
- TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename"));
-@@ -208,7 +208,7 @@
- bool KrashDebugger::performChecks( TQString* msg )
- {
- bool ret = true;
-- KConfig kdedcfg( TQString::tqfromLatin1( "kdedrc" ), true );
-+ KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true );
- kdedcfg.setGroup( "General" );
- if( kdedcfg.readBoolEntry( "DelayedCheck", false ))
- {
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/drkonqi/krashconf.cpp v3.5.13-sru/drkonqi/krashconf.cpp
---- /tmp/stable//kdebase/drkonqi/krashconf.cpp 2011-03-12 07:58:20.000000000 +0100
-+++ v3.5.13-sru/drkonqi/krashconf.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -93,12 +93,12 @@
-
- // maybe we should check if it's relative?
- TQString configname = config->readEntry("ConfigName",
-- TQString::tqfromLatin1("enduser"));
-+ TQString::fromLatin1("enduser"));
-
- TQString debuggername = config->readEntry("Debugger",
-- TQString::tqfromLatin1("gdb"));
-+ TQString::fromLatin1("gdb"));
-
-- KConfig debuggers(TQString::tqfromLatin1("debuggers/%1rc").arg(debuggername),
-+ KConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername),
- true, false, "appdata");
-
- debuggers.setGroup("General");
-@@ -112,7 +112,7 @@
- m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp");
- m_kcrashRegExp = debuggers.readEntry("KCrashRegExp");
-
-- KConfig preset(TQString::tqfromLatin1("presets/%1rc").arg(configname),
-+ KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
- true, false, "appdata");
-
- preset.setGroup("ErrorDescription");
-@@ -138,7 +138,7 @@
- TQString str = TQString::number(m_signalnum);
- // use group unknown if signal not found
- if (!preset.hasGroup(str))
-- str = TQString::tqfromLatin1("unknown");
-+ str = TQString::fromLatin1("unknown");
- preset.setGroup(str);
- m_signalName = preset.readEntry("Name");
- if (b)
-@@ -149,13 +149,13 @@
- void KrashConfig :: expandString(TQString &str, bool shell, const TQString &tempFile) const
- {
- TQMap<TQString,TQString> map;
-- map[TQString::tqfromLatin1("appname")] = TQString::tqfromLatin1(appName());
-- map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("kdeinit") : m_execname;
-- map[TQString::tqfromLatin1("signum")] = TQString::number(signalNumber());
-- map[TQString::tqfromLatin1("signame")] = signalName();
-- map[TQString::tqfromLatin1("progname")] = programName();
-- map[TQString::tqfromLatin1("pid")] = TQString::number(pid());
-- map[TQString::tqfromLatin1("tempfile")] = tempFile;
-+ map[TQString::fromLatin1("appname")] = TQString::fromLatin1(appName());
-+ map[TQString::fromLatin1("execname")] = startedByKdeinit() ? TQString::fromLatin1("kdeinit") : m_execname;
-+ map[TQString::fromLatin1("signum")] = TQString::number(signalNumber());
-+ map[TQString::fromLatin1("signame")] = signalName();
-+ map[TQString::fromLatin1("progname")] = programName();
-+ map[TQString::fromLatin1("pid")] = TQString::number(pid());
-+ map[TQString::fromLatin1("tempfile")] = tempFile;
- if (shell)
- str = KMacroExpander::expandMacrosShellQuote( str, map );
- else
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/drkonqi/toplevel.cpp v3.5.13-sru/drkonqi/toplevel.cpp
---- /tmp/stable//kdebase/drkonqi/toplevel.cpp 2011-03-12 07:58:20.000000000 +0100
-+++ v3.5.13-sru/drkonqi/toplevel.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -67,12 +67,12 @@
- // picture of konqi
- TQLabel *lab = new TQLabel(page);
- lab->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
-- TQPixmap pix(locate("appdata", TQString::tqfromLatin1("pics/konqi.png")));
-+ TQPixmap pix(locate("appdata", TQString::fromLatin1("pics/konqi.png")));
- lab->setPixmap(pix);
-- lab->setFixedSize( lab->tqsizeHint() );
-+ lab->setFixedSize( lab->sizeHint() );
-
- TQLabel * info = new TQLabel(generateText(), page);
-- info->setMinimumSize(info->tqsizeHint());
-+ info->setMinimumSize(info->sizeHint());
-
- if (m_krashconf->showBacktrace())
- {
-@@ -196,7 +196,7 @@
- void Toplevel :: slotBacktraceDone(const TQString &str)
- {
- // Do not translate.. This will be included in the _MAIL_.
-- TQString buf = TQString::tqfromLatin1
-+ TQString buf = TQString::fromLatin1
- ("\n\n\nHere is a backtrace generated by DrKonqi:\n") + str;
-
- m_bugreport->setText(buf);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/.gitmodules v3.5.13-sru/.gitmodules
---- /tmp/stable//kdebase/.gitmodules 1970-01-01 01:00:00.000000000 +0100
-+++ v3.5.13-sru/.gitmodules 2012-07-31 17:17:50.000000000 +0200
-@@ -0,0 +1,6 @@
-+[submodule "admin"]
-+ path = admin
-+ url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-+[submodule "cmake"]
-+ path = cmake
-+ url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/HOW.TO.BUILD v3.5.13-sru/HOW.TO.BUILD
---- /tmp/stable//kdebase/HOW.TO.BUILD 2011-10-30 08:44:27.000000000 +0100
-+++ v3.5.13-sru/HOW.TO.BUILD 1970-01-01 01:00:00.000000000 +0100
-@@ -1,2 +0,0 @@
--FOR BUILD INSTRUCTIONS PLEASE VISIT
--http://trinity.pearsoncomputing.net/wiki/bin/view/Developers/HowToBuild
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kappfinder/toplevel.cpp v3.5.13-sru/kappfinder/toplevel.cpp
---- /tmp/stable//kdebase/kappfinder/toplevel.cpp 2011-08-11 07:25:38.000000000 +0200
-+++ v3.5.13-sru/kappfinder/toplevel.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -54,7 +54,7 @@
- "applications on your system and adds "
- "them to the KDE menu system. "
- "Click 'Scan' to begin, select the desired applications and then click 'Apply'."), this);
-- label->tqsetAlignment( AlignAuto | WordBreak );
-+ label->setAlignment( AlignAuto | WordBreak );
- layout->addWidget( label );
-
- layout->addSpacing( 5 );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/kateconfigdialog.cpp v3.5.13-sru/kate/app/kateconfigdialog.cpp
---- /tmp/stable//kdebase/kate/app/kateconfigdialog.cpp 2011-07-09 08:16:52.000000000 +0200
-+++ v3.5.13-sru/kate/app/kateconfigdialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -112,11 +112,32 @@
- 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() ) );
-
-+ // sort filelist if desired
-+ cb_sortFiles = new TQCheckBox(bgStartup);
-+ cb_sortFiles->setText(i18n("Sort &files alphabetically in the file list"));
-+ 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() ) );
-
- // GROUP with the one below: "Behavior"
- bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("&Behavior"), frGeneral );
- lo->addWidget( bgStartup );
-
-+ // number of recent files
-+ TQHBox *hbNrf = new TQHBox( bgStartup );
-+ TQLabel *lNrf = new TQLabel( i18n("&Number of recent files:"), hbNrf );
-+ sb_numRecentFiles = new TQSpinBox( 0, 1000, 1, hbNrf );
-+ sb_numRecentFiles->setValue( mainWindow->fileOpenRecent->maxItems() );
-+ lNrf->setBuddy( sb_numRecentFiles );
-+ TQString numRecentFileHelpString ( i18n(
-+ "<qt>Sets the number of recent files remembered by Kate.<p><strong>NOTE: </strong>"
-+ "If you set this lower than the current value, the list will be truncated and "
-+ "some items forgotten.</qt>") );
-+ TQWhatsThis::add( lNrf, numRecentFileHelpString );
-+ TQWhatsThis::add( sb_numRecentFiles, numRecentFileHelpString );
-+ connect( sb_numRecentFiles, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
-+
- // sync the konsole ?
- cb_syncKonsole = new TQCheckBox(bgStartup);
- cb_syncKonsole->setText(i18n("Sync &terminal emulator with active document"));
-@@ -332,12 +353,12 @@
-
- for (uint i=0; i<pluginPages.count(); i++)
- {
-- if ( pluginPages.tqat(i)->plugin == plugin )
-+ if ( pluginPages.at(i)->plugin == plugin )
- {
-- TQWidget *w = pluginPages.tqat(i)->page->parentWidget();
-- delete pluginPages.tqat(i)->page;
-+ TQWidget *w = pluginPages.at(i)->page->parentWidget();
-+ delete pluginPages.at(i)->page;
- delete w;
-- pluginPages.remove(pluginPages.tqat(i));
-+ pluginPages.remove(pluginPages.at(i));
- i--;
- }
- }
-@@ -388,6 +409,10 @@
- mainWindow->modNotification = cb_modNotifications->isChecked();
-
- mainWindow->syncKonsole = cb_syncKonsole->isChecked();
-+ mainWindow->filelist->setSortType(cb_sortFiles->isChecked() ? KateFileList::sortByName : KateFileList::sortByID);
-+
-+ config->writeEntry( "Number of recent files", sb_numRecentFiles->value() );
-+ mainWindow->fileOpenRecent->setMaxItems( sb_numRecentFiles->value() );
-
- fileSelConfigPage->apply();
-
-@@ -415,7 +440,7 @@
- //
- for (uint i=0; i<editorPages.count(); i++)
- {
-- editorPages.tqat(i)->apply();
-+ editorPages.at(i)->apply();
- }
-
- v->getDoc()->writeConfig(config);
-@@ -425,7 +450,7 @@
- //
- for (uint i=0; i<pluginPages.count(); i++)
- {
-- pluginPages.tqat(i)->page->apply();
-+ pluginPages.at(i)->page->apply();
- }
-
- config->sync();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/kateconfigdialog.h v3.5.13-sru/kate/app/kateconfigdialog.h
---- /tmp/stable//kdebase/kate/app/kateconfigdialog.h 2010-08-13 00:35:39.000000000 +0200
-+++ v3.5.13-sru/kate/app/kateconfigdialog.h 2012-07-31 17:17:50.000000000 +0200
-@@ -66,6 +66,8 @@
-
- TQCheckBox *cb_fullPath;
- TQCheckBox *cb_syncKonsole;
-+ TQCheckBox *cb_sortFiles;
-+ TQSpinBox *sb_numRecentFiles;
- TQCheckBox *cb_modNotifications;
- TQCheckBox *cb_saveMetaInfos;
- TQSpinBox *sb_daysMetaInfos;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/kateconsole.cpp v3.5.13-sru/kate/app/kateconsole.cpp
---- /tmp/stable//kdebase/kate/app/kateconsole.cpp 2011-07-09 08:16:51.000000000 +0200
-+++ v3.5.13-sru/kate/app/kateconsole.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -57,8 +57,8 @@
- {
- if (m_part) return;
-
-- if (!tqtopLevelWidget() || !parentWidget()) return;
-- if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return;
-+ if (!topLevelWidget() || !parentWidget()) return;
-+ if (!topLevelWidget() || !isVisibleTo(topLevelWidget())) return;
-
- KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/katedocmanager.cpp v3.5.13-sru/kate/app/katedocmanager.cpp
---- /tmp/stable//kdebase/kate/app/katedocmanager.cpp 2011-08-11 07:25:25.000000000 +0200
-+++ v3.5.13-sru/kate/app/katedocmanager.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -69,7 +69,7 @@
- {
- // save config
- if (!m_docList.isEmpty())
-- m_docList.tqat(0)->writeConfig(KateApp::self()->config());
-+ m_docList.at(0)->writeConfig(KateApp::self()->config());
-
- if (m_saveMetaInfos)
- {
-@@ -86,7 +86,7 @@
- {
- m_metaInfos->setGroup(*it);
- TQDateTime last = m_metaInfos->readDateTimeEntry("Time", def);
-- if (last.daysTo(TQDateTime::tqcurrentDateTime()) > m_daysMetaInfos)
-+ if (last.daysTo(TQDateTime::currentDateTime()) > m_daysMetaInfos)
- m_metaInfos->deleteGroup(*it);
- }
- delete def;
-@@ -150,7 +150,7 @@
-
- Kate::Document *KateDocManager::document (uint n)
- {
-- return m_docList.tqat(n);
-+ return m_docList.at(n);
- }
-
- Kate::Document *KateDocManager::activeDocument ()
-@@ -234,7 +234,7 @@
- Kate::Document *KateDocManager::openURL (const KURL& url,const TQString &encoding, uint *id, bool isTempFile)
- {
- // special handling if still only the first initial doc is there
-- if (!documentList().isEmpty() && (documentList().count() == 1) && (!documentList().tqat(0)->isModified() && documentList().tqat(0)->url().isEmpty()))
-+ if (!documentList().isEmpty() && (documentList().count() == 1) && (!documentList().at(0)->isModified() && documentList().at(0)->url().isEmpty()))
- {
- Kate::Document* doc = documentList().getFirst();
-
-@@ -354,7 +354,7 @@
- }
-
- while (!docs.isEmpty() && res)
-- if (! closeDocument(docs.tqat(0),closeURL) )
-+ if (! closeDocument(docs.at(0),closeURL) )
- res = false;
- else
- docs.remove ((uint)0);
-@@ -364,7 +364,7 @@
- KateApp::self()->mainWindow(i)->viewManager()->setViewActivationBlocked(false);
-
- for (uint s=0; s < KateApp::self()->mainWindow(i)->viewManager()->containers()->count(); s++)
-- KateApp::self()->mainWindow(i)->viewManager()->containers()->tqat(s)->activateView (m_docList.tqat(0)->documentNumber());
-+ KateApp::self()->mainWindow(i)->viewManager()->containers()->at(s)->activateView (m_docList.at(0)->documentNumber());
- }
-
- return res;
-@@ -583,7 +583,7 @@
- m_metaInfos->setGroup(doc->url().prettyURL());
- doc->writeSessionConfig(m_metaInfos);
- m_metaInfos->writeEntry("MD5", (const char *)md5);
-- m_metaInfos->writeEntry("Time", TQDateTime::tqcurrentDateTime());
-+ m_metaInfos->writeEntry("Time", TQDateTime::currentDateTime());
- m_metaInfos->sync();
- }
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/kateexternaltools.cpp v3.5.13-sru/kate/app/kateexternaltools.cpp
---- /tmp/stable//kdebase/kate/app/kateexternaltools.cpp 2011-08-11 07:25:25.000000000 +0200
-+++ v3.5.13-sru/kate/app/kateexternaltools.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -191,7 +191,7 @@
- // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl;
- return false;
- }
-- KateMDI::MainWindow *dmw=tqt_dynamic_cast<KateMDI::MainWindow*>(wv->tqtopLevelWidget());
-+ KateMDI::MainWindow *dmw=tqt_dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
- if (!dmw) {
- // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl;
- return false;
-@@ -439,7 +439,7 @@
- leName = new TQLineEdit( w );
- lo->addWidget( leName, 1, 2 );
- l = new TQLabel( leName, i18n("&Label:"), w );
-- l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
-+ l->setAlignment( l->alignment()|Qt::AlignRight );
- lo->addWidget( l, 1, 1 );
- if ( tool ) leName->setText( tool->name );
- TQWhatsThis::add( leName, i18n(
-@@ -454,7 +454,7 @@
- teCommand = new TQTextEdit( w );
- lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 );
- l = new TQLabel( teCommand, i18n("S&cript:"), w );
-- l->tqsetAlignment( Qt::AlignTop|Qt::AlignRight );
-+ l->setAlignment( Qt::AlignTop|Qt::AlignRight );
- lo->addWidget( l, 2, 1 );
- if ( tool ) teCommand->setText( tool->command );
- TQWhatsThis::add( teCommand, i18n(
-@@ -477,7 +477,7 @@
- leExecutable = new TQLineEdit( w );
- lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 );
- l = new TQLabel( leExecutable, i18n("&Executable:"), w );
-- l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
-+ l->setAlignment( l->alignment()|Qt::AlignRight );
- lo->addWidget( l, 3, 1 );
- if ( tool ) leExecutable->setText( tool->tryexec );
- TQWhatsThis::add( leExecutable, i18n(
-@@ -488,7 +488,7 @@
- leMimetypes = new TQLineEdit( w );
- lo->addWidget( leMimetypes, 4, 2 );
- l = new TQLabel( leMimetypes, i18n("&Mime types:"), w );
-- l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
-+ l->setAlignment( l->alignment()|Qt::AlignRight );
- lo->addWidget( l, 4, 1 );
- if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") );
- TQWhatsThis::add( leMimetypes, i18n(
-@@ -506,7 +506,7 @@
- cmbSave = new TQComboBox(w);
- lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 );
- l = new TQLabel( cmbSave, i18n("&Save:"), w );
-- l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
-+ l->setAlignment( l->alignment()|Qt::AlignRight );
- lo->addWidget( l, 5, 1 );
- TQStringList sl;
- sl << i18n("None") << i18n("Current Document") << i18n("All Documents");
-@@ -521,7 +521,7 @@
- leCmdLine = new TQLineEdit( w );
- lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 );
- l = new TQLabel( leCmdLine, i18n("&Command line name:"), w );
-- l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
-+ l->setAlignment( l->alignment()|Qt::AlignRight );
- lo->addWidget( l, 6, 1 );
- if ( tool ) leCmdLine->setText( tool->cmdname );
- TQWhatsThis::add( leCmdLine, i18n(
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/katefilelist.cpp v3.5.13-sru/kate/app/katefilelist.cpp
---- /tmp/stable//kdebase/kate/app/katefilelist.cpp 2011-07-08 00:00:30.000000000 +0200
-+++ v3.5.13-sru/kate/app/katefilelist.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -69,7 +69,7 @@
- KateFileListItem *item = ((KateFileListItem*)i);
- if ( ! item ) return;
-
-- tip( m_listView->tqitemRect( i ), m_listView->tooltip( item, 0 ) );
-+ tip( m_listView->itemRect( i ), m_listView->tooltip( item, 0 ) );
-
- }
-
-@@ -272,8 +272,8 @@
-
- for ( uint i=0; i < m_editHistory.count(); i++ )
- {
-- m_editHistory.tqat( i )->setEditHistPos( i+1 );
-- repaintItem( m_editHistory.tqat( i ) );
-+ m_editHistory.at( i )->setEditHistPos( i+1 );
-+ repaintItem( m_editHistory.at( i ) );
- }
- }
- else
-@@ -334,7 +334,7 @@
- // int p = 0;
- // if ( m_viewHistory.count() )
- // {
--// int p = m_viewHistory.findRef( item ); // only tqrepaint items that needs it
-+// int p = m_viewHistory.findRef( item ); // only repaint items that needs it
- // }
-
- m_viewHistory.removeRef( item );
-@@ -342,8 +342,8 @@
-
- for ( uint i=0; i < m_viewHistory.count(); i++ )
- {
-- m_viewHistory.tqat( i )->setViewHistPos( i+1 );
-- repaintItem( m_viewHistory.tqat( i ) );
-+ m_viewHistory.at( i )->setViewHistPos( i+1 );
-+ repaintItem( m_viewHistory.at( i ) );
- }
-
- }
-@@ -616,7 +616,7 @@
- m_filelist->m_editShade = kcbEditShade->color();
- m_filelist->m_enableBgShading = cbEnableShading->isChecked();
- m_filelist->setSortType( cmbSort->currentItem() );
-- // tqrepaint the affected items
-+ // repaint the affected items
- m_filelist->triggerUpdate();
- }
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/katefileselector.cpp v3.5.13-sru/kate/app/katefileselector.cpp
---- /tmp/stable//kdebase/kate/app/katefileselector.cpp 2011-08-11 07:25:25.000000000 +0200
-+++ v3.5.13-sru/kate/app/katefileselector.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -96,7 +96,7 @@
- {
- if (m_tb)
- {
-- setMinimumHeight(m_tb->tqsizeHint().height());
-+ setMinimumHeight(m_tb->sizeHint().height());
- m_tb->resize(width(),height());
- }
- }
-@@ -123,7 +123,7 @@
- tqInstallMsgHandler( oldHandler );
-
- cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
-- cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
-+ cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
- KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion);
- cmbPath->setCompletionObject( cmpl );
- cmbPath->setAutoDeleteCompletionObject( true );
-@@ -157,7 +157,7 @@
- btnFilter->setIconSet( SmallIconSet("filter" ) );
- btnFilter->setToggleButton( true );
- filter = new KHistoryCombo( true, filterBox, "filter");
-- filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
-+ filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
- filterBox->setStretchFactor(filter, 2);
- connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) );
-
-@@ -354,7 +354,7 @@
- newurl.setPath(pathstr);
-
- if ( !kateFileSelectorIsReadable ( newurl ) )
-- newurl.cd(TQString::tqfromLatin1(".."));
-+ newurl.cd(TQString::fromLatin1(".."));
-
- if ( !kateFileSelectorIsReadable (newurl) )
- newurl.setPath( TQDir::homeDirPath() );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/kategrepdialog.cpp v3.5.13-sru/kate/app/kategrepdialog.cpp
---- /tmp/stable//kdebase/kate/app/kategrepdialog.cpp 2011-08-11 07:25:25.000000000 +0200
-+++ v3.5.13-sru/kate/app/kategrepdialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -100,7 +100,7 @@
- loInput->setColStretch(1, 20);
-
- TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this);
-- lPattern->setFixedSize(lPattern->tqsizeHint());
-+ lPattern->setFixedSize(lPattern->sizeHint());
- loInput->addWidget(lPattern, 0, 0, Qt::AlignRight | Qt::AlignVCenter);
-
- TQBoxLayout *loPattern = new TQHBoxLayout( 4 );
-@@ -112,22 +112,22 @@
- cmbPattern->setInsertionPolicy(TQComboBox::NoInsertion);
- lPattern->setBuddy(cmbPattern);
- cmbPattern->setFocus();
-- cmbPattern->setMinimumSize(cmbPattern->tqsizeHint());
-+ cmbPattern->setMinimumSize(cmbPattern->sizeHint());
- loPattern->addWidget( cmbPattern );
-
- cbCasesensitive = new TQCheckBox(i18n("Case sensitive"), this);
-- cbCasesensitive->setMinimumWidth(cbCasesensitive->tqsizeHint().width());
-+ cbCasesensitive->setMinimumWidth(cbCasesensitive->sizeHint().width());
- cbCasesensitive->setChecked(config->readBoolEntry("CaseSensitive", true));
- loPattern->addWidget(cbCasesensitive);
-
- cbRegex = new TQCheckBox( i18n("Regular expression"), this );
-- cbRegex->setMinimumWidth( cbRegex->tqsizeHint().width() );
-+ cbRegex->setMinimumWidth( cbRegex->sizeHint().width() );
- cbRegex->setChecked( config->readBoolEntry( "Regex", true ) );
- loPattern->addWidget( cbRegex );
- loPattern->setStretchFactor( cmbPattern, 100 );
-
- TQLabel *lTemplate = new TQLabel(i18n("Template:"), this);
-- lTemplate->setFixedSize(lTemplate->tqsizeHint());
-+ lTemplate->setFixedSize(lTemplate->sizeHint());
- loInput->addWidget(lTemplate, 1, 0, Qt::AlignRight | Qt::AlignVCenter);
-
- TQBoxLayout *loTemplate = new TQHBoxLayout(4);
-@@ -136,7 +136,7 @@
- leTemplate = new KLineEdit(this);
- lTemplate->setBuddy(leTemplate);
- leTemplate->setText(strTemplate[0]);
-- leTemplate->setMinimumSize(leTemplate->tqsizeHint());
-+ leTemplate->setMinimumSize(leTemplate->sizeHint());
- loTemplate->addWidget(leTemplate);
-
- KComboBox *cmbTemplate = new KComboBox(false, this);
-@@ -146,19 +146,19 @@
- loTemplate->addWidget(cmbTemplate);
-
- TQLabel *lFiles = new TQLabel(i18n("Files:"), this);
-- lFiles->setFixedSize(lFiles->tqsizeHint());
-+ lFiles->setFixedSize(lFiles->sizeHint());
- loInput->addWidget(lFiles, 2, 0, Qt::AlignRight | Qt::AlignVCenter);
-
- cmbFiles = new KComboBox(true, this);
- lFiles->setBuddy(TQT_TQWIDGET(cmbFiles->focusProxy()));
-- cmbFiles->setMinimumSize(cmbFiles->tqsizeHint());
-+ cmbFiles->setMinimumSize(cmbFiles->sizeHint());
- cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion);
- cmbFiles->setDuplicatesEnabled(false);
- cmbFiles->insertStringList(lastSearchFiles);
- loInput->addWidget(cmbFiles, 2, 1);
-
- TQLabel *lDir = new TQLabel(i18n("Folder:"), this);
-- lDir->setFixedSize(lDir->tqsizeHint());
-+ lDir->setFixedSize(lDir->sizeHint());
- loInput->addWidget(lDir, 3, 0, Qt::AlignRight | Qt::AlignVCenter);
-
- TQBoxLayout *loDir = new TQHBoxLayout(3);
-@@ -176,7 +176,7 @@
- lDir->setBuddy(cmbDir);
-
- cbRecursive = new TQCheckBox(i18n("Recursive"), this);
-- cbRecursive->setMinimumWidth(cbRecursive->tqsizeHint().width());
-+ cbRecursive->setMinimumWidth(cbRecursive->sizeHint().width());
- cbRecursive->setChecked(config->readBoolEntry("Recursive", true));
- loDir->addWidget(cbRecursive);
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/katemailfilesdialog.cpp v3.5.13-sru/kate/app/katemailfilesdialog.cpp
---- /tmp/stable//kdebase/kate/app/katemailfilesdialog.cpp 2011-03-12 07:57:34.000000000 +0100
-+++ v3.5.13-sru/kate/app/katemailfilesdialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -78,7 +78,7 @@
- }
- list->hide();
- connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) );
-- mw->setMinimumSize( lInfo->tqsizeHint() );
-+ mw->setMinimumSize( lInfo->sizeHint() );
- }
-
- TQPtrList<Kate::Document> KateMailDialog::selectedDocs()
-@@ -105,8 +105,8 @@
- lInfo->setText( i18n("Press <strong>Mail...</strong> to send selected documents") );
-
- }
-- mw->setMinimumSize( TQSize( lInfo->tqsizeHint().width(), mw->tqsizeHint().height()) );
-- setMinimumSize( calculateSize( mw->tqminimumSize().width(), mw->tqsizeHint().height() ) );
-+ mw->setMinimumSize( TQSize( lInfo->sizeHint().width(), mw->sizeHint().height()) );
-+ setMinimumSize( calculateSize( mw->minimumSize().width(), mw->sizeHint().height() ) );
- resize( width(), minimumHeight() );
- }
- #include "katemailfilesdialog.moc"
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/katemain.cpp v3.5.13-sru/kate/app/katemain.cpp
---- /tmp/stable//kdebase/kate/app/katemain.cpp 2011-03-12 07:57:34.000000000 +0100
-+++ v3.5.13-sru/kate/app/katemain.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -231,7 +231,24 @@
- else
- wRef.call("restore");
- }
-+ // The --use parameter forces Kate to use a single session window to host
-+ // all opened files. Generally, that parameter works. Yet when a file is
-+ // opened into Kate externally, such as from Konqueror, Kate will pop
-+ // forward (raise) but not grab the focus (show). The following snippet
-+ // resolves that problem. For whatever reason the hide call is needed
-+ // before the raise and show otherwise the snippet fails. Some extra glue
-+ // might be needed. With Kate open:
-+ // "Right-click" on the title bar
-+ // Select Advanced
-+ // Select Special Application Settings (Not Special Window Settings)
-+ // Select the Workarounds tab
-+ // Enable the Focus stealing prevention check box
-+ // Select the Force option
-+ // Select the None option
-+
-+ wRef.call( "hide" );
- wRef.call( "raise" );
-+ wRef.call( "show" );
-
- // stop startup notification
- KStartupInfo::appStarted( );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/katemainwindow.cpp v3.5.13-sru/kate/app/katemainwindow.cpp
---- /tmp/stable//kdebase/kate/app/katemainwindow.cpp 2011-07-09 08:16:52.000000000 +0200
-+++ v3.5.13-sru/kate/app/katemainwindow.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -110,8 +110,8 @@
- if (sconfig)
- {
- sconfig->setGroup (sgroup);
-- size.setWidth (sconfig->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ));
-- size.setHeight (sconfig->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ));
-+ size.setWidth (sconfig->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ));
-+ size.setHeight (sconfig->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));
- }
-
- // if thats fails, try to reuse size
-@@ -131,8 +131,8 @@
- {
- // first try global app config
- KateApp::self()->config()->setGroup ("MainWindow");
-- size.setWidth (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ));
-- size.setHeight (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ));
-+ size.setWidth (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ));
-+ size.setHeight (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));
-
- if (size.isEmpty())
- size = TQSize (kMin (700, desk.width()), kMin(480, desk.height()));
-@@ -412,6 +412,7 @@
-
- m_viewManager->setShowFullPath(config->readBoolEntry("Show Full Path in Title", false));
-
-+ fileOpenRecent->setMaxItems( config->readNumEntry("Number of recent files", fileOpenRecent->maxItems() ) );
- fileOpenRecent->loadEntries(config, "Recent Files");
-
- fileselector->readConfig(config, "fileselector");
-@@ -544,10 +545,10 @@
- TQPtrList<Kate::Document> l=KateDocManager::self()->documentList();
- for (uint i=0;i<l.count();i++) {
- // kdDebug(13001)<<"reloading Keysettings for document "<<i<<endl;
-- l.tqat(i)->reloadXML();
-- TQPtrList<class KTextEditor::View> l1=l.tqat(i)->views ();//KTextEditor::Document
-+ l.at(i)->reloadXML();
-+ TQPtrList<class KTextEditor::View> l1=l.at(i)->views ();//KTextEditor::Document
- for (uint i1=0;i1<l1.count();i1++) {
-- l1.tqat(i1)->reloadXML();
-+ l1.at(i1)->reloadXML();
- // kdDebug(13001)<<"reloading Keysettings for view "<<i<<"/"<<i1<<endl;
- }
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/katemdi.cpp v3.5.13-sru/kate/app/katemdi.cpp
---- /tmp/stable//kdebase/kate/app/katemdi.cpp 2011-08-11 07:25:25.000000000 +0200
-+++ v3.5.13-sru/kate/app/katemdi.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -128,7 +128,7 @@
-
- if ( domDocument().documentElement().isNull() )
- {
-- TQString completeDescription = TQString::tqfromLatin1( guiDescription )
-+ TQString completeDescription = TQString::fromLatin1( guiDescription )
- .arg( actionListName );
-
- setXML( completeDescription, false /*merge*/ );
-@@ -239,7 +239,7 @@
- m_mainWin->toolViewDeleted (this);
- }
-
--void ToolView::tqsetVisible (bool vis)
-+void ToolView::setVisible (bool vis)
- {
- if (m_visible == vis)
- return;
-@@ -380,7 +380,7 @@
- {
- it.current()->hide();
- setTab (it.currentKey(), false);
-- it.current()->tqsetVisible(false);
-+ it.current()->setVisible(false);
- }
-
- setTab (m_widgetToId[widget], true);
-@@ -388,7 +388,7 @@
- m_ownSplit->show ();
- widget->show ();
-
-- widget->tqsetVisible (true);
-+ widget->setVisible (true);
-
- return true;
- }
-@@ -420,7 +420,7 @@
- if (!anyVis)
- m_ownSplit->hide ();
-
-- widget->tqsetVisible (false);
-+ widget->setVisible (false);
-
- return true;
- }
-@@ -618,7 +618,7 @@
- ToolView *tv = m_toolviews[i];
-
- tv->persistent = config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Persistent").arg(tv->id), false);
-- tv->tqsetVisible (config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), false));
-+ tv->setVisible (config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), false));
-
- if (!anyVis)
- anyVis = tv->visible();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/katemdi.h v3.5.13-sru/kate/app/katemdi.h
---- /tmp/stable//kdebase/kate/app/katemdi.h 2011-07-09 08:16:52.000000000 +0200
-+++ v3.5.13-sru/kate/app/katemdi.h 2012-07-31 17:17:50.000000000 +0200
-@@ -146,7 +146,7 @@
-
- Sidebar *sidebar () { return m_sidebar; }
-
-- void tqsetVisible (bool vis);
-+ void setVisible (bool vis);
-
- public:
- bool visible () const;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/katesavemodifieddialog.cpp v3.5.13-sru/kate/app/katesavemodifieddialog.cpp
---- /tmp/stable//kdebase/kate/app/katesavemodifieddialog.cpp 2011-03-12 07:57:34.000000000 +0100
-+++ v3.5.13-sru/kate/app/katesavemodifieddialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -152,7 +152,7 @@
- m_documentRoot=new TQListViewItem(m_list,i18n("Documents"));
- const uint docCnt=documents.count();
- for (uint i=0;i<docCnt;i++) {
-- new KateSaveModifiedDocumentCheckListItem(m_documentRoot,documents.tqat(i));
-+ new KateSaveModifiedDocumentCheckListItem(m_documentRoot,documents.at(i));
- }
- m_documentRoot->setOpen(true);
- } else m_documentRoot=0;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/katetabwidget.cpp v3.5.13-sru/kate/app/katetabwidget.cpp
---- /tmp/stable//kdebase/kate/app/katetabwidget.cpp 2011-03-12 07:57:34.000000000 +0100
-+++ v3.5.13-sru/kate/app/katetabwidget.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -70,7 +70,7 @@
- KTabWidget::insertTab(child,label,index);
- showPage(child);
- maybeShow();
-- tabBar()->tqrepaint();
-+ tabBar()->repaint();
- }
-
- void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index )
-@@ -78,7 +78,7 @@
- KTabWidget::insertTab(child,iconset,label,index);
- showPage(child);
- maybeShow();
-- tabBar()->tqrepaint();
-+ tabBar()->repaint();
- }
-
- void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
-@@ -86,7 +86,7 @@
- KTabWidget::insertTab(child,tab,index);
- showPage(child);
- maybeShow();
-- tabBar()->tqrepaint();
-+ tabBar()->repaint();
- }
-
- void KateTabWidget::removePage ( TQWidget * w )
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/kateviewmanager.cpp v3.5.13-sru/kate/app/kateviewmanager.cpp
---- /tmp/stable//kdebase/kate/app/kateviewmanager.cpp 2011-08-11 07:25:25.000000000 +0200
-+++ v3.5.13-sru/kate/app/kateviewmanager.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -316,7 +316,7 @@
- {
- uint viewCount=0;
- for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
-- viewCount+=m_viewSpaceContainerList.tqat(i)->viewCount();
-+ viewCount+=m_viewSpaceContainerList.at(i)->viewCount();
- }
- return viewCount;
-
-@@ -326,7 +326,7 @@
- {
- uint viewSpaceCount=0;
- for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
-- viewSpaceCount+=m_viewSpaceContainerList.tqat(i)->viewSpaceCount();
-+ viewSpaceCount+=m_viewSpaceContainerList.at(i)->viewSpaceCount();
- }
- return viewSpaceCount;
- }
-@@ -334,7 +334,7 @@
- void KateViewManager::setViewActivationBlocked (bool block)
- {
- for (uint i=0;i<m_viewSpaceContainerList.count();i++)
-- m_viewSpaceContainerList.tqat(i)->m_blockViewCreationAndActivation=block;
-+ m_viewSpaceContainerList.at(i)->m_blockViewCreationAndActivation=block;
- }
-
- void KateViewManager::activateNextView()
-@@ -354,7 +354,7 @@
- void KateViewManager::closeViews(uint documentNumber)
- {
- for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
-- m_viewSpaceContainerList.tqat(i)->closeViews(documentNumber);
-+ m_viewSpaceContainerList.at(i)->closeViews(documentNumber);
- }
- tabChanged(m_currentContainer);
- }
-@@ -454,7 +454,7 @@
- {
- showFullPath=enable;
- for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
-- m_viewSpaceContainerList.tqat(i)->setShowFullPath(enable);
-+ m_viewSpaceContainerList.at(i)->setShowFullPath(enable);
- }
- m_mainWindow->slotWindowActivated ();
- }
-@@ -477,7 +477,7 @@
- config->writeEntry("ViewSpaceContainers",m_viewSpaceContainerList.count());
- config->writeEntry("Active ViewSpaceContainer", m_mainWindow->tabWidget()->currentPageIndex());
- for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
-- m_viewSpaceContainerList.tqat(i)->saveViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
-+ m_viewSpaceContainerList.at(i)->saveViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
- }
- }
-
-@@ -495,10 +495,10 @@
- uint tabCount=config->readNumEntry("ViewSpaceContainers",0);
- int activeOne=config->readNumEntry("Active ViewSpaceContainer",0);
- if (tabCount==0) return;
-- m_viewSpaceContainerList.tqat(0)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-0:"));
-+ m_viewSpaceContainerList.at(0)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-0:"));
- for (uint i=1;i<tabCount;i++) {
- slotNewTab();
-- m_viewSpaceContainerList.tqat(i)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
-+ m_viewSpaceContainerList.at(i)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
- }
-
- if (activeOne != m_mainWindow->tabWidget()->currentPageIndex())
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/kateviewspacecontainer.cpp v3.5.13-sru/kate/app/kateviewspacecontainer.cpp
---- /tmp/stable//kdebase/kate/app/kateviewspacecontainer.cpp 2011-08-11 07:25:25.000000000 +0200
-+++ v3.5.13-sru/kate/app/kateviewspacecontainer.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -277,7 +277,7 @@
- setActiveView (view);
- m_viewList.findRef (view);
-
-- mainWindow()->toolBar ()->tqsetUpdatesEnabled (false);
-+ mainWindow()->toolBar ()->setUpdatesEnabled (false);
-
- if (m_viewManager->guiMergedView)
- mainWindow()->guiFactory()->removeClient (m_viewManager->guiMergedView );
-@@ -287,7 +287,7 @@
- if (!m_blockViewCreationAndActivation)
- mainWindow()->guiFactory ()->addClient( view );
-
-- mainWindow()->toolBar ()->tqsetUpdatesEnabled (true);
-+ mainWindow()->toolBar ()->setUpdatesEnabled (true);
-
- statusMsg();
-
-@@ -342,8 +342,8 @@
- if (i >= m_viewSpaceList.count())
- i=0;
-
-- setActiveSpace (m_viewSpaceList.tqat(i));
-- activateView(m_viewSpaceList.tqat(i)->currentView());
-+ setActiveSpace (m_viewSpaceList.at(i));
-+ activateView(m_viewSpaceList.at(i)->currentView());
- }
-
- void KateViewSpaceContainer::activatePrevView()
-@@ -353,8 +353,8 @@
- if (i < 0)
- i=m_viewSpaceList.count()-1;
-
-- setActiveSpace (m_viewSpaceList.tqat(i));
-- activateView(m_viewSpaceList.tqat(i)->currentView());
-+ setActiveSpace (m_viewSpaceList.at(i));
-+ activateView(m_viewSpaceList.at(i)->currentView());
- }
-
- void KateViewSpaceContainer::closeViews(uint documentNumber)
-@@ -363,7 +363,7 @@
-
- for (uint z=0 ; z < m_viewList.count(); z++)
- {
-- Kate::View* current = m_viewList.tqat(z);
-+ Kate::View* current = m_viewList.at(z);
- if ( current->getDoc()->documentNumber() == documentNumber )
- {
- closeList.append (current);
-@@ -644,7 +644,7 @@
- {
- // send all views + their gui to **** ;)
- for (uint i=0; i < m_viewList.count(); i++)
-- mainWindow()->guiFactory ()->removeClient (m_viewList.tqat(i));
-+ mainWindow()->guiFactory ()->removeClient (m_viewList.at(i));
-
- m_viewList.clear ();
-
-@@ -658,7 +658,7 @@
- // finally, make the correct view active.
- config->setGroup (group);
- /*
-- KateViewSpace *vs = m_viewSpaceList.tqat( config->readNumEntry("Active ViewSpace") );
-+ KateViewSpace *vs = m_viewSpaceList.at( config->readNumEntry("Active ViewSpace") );
- if ( vs )
- activateSpace( vs->currentView() );
- */
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/kateviewspace.cpp v3.5.13-sru/kate/app/kateviewspace.cpp
---- /tmp/stable//kdebase/kate/app/kateviewspace.cpp 2011-07-09 08:16:52.000000000 +0200
-+++ v3.5.13-sru/kate/app/kateviewspace.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -67,9 +67,9 @@
- void paintEvent( TQPaintEvent *e )
- {
- TQPainter p( this );
-- p.setPen( tqcolorGroup().shadow() );
-+ p.setPen( colorGroup().shadow() );
- p.drawLine( e->rect().left(), 0, e->rect().right(), 0 );
-- p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().midlight() );
-+ p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? colorGroup().light() : colorGroup().midlight() );
- p.drawLine( e->rect().left(), 1, e->rect().right(), 1 );
- }
- };
-@@ -309,29 +309,29 @@
- {
- m_lineColLabel = new TQLabel( this );
- addWidget( m_lineColLabel, 0, false );
-- m_lineColLabel->tqsetAlignment( Qt::AlignCenter );
-+ m_lineColLabel->setAlignment( Qt::AlignCenter );
- m_lineColLabel->installEventFilter( this );
-
- m_modifiedLabel = new TQLabel( TQString(" "), this );
- addWidget( m_modifiedLabel, 0, false );
-- m_modifiedLabel->tqsetAlignment( Qt::AlignCenter );
-+ m_modifiedLabel->setAlignment( Qt::AlignCenter );
- m_modifiedLabel->installEventFilter( this );
-
- m_insertModeLabel = new TQLabel( i18n(" INS "), this );
- addWidget( m_insertModeLabel, 0, false );
-- m_insertModeLabel->tqsetAlignment( Qt::AlignCenter );
-+ m_insertModeLabel->setAlignment( Qt::AlignCenter );
- m_insertModeLabel->installEventFilter( this );
-
- m_selectModeLabel = new TQLabel( i18n(" NORM "), this );
- addWidget( m_selectModeLabel, 0, false );
-- m_selectModeLabel->tqsetAlignment( Qt::AlignCenter );
-+ m_selectModeLabel->setAlignment( Qt::AlignCenter );
- m_selectModeLabel->installEventFilter( this );
-
- m_fileNameLabel=new KSqueezedTextLabel( this );
- addWidget( m_fileNameLabel, 1, true );
- m_fileNameLabel->setMinimumSize( 0, 0 );
-- m_fileNameLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
-- m_fileNameLabel->tqsetAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
-+ m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
-+ m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
- m_fileNameLabel->installEventFilter( this );
-
- installEventFilter( this );
-@@ -396,7 +396,7 @@
-
- void KateVSStatusBar::showMenu()
- {
-- KMainWindow* mainWindow = static_cast<KMainWindow*>( tqtopLevelWidget() );
-+ KMainWindow* mainWindow = static_cast<KMainWindow*>( topLevelWidget() );
- TQPopupMenu* menu = static_cast<TQPopupMenu*>( mainWindow->factory()->container("viewspace_popup", mainWindow ) );
-
- if (menu)
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/app/kwritemain.cpp v3.5.13-sru/kate/app/kwritemain.cpp
---- /tmp/stable//kdebase/kate/app/kwritemain.cpp 2011-08-11 07:25:25.000000000 +0200
-+++ v3.5.13-sru/kate/app/kwritemain.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -112,7 +112,7 @@
-
- // init with more usefull size, stolen from konq :)
- if (!initialGeometrySet())
-- resize( TQSize(700, 480).expandedTo(tqminimumSizeHint()));
-+ resize( TQSize(700, 480).expandedTo(minimumSizeHint()));
-
- // call it as last thing, must be sure everything is already set up ;)
- setAutoSaveSettings ();
-@@ -474,7 +474,7 @@
- TQString buf = TQString("Document %1").arg(z);
- config->setGroup(buf);
-
-- KTextEditor::Document *doc = docList.tqat(z - 1);
-+ KTextEditor::Document *doc = docList.at(z - 1);
-
- if (KTextEditor::configInterface(doc))
- KTextEditor::configInterface(doc)->writeSessionConfig(config);
-@@ -485,7 +485,7 @@
- TQString buf = TQString("Window %1").arg(z);
- config->setGroup(buf);
-
-- config->writeEntry("DocumentNumber",docList.find(winList.tqat(z-1)->view()->document()) + 1);
-+ config->writeEntry("DocumentNumber",docList.find(winList.at(z-1)->view()->document()) + 1);
- }
- }
-
-@@ -521,7 +521,7 @@
- {
- buf = TQString("Window %1").arg(z);
- config->setGroup(buf);
-- t = new KWrite(docList.tqat(config->readNumEntry("DocumentNumber") - 1));
-+ t = new KWrite(docList.at(config->readNumEntry("DocumentNumber") - 1));
- t->restore(config,z);
- }
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kate/utils/dockviewbase.cpp v3.5.13-sru/kate/utils/dockviewbase.cpp
---- /tmp/stable//kdebase/kate/utils/dockviewbase.cpp 2011-03-12 07:57:34.000000000 +0100
-+++ v3.5.13-sru/kate/utils/dockviewbase.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -87,7 +87,7 @@
- {
- setSpacing( 4 );
- d->header = new TQWidget( this );
-- d->header->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) );
-+ d->header->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) );
- TQHBoxLayout *lo = new TQHBoxLayout( d->header );
- lo->setSpacing( 6 );
- lo->insertSpacing( 0, 6 );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/access/kaccess.cpp v3.5.13-sru/kcontrol/access/kaccess.cpp
---- /tmp/stable//kdebase/kcontrol/access/kaccess.cpp 2011-03-12 07:57:40.000000000 +0100
-+++ v3.5.13-sru/kcontrol/access/kaccess.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -585,7 +585,7 @@
- TQVBoxLayout * vlay = new TQVBoxLayout(lay);
-
- featuresLabel = new TQLabel( "", contents );
-- featuresLabel->tqsetAlignment( WordBreak|AlignVCenter );
-+ featuresLabel->setAlignment( WordBreak|AlignVCenter );
- vlay->addWidget( featuresLabel );
- vlay->addStretch();
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/access/kcmaccess.cpp v3.5.13-sru/kcontrol/access/kcmaccess.cpp
---- /tmp/stable//kdebase/kcontrol/access/kcmaccess.cpp 2011-03-12 07:57:40.000000000 +0100
-+++ v3.5.13-sru/kcontrol/access/kcmaccess.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -248,7 +248,7 @@
- grp->setColumnLayout( 0, Qt::Horizontal );
- vbox->addWidget(grp);
-
-- TQVBoxLayout *vvbox = new TQVBoxLayout(grp->tqlayout(),
-+ TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(),
- KDialogBase::spacingHint());
-
- systemBell = new TQCheckBox(i18n("Use &system bell"), grp);
-@@ -291,7 +291,7 @@
- grp->setColumnLayout( 0, Qt::Horizontal );
- vbox->addWidget(grp);
-
-- vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
-+ vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
-
- visibleBell = new TQCheckBox(i18n("&Use visible bell"), grp);
- vvbox->addWidget(visibleBell);
-@@ -311,7 +311,7 @@
- TQWhatsThis::add( flashScreen, i18n("The screen will turn to a custom color for the amount of time specified below.") );
- hbox->addSpacing(12);
- colorButton = new KColorButton(grp);
-- colorButton->setFixedWidth(colorButton->tqsizeHint().height()*2);
-+ colorButton->setFixedWidth(colorButton->sizeHint().height()*2);
- hbox->addWidget(colorButton);
- hbox->addStretch();
- TQWhatsThis::add( colorButton, i18n("Click here to choose the color used for the \"flash screen\" visible bell.") );
-@@ -353,7 +353,7 @@
- grp->setColumnLayout( 0, Qt::Horizontal );
- vbox->addWidget(grp);
-
-- vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
-+ vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
-
- stickyKeys = new TQCheckBox(i18n("Use &sticky keys"), grp);
- vvbox->addWidget(stickyKeys);
-@@ -377,7 +377,7 @@
- grp->setColumnLayout( 0, Qt::Horizontal );
- vbox->addWidget(grp);
-
-- vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
-+ vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
-
- toggleKeysBeep = new TQCheckBox(i18n("Use system bell whenever a locking key gets activated or deactivated"), grp);
- vvbox->addWidget(toggleKeysBeep);
-@@ -388,7 +388,7 @@
- hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
- hbox->addStretch(1);
- kNotifyModifiersButton = new TQPushButton(i18n("Configure System Notification..."), grp);
-- kNotifyModifiersButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-+ kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
- hbox->addWidget(kNotifyModifiersButton);
-
- connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-@@ -415,7 +415,7 @@
- grp->setColumnLayout( 0, Qt::Horizontal );
- vbox->addWidget(grp);
-
-- vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
-+ vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
-
- slowKeys = new TQCheckBox(i18n("&Use slow keys"), grp);
- vvbox->addWidget(slowKeys);
-@@ -447,7 +447,7 @@
- grp->setColumnLayout( 0, Qt::Horizontal );
- vbox->addWidget(grp);
-
-- vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
-+ vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
-
- bounceKeys = new TQCheckBox(i18n("Use bou&nce keys"), grp);
- vvbox->addWidget(bounceKeys);
-@@ -491,7 +491,7 @@
- grp->setColumnLayout( 0, Qt::Horizontal );
- vbox->addWidget(grp);
-
-- vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
-+ vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
-
- gestures = new TQCheckBox(i18n("Use gestures for activating sticky keys and slow keys"), grp);
- vvbox->addWidget(gestures);
-@@ -521,7 +521,7 @@
- grp->setColumnLayout( 0, Qt::Horizontal );
- vbox->addWidget(grp);
-
-- vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
-+ vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
-
- accessxBeep = new TQCheckBox(i18n("Use the system bell whenever a gesture is used to turn an accessibility feature on or off"), grp);
- vvbox->addWidget(accessxBeep);
-@@ -536,7 +536,7 @@
- hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
- hbox->addStretch(1);
- kNotifyAccessXButton = new TQPushButton(i18n("Configure System Notification..."), grp);
-- kNotifyAccessXButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-+ kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
- hbox->addWidget(kNotifyAccessXButton);
-
- connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/accessibility/accessibilityconfigwidget.ui v3.5.13-sru/kcontrol/accessibility/accessibilityconfigwidget.ui
---- /tmp/stable//kdebase/kcontrol/accessibility/accessibilityconfigwidget.ui 2011-03-12 07:57:37.000000000 +0100
-+++ v3.5.13-sru/kcontrol/accessibility/accessibilityconfigwidget.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -95,7 +95,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -244,7 +244,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -338,7 +338,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>0</width>
- <height>15</height>
-@@ -363,7 +363,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-@@ -420,7 +420,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -534,7 +534,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -625,7 +625,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -683,7 +683,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>21</width>
- <height>61</height>
-@@ -789,7 +789,7 @@
- <property name="text">
- <string>Ma&amp;ximum speed:</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignVCenter|AlignRight</set>
- </property>
- <property name="buddy" stdset="0">
-@@ -806,7 +806,7 @@
- <property name="text">
- <string>Acceleration &amp;time:</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignVCenter|AlignRight</set>
- </property>
- <property name="buddy" stdset="0">
-@@ -895,7 +895,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -944,7 +944,7 @@
- <property name="text">
- <string>&amp;Repeat interval:</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignVCenter|AlignRight</set>
- </property>
- <property name="buddy" stdset="0">
-@@ -992,7 +992,7 @@
- <property name="text">
- <string>Acceleration &amp;profile:</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignVCenter|AlignRight</set>
- </property>
- <property name="buddy" stdset="0">
-@@ -1087,7 +1087,7 @@
- <property name="text">
- <string>&amp;Acceleration delay:</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignVCenter|AlignRight</set>
- </property>
- <property name="buddy" stdset="0">
-@@ -1108,7 +1108,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>1</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/arts/arts.cpp v3.5.13-sru/kcontrol/arts/arts.cpp
---- /tmp/stable//kdebase/kcontrol/arts/arts.cpp 2011-03-12 07:57:42.000000000 +0100
-+++ v3.5.13-sru/kcontrol/arts/arts.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -297,7 +297,7 @@
- {
- if(a->name == audioIO) // first item: "autodetect"
- {
-- hardware->audioIO->setCurrentItem(audioIOList.tqat() + 1);
-+ hardware->audioIO->setCurrentItem(audioIOList.at() + 1);
- break;
- }
-
-@@ -334,7 +334,7 @@
- int item = hardware->audioIO->currentItem() - 1; // first item: "default"
-
- if (item >= 0) {
-- audioIO = audioIOList.tqat(item)->name;
-+ audioIO = audioIOList.at(item)->name;
- }
-
- TQString dev = customDevice->isChecked() ? deviceName->text() : TQString::null;
-@@ -498,8 +498,8 @@
- int item = hardware->audioIO->currentItem() - 1; // first item: "default"
- if (item >= 0)
- {
-- audioIO = audioIOList.tqat(item)->name;
-- bool jack = (audioIO == TQString::tqfromLatin1("jack"));
-+ audioIO = audioIOList.at(item)->name;
-+ bool jack = (audioIO == TQString::fromLatin1("jack"));
- if(jack)
- {
- customRate->setChecked(false);
-@@ -620,39 +620,39 @@
- TQString args;
-
- if(fragmentCount)
-- args += TQString::tqfromLatin1(" -F %1").arg(fragmentCount);
-+ args += TQString::fromLatin1(" -F %1").arg(fragmentCount);
-
- if(fragmentSize)
-- args += TQString::tqfromLatin1(" -S %1").arg(fragmentSize);
-+ args += TQString::fromLatin1(" -S %1").arg(fragmentSize);
-
- if (!audioIO.isEmpty())
-- args += TQString::tqfromLatin1(" -a %1").arg(audioIO);
-+ args += TQString::fromLatin1(" -a %1").arg(audioIO);
-
- if (duplex)
-- args += TQString::tqfromLatin1(" -d");
-+ args += TQString::fromLatin1(" -d");
-
- if (netTrans)
-- args += TQString::tqfromLatin1(" -n");
-+ args += TQString::fromLatin1(" -n");
-
- if (!deviceName.isEmpty())
-- args += TQString::tqfromLatin1(" -D ") + deviceName;
-+ args += TQString::fromLatin1(" -D ") + deviceName;
-
- if (rate)
-- args += TQString::tqfromLatin1(" -r %1").arg(rate);
-+ args += TQString::fromLatin1(" -r %1").arg(rate);
-
- if (bits)
-- args += TQString::tqfromLatin1(" -b %1").arg(bits);
-+ args += TQString::fromLatin1(" -b %1").arg(bits);
-
- if (autoSuspend && suspendTime)
-- args += TQString::tqfromLatin1(" -s %1").arg(suspendTime);
-+ args += TQString::fromLatin1(" -s %1").arg(suspendTime);
-
- if (!addOptions.isEmpty())
- args += TQChar(' ') + addOptions;
-
-- args += TQString::tqfromLatin1(" -m artsmessage");
-- args += TQString::tqfromLatin1(" -c drkonqi");
-- args += TQString::tqfromLatin1(" -l 3");
-- args += TQString::tqfromLatin1(" -f");
-+ args += TQString::fromLatin1(" -m artsmessage");
-+ args += TQString::fromLatin1(" -c drkonqi");
-+ args += TQString::fromLatin1(" -l 3");
-+ args += TQString::fromLatin1(" -f");
-
- return args;
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/arts/generaltab.ui v3.5.13-sru/kcontrol/arts/generaltab.ui
---- /tmp/stable//kdebase/kcontrol/arts/generaltab.ui 2011-03-12 07:57:42.000000000 +0100
-+++ v3.5.13-sru/kcontrol/arts/generaltab.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -12,7 +12,7 @@
- <height>613</height>
- </rect>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>0</width>
- <height>450</height>
-@@ -227,7 +227,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>173</width>
- <height>20</height>
-@@ -256,7 +256,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>40</width>
- <height>20</height>
-@@ -289,7 +289,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>40</width>
- <height>20</height>
-@@ -308,7 +308,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/arts/hardwaretab.ui v3.5.13-sru/kcontrol/arts/hardwaretab.ui
---- /tmp/stable//kdebase/kcontrol/arts/hardwaretab.ui 2011-03-12 07:57:42.000000000 +0100
-+++ v3.5.13-sru/kcontrol/arts/hardwaretab.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -133,7 +133,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -189,7 +189,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>0</width>
- <height>20</height>
-@@ -252,7 +252,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>0</width>
- <height>20</height>
-@@ -345,7 +345,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>60</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/arts/krichtextlabel.cpp v3.5.13-sru/kcontrol/arts/krichtextlabel.cpp
---- /tmp/stable//kdebase/kcontrol/arts/krichtextlabel.cpp 2011-03-12 07:57:42.000000000 +0100
-+++ v3.5.13-sru/kcontrol/arts/krichtextlabel.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -41,14 +41,14 @@
- KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
- : TQLabel ( parent, name ) {
- m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
-- tqsetAlignment( TQt::WordBreak );
-+ setAlignment( TQt::WordBreak );
- setText(text);
- }
-
- KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
- : TQLabel ( parent, name ) {
- m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
-- tqsetAlignment( TQt::WordBreak );
-+ setAlignment( TQt::WordBreak );
- }
-
- void KRichTextLabel::setDefaultWidth(int defaultWidth)
-@@ -62,7 +62,7 @@
- return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
- }
-
--TQSize KRichTextLabel::tqminimumSizeHint() const
-+TQSize KRichTextLabel::minimumSizeHint() const
- {
- TQString qt_text = qrichtextify( text() );
- int pref_width = 0;
-@@ -97,9 +97,9 @@
- return TQSize(pref_width, rt.height());
- }
-
--TQSize KRichTextLabel::tqsizeHint() const
-+TQSize KRichTextLabel::sizeHint() const
- {
-- return tqminimumSizeHint();
-+ return minimumSizeHint();
- }
-
- void KRichTextLabel::setText( const TQString &text ) {
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/arts/krichtextlabel.h v3.5.13-sru/kcontrol/arts/krichtextlabel.h
---- /tmp/stable//kdebase/kcontrol/arts/krichtextlabel.h 2011-03-12 07:57:42.000000000 +0100
-+++ v3.5.13-sru/kcontrol/arts/krichtextlabel.h 2012-07-31 17:17:50.000000000 +0200
-@@ -45,8 +45,8 @@
- int defaultWidth() const { return m_defaultWidth; }
- void setDefaultWidth(int defaultWidth);
-
-- virtual TQSize tqminimumSizeHint() const;
-- virtual TQSize tqsizeHint() const;
-+ virtual TQSize minimumSizeHint() const;
-+ virtual TQSize sizeHint() const;
- TQSizePolicy sizePolicy() const;
-
- public slots:
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/background/bgadvanced.cpp v3.5.13-sru/kcontrol/background/bgadvanced.cpp
---- /tmp/stable//kdebase/kcontrol/background/bgadvanced.cpp 2011-08-11 07:25:25.000000000 +0200
-+++ v3.5.13-sru/kcontrol/background/bgadvanced.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -432,7 +432,7 @@
- m_RefreshEdit->setRange(5, 60);
- m_RefreshEdit->setSteps(5, 10);
- m_RefreshEdit->setSuffix(i18n(" min"));
-- m_RefreshEdit->setFixedSize(m_RefreshEdit->tqsizeHint());
-+ m_RefreshEdit->setFixedSize(m_RefreshEdit->sizeHint());
- lbl->setBuddy(m_RefreshEdit);
- grid->addWidget(m_RefreshEdit, 5, 1, Qt::AlignLeft);
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/background/bgadvanced_ui.ui v3.5.13-sru/kcontrol/background/bgadvanced_ui.ui
---- /tmp/stable//kdebase/kcontrol/background/bgadvanced_ui.ui 2011-03-12 07:57:36.000000000 +0100
-+++ v3.5.13-sru/kcontrol/background/bgadvanced_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -91,7 +91,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -138,7 +138,7 @@
- <property name="enabled">
- <bool>false</bool>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>400</width>
- <height>0</height>
-@@ -223,7 +223,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>220</width>
- <height>20</height>
-@@ -376,7 +376,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -395,7 +395,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>16</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/background/bgdialog.cpp v3.5.13-sru/kcontrol/background/bgdialog.cpp
---- /tmp/stable//kdebase/kcontrol/background/bgdialog.cpp 2011-08-11 07:25:25.000000000 +0200
-+++ v3.5.13-sru/kcontrol/background/bgdialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -142,7 +142,7 @@
- }
-
- // background image settings
-- TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen"));
-+ TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
- TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
- m_urlWallpaperButton->setIconSet( iconSet );
- m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
-@@ -414,14 +414,14 @@
- screenLabel->setFrameStyle(TQFrame::Panel);
- screenLabel->setFrameShadow(TQFrame::Plain);
-
-- screenLabel->tqsetAlignment(Qt::AlignCenter);
-+ screenLabel->setAlignment(Qt::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()));
-
- TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center());
-- TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint());
-+ TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
- targetGeometry.moveCenter(screenCenter);
-
- screenLabel->setGeometry(targetGeometry);
-@@ -441,14 +441,14 @@
- else {
- for (unsigned i = 0; i < (m_numDesks/m_numViewports); ++i) {
- for (unsigned j = 0; j < m_numViewports; ++j) {
-- m_comboDesktop->insertItem(i18n("Desktop %1 Viewport %2").tqarg(i+1).tqarg(j+1));
-+ m_comboDesktop->insertItem(i18n("Desktop %1 Viewport %2").arg(i+1).arg(j+1));
- }
- }
- }
-
- // Screens
- for (unsigned i = 0; i < m_numScreens; ++i)
-- m_comboScreen->insertItem( i18n("Screen %1").tqarg(TQString::number(i+1)) );
-+ m_comboScreen->insertItem( i18n("Screen %1").arg(TQString::number(i+1)) );
-
- // Patterns
- m_comboPattern->insertItem(i18n("Single Color"));
-@@ -1004,7 +1004,7 @@
- {
- KBackgroundRenderer *r = eRenderer();
-
-- BGMultiWallpaperDialog dlg(r, tqtopLevelWidget());
-+ BGMultiWallpaperDialog dlg(r, topLevelWidget());
- if (dlg.exec() == TQDialog::Accepted) {
- r->stop();
- m_slideShowRandom = r->multiWallpaperMode();
-@@ -1182,7 +1182,7 @@
- KBackgroundRenderer *r = eRenderer();
-
- m_previewUpdates = false;
-- BGAdvancedDialog dlg(r, tqtopLevelWidget(), m_multidesktop);
-+ BGAdvancedDialog dlg(r, topLevelWidget(), m_multidesktop);
-
- if (!m_pMonitorArrangement->isEnabled()) {
- dlg.makeReadOnly();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/background/bgdialog_ui.ui v3.5.13-sru/kcontrol/background/bgdialog_ui.ui
---- /tmp/stable//kdebase/kcontrol/background/bgdialog_ui.ui 2011-03-12 07:57:36.000000000 +0100
-+++ v3.5.13-sru/kcontrol/background/bgdialog_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -105,7 +105,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>0</width>
- <height>0</height>
-@@ -132,7 +132,7 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
-@@ -161,7 +161,7 @@
- <property name="sizeType">
- <enum>Minimum</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>4</width>
- <height>20</height>
-@@ -197,7 +197,7 @@
- <property name="sizeType">
- <enum>Minimum</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>4</width>
- <height>20</height>
-@@ -219,7 +219,7 @@
- <property name="sizeType">
- <enum>Minimum</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>4</width>
- <height>20</height>
-@@ -255,7 +255,7 @@
- <property name="sizeType">
- <enum>Minimum</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>4</width>
- <height>20</height>
-@@ -277,7 +277,7 @@
- <property name="sizeType">
- <enum>Minimum</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>4</width>
- <height>20</height>
-@@ -313,7 +313,7 @@
- <property name="sizeType">
- <enum>Minimum</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>4</width>
- <height>20</height>
-@@ -333,7 +333,7 @@
- <property name="sizeType">
- <enum>MinimumExpanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-@@ -522,7 +522,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>120</width>
- <height>10</height>
-@@ -539,7 +539,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>130</width>
- <height>10</height>
-@@ -613,7 +613,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>260</width>
- <height>20</height>
-@@ -641,7 +641,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>110</width>
- <height>16</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/background/bghash.h v3.5.13-sru/kcontrol/background/bghash.h
---- /tmp/stable//kdebase/kcontrol/background/bghash.h 2011-03-12 07:57:36.000000000 +0100
-+++ v3.5.13-sru/kcontrol/background/bghash.h 2012-07-31 17:17:50.000000000 +0200
-@@ -8,7 +8,7 @@
- static int TQHash(TQString key)
- {
- int g, h = 0;
-- const TQChar *p = key.tqunicode();
-+ const TQChar *p = key.unicode();
- for (unsigned i=0; i < key.length(); i++) {
- h = (h << 4) + p[i].cell();
- if ((g = (h & 0xf0000000)))
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/background/bgmonitor.cpp v3.5.13-sru/kcontrol/background/bgmonitor.cpp
---- /tmp/stable//kdebase/kcontrol/background/bgmonitor.cpp 2011-03-12 07:57:36.000000000 +0100
-+++ v3.5.13-sru/kcontrol/background/bgmonitor.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -157,7 +157,7 @@
- BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name)
- : TQLabel(parent, name)
- {
-- tqsetAlignment(AlignCenter);
-+ setAlignment(AlignCenter);
- setScaledContents(true);
- setPixmap( TQPixmap( locate("data", "kcontrol/pics/monitor.png") ) );
- m_pBGMonitor = new BGMonitor(this);
-@@ -168,8 +168,8 @@
-
- void BGMonitorLabel::updateMonitorGeometry()
- {
-- double scaleX = double(width()) / double(tqsizeHint().width());
-- double scaleY = double(height()) / double(tqsizeHint().height());
-+ double scaleX = double(width()) / double(sizeHint().width());
-+ double scaleY = double(height()) / double(sizeHint().height());
-
- kdDebug() << k_funcinfo << " Setting geometry to " << TQRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl;
- m_pBGMonitor->setGeometry( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) );
-@@ -189,7 +189,7 @@
- BGMonitor::BGMonitor(TQWidget *parent, const char *name)
- : TQLabel(parent, name)
- {
-- tqsetAlignment(AlignCenter);
-+ setAlignment(AlignCenter);
- setScaledContents(true);
- setAcceptDrops(true);
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/background/bgrender.cpp v3.5.13-sru/kcontrol/background/bgrender.cpp
---- /tmp/stable//kdebase/kcontrol/background/bgrender.cpp 2011-08-11 07:25:25.000000000 +0200
-+++ v3.5.13-sru/kcontrol/background/bgrender.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -129,7 +129,7 @@
- if (pos == (int) (cmd.length() - 1))
- break;
-
-- switch (cmd.tqat(pos+1).latin1()) {
-+ switch (cmd.at(pos+1).latin1()) {
- case 'f':
- createTempFile();
- cmd.replace(pos, 2, KShellProcess::quote(m_Tempfile->name()));
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/background/bgsettings.cpp v3.5.13-sru/kcontrol/background/bgsettings.cpp
---- /tmp/stable//kdebase/kcontrol/background/bgsettings.cpp 2011-08-11 07:25:25.000000000 +0200
-+++ v3.5.13-sru/kcontrol/background/bgsettings.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -148,7 +148,7 @@
- if (m_Pattern.isEmpty())
- return false;
- TQString file = m_Pattern;
-- if (file.tqat(0) != '/')
-+ if (file.at(0) != '/')
- file = m_pDirs->findResource("dtop_pattern", file);
- TQFileInfo fi(file);
- return (fi.exists());
-@@ -895,7 +895,7 @@
- tmpList.pop_front();
- while(tmpList.count())
- {
-- randomList.insert(randomList.tqat(
-+ randomList.insert(randomList.at(
- rseq.getLong(randomList.count()+1)),
- 1, tmpList.front());
-
-@@ -985,7 +985,7 @@
- {
- return false;
- }
-- m_WallpaperFiles.remove(m_WallpaperFiles.tqat(m_CurrentWallpaper));
-+ m_WallpaperFiles.remove(m_WallpaperFiles.at(m_CurrentWallpaper));
- --m_CurrentWallpaper;
- changeWallpaper();
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/background/bgwallpaper_ui.ui v3.5.13-sru/kcontrol/background/bgwallpaper_ui.ui
---- /tmp/stable//kdebase/kcontrol/background/bgwallpaper_ui.ui 2011-03-12 07:57:36.000000000 +0100
-+++ v3.5.13-sru/kcontrol/background/bgwallpaper_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -69,7 +69,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -98,7 +98,7 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>300</width>
- <height>100</height>
-@@ -123,7 +123,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/background/CMakeLists.txt v3.5.13-sru/kcontrol/background/CMakeLists.txt
---- /tmp/stable//kdebase/kcontrol/background/CMakeLists.txt 2011-03-12 07:57:36.000000000 +0100
-+++ v3.5.13-sru/kcontrol/background/CMakeLists.txt 2012-07-31 17:17:50.000000000 +0200
-@@ -18,6 +18,7 @@
- ${CMAKE_SOURCE_DIR}/libkonq
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
-+ ${LIBART_INCLUDE_DIRS}
- )
-
- link_directories(
-@@ -28,6 +29,7 @@
-
- tde_add_library( bgnd STATIC_PIC AUTOMOC
- SOURCES bgrender.cpp bgsettings.cpp
-+ LINK ${LIBART_LIBRARIES}
- )
-
- endif( )
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/bell/bell.cpp v3.5.13-sru/kcontrol/bell/bell.cpp
---- /tmp/stable//kdebase/kcontrol/bell/bell.cpp 2011-03-12 07:57:42.000000000 +0100
-+++ v3.5.13-sru/kcontrol/bell/bell.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -74,7 +74,7 @@
- box->setColumnLayout( 0, Qt::Horizontal );
- layout->addWidget(box);
- layout->addStretch();
-- TQGridLayout *grid = new TQGridLayout(box->tqlayout(), KDialog::spacingHint());
-+ TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint());
- grid->setColStretch(0, 0);
- grid->setColStretch(1, 1);
- grid->addColSpacing(0, 30);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/clock/dtime.cpp v3.5.13-sru/kcontrol/clock/dtime.cpp
---- /tmp/stable//kdebase/kcontrol/clock/dtime.cpp 2011-08-11 07:25:30.000000000 +0200
-+++ v3.5.13-sru/kcontrol/clock/dtime.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -89,7 +89,7 @@
- TQVBoxLayout *l1 = new TQVBoxLayout( dateBox, KDialog::spacingHint() );
-
- cal = new KDatePicker( dateBox );
-- cal->setMinimumSize(cal->tqsizeHint());
-+ cal->setMinimumSize(cal->sizeHint());
- l1->addWidget( cal );
- TQWhatsThis::add( cal, i18n("Here you can change the system date's day of the month, month and year.") );
-
-@@ -120,7 +120,7 @@
-
- TQLabel *dots1 = new TQLabel(":", timeBox);
- dots1->setMinimumWidth( 7 );
-- dots1->tqsetAlignment( TQLabel::AlignCenter );
-+ dots1->setAlignment( TQLabel::AlignCenter );
- v3->addMultiCellWidget(dots1, 0, 1, 3, 3 );
-
- minute = new HMSTimeWidget( timeBox );
-@@ -132,7 +132,7 @@
-
- TQLabel *dots2 = new TQLabel(":", timeBox);
- dots2->setMinimumWidth( 7 );
-- dots2->tqsetAlignment( TQLabel::AlignCenter );
-+ dots2->setAlignment( TQLabel::AlignCenter );
- v3->addMultiCellWidget(dots2, 0, 1, 5, 5 );
-
- second = new HMSTimeWidget( timeBox );
-@@ -293,7 +293,7 @@
- proc << ntpUtility << timeServer;
- proc.start( KProcess::Block );
- if( proc.exitStatus() != 0 ){
-- KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").tqarg(timeServer).latin1()));
-+ KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").arg(timeServer).latin1()));
- setDateTimeAuto->setChecked( false );
- }
- else {
-@@ -368,7 +368,7 @@
- void Kclock::setTime(const TQTime &time)
- {
- this->time = time;
-- tqrepaint();
-+ repaint();
- }
-
- void Kclock::paintEvent( TQPaintEvent * )
-@@ -382,8 +382,8 @@
- TQPointArray pts;
- TQPoint cp = rect().center();
- int d = QMIN(width(),height());
-- TQColor hands = tqcolorGroup().dark();
-- TQColor shadow = tqcolorGroup().text();
-+ TQColor hands = colorGroup().dark();
-+ TQColor shadow = colorGroup().text();
- paint.setPen( shadow );
- paint.setBrush( shadow );
- paint.setViewport(4,4,width(),height());
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/clock/tzone.cpp v3.5.13-sru/kcontrol/clock/tzone.cpp
---- /tmp/stable//kdebase/kcontrol/clock/tzone.cpp 2011-08-11 07:25:30.000000000 +0200
-+++ v3.5.13-sru/kcontrol/clock/tzone.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -77,7 +77,7 @@
- time_t now = time(0);
- tzset();
- strftime(result.data(), result.size(), "%Z", localtime(&now));
-- m_local->setText(localZone.tqarg(KTimezoneWidget::displayName(m_zoneDb.local())).tqarg(static_cast<const char *>(result)));
-+ m_local->setText(localZone.arg(KTimezoneWidget::displayName(m_zoneDb.local())).arg(static_cast<const char *>(result)));
- }
-
- // FIXME: Does the logic in this routine actually work correctly? For example,
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/colors/colorscm.cpp v3.5.13-sru/kcontrol/colors/colorscm.cpp
---- /tmp/stable//kdebase/kcontrol/colors/colorscm.cpp 2011-08-21 09:08:14.000000000 +0200
-+++ v3.5.13-sru/kcontrol/colors/colorscm.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -440,7 +440,7 @@
-
- void KColorScheme::slotSave( )
- {
-- KColorSchemeEntry *entry = mSchemeList->tqat(sList->currentItem()-nSysSchemes);
-+ KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes);
- if (!entry) return;
- sCurrentScheme = entry->path;
- KSimpleConfig *config = new KSimpleConfig(sCurrentScheme );
-@@ -482,7 +482,7 @@
- void KColorScheme::slotRemove()
- {
- uint ind = sList->currentItem();
-- KColorSchemeEntry *entry = mSchemeList->tqat(ind-nSysSchemes);
-+ KColorSchemeEntry *entry = mSchemeList->at(ind-nSysSchemes);
- if (!entry) return;
-
- if (unlink(TQFile::encodeName(entry->path).data())) {
-@@ -497,7 +497,7 @@
- mSchemeList->remove(entry);
-
- ind = sList->currentItem();
-- entry = mSchemeList->tqat(ind-nSysSchemes);
-+ entry = mSchemeList->at(ind-nSysSchemes);
- if (!entry) return;
- removeBt->setEnabled(entry ? entry->local : false);
- }
-@@ -795,7 +795,7 @@
- config->setGroup("General");
- } else {
- // Open scheme file
-- KColorSchemeEntry *entry = mSchemeList->tqat(sList->currentItem()-nSysSchemes);
-+ KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes);
- if (!entry) return;
- sCurrentScheme = entry->path;
- config = new KSimpleConfig(sCurrentScheme, true);
-@@ -941,7 +941,7 @@
- removeBt->setEnabled(false);
- else
- {
-- KColorSchemeEntry *entry = mSchemeList->tqat(indx-nSysSchemes);
-+ KColorSchemeEntry *entry = mSchemeList->at(indx-nSysSchemes);
- removeBt->setEnabled(entry ? entry->local : false);
- }
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/colors/widgetcanvas.cpp v3.5.13-sru/kcontrol/colors/widgetcanvas.cpp
---- /tmp/stable//kdebase/kcontrol/colors/widgetcanvas.cpp 2011-08-11 07:25:31.000000000 +0200
-+++ v3.5.13-sru/kcontrol/colors/widgetcanvas.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -327,7 +327,7 @@
- #ifndef __osf__
- TQPainter::redirect( vertScrollBar, &pm );
- #endif
-- vertScrollBar->tqrepaint();
-+ vertScrollBar->repaint();
- TQPainter::redirect( vertScrollBar, 0 );
- vertScrollBar->hide();
-
-@@ -338,7 +338,7 @@
-
- smplw.resize(width(), height());
- //smplw.fill( parentWidget()->back() );
-- smplw.fill( parentWidget()->tqcolorGroup().mid() );
-+ smplw.fill( parentWidget()->colorGroup().mid() );
-
- // Actually start painting in
-
-@@ -435,7 +435,7 @@
- // Menu bar
-
- //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush);
-- kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_PanelMenuBar, &paint,
-+ kapp->style().tqdrawPrimitive(TQStyle::PE_PanelMenuBar, &paint,
- TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg);
-
- paint.setFont( menuFont );
-@@ -443,7 +443,7 @@
- TQString file = i18n("File");
- textLen = paint.fontMetrics().width( file );
- //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush);
-- kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &paint,
-+ kapp->style().tqdrawPrimitive(TQStyle::PE_Panel, &paint,
- TQRect(30, 59, textLen + 10, 21), cg);
- paint.drawText( 35, 74, file );
-
-@@ -528,7 +528,7 @@
- cg2.setColor(TQColorGroup::Button, button);
- cg2.setColor(TQColorGroup::Background, window);
- //qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush);
-- kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonCommand, &paint,
-+ kapp->style().tqdrawPrimitive(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,
-@@ -567,9 +567,9 @@
- popup->setItemEnabled( id, false );
-
- // HACK: Force Layouting
-- //Sad Eagle: tqsizeHint() forces layouting too, and it's a lot less visible
-- //popup->tqsizeHint(); // Breaks with Qt 3.3
-- popup->resize(popup->tqsizeHint());
-+ //Sad Eagle: sizeHint() forces layouting too, and it's a lot less visible
-+ //popup->sizeHint(); // Breaks with Qt 3.3
-+ popup->resize(popup->sizeHint());
-
- pm = TQPixmap::grabWidget( popup );
- delete popup;
-@@ -585,12 +585,12 @@
- // Valance
-
- qDrawWinPanel ( &paint, 0, 0, width(), height(),
-- parentWidget()->tqcolorGroup(), TRUE, 0);
-+ parentWidget()->colorGroup(), TRUE, 0);
-
- // Stop the painting
-
- hotspots[ spot++ ] =
- HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ?
-
-- tqrepaint( FALSE );
-+ repaint( FALSE );
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/componentchooser/browserconfig_ui.ui v3.5.13-sru/kcontrol/componentchooser/browserconfig_ui.ui
---- /tmp/stable//kdebase/kcontrol/componentchooser/browserconfig_ui.ui 2011-03-12 07:57:37.000000000 +0100
-+++ v3.5.13-sru/kcontrol/componentchooser/browserconfig_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -86,7 +86,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -134,7 +134,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/componentchooser/componentchooser.cpp v3.5.13-sru/kcontrol/componentchooser/componentchooser.cpp
---- /tmp/stable//kdebase/kcontrol/componentchooser/componentchooser.cpp 2011-03-12 07:57:37.000000000 +0100
-+++ v3.5.13-sru/kcontrol/componentchooser/componentchooser.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -147,7 +147,7 @@
- kmailCB->setChecked(useKMail);
- otherCB->setChecked(!useKMail);
- txtEMailClient->setText(emailClient);
-- txtEMailClient->setFixedHeight(txtEMailClient->tqsizeHint().height());
-+ txtEMailClient->setFixedHeight(txtEMailClient->sizeHint().height());
- chkRunTerminal->setChecked((pSettings->getSetting(KEMailSettings::ClientTerminal) == "true"));
-
- emit changed(false);
-@@ -169,9 +169,9 @@
- TQString client = dlg.text();
-
- // get the preferred Terminal Application
-- KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
-- TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole"));
-- preferredTerminal += TQString::tqfromLatin1(" -e ");
-+ KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
-+ TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
-+ preferredTerminal += TQString::fromLatin1(" -e ");
-
- int len = preferredTerminal.length();
- bool b = client.left(len) == preferredTerminal;
-@@ -393,7 +393,7 @@
- ServiceChooser->insertItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it)));
-
- }
-- ServiceChooser->setFixedWidth(ServiceChooser->tqsizeHint().width());
-+ ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width());
- ServiceChooser->sort();
- connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*)));
- ServiceChooser->setSelected(0,true);
-@@ -410,7 +410,7 @@
- KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File);
-
- ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available")));
-- ComponentDescription->setMinimumSize(ComponentDescription->tqsizeHint());
-+ ComponentDescription->setMinimumSize(ComponentDescription->sizeHint());
-
-
- TQString cfgType=cfg.readEntry("configurationType");
-@@ -461,7 +461,7 @@
- delete configWidget;
- configWidget=newConfigWidget;
- connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool)));
-- configContainer->setMinimumSize(configWidget->tqsizeHint());
-+ configContainer->setMinimumSize(configWidget->sizeHint());
- }
-
- if (configWidget)
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/componentchooser/componentchooser_ui.ui v3.5.13-sru/kcontrol/componentchooser/componentchooser_ui.ui
---- /tmp/stable//kdebase/kcontrol/componentchooser/componentchooser_ui.ui 2011-03-12 07:57:37.000000000 +0100
-+++ v3.5.13-sru/kcontrol/componentchooser/componentchooser_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -91,7 +91,7 @@
- <property name="text">
- <string></string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>WordBreak|AlignTop</set>
- </property>
- </widget>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/componentchooser/componentconfig_ui.ui v3.5.13-sru/kcontrol/componentchooser/componentconfig_ui.ui
---- /tmp/stable//kdebase/kcontrol/componentchooser/componentconfig_ui.ui 2011-03-12 07:57:37.000000000 +0100
-+++ v3.5.13-sru/kcontrol/componentchooser/componentconfig_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -26,7 +26,7 @@
- <property name="text">
- <string></string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>WordBreak|AlignVCenter</set>
- </property>
- </widget>
-@@ -45,7 +45,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>0</width>
- <height>91</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/componentchooser/emailclientconfig_ui.ui v3.5.13-sru/kcontrol/componentchooser/emailclientconfig_ui.ui
---- /tmp/stable//kdebase/kcontrol/componentchooser/emailclientconfig_ui.ui 2011-03-12 07:57:37.000000000 +0100
-+++ v3.5.13-sru/kcontrol/componentchooser/emailclientconfig_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -73,7 +73,7 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
-@@ -126,7 +126,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>0</width>
- <height>16</height>
-@@ -165,7 +165,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>30</width>
- <height>16</height>
-@@ -182,7 +182,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>30</width>
- <height>16</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/componentchooser/terminalemulatorconfig_ui.ui v3.5.13-sru/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
---- /tmp/stable//kdebase/kcontrol/componentchooser/terminalemulatorconfig_ui.ui 2011-03-12 07:57:37.000000000 +0100
-+++ v3.5.13-sru/kcontrol/componentchooser/terminalemulatorconfig_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -57,7 +57,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>0</width>
- <height>87</height>
-@@ -82,7 +82,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>31</width>
- <height>20</height>
-@@ -120,7 +120,7 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/crypto/crypto.cpp v3.5.13-sru/kcontrol/crypto/crypto.cpp
---- /tmp/stable//kdebase/kcontrol/crypto/crypto.cpp 2011-10-10 08:55:56.000000000 +0200
-+++ v3.5.13-sru/kcontrol/crypto/crypto.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -842,7 +842,7 @@
- tabs->addTab(tabSSLCOpts, i18n("Validation Options"));
- #endif
-
-- tabs->resize(tabs->tqsizeHint());
-+ tabs->resize(tabs->sizeHint());
- load();
- }
-
-@@ -1500,7 +1500,7 @@
- TQPalette cspl;
- iss = cert->getIssuer();
- cspl = validFrom->palette();
-- if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
-+ if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
- cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
- } else {
- cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
-@@ -1508,7 +1508,7 @@
- validFrom->setPalette(cspl);
-
- cspl = validUntil->palette();
-- if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
-+ if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
- cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
- } else {
- cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
-@@ -1518,7 +1518,7 @@
- validFrom->setText(cert->getNotBefore());
- validUntil->setText(cert->getNotAfter());
- untilDate->setText(x ? KGlobal::locale()->formatDateTime(x->getExpires())
-- : KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(Qt::UTC)));
-+ : KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC)));
- untilDate->setEnabled(x && !x->isPermanent());
- pHash->setText(cert->getMD5DigestText());
- delete cert;
-@@ -1738,7 +1738,7 @@
- TQPalette cspl;
- KSSLCertificate *cert = pkcs->getCertificate();
- cspl = yValidFrom->palette();
-- if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
-+ if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
- cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
- } else {
- cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
-@@ -1746,7 +1746,7 @@
- yValidFrom->setPalette(cspl);
-
- cspl = yValidUntil->palette();
-- if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
-+ if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
- cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
- } else {
- cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
-@@ -1778,7 +1778,7 @@
- KSSLCertificate *cert = pkcs->getCertificate();
- iss = cert->getIssuer();
- cspl = yValidFrom->palette();
-- if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
-+ if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
- cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
- } else {
- cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
-@@ -1786,7 +1786,7 @@
- yValidFrom->setPalette(cspl);
-
- cspl = yValidUntil->palette();
-- if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
-+ if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
- cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
- } else {
- cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/css/cssconfig.ui v3.5.13-sru/kcontrol/css/cssconfig.ui
---- /tmp/stable//kdebase/kcontrol/css/cssconfig.ui 2011-03-12 07:57:45.000000000 +0100
-+++ v3.5.13-sru/kcontrol/css/cssconfig.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -103,7 +103,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>16</width>
- <height>20</height>
-@@ -157,7 +157,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>16</width>
- <height>20</height>
-@@ -185,7 +185,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>451</width>
- <height>20</height>
-@@ -206,7 +206,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>50</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/css/csscustom.ui v3.5.13-sru/kcontrol/css/csscustom.ui
---- /tmp/stable//kdebase/kcontrol/css/csscustom.ui 2011-03-12 07:57:45.000000000 +0100
-+++ v3.5.13-sru/kcontrol/css/csscustom.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -243,7 +243,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>0</width>
- <height>20</height>
-@@ -273,7 +273,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-@@ -315,7 +315,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>0</width>
- <height>20</height>
-@@ -412,7 +412,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>0</width>
- <height>20</height>
-@@ -429,7 +429,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>21</width>
- <height>20</height>
-@@ -446,7 +446,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -463,7 +463,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>0</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/css/preview.ui v3.5.13-sru/kcontrol/css/preview.ui
---- /tmp/stable//kdebase/kcontrol/css/preview.ui 2011-03-12 07:57:45.000000000 +0100
-+++ v3.5.13-sru/kcontrol/css/preview.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -37,7 +37,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/displayconfig/displayconfigbase.ui v3.5.13-sru/kcontrol/displayconfig/displayconfigbase.ui
---- /tmp/stable//kdebase/kcontrol/displayconfig/displayconfigbase.ui 2011-10-10 03:40:45.000000000 +0200
-+++ v3.5.13-sru/kcontrol/displayconfig/displayconfigbase.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -65,7 +65,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -310,7 +310,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -403,7 +403,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -420,7 +420,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -597,7 +597,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -649,7 +649,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -749,7 +749,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/displayconfig/displayconfig.cpp v3.5.13-sru/kcontrol/displayconfig/displayconfig.cpp
---- /tmp/stable//kdebase/kcontrol/displayconfig/displayconfig.cpp 2011-10-10 03:40:45.000000000 +0200
-+++ v3.5.13-sru/kcontrol/displayconfig/displayconfig.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -743,7 +743,7 @@
- m_randrsimple = new KRandrSimpleAPI();
-
- TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-- systemconfig = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdisplay/kdisplayconfigrc" ));
-+ systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdisplay/kdisplayconfigrc" ));
- systemconfig->setFileWriteMode(0644);
-
- KAboutData *about =
-@@ -1219,10 +1219,10 @@
- screendata->gamma_blue = floorf(screendata->gamma_blue * 10 + 0.5) / 10;
-
- // Set the labels
-- base->gammaAllLabel->setText(TQString("%1").tqarg(((float)base->gammaAllSlider->value())/10.0, 0, 'f', 1));
-- base->gammaRedLabel->setText(TQString("%1").tqarg(((float)base->gammaRedSlider->value())/10.0, 0, 'f', 1));
-- base->gammaGreenLabel->setText(TQString("%1").tqarg(((float)base->gammaGreenSlider->value())/10.0, 0, 'f', 1));
-- base->gammaBlueLabel->setText(TQString("%1").tqarg(((float)base->gammaBlueSlider->value())/10.0, 0, 'f', 1));
-+ base->gammaAllLabel->setText(TQString("%1").arg(((float)base->gammaAllSlider->value())/10.0, 0, 'f', 1));
-+ base->gammaRedLabel->setText(TQString("%1").arg(((float)base->gammaRedSlider->value())/10.0, 0, 'f', 1));
-+ base->gammaGreenLabel->setText(TQString("%1").arg(((float)base->gammaGreenSlider->value())/10.0, 0, 'f', 1));
-+ base->gammaBlueLabel->setText(TQString("%1").arg(((float)base->gammaBlueSlider->value())/10.0, 0, 'f', 1));
- }
-
- void KDisplayConfig::gammaSetAverageAllSlider() {
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/displayconfig/displayconfig.desktop v3.5.13-sru/kcontrol/displayconfig/displayconfig.desktop
---- /tmp/stable//kdebase/kcontrol/displayconfig/displayconfig.desktop 2011-08-24 18:35:15.000000000 +0200
-+++ v3.5.13-sru/kcontrol/displayconfig/displayconfig.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -1,23 +1,25 @@
- [Desktop Entry]
--Exec=kcmshell displayconfig
--Icon=background
--Type=Application
--DocPath=kcontrol/displayconfig/index.html
--
--X-KDE-Library=displayconfig
--X-KDE-ParentApp=kcontrol
--X-KDE-RootOnly=true
--X-KDE-SubstituteUID=true
--
--Categories=Qt;KDE;X-KDE-settings-peripherals;
-+Categories=Qt;KDE;X-KDE-settings-system;
- Comment=Configure display
- Comment[en_US]=Configure display
- DocPath=kcontrol/displayconfig.html
-+Exec[$e]=kcmshell displayconfig
- GenericName=
- GenericName[en_US]=
-+Icon=background
- Keywords=monitor,resolution,display
- MimeType=
--Name=Monitor and Display
--Name[en_US]=Monitor and Display
--
--NoDisplay=false
-\ Pas de fin de ligne à la fin du fichier
-+Name=Monitor & Display
-+Name[en_US]=Monitor & Display
-+NoDisplay=false
-+Path[$e]=
-+StartupNotify=true
-+Terminal=false
-+TerminalOptions=
-+Type=Application
-+X-DCOP-ServiceType=
-+X-KDE-Library=displayconfig
-+X-KDE-ParentApp=kcontrol
-+X-KDE-RootOnly=true
-+X-KDE-SubstituteUID=true
-+X-KDE-Username=
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/dnssd/configdialog.ui v3.5.13-sru/kcontrol/dnssd/configdialog.ui
---- /tmp/stable//kdebase/kcontrol/dnssd/configdialog.ui 2011-03-12 07:57:49.000000000 +0100
-+++ v3.5.13-sru/kcontrol/dnssd/configdialog.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -20,7 +20,7 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
-@@ -204,7 +204,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>130</width>
- <height>21</height>
-@@ -264,7 +264,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>90</width>
- <height>20</height>
-@@ -281,7 +281,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>90</width>
- <height>21</height>
-@@ -300,7 +300,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>50</width>
- <height>110</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/dnssd/kcmdnssd.cpp v3.5.13-sru/kcontrol/dnssd/kcmdnssd.cpp
---- /tmp/stable//kdebase/kcontrol/dnssd/kcmdnssd.cpp 2011-03-12 07:57:49.000000000 +0100
-+++ v3.5.13-sru/kcontrol/dnssd/kcmdnssd.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -65,7 +65,7 @@
- else if (getenv("KDESU_USER")!=0) tabs->removePage(tab);
- addConfig(DNSSD::Configuration::self(),this);
- // it is host-wide setting so it has to be in global config file
-- domain = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdnssdrc" ));
-+ domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdnssdrc" ));
- domain->setGroup("publishing");
- load();
- connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));
-@@ -124,7 +124,7 @@
- while (avahiStatus.isRunning()) {
- kapp->processEvents();
- }
-- int exitStatus = avahiStatus.exitqStatus();
-+ int exitStatus = avahiStatus.exitStatus();
- if (exitStatus == 0) { // disabled
- enableZeroconf->setChecked(false);
- } else if (exitStatus == 1) { // enabled
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui v3.5.13-sru/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
---- /tmp/stable//kdebase/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui 2011-03-12 07:57:39.000000000 +0100
-+++ v3.5.13-sru/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -161,7 +161,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>21</width>
- <height>170</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp v3.5.13-sru/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
---- /tmp/stable//kdebase/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp 2011-08-11 07:25:27.000000000 +0200
-+++ v3.5.13-sru/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -41,7 +41,7 @@
- : KURIFilterPlugin( parent, name ? name : "localdomainurifilter", 1.0 ),
- DCOPObject( "LocalDomainURIFilterIface" ),
- last_time( 0 ),
-- m_hostPortPattern( TQString::tqfromLatin1(HOSTPORT_PATTERN) )
-+ m_hostPortPattern( TQString::fromLatin1(HOSTPORT_PATTERN) )
- {
- configure();
- }
-@@ -56,7 +56,7 @@
- if( m_hostPortPattern.exactMatch( cmd ) &&
- isLocalDomainHost( cmd ) )
- {
-- cmd.prepend( TQString::tqfromLatin1("http://") );
-+ cmd.prepend( TQString::fromLatin1("http://") );
- setFilteredURI( data, KURL( cmd ) );
- setURIType( data, KURIFilterData::NET_PROTOCOL );
-
-@@ -76,7 +76,7 @@
-
- if( !(host == last_host && last_time > time( NULL ) - 5 ) ) {
-
-- TQString helper = KStandardDirs::findExe(TQString::tqfromLatin1( "klocaldomainurifilterhelper" ));
-+ TQString helper = KStandardDirs::findExe(TQString::fromLatin1( "klocaldomainurifilterhelper" ));
- if( helper.isEmpty())
- return last_result = false;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp v3.5.13-sru/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
---- /tmp/stable//kdebase/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp 2011-10-16 21:40:20.000000000 +0200
-+++ v3.5.13-sru/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -43,7 +43,7 @@
- #define IPv6_PATTERN "^\\[.*\\]"
- #define ENV_VAR_PATTERN "\\$[a-zA-Z_][a-zA-Z0-9_]*"
-
--#define QFL1(x) TQString::tqfromLatin1(x)
-+#define QFL1(x) TQString::fromLatin1(x)
-
- /**
- * IMPORTANT:
-@@ -164,13 +164,13 @@
-
- if (!isMalformed &&
- (url.protocol().length() == 4) &&
-- (url.protocol() != TQString::tqfromLatin1("http")) &&
-+ (url.protocol() != TQString::fromLatin1("http")) &&
- (url.protocol()[0]=='h') &&
- (url.protocol()[1]==url.protocol()[2]) &&
- (url.protocol()[3]=='p'))
- {
- // Handle "encrypted" URLs like: h++p://www.kde.org
-- url.setProtocol( TQString::tqfromLatin1("http"));
-+ url.setProtocol( TQString::fromLatin1("http"));
- setFilteredURI( data, url);
- setURIType( data, KURIFilterData::NET_PROTOCOL );
- return true;
-@@ -210,11 +210,11 @@
- }
-
- // Detect UNC style (aka windows SMB) URLs
-- if ( cmd.startsWith( TQString::tqfromLatin1( "\\\\") ) )
-+ if ( cmd.startsWith( TQString::fromLatin1( "\\\\") ) )
- {
- // make sure path is unix style
- cmd.replace('\\', '/');
-- cmd.prepend( TQString::tqfromLatin1( "smb:" ) );
-+ cmd.prepend( TQString::fromLatin1( "smb:" ) );
- setFilteredURI( data, KURL( cmd ));
- setURIType( data, KURIFilterData::NET_PROTOCOL );
- return true;
-@@ -379,7 +379,7 @@
- u.setRef(ref);
- u.setQuery(query);
-
-- if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("open"), KURL(), u))
-+ if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
- {
- // No authorisation, we pretend it's a file will get
- // an access denied error later on.
-@@ -514,7 +514,7 @@
- u.setPath(path);
- u.setRef(ref);
-
-- if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("open"), KURL(), u))
-+ if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
- {
- // No authorisation, we pretend it exists and will get
- // an access denied error later on.
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/filetypes/filetypedetails.cpp v3.5.13-sru/kcontrol/filetypes/filetypedetails.cpp
---- /tmp/stable//kdebase/kcontrol/filetypes/filetypedetails.cpp 2011-03-12 07:57:40.000000000 +0100
-+++ v3.5.13-sru/kcontrol/filetypes/filetypedetails.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -100,7 +100,7 @@
- m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() );
- secondLayout->addWidget( m_autoEmbed, 1 );
-
-- m_autoEmbed->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) );
-+ m_autoEmbed->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) );
-
- // The order of those three items is very important. If you change it, fix typeslistitem.cpp !
- new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
-@@ -120,7 +120,7 @@
- secondLayout->addSpacing(10);
-
- embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget );
-- embedServiceListWidget->setMinimumHeight( serviceListWidget->tqsizeHint().height() );
-+ embedServiceListWidget->setMinimumHeight( serviceListWidget->sizeHint().height() );
- connect( embedServiceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
- secondLayout->addWidget(embedServiceListWidget, 3);
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/filetypes/filetypesview.cpp v3.5.13-sru/kcontrol/filetypes/filetypesview.cpp
---- /tmp/stable//kdebase/kcontrol/filetypes/filetypesview.cpp 2011-08-11 07:25:27.000000000 +0200
-+++ v3.5.13-sru/kcontrol/filetypes/filetypesview.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -126,7 +126,7 @@
-
- // Widget shown on startup
- m_emptyWidget = new TQLabel( i18n("Select a file type by name or by extension"), m_widgetStack);
-- m_emptyWidget->tqsetAlignment(AlignCenter);
-+ m_emptyWidget->setAlignment(AlignCenter);
-
- m_widgetStack->addWidget( m_emptyWidget, 3 /*id*/ );
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/filetypes/typeslistitem.cpp v3.5.13-sru/kcontrol/filetypes/typeslistitem.cpp
---- /tmp/stable//kdebase/kcontrol/filetypes/typeslistitem.cpp 2011-08-11 07:25:27.000000000 +0200
-+++ v3.5.13-sru/kcontrol/filetypes/typeslistitem.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -69,7 +69,7 @@
- KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
- config->setGroup("EmbedSettings");
- bool defaultValue = defaultEmbeddingSetting( major );
-- m_autoEmbed = config->readBoolEntry( TQString::tqfromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
-+ m_autoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
- }
-
- bool TypesListItem::defaultEmbeddingSetting( const TQString& major )
-@@ -230,7 +230,7 @@
- KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
- config->setGroup("EmbedSettings");
- bool defaultValue = defaultEmbeddingSetting(m_major);
-- unsigned int oldAutoEmbed = config->readBoolEntry( TQString::tqfromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
-+ unsigned int oldAutoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
- if ( m_autoEmbed != oldAutoEmbed )
- return true;
- }
-@@ -249,7 +249,7 @@
- {
- KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
- config->setGroup("EmbedSettings");
-- config->writeEntry( TQString::tqfromLatin1("embed-")+m_major, m_autoEmbed == 0 );
-+ config->writeEntry( TQString::fromLatin1("embed-")+m_major, m_autoEmbed == 0 );
- return;
- }
-
-@@ -286,9 +286,9 @@
- config.writeEntry("Hidden", false);
-
- if ( m_autoEmbed == 2 )
-- config.deleteEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), false );
-+ config.deleteEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), false );
- else
-- config.writeEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 );
-+ config.writeEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 );
-
- m_bNewItem = false;
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/fonts/fonts.cpp v3.5.13-sru/kcontrol/fonts/fonts.cpp
---- /tmp/stable//kdebase/kcontrol/fonts/fonts.cpp 2011-03-12 07:57:37.000000000 +0100
-+++ v3.5.13-sru/kcontrol/fonts/fonts.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -688,7 +688,7 @@
- void KFonts::load( bool useDefaults )
- {
- for ( uint i = 0; i < fontUseList.count(); i++ )
-- fontUseList.tqat( i )->readFont( useDefaults );
-+ fontUseList.at( i )->readFont( useDefaults );
-
- useAA_original = useAA = aaSettings->load( useDefaults ) ? AAEnabled : AADisabled;
- cbAA->setCurrentItem( useAA );
-@@ -779,7 +779,7 @@
- if (ret == KDialog::Accepted && fontDiffFlags)
- {
- for ( int i = 0; i < (int) fontUseList.count(); i++ )
-- fontUseList.tqat( i )->applyFontDiff( font,fontDiffFlags );
-+ fontUseList.at( i )->applyFontDiff( font,fontDiffFlags );
- emit changed(true);
- }
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/fonts/kxftconfig.cpp v3.5.13-sru/kcontrol/fonts/kxftconfig.cpp
---- /tmp/stable//kdebase/kcontrol/fonts/kxftconfig.cpp 2011-08-16 01:07:50.000000000 +0200
-+++ v3.5.13-sru/kcontrol/fonts/kxftconfig.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -52,7 +52,7 @@
- unsigned int len = home.length();
-
- if(path.length() == len || path[len] == '/')
-- return path.replace(0, len, TQString::tqfromLatin1("~"));
-+ return path.replace(0, len, TQString::fromLatin1("~"));
- }
- }
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/iccconfig/iccconfigbase.ui v3.5.13-sru/kcontrol/iccconfig/iccconfigbase.ui
---- /tmp/stable//kdebase/kcontrol/iccconfig/iccconfigbase.ui 2011-07-05 21:59:37.000000000 +0200
-+++ v3.5.13-sru/kcontrol/iccconfig/iccconfigbase.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -168,7 +168,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/iccconfig/iccconfig.cpp v3.5.13-sru/kcontrol/iccconfig/iccconfig.cpp
---- /tmp/stable//kdebase/kcontrol/iccconfig/iccconfig.cpp 2011-03-12 07:57:37.000000000 +0100
-+++ v3.5.13-sru/kcontrol/iccconfig/iccconfig.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -65,8 +65,8 @@
- {
-
- TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-- config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" ));
-- systemconfig = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
-+ config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
-+ systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
-
- KAboutData *about =
- new KAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("KDE ICC Profile Control Module"),
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/iccconfig/iccconfig.desktop v3.5.13-sru/kcontrol/iccconfig/iccconfig.desktop
---- /tmp/stable//kdebase/kcontrol/iccconfig/iccconfig.desktop 2010-08-12 05:28:32.000000000 +0200
-+++ v3.5.13-sru/kcontrol/iccconfig/iccconfig.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -9,7 +9,7 @@
- X-KDE-RootOnly=true
- X-KDE-SubstituteUID=true
-
--Categories=Qt;KDE;X-KDE-settings-peripherals;
-+Categories=Qt;KDE;X-KDE-settings-hardware;
- Comment=Configure display ICC profile
- Comment[en_US]=Configure display ICC profile
- DocPath=kcontrol/iccconfig.html
-@@ -18,4 +18,6 @@
- Keywords=ICC,display,color,profile
- MimeType=
- Name=ICC Color Profile
--Name[en_US]=ICC Color Profile
-\ Pas de fin de ligne à la fin du fichier
-+Name[en_US]=ICC Color Profile
-+
-+NoDisplay=false
-\ Pas de fin de ligne à la fin du fichier
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/icons/CMakeLists.txt v3.5.13-sru/kcontrol/icons/CMakeLists.txt
---- /tmp/stable//kdebase/kcontrol/icons/CMakeLists.txt 2011-03-12 07:57:49.000000000 +0100
-+++ v3.5.13-sru/kcontrol/icons/CMakeLists.txt 2012-07-31 17:17:50.000000000 +0200
-@@ -14,6 +14,7 @@
- ${CMAKE_BINARY_DIR}
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
-+ ${LIBART_INCLUDE_DIRS}
- )
-
- link_directories(
-@@ -30,6 +31,6 @@
-
- tde_add_kpart( kcm_icons AUTOMOC
- SOURCES iconthemes.cpp icons.cpp main.cpp
-- LINK kio-shared
-+ LINK kio-shared ${LIBART_LIBRARIES}
- DESTINATION ${PLUGIN_INSTALL_DIR}
- )
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/icons/icons.cpp v3.5.13-sru/kcontrol/icons/icons.cpp
---- /tmp/stable//kdebase/kcontrol/icons/icons.cpp 2011-08-11 07:25:32.000000000 +0200
-+++ v3.5.13-sru/kcontrol/icons/icons.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -80,7 +80,7 @@
-
- // Size
- TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1);
-- lbl->setFixedSize(lbl->tqsizeHint());
-+ lbl->setFixedSize(lbl->sizeHint());
- grid->addWidget(lbl, 0, 0, Qt::AlignLeft);
- mpSizeBox = new TQComboBox(m_pTab1);
- connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int)));
-@@ -105,8 +105,8 @@
-
- top->activate();
-
-- mpSystrayConfig = new KSimpleConfig( TQString::tqfromLatin1( "systemtray_panelappletrc" ));
-- mpKickerConfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" ));
-+ mpSystrayConfig = new KSimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" ));
-+ mpKickerConfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
-
- init();
- read();
-@@ -125,7 +125,7 @@
- TQLabel *lab = new TQLabel(str, parent);
- lay->addWidget(lab, 1, i, Qt::AlignCenter);
- mpPreview[i] = new TQLabel(parent);
-- mpPreview[i]->tqsetAlignment(AlignCenter);
-+ mpPreview[i]->setAlignment(AlignCenter);
- mpPreview[i]->setMinimumSize(105, 105);
- lay->addWidget(mpPreview[i], 2, i);
- TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent);
-@@ -302,12 +302,12 @@
-
- if (mpUsageList->currentText() == i18n("Panel Buttons")) {
- mpSizeBox->clear();
-- mpSizeBox->insertItem(TQString().tqsetNum(16));
-- mpSizeBox->insertItem(TQString().tqsetNum(22));
-- mpSizeBox->insertItem(TQString().tqsetNum(32));
-- mpSizeBox->insertItem(TQString().tqsetNum(48));
-- mpSizeBox->insertItem(TQString().tqsetNum(64));
-- mpSizeBox->insertItem(TQString().tqsetNum(128));
-+ mpSizeBox->insertItem(TQString().setNum(16));
-+ mpSizeBox->insertItem(TQString().setNum(22));
-+ mpSizeBox->insertItem(TQString().setNum(32));
-+ mpSizeBox->insertItem(TQString().setNum(48));
-+ mpSizeBox->insertItem(TQString().setNum(64));
-+ mpSizeBox->insertItem(TQString().setNum(128));
- for (i=0;i<(mpSizeBox->count());i++) {
- if (mpSizeBox->text(i) == TQString().setNum(mQuickLaunchSize)) {
- mpSizeBox->setCurrentItem(i);
-@@ -316,12 +316,12 @@
- }
- else if (mpUsageList->currentText() == i18n("System Tray Icons")) {
- mpSizeBox->clear();
-- mpSizeBox->insertItem(TQString().tqsetNum(16));
-- mpSizeBox->insertItem(TQString().tqsetNum(22));
-- mpSizeBox->insertItem(TQString().tqsetNum(32));
-- mpSizeBox->insertItem(TQString().tqsetNum(48));
-- mpSizeBox->insertItem(TQString().tqsetNum(64));
-- mpSizeBox->insertItem(TQString().tqsetNum(128));
-+ mpSizeBox->insertItem(TQString().setNum(16));
-+ mpSizeBox->insertItem(TQString().setNum(22));
-+ mpSizeBox->insertItem(TQString().setNum(32));
-+ mpSizeBox->insertItem(TQString().setNum(48));
-+ mpSizeBox->insertItem(TQString().setNum(64));
-+ mpSizeBox->insertItem(TQString().setNum(128));
- for (i=0;i<(mpSizeBox->count());i++) {
- if (mpSizeBox->text(i) == TQString().setNum(mSysTraySize)) {
- mpSizeBox->setCurrentItem(i);
-@@ -335,7 +335,7 @@
- if (mUsage < KIcon::LastGroup) {
- for (it=mAvSizes[mUsage].begin(), i=0; it!=mAvSizes[mUsage].end(); ++it, i++)
- {
-- mpSizeBox->insertItem(TQString().tqsetNum(*it));
-+ mpSizeBox->insertItem(TQString().setNum(*it));
- dw = abs(mSizes[mUsage] - *it);
- if (dw < delta)
- {
-@@ -688,7 +688,7 @@
- top->setRowStretch(1,1);
-
- lbl = new TQLabel(i18n("&Effect:"), page);
-- lbl->setFixedSize(lbl->tqsizeHint());
-+ lbl->setFixedSize(lbl->sizeHint());
- top->addWidget(lbl, 0, 0, Qt::AlignLeft);
- mpEffectBox = new TQListBox(page);
- mpEffectBox->insertItem(i18n("No Effect"));
-@@ -713,7 +713,7 @@
- grid->setRowStretch(1, 1);
-
- mpPreview = new TQLabel(frame);
-- mpPreview->tqsetAlignment(AlignCenter);
-+ mpPreview->setAlignment(AlignCenter);
- mpPreview->setMinimumSize(105, 105);
- grid->addWidget(mpPreview, 1, 0);
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/cdinfo.desktop v3.5.13-sru/kcontrol/info/cdinfo.desktop
---- /tmp/stable//kdebase/kcontrol/info/cdinfo.desktop 2010-08-12 05:28:32.000000000 +0200
-+++ v3.5.13-sru/kcontrol/info/cdinfo.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -163,4 +163,4 @@
- Keywords[vi]=Thông tin đĩa CD-ROM,CD-ROM,CD, ổ đĩa CD, Khả năng ổ ghi
- Keywords[wa]=Informåcion do CD-ROM,CD-ROM,CD,léjheu d' CD,Usteyes di scrijhaedje
-
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/devices.desktop v3.5.13-sru/kcontrol/info/devices.desktop
---- /tmp/stable//kdebase/kcontrol/info/devices.desktop 2010-08-12 05:28:33.000000000 +0200
-+++ v3.5.13-sru/kcontrol/info/devices.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -3,7 +3,7 @@
- Icon=kcmdevices
- Type=Application
- DocPath=kinfocenter/devices/index.html
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-
-
- X-KDE-Library=info
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/dma.desktop v3.5.13-sru/kcontrol/info/dma.desktop
---- /tmp/stable//kdebase/kcontrol/info/dma.desktop 2010-08-12 05:28:32.000000000 +0200
-+++ v3.5.13-sru/kcontrol/info/dma.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -3,7 +3,7 @@
- Icon=kcmmemory
- Type=Application
- DocPath=kinfocenter/dma/index.html
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-
-
- X-KDE-Library=info
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/info.cpp v3.5.13-sru/kcontrol/info/info.cpp
---- /tmp/stable//kdebase/kcontrol/info/info.cpp 2011-03-12 07:57:38.000000000 +0100
-+++ v3.5.13-sru/kcontrol/info/info.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -80,7 +80,7 @@
- {
- TQString hexstr;
- int i;
-- hexstr = TQString::tqfromLatin1("0x%1").arg(val, digits, 16/*=HEX*/);
-+ hexstr = TQString::fromLatin1("0x%1").arg(val, digits, 16/*=HEX*/);
- for (i=hexstr.length()-1; i>0; --i)
- if (hexstr[i]==' ')
- hexstr[i] = '0';
-@@ -167,7 +167,7 @@
- for (i = 0; i < ndepths; i++) {
- txt = txt + Value(depths[i]);
- if (i < ndepths - 1)
-- txt = txt + TQString::tqfromLatin1(", ");
-+ txt = txt + TQString::fromLatin1(", ");
- }
-
- last = new TQListViewItem(item, last, i18n("Depths (%1)").arg(ndepths,-1), txt);
-@@ -204,7 +204,7 @@
- &width, &height);
- last = new TQListViewItem(item, last, i18n("Largest Cursor"),
- (width == 65535 && height == 65535)
-- ? i18n("unlimited") : TQString::tqfromLatin1("%1 x %2").arg(width).arg(height));
-+ ? i18n("unlimited") : TQString::fromLatin1("%1 x %2").arg(width).arg(height));
-
- last = new TQListViewItem(item, last, i18n("Current Input Event Mask"),
- HexStr((unsigned long)EventMaskOfScreen(s),HEXDIGITS));
-@@ -272,12 +272,12 @@
- last = new TQListViewItem(next, i18n("Name of the Display"),
- DisplayString(dpy));
-
-- last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::tqfromLatin1(ServerVendor(dpy)));
-+ last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::fromLatin1(ServerVendor(dpy)));
- last = new TQListViewItem(next, last, i18n("Vendor Release Number"),
- Value((int)VendorRelease(dpy)));
-
- last = new TQListViewItem(next, last, i18n("Version Number"),
-- TQString::tqfromLatin1("%1.%2").arg((int)ProtocolVersion(dpy))
-+ TQString::fromLatin1("%1.%2").arg((int)ProtocolVersion(dpy))
- .arg((int)ProtocolRevision(dpy)));
-
- last = item = new TQListViewItem(next, last, i18n("Available Screens"));
-@@ -294,7 +294,7 @@
- int extCount;
- char **extensions = XListExtensions( dpy, &extCount );
- for ( i = 0; i < extCount; i++ ) {
-- item = new TQListViewItem( last, item, TQString::tqfromLatin1( extensions[i] ) );
-+ item = new TQListViewItem( last, item, TQString::fromLatin1( extensions[i] ) );
- }
- XFreeExtensionList( extensions );
-
-@@ -356,7 +356,7 @@
- retrieve-function. If the function wants the widget to show
- another string, then it change *GetInfo_ErrorString ! */
- ErrorString = i18n("No information available about %1.").arg(title)
-- + TQString::tqfromLatin1("\n\n") + DEFAULT_ERRORSTRING;
-+ + TQString::fromLatin1("\n\n") + DEFAULT_ERRORSTRING;
- GetInfo_ErrorString = &ErrorString; /* save the address of ErrorString */
-
- sorting_allowed = true; /* the functions may set that */
-@@ -425,7 +425,7 @@
- TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) );
- NoInfoText = new TQLabel(widgetStack);
- widgetStack->addWidget(NoInfoText, 1);
-- NoInfoText->tqsetAlignment(AlignCenter | WordBreak);
-+ NoInfoText->setAlignment(AlignCenter | WordBreak);
- widgetStack->raiseWidget(NoInfoText);
- load();
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/info_netbsd.cpp v3.5.13-sru/kcontrol/info/info_netbsd.cpp
---- /tmp/stable//kdebase/kcontrol/info/info_netbsd.cpp 2011-08-11 07:25:26.000000000 +0200
-+++ v3.5.13-sru/kcontrol/info/info_netbsd.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -296,18 +296,18 @@
-
- // convert to strings
- vv[0] = KIO::convertSize(big[0]);
-- vv[1] = TQString::tqfromLatin1("%1 (%2%%)")
-+ vv[1] = TQString::fromLatin1("%1 (%2%%)")
- .arg(KIO::convertSize(big[1]))
- .arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0);
-
- // FIXME: these two are large enough to punctuate
- vv[2] = TQString::number(mnt->f_files);
-- vv[3] = TQString::tqfromLatin1("%1 (%2%%) ")
-+ vv[3] = TQString::fromLatin1("%1 (%2%%) ")
- .arg(mnt->f_ffree)
- .arg(mnt->f_files ? mnt->f_ffree*100/mnt->f_files : 0);
-
- vv[4] = TQString::null;
--#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::tqfromLatin1(#x " ");
-+#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::fromLatin1(#x " ");
- MNTF(ASYNC)
- MNTF(DEFEXPORTED)
- MNTF(EXKERB)
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/info_solaris.cpp v3.5.13-sru/kcontrol/info/info_solaris.cpp
---- /tmp/stable//kdebase/kcontrol/info/info_solaris.cpp 2011-03-12 07:57:38.000000000 +0100
-+++ v3.5.13-sru/kcontrol/info/info_solaris.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -184,10 +184,10 @@
- lBox->addColumn( i18n( "Mount Point" ));
- lBox->addColumn( i18n( "FS Type" ));
- lBox->addColumn( i18n( "Total Size" ));
-- // XXX: FIXME: how do I set column tqalignment correctly?
-+ // XXX: FIXME: how do I set column alignment correctly?
- lBox->setColumnAlignment( 3, 2 );
- lBox->addColumn( i18n( "Free Size" ));
-- // XXX: FIXME: how do I set column tqalignment correctly?
-+ // XXX: FIXME: how do I set column alignment correctly?
- lBox->setColumnAlignment( 4, 2 );
- lBox->addColumn( i18n( "Mount Time" ));
- lBox->addColumn( i18n( "Mount Options" ));
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/interrupts.desktop v3.5.13-sru/kcontrol/info/interrupts.desktop
---- /tmp/stable//kdebase/kcontrol/info/interrupts.desktop 2010-08-12 05:28:32.000000000 +0200
-+++ v3.5.13-sru/kcontrol/info/interrupts.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -3,7 +3,7 @@
- Icon=kcmmemory
- Type=Application
- DocPath=kinfocenter/interrupts/index.html
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-
-
- X-KDE-Library=info
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/ioports.desktop v3.5.13-sru/kcontrol/info/ioports.desktop
---- /tmp/stable//kdebase/kcontrol/info/ioports.desktop 2010-08-12 05:28:33.000000000 +0200
-+++ v3.5.13-sru/kcontrol/info/ioports.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -3,7 +3,7 @@
- Icon=kcmmemory
- Type=Application
- DocPath=kinfocenter/ioports/index.html
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-
-
- X-KDE-Library=info
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/memory.cpp v3.5.13-sru/kcontrol/info/memory.cpp
---- /tmp/stable//kdebase/kcontrol/info/memory.cpp 2011-03-12 07:57:38.000000000 +0100
-+++ v3.5.13-sru/kcontrol/info/memory.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -163,7 +163,7 @@
- break;
- };
- Widget = new TQLabel(title, this);
-- Widget->tqsetAlignment(AlignLeft);
-+ Widget->setAlignment(AlignLeft);
- vbox->addWidget(Widget, 1);
- }
-
-@@ -174,7 +174,7 @@
- if (i == SWAP_MEM)
- vbox->addSpacing(SPACING);
- Widget = new TQLabel(this);
-- Widget->tqsetAlignment(AlignRight);
-+ Widget->setAlignment(AlignRight);
- MemSizeLabel[i][j] = Widget;
- vbox->addWidget(Widget, 1);
- }
-@@ -228,7 +228,7 @@
- hint = "<qt>" + hint + "</qt>";
-
- Widget = new TQLabel("<b>" + title + "</b>", this);
-- Widget->tqsetAlignment(AlignCenter);
-+ Widget->setAlignment(AlignCenter);
- TQToolTip::add(Widget, hint);
- vbox->addWidget(Widget);
- vbox->addSpacing(SPACING / 2);
-@@ -243,7 +243,7 @@
- vbox->addSpacing(SPACING / 2);
-
- Widget = new TQLabel(this); /* xx MB used. */
-- Widget->tqsetAlignment(AlignCenter);
-+ Widget->setAlignment(AlignCenter);
- TQToolTip::add(Widget, hint);
- GraphLabel[i] = Widget;
- vbox->addWidget(Widget);
-@@ -288,7 +288,7 @@
- TQPixmap pm(width, height);
- TQPainter paint;
-
-- paint.tqbegin(&pm, this);
-+ paint.begin(&pm, this);
-
- TQPen pen(TQColor(0, 0, 0));
-
-@@ -342,7 +342,7 @@
- /* draw surrounding box */
- paint.setPen(pen);
- TQRect r = graph->rect();
-- qDrawShadePanel(&paint, r.x(), r.y(), r.width(), r.height(), tqpalette().active(), true, 1);
-+ qDrawShadePanel(&paint, r.x(), r.y(), r.width(), r.height(), palette().active(), true, 1);
- paint.end();
- bitBlt(graph, 0, 0, &pm);
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/memory.desktop v3.5.13-sru/kcontrol/info/memory.desktop
---- /tmp/stable//kdebase/kcontrol/info/memory.desktop 2010-08-12 05:28:33.000000000 +0200
-+++ v3.5.13-sru/kcontrol/info/memory.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -245,5 +245,5 @@
- Keywords[zh_CN]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information,内存,虚拟存储,物理存储,共享内存,交换,系统信息
- Keywords[zh_TW]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information,記憶體,虛擬記憶體,實體記憶體,共享記憶體,系統資訊
- Keywords[zu]=Inkumbulo,RAM,Inkumbulo yamanga,Inkumbulo siqu,Inkumbulo yokwabelana,Shintshanisa,Ulwazi Lwesistimu
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/opengl.cpp v3.5.13-sru/kcontrol/info/opengl.cpp
---- /tmp/stable//kdebase/kcontrol/info/opengl.cpp 2011-08-11 07:25:26.000000000 +0200
-+++ v3.5.13-sru/kcontrol/info/opengl.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -194,7 +194,7 @@
-
- if (!ext || !ext[0])
- return;
-- TQString qext = TQString::tqfromLatin1(ext);
-+ TQString qext = TQString::fromLatin1(ext);
- TQListViewItem *l2 = NULL;
-
- i = j = 0;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/opengl.desktop v3.5.13-sru/kcontrol/info/opengl.desktop
---- /tmp/stable//kdebase/kcontrol/info/opengl.desktop 2011-03-12 07:57:38.000000000 +0100
-+++ v3.5.13-sru/kcontrol/info/opengl.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -8,7 +8,7 @@
-
- X-KDE-Library=info
- X-KDE-FactoryName=opengl
--X-KDE-ParentApp=kinfocenter
-+X-KDE-ParentApp=kcontrol
-
- Name=OpenGL
- Name[bn]=ওপেন-জি-এল
-@@ -145,5 +145,5 @@
- Keywords[zh_CN]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,显卡,硬件加速,图形,X 服务器,显示
- Keywords[zh_TW]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,顯示卡,硬體加速,圖形,顯示
-
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/partitions.desktop v3.5.13-sru/kcontrol/info/partitions.desktop
---- /tmp/stable//kdebase/kcontrol/info/partitions.desktop 2010-08-12 05:28:33.000000000 +0200
-+++ v3.5.13-sru/kcontrol/info/partitions.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -243,5 +243,5 @@
- Keywords[zh_TW]=Partitions,Harddrive,HD,System Information,磁碟分割區,硬式磁碟機,硬碟,系統資訊
- Keywords[zu]=Izahluko,Harddrive,HD,Ulwazi Lwesistimu
-
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/pci.desktop v3.5.13-sru/kcontrol/info/pci.desktop
---- /tmp/stable//kdebase/kcontrol/info/pci.desktop 2010-08-12 05:28:33.000000000 +0200
-+++ v3.5.13-sru/kcontrol/info/pci.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -177,5 +177,5 @@
- Keywords[zh_CN]=PCI,PCI-Devices,PCI-Bus,System Information,PCI 设备,PCI 总线,系统信息
- Keywords[zh_TW]=PCI,PCI-Devices,PCI-Bus,System Information,PCI 設備,PCI 匯流排,系統資訊
- Keywords[zu]=PCI,Amathuluzi-PCI,Ibhasi-PCI,Ulwaz Lwesistimu
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/processor.desktop v3.5.13-sru/kcontrol/info/processor.desktop
---- /tmp/stable//kdebase/kcontrol/info/processor.desktop 2010-08-12 05:28:32.000000000 +0200
-+++ v3.5.13-sru/kcontrol/info/processor.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -246,5 +246,5 @@
- Keywords[zh_CN]=Processor,CPU,FPU,MHz,System Information,处理器,系统信息
- Keywords[zh_TW]=Processor,CPU,FPU,MHz,System Information,處理器,中央處理器,浮點運算器,系統資訊
- Keywords[zu]=Umqhubekisi,CPU,FPU,MHz,Ulwazi Lwesistimu
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/scsi.desktop v3.5.13-sru/kcontrol/info/scsi.desktop
---- /tmp/stable//kdebase/kcontrol/info/scsi.desktop 2010-08-12 05:28:32.000000000 +0200
-+++ v3.5.13-sru/kcontrol/info/scsi.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -174,5 +174,5 @@
- Keywords[zh_CN]=SCSI,SCSI-Bus,System Information,SCSI 总线,系统信息
- Keywords[zh_TW]=SCSI,SCSI-Bus,System Information,系統資訊
- Keywords[zu]=SCSI,Ibhasi-SCSI,Ulwazi Lwesistimu
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/sound.desktop v3.5.13-sru/kcontrol/info/sound.desktop
---- /tmp/stable//kdebase/kcontrol/info/sound.desktop 2010-08-12 05:28:33.000000000 +0200
-+++ v3.5.13-sru/kcontrol/info/sound.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -240,5 +240,5 @@
- Keywords[wa]=Son,Audiocåte son,MIDI,OSS,informåcion do sistinme
- Keywords[zh_CN]=Sound,Audio,Soundcard,MIDI,OSS,System Information,音频,音响,声卡,系统信息
- Keywords[zh_TW]=Sound,Audio,Soundcard,Midi,OSS,系統資訊
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/info/xserver.desktop v3.5.13-sru/kcontrol/info/xserver.desktop
---- /tmp/stable//kdebase/kcontrol/info/xserver.desktop 2010-08-12 05:28:32.000000000 +0200
-+++ v3.5.13-sru/kcontrol/info/xserver.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -224,4 +224,4 @@
- Keywords[zh_CN]=X,X-Server,XServer,XFree86,Display,VideoCard,System InformationX 服务器,显示器,显卡,系统信息
- Keywords[zh_TW]=X,X-Server,XServer,XFree86,Display,VideoCard,System Information,X 伺服器,X伺服器,顯示器,顯示卡,系統資訊
-
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/input/kmousedlg.ui v3.5.13-sru/kcontrol/input/kmousedlg.ui
---- /tmp/stable//kdebase/kcontrol/input/kmousedlg.ui 2011-03-12 07:57:40.000000000 +0100
-+++ v3.5.13-sru/kcontrol/input/kmousedlg.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -57,7 +57,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -74,7 +74,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -112,7 +112,7 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>150</width>
- <height>115</height>
-@@ -181,10 +181,10 @@
- </widget>
- <widget class="TQCheckBox" row="2" column="1" rowspan="1" colspan="2">
- <property name="name">
-- <cstring>cb_pointertqshape</cstring>
-+ <cstring>cb_pointershape</cstring>
- </property>
- <property name="text">
-- <string>Cha&amp;nge pointer tqshape over icons</string>
-+ <string>Cha&amp;nge pointer shape over icons</string>
- </property>
- <property name="checked">
- <bool>true</bool>
-@@ -208,7 +208,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>60</height>
-@@ -235,7 +235,7 @@
- <property name="name">
- <cstring>slAutoSelect</cstring>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>250</width>
- <height>0</height>
-@@ -258,7 +258,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>230</width>
- <height>20</height>
-@@ -283,7 +283,7 @@
- <property name="text">
- <string>Long</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignVCenter|AlignRight</set>
- </property>
- <property name="hAlign" stdset="0">
-@@ -301,7 +301,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>21</height>
-@@ -331,7 +331,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>16</height>
-@@ -344,7 +344,7 @@
- <connection>
- <sender>singleClick</sender>
- <signal>toggled(bool)</signal>
-- <receiver>cb_pointertqshape</receiver>
-+ <receiver>cb_pointershape</receiver>
- <slot>setEnabled(bool)</slot>
- </connection>
- <connection>
-@@ -364,7 +364,7 @@
- <tabstop>rightHanded</tabstop>
- <tabstop>leftHanded</tabstop>
- <tabstop>singleClick</tabstop>
-- <tabstop>cb_pointertqshape</tabstop>
-+ <tabstop>cb_pointershape</tabstop>
- <tabstop>cbAutoSelect</tabstop>
- <tabstop>slAutoSelect</tabstop>
- <tabstop>doubleClick</tabstop>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/input/logitechmouse_base.ui v3.5.13-sru/kcontrol/input/logitechmouse_base.ui
---- /tmp/stable//kdebase/kcontrol/input/logitechmouse_base.ui 2011-03-12 07:57:40.000000000 +0100
-+++ v3.5.13-sru/kcontrol/input/logitechmouse_base.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -31,7 +31,7 @@
- <property name="text">
- <string>You have a Logitech Mouse connected, and libusb was found at compile time, but it was not possible to access this mouse. This is probably caused by a permissions problem - you should consult the manual on how to fix this.</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>WordBreak|AlignVCenter</set>
- </property>
- </widget>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/input/mouse.cpp v3.5.13-sru/kcontrol/input/mouse.cpp
---- /tmp/stable//kdebase/kcontrol/input/mouse.cpp 2011-03-12 07:57:40.000000000 +0100
-+++ v3.5.13-sru/kcontrol/input/mouse.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -150,7 +150,7 @@
- connect(tab1->slAutoSelect, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
- connect(tab1->cbVisualActivate, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-
-- connect(tab1->cb_pointertqshape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-+ connect(tab1->cb_pointershape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-
- connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
- connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClick()));
-@@ -291,7 +291,7 @@
- TQBoxLayout *vbox = new TQVBoxLayout(mouse, KDialog::marginHint(),
- KDialog::spacingHint());
-
-- TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->tqlayout(), KDialog::spacingHint());
-+ TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->layout(), KDialog::spacingHint());
-
- mouseKeys = new TQCheckBox(i18n("&Move pointer with keyboard (using the num pad)"), mouse);
- vvbox->addWidget(mouseKeys);
-@@ -506,7 +506,7 @@
-
- tab1->singleClick->setChecked( settings->singleClick );
- tab1->doubleClick->setChecked(!settings->singleClick);
-- tab1->cb_pointertqshape->setChecked(settings->changeCursor);
-+ tab1->cb_pointershape->setChecked(settings->changeCursor);
- tab1->cbAutoSelect->setChecked( settings->autoSelectDelay >= 0 );
- if ( settings->autoSelectDelay < 0 )
- tab1->slAutoSelect->setValue( 0 );
-@@ -564,7 +564,7 @@
- settings->autoSelectDelay = tab1->cbAutoSelect->isChecked()? tab1->slAutoSelect->value():-1;
- settings->visualActivate = tab1->cbVisualActivate->isChecked();
- // settings->changeCursor = tab1->singleClick->isChecked();
-- settings->changeCursor = tab1->cb_pointertqshape->isChecked();
-+ settings->changeCursor = tab1->cb_pointershape->isChecked();
- settings->reverseScrollPolarity = tab1->cbScrollPolarity->isChecked();
-
- settings->apply();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/input/xcursor/previewwidget.cpp v3.5.13-sru/kcontrol/input/xcursor/previewwidget.cpp
---- /tmp/stable//kdebase/kcontrol/input/xcursor/previewwidget.cpp 2011-03-12 07:57:40.000000000 +0100
-+++ v3.5.13-sru/kcontrol/input/xcursor/previewwidget.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -286,7 +286,7 @@
-
- void PreviewWidget::setTheme( const TQString &theme )
- {
-- tqsetUpdatesEnabled( false );
-+ setUpdatesEnabled( false );
-
- int minHeight = previewSize + 20; // Minimum height of the preview widget
- int maxHeight = height(); // Tallest cursor height
-@@ -302,8 +302,8 @@
-
- current = -1;
- setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) );
-- tqsetUpdatesEnabled( true );
-- tqrepaint( false );
-+ setUpdatesEnabled( true );
-+ repaint( false );
- }
-
-
-@@ -311,7 +311,7 @@
- {
- TQPixmap buffer( size() );
- TQPainter p( &buffer );
-- p.fillRect( rect(), tqcolorGroup().brush( TQColorGroup::Background ) );
-+ p.fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
- Picture dest;
-
- if ( !qt_has_xft || !qt_use_xrender ) {
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/joystick/caldialog.cpp v3.5.13-sru/kcontrol/joystick/caldialog.cpp
---- /tmp/stable//kdebase/kcontrol/joystick/caldialog.cpp 2011-03-12 07:57:46.000000000 +0100
-+++ v3.5.13-sru/kcontrol/joystick/caldialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -65,7 +65,7 @@
-
- do
- {
-- tqApp->tqprocessEvents(2000);
-+ tqApp->processEvents(2000);
- }
- while ( ti.isActive() && (result() != TQDialog::Rejected) );
-
-@@ -165,7 +165,7 @@
- // loop until the user presses a button on the device or on the dialog
- do
- {
-- tqApp->tqprocessEvents(100);
-+ tqApp->processEvents(100);
-
- if ( joydev->getEvent(type, number, value) )
- {
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/joystick/joystick.cpp v3.5.13-sru/kcontrol/joystick/joystick.cpp
---- /tmp/stable//kdebase/kcontrol/joystick/joystick.cpp 2011-03-12 07:57:46.000000000 +0100
-+++ v3.5.13-sru/kcontrol/joystick/joystick.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -95,7 +95,7 @@
-
- joyWidget = new JoyWidget(this);
-
-- setMinimumSize(joyWidget->tqminimumSize());
-+ setMinimumSize(joyWidget->minimumSize());
-
- setButtons(KCModule::Default);
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/joystick/joywidget.cpp v3.5.13-sru/kcontrol/joystick/joywidget.cpp
---- /tmp/stable//kdebase/kcontrol/joystick/joywidget.cpp 2011-08-11 07:25:30.000000000 +0200
-+++ v3.5.13-sru/kcontrol/joystick/joywidget.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -56,7 +56,7 @@
- TQLabel *icon = new TQLabel(messageBox);
- icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup,
- KIcon::SizeMedium, KIcon::DefaultState, 0, true));
-- icon->setFixedSize(icon->tqsizeHint());
-+ icon->setFixedSize(icon->sizeHint());
- message = new TQLabel(messageBox);
- messageBox->hide();
- }
-@@ -170,7 +170,7 @@
-
- // we found one
-
-- device->insertItem(TQString("%1 (%2)").tqarg(joy->text()).tqarg(joy->device()));
-+ device->insertItem(TQString("%1 (%2)").arg(joy->text()).arg(joy->device()));
-
- // display values for first device
- if ( first )
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kcontrol/aboutwidget.cpp v3.5.13-sru/kcontrol/kcontrol/aboutwidget.cpp
---- /tmp/stable//kdebase/kcontrol/kcontrol/aboutwidget.cpp 2011-03-12 07:57:38.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kcontrol/aboutwidget.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -82,7 +82,7 @@
- // set qwhatsthis help
- TQWhatsThis::add(this, i18n(intro_text));
- _viewer = new KHTMLPart( this, "_viewer" );
-- _viewer->widget()->tqsetSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
-+ _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
- connect( _viewer->browserExtension(),
- TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
- this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kcontrol/dockcontainer.cpp v3.5.13-sru/kcontrol/kcontrol/dockcontainer.cpp
---- /tmp/stable//kdebase/kcontrol/kcontrol/dockcontainer.cpp 2011-03-12 07:57:38.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kcontrol/dockcontainer.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -131,7 +131,7 @@
- , _module(0L)
- {
- _busyw = new TQLabel(i18n("<big><b>Loading...</b></big>"), this);
-- _busyw->tqsetAlignment(AlignCenter);
-+ _busyw->setAlignment(AlignCenter);
- _busyw->setTextFormat(RichText);
- _busyw->setGeometry(0,0, width(), height());
- addWidget( _busyw );
-@@ -221,7 +221,7 @@
-
- ProxyWidget *widget = loadModule( module );
-
-- KCGlobal::repairAccels( tqtopLevelWidget() );
-+ KCGlobal::repairAccels( topLevelWidget() );
- return ( widget!=0 );
- }
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kcontrol/global.cpp v3.5.13-sru/kcontrol/kcontrol/global.cpp
---- /tmp/stable//kdebase/kcontrol/kcontrol/global.cpp 2011-03-12 07:57:38.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kcontrol/global.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -91,12 +91,12 @@
- if (_infocenter)
- {
- kdWarning() << "No K menu group with X-KDE-BaseGroup=info found ! Defaulting to Settings/Information/" << endl;
-- _baseGroup = TQString::tqfromLatin1("Settings/Information/");
-+ _baseGroup = TQString::fromLatin1("Settings/Information/");
- }
- else
- {
- kdWarning() << "No K menu group with X-KDE-BaseGroup=settings found ! Defaulting to Settings/" << endl;
-- _baseGroup = TQString::tqfromLatin1("Settings/");
-+ _baseGroup = TQString::fromLatin1("Settings/");
- }
- }
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kcontrol/helpwidget.cpp v3.5.13-sru/kcontrol/kcontrol/helpwidget.cpp
---- /tmp/stable//kdebase/kcontrol/kcontrol/helpwidget.cpp 2011-08-11 07:25:26.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kcontrol/helpwidget.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -42,7 +42,7 @@
- helptext = text;
- else
- helptext = (text + i18n("<p>Use the \"What's This?\" (Shift+F1) to get help on specific options.</p><p>To read the full manual click <a href=\"%1\">here</a>.</p>")
-- .tqarg(static_cast<const char *>(docPath.local8Bit())));
-+ .arg(static_cast<const char *>(docPath.local8Bit())));
- }
-
- void HelpWidget::setBaseText()
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kcontrol/kcrootonly.cpp v3.5.13-sru/kcontrol/kcontrol/kcrootonly.cpp
---- /tmp/stable//kdebase/kcontrol/kcontrol/kcrootonly.cpp 2011-03-12 07:57:38.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kcontrol/kcrootonly.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -30,9 +30,9 @@
- TQLabel *label = new TQLabel(i18n("<big>You need super user privileges to run this control module.</big><br>"
- "Click on the \"Administrator Mode\" button below."), this);
- layout->addWidget(label);
-- label->tqsetAlignment(AlignCenter);
-+ label->setAlignment(AlignCenter);
- label->setTextFormat(RichText);
-- label->setMinimumSize(label->tqsizeHint());
-+ label->setMinimumSize(label->sizeHint());
- }
-
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kcontrol/main.cpp v3.5.13-sru/kcontrol/kcontrol/main.cpp
---- /tmp/stable//kdebase/kcontrol/kcontrol/main.cpp 2011-03-12 07:57:38.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kcontrol/main.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -77,9 +77,9 @@
- int fontSize = toplevel->fontInfo().pointSize();
- if (fontSize == 0)
- fontSize = (toplevel->fontInfo().pixelSize() * 72) / pdm.logicalDpiX();
-- int x = config->readNumEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk.width()),
-+ int x = config->readNumEntry(TQString::fromLatin1("InitialWidth %1").arg(desk.width()),
- QMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) );
-- int y = config->readNumEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk.height()),
-+ int y = config->readNumEntry(TQString::fromLatin1("InitialHeight %1").arg(desk.height()),
- QMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) );
- toplevel->resize(x,y);
- }
-@@ -91,8 +91,8 @@
- KConfig *config = KGlobal::config();
- config->setGroup("General");
- TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop());
-- config->writeEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
-- config->writeEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
-+ config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
-+ config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
- config->sync();
- }
- delete toplevel;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kcontrol/modules.cpp v3.5.13-sru/kcontrol/kcontrol/modules.cpp
---- /tmp/stable//kdebase/kcontrol/kcontrol/modules.cpp 2011-08-11 07:25:26.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kcontrol/modules.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -147,7 +147,7 @@
- _embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised );
- TQPalette pal( red );
- pal.setColor( TQColorGroup::Background,
-- _module->parentWidget()->tqcolorGroup().background() );
-+ _module->parentWidget()->colorGroup().background() );
- _embedFrame->setPalette( pal );
- _embedFrame->setLineWidth( 2 );
- _embedFrame->setMidLineWidth( 2 );
-@@ -158,7 +158,7 @@
- _module->hide();
- _embedFrame->show();
- TQLabel *_busy = new TQLabel(i18n("<big>Loading...</big>"), _embedStack);
-- _busy->tqsetAlignment(AlignCenter);
-+ _busy->setAlignment(AlignCenter);
- _busy->setTextFormat(RichText);
- _busy->setGeometry(0,0, _module->width(), _module->height());
- _busy->show();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kcontrol/moduletreeview.cpp v3.5.13-sru/kcontrol/kcontrol/moduletreeview.cpp
---- /tmp/stable//kdebase/kcontrol/kcontrol/moduletreeview.cpp 2011-08-11 07:25:26.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kcontrol/moduletreeview.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -133,10 +133,10 @@
-
-
-
--TQSize ModuleTreeView::tqsizeHint() const
-+TQSize ModuleTreeView::sizeHint() const
- {
-- return TQListView::tqsizeHint().boundedTo(
-- TQSize( fontMetrics().maxWidth()*35, QWIDGETSIZE_MAX) );
-+ return TQListView::sizeHint().boundedTo(
-+ TQSize( fontMetrics().maxWidth()*35, TQWIDGETSIZE_MAX) );
- }
-
- void ModuleTreeView::makeSelected(ConfigModule *module)
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kcontrol/moduletreeview.h v3.5.13-sru/kcontrol/kcontrol/moduletreeview.h
---- /tmp/stable//kdebase/kcontrol/kcontrol/moduletreeview.h 2011-03-12 07:57:38.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kcontrol/moduletreeview.h 2012-07-31 17:17:50.000000000 +0200
-@@ -74,7 +74,7 @@
- void makeSelected(ConfigModule* module);
- void makeVisible(ConfigModule *module);
- void fill();
-- TQSize tqsizeHint() const;
-+ TQSize sizeHint() const;
-
- signals:
- void moduleSelected(ConfigModule*);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kcontrol/proxywidget.cpp v3.5.13-sru/kcontrol/kcontrol/proxywidget.cpp
---- /tmp/stable//kdebase/kcontrol/kcontrol/proxywidget.cpp 2011-03-12 07:57:38.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kcontrol/proxywidget.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -120,7 +120,7 @@
- ~ProxyContentWidget(){}
-
- // this should be really done by qscrollview in AutoOneFit mode!
-- TQSize tqsizeHint() const { return tqminimumSizeHint(); }
-+ TQSize sizeHint() const { return minimumSizeHint(); }
- };
-
-
-@@ -144,7 +144,7 @@
- }
- client->reparent(contentWidget,0,TQPoint(0,0),true);
- vbox->addWidget( client );
-- vbox->activate(); // make sure we have a proper tqminimumSizeHint
-+ vbox->activate(); // make sure we have a proper minimumSizeHint
- addChild(contentWidget);
- }
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kcontrol/toplevel.cpp v3.5.13-sru/kcontrol/kcontrol/toplevel.cpp
---- /tmp/stable//kdebase/kcontrol/kcontrol/toplevel.cpp 2011-08-11 07:25:26.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kcontrol/toplevel.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -142,7 +142,7 @@
- // help widget
- _help = new HelpWidget(_dock);
-
-- _stack->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
-+ _stack->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
-
- // Restore sizes
- config->setGroup("General");
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kded/kcmkded.cpp v3.5.13-sru/kcontrol/kded/kcmkded.cpp
---- /tmp/stable//kdebase/kcontrol/kded/kcmkded.cpp 2011-08-11 07:25:27.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kded/kcmkded.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -149,7 +149,7 @@
-
- TQStringList files;
- KGlobal::dirs()->findAllResources( "services",
-- TQString::tqfromLatin1( "kded/*.desktop" ),
-+ TQString::fromLatin1( "kded/*.desktop" ),
- true, true, files );
-
- TQListViewItem* item = 0L;
-@@ -187,7 +187,7 @@
-
- TQStringList files;
- KGlobal::dirs()->findAllResources( "services",
-- TQString::tqfromLatin1( "kded/*.desktop" ),
-+ TQString::fromLatin1( "kded/*.desktop" ),
- true, true, files );
-
- KConfig kdedrc("kdedrc", false, false);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kdm/kdm-appear.cpp v3.5.13-sru/kcontrol/kdm/kdm-appear.cpp
---- /tmp/stable//kdebase/kcontrol/kdm/kdm-appear.cpp 2011-09-16 07:40:51.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kdm/kdm-appear.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -21,7 +21,9 @@
-
- #include <unistd.h>
- #include <sys/types.h>
--
-+#include <stdlib.h>
-+#include <sys/types.h>
-+#include <signal.h>
-
- #include <tqbuttongroup.h>
- #include <tqlabel.h>
-@@ -47,11 +49,14 @@
- #include "kdm-appear.h"
- #include "kbackedcombobox.h"
-
-+#include "config.h"
-+
- extern KSimpleConfig *config;
-
-+#define TSAK_LOCKFILE "/tmp/ksocket-global/tsak.lock"
-
- KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
-- : TQWidget(parent, name)
-+ : TQWidget(parent, name), sakwarning(0)
- {
- TQString wtstr;
-
-@@ -228,7 +233,7 @@
- loadLanguageList(langcombo);
- connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
- label = new TQLabel(langcombo, i18n("Languag&e:"), group);
-- TQGridLayout *hbox = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() );
-+ TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
- hbox->setColStretch(1, 1);
- hbox->addWidget(label, 1, 0);
- hbox->addWidget(langcombo, 1, 1);
-@@ -244,9 +249,16 @@
-
- sakbox = new TQCheckBox( i18n("Enable Secure Attention Key"), group );
- connect( sakbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) );
-- TQGridLayout *hbox2 = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() );
-+ TQGridLayout *hbox2 = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
- hbox2->setColStretch(1, 1);
- hbox2->addWidget(sakbox, 1, 0);
-+ if (getuid() == 0 && config->checkConfigFilesWritable( true )) {
-+ if (system(KDE_BINDIR "/tsak checkdeps") != 0) {
-+ sakbox->setEnabled(false);
-+ sakwarning = new TQLabel( i18n("Secure Attention Key support is not available on your system. Please check for the presence of evdev and uinput."), group );
-+ hbox2->addWidget(sakwarning, 2, 0);
-+ }
-+ }
- wtstr = i18n("Here you can enable or disable the Secure Attention Key [SAK] anti-spoofing measure.");
- TQWhatsThis::add( sakbox, wtstr );
-
-@@ -277,7 +289,7 @@
- void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
- {
- TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
-- TQString::tqfromLatin1("*/entry.desktop"));
-+ TQString::fromLatin1("*/entry.desktop"));
- langlist.sort();
- for ( TQStringList::ConstIterator it = langlist.begin();
- it != langlist.end(); ++it )
-@@ -287,9 +299,9 @@
- TQString nid = fpath.mid(index + 1);
-
- KSimpleConfig entry(*it);
-- entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-- TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
-- combo->insertLanguage(nid, name, TQString::tqfromLatin1("l10n/"), TQString::null);
-+ entry.setGroup(TQString::fromLatin1("KCM Locale"));
-+ TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
-+ combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString::null);
- }
- }
-
-@@ -343,7 +355,7 @@
- bool KDMAppearanceWidget::setLogo(TQString logo)
- {
- TQString flogo = logo.isEmpty() ?
-- locate("data", TQString::tqfromLatin1("kdm/pics/kdelogo.png") ) :
-+ locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) :
- logo;
- TQImage p(flogo);
- if (p.isNull())
-@@ -351,7 +363,7 @@
- if (p.width() > 100 || p.height() > 100)
- p = p.smoothScale(100, 100, TQ_ScaleMin);
- logobutton->setPixmap(p);
-- uint bd = tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2;
-+ uint bd = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
- logobutton->setFixedSize(p.width() + bd, p.height() + bd);
- logopath = logo;
- return true;
-@@ -361,7 +373,7 @@
- void KDMAppearanceWidget::slotLogoButtonClicked()
- {
- KImageIO::registerFormats();
-- KFileDialog dialogue(locate("data", TQString::tqfromLatin1("kdm/pics/")),
-+ KFileDialog dialogue(locate("data", TQString::fromLatin1("kdm/pics/")),
- KImageIO::pattern( KImageIO::Reading ),
- this, 0, true);
- dialogue.setOperationMode( KFileDialog::Opening );
-@@ -464,7 +476,24 @@
-
- config->writeEntry("Language", langcombo->current());
-
-- config->writeEntry("UseSAK", sakbox->isChecked());
-+ if (!sakwarning) {
-+ config->writeEntry("UseSAK", sakbox->isChecked());
-+ }
-+
-+ // Enable/disable tsak as needed
-+ if (sakbox->isChecked()) {
-+ system(KDE_BINDIR "/tsak");
-+ }
-+ else {
-+ // Get PID
-+ TQFile file(TSAK_LOCKFILE);
-+ if (file.open(IO_ReadOnly)) {
-+ TQTextStream stream(&file);
-+ unsigned long tsakpid = stream.readLine().toULong();
-+ file.close();
-+ kill(tsakpid, SIGTERM);
-+ }
-+ }
- }
-
-
-@@ -473,7 +502,7 @@
- config->setGroup("X-*-Greeter");
-
- // Read the greeting string
-- greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to Kubuntu at %n")));
-+ greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to %n")));
-
- // Regular logo or clock
- TQString logoArea = config->readEntry("LogoArea", "Logo" );
-@@ -516,13 +545,18 @@
- langcombo->setCurrentItem(config->readEntry("Language", "C"));
-
- // See if the SAK is enabled
-- sakbox->setChecked(config->readBoolEntry("UseSAK", true));
-+ if (!sakwarning) {
-+ sakbox->setChecked(config->readBoolEntry("UseSAK", true));
-+ }
-+ else {
-+ sakbox->setChecked(false);
-+ }
- }
-
-
- void KDMAppearanceWidget::defaults()
- {
-- greetstr_lined->setText( i18n("Welcome to Kubuntu at %n") );
-+ greetstr_lined->setText( i18n("Welcome to %n") );
- logoRadio->setChecked( true );
- slotAreaRadioClicked( KdmLogo );
- setLogo( "" );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kdm/kdm-appear.h v3.5.13-sru/kcontrol/kdm/kdm-appear.h
---- /tmp/stable//kdebase/kcontrol/kdm/kdm-appear.h 2011-09-16 07:40:51.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kdm/kdm-appear.h 2012-07-31 17:17:50.000000000 +0200
-@@ -91,6 +91,7 @@
- KBackedComboBox *echocombo;
- KLanguageButton *langcombo;
- TQCheckBox *sakbox;
-+ TQLabel *sakwarning;
-
- };
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kdm/kdm-conv.cpp v3.5.13-sru/kcontrol/kdm/kdm-conv.cpp
---- /tmp/stable//kdebase/kcontrol/kdm/kdm-conv.cpp 2011-08-11 07:25:32.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kdm/kdm-conv.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -50,7 +50,7 @@
-
- alGroup = new TQVGroupBox( i18n("Enable Au&to-Login"), this );
- alGroup->setCheckable( true );
-- alGroup->tqsetSizePolicy( vpref );
-+ alGroup->setSizePolicy( vpref );
-
- TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature."
- " This applies only to KDM's graphical login."
-@@ -92,7 +92,7 @@
-
-
- puGroup = new TQVButtonGroup(i18n("Preselect User"), this );
-- puGroup->tqsetSizePolicy( vpref );
-+ puGroup->setSizePolicy( vpref );
-
- connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPresChanged()));
- connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged()));
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kdm/kdm-users.cpp v3.5.13-sru/kcontrol/kdm/kdm-users.cpp
---- /tmp/stable//kdebase/kcontrol/kdm/kdm-users.cpp 2011-08-11 07:25:32.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kdm/kdm-users.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -94,14 +94,14 @@
- TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup );
- leminuid = new KLineEdit( minGroup );
- minlab->setBuddy( leminuid );
-- leminuid->tqsetSizePolicy( sp_ign_fix );
-+ 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()) );
- TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup );
- lemaxuid = new KLineEdit( minGroup );
- maxlab->setBuddy( lemaxuid );
-- lemaxuid->tqsetSizePolicy( sp_ign_fix );
-+ 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()) );
-@@ -168,7 +168,7 @@
- userbutton = new TQPushButton( hlpw );
- userbutton->setAcceptDrops( true );
- userbutton->installEventFilter( this ); // for drag and drop
-- uint sz = tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48;
-+ uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48;
- userbutton->setFixedSize( sz, sz );
- connect( userbutton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotUserButtonClicked()) );
-@@ -457,11 +457,11 @@
- cbusrsrt->setChecked(config->readBoolEntry("SortUsers", true));
-
- TQString ps = config->readEntry( "FaceSource" );
-- if (ps == TQString::tqfromLatin1("UserOnly"))
-+ if (ps == TQString::fromLatin1("UserOnly"))
- rbusronly->setChecked(true);
-- else if (ps == TQString::tqfromLatin1("PreferUser"))
-+ else if (ps == TQString::fromLatin1("PreferUser"))
- rbprefusr->setChecked(true);
-- else if (ps == TQString::tqfromLatin1("PreferAdmin"))
-+ else if (ps == TQString::fromLatin1("PreferAdmin"))
- rbprefadm->setChecked(true);
- else
- rbadmonly->setChecked(true);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kdm/main.cpp v3.5.13-sru/kcontrol/kdm/main.cpp
---- /tmp/stable//kdebase/kcontrol/kdm/main.cpp 2011-09-19 03:46:39.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kdm/main.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -175,10 +175,10 @@
-
- struct stat st;
- if( stat( KDE_CONFDIR "/kdm/kdmdistrc" ,&st ) == 0) {
-- config = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" ));
-+ config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" ));
- }
- else {
-- config = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
-+ config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
- }
-
- TQVBoxLayout *top = new TQVBoxLayout(this);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/keys/commandShortcuts.cpp v3.5.13-sru/kcontrol/keys/commandShortcuts.cpp
---- /tmp/stable//kdebase/kcontrol/keys/commandShortcuts.cpp 2011-08-11 07:25:32.000000000 +0200
-+++ v3.5.13-sru/kcontrol/keys/commandShortcuts.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -83,13 +83,13 @@
- label->setText(i18n("<qt>Below is a list of known commands which you may assign keyboard shortcuts to. "
- "To edit, add or remove entries from this list use the "
- "<a href=\"launchMenuEditor\">KDE menu editor</a>.</qt>"));
-- label->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
-+ 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()));
- mainLayout->addWidget(label);
-
- m_tree = new AppTreeView(this, "appTreeView");
-- m_tree->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
-+ m_tree->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
- mainLayout->setStretchFactor(m_tree, 10);
- mainLayout->addWidget(m_tree);
- TQWhatsThis::add(m_tree,
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/keys/keyconfig.cpp v3.5.13-sru/kcontrol/keys/keyconfig.cpp
---- /tmp/stable//kdebase/kcontrol/keys/keyconfig.cpp 2011-08-21 09:08:14.000000000 +0200
-+++ v3.5.13-sru/kcontrol/keys/keyconfig.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -170,7 +170,7 @@
- topLayout->addRowSpacing(3, 15);
- topLayout->addMultiCellWidget(kc, 5, 5, 0, 1);
-
-- setMinimumSize(topLayout->tqsizeHint());
-+ setMinimumSize(topLayout->sizeHint());
- }
-
- KKeyModule::~KKeyModule (){
-@@ -238,7 +238,7 @@
-
- uint ind = sList->currentItem();
-
-- if ( !d.remove( *sFileList->tqat( ind ) ) ) {
-+ if ( !d.remove( *sFileList->at( ind ) ) ) {
- KMessageBox::sorry( 0,
- i18n("This key scheme could not be removed.\n"
- "Perhaps you do not have permission to alter the file "
-@@ -247,7 +247,7 @@
- }
-
- sList->removeItem( ind );
-- sFileList->remove( sFileList->tqat(ind) );
-+ sFileList->remove( sFileList->at(ind) );
- }*/
-
- void KKeyModule::slotKeyChange()
-@@ -258,7 +258,7 @@
-
- /*void KKeyModule::slotSave( )
- {
-- KSimpleConfig config(*sFileList->tqat( sList->currentItem() ) );
-+ KSimpleConfig config(*sFileList->at( sList->currentItem() ) );
- // global=true is necessary in order to
- // let both 'Global Shortcuts' and 'Shortcut Sequences' be
- // written to the same scheme file.
-@@ -281,7 +281,7 @@
- else {
- KConfigBase* config = 0;
- if( index == 0 ) config = new KConfig( "kdeglobals" );
-- //else config = new KSimpleConfig( *sFileList->tqat( index ), true );
-+ //else config = new KSimpleConfig( *sFileList->at( index ), true );
-
- actions.readActions( (index == 0) ? KeySet : KeyScheme, config );
- kc->listSync();
-@@ -416,8 +416,8 @@
- // Set various appropriate for the scheme
-
- if ( indx < nSysSchemes ||
-- (*sFileList->tqat(indx)).contains( "/global-" ) ||
-- (*sFileList->tqat(indx)).contains( "/app-" ) ) {
-+ (*sFileList->at(indx)).contains( "/global-" ) ||
-+ (*sFileList->at(indx)).contains( "/app-" ) ) {
- removeBt->setEnabled( FALSE );
- } else {
- removeBt->setEnabled( TRUE );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/keys/shortcuts.cpp v3.5.13-sru/kcontrol/keys/shortcuts.cpp
---- /tmp/stable//kdebase/kcontrol/keys/shortcuts.cpp 2011-08-21 09:08:14.000000000 +0200
-+++ v3.5.13-sru/kcontrol/keys/shortcuts.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -145,7 +145,7 @@
-
- m_pcbSchemes = new KComboBox( this );
- m_pcbSchemes->setMinimumWidth( 100 );
-- m_pcbSchemes->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
-+ m_pcbSchemes->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
- connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) );
- pHLayout->addWidget( m_pcbSchemes );
-
-@@ -190,10 +190,10 @@
- m_pListGeneral = new KAccelShortcutList( m_actionsGeneral, true );
-
- m_pkcGeneral = new KKeyChooser( m_pListGeneral, this, KKeyChooser::Global, false );
-- m_pkcGeneral->resize (m_pkcGeneral->tqsizeHint() );
-+ m_pkcGeneral->resize (m_pkcGeneral->sizeHint() );
- if (system("xmodmap 1> /dev/null 2> /dev/null") == 0) {
- m_useRmWinKeys = new TQCheckBox( i18n("Use Win key as modifier (uncheck to bind Win key to Menu)"), this );
-- m_useRmWinKeys->resize( m_useRmWinKeys->tqsizeHint() );
-+ 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()) );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp v3.5.13-sru/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
---- /tmp/stable//kdebase/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp 2011-08-11 07:25:28.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -4,7 +4,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 26/04/2003
--// Version : $Revision: 1246075 $ $Date: 2011-08-10 01:08:18 -0500 (Wed, 10 Aug 2011) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-@@ -114,7 +114,7 @@
- itsSplitter=new TQSplitter(this);
- fontsFrame=new TQFrame(itsSplitter),
- itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(itsSplitter), "kcmfontinst", "KParts::ReadOnlyPart");
-- itsSplitter->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
-+ itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
-
- TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES));
-
-@@ -130,7 +130,7 @@
- {
- #endif
- fontsFrame=new TQFrame(this);
-- fontsFrame->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
-+ fontsFrame->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
- #ifdef HAVE_XFT
- }
- #endif
-@@ -141,7 +141,7 @@
- bool showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false));
-
- fontsFrame->setLineWidth(0);
-- toolbar->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
-+ toolbar->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
- toolbar->setMovingEnabled(false);
-
- TQString previousPath=itsConfig.readEntry(CFG_PATH);
-@@ -152,12 +152,12 @@
- itsDirOp->setMinimumSize(TQSize(96, 64));
- setMimeTypes(showBitmap);
- itsDirOp->dirLister()->setMainWindow(this);
-- itsDirOp->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
-+ itsDirOp->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
- 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()));
-- button->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
-+ button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
- fontsLayout->addWidget(button, 1, 0);
- TQT_TQLAYOUT(fontsLayout)->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h v3.5.13-sru/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
---- /tmp/stable//kdebase/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h 2011-03-12 07:57:42.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h 2012-07-31 17:17:50.000000000 +0200
-@@ -7,7 +7,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 26/04/2003
--// Version : $Revision: 1212480 $ $Date: 2011-01-06 22:10:07 -0600 (Thu, 06 Jan 2011) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp v3.5.13-sru/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp
---- /tmp/stable//kdebase/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp 2010-08-13 00:36:05.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -4,7 +4,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 31/05/2003
--// Version : $Revision: 1157639 $ $Date: 2010-07-31 14:33:34 -0500 (Sat, 31 Jul 2010) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h v3.5.13-sru/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h
---- /tmp/stable//kdebase/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h 2010-08-13 00:36:05.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h 2012-07-31 17:17:50.000000000 +0200
-@@ -7,7 +7,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 01/08/2003
--// Version : $Revision: 1157639 $ $Date: 2010-07-31 14:33:34 -0500 (Sat, 31 Jul 2010) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp v3.5.13-sru/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
---- /tmp/stable//kdebase/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp 2010-08-13 00:36:05.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -4,7 +4,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 31/05/2003
--// Version : $Revision: 1157639 $ $Date: 2010-07-31 14:33:34 -0500 (Sat, 31 Jul 2010) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/kcmfontinst/KFileFontView.h v3.5.13-sru/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
---- /tmp/stable//kdebase/kcontrol/kfontinst/kcmfontinst/KFileFontView.h 2011-03-12 07:57:42.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kfontinst/kcmfontinst/KFileFontView.h 2012-07-31 17:17:50.000000000 +0200
-@@ -7,7 +7,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 31/05/2003
--// Version : $Revision: 1215552 $ $Date: 2011-01-18 19:42:14 -0600 (Tue, 18 Jan 2011) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-@@ -88,7 +88,7 @@
-
- TQRect rect() const
- {
-- TQRect r = listView()->tqitemRect(this);
-+ TQRect r = listView()->itemRect(this);
-
- return TQRect(listView()->viewportToContents(r.topLeft()), TQSize(r.width(), r.height()));
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp v3.5.13-sru/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
---- /tmp/stable//kdebase/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp 2011-08-11 07:25:28.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -4,7 +4,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 20/03/2003
--// Version : $Revision: 1246075 $ $Date: 2011-08-10 01:08:18 -0500 (Wed, 10 Aug 2011) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/kfile-plugin/KFileFont.h v3.5.13-sru/kcontrol/kfontinst/kfile-plugin/KFileFont.h
---- /tmp/stable//kdebase/kcontrol/kfontinst/kfile-plugin/KFileFont.h 2010-08-13 00:36:06.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/kfile-plugin/KFileFont.h 2012-07-31 17:17:50.000000000 +0200
-@@ -7,7 +7,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 20/03/2003
--// Version : $Revision: 1157639 $ $Date: 2010-07-31 14:33:34 -0500 (Sat, 31 Jul 2010) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/kfontinst/FontEngine.cpp v3.5.13-sru/kcontrol/kfontinst/kfontinst/FontEngine.cpp
---- /tmp/stable//kdebase/kcontrol/kfontinst/kfontinst/FontEngine.cpp 2011-08-11 07:25:28.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/kfontinst/FontEngine.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -163,7 +163,7 @@
- TQChar space(' ');
-
- for(int c=0; c<len; ++c)
-- if(str[c].tqunicode()<0x20 || str[c].tqunicode()>0x7E)
-+ if(str[c].unicode()<0x20 || str[c].unicode()>0x7E)
- str[c]=space;
-
- str=str.simplifyWhiteSpace();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/kfontinst/Main.cpp v3.5.13-sru/kcontrol/kfontinst/kfontinst/Main.cpp
---- /tmp/stable//kdebase/kcontrol/kfontinst/kfontinst/Main.cpp 2011-08-11 07:25:28.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/kfontinst/Main.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -4,7 +4,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 20/03/2003
--// Version : $Revision: 1246075 $ $Date: 2011-08-10 01:08:18 -0500 (Wed, 10 Aug 2011) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/kio/KioFonts.cpp v3.5.13-sru/kcontrol/kfontinst/kio/KioFonts.cpp
---- /tmp/stable//kdebase/kcontrol/kfontinst/kio/KioFonts.cpp 2011-08-11 07:25:28.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/kio/KioFonts.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -4,7 +4,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 05/03/2003
--// Version : $Revision: 1246075 $ $Date: 2011-08-10 01:08:18 -0500 (Wed, 10 Aug 2011) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-@@ -136,7 +136,7 @@
- TQString fname(url.fileName());
- int pos;
-
-- if(-1!=(pos=fname.findRev(TQString::tqfromLatin1(constMultipleExtension))))
-+ if(-1!=(pos=fname.findRev(TQString::fromLatin1(constMultipleExtension))))
- fname=fname.left(pos);
-
- return fname;
-@@ -292,7 +292,7 @@
- ? KFI_KIO_FONTS_PROTOCOL"/system-folder"
- : KFI_KIO_FONTS_PROTOCOL"/folder");
- addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
-- TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/"));
-+ TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
- return true;
- }
- else if (sys && !Misc::root()) // Default system fonts folder does not actually exist yet!
-@@ -393,15 +393,15 @@
- addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name());
- addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
-
-- TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/"));
-+ TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
-
- if(!Misc::root())
- {
- url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER);
-- url+=TQString::tqfromLatin1("/");
-+ url+=TQString::fromLatin1("/");
- }
- if(multiple)
-- url+=name+TQString::tqfromLatin1(constMultipleExtension);
-+ url+=name+TQString::fromLatin1(constMultipleExtension);
- else
- url+=Misc::getFile(path);
- addAtom(entry, KIO::UDS_URL, 0, url);
-@@ -1185,7 +1185,7 @@
-
- if (markPartial)
- {
-- TQString destPart(destOrig+TQString::tqfromLatin1(".part"));
-+ TQString destPart(destOrig+TQString::fromLatin1(".part"));
- TQCString destPartC(TQFile::encodeName(destPart));
-
- dest = destPart;
-@@ -2385,8 +2385,8 @@
-
- if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) ||
- ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) ||
-- ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
-- ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/')))
-+ ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
-+ ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/')))
- {
- error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".")
- .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/kio/KioFonts.h v3.5.13-sru/kcontrol/kfontinst/kio/KioFonts.h
---- /tmp/stable//kdebase/kcontrol/kfontinst/kio/KioFonts.h 2011-08-11 07:25:28.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/kio/KioFonts.h 2012-07-31 17:17:50.000000000 +0200
-@@ -7,7 +7,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 05/03/2003
--// Version : $Revision: 1246075 $ $Date: 2011-08-10 01:08:18 -0500 (Wed, 10 Aug 2011) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/lib/FcEngine.cpp v3.5.13-sru/kcontrol/kfontinst/lib/FcEngine.cpp
---- /tmp/stable//kdebase/kcontrol/kfontinst/lib/FcEngine.cpp 2011-08-11 07:25:28.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/lib/FcEngine.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -439,7 +439,7 @@
- ch;
-
- for(ch=0; ch<slen; ++ch)
-- if(!FcCharSetHasChar(font->charset, str[ch].tqunicode()))
-+ if(!FcCharSetHasChar(font->charset, str[ch].unicode()))
- return false;
- return true;
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp v3.5.13-sru/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
---- /tmp/stable//kdebase/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp 2010-08-13 00:36:06.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -4,7 +4,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 02/08/2003
--// Version : $Revision: 1157639 $ $Date: 2010-07-31 14:33:34 -0500 (Sat, 31 Jul 2010) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontPreview.cpp v3.5.13-sru/kcontrol/kfontinst/viewpart/FontPreview.cpp
---- /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontPreview.cpp 2011-03-12 07:57:43.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kfontinst/viewpart/FontPreview.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -4,7 +4,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 04/11/2001
--// Version : $Revision: 1215552 $ $Date: 2011-01-18 19:42:14 -0600 (Tue, 18 Jan 2011) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-@@ -88,7 +88,7 @@
- {
- if(!itsCurrentUrl.isEmpty())
- {
-- paint.setPen(kapp->tqpalette().active().text());
-+ paint.setPen(kapp->palette().active().text());
- paint.drawText(rect(), AlignCenter, i18n(" No preview available"));
- }
- }
-@@ -103,12 +103,12 @@
- }
- }
-
--TQSize CFontPreview::tqsizeHint() const
-+TQSize CFontPreview::sizeHint() const
- {
- return TQSize(132, 132);
- }
-
--TQSize CFontPreview::tqminimumSizeHint() const
-+TQSize CFontPreview::minimumSizeHint() const
- {
- return TQSize(32, 32);
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontPreview.h v3.5.13-sru/kcontrol/kfontinst/viewpart/FontPreview.h
---- /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontPreview.h 2011-03-12 07:57:43.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kfontinst/viewpart/FontPreview.h 2012-07-31 17:17:50.000000000 +0200
-@@ -7,7 +7,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 04/11/2001
--// Version : $Revision: 1215552 $ $Date: 2011-01-18 19:42:14 -0600 (Tue, 18 Jan 2011) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-@@ -50,8 +50,8 @@
- virtual ~CFontPreview() {}
-
- void paintEvent(TQPaintEvent *);
-- TQSize tqsizeHint() const;
-- TQSize tqminimumSizeHint() const;
-+ TQSize sizeHint() const;
-+ TQSize minimumSizeHint() const;
-
- void showFont(const KURL &url);
- void showFont();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontViewerApp.cpp v3.5.13-sru/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
---- /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontViewerApp.cpp 2011-03-12 07:57:43.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kfontinst/viewpart/FontViewerApp.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -4,7 +4,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer (kfontinst-kcontrol)
- // Creation Date : 30/04/2004
--// Version : $Revision: 1215552 $ $Date: 2011-01-18 19:42:14 -0600 (Tue, 18 Jan 2011) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontViewerApp.h v3.5.13-sru/kcontrol/kfontinst/viewpart/FontViewerApp.h
---- /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontViewerApp.h 2010-08-12 05:28:28.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/viewpart/FontViewerApp.h 2012-07-31 17:17:50.000000000 +0200
-@@ -7,7 +7,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer (kfontinst-kcontrol)
- // Creation Date : 30/04/2004
--// Version : $Revision: 465343 $ $Date: 2005-09-29 08:24:25 -0500 (Thu, 29 Sep 2005) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontViewPart.cpp v3.5.13-sru/kcontrol/kfontinst/viewpart/FontViewPart.cpp
---- /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontViewPart.cpp 2011-07-09 08:16:52.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/viewpart/FontViewPart.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -4,7 +4,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 03/08/2002
--// Version : $Revision: 1240522 $ $Date: 2011-07-08 21:23:29 -0500 (Fri, 08 Jul 2011) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-@@ -88,7 +88,7 @@
- setInstance(new KInstance("kfontview"));
-
- itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview");
-- itsPreview->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
-+ itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
- itsFaceLabel=new TQLabel(i18n("Face:"), itsToolsFrame);
- itsFaceSelector=new KIntNumInput(1, itsToolsFrame);
- itsInstallButton=new TQPushButton(i18n("Install..."), itsToolsFrame, "button");
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp v3.5.13-sru/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
---- /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp 2010-08-13 00:36:05.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -4,7 +4,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 03/08/2002
--// Version : $Revision: 1157639 $ $Date: 2010-07-31 14:33:34 -0500 (Sat, 31 Jul 2010) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontViewPartFactory.h v3.5.13-sru/kcontrol/kfontinst/viewpart/FontViewPartFactory.h
---- /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontViewPartFactory.h 2011-04-03 01:50:11.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kfontinst/viewpart/FontViewPartFactory.h 2012-07-31 17:17:50.000000000 +0200
-@@ -7,7 +7,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer
- // Creation Date : 03/08/2002
--// Version : $Revision: 1226910 $ $Date: 2011-04-02 18:45:34 -0500 (Sat, 02 Apr 2011) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontViewPart.h v3.5.13-sru/kcontrol/kfontinst/viewpart/FontViewPart.h
---- /tmp/stable//kdebase/kcontrol/kfontinst/viewpart/FontViewPart.h 2011-03-12 07:57:43.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kfontinst/viewpart/FontViewPart.h 2012-07-31 17:17:50.000000000 +0200
-@@ -7,7 +7,7 @@
- // Author : Craig Drummond
- // Project : K Font Installer (kfontinst-kcontrol)
- // Creation Date : 03/08/2002
--// Version : $Revision: 1212480 $ $Date: 2011-01-06 22:10:07 -0600 (Thu, 06 Jan 2011) $
-+// Version : $Revision$ $Date$
- //
- ////////////////////////////////////////////////////////////////////////////////
- //
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kicker/advancedDialog.cpp v3.5.13-sru/kcontrol/kicker/advancedDialog.cpp
---- /tmp/stable//kdebase/kcontrol/kicker/advancedDialog.cpp 2011-08-26 01:00:16.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kicker/advancedDialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -51,7 +51,7 @@
- layout->addWidget(m_advancedWidget);
- layout->addStretch();
-
-- setMinimumSize( tqsizeHint() );
-+ setMinimumSize( sizeHint() );
-
- connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)),
- this, TQT_SLOT(changed()));
-@@ -92,7 +92,7 @@
-
- int defaultHideButtonSize = c.readNumEntry("HideButtonSize", 14);
- m_advancedWidget->hideButtonSize->setValue(defaultHideButtonSize);
-- TQColor color = c.readColorEntry( "TintColor", &tqcolorGroup().mid() );
-+ TQColor color = c.readColorEntry( "TintColor", &colorGroup().mid() );
- m_advancedWidget->tintColorB->setColor( color );
- int tintValue = c.readNumEntry( "TintValue", 33 );
- m_advancedWidget->tintSlider->setValue( tintValue );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kicker/advancedOptions.ui v3.5.13-sru/kcontrol/kicker/advancedOptions.ui
---- /tmp/stable//kdebase/kcontrol/kicker/advancedOptions.ui 2011-08-26 01:00:16.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kicker/advancedOptions.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -71,7 +71,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>101</width>
- <height>20</height>
-@@ -145,7 +145,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>21</width>
- <height>20</height>
-@@ -194,7 +194,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>21</height>
-@@ -208,7 +208,7 @@
- <property name="text">
- <string>Min</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignVCenter|AlignLeft</set>
- </property>
- <property name="whatsThis" stdset="0">
-@@ -225,7 +225,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>81</width>
- <height>20</height>
-@@ -250,7 +250,7 @@
- <property name="text">
- <string>Max</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignVCenter|AlignRight</set>
- </property>
- <property name="whatsThis" stdset="0">
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kicker/applettab.ui v3.5.13-sru/kcontrol/kicker/applettab.ui
---- /tmp/stable//kdebase/kcontrol/kicker/applettab.ui 2011-03-12 07:57:41.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kicker/applettab.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -112,7 +112,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -123,7 +123,7 @@
- <property name="name">
- <cstring>pb_add</cstring>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
-@@ -143,7 +143,7 @@
- <property name="sizeType">
- <enum>Minimum</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -162,7 +162,7 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
-@@ -182,7 +182,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kicker/extensionInfo.cpp v3.5.13-sru/kcontrol/kicker/extensionInfo.cpp
---- /tmp/stable//kdebase/kcontrol/kicker/extensionInfo.cpp 2011-03-12 07:57:41.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kicker/extensionInfo.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -125,7 +125,7 @@
- c.setGroup("General");
-
- _position = c.readNumEntry ("Position", _position);
-- _tqalignment = c.readNumEntry ("Alignment", _tqalignment);
-+ _alignment = c.readNumEntry ("Alignment", _alignment);
- _xineramaScreen = c.readNumEntry ("XineramaScreen", _xineramaScreen);
- _showLeftHB = c.readBoolEntry("ShowLeftHideButton", _showLeftHB);
- _showRightHB = c.readBoolEntry("ShowRightHideButton", _showRightHB);
-@@ -147,7 +147,7 @@
- }
-
- _orig_position = _position;
-- _orig_tqalignment = _tqalignment;
-+ _orig_alignment = _alignment;
- _orig_size = _size;
- _orig_customSize = _customSize;
-
-@@ -170,10 +170,10 @@
- _orig_position = _position = position;
- }
-
-- int tqalignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0);
-- if (tqalignment != _tqalignment && tqalignment != _orig_tqalignment)
-+ int alignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0);
-+ if (alignment != _alignment && alignment != _orig_alignment)
- {
-- _orig_tqalignment = _tqalignment = tqalignment;
-+ _orig_alignment = _alignment = alignment;
- }
-
- if (_resizeable)
-@@ -197,7 +197,7 @@
- {
- // defaults
- _position = 3;
-- _tqalignment = TQApplication::reverseLayout() ? 2 : 0;
-+ _alignment = TQApplication::reverseLayout() ? 2 : 0;
- _xineramaScreen = TQApplication::desktop()->primaryScreen();
- _size = 2;
- _showLeftHB = false;
-@@ -225,7 +225,7 @@
- c.setGroup("General");
-
- c.writeEntry("Position", _position);
-- c.writeEntry("Alignment", _tqalignment);
-+ c.writeEntry("Alignment", _alignment);
- c.writeEntry("XineramaScreen", _xineramaScreen);
- c.writeEntry("ShowLeftHideButton", _showLeftHB);
- c.writeEntry("ShowRightHideButton", _showRightHB);
-@@ -251,7 +251,7 @@
- }
-
- _orig_position = _position;
-- _orig_tqalignment = _tqalignment;
-+ _orig_alignment = _alignment;
- _orig_size = _size;
- _orig_customSize = _customSize;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kicker/extensionInfo.h v3.5.13-sru/kcontrol/kicker/extensionInfo.h
---- /tmp/stable//kdebase/kcontrol/kicker/extensionInfo.h 2011-03-12 07:57:41.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kicker/extensionInfo.h 2012-07-31 17:17:50.000000000 +0200
-@@ -47,7 +47,7 @@
- // Configuration settings
- TQString _name;
- int _position;
-- int _tqalignment;
-+ int _alignment;
- int _xineramaScreen;
- int _size;
- int _customSize;
-@@ -67,7 +67,7 @@
- // Original settings to ensure that we can figure out
- // what has changed externally to the panel vs within the panel
- int _orig_position;
-- int _orig_tqalignment;
-+ int _orig_alignment;
- int _orig_size;
- int _orig_customSize;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kicker/hidingtab.ui v3.5.13-sru/kcontrol/kicker/hidingtab.ui
---- /tmp/stable//kdebase/kcontrol/kicker/hidingtab.ui 2011-03-12 07:57:41.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kicker/hidingtab.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -62,7 +62,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>342</width>
- <height>20</height>
-@@ -92,7 +92,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>30</width>
- <height>20</height>
-@@ -179,7 +179,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -299,7 +299,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -332,7 +332,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>50</width>
- <height>10</height>
-@@ -401,7 +401,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -439,7 +439,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -467,7 +467,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>30</width>
- <height>20</height>
-@@ -532,7 +532,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -557,7 +557,7 @@
- <property name="text">
- <string>Fast</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignVCenter|AlignRight</set>
- </property>
- <property name="hAlign" stdset="0">
-@@ -573,7 +573,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -598,7 +598,7 @@
- <property name="text">
- <string>Medium</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignCenter</set>
- </property>
- <property name="hAlign" stdset="0">
-@@ -637,7 +637,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>16</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kicker/lookandfeeltab.ui v3.5.13-sru/kcontrol/kicker/lookandfeeltab.ui
---- /tmp/stable//kdebase/kcontrol/kicker/lookandfeeltab.ui 2011-03-12 07:57:41.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kicker/lookandfeeltab.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -359,7 +359,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>66</width>
- <height>130</height>
-@@ -389,7 +389,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -428,13 +428,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>50</width>
- <height>50</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>50</width>
- <height>50</height>
-@@ -449,7 +449,7 @@
- <property name="scaledContents">
- <bool>true</bool>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignCenter</set>
- </property>
- <property name="hAlign" stdset="0">
-@@ -527,7 +527,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>289</width>
- <height>20</height>
-@@ -546,7 +546,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kicker/menutab_impl.cpp v3.5.13-sru/kcontrol/kicker/menutab_impl.cpp
---- /tmp/stable//kdebase/kcontrol/kicker/menutab_impl.cpp 2011-03-12 07:57:41.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kicker/menutab_impl.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -93,9 +93,9 @@
- btnCustomKMenuIcon->setPixmap(kmenu_icon);
-
- KConfig *config;
-- config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false);
-- config->setGroup(TQString::tqfromLatin1("RecentDocuments"));
-- maxrecentdocs->setValue(config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10));
-+ config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
-+ config->setGroup(TQString::fromLatin1("RecentDocuments"));
-+ maxrecentdocs->setValue(config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10));
-
- m_browserGroupLayout->setColStretch( 1, 1 );
- m_pRecentOrderGroupLayout->setColStretch( 1, 1 );
-@@ -247,8 +247,8 @@
-
- // Save recent documents
- KConfig *config;
-- config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false);
-- config->setGroup(TQString::tqfromLatin1("RecentDocuments"));
-+ config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
-+ config->setGroup(TQString::fromLatin1("RecentDocuments"));
- config->writeEntry("MaxEntries", maxrecentdocs->value());
- config->sync();
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kicker/menutab.ui v3.5.13-sru/kcontrol/kicker/menutab.ui
---- /tmp/stable//kdebase/kcontrol/kicker/menutab.ui 2011-03-12 07:57:41.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kicker/menutab.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -63,7 +63,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>40</width>
- <height>20</height>
-@@ -197,7 +197,7 @@
- <property name="sizeType">
- <enum>MinimumExpanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-@@ -261,13 +261,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>26</width>
- <height>26</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>26</width>
- <height>26</height>
-@@ -327,7 +327,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -345,7 +345,7 @@
- <property name="sizeType">
- <enum>MinimumExpanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-@@ -389,7 +389,7 @@
- <verstretch>1</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
-@@ -487,7 +487,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-@@ -558,7 +558,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-@@ -654,7 +654,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-@@ -698,7 +698,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kicker/positiontab_impl.cpp v3.5.13-sru/kcontrol/kicker/positiontab_impl.cpp
---- /tmp/stable//kdebase/kcontrol/kicker/positiontab_impl.cpp 2011-08-11 07:25:28.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kicker/positiontab_impl.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -60,7 +60,7 @@
- {
- TQPixmap monitor(locate("data", "kcontrol/pics/monitor.png"));
- m_monitorImage->setPixmap(monitor);
-- m_monitorImage->setFixedSize(m_monitorImage->tqsizeHint());
-+ m_monitorImage->setFixedSize(m_monitorImage->sizeHint());
-
- m_pretendDesktop = new TQWidget(m_monitorImage, "pretendBG");
- m_pretendDesktop->setGeometry(offsetX, offsetY, maxX, maxY);
-@@ -558,7 +558,7 @@
- m_customSpinbox->setValue(m_panelInfo->_customSize);
- m_sizeGroup->setEnabled(m_panelInfo->_resizeable);
- m_panelPos = m_panelInfo->_position;
-- m_panelAlign = m_panelInfo->_tqalignment;
-+ m_panelAlign = m_panelInfo->_alignment;
- if(m_panelInfo->_xineramaScreen >= 0 && m_panelInfo->_xineramaScreen < TQApplication::desktop()->numScreens())
- m_xineramaScreenComboBox->setCurrentItem(m_panelInfo->_xineramaScreen);
- else if(m_panelInfo->_xineramaScreen == -2) /* the All Screens option: qt uses -1 for default, so -2 for all */
-@@ -672,7 +672,7 @@
- }
-
- m_panelInfo->_position = m_panelPos;
-- m_panelInfo->_tqalignment = m_panelAlign;
-+ m_panelInfo->_alignment = m_panelAlign;
- if(m_xineramaScreenComboBox->currentItem() == m_xineramaScreenComboBox->count()-1)
- m_panelInfo->_xineramaScreen = -2; /* all screens */
- else
-@@ -696,14 +696,14 @@
- screenLabel->setFrameStyle(TQFrame::Panel);
- screenLabel->setFrameShadow(TQFrame::Plain);
-
-- screenLabel->tqsetAlignment(Qt::AlignCenter);
-+ screenLabel->setAlignment(Qt::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()));
-
- TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center());
-- TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint());
-+ TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
- targetGeometry.moveCenter(screenCenter);
-
- screenLabel->setGeometry(targetGeometry);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kicker/positiontab.ui v3.5.13-sru/kcontrol/kicker/positiontab.ui
---- /tmp/stable//kdebase/kcontrol/kicker/positiontab.ui 2011-03-12 07:57:41.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kicker/positiontab.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -66,7 +66,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>342</width>
- <height>20</height>
-@@ -104,7 +104,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-@@ -123,7 +123,7 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>151</width>
- <height>115</height>
-@@ -132,7 +132,7 @@
- <property name="scaledContents">
- <bool>true</bool>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignCenter</set>
- </property>
- <property name="whatsThis" stdset="0">
-@@ -149,7 +149,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-@@ -176,7 +176,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-@@ -235,7 +235,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>0</width>
- <height>101</height>
-@@ -357,7 +357,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>16</width>
- <height>16</height>
-@@ -426,7 +426,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>30</width>
- <height>40</height>
-@@ -538,7 +538,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-@@ -555,7 +555,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>21</width>
- <height>0</height>
-@@ -590,13 +590,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>32</width>
- <height>16</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32</width>
- <height>16</height>
-@@ -624,13 +624,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>32</width>
- <height>16</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32</width>
- <height>16</height>
-@@ -658,13 +658,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>32</width>
- <height>16</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32</width>
- <height>16</height>
-@@ -702,13 +702,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>16</width>
- <height>24</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>16</width>
- <height>24</height>
-@@ -736,13 +736,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>16</width>
- <height>24</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>16</width>
- <height>24</height>
-@@ -770,13 +770,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>16</width>
- <height>24</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>16</width>
- <height>24</height>
-@@ -814,13 +814,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>32</width>
- <height>16</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32</width>
- <height>16</height>
-@@ -848,13 +848,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>32</width>
- <height>16</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32</width>
- <height>16</height>
-@@ -882,13 +882,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>32</width>
- <height>16</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32</width>
- <height>16</height>
-@@ -926,13 +926,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>16</width>
- <height>24</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>16</width>
- <height>24</height>
-@@ -960,13 +960,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>16</width>
- <height>24</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>16</width>
- <height>24</height>
-@@ -994,13 +994,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>16</width>
- <height>24</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>16</width>
- <height>24</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/cache_ui.ui v3.5.13-sru/kcontrol/kio/cache_ui.ui
---- /tmp/stable//kdebase/kcontrol/kio/cache_ui.ui 2011-03-12 07:57:44.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kio/cache_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -29,7 +29,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>16</width>
- <height>21</height>
-@@ -88,7 +88,7 @@
- <property name="sizeType">
- <enum>MinimumExpanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>0</width>
- <height>21</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/fakeuaprovider.cpp v3.5.13-sru/kcontrol/kio/fakeuaprovider.cpp
---- /tmp/stable//kdebase/kcontrol/kio/fakeuaprovider.cpp 2011-08-11 07:25:29.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kio/fakeuaprovider.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -27,7 +27,7 @@
- #include "fakeuaprovider.h"
-
- #define UA_PTOS(x) (*it)->property(x).toString()
--#define QFL(x) TQString::tqfromLatin1(x)
-+#define QFL(x) TQString::fromLatin1(x)
-
- FakeUASProvider::FakeUASProvider()
- {
-@@ -97,13 +97,13 @@
- TQStringList languageList = KGlobal::locale()->languageList();
- if ( languageList.count() )
- {
-- TQStringList::Iterator it = languageList.find( TQString::tqfromLatin1("C") );
-+ TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
- if( it != languageList.end() )
- {
-- if( languageList.contains( TQString::tqfromLatin1("en") ) > 0 )
-+ if( languageList.contains( TQString::fromLatin1("en") ) > 0 )
- languageList.remove( it );
- else
-- (*it) = TQString::tqfromLatin1("en");
-+ (*it) = TQString::fromLatin1("en");
- }
- }
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/kcookiesmanagementdlg_ui.ui v3.5.13-sru/kcontrol/kio/kcookiesmanagementdlg_ui.ui
---- /tmp/stable//kdebase/kcontrol/kio/kcookiesmanagementdlg_ui.ui 2011-03-12 07:57:44.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kio/kcookiesmanagementdlg_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -119,7 +119,7 @@
- <property name="sizeType">
- <enum>MinimumExpanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>21</width>
- <height>62</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/kcookiespolicies.cpp v3.5.13-sru/kcontrol/kio/kcookiespolicies.cpp
---- /tmp/stable//kdebase/kcontrol/kio/kcookiespolicies.cpp 2011-08-11 07:25:29.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kio/kcookiespolicies.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -392,7 +392,7 @@
-
- while( at )
- {
-- domainConfig.append(TQString::tqfromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at]));
-+ domainConfig.append(TQString::fromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at]));
- at = at->nextSibling();
- }
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/kcookiespoliciesdlg_ui.ui v3.5.13-sru/kcontrol/kio/kcookiespoliciesdlg_ui.ui
---- /tmp/stable//kdebase/kcontrol/kio/kcookiespoliciesdlg_ui.ui 2011-03-12 07:57:44.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kio/kcookiespoliciesdlg_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -161,7 +161,7 @@
- <property name="sizeType">
- <enum>MinimumExpanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>16</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/kenvvarproxydlg.cpp v3.5.13-sru/kcontrol/kio/kenvvarproxydlg.cpp
---- /tmp/stable//kdebase/kcontrol/kio/kenvvarproxydlg.cpp 2011-03-12 07:57:44.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kio/kenvvarproxydlg.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -163,16 +163,16 @@
- setHighLight (mDlg->lbNoProxy, false);
-
- // Detect HTTP proxy settings...
-- found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]);
-+ found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]);
-
- // Detect HTTPS proxy settings...
-- found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]);
-+ found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]);
-
- // Detect FTP proxy settings...
-- found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]);
-+ found |= autoDetectProxySetting (TQString::fromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]);
-
- // Detect the NO_PROXY settings...
-- found |= autoDetectProxySetting (TQString::tqfromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]);
-+ found |= autoDetectProxySetting (TQString::fromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]);
-
- if ( !found )
- {
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/kmanualproxydlg.cpp v3.5.13-sru/kcontrol/kio/kmanualproxydlg.cpp
---- /tmp/stable//kdebase/kcontrol/kio/kmanualproxydlg.cpp 2011-08-11 07:25:29.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kio/kmanualproxydlg.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -52,7 +52,7 @@
- mDlg->pbCopyDown->setPixmap( BarIcon("down", KIcon::SizeSmall) );
- TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed,
- mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() );
-- mDlg->pbCopyDown->tqsetSizePolicy( sizePolicy );
-+ mDlg->pbCopyDown->setSizePolicy( sizePolicy );
-
- init();
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/kproxydlg_ui.ui v3.5.13-sru/kcontrol/kio/kproxydlg_ui.ui
---- /tmp/stable//kdebase/kcontrol/kio/kproxydlg_ui.ui 2011-03-12 07:57:44.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kio/kproxydlg_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -115,7 +115,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>16</width>
- <height>20</height>
-@@ -300,7 +300,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>16</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/manualproxy_ui.ui v3.5.13-sru/kcontrol/kio/manualproxy_ui.ui
---- /tmp/stable//kdebase/kcontrol/kio/manualproxy_ui.ui 2011-03-12 07:57:44.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kio/manualproxy_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -137,7 +137,7 @@
- <property name="name">
- <cstring>sbHttp</cstring>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32767</width>
- <height>32767</height>
-@@ -160,7 +160,7 @@
- <property name="sizeType">
- <enum>Minimum</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>51</width>
- <height>20</height>
-@@ -280,7 +280,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>114</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/policydlg.cpp v3.5.13-sru/kcontrol/kio/policydlg.cpp
---- /tmp/stable//kdebase/kcontrol/kio/policydlg.cpp 2011-03-12 07:57:44.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kio/policydlg.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -70,7 +70,7 @@
- connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotTextChanged(const TQString&)));
-
-- setFixedSize (tqsizeHint());
-+ setFixedSize (sizeHint());
- m_dlgUI->leDomain->setFocus ();
- }
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/policydlg.h v3.5.13-sru/kcontrol/kio/policydlg.h
---- /tmp/stable//kdebase/kcontrol/kio/policydlg.h 2011-08-11 07:25:29.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kio/policydlg.h 2012-07-31 17:17:50.000000000 +0200
-@@ -52,11 +52,11 @@
- if (advice.isEmpty())
- return KCookieAdvice::Dunno;
-
-- if (advice.find (TQString::tqfromLatin1("accept"), 0, false) == 0)
-+ if (advice.find (TQString::fromLatin1("accept"), 0, false) == 0)
- return KCookieAdvice::Accept;
-- else if (advice.find (TQString::tqfromLatin1("reject"), 0, false) == 0)
-+ else if (advice.find (TQString::fromLatin1("reject"), 0, false) == 0)
- return KCookieAdvice::Reject;
-- else if (advice.find (TQString::tqfromLatin1("ask"), 0, false) == 0)
-+ else if (advice.find (TQString::fromLatin1("ask"), 0, false) == 0)
- return KCookieAdvice::Ask;
-
- return KCookieAdvice::Dunno;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/smbrodlg.cpp v3.5.13-sru/kcontrol/kio/smbrodlg.cpp
---- /tmp/stable//kdebase/kcontrol/kio/smbrodlg.cpp 2011-08-11 07:25:29.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kio/smbrodlg.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -140,7 +140,7 @@
- for (uint i=0; i<password.length(); i++)
- {
- TQChar c = password[i];
-- unsigned int num = (c.tqunicode() ^ 173) + 17;
-+ unsigned int num = (c.unicode() ^ 173) + 17;
- unsigned int a1 = (num & 0xFC00) >> 10;
- unsigned int a2 = (num & 0x3E0) >> 5;
- unsigned int a3 = (num & 0x1F);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/socksbase.ui v3.5.13-sru/kcontrol/kio/socksbase.ui
---- /tmp/stable//kdebase/kcontrol/kio/socksbase.ui 2011-03-12 07:57:44.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kio/socksbase.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -127,7 +127,7 @@
- <property name="name">
- <cstring>_c_customPath</cstring>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>0</width>
- <height>20</height>
-@@ -211,7 +211,7 @@
- <property name="name">
- <cstring>_c_newPath</cstring>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>0</width>
- <height>25</height>
-@@ -236,7 +236,7 @@
- <property name="sizeType">
- <enum>MinimumExpanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -281,7 +281,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/uagentproviderdlg.cpp v3.5.13-sru/kcontrol/kio/uagentproviderdlg.cpp
---- /tmp/stable//kdebase/kcontrol/kio/uagentproviderdlg.cpp 2011-08-11 07:25:29.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kio/uagentproviderdlg.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -47,7 +47,7 @@
- TQString keycode = e->text();
- if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period ||
- (cursorPosition() > 0 && key == Qt::Key_Minus) ||
-- (!keycode.isEmpty() && keycode.tqunicode()->isLetterOrNumber()) )
-+ (!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) )
- {
- KLineEdit::keyPressEvent(e);
- return;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/uagentproviderdlg_ui.ui v3.5.13-sru/kcontrol/kio/uagentproviderdlg_ui.ui
---- /tmp/stable//kdebase/kcontrol/kio/uagentproviderdlg_ui.ui 2011-03-12 07:57:44.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kio/uagentproviderdlg_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -117,7 +117,7 @@
- <property name="sizeType">
- <enum>MinimumExpanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>21</width>
- <height>16</height>
-@@ -142,7 +142,7 @@
- <property name="sizeType">
- <enum>MinimumExpanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>29</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kio/useragentdlg_ui.ui v3.5.13-sru/kcontrol/kio/useragentdlg_ui.ui
---- /tmp/stable//kdebase/kcontrol/kio/useragentdlg_ui.ui 2011-03-12 07:57:44.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kio/useragentdlg_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -117,7 +117,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>16</width>
- <height>20</height>
-@@ -310,7 +310,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>21</width>
- <height>16</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/knotify/playersettings.ui v3.5.13-sru/kcontrol/knotify/playersettings.ui
---- /tmp/stable//kdebase/kcontrol/knotify/playersettings.ui 2011-03-12 07:57:37.000000000 +0100
-+++ v3.5.13-sru/kcontrol/knotify/playersettings.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -84,7 +84,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -109,7 +109,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -140,7 +140,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>233</width>
- <height>20</height>
-@@ -205,7 +205,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -265,7 +265,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>16</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konq/behaviour.cpp v3.5.13-sru/kcontrol/konq/behaviour.cpp
---- /tmp/stable//kdebase/kcontrol/konq/behaviour.cpp 2011-03-12 07:57:41.000000000 +0100
-+++ v3.5.13-sru/kcontrol/konq/behaviour.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -58,7 +58,7 @@
- winPixmap->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
- winPixmap->setPixmap(TQPixmap(locate("data",
- "kcontrol/pics/onlyone.png")));
-- winPixmap->setFixedSize( winPixmap->tqsizeHint() );
-+ winPixmap->setFixedSize( winPixmap->sizeHint() );
-
-
- // ----
-@@ -103,7 +103,7 @@
- TQHBox *hboxpreview = new TQHBox(vbox);
- TQWidget* spacer = new TQWidget( hboxpreview );
- spacer->setMinimumSize( 20, 0 );
-- spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
-+ 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()));
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konq/desktopbehavior_impl.cpp v3.5.13-sru/kcontrol/konq/desktopbehavior_impl.cpp
---- /tmp/stable//kdebase/kcontrol/konq/desktopbehavior_impl.cpp 2011-08-11 07:25:27.000000000 +0200
-+++ v3.5.13-sru/kcontrol/konq/desktopbehavior_impl.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -124,7 +124,7 @@
- */
- bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded);
-
-- m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media"));
-+ 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()));
-@@ -241,9 +241,9 @@
- it; it=static_cast<DesktopBehaviorMediaItem *>(it->nextSibling()))
- {
- if (it->mimeType().startsWith("media/builtin-") == false)
-- it->tqsetVisible(enabled);
-+ it->setVisible(enabled);
- else
-- it->tqsetVisible(TRUE);
-+ it->setVisible(TRUE);
- }
- }
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konq/desktopbehavior_impl.h v3.5.13-sru/kcontrol/konq/desktopbehavior_impl.h
---- /tmp/stable//kdebase/kcontrol/konq/desktopbehavior_impl.h 2010-09-24 19:35:33.000000000 +0200
-+++ v3.5.13-sru/kcontrol/konq/desktopbehavior_impl.h 2012-07-31 17:17:50.000000000 +0200
-@@ -22,6 +22,7 @@
- #define desktopbehavior_h
-
- #include "desktopbehavior.h"
-+#include "tqlistview.h"
- #include <kconfig.h>
- #include <kcmodule.h>
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konq/desktopbehavior.ui v3.5.13-sru/kcontrol/konq/desktopbehavior.ui
---- /tmp/stable//kdebase/kcontrol/konq/desktopbehavior.ui 2011-03-12 07:57:41.000000000 +0100
-+++ v3.5.13-sru/kcontrol/konq/desktopbehavior.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -74,7 +74,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-@@ -268,7 +268,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>191</width>
- <height>80</height>
-@@ -287,7 +287,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>16</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konqhtml/advancedTabOptions.ui v3.5.13-sru/kcontrol/konqhtml/advancedTabOptions.ui
---- /tmp/stable//kdebase/kcontrol/konqhtml/advancedTabOptions.ui 2011-03-12 07:57:45.000000000 +0100
-+++ v3.5.13-sru/kcontrol/konqhtml/advancedTabOptions.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -138,7 +138,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konqhtml/appearance.cpp v3.5.13-sru/kcontrol/konqhtml/appearance.cpp
---- /tmp/stable//kdebase/kcontrol/konqhtml/appearance.cpp 2011-03-12 07:57:45.000000000 +0100
-+++ v3.5.13-sru/kcontrol/konqhtml/appearance.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -231,7 +231,7 @@
-
- TQFontDatabase db;
-
-- m_families = db.tqfamilies();
-+ m_families = db.families();
-
- m_pFonts[0]->setFonts( m_families );
- m_pFonts[1]->setFonts( m_families );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konqhtml/domainlistview.cpp v3.5.13-sru/kcontrol/konqhtml/domainlistview.cpp
---- /tmp/stable//kdebase/kcontrol/konqhtml/domainlistview.cpp 2011-08-11 07:25:30.000000000 +0200
-+++ v3.5.13-sru/kcontrol/konqhtml/domainlistview.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -38,8 +38,8 @@
- setColumnLayout(0, Qt::Vertical);
- layout()->setSpacing(0);
- layout()->setMargin(0);
-- TQGridLayout* thisLayout = new TQGridLayout(tqlayout());
-- thisLayout->tqsetAlignment(Qt::AlignTop);
-+ TQGridLayout* thisLayout = new TQGridLayout(layout());
-+ thisLayout->setAlignment(Qt::AlignTop);
- thisLayout->setSpacing(KDialog::spacingHint());
- thisLayout->setMargin(KDialog::marginHint());
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konqhtml/htmlopts.cpp v3.5.13-sru/kcontrol/konqhtml/htmlopts.cpp
---- /tmp/stable//kdebase/kcontrol/konqhtml/htmlopts.cpp 2011-10-24 00:25:32.000000000 +0200
-+++ v3.5.13-sru/kcontrol/konqhtml/htmlopts.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -82,7 +82,7 @@
- // Tabbed Browsing
-
- TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this );
-- TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->tqlayout(), KDialog::spacingHint() );
-+ TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint() );
-
- m_pShowMMBInTabs = new TQCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing );
- TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, "
-@@ -109,7 +109,7 @@
- TQVGroupBox *bgMouse = new TQVGroupBox( i18n("Mouse Beha&vior"), this );
-
- m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse );
-- TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the tqshape of the cursor will change "
-+ 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()));
-
-@@ -299,7 +299,7 @@
- KConfig kdeglobals("kdeglobals", true, false);
- kdeglobals.setReadDefaults( useDefaults );
- kdeglobals.setGroup("KDE");
-- bool smoothScrolling = kdeglobals.readBoolEntry("SmoothScroll", DEFAULT_SMOOTHSCROLL);
-+ bool smoothScrolling = kdeglobals.readBoolEntry("SmoothScrolling", DEFAULT_SMOOTHSCROLL);
- if (smoothScrolling)
- m_pSmoothScrollingCombo->setCurrentItem( SmoothScrollingAlways );
- else
-@@ -374,13 +374,13 @@
- switch(m_pSmoothScrollingCombo->currentItem())
- {
- case SmoothScrollingAlways:
-- kdeglobals.writeEntry( "SmoothScroll", true );
-+ kdeglobals.writeEntry( "SmoothScrolling", true );
- break;
- case SmoothScrollingNever:
-- kdeglobals.writeEntry( "SmoothScroll", false );
-+ kdeglobals.writeEntry( "SmoothScrolling", false );
- break;
- // case SmoothScrollingWhenEfficient:
-- // kdeglobals.writeEntry( "SmoothScroll", somethingelse );
-+ // kdeglobals.writeEntry( "SmoothScrolling", somethingelse );
- // break;
- }
- kdeglobals.sync();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konqhtml/jspolicies.cpp v3.5.13-sru/kcontrol/konqhtml/jspolicies.cpp
---- /tmp/stable//kdebase/kcontrol/konqhtml/jspolicies.cpp 2011-08-11 07:25:30.000000000 +0200
-+++ v3.5.13-sru/kcontrol/konqhtml/jspolicies.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -135,8 +135,8 @@
- setColumnLayout(0, Qt::Vertical);
- layout()->setSpacing(0);
- layout()->setMargin(0);
-- TQGridLayout *this_layout = new TQGridLayout(tqlayout(),5,10+is_per_domain*2);
-- this_layout->tqsetAlignment(Qt::AlignTop);
-+ TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2);
-+ this_layout->setAlignment(Qt::AlignTop);
- this_layout->setSpacing(3);
- this_layout->setMargin(11);
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konqhtml/nsconfigwidget.ui v3.5.13-sru/kcontrol/konqhtml/nsconfigwidget.ui
---- /tmp/stable//kdebase/kcontrol/konqhtml/nsconfigwidget.ui 2011-03-12 07:57:45.000000000 +0100
-+++ v3.5.13-sru/kcontrol/konqhtml/nsconfigwidget.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -72,7 +72,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -96,7 +96,7 @@
- <property name="name">
- <cstring>GroupBox1</cstring>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>300</width>
- <height>0</height>
-@@ -184,7 +184,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konqhtml/pluginopts.cpp v3.5.13-sru/kcontrol/konqhtml/pluginopts.cpp
---- /tmp/stable//kdebase/kcontrol/konqhtml/pluginopts.cpp 2011-03-12 07:57:45.000000000 +0100
-+++ v3.5.13-sru/kcontrol/konqhtml/pluginopts.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -72,14 +72,14 @@
-
- TQFrame *hrule = new TQFrame(globalGB);
- hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
-- hrule->tqsetSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed);
-+ hrule->setSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed);
-
- /**************************************************************************
- ********************* Domain-specific Settings ***************************
- *************************************************************************/
- TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"),
- globalGB);
-- domainSpecPB->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
-+ domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
- connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg()));
-
- domainSpecificDlg = new KDialogBase(KDialogBase::Swallow,
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konsole/kcmkonsoledialog.ui v3.5.13-sru/kcontrol/konsole/kcmkonsoledialog.ui
---- /tmp/stable//kdebase/kcontrol/konsole/kcmkonsoledialog.ui 2011-03-12 07:57:48.000000000 +0100
-+++ v3.5.13-sru/kcontrol/konsole/kcmkonsoledialog.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -55,7 +55,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -184,7 +184,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -282,7 +282,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konsole/schemadialog.ui v3.5.13-sru/kcontrol/konsole/schemadialog.ui
---- /tmp/stable//kdebase/kcontrol/konsole/schemadialog.ui 2011-03-12 07:57:48.000000000 +0100
-+++ v3.5.13-sru/kcontrol/konsole/schemadialog.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -108,7 +108,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -158,7 +158,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -357,7 +357,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -389,7 +389,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -498,13 +498,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>180</width>
- <height>120</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>180</width>
- <height>120</height>
-@@ -540,7 +540,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konsole/schemaeditor.cpp v3.5.13-sru/kcontrol/konsole/schemaeditor.cpp
---- /tmp/stable//kdebase/kcontrol/konsole/schemaeditor.cpp 2011-08-11 07:25:31.000000000 +0200
-+++ v3.5.13-sru/kcontrol/konsole/schemaeditor.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -666,7 +666,7 @@
- continue;
- if (!(0 <= bo && bo <= 1))
- continue;
-- color[fi] = kapp->tqpalette().active().text();
-+ color[fi] = kapp->palette().active().text();
- transparent[fi] = tr;
- bold[fi] = bo;
- type[fi] = 1;
-@@ -681,7 +681,7 @@
- continue;
- if (!(0 <= bo && bo <= 1))
- continue;
-- color[fi] = kapp->tqpalette().active().base();
-+ color[fi] = kapp->palette().active().base();
- transparent[fi] = tr;
- bold[fi] = bo;
- type[fi] = 2;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konsole/sessiondialog.ui v3.5.13-sru/kcontrol/konsole/sessiondialog.ui
---- /tmp/stable//kdebase/kcontrol/konsole/sessiondialog.ui 2011-03-12 07:57:48.000000000 +0100
-+++ v3.5.13-sru/kcontrol/konsole/sessiondialog.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -184,13 +184,13 @@
- <property name="name">
- <cstring>previewIcon</cstring>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>100</width>
- <height>100</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>100</width>
- <height>100</height>
-@@ -212,7 +212,7 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>90</width>
- <height>100</height>
-@@ -221,7 +221,7 @@
- <property name="text">
- <string>&amp;Icon:</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignTop|AlignLeft</set>
- </property>
- <property name="buddy" stdset="0">
-@@ -280,7 +280,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konsole/sessioneditor.cpp v3.5.13-sru/kcontrol/konsole/sessioneditor.cpp
---- /tmp/stable//kdebase/kcontrol/konsole/sessioneditor.cpp 2011-03-12 07:57:48.000000000 +0100
-+++ v3.5.13-sru/kcontrol/konsole/sessioneditor.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -340,8 +340,8 @@
- else
- co->writeEntry("Font",fontCombo->currentItem()-1);
- co->writeEntry("Term",termLine->text());
-- co->writeEntry("KeyTab",*keytabFilename.tqat(keytabCombo->currentItem()));
-- co->writeEntry("Schema",*schemaFilename.tqat(schemaCombo->currentItem()));
-+ co->writeEntry("KeyTab",*keytabFilename.at(keytabCombo->currentItem()));
-+ co->writeEntry("Schema",*schemaFilename.at(schemaCombo->currentItem()));
- co->sync();
- delete co;
- sesMod=false;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/krdb/krdb.cpp v3.5.13-sru/kcontrol/krdb/krdb.cpp
---- /tmp/stable//kdebase/kcontrol/krdb/krdb.cpp 2011-08-11 07:25:25.000000000 +0200
-+++ v3.5.13-sru/kcontrol/krdb/krdb.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -80,7 +80,7 @@
- TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc));
- if (list.count() == 0)
- {
-- list.append(TQString::tqfromLatin1(sysGtkrc(version)));
-+ list.append(TQString::fromLatin1(sysGtkrc(version)));
- list.append(TQDir::homeDirPath()+userGtkrc(version));
- }
- list.remove(gtkkde);
-@@ -347,7 +347,7 @@
- "# Appearance & Themes -> Colors in the Control Center and disable the checkbox\n"
- "# \"Apply colors to non-KDE applications\"\n"
- "#\n"
-- "#\n").arg(TQDateTime::tqcurrentDateTime().toString());
-+ "#\n").arg(TQDateTime::currentDateTime().toString());
-
- t << "style \"default\"" << endl;
- t << "{" << endl;
-@@ -590,7 +590,7 @@
- // Qt-only apps without adversely affecting ourselves.
-
- // Cheat and use the current timestamp, since we just saved to qtrc.
-- TQDateTime settingsstamp = TQDateTime::tqcurrentDateTime();
-+ TQDateTime settingsstamp = TQDateTime::currentDateTime();
-
- static Atom qt_settings_timestamp = 0;
- if (!qt_settings_timestamp) {
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kthememanager/ktheme.cpp v3.5.13-sru/kcontrol/kthememanager/ktheme.cpp
---- /tmp/stable//kdebase/kcontrol/kthememanager/ktheme.cpp 2011-08-11 07:25:31.000000000 +0200
-+++ v3.5.13-sru/kcontrol/kthememanager/ktheme.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -720,7 +720,7 @@
- else
- {
- kdWarning() << TQString( "No such property found: %1->%2->%3" )
-- .tqarg( parent.tagName() ).tqarg( tag ).tqarg( attr ) << endl;
-+ .arg( parent.tagName() ).arg( tag ).arg( attr ) << endl;
- return TQString::null;
- }
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kthememanager/kthemedlg.ui v3.5.13-sru/kcontrol/kthememanager/kthemedlg.ui
---- /tmp/stable//kdebase/kcontrol/kthememanager/kthemedlg.ui 2011-03-12 07:57:48.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kthememanager/kthemedlg.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -60,7 +60,7 @@
- <property name="sizeType">
- <enum>MinimumExpanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>170</width>
- <height>20</height>
-@@ -109,7 +109,7 @@
- <property name="frameShape">
- <enum>Box</enum>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignCenter</set>
- </property>
- </widget>
-@@ -211,13 +211,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>80</width>
- <height>60</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32767</width>
- <height>60</height>
-@@ -251,13 +251,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>80</width>
- <height>60</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32767</width>
- <height>60</height>
-@@ -291,13 +291,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>80</width>
- <height>60</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32767</width>
- <height>60</height>
-@@ -331,13 +331,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>80</width>
- <height>60</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32767</width>
- <height>60</height>
-@@ -371,13 +371,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>80</width>
- <height>60</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32767</width>
- <height>60</height>
-@@ -411,13 +411,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>80</width>
- <height>60</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32767</width>
- <height>60</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/kthememanager/newthemewidget.ui v3.5.13-sru/kcontrol/kthememanager/newthemewidget.ui
---- /tmp/stable//kdebase/kcontrol/kthememanager/newthemewidget.ui 2011-03-12 07:57:48.000000000 +0100
-+++ v3.5.13-sru/kcontrol/kthememanager/newthemewidget.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -88,7 +88,7 @@
- <property name="text">
- <string>Co&amp;mment:</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignTop</set>
- </property>
- <property name="buddy" stdset="0">
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/launch/kcmlaunch.cpp v3.5.13-sru/kcontrol/launch/kcmlaunch.cpp
---- /tmp/stable//kdebase/kcontrol/launch/kcmlaunch.cpp 2011-03-12 07:57:48.000000000 +0100
-+++ v3.5.13-sru/kcontrol/launch/kcmlaunch.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -57,10 +57,10 @@
- "given in the section 'Startup indication timeout'"));
-
- GroupBox1->setColumnLayout(0, Qt::Vertical );
-- GroupBox1->tqlayout()->setSpacing( 0 );
-- GroupBox1->tqlayout()->setMargin( 0 );
-+ GroupBox1->layout()->setSpacing( 0 );
-+ GroupBox1->layout()->setMargin( 0 );
- Form1Layout->addWidget( GroupBox1 );
-- TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->tqlayout(), 3, 2 );
-+ TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->layout(), 3, 2 );
- GroupBox1Layout->setSpacing( 6 );
- GroupBox1Layout->setMargin( 11 );
- GroupBox1Layout->setColStretch( 1, 1 );
-@@ -97,10 +97,10 @@
- "given in the section 'Startup indication timeout'"));
-
- GroupBox2->setColumnLayout( 0, Qt::Vertical );
-- GroupBox2->tqlayout()->setSpacing( 0 );
-- GroupBox2->tqlayout()->setMargin( 0 );
-+ GroupBox2->layout()->setSpacing( 0 );
-+ GroupBox2->layout()->setMargin( 0 );
- Form1Layout->addWidget( GroupBox2 );
-- TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->tqlayout(), 2, 2 );
-+ TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->layout(), 2, 2 );
- GroupBox2Layout->setSpacing( 6 );
- GroupBox2Layout->setMargin( 11 );
- GroupBox2Layout->setColStretch( 1, 1 );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/locale/kcmlocale.cpp v3.5.13-sru/kcontrol/locale/kcmlocale.cpp
---- /tmp/stable//kdebase/kcontrol/locale/kcmlocale.cpp 2011-08-11 07:25:26.000000000 +0200
-+++ v3.5.13-sru/kcontrol/locale/kcmlocale.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -59,7 +59,7 @@
- this, TQT_SLOT(changedCountry(const TQString &)) );
-
- m_labLang = new TQLabel(this, I18N_NOOP("Languages:"));
-- m_labLang->tqsetAlignment( AlignTop );
-+ m_labLang->setAlignment( AlignTop );
-
- m_languages = new TQListBox(this);
- connect(m_languages, TQT_SIGNAL(selectionChanged()),
-@@ -174,12 +174,12 @@
- // If it's already in list, just move it (delete the old, then insert a new)
- int oldPos = languageList.findIndex( code );
- if ( oldPos != -1 )
-- languageList.remove( languageList.tqat(oldPos) );
-+ languageList.remove( languageList.at(oldPos) );
-
- if ( oldPos != -1 && oldPos < pos )
- --pos;
-
-- TQStringList::Iterator it = languageList.tqat( pos );
-+ TQStringList::Iterator it = languageList.at( pos );
-
- languageList.insert( it, code );
-
-@@ -195,7 +195,7 @@
- TQStringList languageList = m_locale->languageList();
- int pos = m_languages->currentItem();
-
-- TQStringList::Iterator it = languageList.tqat( pos );
-+ TQStringList::Iterator it = languageList.at( pos );
-
- if ( it != languageList.end() )
- {
-@@ -214,8 +214,8 @@
- TQStringList languageList = m_locale->languageList();
- int pos = m_languages->currentItem();
-
-- TQStringList::Iterator it1 = languageList.tqat( pos - 1 );
-- TQStringList::Iterator it2 = languageList.tqat( pos );
-+ TQStringList::Iterator it1 = languageList.at( pos - 1 );
-+ TQStringList::Iterator it2 = languageList.at( pos );
-
- if ( it1 != languageList.end() && it2 != languageList.end() )
- {
-@@ -236,8 +236,8 @@
- TQStringList languageList = m_locale->languageList();
- int pos = m_languages->currentItem();
-
-- TQStringList::Iterator it1 = languageList.tqat( pos );
-- TQStringList::Iterator it2 = languageList.tqat( pos + 1 );
-+ TQStringList::Iterator it1 = languageList.at( pos );
-+ TQStringList::Iterator it2 = languageList.at( pos + 1 );
-
- if ( it1 != languageList.end() && it2 != languageList.end() )
- {
-@@ -270,7 +270,7 @@
- it != first.end();
- ++it )
- {
-- TQString str = locate("locale", TQString::tqfromLatin1("%1/entry.desktop")
-+ TQString str = locate("locale", TQString::fromLatin1("%1/entry.desktop")
- .arg(*it));
- if (!str.isNull())
- prilang << str;
-@@ -278,7 +278,7 @@
-
- // add all languages to the list
- TQStringList alllang = KGlobal::dirs()->findAllResources("locale",
-- TQString::tqfromLatin1("*/entry.desktop"),
-+ TQString::fromLatin1("*/entry.desktop"),
- false, true);
- TQStringList langlist = prilang;
- if (langlist.count() > 0)
-@@ -293,7 +293,7 @@
- if ((*it).isNull())
- {
- m_addLanguage->insertSeparator();
-- submenu = TQString::tqfromLatin1("other");
-+ submenu = TQString::fromLatin1("other");
- m_addLanguage->insertSubmenu(m_locale->translate("Other"),
- submenu, TQString::null, -1);
- menu_index = -2; // first entries should _not_ be sorted
-@@ -322,13 +322,13 @@
- KLocale *lsave = KGlobal::_locale;
- KGlobal::_locale = m_locale;
-
-- TQString sub = TQString::tqfromLatin1("l10n/");
-+ TQString sub = TQString::fromLatin1("l10n/");
-
- // clear the list
- m_comboCountry->clear();
-
- TQStringList regionlist = KGlobal::dirs()->findAllResources("locale",
-- sub + TQString::tqfromLatin1("*.desktop"),
-+ sub + TQString::fromLatin1("*.desktop"),
- false, true );
-
- for ( TQStringList::ConstIterator it = regionlist.begin();
-@@ -352,7 +352,7 @@
- m_locale->translate("without name"));
-
- TQString map( locate( "locale",
-- TQString::tqfromLatin1( "l10n/%1.png" )
-+ TQString::fromLatin1( "l10n/%1.png" )
- .arg(tag) ) );
- TQIconSet icon;
- if ( !map.isNull() )
-@@ -362,7 +362,7 @@
-
- // add all languages to the list
- TQStringList countrylist = KGlobal::dirs()->findAllResources
-- ("locale", sub + TQString::tqfromLatin1("*/entry.desktop"), false, true);
-+ ("locale", sub + TQString::fromLatin1("*/entry.desktop"), false, true);
-
- for ( TQStringList::ConstIterator it = countrylist.begin();
- it != countrylist.end(); ++it )
-@@ -381,7 +381,7 @@
- int menu_index = submenu.isEmpty() ? -1 : -2;
-
- TQString flag( locate( "locale",
-- TQString::tqfromLatin1( "l10n/%1/flag.png" )
-+ TQString::fromLatin1( "l10n/%1/flag.png" )
- .arg(tag) ) );
- TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) );
- m_comboCountry->insertItem( icon, name, tag, submenu, menu_index );
-@@ -399,7 +399,7 @@
- KGlobal::_locale = m_locale;
-
- // read the name
-- TQString filepath = TQString::tqfromLatin1("%1%2/entry.desktop")
-+ TQString filepath = TQString::fromLatin1("%1%2/entry.desktop")
- .arg(sub)
- .arg(path);
-
-@@ -419,7 +419,7 @@
-
- config->writeEntry("Country", m_locale->country(), true, true);
- if ( m_locale->languageList().isEmpty() )
-- config->writeEntry("Language", TQString::tqfromLatin1(""), true, true);
-+ config->writeEntry("Language", TQString::fromLatin1(""), true, true);
- else
- config->writeEntry("Language",
- m_locale->languageList(), ':', true, true);
-@@ -502,7 +502,7 @@
- TQStringList KLocaleConfig::languageList() const
- {
- TQString fileName = locate("locale",
-- TQString::tqfromLatin1("l10n/%1/entry.desktop")
-+ TQString::fromLatin1("l10n/%1/entry.desktop")
- .arg(m_locale->country()));
-
- KSimpleConfig entry(fileName);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/locale/klocalesample.cpp v3.5.13-sru/kcontrol/locale/klocalesample.cpp
---- /tmp/stable//kdebase/kcontrol/locale/klocalesample.cpp 2011-03-12 07:57:39.000000000 +0100
-+++ v3.5.13-sru/kcontrol/locale/klocalesample.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -45,7 +45,7 @@
- lay->setAutoAdd(TRUE);
-
- // Whatever the color scheme is, we want black text
-- TQColorGroup a = tqpalette().active();
-+ TQColorGroup a = palette().active();
- a.setColor(TQColorGroup::Foreground, Qt::black);
- TQPalette pal(a, a, a);
-
-@@ -88,7 +88,7 @@
-
- void KLocaleSample::slotUpdateTime()
- {
-- TQDateTime dt = TQDateTime::tqcurrentDateTime();
-+ 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));
-@@ -98,11 +98,11 @@
- void KLocaleSample::slotLocaleChanged()
- {
- m_numberSample->setText(m_locale->formatNumber(1234567.89) +
-- TQString::tqfromLatin1(" / ") +
-+ TQString::fromLatin1(" / ") +
- m_locale->formatNumber(-1234567.89));
-
- m_moneySample->setText(m_locale->formatMoney(123456789.00) +
-- TQString::tqfromLatin1(" / ") +
-+ TQString::fromLatin1(" / ") +
- m_locale->formatMoney(-123456789.00));
-
- slotUpdateTime();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/locale/localemon.cpp v3.5.13-sru/kcontrol/locale/localemon.cpp
---- /tmp/stable//kdebase/kcontrol/locale/localemon.cpp 2011-08-11 07:25:26.000000000 +0200
-+++ v3.5.13-sru/kcontrol/locale/localemon.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -131,7 +131,7 @@
- KConfigGroupSaver saver(config, "Locale");
-
- KSimpleConfig ent(locate("locale",
-- TQString::tqfromLatin1("l10n/%1/entry.desktop")
-+ TQString::fromLatin1("l10n/%1/entry.desktop")
- .arg(m_locale->country())), true);
- ent.setGroup("KCM Locale");
-
-@@ -139,25 +139,25 @@
- int i;
- bool b;
-
-- str = ent.readEntry("CurrencySymbol", TQString::tqfromLatin1("$"));
-+ str = ent.readEntry("CurrencySymbol", TQString::fromLatin1("$"));
- config->deleteEntry("CurrencySymbol", false, true);
- if (str != m_locale->currencySymbol())
- config->writeEntry("CurrencySymbol",
- m_locale->currencySymbol(), true, true);
-
-- str = ent.readEntry("MonetaryDecimalSymbol", TQString::tqfromLatin1("."));
-+ str = ent.readEntry("MonetaryDecimalSymbol", TQString::fromLatin1("."));
- config->deleteEntry("MonetaryDecimalSymbol", false, true);
- if (str != m_locale->monetaryDecimalSymbol())
- config->writeEntry("MonetaryDecimalSymbol",
- m_locale->monetaryDecimalSymbol(), true, true);
-
-- str = ent.readEntry("MonetaryThousandsSeparator", TQString::tqfromLatin1(","));
-- str.replace(TQString::tqfromLatin1("$0"), TQString());
-+ str = ent.readEntry("MonetaryThousandsSeparator", TQString::fromLatin1(","));
-+ str.replace(TQString::fromLatin1("$0"), TQString());
- config->deleteEntry("MonetaryThousandsSeparator", false, true);
- if (str != m_locale->monetaryThousandsSeparator())
- config->writeEntry("MonetaryThousandsSeparator",
-- TQString::tqfromLatin1("$0%1$0")
-- .tqarg(m_locale->monetaryThousandsSeparator()),
-+ TQString::fromLatin1("$0%1$0")
-+ .arg(m_locale->monetaryThousandsSeparator()),
- true, true);
-
- i = ent.readNumEntry("FracDigits", 2);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/locale/localenum.cpp v3.5.13-sru/kcontrol/locale/localenum.cpp
---- /tmp/stable//kdebase/kcontrol/locale/localenum.cpp 2011-08-11 07:25:26.000000000 +0200
-+++ v3.5.13-sru/kcontrol/locale/localenum.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -89,34 +89,34 @@
- KConfigGroupSaver saver(config, "Locale");
-
- KSimpleConfig ent(locate("locale",
-- TQString::tqfromLatin1("l10n/%1/entry.desktop")
-+ TQString::fromLatin1("l10n/%1/entry.desktop")
- .arg(m_locale->country())), true);
- ent.setGroup("KCM Locale");
-
- TQString str;
-
- str = ent.readEntry("DecimalSymbol",
-- TQString::tqfromLatin1("."));
-+ TQString::fromLatin1("."));
- config->deleteEntry("DecimalSymbol", false, true);
- if (str != m_locale->decimalSymbol())
- config->writeEntry("DecimalSymbol",
- m_locale->decimalSymbol(), true, true);
-
- str = ent.readEntry("ThousandsSeparator",
-- TQString::tqfromLatin1(","));
-+ TQString::fromLatin1(","));
- config->deleteEntry("ThousandsSeparator", false, true);
-- str.replace(TQString::tqfromLatin1("$0"), TQString());
-+ str.replace(TQString::fromLatin1("$0"), TQString());
- if (str != m_locale->thousandsSeparator())
- config->writeEntry("ThousandsSeparator",
-- TQString::tqfromLatin1("$0%1$0")
-- .tqarg(m_locale->thousandsSeparator()), true, true);
-+ TQString::fromLatin1("$0%1$0")
-+ .arg(m_locale->thousandsSeparator()), true, true);
-
- str = ent.readEntry("PositiveSign");
- config->deleteEntry("PositiveSign", false, true);
- if (str != m_locale->positiveSign())
- config->writeEntry("PositiveSign", m_locale->positiveSign(), true, true);
-
-- str = ent.readEntry("NegativeSign", TQString::tqfromLatin1("-"));
-+ str = ent.readEntry("NegativeSign", TQString::fromLatin1("-"));
- config->deleteEntry("NegativeSign", false, true);
- if (str != m_locale->negativeSign())
- config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/locale/localeother.cpp v3.5.13-sru/kcontrol/locale/localeother.cpp
---- /tmp/stable//kdebase/kcontrol/locale/localeother.cpp 2011-03-12 07:57:39.000000000 +0100
-+++ v3.5.13-sru/kcontrol/locale/localeother.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -80,7 +80,7 @@
- KConfigGroupSaver saver(config, "Locale");
-
- KSimpleConfig ent(locate("locale",
-- TQString::tqfromLatin1("l10n/%1/entry.desktop")
-+ TQString::fromLatin1("l10n/%1/entry.desktop")
- .arg(m_locale->country())), true);
- ent.setGroup("KCM Locale");
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/locale/localetime.cpp v3.5.13-sru/kcontrol/locale/localetime.cpp
---- /tmp/stable//kdebase/kcontrol/locale/localetime.cpp 2011-03-12 07:57:39.000000000 +0100
-+++ v3.5.13-sru/kcontrol/locale/localetime.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -150,7 +150,7 @@
-
- if ( !bFound )
- {
-- TQChar c = userFormat.tqat( pos );
-+ TQChar c = userFormat.at( pos );
- if ( c == '%' )
- result += c;
-
-@@ -169,7 +169,7 @@
- bool escaped = false;
- for ( uint pos = 0; pos < storeFormat.length(); ++pos )
- {
-- TQChar c = storeFormat.tqat(pos);
-+ TQChar c = storeFormat.at(pos);
- if ( escaped )
- {
- StringPair it = StringPair::find( list, c );
-@@ -253,28 +253,28 @@
- KConfigGroupSaver saver(config, "Locale");
-
- KSimpleConfig ent(locate("locale",
-- TQString::tqfromLatin1("l10n/%1/entry.desktop")
-+ TQString::fromLatin1("l10n/%1/entry.desktop")
- .arg(m_locale->country())), true);
- ent.setGroup("KCM Locale");
-
- TQString str;
-
-- str = ent.readEntry("CalendarSystem", TQString::tqfromLatin1("gregorian"));
-+ str = ent.readEntry("CalendarSystem", TQString::fromLatin1("gregorian"));
- config->deleteEntry("CalendarSystem", false, true);
- if (str != m_locale->calendarType())
- config->writeEntry("CalendarSystem", m_locale->calendarType(), true, true);
-
-- str = ent.readEntry("TimeFormat", TQString::tqfromLatin1("%H:%M:%S"));
-+ str = ent.readEntry("TimeFormat", TQString::fromLatin1("%H:%M:%S"));
- config->deleteEntry("TimeFormat", false, true);
- if (str != m_locale->timeFormat())
- config->writeEntry("TimeFormat", m_locale->timeFormat(), true, true);
-
-- str = ent.readEntry("DateFormat", TQString::tqfromLatin1("%A %d %B %Y"));
-+ str = ent.readEntry("DateFormat", TQString::fromLatin1("%A %d %B %Y"));
- config->deleteEntry("DateFormat", false, true);
- if (str != m_locale->dateFormat())
- config->writeEntry("DateFormat", m_locale->dateFormat(), true, true);
-
-- str = ent.readEntry("DateFormatShort", TQString::tqfromLatin1("%Y-%m-%d"));
-+ str = ent.readEntry("DateFormatShort", TQString::fromLatin1("%Y-%m-%d"));
- config->deleteEntry("DateFormatShort", false, true);
- if (str != m_locale->dateFormatShort())
- config->writeEntry("DateFormatShort",
-@@ -323,7 +323,7 @@
-
- TQString calendarType;
- bool ok;
-- calendarType = calendars.tqat(calendarSystem, &ok);
-+ calendarType = calendars.at(calendarSystem, &ok);
- if ( !ok )
- calendarType = calendars.first();
-
-@@ -371,7 +371,7 @@
- kdDebug(173) << storeToUser(timeMap(),
- m_locale->timeFormat()) << endl;
- kdDebug(173) << userToStore(timeMap(),
-- TQString::tqfromLatin1("HH:MM:SS AMPM test")) << endl;
-+ TQString::fromLatin1("HH:MM:SS AMPM test")) << endl;
-
- }
-
-@@ -416,7 +416,7 @@
- {
- TQString str;
-
-- TQString sep = TQString::tqfromLatin1("\n");
-+ TQString sep = TQString::fromLatin1("\n");
-
- TQString old;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/locale/toplevel.cpp v3.5.13-sru/kcontrol/locale/toplevel.cpp
---- /tmp/stable//kdebase/kcontrol/locale/toplevel.cpp 2011-03-12 07:57:39.000000000 +0100
-+++ v3.5.13-sru/kcontrol/locale/toplevel.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -62,7 +62,7 @@
- m_nullConfig = new KConfig(TQString::null, false, false);
- m_globalConfig = new KConfig(TQString::null, false, true);
-
-- m_locale = new KLocale(TQString::tqfromLatin1("kcmlocale"), m_nullConfig);
-+ m_locale = new KLocale(TQString::fromLatin1("kcmlocale"), m_nullConfig);
- TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint());
- l->setAutoAdd(TRUE);
-
-@@ -162,7 +162,7 @@
- {
- m_globalConfig->setReadDefaults( useDefaults );
- m_globalConfig->reparseConfiguration();
-- *m_locale = KLocale(TQString::tqfromLatin1("kcmlocale"), m_globalConfig);
-+ *m_locale = KLocale(TQString::fromLatin1("kcmlocale"), m_globalConfig);
-
- emit localeChanged();
- emit languageChanged();
-@@ -180,7 +180,7 @@
- "language of all programs, you will have to "
- "logout first."),
- m_locale->translate("Applying Language Settings"),
-- TQString::tqfromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms"));
-+ TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms"));
- // restore the old global locale
- KGlobal::_locale = lsave;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/nics/nic.cpp v3.5.13-sru/kcontrol/nics/nic.cpp
---- /tmp/stable//kdebase/kcontrol/nics/nic.cpp 2011-03-12 07:57:38.000000000 +0100
-+++ v3.5.13-sru/kcontrol/nics/nic.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -298,21 +298,21 @@
-
- if (flags & IFF_BROADCAST) {
- if (tmp.length()) {
-- tmp += TQString::tqfromLatin1(", ");
-+ tmp += TQString::fromLatin1(", ");
- }
- tmp += i18n("Broadcast");
- }
-
- if (flags & IFF_MULTICAST) {
- if (tmp.length()) {
-- tmp += TQString::tqfromLatin1(", ");
-+ tmp += TQString::fromLatin1(", ");
- }
- tmp += i18n("Multicast");
- }
-
- if (flags & IFF_LOOPBACK) {
- if (tmp.length()) {
-- tmp += TQString::tqfromLatin1(", ");
-+ tmp += TQString::fromLatin1(", ");
- }
- tmp += i18n("Loopback");
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/nics/nic.desktop v3.5.13-sru/kcontrol/nics/nic.desktop
---- /tmp/stable//kdebase/kcontrol/nics/nic.desktop 2010-08-12 05:28:32.000000000 +0200
-+++ v3.5.13-sru/kcontrol/nics/nic.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -170,5 +170,5 @@
- Comment[zh_TW]=網路界面資訊
- Comment[zu]=Ulwazi lomxhumanisi woxhumano olusakazekile
-
--Categories=Qt;KDE;X-KDE-settings-network;
-+Categories=Qt;KDE;X-KDE-settings-information;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/performance/konqueror_ui.ui v3.5.13-sru/kcontrol/performance/konqueror_ui.ui
---- /tmp/stable//kdebase/kcontrol/performance/konqueror_ui.ui 2011-03-12 07:57:47.000000000 +0100
-+++ v3.5.13-sru/kcontrol/performance/konqueror_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -101,7 +101,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>40</width>
- <height>20</height>
-@@ -138,7 +138,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>160</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/performance/system_ui.ui v3.5.13-sru/kcontrol/performance/system_ui.ui
---- /tmp/stable//kdebase/kcontrol/performance/system_ui.ui 2011-03-12 07:57:47.000000000 +0100
-+++ v3.5.13-sru/kcontrol/performance/system_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -55,7 +55,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>40</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/privacy/kcmprivacydialog.ui v3.5.13-sru/kcontrol/privacy/kcmprivacydialog.ui
---- /tmp/stable//kdebase/kcontrol/privacy/kcmprivacydialog.ui 2011-03-12 07:57:42.000000000 +0100
-+++ v3.5.13-sru/kcontrol/privacy/kcmprivacydialog.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -79,13 +79,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>0</width>
- <height>50</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32767</width>
- <height>200</height>
-@@ -114,13 +114,13 @@
- <property name="name">
- <cstring>selectAllButton</cstring>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>80</width>
- <height>0</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32767</width>
- <height>32767</height>
-@@ -134,13 +134,13 @@
- <property name="name">
- <cstring>selectNoneButton</cstring>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>80</width>
- <height>0</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32767</width>
- <height>32767</height>
-@@ -160,7 +160,7 @@
- <property name="sizeType">
- <enum>Maximum</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>80</width>
- <height>20</height>
-@@ -179,7 +179,7 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>32767</width>
- <height>32767</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/randr/configdialog.cpp v3.5.13-sru/kcontrol/randr/configdialog.cpp
---- /tmp/stable//kdebase/kcontrol/randr/configdialog.cpp 2011-03-12 07:57:48.000000000 +0100
-+++ v3.5.13-sru/kcontrol/randr/configdialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -60,7 +60,7 @@
- {
- if ( !isVisible() ) {
- KWinModule module(0, KWinModule::INFO_DESKTOP);
-- TQSize s1 = tqsizeHint();
-+ TQSize s1 = sizeHint();
- TQSize s2 = module.workArea().size();
- int w = s1.width();
- int h = s1.height();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/randr/configdialog.h v3.5.13-sru/kcontrol/randr/configdialog.h
---- /tmp/stable//kdebase/kcontrol/randr/configdialog.h 2011-03-12 07:57:48.000000000 +0100
-+++ v3.5.13-sru/kcontrol/randr/configdialog.h 2012-07-31 17:17:50.000000000 +0200
-@@ -62,11 +62,11 @@
- ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name )
- : KListView( parent, name ), _configWidget( configWidget ),
- _regExpEditor(0L) {}
-- // TQListView has a weird idea of a tqsizeHint...
-- virtual TQSize tqsizeHint () const {
-- int w = tqminimumSizeHint().width();
-+ // TQListView has a weird idea of a sizeHint...
-+ virtual TQSize sizeHint () const {
-+ int w = minimumSizeHint().width();
- int h = header()->height();
-- h += viewport()->tqsizeHint().height();
-+ h += viewport()->sizeHint().height();
- h += horizontalScrollBar()->height();
-
- TQListViewItem *item = firstChild();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/randr/krandrapp.cpp v3.5.13-sru/kcontrol/randr/krandrapp.cpp
---- /tmp/stable//kdebase/kcontrol/randr/krandrapp.cpp 2010-08-12 05:28:34.000000000 +0200
-+++ v3.5.13-sru/kcontrol/randr/krandrapp.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -28,13 +28,20 @@
- KRandRApp::KRandRApp()
- : m_tray(new KRandRSystemTray(0L, "RANDRTray"))
- {
-+ connect(&m_eventMergingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(handleX11ConfigChangeEvent()));
- m_tray->show();
- }
-
-+void KRandRApp::handleX11ConfigChangeEvent()
-+{
-+ m_eventMergingTimer.stop();
-+ m_tray->configChanged();
-+}
-+
- bool KRandRApp::x11EventFilter(XEvent* e)
- {
- if (e->type == m_tray->screenChangeNotifyEvent()) {
-- m_tray->configChanged();
-+ m_eventMergingTimer.start(1000, TRUE);
- }
- return KApplication::x11EventFilter( e );
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/randr/krandrapp.h v3.5.13-sru/kcontrol/randr/krandrapp.h
---- /tmp/stable//kdebase/kcontrol/randr/krandrapp.h 2010-08-12 05:28:34.000000000 +0200
-+++ v3.5.13-sru/kcontrol/randr/krandrapp.h 2012-07-31 17:17:50.000000000 +0200
-@@ -19,6 +19,7 @@
- #ifndef KRANDRAPP_H
- #define KRANDRAPP_H
-
-+#include <tqtimer.h>
- #include <kuniqueapplication.h>
-
- class KRandRSystemTray;
-@@ -32,8 +33,12 @@
-
- virtual bool x11EventFilter(XEvent * e);
-
-+private slots:
-+ void handleX11ConfigChangeEvent();
-+
- private:
- KRandRSystemTray* m_tray;
-+ TQTimer m_eventMergingTimer;
- };
-
- #endif
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/randr/krandrmodule.cpp v3.5.13-sru/kcontrol/randr/krandrmodule.cpp
---- /tmp/stable//kdebase/kcontrol/randr/krandrmodule.cpp 2011-08-11 07:25:31.000000000 +0200
-+++ v3.5.13-sru/kcontrol/randr/krandrmodule.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -93,7 +93,7 @@
- m_screenSelector = new KComboBox(screenBox);
-
- for (int s = 0; s < numScreens(); s++) {
-- m_screenSelector->insertItem(i18n("Screen %1").tqarg(s+1));
-+ m_screenSelector->insertItem(i18n("Screen %1").arg(s+1));
- }
-
- m_screenSelector->setCurrentItem(currentScreenIndex());
-@@ -172,7 +172,7 @@
-
- // Add new resolutions
- for (int i = 0; i < currentScreen()->numSizes(); i++) {
-- m_sizeCombo->insertItem(i18n("%1 x %2").tqarg(currentScreen()->pixelSize(i).width()).tqarg(currentScreen()->pixelSize(i).height()));
-+ m_sizeCombo->insertItem(i18n("%1 x %2").arg(currentScreen()->pixelSize(i).width()).arg(currentScreen()->pixelSize(i).height()));
-
- // Aspect ratio
- /* , aspect ratio %5)*/
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/randr/krandrtray.cpp v3.5.13-sru/kcontrol/randr/krandrtray.cpp
---- /tmp/stable//kdebase/kcontrol/randr/krandrtray.cpp 2011-08-24 18:35:15.000000000 +0200
-+++ v3.5.13-sru/kcontrol/randr/krandrtray.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -54,7 +54,7 @@
- , m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection()))
- {
- setPixmap(KSystemTray::loadSizedIcon("randr", width()));
-- tqsetAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-+ setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
- connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
- TQToolTip::add(this, i18n("Screen resize & rotate"));
- my_parent = parent;
-@@ -205,7 +205,7 @@
- /*lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1));
- menu->setItemEnabled(lastIndex, false);*/
- } else {
-- KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").tqarg(s+1).latin1());
-+ KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").arg(s+1).latin1());
- m_screenPopups.append(subMenu);
- populateMenu(subMenu);
- lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/samba/kcmsambalog.cpp v3.5.13-sru/kcontrol/samba/kcmsambalog.cpp
---- /tmp/stable//kdebase/kcontrol/samba/kcmsambalog.cpp 2011-03-12 07:57:44.000000000 +0100
-+++ v3.5.13-sru/kcontrol/samba/kcmsambalog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -116,14 +116,14 @@
- connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList()));
- emit contentsChanged(&viewHistory,0,0);
-
-- label.setMinimumSize(label.tqsizeHint());
-- logFileName.setMinimumSize(250,logFileName.tqsizeHint().height());
-+ label.setMinimumSize(label.sizeHint());
-+ logFileName.setMinimumSize(250,logFileName.sizeHint().height());
- viewHistory.setMinimumSize(425,200);
-- showConnOpen.setMinimumSize(showConnOpen.tqsizeHint());
-- showConnClose.setMinimumSize(showConnClose.tqsizeHint());
-- showFileOpen.setMinimumSize(showFileOpen.tqsizeHint());
-- showFileClose.setMinimumSize(showFileClose.tqsizeHint());
-- updateButton.setFixedSize(updateButton.tqsizeHint());
-+ showConnOpen.setMinimumSize(showConnOpen.sizeHint());
-+ showConnClose.setMinimumSize(showConnClose.sizeHint());
-+ showFileOpen.setMinimumSize(showFileOpen.sizeHint());
-+ showFileClose.setMinimumSize(showFileClose.sizeHint());
-+ updateButton.setFixedSize(updateButton.sizeHint());
- }
-
- void LogView::loadSettings()
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/samba/kcmsambastatistics.cpp v3.5.13-sru/kcontrol/samba/kcmsambastatistics.cpp
---- /tmp/stable//kdebase/kcontrol/samba/kcmsambastatistics.cpp 2011-08-11 07:25:30.000000000 +0200
-+++ v3.5.13-sru/kcontrol/samba/kcmsambastatistics.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -80,18 +80,18 @@
- hostLe->setText("*");
-
- viewStatistics->setMinimumSize(375,200);
-- connectionsL->setMinimumSize(connectionsL->tqsizeHint());
-- filesL->setMinimumSize(filesL->tqsizeHint());
-- eventL->setMinimumSize(eventL->tqsizeHint());
-- eventCb->setMinimumSize(eventCb->tqsizeHint());
-- hostL->setMinimumSize(hostL->tqsizeHint());
-- hostLe->setMinimumSize(120,hostLe->tqsizeHint().height());
-- serviceL->setMinimumSize(serviceL->tqsizeHint());
-- serviceLe->setMinimumSize(120,serviceLe->tqsizeHint().height());
-- calcButton->setMinimumSize(calcButton->tqsizeHint());
-- clearButton->setMinimumSize(clearButton->tqsizeHint());
-- expandedInfoCb->setMinimumSize(expandedInfoCb->tqsizeHint());
-- expandedUserCb->setMinimumSize(expandedUserCb->tqsizeHint());
-+ connectionsL->setMinimumSize(connectionsL->sizeHint());
-+ filesL->setMinimumSize(filesL->sizeHint());
-+ eventL->setMinimumSize(eventL->sizeHint());
-+ eventCb->setMinimumSize(eventCb->sizeHint());
-+ hostL->setMinimumSize(hostL->sizeHint());
-+ hostLe->setMinimumSize(120,hostLe->sizeHint().height());
-+ serviceL->setMinimumSize(serviceL->sizeHint());
-+ serviceLe->setMinimumSize(120,serviceLe->sizeHint().height());
-+ calcButton->setMinimumSize(calcButton->sizeHint());
-+ clearButton->setMinimumSize(clearButton->sizeHint());
-+ expandedInfoCb->setMinimumSize(expandedInfoCb->sizeHint());
-+ expandedUserCb->setMinimumSize(expandedUserCb->sizeHint());
-
- TQVBoxLayout *topLayout=new TQVBoxLayout(this, KDialog::marginHint(),
- KDialog::spacingHint());
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/samba/smbstatus.desktop v3.5.13-sru/kcontrol/samba/smbstatus.desktop
---- /tmp/stable//kdebase/kcontrol/samba/smbstatus.desktop 2011-03-12 07:57:44.000000000 +0100
-+++ v3.5.13-sru/kcontrol/samba/smbstatus.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -7,7 +7,7 @@
-
- X-KDE-Library=samba
- X-KDE-FactoryName=samba
--X-KDE-ParentApp=kinfocenter
-+X-KDE-ParentApp=kcontrol
-
- Name=Samba Status
- Name[ar]=حالة Samba
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/screensaver/advanceddialogimpl.ui v3.5.13-sru/kcontrol/screensaver/advanceddialogimpl.ui
---- /tmp/stable//kdebase/kcontrol/screensaver/advanceddialogimpl.ui 2011-03-12 07:57:43.000000000 +0100
-+++ v3.5.13-sru/kcontrol/screensaver/advanceddialogimpl.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -69,7 +69,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>31</width>
- <height>20</height>
-@@ -153,7 +153,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>41</width>
- <height>20</height>
-@@ -256,7 +256,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -321,7 +321,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>21</width>
- <height>20</height>
-@@ -346,7 +346,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>31</width>
- <height>20</height>
-@@ -365,7 +365,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -382,7 +382,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/screensaver/scrnsave.cpp v3.5.13-sru/kcontrol/screensaver/scrnsave.cpp
---- /tmp/stable//kdebase/kcontrol/screensaver/scrnsave.cpp 2011-08-11 07:25:29.000000000 +0200
-+++ v3.5.13-sru/kcontrol/screensaver/scrnsave.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -133,12 +133,12 @@
- mSaverGroup->setColumnLayout( 0, Qt::Horizontal );
- vLayout->addWidget(mSaverGroup);
- vLayout->setStretchFactor( mSaverGroup, 10 );
-- TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->tqlayout(),
-+ TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(),
- KDialog::spacingHint() );
-
- mSaverListView = new TQListView( mSaverGroup );
- mSaverListView->setMinimumHeight( 120 );
-- mSaverListView->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
-+ mSaverListView->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
- mSaverListView->addColumn("");
- mSaverListView->header()->hide();
- mSelected = -1;
-@@ -162,7 +162,7 @@
- mSettingsGroup = new TQGroupBox( i18n("Settings"), this );
- mSettingsGroup->setColumnLayout( 0, Qt::Vertical );
- leftColumnLayout->addWidget( mSettingsGroup );
-- groupLayout = new TQVBoxLayout( mSettingsGroup->tqlayout(),
-+ groupLayout = new TQVBoxLayout( mSettingsGroup->layout(),
- KDialog::spacingHint() );
-
- mEnabledCheckBox = new TQCheckBox(i18n(
-@@ -221,14 +221,14 @@
- mWaitLockEdit->setSuffix(i18n(" sec"));
- mWaitLockEdit->setValue(mLockTimeout/1000);
- mWaitLockEdit->setEnabled(mEnabled && mLock);
-- if ( mWaitLockEdit->tqsizeHint().width() <
-- mWaitEdit->tqsizeHint().width() ) {
-- mWaitLockEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() );
-- mWaitEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() );
-+ if ( mWaitLockEdit->sizeHint().width() <
-+ mWaitEdit->sizeHint().width() ) {
-+ mWaitLockEdit->setFixedWidth( mWaitEdit->sizeHint().width() );
-+ mWaitEdit->setFixedWidth( mWaitEdit->sizeHint().width() );
- }
- else {
-- mWaitEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() );
-- mWaitLockEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() );
-+ mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
-+ mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
- }
- connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotLockTimeoutChanged(int)));
-@@ -246,7 +246,7 @@
- new TQVBoxLayout(topLayout, KDialog::spacingHint());
-
- mMonitorLabel = new TQLabel( this );
-- mMonitorLabel->tqsetAlignment( AlignCenter );
-+ mMonitorLabel->setAlignment( AlignCenter );
- mMonitorLabel->setPixmap( TQPixmap(locate("data",
- "kcontrol/pics/monitor.png")));
- rightColumnLayout->addWidget(mMonitorLabel, 0);
-@@ -256,7 +256,7 @@
- advancedLayout->addWidget( new TQWidget( this ) );
- TQPushButton* advancedBt = new TQPushButton(
- i18n( "Advanced &Options" ), this, "advancedBtn" );
-- advancedBt->tqsetSizePolicy( TQSizePolicy(
-+ advancedBt->setSizePolicy( TQSizePolicy(
- TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
- connect( advancedBt, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotAdvanced() ) );
-@@ -537,7 +537,7 @@
- mSaverListView->setSelected(selectedItem, true);
- mSaverListView->setCurrentItem(selectedItem);
- mSaverListView->ensureItemVisible(selectedItem);
-- mSetupBt->setEnabled(!mSaverList.tqat(mSelected)->setup().isEmpty());
-+ mSetupBt->setEnabled(!mSaverList.at(mSelected)->setup().isEmpty());
- mTestBt->setEnabled(true);
- }
-
-@@ -587,7 +587,7 @@
- if (mSelected >= 0) {
- mPreviewProc->clearArguments();
-
-- TQString saver = mSaverList.tqat(mSelected)->saver();
-+ TQString saver = mSaverList.at(mSelected)->saver();
- TQTextStream ts(&saver, IO_ReadOnly);
-
- TQString word;
-@@ -665,9 +665,9 @@
- bool bChanged = (indx != mSelected);
-
- if (!mSetupProc->isRunning())
-- mSetupBt->setEnabled(!mSaverList.tqat(indx)->setup().isEmpty());
-+ mSetupBt->setEnabled(!mSaverList.at(indx)->setup().isEmpty());
- mTestBt->setEnabled(true);
-- mSaver = mSaverList.tqat(indx)->file();
-+ mSaver = mSaverList.at(indx)->file();
-
- mSelected = indx;
- setMonitor();
-@@ -690,7 +690,7 @@
-
- mSetupProc->clearArguments();
-
-- TQString saver = mSaverList.tqat(mSelected)->setup();
-+ TQString saver = mSaverList.at(mSelected)->setup();
- if( saver.isEmpty())
- return;
- TQTextStream ts(&saver, IO_ReadOnly);
-@@ -708,7 +708,7 @@
- if (!kxsconfig) {
- word = "-caption";
- (*mSetupProc) << word;
-- word = mSaverList.tqat(mSelected)->name();
-+ word = mSaverList.at(mSelected)->name();
- (*mSetupProc) << word;
- word = "-icon";
- (*mSetupProc) << word;
-@@ -724,7 +724,7 @@
-
- // Pass translated name to kxsconfig
- if (kxsconfig) {
-- word = mSaverList.tqat(mSelected)->name();
-+ word = mSaverList.at(mSelected)->name();
- (*mSetupProc) << word;
- }
-
-@@ -739,7 +739,7 @@
- //
- void KScreenSaver::slotAdvanced()
- {
-- KScreenSaverAdvancedDialog dlg( tqtopLevelWidget() );
-+ KScreenSaverAdvancedDialog dlg( topLevelWidget() );
- if ( dlg.exec() ) {
- mChanged = true;
- emit changed(true);
-@@ -758,7 +758,7 @@
- }
-
- mTestProc->clearArguments();
-- TQString saver = mSaverList.tqat(mSelected)->saver();
-+ TQString saver = mSaverList.at(mSelected)->saver();
- TQTextStream ts(&saver, IO_ReadOnly);
-
- TQString word;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/smartcard/nosmartcardbase.ui v3.5.13-sru/kcontrol/smartcard/nosmartcardbase.ui
---- /tmp/stable//kdebase/kcontrol/smartcard/nosmartcardbase.ui 2011-03-12 07:57:36.000000000 +0100
-+++ v3.5.13-sru/kcontrol/smartcard/nosmartcardbase.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -23,7 +23,7 @@
- <property name="text">
- <string>&lt;b&gt;Unable to contact the KDE smartcard service.&lt;/b&gt;</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>WordBreak|AlignVCenter</set>
- </property>
- </widget>
-@@ -48,7 +48,7 @@
-
- 2) You don't appear to have smartcard support in the KDE libraries. You will need to recompile the kdelibs package with libpcsclite installed.</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>WordBreak|AlignVCenter</set>
- </property>
- </widget>
-@@ -64,7 +64,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/smartcard/smartcardbase.ui v3.5.13-sru/kcontrol/smartcard/smartcardbase.ui
---- /tmp/stable//kdebase/kcontrol/smartcard/smartcardbase.ui 2011-03-12 07:57:36.000000000 +0100
-+++ v3.5.13-sru/kcontrol/smartcard/smartcardbase.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -74,7 +74,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>15</width>
- <height>20</height>
-@@ -118,7 +118,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -250,7 +250,7 @@
- <property name="text">
- <string>To add new readers you have to modify /etc/readers.conf file and re-start pcscd</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>WordBreak|AlignVCenter</set>
- </property>
- </widget>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/smserver/kcmsmserver.cpp v3.5.13-sru/kcontrol/smserver/kcmsmserver.cpp
---- /tmp/stable//kdebase/kcontrol/smserver/kcmsmserver.cpp 2010-08-13 00:36:01.000000000 +0200
-+++ v3.5.13-sru/kcontrol/smserver/kcmsmserver.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -92,6 +92,9 @@
- }
- dialog->excludeLineedit->setText( c->readEntry("excludeApps"));
-
-+ c->setGroup("Logout");
-+ dialog->showLogoutStatusDialog->setChecked(c->readBoolEntry("showLogoutStatusDlg", true));
-+
- delete c;
-
- emit changed(useDefaults);
-@@ -103,6 +106,7 @@
- c->setGroup("General");
- c->writeEntry( "confirmLogout", dialog->confirmLogoutCheck->isChecked());
- c->writeEntry( "offerShutdown", dialog->offerShutdownCheck->isChecked());
-+
- TQString s = "restorePreviousLogout";
- if ( dialog->emptySessionRadio->isChecked() )
- s = "default";
-@@ -117,6 +121,8 @@
- int(KApplication::ShutdownTypeReboot) :
- int(KApplication::ShutdownTypeNone));
- c->writeEntry("excludeApps", dialog->excludeLineedit->text());
-+ c->setGroup("Logout");
-+ c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked());
- c->sync();
- delete c;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/smserver/smserverconfigdlg.ui v3.5.13-sru/kcontrol/smserver/smserverconfigdlg.ui
---- /tmp/stable//kdebase/kcontrol/smserver/smserverconfigdlg.ui 2011-03-12 07:57:40.000000000 +0100
-+++ v3.5.13-sru/kcontrol/smserver/smserverconfigdlg.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -62,6 +62,17 @@
- <string>O&amp;ffer shutdown options</string>
- </property>
- </widget>
-+ <widget class="TQCheckBox">
-+ <property name="name">
-+ <cstring>showLogoutStatusDialog</cstring>
-+ </property>
-+ <property name="text">
-+ <string>Show logout stat&amp;us dialog</string>
-+ </property>
-+ <property name="whatsThis" stdset="0">
-+ <string>Check this option if you want to see a dialog box showing the logout status.</string>
-+ </property>
-+ </widget>
- </vbox>
- </widget>
- <widget class="TQButtonGroup">
-@@ -190,7 +201,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>130</height>
-@@ -205,6 +216,12 @@
- <signal>toggled(bool)</signal>
- <receiver>SMServerConfigDlg</receiver>
- <slot>configChanged()</slot>
-+ </connection>
-+ <connection>
-+ <sender>showLogoutStatusDialog</sender>
-+ <signal>toggled(bool)</signal>
-+ <receiver>SMServerConfigDlg</receiver>
-+ <slot>configChanged()</slot>
- </connection>
- <connection>
- <sender>loginGroup</sender>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/style/kcmstyle.cpp v3.5.13-sru/kcontrol/style/kcmstyle.cpp
---- /tmp/stable//kdebase/kcontrol/style/kcmstyle.cpp 2011-08-11 07:25:31.000000000 +0200
-+++ v3.5.13-sru/kcontrol/style/kcmstyle.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -160,8 +160,8 @@
- gbWidgetStyle->layout()->setMargin( KDialog::marginHint() );
- gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() );
-
-- gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->tqlayout() );
-- gbWidgetStyleLayout->tqsetAlignment( Qt::AlignTop );
-+ gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() );
-+ gbWidgetStyleLayout->setAlignment( Qt::AlignTop );
- hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" );
-
- cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" );
-@@ -169,7 +169,7 @@
- hbLayout->addWidget( cbStyle );
-
- pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle );
-- pbConfigStyle->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
-+ pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
- pbConfigStyle->setEnabled( FALSE );
- hbLayout->addWidget( pbConfigStyle );
-
-@@ -195,7 +195,7 @@
- gbPreview->layout()->setSpacing( KDialog::spacingHint() );
- gbPreview->setFlat( true );
- stylePreview = new StylePreview( gbPreview );
-- gbPreview->tqlayout()->add( stylePreview );
-+ gbPreview->layout()->add( stylePreview );
-
- page1Layout->addWidget( gbWidgetStyle );
- page1Layout->addWidget( gbPreview );
-@@ -296,16 +296,16 @@
- box1->setSpacing( KDialog::spacingHint() );
- box1->setMargin( 0 );
- TQLabel* lbl = new TQLabel( i18n("0%"), box1 );
-- lbl->tqsetAlignment( AlignLeft );
-+ lbl->setAlignment( AlignLeft );
- lbl = new TQLabel( i18n("50%"), box1 );
-- lbl->tqsetAlignment( AlignHCenter );
-+ lbl->setAlignment( AlignHCenter );
- lbl = new TQLabel( i18n("100%"), box1 );
-- lbl->tqsetAlignment( AlignRight );
-+ lbl->setAlignment( AlignRight );
-
- lblMenuEffectType = new TQLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer );
-- lblMenuEffectType->tqsetAlignment( AlignBottom | AlignLeft );
-+ lblMenuEffectType->setAlignment( AlignBottom | AlignLeft );
- lblMenuOpacity = new TQLabel( slOpacity, i18n("Menu &opacity:"), menuContainer );
-- lblMenuOpacity->tqsetAlignment( AlignBottom | AlignLeft );
-+ lblMenuOpacity->setAlignment( AlignBottom | AlignLeft );
-
- menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 );
- menuContainerLayout->addWidget( comboMenuEffectType, 1, 0 );
-@@ -804,7 +804,7 @@
- break;
- else if ( id.contains( cfgStyle ) )
- break;
-- else if ( id.contains( TQApplication::tqstyle().className() ) )
-+ else if ( id.contains( TQApplication::style().className() ) )
- break;
- item = 0;
- }
-@@ -844,7 +844,7 @@
- setStyleRecursive( stylePreview, style );
-
- // this flickers, but reliably draws the widgets correctly.
-- stylePreview->resize( stylePreview->tqsizeHint() );
-+ stylePreview->resize( stylePreview->sizeHint() );
-
- delete appliedStyle;
- appliedStyle = style;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/style/menupreview.cpp v3.5.13-sru/kcontrol/style/menupreview.cpp
---- /tmp/stable//kdebase/kcontrol/style/menupreview.cpp 2011-03-12 07:57:46.000000000 +0100
-+++ v3.5.13-sru/kcontrol/style/menupreview.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -68,7 +68,7 @@
- if (pixBlended)
- pixBlended->resize( w, h );
-
-- TQColorGroup cg = tqcolorGroup();
-+ TQColorGroup cg = colorGroup();
- TQColor c1 = cg.background();
- TQColor c2 = cg.mid();
-
-@@ -96,7 +96,7 @@
-
- void MenuPreview::blendPixmaps()
- {
-- // Rebuild pixmaps, and tqrepaint
-+ // Rebuild pixmaps, and repaint
- if (pixBlended && pixBackground)
- {
- if (mode == Blend && pixOverlay) {
-@@ -105,7 +105,7 @@
- KImageEffect::blend(src, dst, menuOpacity);
- pixBlended->convertFromImage( dst );
- } else if (mode == Tint) {
-- TQColor clr = tqcolorGroup().button();
-+ TQColor clr = colorGroup().button();
- TQImage dst = pixBackground->convertToImage();
- KImageEffect::blend(clr, dst, menuOpacity);
- pixBlended->convertFromImage( dst );
-@@ -121,7 +121,7 @@
- if ((int)(menuOpacity*100) != opacity) {
- menuOpacity = opacity/100.0;
- blendPixmaps();
-- tqrepaint( false );
-+ repaint( false );
- }
- }
-
-@@ -130,14 +130,14 @@
- if (mode != pvm) {
- mode = pvm;
- blendPixmaps();
-- tqrepaint( false );
-+ repaint( false );
- }
- }
-
- void MenuPreview::paintEvent( TQPaintEvent* /* pe */ )
- {
- // Paint the frame and blended pixmap
-- TQColorGroup cg = tqcolorGroup();
-+ TQColorGroup cg = colorGroup();
- int x2 = width()-1;
- int y2 = height()-1;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/style/stylepreview.ui v3.5.13-sru/kcontrol/style/stylepreview.ui
---- /tmp/stable//kdebase/kcontrol/style/stylepreview.ui 2011-03-12 07:57:46.000000000 +0100
-+++ v3.5.13-sru/kcontrol/style/stylepreview.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -29,7 +29,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>50</height>
-@@ -177,7 +177,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>40</width>
- <height>20</height>
-@@ -196,13 +196,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>200</width>
- <height>32767</height>
-@@ -224,13 +224,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>200</width>
- <height>32767</height>
-@@ -250,7 +250,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>30</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/taskbar/kcmtaskbarui.ui v3.5.13-sru/kcontrol/taskbar/kcmtaskbarui.ui
---- /tmp/stable//kdebase/kcontrol/taskbar/kcmtaskbarui.ui 2011-03-12 07:57:37.000000000 +0100
-+++ v3.5.13-sru/kcontrol/taskbar/kcmtaskbarui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -209,7 +209,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>191</width>
- <height>20</height>
-@@ -234,7 +234,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>191</width>
- <height>20</height>
-@@ -300,7 +300,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>191</width>
- <height>20</height>
-@@ -319,7 +319,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -434,7 +434,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/usbview/kcmusb.cpp v3.5.13-sru/kcontrol/usbview/kcmusb.cpp
---- /tmp/stable//kdebase/kcontrol/usbview/kcmusb.cpp 2011-08-11 07:25:25.000000000 +0200
-+++ v3.5.13-sru/kcontrol/usbview/kcmusb.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -39,7 +39,7 @@
- gbox->setColumnLayout( 0, Qt::Horizontal );
- vbox->addWidget(gbox);
-
-- TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->tqlayout(), KDialog::spacingHint());
-+ TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint());
-
- TQSplitter *splitter = new TQSplitter(gbox);
- vvbox->addWidget(splitter);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/usbview/kcmusb.desktop v3.5.13-sru/kcontrol/usbview/kcmusb.desktop
---- /tmp/stable//kdebase/kcontrol/usbview/kcmusb.desktop 2011-03-12 07:57:37.000000000 +0100
-+++ v3.5.13-sru/kcontrol/usbview/kcmusb.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -237,4 +237,4 @@
- Keywords[zh_TW]=USB,devices,viewer,control,裝置,檢視器,控制
- Keywords[zu]=USB,amathukuzi ananjongo,umbukisi,lawula
-
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/usbview/usbdevices.cpp v3.5.13-sru/kcontrol/usbview/usbdevices.cpp
---- /tmp/stable//kdebase/kcontrol/usbview/usbdevices.cpp 2011-08-11 07:25:25.000000000 +0200
-+++ v3.5.13-sru/kcontrol/usbview/usbdevices.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -226,9 +226,9 @@
- r += i18n("<tr><td><i>Power Consumption</i></td><td>%1 mA</td></tr>").arg(_power);
- else
- r += i18n("<tr><td><i>Power Consumption</i></td><td>self powered</td></tr>");
-- r += i18n("<tr><td><i>Attached Devicenodes</i></td><td>%1</td></tr>").arg(*_devnodes.tqat(0));
-+ r += i18n("<tr><td><i>Attached Devicenodes</i></td><td>%1</td></tr>").arg(*_devnodes.at(0));
- if ( _devnodes.count() > 1 )
-- for ( TQStringList::Iterator it = _devnodes.tqat(1); it != _devnodes.end(); ++it )
-+ for ( TQStringList::Iterator it = _devnodes.at(1); it != _devnodes.end(); ++it )
- r += "<tr><td></td><td>" + *it + "</td></tr>";
- #else
- r += i18n("<tr><td><i>Max. Packet Size</i></td><td>%1</td></tr>").arg(_maxPacketSize);
-@@ -332,10 +332,10 @@
-
- _bus = di.udi_bus;
- _device = di.udi_addr;
-- _product = TQString::tqfromLatin1(di.udi_product);
-+ _product = TQString::fromLatin1(di.udi_product);
- if ( _device == 1 )
- _product += " " + TQString::number( _bus );
-- _manufacturer = TQString::tqfromLatin1(di.udi_vendor);
-+ _manufacturer = TQString::fromLatin1(di.udi_vendor);
- _prodID = di.udi_productNo;
- _vendorID = di.udi_vendorNo;
- _class = di.udi_class;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/usbview/usb.ids v3.5.13-sru/kcontrol/usbview/usb.ids
---- /tmp/stable//kdebase/kcontrol/usbview/usb.ids 2011-03-12 07:57:37.000000000 +0100
-+++ v3.5.13-sru/kcontrol/usbview/usb.ids 2012-07-31 17:17:50.000000000 +0200
-@@ -7,7 +7,7 @@
- # The latest version can be obtained from
- # http://www.linux-usb.org/usb.ids
- #
--# $Id: usb.ids 1212480 2011-01-07 04:10:07Z tpearson $
-+# $Id$
- #
-
- # Vendors, devices and interfaces. Please keep sorted.
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/view1394/kcmview1394.desktop v3.5.13-sru/kcontrol/view1394/kcmview1394.desktop
---- /tmp/stable//kdebase/kcontrol/view1394/kcmview1394.desktop 2011-03-12 07:57:45.000000000 +0100
-+++ v3.5.13-sru/kcontrol/view1394/kcmview1394.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -216,5 +216,5 @@
- Keywords[zh_CN]=1394,Firewire,devices,viewer,control,设备,查看器,控制,火线
- Keywords[zh_TW]=1394,Firewire,devices,viewer,control,裝置,檢視器,控制
-
--Categories=Qt;KDE;X-KDE-settings-hardware;
-+Categories=Qt;KDE;X-KDE-settings-information;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/view1394/view1394widget.ui v3.5.13-sru/kcontrol/view1394/view1394widget.ui
---- /tmp/stable//kdebase/kcontrol/view1394/view1394widget.ui 2011-03-12 07:57:45.000000000 +0100
-+++ v3.5.13-sru/kcontrol/view1394/view1394widget.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -163,7 +163,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>40</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/xinerama/kcmxinerama.cpp v3.5.13-sru/kcontrol/xinerama/kcmxinerama.cpp
---- /tmp/stable//kdebase/kcontrol/xinerama/kcmxinerama.cpp 2011-03-12 07:57:47.000000000 +0100
-+++ v3.5.13-sru/kcontrol/xinerama/kcmxinerama.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -223,10 +223,10 @@
- si->setFont(fnt);
- si->setFrameStyle(TQFrame::Panel);
- si->setFrameShadow(TQFrame::Plain);
-- si->tqsetAlignment(Qt::AlignCenter);
-+ si->setAlignment(Qt::AlignCenter);
-
- TQPoint screenCenter(TQApplication::desktop()->screenGeometry(dpy).center());
-- TQRect targetGeometry(TQPoint(0,0), si->tqsizeHint());
-+ TQRect targetGeometry(TQPoint(0,0), si->sizeHint());
- targetGeometry.moveCenter(screenCenter);
- si->setGeometry(targetGeometry);
- si->show();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/xinerama/xineramawidget.ui v3.5.13-sru/kcontrol/xinerama/xineramawidget.ui
---- /tmp/stable//kdebase/kcontrol/xinerama/xineramawidget.ui 2011-03-12 07:57:47.000000000 +0100
-+++ v3.5.13-sru/kcontrol/xinerama/xineramawidget.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -156,7 +156,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>431</width>
- <height>21</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdcop/kdcopview.ui v3.5.13-sru/kdcop/kdcopview.ui
---- /tmp/stable//kdebase/kdcop/kdcopview.ui 2011-03-12 07:58:02.000000000 +0100
-+++ v3.5.13-sru/kdcop/kdcopview.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -98,7 +98,7 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdcop/kdcopwindow.cpp v3.5.13-sru/kdcop/kdcopwindow.cpp
---- /tmp/stable//kdebase/kdcop/kdcopwindow.cpp 2011-08-11 07:25:41.000000000 +0200
-+++ v3.5.13-sru/kdcop/kdcopwindow.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -114,7 +114,7 @@
- {
- setExpandable(true);
- setText(0, TQString::fromUtf8(app_));
-- setPixmap(0, KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "exec" ), KIcon::Small ));
-+ setPixmap(0, KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), KIcon::Small ));
-
-
- /* Get the icon: we use the icon from a mainwindow in that class.
-@@ -674,7 +674,7 @@
- }
-
- if (!wl.isEmpty())
-- wl.tqat(0)->setFocus();
-+ wl.at(0)->setFocus();
-
- i++;
-
-@@ -693,104 +693,104 @@
-
- if ( type == "int" )
- {
-- KLineEdit* e = (KLineEdit*)wl.tqat( i );
-+ KLineEdit* e = (KLineEdit*)wl.at( i );
- arg << e->text().toInt();
- }
- else if ( type == "unsigned" || type == "uint" || type == "unsigned int"
- || type == "TQ_UINT32" )
- {
-- KLineEdit* e = (KLineEdit*)wl.tqat( i );
-+ KLineEdit* e = (KLineEdit*)wl.at( i );
- arg << e->text().toUInt();
- }
- else if( type == "long" || type == "long int" )
- {
-- KLineEdit* e = (KLineEdit*)wl.tqat( i );
-+ KLineEdit* e = (KLineEdit*)wl.at( i );
- arg << e->text().toLong();
- }
- else if( type == "ulong" || type == "unsigned long" || type == "unsigned long int" )
- {
-- KLineEdit* e = (KLineEdit*)wl.tqat( i );
-+ KLineEdit* e = (KLineEdit*)wl.at( i );
- arg << e->text().toULong();
- }
- else if( type == "short" || type == "short int" )
- {
-- KLineEdit* e = (KLineEdit*)wl.tqat( i );
-+ KLineEdit* e = (KLineEdit*)wl.at( i );
- arg << e->text().toShort();
- }
- else if( type == "ushort" || type == "unsigned short" || type == "unsigned short int" )
- {
-- KLineEdit* e = (KLineEdit*)wl.tqat( i );
-+ KLineEdit* e = (KLineEdit*)wl.at( i );
- arg << e->text().toUShort();
- }
- else if ( type == "TQ_UINT64" )
- {
-- KLineEdit* e = ( KLineEdit* )wl.tqat( i );
-+ KLineEdit* e = ( KLineEdit* )wl.at( i );
- arg << e->text().toULongLong();
- }
- else if( type == "float" )
- {
-- KLineEdit* e = (KLineEdit*)wl.tqat( i );
-+ KLineEdit* e = (KLineEdit*)wl.at( i );
- arg << e->text().toFloat();
- }
- else if( type == "double" )
- {
-- KLineEdit* e = (KLineEdit*)wl.tqat( i );
-+ KLineEdit* e = (KLineEdit*)wl.at( i );
- arg << e->text().toDouble();
- }
- else if( type == "bool" )
- {
-- TQCheckBox* c = (TQCheckBox*)wl.tqat( i );
-+ TQCheckBox* c = (TQCheckBox*)wl.at( i );
- arg << c->isChecked();
- }
- else if( type == "TQCString" )
- {
-- KLineEdit* e = (KLineEdit*)wl.tqat( i );
-+ KLineEdit* e = (KLineEdit*)wl.at( i );
- arg << TQCString( e->text().local8Bit() );
- }
- else if( type == "TQString" )
- {
-- KLineEdit* e = (KLineEdit*)wl.tqat( i );
-+ KLineEdit* e = (KLineEdit*)wl.at( i );
- arg << e->text();
- }
- else if( type == "TQStringList" )
- {
-- KEditListBox* e = (KEditListBox*)wl.tqat( i );
-+ KEditListBox* e = (KEditListBox*)wl.at( i );
- arg << e->items();
- }
- else if( type == "TQValueList<TQCString>" )
- {
-- KEditListBox* e = (KEditListBox*)wl.tqat( i );
-+ KEditListBox* e = (KEditListBox*)wl.at( i );
- for (int i = 0; i < e->count(); i++)
- arg << TQCString( e->text(i).local8Bit() );
- }
- else if( type == "KURL" )
- {
-- KLineEdit* e = (KLineEdit*)wl.tqat( i );
-+ KLineEdit* e = (KLineEdit*)wl.at( i );
- arg << KURL( e->text() );
- }
- else if( type == "TQColor" )
- {
-- KColorButton* e = (KColorButton*)wl.tqat( i );
-+ KColorButton* e = (KColorButton*)wl.at( i );
- arg << e->color();
- }
- else if( type == "TQSize" )
- {
-- KMultiIntEdit* e = (KMultiIntEdit*)wl.tqat( i );
-+ KMultiIntEdit* e = (KMultiIntEdit*)wl.at( i );
- arg << TQSize(e->field(1) , e->field(2)) ;
- }
- else if( type == "TQPoint" )
- {
-- KMultiIntEdit* e = (KMultiIntEdit*)wl.tqat( i );
-+ KMultiIntEdit* e = (KMultiIntEdit*)wl.at( i );
- arg << TQPoint(e->field(1) , e->field(2)) ;
- }
- else if( type == "TQRect" )
- {
-- KMultiIntEdit* e = (KMultiIntEdit*)wl.tqat( i );
-+ KMultiIntEdit* e = (KMultiIntEdit*)wl.at( i );
- arg << TQRect(e->field(1) , e->field(2) , e->field(3) , e->field(4)) ;
- }
- else if( type == "TQPixmap" )
- {
-- KURLRequester* e= (KURLRequester*)wl.tqat( i );
-+ KURLRequester* e= (KURLRequester*)wl.at( i );
- arg << TQPixmap(e->url());
- }
- else
-@@ -1053,7 +1053,7 @@
- TQCursor r;
- reply >> r;
- //theList->insertItem(r, 1);
-- ret << "Cursor #" + TQString::number(r.tqshape());
-+ ret << "Cursor #" + TQString::number(r.shape());
- }
- else if (replyType == "TQPixmap")
- {
-@@ -1211,7 +1211,7 @@
- // below list view. If there is nothing selected from
- // the below menu then tell the tree to copy its current
- // selection as text.
-- TQClipboard *clipboard = TQApplication::tqclipboard();
-+ TQClipboard *clipboard = TQApplication::clipboard();
- if (mainView->lb_replyData->count()!= 0)
- {
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdebugdialog/kabstractdebugdialog.cpp v3.5.13-sru/kdebugdialog/kabstractdebugdialog.cpp
---- /tmp/stable//kdebase/kdebugdialog/kabstractdebugdialog.cpp 2011-03-12 07:57:32.000000000 +0100
-+++ v3.5.13-sru/kdebugdialog/kabstractdebugdialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -52,11 +52,11 @@
- pCancelButton = new KPushButton( KStdGuiItem::cancel(), this );
- hbox->addWidget( pCancelButton );
-
-- int w1 = pHelpButton->tqsizeHint().width();
-- int w2 = pOKButton->tqsizeHint().width();
-- int w3 = pCancelButton->tqsizeHint().width();
-+ int w1 = pHelpButton->sizeHint().width();
-+ int w2 = pOKButton->sizeHint().width();
-+ int w3 = pCancelButton->sizeHint().width();
- int w4 = QMAX( w1, QMAX( w2, w3 ) );
-- int w5 = pApplyButton->tqsizeHint().width();
-+ int w5 = pApplyButton->sizeHint().width();
- w4 = QMAX(w4, w5);
-
- pHelpButton->setFixedWidth( w4 );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdebugdialog/kdebugdialog.cpp v3.5.13-sru/kdebugdialog/kdebugdialog.cpp
---- /tmp/stable//kdebase/kdebugdialog/kdebugdialog.cpp 2011-08-11 07:25:24.000000000 +0200
-+++ v3.5.13-sru/kdebugdialog/kdebugdialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -54,7 +54,7 @@
-
- // Build combo of debug areas
- pDebugAreas = new TQComboBox( false, this );
-- pDebugAreas->setFixedHeight( pDebugAreas->tqsizeHint().height() );
-+ pDebugAreas->setFixedHeight( pDebugAreas->sizeHint().height() );
- pDebugAreas->insertStringList( areaList );
- topLayout->addWidget( pDebugAreas );
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdebugdialog/klistdebugdialog.cpp v3.5.13-sru/kdebugdialog/klistdebugdialog.cpp
---- /tmp/stable//kdebase/kdebugdialog/klistdebugdialog.cpp 2011-08-11 07:25:24.000000000 +0200
-+++ v3.5.13-sru/kdebugdialog/klistdebugdialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -182,7 +182,7 @@
- for ( ; it.current() ; ++it )
- {
- if ( area == (*it)->name() // debug area code = cb's name
-- || (*it)->text().find( TQString::tqfromLatin1(area) ) != -1 ) // area name included in cb text
-+ || (*it)->text().find( TQString::fromLatin1(area) ) != -1 ) // area name included in cb text
- {
- (*it)->setChecked( activate );
- return;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdepasswd/kcm/main.cpp v3.5.13-sru/kdepasswd/kcm/main.cpp
---- /tmp/stable//kdebase/kdepasswd/kcm/main.cpp 2011-03-12 07:58:06.000000000 +0100
-+++ v3.5.13-sru/kdepasswd/kcm/main.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -150,11 +150,11 @@
- KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces/";
-
- TQString fs = KCFGUserAccount::faceSource();
-- if (fs == TQString::tqfromLatin1("UserOnly"))
-+ if (fs == TQString::fromLatin1("UserOnly"))
- _facePerm = userOnly;
-- else if (fs == TQString::tqfromLatin1("PreferUser"))
-+ else if (fs == TQString::fromLatin1("PreferUser"))
- _facePerm = userFirst;
-- else if (fs == TQString::tqfromLatin1("PreferAdmin"))
-+ else if (fs == TQString::fromLatin1("PreferAdmin"))
- _facePerm = adminFirst;
- else
- _facePerm = adminOnly; // Admin Only
-@@ -169,13 +169,13 @@
- _mw->btnChangeFace->setPixmap( _facePixmap );
- }
-
-- if ( _facePerm >= userFirst )
-+ if ( _facePerm == userFirst )
- {
- // If the user's choice takes preference
- _facePixmap = TQPixmap( KCFGUserAccount::faceFile() );
-
- // The user has no face, should we check for the admin's setting?
-- if ( _facePixmap.isNull() && _facePerm == userFirst )
-+ if ( _facePixmap.isNull() )
- _facePixmap = TQPixmap( _userPicsDir + _ku->loginName() + ".face.icon" );
-
- if ( _facePixmap.isNull() )
-@@ -183,7 +183,7 @@
-
- _mw->btnChangeFace->setPixmap( _facePixmap );
- }
-- else if ( _facePerm <= adminOnly )
-+ else if ( _facePerm == adminOnly )
- {
- // Admin only
- _facePixmap = TQPixmap( _userPicsDir + _ku->loginName() + ".face.icon" );
-@@ -249,7 +249,7 @@
-
- void KCMUserAccount::changeFace(const TQPixmap &pix)
- {
-- if ( _facePerm < userFirst )
-+ if ( _facePerm != userFirst )
- return; // If the user isn't allowed to change their face, don't!
-
- if ( pix.isNull() ) {
-@@ -264,7 +264,7 @@
-
- void KCMUserAccount::slotFaceButtonClicked()
- {
-- if ( _facePerm < userFirst )
-+ if ( _facePerm != userFirst )
- {
- KMessageBox::sorry( this, i18n("Your administrator has disallowed changing your image.") );
- return;
-@@ -295,10 +295,9 @@
-
- if (e->type() == TQEvent::Drop)
- {
-- if ( _facePerm < userFirst )
-+ if ( _facePerm != userFirst )
- {
-- KMessageBox::sorry( this, i18n("Your administrator "
-- "has disallowed changing your image.") );
-+ KMessageBox::sorry( this, i18n("Your administrator has disallowed changing your image.") );
- return true;
- }
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdepasswd/kcm/main_widget.ui v3.5.13-sru/kdepasswd/kcm/main_widget.ui
---- /tmp/stable//kdebase/kdepasswd/kcm/main_widget.ui 2011-03-12 07:58:06.000000000 +0100
-+++ v3.5.13-sru/kdepasswd/kcm/main_widget.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -32,13 +32,13 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>74</width>
- <height>74</height>
- </size>
- </property>
-- <property name="tqmaximumSize">
-+ <property name="maximumSize">
- <size>
- <width>74</width>
- <height>74</height>
-@@ -154,7 +154,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>16</height>
-@@ -182,7 +182,7 @@
- <property name="text">
- <string></string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignVCenter</set>
- </property>
- </widget>
-@@ -193,7 +193,7 @@
- <property name="text">
- <string>&lt;i&gt;(Click the button to change your image)&lt;/i&gt;</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignVCenter</set>
- </property>
- </widget>
-@@ -217,7 +217,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>111</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdepasswd/kdepasswd.cpp v3.5.13-sru/kdepasswd/kdepasswd.cpp
---- /tmp/stable//kdebase/kdepasswd/kdepasswd.cpp 2010-08-13 00:35:42.000000000 +0200
-+++ v3.5.13-sru/kdepasswd/kdepasswd.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -1,6 +1,6 @@
- /* vi: ts=8 sts=4 sw=4
- *
-- * $Id: kdepasswd.cpp 1157639 2010-07-31 19:33:34Z tpearson $
-+ * $Id$
- *
- * This file is part of the KDE project, module kdesu.
- * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdepasswd/passwd.cpp v3.5.13-sru/kdepasswd/passwd.cpp
---- /tmp/stable//kdebase/kdepasswd/passwd.cpp 2011-08-11 07:25:44.000000000 +0200
-+++ v3.5.13-sru/kdepasswd/passwd.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -1,6 +1,6 @@
- /* vi: ts=8 sts=4 sw=4
- *
-- * $Id: passwd.cpp 1246075 2011-08-10 06:08:18Z tpearson $
-+ * $Id$
- *
- * This file is part of the KDE project, module kdesu.
- * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdepasswd/passwddlg.cpp v3.5.13-sru/kdepasswd/passwddlg.cpp
---- /tmp/stable//kdebase/kdepasswd/passwddlg.cpp 2011-03-12 07:58:06.000000000 +0100
-+++ v3.5.13-sru/kdepasswd/passwddlg.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -1,6 +1,6 @@
- /* vi: ts=8 sts=4 sw=4
- *
-- * $Id: passwddlg.cpp 1215552 2011-01-19 01:42:14Z tpearson $
-+ * $Id$
- *
- * This file is part of the KDE project, module kdesu.
- * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdepasswd/passwddlg.h v3.5.13-sru/kdepasswd/passwddlg.h
---- /tmp/stable//kdebase/kdepasswd/passwddlg.h 2010-08-13 00:35:42.000000000 +0200
-+++ v3.5.13-sru/kdepasswd/passwddlg.h 2012-07-31 17:17:50.000000000 +0200
-@@ -1,6 +1,6 @@
- /* vi: ts=8 sts=4 sw=4
- *
-- * $Id: passwddlg.h 1157639 2010-07-31 19:33:34Z tpearson $
-+ * $Id$
- *
- * This file is part of the KDE project, module kdesu.
- * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdepasswd/passwd.h v3.5.13-sru/kdepasswd/passwd.h
---- /tmp/stable//kdebase/kdepasswd/passwd.h 2010-08-13 00:35:42.000000000 +0200
-+++ v3.5.13-sru/kdepasswd/passwd.h 2012-07-31 17:17:50.000000000 +0200
-@@ -1,6 +1,6 @@
- /* vi: ts=8 sts=4 sw=4
- *
-- * $Id: passwd.h 1157639 2010-07-31 19:33:34Z tpearson $
-+ * $Id$
- *
- * This file is part of the KDE project, module kdesu.
- * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdeprint/kdeprintfax/faxctrl.cpp v3.5.13-sru/kdeprint/kdeprintfax/faxctrl.cpp
---- /tmp/stable//kdebase/kdeprint/kdeprintfax/faxctrl.cpp 2011-08-11 07:25:50.000000000 +0200
-+++ v3.5.13-sru/kdeprint/kdeprintfax/faxctrl.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -291,7 +291,7 @@
- if (v.isEmpty())
- v = getenv("FAXSERVER");
- if (v.isEmpty())
-- v = TQString::tqfromLatin1("localhost");
-+ v = TQString::fromLatin1("localhost");
- v = processTag( match, v );
- }
- else if (isTag( match, "%page" ))
-@@ -491,7 +491,7 @@
- m_tempfiles.append(tmp);
- m_process->clearArguments();
- *m_process << locate("data","kdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","kdeprintfax/faxfilters"))
-- << TQString::tqfromLatin1("--mime=%1").arg(mimeType)
-+ << TQString::fromLatin1("--mime=%1").arg(mimeType)
- << "-p" << pageSize()
- << KProcess::quote(m_files[0]) << KProcess::quote(tmp);
- if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput))
-@@ -617,7 +617,7 @@
- KPrinter printer;
- printer.setDocName( i18n( "Fax log" ) );
- printer.setDocFileName( "faxlog" );
-- if ( printer.setup( m_logview->tqtopLevelWidget(), i18n( "Fax Log" ) ) )
-+ if ( printer.setup( m_logview->topLevelWidget(), i18n( "Fax Log" ) ) )
- {
- TQPainter painter( &printer );
- TQPaintDeviceMetrics metric( &printer );
-@@ -634,7 +634,7 @@
- richText.setWidth( &painter, body.width() );
- do
- {
-- richText.draw( &painter, body.left(), body.top(), view, m_logview->tqcolorGroup() );
-+ richText.draw( &painter, body.left(), body.top(), view, m_logview->colorGroup() );
- view.moveBy( 0, body.height() );
- painter.translate( 0, -body.height() );
- if ( view.top() >= richText.height() )
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdeprint/kdeprintfax/kdeprintfax.cpp v3.5.13-sru/kdeprint/kdeprintfax/kdeprintfax.cpp
---- /tmp/stable//kdebase/kdeprint/kdeprintfax/kdeprintfax.cpp 2011-08-11 07:25:50.000000000 +0200
-+++ v3.5.13-sru/kdeprint/kdeprintfax/kdeprintfax.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -429,14 +429,14 @@
- if ( !m_cover->isEnabled() )
- m_cover->setChecked(false);
- m_comment->setEnabled(cmd.find("%comment") != -1 && m_cover->isChecked());
-- //m_comment->setPaper(m_comment->isEnabled() ? tqcolorGroup().brush(TQColorGroup::Base) : tqcolorGroup().brush(TQColorGroup::Background));
-+ //m_comment->setPaper(m_comment->isEnabled() ? colorGroup().brush(TQColorGroup::Base) : colorGroup().brush(TQColorGroup::Background));
- if (!m_comment->isEnabled())
- {
- m_comment->setText("");
-- m_comment->setPaper( tqcolorGroup().background() );
-+ m_comment->setPaper( colorGroup().background() );
- }
- else
-- m_comment->setPaper( tqcolorGroup().base() );
-+ m_comment->setPaper( colorGroup().base() );
- /*
- m_enterprise->setEnabled(cmd.find("%enterprise") != -1);
- if (!m_enterprise->isEnabled())
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdeprint/kdeprintfax/kdeprintfax.desktop v3.5.13-sru/kdeprint/kdeprintfax/kdeprintfax.desktop
---- /tmp/stable//kdebase/kdeprint/kdeprintfax/kdeprintfax.desktop 2010-08-12 05:29:41.000000000 +0200
-+++ v3.5.13-sru/kdeprint/kdeprintfax/kdeprintfax.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -94,4 +94,4 @@
- Icon=kdeprintfax
- Terminal=false
- X-DCOP-ServiceType=Multi
--Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals;
-+Categories=Qt;KDE;Utility
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdeprint/kjobviewer/kjobviewer.cpp v3.5.13-sru/kdeprint/kjobviewer/kjobviewer.cpp
---- /tmp/stable//kdebase/kdeprint/kjobviewer/kjobviewer.cpp 2011-08-11 07:25:50.000000000 +0200
-+++ v3.5.13-sru/kdeprint/kjobviewer/kjobviewer.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -77,7 +77,7 @@
- int choice = menu.exec(mapToGlobal(e->pos()));
- if (choice != -1)
- {
-- KMJobViewer *view = list.tqat(choice);
-+ KMJobViewer *view = list.at(choice);
- if (view->isVisible())
- KWin::activateWindow(view->winId());
- else
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdeprint/kjobviewer/kjobviewer.desktop v3.5.13-sru/kdeprint/kjobviewer/kjobviewer.desktop
---- /tmp/stable//kdebase/kdeprint/kjobviewer/kjobviewer.desktop 2010-08-12 05:29:41.000000000 +0200
-+++ v3.5.13-sru/kdeprint/kjobviewer/kjobviewer.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -89,4 +89,4 @@
- GenericName[zh_TW]=列印工作
-
- X-DCOP-ServiceType=Unique
--Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals;
-+Categories=Qt;KDE;Utility
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdeprint/kprinter/printwrapper.cpp v3.5.13-sru/kdeprint/kprinter/printwrapper.cpp
---- /tmp/stable//kdebase/kdeprint/kprinter/printwrapper.cpp 2011-03-12 07:58:15.000000000 +0100
-+++ v3.5.13-sru/kdeprint/kprinter/printwrapper.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -66,7 +66,7 @@
-
- void showmsgconsole(const TQString& msg, int type = 0)
- {
-- TQString errmsg = TQString::tqfromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error"))));
-+ TQString errmsg = TQString::fromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error"))));
- kdDebug() << errmsg << msg << endl;
- }
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdeprint/slave/kio_print.cpp v3.5.13-sru/kdeprint/slave/kio_print.cpp
---- /tmp/stable//kdebase/kdeprint/slave/kio_print.cpp 2011-08-11 07:25:50.000000000 +0200
-+++ v3.5.13-sru/kdeprint/slave/kio_print.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -635,7 +635,7 @@
- mimeType("text/html");
-
- TQString content;
-- if (!loadTemplate(TQString::tqfromLatin1("printer.template"), content))
-+ if (!loadTemplate(TQString::fromLatin1("printer.template"), content))
- {
- error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("printer.template"));
- return;
-@@ -676,7 +676,7 @@
- mimeType("text/html");
-
- TQString content;
-- if (!loadTemplate(TQString::tqfromLatin1("class.template"), content))
-+ if (!loadTemplate(TQString::fromLatin1("class.template"), content))
- {
- error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("class.template"));
- return;
-@@ -686,7 +686,7 @@
- TQStringList members(printer->members());
- for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it)
- {
-- memberContent.append(TQString::tqfromLatin1("<li><a href=\"print:/printers/%1\">%2</a></li>\n").arg(*it).arg(*it));
-+ memberContent.append(TQString::fromLatin1("<li><a href=\"print:/printers/%1\">%2</a></li>\n").arg(*it).arg(*it));
- }
- memberContent.append("</ul>\n");
-
-@@ -719,7 +719,7 @@
- mimeType("text/html");
-
- TQString content;
-- if (!loadTemplate(TQString::tqfromLatin1("pseudo.template"), content))
-+ if (!loadTemplate(TQString::fromLatin1("pseudo.template"), content))
- {
- error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
- return;
-@@ -755,7 +755,7 @@
-
- bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer)
- {
-- TQFile f(locate("data", TQString::tqfromLatin1("kdeprint/template/")+filename));
-+ TQFile f(locate("data", TQString::fromLatin1("kdeprint/template/")+filename));
- if (f.exists() && f.open(IO_ReadOnly))
- {
- TQTextStream t(&f);
-@@ -820,7 +820,7 @@
- }
-
- TQString content;
-- if (!loadTemplate(TQString::tqfromLatin1("jobs.template"), content))
-+ if (!loadTemplate(TQString::fromLatin1("jobs.template"), content))
- {
- error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
- return;
-@@ -891,7 +891,7 @@
- mimeType("text/html");
-
- TQString content;
-- if (!loadTemplate(TQString::tqfromLatin1("driver.template"), content))
-+ if (!loadTemplate(TQString::fromLatin1("driver.template"), content))
- {
- error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
- return;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/bgmanager.cc v3.5.13-sru/kdesktop/bgmanager.cc
---- /tmp/stable//kdebase/kdesktop/bgmanager.cc 2011-07-09 08:16:54.000000000 +0200
-+++ v3.5.13-sru/kdesktop/bgmanager.cc 2012-07-31 17:17:50.000000000 +0200
-@@ -125,7 +125,7 @@
- if (m_numberOfViewports < 1) {
- m_numberOfViewports = 1;
- }
-- for (unsigned j=0;j<(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports);j++) {
-+ for (signed j=0;j<(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports);j++) {
- renderBackground(j);
- }
- }
-@@ -250,7 +250,7 @@
- if (m_numberOfViewports < 1) {
- m_numberOfViewports = 1;
- }
-- for (unsigned j=0;j<(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports);j++) {
-+ for (signed j=0;j<(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports);j++) {
- renderBackground(j);
- }
- }
-@@ -350,7 +350,7 @@
- desk--;
-
- // Lazy initialisation of # of desktops
-- if ((m_pKwinmodule->numberOfDesktops() * m_numberOfViewports) >= m_Renderer.size())
-+ if ((unsigned)(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports) >= m_Renderer.size())
- slotChangeNumberOfDesktops( m_pKwinmodule->numberOfDesktops() * m_numberOfViewports);
-
- int edesk = effectiveDesktop();
-@@ -410,7 +410,7 @@
- desk--;
-
- // Lazy initialisation of # of desktops
-- if ((m_pKwinmodule->numberOfDesktops() * m_numberOfViewports) >= m_Renderer.size())
-+ if ((unsigned)(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports) >= m_Renderer.size())
- slotChangeNumberOfDesktops( m_pKwinmodule->numberOfDesktops() * m_numberOfViewports );
-
- int edesk = effectiveDesktop();
-@@ -518,11 +518,11 @@
- {
- TQScrollView* sv = dynamic_cast<TQScrollView*>( m_pDesktop );
- if ( sv ) {
-- // Qt eats tqrepaint events in this case :-((
-+ // Qt eats repaint events in this case :-((
- sv->viewport()->update();
- }
- m_pDesktop->setErasePixmap(*ep);
-- m_pDesktop->tqrepaint();
-+ m_pDesktop->repaint();
- static bool root_cleared = false;
- if( !root_cleared )
- { // clear the root window pixmap set by kdm
-@@ -923,7 +923,7 @@
- void KBackgroundManager::repaintBackground()
- {
- if (m_pDesktop)
-- m_pDesktop->tqrepaint();
-+ m_pDesktop->repaint();
- else
- TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
- }
-@@ -963,7 +963,7 @@
- if (m_numberOfViewports < 1) {
- m_numberOfViewports = 1;
- }
-- for (unsigned j=0;j<(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports);j++) {
-+ for (signed j=0;j<(m_pKwinmodule->numberOfDesktops() * m_numberOfViewports);j++) {
- renderBackground(j);
- }
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/CMakeLists.txt v3.5.13-sru/kdesktop/CMakeLists.txt
---- /tmp/stable//kdebase/kdesktop/CMakeLists.txt 2011-03-26 00:02:18.000000000 +0100
-+++ v3.5.13-sru/kdesktop/CMakeLists.txt 2012-07-31 17:17:50.000000000 +0200
-@@ -48,7 +48,9 @@
-
- ##### other data ################################
-
--install( FILES kdesktop.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
-+configure_file( kdesktop.desktop.cmake kdesktop.desktop @ONLY )
-+
-+install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kdesktop.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
- install( FILES kdesktop_custom_menu1 kdesktop_custom_menu2 DESTINATION ${CONFIG_INSTALL_DIR} )
- install( FILES kdesktopSetAsBackground.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )
- install( FILES kdesktop.kcfg klaunch.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
-@@ -92,6 +94,7 @@
- kdesktopsettings-static bgnd-static dmctl-static
- konq-shared kutils-shared
- ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext dl
-+ ${XSS_LIBRARIES}
- )
-
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/desktop.cc v3.5.13-sru/kdesktop/desktop.cc
---- /tmp/stable//kdebase/kdesktop/desktop.cc 2011-08-11 07:25:39.000000000 +0200
-+++ v3.5.13-sru/kdesktop/desktop.cc 2012-07-31 17:17:50.000000000 +0200
-@@ -135,8 +135,8 @@
- const char* KDesktop::m_wheelDirectionStrings[2] = { "Forward", "Reverse" };
-
- KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) :
-- KDesktopIface(),
- TQWidget( 0L, "desktop", (WFlags)(WResizeNoErase | ( x_root_hack ? (WStyle_Customize | WStyle_NoBorder) : 0)) ),
-+ KDesktopIface(),
- // those two WStyle_ break kdesktop when the root-hack isn't used (no Dnd)
- startup_id( NULL ), m_waitForKicker(0)
- {
-@@ -159,7 +159,7 @@
- kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)",
- "KDesktopIface", "desktopIconsAreaChanged(TQRect, int)", false);
-
-- // Dont tqrepaint on configuration changes during construction
-+ // Dont repaint on configuration changes during construction
- m_bInit = true;
-
- // It's the child widget that gets the focus, not us
-@@ -1179,7 +1179,7 @@
-
- void KDesktop::removeIcon(const TQString &_url)
- {
-- if (_url.tqat(0) != '/') {
-+ if (_url.at(0) != '/') {
- qDebug("removeIcon with relative path not supported for now");
- return;
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/init/My_Documents v3.5.13-sru/kdesktop/init/My_Documents
---- /tmp/stable//kdebase/kdesktop/init/My_Documents 2011-10-24 00:31:04.000000000 +0200
-+++ v3.5.13-sru/kdesktop/init/My_Documents 2012-07-31 17:17:50.000000000 +0200
-@@ -3,12 +3,10 @@
- Icon=folder_wordprocessing
- Name=My Documents
- Name[af]=Dokument Gids
--Name[ar]=مستنداتي
-+Name[ar]=مستنداتي
- Name[be]=Тэчка для дакументаў
- Name[bg]=Директория с документи
- Name[bn]=ডকুমেন্ট ফোল্ডার
--Name[br]=Renkell an teulioù
--Name[ar]=مستنداتي
- Name[br]=Renkell an teulioù
- Name[bs]=Direktorij dokumenata
- Name[ca]=Carpeta de documents
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/kdesktop.desktop v3.5.13-sru/kdesktop/kdesktop.desktop
---- /tmp/stable//kdebase/kdesktop/kdesktop.desktop 2010-08-12 05:29:22.000000000 +0200
-+++ v3.5.13-sru/kdesktop/kdesktop.desktop 1970-01-01 01:00:00.000000000 +0100
-@@ -1,85 +0,0 @@
--[Desktop Entry]
--Exec=kdesktop
--X-DCOP-ServiceType=wait
--Name=KDE Desktop
--Name[af]=KDE Werkskerm
--Name[ar]=سطح المكتب KDE
--Name[az]=KDE Masa üstü
--Name[be]=Працоўны стол KDE
--Name[bn]=কে.ডি.ই. ডেস্কটপ
--Name[br]=Burev KDE
--Name[bs]=KDE radna površina
--Name[ca]=Escriptori KDE
--Name[cs]=Pracovní plocha KDE
--Name[csb]=Pùlt KDE
--Name[cy]=Penbwrdd KDE
--Name[da]=KDE-desktop
--Name[de]=KDE-Arbeitsfläche
--Name[el]=Επιφάνεια εργασίας του KDE
--Name[eo]=KDE Labortablo
--Name[es]=Escritorio de KDE
--Name[et]=KDE töölaud
--Name[eu]=KDE mahaigaina
--Name[fa]=رومیزی KDE
--Name[fi]=KDE-työpöytä
--Name[fr]=Bureau de KDE
--Name[fy]=KDE Buroblêd
--Name[ga]=Deasc KDE
--Name[gl]=Escritório de KDE
--Name[he]=שולחן העבודה של KDE
--Name[hi]=केडीई डेस्कटॉप
--Name[hr]=KDE radna površina
--Name[hu]=Munkaasztal
--Name[id]=Desktop KDE
--Name[is]=KDE skjáborð
--Name[it]=Desktop KDE
--Name[ja]=KDE デスクトップ
--Name[ka]=KDE სამუშაო დაფა
--Name[kk]=KDE үстелі
--Name[km]=ផ្ទៃតុ KDE
--Name[ko]=데스크톱
--Name[lo]=ພື້ນທີ່ທຳງານ KDE
--Name[lt]=KDE Darbastalis
--Name[lv]=KDE Darbvirsma
--Name[mk]=KDE Десктоп
--Name[mn]=КДЭ-Ажлын тавцан
--Name[ms]=Desktop KDE
--Name[mt]=Desktop KDE
--Name[nb]=KDE Skrivebord
--Name[nds]=KDE-Schriefdisch
--Name[ne]=KDE डेस्कटप
--Name[nl]=KDE Bureaublad
--Name[nn]=KDE-skrivebord
--Name[nso]=Desktop ya KDE
--Name[pa]=KDE ਵੇਹੜਾ
--Name[pl]=Pulpit KDE
--Name[pt]=Ecrã do KDE
--Name[pt_BR]=Área de Trabalho KDE
--Name[ro]=Ecran KDE
--Name[ru]=Рабочий стол KDE
--Name[rw]=KDE Ibiro
--Name[se]=KDE-čallinbeavdi
--Name[sk]=Pracovná plocha
--Name[sl]=Namizje KDE
--Name[sr]=KDE радна површина
--Name[sr@Latn]=KDE radna površina
--Name[sv]=KDE-skrivbord
--Name[ta]=KDE மேல்மேசை
--Name[te]=కెడిఈ రంగస్థలం
--Name[tg]=Мизи Кории KDE
--Name[th]=พื้นที่ทำงาน KDE
--Name[tr]=KDE Masaüstü
--Name[tt]=KDE Östäl
--Name[uk]=Стільниця KDE
--Name[uz]=KDE ish stoli
--Name[uz@cyrillic]=KDE иш столи
--Name[ven]=Desikithopo ya KDE
--Name[vi]=Môi trường KDE
--Name[wa]=Sicribanne KDE
--Name[zh_CN]=KDE 桌面
--Name[zh_TW]=KDE 桌面
--Name[zu]=I-Desktop ye-KDE
--Type=Service
--X-KDE-StartupNotify=false
--OnlyShowIn=KDE;
--X-KDE-autostart-phase=0
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/kdesktop.desktop.cmake v3.5.13-sru/kdesktop/kdesktop.desktop.cmake
---- /tmp/stable//kdebase/kdesktop/kdesktop.desktop.cmake 1970-01-01 01:00:00.000000000 +0100
-+++ v3.5.13-sru/kdesktop/kdesktop.desktop.cmake 2012-07-31 17:17:50.000000000 +0200
-@@ -0,0 +1,85 @@
-+[Desktop Entry]
-+Exec=@TDE_BIN_DIR@/kdesktop
-+X-DCOP-ServiceType=wait
-+Name=KDE Desktop
-+Name[af]=KDE Werkskerm
-+Name[ar]=سطح المكتب KDE
-+Name[az]=KDE Masa üstü
-+Name[be]=Працоўны стол KDE
-+Name[bn]=কে.ডি.ই. ডেস্কটপ
-+Name[br]=Burev KDE
-+Name[bs]=KDE radna površina
-+Name[ca]=Escriptori KDE
-+Name[cs]=Pracovní plocha KDE
-+Name[csb]=Pùlt KDE
-+Name[cy]=Penbwrdd KDE
-+Name[da]=KDE-desktop
-+Name[de]=KDE-Arbeitsfläche
-+Name[el]=Επιφάνεια εργασίας του KDE
-+Name[eo]=KDE Labortablo
-+Name[es]=Escritorio de KDE
-+Name[et]=KDE töölaud
-+Name[eu]=KDE mahaigaina
-+Name[fa]=رومیزی KDE
-+Name[fi]=KDE-työpöytä
-+Name[fr]=Bureau de KDE
-+Name[fy]=KDE Buroblêd
-+Name[ga]=Deasc KDE
-+Name[gl]=Escritório de KDE
-+Name[he]=שולחן העבודה של KDE
-+Name[hi]=केडीई डेस्कटॉप
-+Name[hr]=KDE radna površina
-+Name[hu]=Munkaasztal
-+Name[id]=Desktop KDE
-+Name[is]=KDE skjáborð
-+Name[it]=Desktop KDE
-+Name[ja]=KDE デスクトップ
-+Name[ka]=KDE სამუშაო დაფა
-+Name[kk]=KDE үстелі
-+Name[km]=ផ្ទៃតុ KDE
-+Name[ko]=데스크톱
-+Name[lo]=ພື້ນທີ່ທຳງານ KDE
-+Name[lt]=KDE Darbastalis
-+Name[lv]=KDE Darbvirsma
-+Name[mk]=KDE Десктоп
-+Name[mn]=КДЭ-Ажлын тавцан
-+Name[ms]=Desktop KDE
-+Name[mt]=Desktop KDE
-+Name[nb]=KDE Skrivebord
-+Name[nds]=KDE-Schriefdisch
-+Name[ne]=KDE डेस्कटप
-+Name[nl]=KDE Bureaublad
-+Name[nn]=KDE-skrivebord
-+Name[nso]=Desktop ya KDE
-+Name[pa]=KDE ਵੇਹੜਾ
-+Name[pl]=Pulpit KDE
-+Name[pt]=Ecrã do KDE
-+Name[pt_BR]=Área de Trabalho KDE
-+Name[ro]=Ecran KDE
-+Name[ru]=Рабочий стол KDE
-+Name[rw]=KDE Ibiro
-+Name[se]=KDE-čallinbeavdi
-+Name[sk]=Pracovná plocha
-+Name[sl]=Namizje KDE
-+Name[sr]=KDE радна површина
-+Name[sr@Latn]=KDE radna površina
-+Name[sv]=KDE-skrivbord
-+Name[ta]=KDE மேல்மேசை
-+Name[te]=కెడిఈ రంగస్థలం
-+Name[tg]=Мизи Кории KDE
-+Name[th]=พื้นที่ทำงาน KDE
-+Name[tr]=KDE Masaüstü
-+Name[tt]=KDE Östäl
-+Name[uk]=Стільниця KDE
-+Name[uz]=KDE ish stoli
-+Name[uz@cyrillic]=KDE иш столи
-+Name[ven]=Desikithopo ya KDE
-+Name[vi]=Môi trường KDE
-+Name[wa]=Sicribanne KDE
-+Name[zh_CN]=KDE 桌面
-+Name[zh_TW]=KDE 桌面
-+Name[zu]=I-Desktop ye-KDE
-+Type=Service
-+X-KDE-StartupNotify=false
-+OnlyShowIn=KDE;
-+X-KDE-autostart-phase=0
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/kdesktop.kcfg v3.5.13-sru/kdesktop/kdesktop.kcfg
---- /tmp/stable//kdebase/kdesktop/kdesktop.kcfg 2011-10-26 21:06:48.000000000 +0200
-+++ v3.5.13-sru/kdesktop/kdesktop.kcfg 2012-07-31 17:17:50.000000000 +0200
-@@ -207,7 +207,7 @@
- <label>Device Types to exclude</label>
- <whatsthis>The device types which you do not want to see on the desktop.</whatsthis>
- <!-- kdiconview.cc:261 -->
-- <!-- QString tmpList=config->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted"); -->
-+ <!-- TQString tmpList=config->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted"); -->
- </entry>
- </group>
- <group name="KDE">
-@@ -307,28 +307,21 @@
- <entry key="UseUnmanagedLockWindows" type="Bool">
- <default>false</default>
- <label></label>
-- <whatsthis></whatsthis>
-+ <whatsthis>When enabled this restores the old style unmanaged window behavior of desktop locking.</whatsthis>
- <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:336 -->
- <!-- mSaver = config.readEntry("UseUnmanagedLockWindows"); -->
- </entry>
-- <entry key="UseTDESAK" type="Bool">
-- <default>true</default>
-- <label></label>
-- <whatsthis>Set to true to enable usage of the Trinity SAK anti-spoofing system</whatsthis>
-- <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:336 -->
-- <!-- mSaver = config.readEntry("UseTDESAK"); -->
-- </entry>
- <entry key="ShowLockDateTime" type="Bool">
- <default>true</default>
- <label></label>
-- <whatsthis>Set to true to enable display of the date and time of desktop lock as an additional intrusion detection measure</whatsthis>
-+ <whatsthis>When enabled the date and time when the desktop was locked is displayed as an additional intrusion detection measure.</whatsthis>
- <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:336 -->
- <!-- mSaver = config.readEntry("ShowLockDateTime"); -->
- </entry>
- <entry key="DelaySaverStart" type="Bool">
- <default>true</default>
- <label></label>
-- <whatsthis></whatsthis>
-+ <whatsthis>When disabled the screensaver starts immediately when locking the desktop.</whatsthis>
- <!-- /home/paco/cvsroot/kdebase/kdesktop/lock/lockprocess.cc:336 -->
- <!-- mSaver = config.readEntry("UseUnmanagedLockWindows"); -->
- </entry>
-@@ -353,7 +346,7 @@
- <label></label>
- <whatsthis></whatsthis>
- <!-- minicli.cpp:191 -->
-- <!-- QStringList histList = config->readPathListEntry("History"); -->
-+ <!-- TQStringList histList = config->readPathListEntry("History"); -->
- <!-- minicli.cpp:242 -->
- <!-- config->writePathEntry( "History", m_dlg->cbCommand->historyItems() ); -->
- </entry>
-@@ -406,7 +399,7 @@
- <label></label>
- <whatsthis></whatsthis>
- <!-- minicli.cpp:204 -->
-- <!-- QStringList compList = config->readPathListEntry("CompletionItems"); -->
-+ <!-- TQStringList compList = config->readPathListEntry("CompletionItems"); -->
- <!-- minicli.cpp:244 -->
- <!-- config->writePathEntry( "CompletionItems", m_dlg->cbCommand->completionObject()->items() ); -->
- </entry>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/kdiconview.cc v3.5.13-sru/kdesktop/kdiconview.cc
---- /tmp/stable//kdebase/kdesktop/kdiconview.cc 2011-08-11 07:25:39.000000000 +0200
-+++ v3.5.13-sru/kdesktop/kdiconview.cc 2012-07-31 17:17:50.000000000 +0200
-@@ -159,7 +159,7 @@
- // Initialize media handler
- mMediaListView = new TQListView();
-
-- connect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()),
-+ connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()),
- this, TQT_SLOT(slotClipboardDataChanged()) );
-
- setURL( desktopURL() ); // sets m_url
-@@ -296,7 +296,7 @@
- m_bSortDirectoriesFirst = KDesktopSettings::directoriesFirst();
- m_itemsAlwaysFirst = KDesktopSettings::alwaysFirstItems(); // Distributor plug-in
-
-- if (KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media")))
-+ if (KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media")))
- m_enableMedia=KDesktopSettings::mediaEnabled();
- else
- m_enableMedia=false;
-@@ -960,20 +960,20 @@
- return false;
-
- // return true if desktop file
-- return ( (_item->mimetype() == TQString::tqfromLatin1("application/x-desktop"))
-- || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mydocuments"))
-- || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mycomputer"))
-- || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mynetworkplaces"))
-- || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-printers"))
-- || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-trash"))
-- || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-webbrowser")) );
-+ return ( (_item->mimetype() == TQString::fromLatin1("application/x-desktop"))
-+ || (_item->mimetype() == TQString::fromLatin1("media/builtin-mydocuments"))
-+ || (_item->mimetype() == TQString::fromLatin1("media/builtin-mycomputer"))
-+ || (_item->mimetype() == TQString::fromLatin1("media/builtin-mynetworkplaces"))
-+ || (_item->mimetype() == TQString::fromLatin1("media/builtin-printers"))
-+ || (_item->mimetype() == TQString::fromLatin1("media/builtin-trash"))
-+ || (_item->mimetype() == TQString::fromLatin1("media/builtin-webbrowser")) );
- }
-
- TQString KDIconView::stripDesktopExtension( const TQString & text )
- {
-- if (text.right(7) == TQString::tqfromLatin1(".kdelnk"))
-+ if (text.right(7) == TQString::fromLatin1(".kdelnk"))
- return text.left(text.length() - 7);
-- else if (text.right(8) == TQString::tqfromLatin1(".desktop"))
-+ else if (text.right(8) == TQString::fromLatin1(".desktop"))
- return text.left(text.length() - 8);
- return text;
- }
-@@ -1047,7 +1047,7 @@
- bool firstRun = (count() == 0); // no icons yet, this seems to be the initial loading
-
- // delay updates until all new items have been created
-- tqsetUpdatesEnabled( false );
-+ setUpdatesEnabled( false );
- TQRect area = iconArea();
- setIconArea( TQRect( 0, 0, -1, -1 ) );
-
-@@ -1055,7 +1055,7 @@
- KURL desktop_URL = desktopURL();
- if (desktop_URL.isLocalFile())
- desktopPath = desktop_URL.path();
-- // We have new items, so we'll need to tqrepaint in slotCompleted
-+ // We have new items, so we'll need to repaint in slotCompleted
- m_bNeedRepaint = true;
- kdDebug(1214) << "KDIconView::slotNewItems count=" << entries.count() << endl;
- KFileItemListIterator it(entries);
-@@ -1141,6 +1141,15 @@
- kdDebug(1214)<<"Using saved position"<<endl;
- }
- }
-+ else
-+ {
-+ // Not found, we'll need to save the new pos
-+ kdDebug(1214)<<"slotNewItems(): New item without position information, try to find a sane location"<<endl;
-+
-+ moveToFreePosition(fileIVI);
-+
-+ m_bNeedSave = true;
-+ }
- }
- }
-
-@@ -1150,7 +1159,7 @@
- if ( m_autoAlign )
- lineupIcons();
-
-- tqsetUpdatesEnabled( true );
-+ setUpdatesEnabled( true );
- }
-
- // -----------------------------------------------------------------------------
-@@ -1198,7 +1207,7 @@
- }
- else
- {
-- // In case we replace a big icon with a small one, need to tqrepaint.
-+ // In case we replace a big icon with a small one, need to repaint.
- updateContents();
- // Can't do that with m_bNeedRepaint since slotCompleted isn't called
- m_bNeedRepaint = false;
-@@ -1305,7 +1314,7 @@
- if (!m_hasExistingPos)
- rearrangeIcons();
-
--// kdDebug(1204) << "KDIconView::slotCompleted save:" << m_bNeedSave << " tqrepaint:" << m_bNeedRepaint << endl;
-+// kdDebug(1204) << "KDIconView::slotCompleted save:" << m_bNeedSave << " repaint:" << m_bNeedRepaint << endl;
- if ( m_bNeedSave )
- {
- // Done here because we want to align icons only once initially, and each time new icons appear.
-@@ -1317,7 +1326,7 @@
- }
- if ( m_bNeedRepaint )
- {
-- viewport()->tqrepaint();
-+ viewport()->repaint();
- m_bNeedRepaint = false;
- }
- }
-@@ -1327,7 +1336,7 @@
- // This is very related to KonqDirPart::slotClipboardDataChanged
-
- KURL::List lst;
-- TQMimeSource *data = TQApplication::tqclipboard()->data();
-+ TQMimeSource *data = TQApplication::clipboard()->data();
- if ( data->provides( "application/x-kde-cutselection" ) && data->provides( "text/uri-list" ) )
- if ( KonqDrag::decodeIsCutSelection( data ) )
- (void) KURLDrag::decode( data, lst );
-@@ -1471,7 +1480,7 @@
- bool isImmutable = KGlobal::config()->isImmutable();
-
- if ( (isColorDrag || isImageDrag) && !isUrlDrag ) {
-- // Hack to clear the drag tqshape
-+ // Hack to clear the drag shape
- bool bMovable = itemsMovable();
- bool bSignals = signalsBlocked();
- setItemsMovable(false);
-@@ -1519,7 +1528,7 @@
- if( adjustedAnyItems )
- {
- // Make sure the viewport isn't unnecessarily resized by now,
-- // then schedule a tqrepaint to remove any garbage pixels.
-+ // then schedule a repaint to remove any garbage pixels.
- resizeContents( width(), height() );
- viewport()->update();
- }
-@@ -1541,7 +1550,7 @@
- {
- m_gotIconsArea = true; // now we have it!
-
-- if (( iconArea() == wr ) && (m_needDesktopAlign == false)) return; // nothing changed; avoid tqrepaint/saveIconPosition ...
-+ if (( iconArea() == wr ) && (m_needDesktopAlign == false)) return; // nothing changed; avoid repaint/saveIconPosition ...
-
- TQRect oldArea = iconArea();
- setIconArea( wr );
-@@ -1551,8 +1560,9 @@
- kdDebug(1204) << " oldArea: " << oldArea.x() << "," << oldArea.y()
- << " " << oldArea.width() << "x" << oldArea.height() << endl;
-
-- if ( m_autoAlign )
-- int dummy = 0; //lineupIcons();
-+ if ( m_autoAlign ) {
-+ //lineupIcons();
-+ }
- else {
- bool needRepaint = false;
- TQIconViewItem* item;
-@@ -1593,8 +1603,8 @@
- }
- }
- if ( needRepaint ) {
-- viewport()->tqrepaint( FALSE );
-- tqrepaint( FALSE );
-+ viewport()->repaint( FALSE );
-+ repaint( FALSE );
- saveIconPositions();
- }
- }
-@@ -1718,7 +1728,7 @@
- TQRect rect=item->rect();
- if (m_bVertAlign)
- {
-- kdDebug(1214)<<"moveToFreePosition for vertical tqalignment"<<endl;
-+ kdDebug(1214)<<"moveToFreePosition for vertical alignment"<<endl;
-
- rect.moveTopLeft(TQPoint(spacing(),spacing()));
- do
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/kfileividesktop.cpp v3.5.13-sru/kdesktop/kfileividesktop.cpp
---- /tmp/stable//kdebase/kdesktop/kfileividesktop.cpp 2011-03-12 07:57:59.000000000 +0100
-+++ v3.5.13-sru/kdesktop/kfileividesktop.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -73,15 +73,15 @@
-
- int spread = shadowThickness();
- TQRect itemTextRect = textRect();
-- TQRect tqitemRect = rect();
-+ TQRect itemRect = rect();
-
- itemTextRect.setBottom( itemTextRect.bottom() + spread );
- itemTextRect.setRight( itemTextRect.right() + spread );
-- tqitemRect.setBottom( tqitemRect.bottom() + spread );
-- tqitemRect.setRight( tqitemRect.right() + spread );
-+ itemRect.setBottom( itemRect.bottom() + spread );
-+ itemRect.setRight( itemRect.right() + spread );
-
- setTextRect( itemTextRect );
-- setItemRect( tqitemRect );
-+ setItemRect( itemRect );
- }
-
- void KFileIVIDesktop::paintItem( TQPainter *p, const TQColorGroup &cg)
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/kfileividesktop.h v3.5.13-sru/kdesktop/kfileividesktop.h
---- /tmp/stable//kdebase/kdesktop/kfileividesktop.h 2011-03-12 07:57:59.000000000 +0100
-+++ v3.5.13-sru/kdesktop/kfileividesktop.h 2012-07-31 17:17:50.000000000 +0200
-@@ -91,7 +91,7 @@
- * Builds the shadow. As the algorithm is pretty slow (at pixel level),
- * This method is triggered only if the configuration has changed.
- * @param p the painter for drawing the item
-- * @param align the shadow tqalignment
-+ * @param align the shadow alignment
- * @param shadowColor the shadow color
- */
- virtual TQImage *buildShadow(TQPainter *p, const int align, TQColor &shadowColor);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/krootwm.cc v3.5.13-sru/kdesktop/krootwm.cc
---- /tmp/stable//kdebase/kdesktop/krootwm.cc 2011-07-09 08:16:54.000000000 +0200
-+++ v3.5.13-sru/kdesktop/krootwm.cc 2012-07-31 17:17:50.000000000 +0200
-@@ -243,9 +243,9 @@
- if (s == s_choices[c])
- { rightButtonChoice = (menuChoice) c; break; }
-
-- // Read configuration for icons tqalignment
-+ // Read configuration for icons alignment
- if ( m_bDesktopEnabled ) {
-- bool startup = true; m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() );
-+ m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() );
- if ( kapp->authorize( "editable_desktop_icons" ) ) {
- m_pDesktop->iconView()->setItemsMovable( !KDesktopSettings::lockIcons() );
- KToggleAction *aLockIcons = static_cast<KToggleAction*>(m_actionCollection->action("lock_icons"));
-@@ -636,8 +636,8 @@
- windowListMenu->init();
- disconnect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
- this, TQT_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice
-- // windowListMenu->rect() is not valid before showing, use tqsizeHint()
-- windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->tqsizeHint()).center());
-+ // 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() ) );
-@@ -656,7 +656,7 @@
- slotPopulateSessions();
- disconnect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
- this, TQT_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice
-- sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->tqsizeHint()).center());
-+ sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->sizeHint()).center());
- connect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
- TQT_SLOT( slotPopulateSessions() ) );
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/kxdglauncher.cpp v3.5.13-sru/kdesktop/kxdglauncher.cpp
---- /tmp/stable//kdebase/kdesktop/kxdglauncher.cpp 2011-08-11 07:25:39.000000000 +0200
-+++ v3.5.13-sru/kdesktop/kxdglauncher.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -103,7 +103,7 @@
- TQDir myqdir;
- if (myqdir.exists(getDocumentPath(), TRUE) == true) {
- if (args->isSet( "getpath" ) == true) {
-- printf("%s\n\r", getDocumentPath().ascii());
-+ printf("%s\n\r", (const char *)getDocumentPath().local8Bit());
- return 0;
- }
- else {
-@@ -140,7 +140,7 @@
- config.writeEntry("XDG_DOCUMENTS_DIR", TQString("\"") + xdgModifiedDirectory + TQString("\""), true);
- config.sync();
- if (args->isSet( "getpath" ) == true) {
-- printf("%s\n\r", getDocumentPath().ascii());
-+ printf("%s\n\r", (const char *)getDocumentPath().local8Bit());
- return 0;
- }
- else {
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/lock/autologout.cc v3.5.13-sru/kdesktop/lock/autologout.cc
---- /tmp/stable//kdebase/kdesktop/lock/autologout.cc 2011-09-14 07:31:14.000000000 +0200
-+++ v3.5.13-sru/kdesktop/lock/autologout.cc 2012-07-31 17:17:50.000000000 +0200
-@@ -55,7 +55,7 @@
- TQLabel *infoLabel = new TQLabel(i18n("<qt>To prevent being logged out, resume using this session by moving the mouse or pressing a key.</qt>"), frame);
-
- mStatusLabel = new TQLabel("<b> </b>", frame);
-- mStatusLabel->tqsetAlignment(TQLabel::AlignCenter);
-+ mStatusLabel->setAlignment(TQLabel::AlignCenter);
-
- TQLabel *mProgressLabel = new TQLabel("Time Remaining:", frame);
- mProgressRemaining = new TQProgressBar(frame);
-@@ -82,6 +82,8 @@
- mCountdownTimerId = startTimer(1000/25);
-
- connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()));
-+
-+ setFixedSize( sizeHint() );
- }
-
- AutoLogout::~AutoLogout()
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/lock/CMakeLists.txt v3.5.13-sru/kdesktop/lock/CMakeLists.txt
---- /tmp/stable//kdebase/kdesktop/lock/CMakeLists.txt 2011-10-26 21:54:40.000000000 +0200
-+++ v3.5.13-sru/kdesktop/lock/CMakeLists.txt 2012-07-31 17:17:50.000000000 +0200
-@@ -2,6 +2,8 @@
- #
- # (C) 2010-2011 Serghei Amelian
- # serghei (DOT) amelian (AT) gmail.com
-+# (C) 2012 Timothy Pearson
-+# kb9vqf (AT) pearsoncomputing.net
- #
- # Improvements and feedback are welcome
- #
-@@ -35,6 +37,6 @@
-
- tde_add_executable( ${target} AUTOMOC
- SOURCES ${${target}_SRCS}
-- LINK kdesktopsettings-static dmctl-static kio-shared Xext ${GL_LIBRARY}
-+ LINK kdesktopsettings-static dmctl-static kio-shared Xext ${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}"
- DESTINATION ${BIN_INSTALL_DIR}
- )
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/lock/infodlg.cc v3.5.13-sru/kdesktop/lock/infodlg.cc
---- /tmp/stable//kdebase/kdesktop/lock/infodlg.cc 2011-09-14 07:31:14.000000000 +0200
-+++ v3.5.13-sru/kdesktop/lock/infodlg.cc 2012-07-31 17:17:50.000000000 +0200
-@@ -86,7 +86,7 @@
- KUser user;
-
- mStatusLabel = new TQLabel( "<b> </b>", frame );
-- mStatusLabel->tqsetAlignment( TQLabel::AlignCenter );
-+ mStatusLabel->setAlignment( TQLabel::AlignCenter );
-
- TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
- unlockDialogLayout->addWidget( frame );
-@@ -99,6 +99,7 @@
- frameLayout->addLayout( layStatus, 1, 1 );
-
- installEventFilter(this);
-+ setFixedSize( sizeHint() );
- }
-
- InfoDlg::~InfoDlg()
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/lock/lockdlg.cc v3.5.13-sru/kdesktop/lock/lockdlg.cc
---- /tmp/stable//kdebase/kdesktop/lock/lockdlg.cc 2011-10-16 21:40:20.000000000 +0200
-+++ v3.5.13-sru/kdesktop/lock/lockdlg.cc 2012-07-31 17:17:50.000000000 +0200
-@@ -115,7 +115,7 @@
- frame->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
- frame->setLineWidth( 2 );
-
-- TQLabel *pixLabel;
-+ TQLabel *pixLabel = NULL;
- if (!trinity_desktop_lock_use_system_modal_dialogs) {
- pixLabel = new TQLabel( frame, "pixlabel" );
- pixLabel->setPixmap(DesktopIcon("lock"));
-@@ -134,13 +134,13 @@
- i18n("<nobr><b>The session was locked by %1</b><br>").arg( user.fullName() ), frame );
- }
-
-- TQLabel *lockDTLabel;
-+ TQLabel *lockDTLabel = NULL;
- if ((trinity_desktop_lock_use_system_modal_dialogs) && (!m_lockStartDT.isNull())) {
- lockDTLabel = new TQLabel(i18n("This session has been locked since %1").arg(m_lockStartDT.toString()), frame);
- }
-
- mStatusLabel = new TQLabel( "<b> </b>", frame );
-- mStatusLabel->tqsetAlignment( TQLabel::AlignCenter );
-+ mStatusLabel->setAlignment( TQLabel::AlignCenter );
-
- mLayoutButton = new TQPushButton( frame );
- mLayoutButton->setFlat( true );
-@@ -215,6 +215,7 @@
- mNewSessButton->hide();
-
- installEventFilter(this);
-+ setFixedSize( sizeHint() );
-
- mFailedTimerId = 0;
- mTimeoutTimerId = startTimer(PASSDLG_HIDE_TIMEOUT);
-@@ -224,8 +225,15 @@
-
- DCOPRef kxkb("kxkb", "kxkb");
- if( !kxkb.isNull() ) {
-- layoutsList = kxkb.call("getLayoutsList");
-- TQString currentLayout = kxkb.call("getCurrentLayout");
-+ DCOPReply reply = kxkb.call("getLayoutsList");
-+ if (reply.isValid()) {
-+ layoutsList = reply;
-+ }
-+ reply = kxkb.call("getCurrentLayout");
-+ TQString currentLayout;
-+ if (reply.isValid()) {
-+ reply.get(currentLayout);
-+ }
- if( !currentLayout.isEmpty() && layoutsList.count() > 1 ) {
- currLayout = layoutsList.find(currentLayout);
- if (currLayout == layoutsList.end())
-@@ -268,7 +276,7 @@
- {
- mLayoutButton->setText( txt );
- TQSize sz = mLayoutButton->fontMetrics().size( 0, txt );
-- int mrg = mLayoutButton->tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2;
-+ int mrg = mLayoutButton->style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
- mLayoutButton->setFixedSize( sz.width() + mrg, sz.height() + mrg );
- }
-
-@@ -577,7 +585,7 @@
- TQLabel *label2 = new TQLabel( text, winFrame );
- KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
- button->setDefault( true );
-- button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
-+ button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) );
-
- TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 );
-@@ -598,6 +606,7 @@
- {
- TQDialog::show();
- TQApplication::flushX();
-+ setFixedSize( sizeHint() );
- }
-
- void PasswordDlg::slotStartNewSession()
-@@ -788,9 +797,9 @@
- ns++;
- }
- int fw = lv->frameWidth() * 2;
-- TQSize hds( lv->header()->tqsizeHint() );
-+ TQSize hds( lv->header()->sizeHint() );
- lv->setMinimumWidth( fw + hds.width() +
-- (ns > 10 ? tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) );
-+ (ns > 10 ? style().pixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) );
- lv->setFixedHeight( fw + hds.height() +
- itm->height() * (ns < 6 ? 6 : ns > 10 ? 10 : ns) );
- lv->header()->adjustHeaderSize();
-@@ -818,6 +827,8 @@
- connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(reject()) );
- vbox2->addWidget( btn );
-
-+ dialog.setFixedSize( dialog.sizeHint() );
-+
- int ret = static_cast< LockProcess* >(parent())->execDialog( &dialog );
- if (ret != TQDialog::Rejected) {
- TQDialog::reject();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/lock/lockprocess.cc v3.5.13-sru/kdesktop/lock/lockprocess.cc
---- /tmp/stable//kdebase/kdesktop/lock/lockprocess.cc 2011-10-23 21:47:02.000000000 +0200
-+++ v3.5.13-sru/kdesktop/lock/lockprocess.cc 2012-07-31 17:17:50.000000000 +0200
-@@ -4,7 +4,7 @@
- //
- // Copyright (c) 1999 Martin R. Jones <mjones@kde.org>
- // Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org>
--// Copyright (c) 2010-2011 Timothy Pearson <kb9vqf@pearsoncomputing.net>
-+// Copyright (c) 2010-2012 Timothy Pearson <kb9vqf@pearsoncomputing.net>
- //
-
- //kdesktop keeps running and checks user inactivity
-@@ -111,6 +111,10 @@
- #define LOCK_GRACE_DEFAULT 5000
- #define AUTOLOGOUT_DEFAULT 600
-
-+// Setting this define is INSECURE
-+// Use it for debugging purposes ONLY
-+// #define KEEP_MOUSE_UNGRABBED 1
-+
- // These lines are taken on 10/2009 from X.org (X11/XF86keysym.h), defining some special multimedia keys
- #define XF86XK_AudioMute 0x1008FF12
- #define XF86XK_AudioRaiseVolume 0x1008FF13
-@@ -137,26 +141,27 @@
- bool trinity_desktop_lock_autohide_lockdlg = TRUE;
- bool trinity_desktop_lock_closing_windows = FALSE;
- bool trinity_desktop_lock_in_sec_dlg = FALSE;
-+bool trinity_desktop_hack_active = FALSE;
-
- #define ENABLE_CONTINUOUS_LOCKDLG_DISPLAY \
- if (!mForceContinualLockDisplayTimer->isActive()) mForceContinualLockDisplayTimer->start(100, FALSE); \
--trinity_desktop_lock_autohide_lockdlg = FALSE;
-+trinity_desktop_lock_autohide_lockdlg = FALSE; \
-+mHackDelayStartupTimer->stop();
-
- #define DISABLE_CONTINUOUS_LOCKDLG_DISPLAY \
- mForceContinualLockDisplayTimer->stop(); \
--trinity_desktop_lock_autohide_lockdlg = TRUE;
-+trinity_desktop_lock_autohide_lockdlg = TRUE; \
-+mHackDelayStartupTimer->stop();
-
- //===========================================================================
- //
- // Screen saver handling process. Handles screensaver window,
- // starting screensaver hacks, and password entry.
- //
--LockProcess::LockProcess(bool child, bool useBlankOnly)
-- : TQWidget(0L, "saver window", (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)(WStyle_StaysOnTop|WStyle_Customize|WStyle_NoBorder)):((WFlags)WX11BypassWM))),
-+LockProcess::LockProcess()
-+ : TQWidget(0L, "saver window", ((WFlags)(WStyle_StaysOnTop|WStyle_Customize|WStyle_NoBorder))),
- mOpenGLVisual(0),
-- child_saver(child),
- mParent(0),
-- mUseBlankOnly(useBlankOnly),
- mShowLockDateTime(false),
- mSuspended(false),
- mVisibility(false),
-@@ -173,21 +178,29 @@
- mDialogControlLock(false),
- mForceReject(false),
- currentDialog(NULL),
-+ mEnsureScreenHiddenTimer(NULL),
- mForceContinualLockDisplayTimer(NULL),
- mEnsureVRootWindowSecurityTimer(NULL),
- mHackDelayStartupTimer(NULL),
- mHackDelayStartupTimeout(0),
- mHackStartupEnabled(true),
-+ mResizingDesktopLock(false),
- m_rootPixmap(NULL),
- mBackingStartupDelayTimer(0),
-- m_startupStatusDialog(NULL)
-+ m_startupStatusDialog(NULL),
-+ m_mouseDown(0),
-+ m_mousePrevX(0),
-+ m_mousePrevY(0),
-+ m_dialogPrevX(0),
-+ m_dialogPrevY(0)
- {
-+#ifdef KEEP_MOUSE_UNGRABBED
-+ setNFlags(WX11DisableMove|WX11DisableClose|WX11DisableShade|WX11DisableMinimize|WX11DisableMaximize);
-+#endif
-+
- setupSignals();
- setupPipe();
-
-- mShowLockDateTime = KDesktopSettings::showLockDateTime();
-- mlockDateTime = TQDateTime::currentDateTime();
--
- kapp->installX11EventFilter(this);
-
- mForceContinualLockDisplayTimer = new TQTimer( this );
-@@ -199,8 +212,13 @@
- mEnsureVRootWindowSecurityTimer = new TQTimer( this );
- connect( mEnsureVRootWindowSecurityTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repaintRootWindowIfNeeded()) );
-
-- mHackDelayStartupTimeout = trinity_desktop_lock_delay_screensaver_start?KDesktopSettings::timeout()*1000:10*1000;
-- mHackStartupEnabled = trinity_desktop_lock_delay_screensaver_start?KDesktopSettings::screenSaverEnabled():true;
-+ connect(tqApp, TQT_SIGNAL(mouseInteraction(XEvent *)), TQT_SLOT(slotMouseActivity(XEvent *)));
-+
-+ // Try to get the root pixmap
-+ if (!m_rootPixmap) m_rootPixmap = new KRootPixmap(this);
-+ m_rootPixmap->setCustomPainting(true);
-+ connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotPaintBackground(const TQPixmap &)));
-+ m_rootPixmap->start();
-
- // Get root window size
- XWindowAttributes rootAttr;
-@@ -243,13 +261,11 @@
-
- TQStringList dmopt =
- TQStringList::split(TQChar(','),
-- TQString::tqfromLatin1( ::getenv( "XDM_MANAGED" )));
-+ TQString::fromLatin1( ::getenv( "XDM_MANAGED" )));
- for (TQStringList::ConstIterator it = dmopt.begin(); it != dmopt.end(); ++it)
- if ((*it).startsWith("method="))
- mMethod = (*it).mid(7);
-
-- configure();
--
- #ifdef HAVE_DPMS
- if (mDPMSDepend) {
- BOOL on;
-@@ -266,7 +282,11 @@
- #endif
-
- #if (QT_VERSION-0 >= 0x030200) // XRANDR support
-- connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
-+ connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
-+#endif
-+
-+#ifdef KEEP_MOUSE_UNGRABBED
-+ setEnabled(false);
- #endif
-
- greetPlugin.library = 0;
-@@ -288,6 +308,10 @@
- hackResumeTimer->stop();
- delete hackResumeTimer;
- }
-+ if (mEnsureScreenHiddenTimer != NULL) {
-+ mEnsureScreenHiddenTimer->stop();
-+ delete mEnsureScreenHiddenTimer;
-+ }
- if (mForceContinualLockDisplayTimer != NULL) {
- mForceContinualLockDisplayTimer->stop();
- delete mForceContinualLockDisplayTimer;
-@@ -316,15 +340,36 @@
- mPipeOpen_out = false;
- }
-
-+//---------------------------------------------------------------------------
-+//
-+// Initialization for startup
-+// This is where instance settings should be set--all objects should have already been created in the constructor above
-+//
-+void LockProcess::init(bool child, bool useBlankOnly)
-+{
-+ if (!trinity_desktop_lock_use_system_modal_dialogs) {
-+ setWFlags((WFlags)WX11BypassWM);
-+ }
-+
-+ child_saver = child;
-+ mUseBlankOnly = useBlankOnly;
-+
-+ mShowLockDateTime = KDesktopSettings::showLockDateTime();
-+ mlockDateTime = TQDateTime::currentDateTime();
-+
-+ mHackDelayStartupTimeout = trinity_desktop_lock_delay_screensaver_start?KDesktopSettings::timeout()*1000:10*1000;
-+ mHackStartupEnabled = trinity_desktop_lock_use_system_modal_dialogs?KDesktopSettings::screenSaverEnabled():true;
-+
-+ configure();
-+}
-+
- static int signal_pipe[2];
-
- static void sigterm_handler(int)
- {
- if (!trinity_desktop_lock_in_sec_dlg) {
-- char tmp = 'T';
-- if (::write( signal_pipe[1], &tmp, 1) == -1) {
-- // Error handler to shut up gcc warnings
-- }
-+ // Exit uncleanly
-+ exit(1);
- }
- }
-
-@@ -410,7 +455,7 @@
- if (numread > 0) {
- if (readbuf[0] == 'C') {
- mInfoMessageDisplayed=false;
-- while (mDialogControlLock == true) sleep(1);
-+ while (mDialogControlLock == true) usleep(100000);
- mDialogControlLock = true;
- if (currentDialog != NULL) {
- mForceReject = true;
-@@ -423,7 +468,7 @@
- to_display = to_display.remove(0,1);
- // Lock out password dialogs and close any active dialog
- mInfoMessageDisplayed=true;
-- while (mDialogControlLock == true) sleep(1);
-+ while (mDialogControlLock == true) usleep(100000);
- mDialogControlLock = true;
- if (currentDialog != NULL) {
- mForceReject = true;
-@@ -444,7 +489,7 @@
- to_display = to_display.remove(0,1);
- // Lock out password dialogs and close any active dialog
- mInfoMessageDisplayed=true;
-- while (mDialogControlLock == true) sleep(1);
-+ while (mDialogControlLock == true) usleep(100000);
- mDialogControlLock = true;
- if (currentDialog != NULL) {
- mForceReject = true;
-@@ -468,7 +513,7 @@
- to_display = to_display.remove(0,1);
- // Lock out password dialogs and close any active dialog
- mInfoMessageDisplayed=true;
-- while (mDialogControlLock == true) sleep(1);
-+ while (mDialogControlLock == true) usleep(100000);
- mDialogControlLock = true;
- if (currentDialog != NULL) {
- mForceReject = true;
-@@ -517,7 +562,7 @@
- sigaddset(&(act.sa_mask), SIGQUIT);
- act.sa_flags = 0;
- sigaction(SIGQUIT, &act, 0L);
-- // exit cleanly on SIGTERM
-+ // exit uncleanly on SIGTERM
- act.sa_handler= sigterm_handler;
- sigemptyset(&(act.sa_mask));
- sigaddset(&(act.sa_mask), SIGTERM);
-@@ -627,14 +672,21 @@
- return;
- }
-
-+ setGeometry(0, 0, mRootWidth, mRootHeight);
-+
- int ret;
- SecureDlg inDlg( this );
- inDlg.setRetInt(&ret);
- mBusy = true;
- execDialog( &inDlg );
- mBusy = false;
-+ bool forcecontdisp = mForceContinualLockDisplayTimer->isActive();
-+ if (forcecontdisp) {
-+ DISABLE_CONTINUOUS_LOCKDLG_DISPLAY
-+ }
- trinity_desktop_lock_in_sec_dlg = false;
- if (ret == 0) {
-+ trinity_desktop_lock_closing_windows = 1;
- kapp->quit();
- }
- if (ret == 1) {
-@@ -644,6 +696,9 @@
- // the screensaver kicks in because the user moved the mouse after
- // selecting "lock screen", that looks really untidy.
- mBusy = true;
-+ trinity_desktop_lock_forced = true;
-+ // Make sure the cursor is not showing busy status
-+ setCursor( tqarrowCursor );
- if (startLock())
- {
- if (trinity_desktop_lock_delay_screensaver_start) {
-@@ -652,19 +707,48 @@
- else {
- TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
- }
-+ if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced && trinity_desktop_lock_use_system_modal_dialogs) {
-+ ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-+ if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
-+ }
-+ else {
-+ if (mHackStartupEnabled == true) {
-+ startHack();
-+ }
-+ else {
-+ if (trinity_desktop_lock_use_system_modal_dialogs == true) {
-+ ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-+ if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
-+ }
-+ else {
-+ startHack();
-+ }
-+ }
-+ }
- return;
- }
- stopSaver();
- mBusy = false;
-+ return;
- }
- if (ret == 2) {
-+ trinity_desktop_lock_closing_windows = 1;
- if (system("ksysguard &") == -1) {
- // Error handler to shut up gcc warnings
- }
- kapp->quit();
- }
-+ if (ret == 3) {
-+ trinity_desktop_lock_closing_windows = 1;
-+ DCOPRef("ksmserver","ksmserver").send("logout", (int)KApplication::ShutdownConfirmYes, (int)KApplication::ShutdownTypeNone, (int)KApplication::ShutdownModeInteractive);
-+ kapp->quit();
-+ }
- // FIXME
-- // Handle remaining two cases (logoff menu and switch user)
-+ // Handle remaining case (switch user)
-+ if (forcecontdisp) {
-+ ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-+ if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
-+ }
- stopSaver();
- }
-
-@@ -725,8 +809,13 @@
- if (mPriority > 19) mPriority = 19;
-
- mSaver = KDesktopSettings::saver();
-- if (mSaver.isEmpty() || mUseBlankOnly)
-+ if (mSaver.isEmpty() || mUseBlankOnly) {
- mSaver = "KBlankscreen.desktop";
-+ }
-+ if (KDesktopSettings::screenSaverEnabled() == false) {
-+ mSaver = "";
-+ mSaverExec = "";
-+ }
-
- readSaver();
-
-@@ -869,7 +958,6 @@
- // this is a security risk and has been deactivated--welcome to the 21st century folks!
- // setBackgroundMode(TQWidget::NoBackground);
-
-- setCursor( tqblankCursor );
- setGeometry(0, 0, mRootWidth, mRootHeight);
-
- kdDebug(1204) << "Saver window Id: " << winId() << endl;
-@@ -878,8 +966,10 @@
- void LockProcess::desktopResized()
- {
- mBusy = true;
-- suspend();
-- setCursor( tqblankCursor );
-+ mHackDelayStartupTimer->stop();
-+ stopHack();
-+ DISABLE_CONTINUOUS_LOCKDLG_DISPLAY
-+ mResizingDesktopLock = true;
-
- // Get root window size
- XWindowAttributes rootAttr;
-@@ -887,8 +977,13 @@
- mRootWidth = rootAttr.width;
- mRootHeight = rootAttr.height;
-
-+ // Resize the background widget
- setGeometry(0, 0, mRootWidth, mRootHeight);
-
-+ // Black out the background widget to hide ugly resize tiling artifacts
-+ setBackgroundColor(black);
-+ erase();
-+
- // This slot needs to be able to execute very rapidly so as to prevent the user's desktop from ever
- // being displayed, so we finish the hack restarting/display prettying operations in a separate timed slot
- if (resizeTimer == NULL) {
-@@ -900,20 +995,37 @@
-
- void LockProcess::doDesktopResizeFinish()
- {
-- stopHack();
--
-- while (mDialogControlLock == true) sleep(1);
-- mDialogControlLock = true;
-- if (closeCurrentWindow()) {
-- TQTimer::singleShot( 0, this, SLOT(doDesktopResizeFinish()) );
-- mDialogControlLock = false;
-- }
-- mDialogControlLock = false;
-+ while (mDialogControlLock == true) usleep(100000);
-+ mDialogControlLock = true;
-+ if (closeCurrentWindow()) {
-+ TQTimer::singleShot( 0, this, SLOT(doDesktopResizeFinish()) );
-+ mDialogControlLock = false;
-+ return;
-+ }
-+ mDialogControlLock = false;
-
-- // Restart the hack as the window size is now different
-- startHack();
-+ // Restart the hack as the window size is now different
-+ if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced && trinity_desktop_lock_use_system_modal_dialogs) {
-+ ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-+ if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
-+ }
-+ else {
-+ if (mHackStartupEnabled == true) {
-+ startHack();
-+ }
-+ else {
-+ if (trinity_desktop_lock_use_system_modal_dialogs == true) {
-+ ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-+ if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
-+ }
-+ else {
-+ startHack();
-+ }
-+ }
-+ }
-
-- mBusy = false;
-+ mResizingDesktopLock = false;
-+ mBusy = false;
- }
-
- //---------------------------------------------------------------------------
-@@ -1047,9 +1159,16 @@
- //
- bool LockProcess::grabMouse()
- {
-+ HANDLE cursorHandle;
-+ if (trinity_desktop_hack_active) {
-+ cursorHandle = TQCursor(tqblankCursor).handle();
-+ }
-+ else {
-+ cursorHandle = TQCursor(tqbusyCursor).handle();
-+ }
- int rv = XGrabPointer( qt_xdisplay(), TQApplication::desktop()->winId(),
- True, GRABEVENTS, GrabModeAsync, GrabModeAsync, None,
-- TQCursor(tqblankCursor).handle(), CurrentTime );
-+ cursorHandle, CurrentTime );
-
- return (rv == GrabSuccess);
- }
-@@ -1064,22 +1183,24 @@
-
- if (!grabKeyboard())
- {
-- sleep(1);
-+ usleep(100000);
- if (!grabKeyboard())
- {
- return false;
- }
- }
-
-+#ifndef KEEP_MOUSE_UNGRABBED
- if (!grabMouse())
- {
-- sleep(1);
-+ usleep(100000);
- if (!grabMouse())
- {
- XUngrabKeyboard(qt_xdisplay(), CurrentTime);
- return false;
- }
- }
-+#endif
-
- lockXF86();
-
-@@ -1117,7 +1238,7 @@
- m_grayImage.fill(0); // Set the alpha buffer to 0 (fully transparent)
- m_grayImage.setAlphaBuffer(true);
- TQPixmap m_root;
-- m_root.resize( TQApplication::desktop()->geometry().width(), TQApplication::desktop()->geometry().height() );
-+ m_root.resize(mRootWidth, mRootHeight);
- TQPainter p;
- p.begin( &m_root );
- m_grayImage.setAlphaBuffer(false);
-@@ -1134,24 +1255,31 @@
- createSaverWindow();
- move(0, 0);
- show();
-- setCursor( tqblankCursor );
-
- raise();
- XSync(qt_xdisplay(), False);
- setVRoot( winId(), winId() );
-- if (!(trinity_desktop_lock_delay_screensaver_start && (trinity_desktop_lock_forced || trinity_desktop_lock_in_sec_dlg))) {
-- if (backingPixmap.isNull())
-+ if (((!(trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced)) && (!trinity_desktop_lock_in_sec_dlg)) && mHackStartupEnabled) {
-+ if (backingPixmap.isNull()) {
- setBackgroundColor(black);
-- else
-+ }
-+ else {
- setBackgroundPixmap(backingPixmap);
-+ }
-+ setGeometry(0, 0, mRootWidth, mRootHeight);
- erase();
- }
- if (trinity_desktop_lock_use_system_modal_dialogs) {
- // Try to get the root pixmap
-- m_rootPixmap = new KRootPixmap(this);
-+ if (!m_rootPixmap) m_rootPixmap = new KRootPixmap(this);
- m_rootPixmap->setCustomPainting(true);
-- connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotPaintBackground(const TQPixmap &)));
- m_rootPixmap->start();
-+ // Sometimes KRootPixmap fails...make sure the desktop is hidden regardless
-+ if (!mEnsureScreenHiddenTimer) {
-+ mEnsureScreenHiddenTimer = new TQTimer( this );
-+ connect( mEnsureScreenHiddenTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForcePaintBackground()) );
-+ mEnsureScreenHiddenTimer->start(2000, true);
-+ }
- }
-
- if (trinity_desktop_lock_in_sec_dlg == FALSE) {
-@@ -1160,7 +1288,18 @@
- if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
- }
- else {
-- startHack();
-+ if (mHackStartupEnabled == true) {
-+ startHack();
-+ }
-+ else {
-+ if (trinity_desktop_lock_use_system_modal_dialogs == true) {
-+ ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-+ if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
-+ }
-+ else {
-+ startHack();
-+ }
-+ }
- }
- }
- return true;
-@@ -1194,7 +1333,7 @@
- TQVariant LockProcess::getConf(void *ctx, const char *key, const TQVariant &dflt)
- {
- LockProcess *that = (LockProcess *)ctx;
-- TQString fkey = TQString::tqfromLatin1( key ) + '=';
-+ TQString fkey = TQString::fromLatin1( key ) + '=';
- for (TQStringList::ConstIterator it = that->mPluginOptions.begin();
- it != that->mPluginOptions.end(); ++it)
- if ((*it).startsWith( fkey ))
-@@ -1275,6 +1414,7 @@
- if (!mHackProc.isRunning()) {
- if (backingPixmap.isNull()) {
- setBackgroundColor(black);
-+ setGeometry(0, 0, mRootWidth, mRootHeight);
- erase();
- }
- else {
-@@ -1289,15 +1429,23 @@
-
- bool LockProcess::startHack()
- {
-+ trinity_desktop_hack_active = TRUE;
-+
-+ setCursor( tqblankCursor );
-+ XChangeActivePointerGrab( qt_xdisplay(), GRABEVENTS, TQCursor(tqblankCursor).handle(), CurrentTime);
-+
- if ((mEnsureVRootWindowSecurityTimer) && (!mEnsureVRootWindowSecurityTimer->isActive())) mEnsureVRootWindowSecurityTimer->start(250, FALSE);
-
- if (currentDialog || (!mDialogs.isEmpty()))
- {
- // no resuming with dialog visible or when not visible
-- if (backingPixmap.isNull())
-+ if (backingPixmap.isNull()) {
- setBackgroundColor(black);
-- else
-+ }
-+ else {
- setBackgroundPixmap(backingPixmap);
-+ }
-+ setGeometry(0, 0, mRootWidth, mRootHeight);
- erase();
- return false;
- }
-@@ -1340,10 +1488,13 @@
-
- if (trinity_desktop_lock_use_system_modal_dialogs) {
- // Make sure we have a nice clean display to start with!
-- if (backingPixmap.isNull())
-+ if (backingPixmap.isNull()) {
- setBackgroundColor(black);
-- else
-+ }
-+ else {
- setBackgroundPixmap(backingPixmap);
-+ }
-+ setGeometry(0, 0, mRootWidth, mRootHeight);
- erase();
- mSuspended = false;
- }
-@@ -1355,7 +1506,7 @@
- #endif
- //bitBlt(this, 0, 0, &mOriginal);
- DISABLE_CONTINUOUS_LOCKDLG_DISPLAY
-- if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced) {
-+ if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced) {
- // Close any active dialogs
- if (closeCurrentWindow()) {
- TQTimer::singleShot( 0, this, SLOT(closeCurrentWindow()) );
-@@ -1372,15 +1523,21 @@
- usleep(100);
- TQApplication::syncX();
- if (!trinity_desktop_lock_use_system_modal_dialogs) {
-- if (backingPixmap.isNull())
-+ if (backingPixmap.isNull()) {
- setBackgroundColor(black);
-- else
-+ }
-+ else {
- setBackgroundPixmap(backingPixmap);
-+ }
-+ }
-+ if (backingPixmap.isNull()) {
-+ setGeometry(0, 0, mRootWidth, mRootHeight);
-+ erase();
- }
-- if (backingPixmap.isNull()) erase();
- else bitBlt(this, 0, 0, &backingPixmap);
- if (trinity_desktop_lock_use_system_modal_dialogs) {
- ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-+ if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
- }
- }
- }
-@@ -1400,6 +1557,9 @@
- mHackProc.kill(SIGKILL);
- }
- }
-+ setCursor( tqarrowCursor );
-+
-+ trinity_desktop_hack_active = FALSE;
- }
-
- //---------------------------------------------------------------------------
-@@ -1408,15 +1568,21 @@
- {
- // Hack exited while we're supposed to be saving the screen.
- // Make sure the saver window is black.
-+ trinity_desktop_hack_active = FALSE;
- usleep(100);
- TQApplication::syncX();
- if (!trinity_desktop_lock_use_system_modal_dialogs) {
-- if (backingPixmap.isNull())
-+ if (backingPixmap.isNull()) {
- setBackgroundColor(black);
-- else
-+ }
-+ else {
- setBackgroundPixmap(backingPixmap);
-+ }
-+ }
-+ if (backingPixmap.isNull()) {
-+ setGeometry(0, 0, mRootWidth, mRootHeight);
-+ erase();
- }
-- if (backingPixmap.isNull()) erase();
- else bitBlt(this, 0, 0, &backingPixmap);
- if (!mSuspended) {
- if (trinity_desktop_lock_use_system_modal_dialogs) {
-@@ -1428,17 +1594,22 @@
-
- void LockProcess::displayLockDialogIfNeeded()
- {
-- if (m_startupStatusDialog) { m_startupStatusDialog->closeSMDialog(); m_startupStatusDialog=NULL; }
-- if (trinity_desktop_lock_use_system_modal_dialogs) {
-- if (!mBusy) {
-- mBusy = true;
-- if (mLocked) {
-- if (checkPass()) {
-- stopSaver();
-- kapp->quit();
-+ if (m_startupStatusDialog) {
-+ m_startupStatusDialog->closeSMDialog(); m_startupStatusDialog=NULL;
-+ }
-+ if (!trinity_desktop_lock_in_sec_dlg) {
-+ if (trinity_desktop_lock_use_system_modal_dialogs) {
-+ if (!mBusy) {
-+ mBusy = true;
-+ if (mLocked) {
-+ if (checkPass()) {
-+ trinity_desktop_lock_closing_windows = true;
-+ stopSaver();
-+ kapp->quit();
-+ }
- }
-+ mBusy = false;
- }
-- mBusy = false;
- }
- }
- }
-@@ -1488,10 +1659,13 @@
- }
- if( !force && (!mDialogs.isEmpty() || !mVisibility )) {
- // no resuming with dialog visible or when not visible
-- if (backingPixmap.isNull())
-+ if (backingPixmap.isNull()) {
- setBackgroundColor(black);
-- else
-+ }
-+ else {
- setBackgroundPixmap(backingPixmap);
-+ }
-+ setGeometry(0, 0, mRootWidth, mRootHeight);
- erase();
- return;
- }
-@@ -1525,6 +1699,18 @@
- return 0;
-
- if (trinity_desktop_lock_use_sak) {
-+ // Verify SAK operational status
-+ KProcess* checkSAKProcess = new KProcess;
-+ *checkSAKProcess << "kdmtsak" << "check";
-+ checkSAKProcess->start(KProcess::Block, KProcess::NoCommunication);
-+ int retcode = checkSAKProcess->exitStatus();
-+ delete checkSAKProcess;
-+ if (retcode != 0) {
-+ trinity_desktop_lock_use_sak = false;
-+ }
-+ }
-+
-+ if (trinity_desktop_lock_use_sak) {
- // Wait for SAK press before continuing...
- SAKDlg inDlg( this );
- execDialog( &inDlg );
-@@ -1597,22 +1783,38 @@
- }
- mDialogs.prepend( dlg );
- fakeFocusIn( dlg->winId());
-- if (backingPixmap.isNull() && trinity_desktop_lock_use_system_modal_dialogs) erase();
-+ if (backingPixmap.isNull() && trinity_desktop_lock_use_system_modal_dialogs) {
-+ setGeometry(0, 0, mRootWidth, mRootHeight);
-+ erase();
-+ }
- else bitBlt(this, 0, 0, &backingPixmap);
-+ // dlg->exec may generate BadMatch errors, so make sure they are silently ignored
-+ int (*oldHandler)(Display *, XErrorEvent *);
-+ oldHandler = XSetErrorHandler(ignoreXError);
- int rt = dlg->exec();
-- while (mDialogControlLock == true) sleep(1);
-+ XSetErrorHandler(oldHandler);
-+ while (mDialogControlLock == true) usleep(100000);
- currentDialog = NULL;
- mDialogs.remove( dlg );
- if( mDialogs.isEmpty() ) {
-+ HANDLE cursorHandle;
-+ if (trinity_desktop_hack_active) {
-+ cursorHandle = TQCursor(tqblankCursor).handle();
-+ }
-+ else {
-+ cursorHandle = TQCursor(tqbusyCursor).handle();
-+ }
- XChangeActivePointerGrab( qt_xdisplay(), GRABEVENTS,
-- TQCursor(tqblankCursor).handle(), CurrentTime);
-+ 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()) );
- }
-- hackResumeTimer->start( 10, TRUE );
-+ if (mResizingDesktopLock == false) {
-+ hackResumeTimer->start( 10, TRUE );
-+ }
- }
- else {
- resume( false );
-@@ -1624,8 +1826,24 @@
- return rt;
- }
-
-+void LockProcess::slotForcePaintBackground()
-+{
-+ TQPixmap blankPixmap(mRootWidth, mRootHeight);
-+ blankPixmap.fill(Qt::black);
-+ slotPaintBackground(blankPixmap);
-+ printf("[WARNING] Unable to obtain desktop wallpaper in a timely manner. High system load or possibly a TDE bug!\n\r"); fflush(stdout);
-+}
-+
- void LockProcess::slotPaintBackground(const TQPixmap &rpm)
- {
-+ if (mEnsureScreenHiddenTimer) {
-+ mEnsureScreenHiddenTimer->stop();
-+ }
-+ else {
-+ mEnsureScreenHiddenTimer = new TQTimer( this );
-+ connect( mEnsureScreenHiddenTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForcePaintBackground()) );
-+ }
-+
- TQPixmap pm = rpm;
-
- if (TQPaintDevice::x11AppDepth() == 32) {
-@@ -1650,8 +1868,9 @@
- }
-
- backingPixmap = pm;
-- if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced) {
-+ if ((trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced) || (!mHackStartupEnabled)) {
- setBackgroundPixmap(backingPixmap);
-+ setGeometry(0, 0, mRootWidth, mRootHeight);
- erase();
- }
- }
-@@ -1677,13 +1896,12 @@
- mBusy=true;
- TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
- if (mkeyCode == XKeysymToKeycode(qt_xdisplay(), XF86XK_Display)) {
-- while (mDialogControlLock == true) sleep(1);
-+ while (mDialogControlLock == true) usleep(100000);
- mDialogControlLock = true;
- currentDialog->close(); // DO NOT use closeCurrentWindow() here!
- mDialogControlLock = false;
- }
- }
-- setCursor( tqblankCursor );
-
- DCOPRef ref( "*", "MainApplication-Interface");
- ref.send("sendFakeKey", DCOPArg(mkeyCode , "unsigned int"));
-@@ -1748,6 +1966,7 @@
- else {
- if (!mLocked || checkPass())
- {
-+ trinity_desktop_lock_closing_windows = true;
- stopSaver();
- kapp->quit();
- }
-@@ -1770,7 +1989,26 @@
- else
- {
- mSuspendTimer.stop();
-- resume( false );
-+ if (mResizingDesktopLock == false) {
-+ if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced && trinity_desktop_lock_use_system_modal_dialogs) {
-+ ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-+ if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
-+ }
-+ else {
-+ if (mHackStartupEnabled == true) {
-+ resume( false );
-+ }
-+ else {
-+ if (trinity_desktop_lock_use_system_modal_dialogs == true) {
-+ ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-+ if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
-+ }
-+ else {
-+ resume( false );
-+ }
-+ }
-+ }
-+ }
- }
- if (event->xvisibility.state != VisibilityUnobscured)
- stayOnTop();
-@@ -1870,7 +2108,9 @@
- suspend();
- } else if ( mSuspended )
- {
-- resume( true );
-+ if (mResizingDesktopLock == false) {
-+ resume( true );
-+ }
- }
- #endif
- }
-@@ -1931,7 +2171,7 @@
- TQLabel *label2 = new TQLabel( txt, winFrame );
- KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
- button->setDefault( true );
-- button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
-+ button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
- connect( button, TQT_SIGNAL( clicked() ), &box, TQT_SLOT( accept() ) );
-
- TQVBoxLayout *vbox = new TQVBoxLayout( &box );
-@@ -1983,7 +2223,12 @@
-
- void LockProcess::windowAdded( WId w, bool managed )
- {
-+ // KWin::windowInfo may generate BadWindow errors, so make sure they are silently ignored
-+ int (*oldHandler)(Display *, XErrorEvent *);
-+ oldHandler = XSetErrorHandler(ignoreXError);
- KWin::WindowInfo info = KWin::windowInfo( w, 0, NET::WM2WindowClass );
-+ XSetErrorHandler(oldHandler);
-+
- if( info.windowClassClass().lower() != "xvkbd" )
- return;
- // Unmanaged windows (i.e. popups) don't currently work anyway, since they
-@@ -2140,4 +2385,64 @@
- }
- }
-
-+void LockProcess::slotMouseActivity(XEvent *event)
-+{
-+ bool inFrame = 0;
-+ bool inDialog = 0;
-+ XButtonEvent *be = (XButtonEvent *) event;
-+ XMotionEvent *me = (XMotionEvent *) event;
-+ if ((event->type == ButtonPress) && (mDialogs.first())) {
-+ // Get geometry including window frame/titlebar
-+ TQRect fgeom = mDialogs.first()->frameGeometry();
-+ TQRect wgeom = mDialogs.first()->geometry();
-+
-+ if (((be->x_root > fgeom.x()) && (be->y_root > fgeom.y())) && ((be->x_root < (fgeom.x()+fgeom.width())) && (be->y_root < (fgeom.y()+fgeom.height())))) {
-+ inFrame = 1;
-+ }
-+ if (((be->x_root > wgeom.x()) && (be->y_root > wgeom.y())) && ((be->x_root < (wgeom.x()+wgeom.width())) && (be->y_root < (wgeom.y()+wgeom.height())))) {
-+ inDialog = 1;
-+ }
-+
-+ // Clicked inside dialog; set focus
-+ if (inFrame == TRUE) {
-+ WId window = mDialogs.first()->winId();
-+ XSetInputFocus(qt_xdisplay(), window, RevertToParent, CurrentTime);
-+ fakeFocusIn(window);
-+ // Why this needs to be repeated I have no idea...
-+ XSetInputFocus(qt_xdisplay(), window, RevertToParent, CurrentTime);
-+ fakeFocusIn(window);
-+ }
-+
-+ // Clicked inside window handle (or border); drag window
-+ if ((inFrame == TRUE) && (inDialog == FALSE)) {
-+ TQPoint oldPoint = mDialogs.first()->pos();
-+ m_mouseDown = 1;
-+ m_dialogPrevX = oldPoint.x();
-+ m_dialogPrevY = oldPoint.y();
-+ m_mousePrevX = be->x_root;
-+ m_mousePrevY = be->y_root;
-+ XChangeActivePointerGrab( qt_xdisplay(), GRABEVENTS, TQCursor(tqsizeAllCursor).handle(), CurrentTime);
-+ }
-+ }
-+
-+ // Drag the window...
-+ if (event->type == MotionNotify) {
-+ if (m_mouseDown == TRUE) {
-+ int deltaX = me->x_root - m_mousePrevX;
-+ int deltaY = me->y_root - m_mousePrevY;
-+ m_dialogPrevX = m_dialogPrevX + deltaX;
-+ m_dialogPrevY = m_dialogPrevY + deltaY;
-+ if (mDialogs.first()) mDialogs.first()->move(m_dialogPrevX, m_dialogPrevY);
-+
-+ m_mousePrevX = me->x_root;
-+ m_mousePrevY = me->y_root;
-+ }
-+ }
-+
-+ if (event->type == ButtonRelease) {
-+ m_mouseDown = 0;
-+ XChangeActivePointerGrab( qt_xdisplay(), GRABEVENTS, TQCursor(tqarrowCursor).handle(), CurrentTime);
-+ }
-+}
-+
- #include "lockprocess.moc"
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/lock/lockprocess.h v3.5.13-sru/kdesktop/lock/lockprocess.h
---- /tmp/stable//kdebase/kdesktop/lock/lockprocess.h 2011-10-23 21:47:02.000000000 +0200
-+++ v3.5.13-sru/kdesktop/lock/lockprocess.h 2012-07-31 17:17:50.000000000 +0200
-@@ -48,9 +48,11 @@
- {
- Q_OBJECT
- public:
-- LockProcess(bool child_saver = false, bool useBlankOnly = false);
-+ LockProcess();
- ~LockProcess();
-
-+ void init(bool child_saver = false, bool useBlankOnly = false);
-+
- bool lock();
-
- bool defaultSave();
-@@ -74,6 +76,7 @@
- void doDesktopResizeFinish();
- void doFunctionKeyBroadcast();
- void slotPaintBackground(const TQPixmap &pm);
-+ void slotForcePaintBackground();
-
- protected:
- virtual bool x11Event(XEvent *);
-@@ -93,6 +96,7 @@
- bool closeCurrentWindow();
- void repaintRootWindowIfNeeded();
- void startSecureDialog();
-+ void slotMouseActivity(XEvent *event);
-
- private:
- void configure();
-@@ -166,7 +170,7 @@
- struct VkbdWindow
- {
- WId id;
-- QRect rect;
-+ TQRect rect;
- };
- TQValueList< VkbdWindow > mVkbdWindows;
- WId mVkbdLastEventWindow;
-@@ -181,12 +185,14 @@
- bool mForceReject;
- TQDialog *currentDialog;
-
-+ TQTimer* mEnsureScreenHiddenTimer;
- TQTimer* mForceContinualLockDisplayTimer;
- TQTimer* mEnsureVRootWindowSecurityTimer;
- TQTimer* mHackDelayStartupTimer;
-
- int mHackDelayStartupTimeout;
- bool mHackStartupEnabled;
-+ bool mResizingDesktopLock;
-
- TQPixmap backingPixmap;
- KRootPixmap *m_rootPixmap;
-@@ -195,6 +201,12 @@
- KSMModalDialog* m_startupStatusDialog;
-
- TQDateTime mlockDateTime;
-+
-+ bool m_mouseDown;
-+ int m_mousePrevX;
-+ int m_mousePrevY;
-+ int m_dialogPrevX;
-+ int m_dialogPrevY;
- };
-
- #endif
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/lock/main.cc v3.5.13-sru/kdesktop/lock/main.cc
---- /tmp/stable//kdebase/kdesktop/lock/main.cc 2011-09-16 04:01:44.000000000 +0200
-+++ v3.5.13-sru/kdesktop/lock/main.cc 2012-07-31 17:17:50.000000000 +0200
-@@ -1,6 +1,7 @@
- /* This file is part of the KDE project
- Copyright (C) 1999 David Faure
- Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org>
-+ Copyright (c) 2010-2012 Timothy Pearson <kb9vqf@pearsoncomputing.net>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
-@@ -28,6 +29,7 @@
- #include <kdebug.h>
- #include <kglobalsettings.h>
- #include <dcopref.h>
-+#include <ksimpleconfig.h>
-
- #include <kdmtsak.h>
-
-@@ -36,6 +38,15 @@
- #include <X11/Xlib.h>
- #include <fixx11h.h>
-
-+#define OPEN_TDMCONFIG_AND_SET_GROUP \
-+if( stat( KDE_CONFDIR "/kdm/kdmdistrc" , &st ) == 0) { \
-+ tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" )); \
-+} \
-+else { \
-+ tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); \
-+} \
-+tdmconfig->setGroup("X-*-Greeter");
-+
- // [FIXME] Add GUI configuration checkboxes for these three settings (see kdesktoprc [ScreenSaver] UseUnmanagedLockWindows, DelaySaverStart, and UseTDESAK)
- bool trinity_desktop_lock_use_system_modal_dialogs = FALSE;
- bool trinity_desktop_lock_delay_screensaver_start = FALSE;
-@@ -43,10 +54,21 @@
-
- bool trinity_desktop_lock_forced = FALSE;
-
-+bool signalled_forcelock;
-+bool signalled_dontlock;
-+bool signalled_securedialog;
-+bool signalled_blank;
-+bool signalled_run;
-+bool in_internal_mode = FALSE;
-+
- bool MyApp::x11EventFilter( XEvent *ev )
- {
-- if (ev->type == XKeyPress || ev->type == ButtonPress)
-+ if (ev->type == ButtonPress || ev->type == ButtonRelease || ev->type == MotionNotify) {
-+ emit mouseInteraction(ev);
-+ }
-+ if (ev->type == XKeyPress || ev->type == ButtonPress) {
- emit activity();
-+ }
- else if (ev->type == MotionNotify) {
- time_t tick = time( 0 );
- if (tick != lastTick) {
-@@ -64,140 +86,266 @@
- { "dontlock", I18N_NOOP("Only start screensaver"), 0 },
- { "securedialog", I18N_NOOP("Launch the secure dialog"), 0 },
- { "blank", I18N_NOOP("Only use the blank screensaver"), 0 },
-+ { "internal <pid>", I18N_NOOP("TDE internal command for background process loading"), 0 },
- KCmdLineLastOption
- };
-
-+static void sigusr1_handler(int)
-+{
-+ signalled_forcelock = TRUE;
-+}
-+
-+static void sigusr2_handler(int)
-+{
-+ signalled_dontlock = TRUE;
-+}
-+
-+static void sigusr3_handler(int)
-+{
-+ signalled_securedialog = TRUE;
-+}
-+
-+static void sigusr4_handler(int)
-+{
-+ signalled_blank = TRUE;
-+}
-+
-+static void sigusr5_handler(int)
-+{
-+ signalled_run = TRUE;
-+}
-+
- // -----------------------------------------------------------------------------
-
- int main( int argc, char **argv )
- {
- KLocale::setMainCatalogue("kdesktop");
-
-- KCmdLineArgs::init( argc, argv, "kdesktop_lock", I18N_NOOP("KDesktop Locker"), I18N_NOOP("Session Locker for KDesktop"), "2.0" );
-+ KCmdLineArgs::init( argc, argv, "kdesktop_lock", I18N_NOOP("KDesktop Locker"), I18N_NOOP("Session Locker for KDesktop"), "2.1" );
- KCmdLineArgs::addCmdLineOptions( options );
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-- if (args->isSet( "forcelock" ))
-- trinity_desktop_lock_forced = TRUE;
--
- putenv(strdup("SESSION_MANAGER="));
-
- KApplication::disableAutoDcopRegistration(); // not needed
-
-- int kdesktop_screen_number = 0;
-- int starting_screen = 0;
-+ while (1 == 1) {
-+ signalled_forcelock = FALSE;
-+ signalled_dontlock = FALSE;
-+ signalled_securedialog = FALSE;
-+ signalled_blank = FALSE;
-+ signalled_run = FALSE;
-+
-+ int kdesktop_screen_number = 0;
-+ int starting_screen = 0;
-+
-+ bool child = false;
-+ int parent_connection = 0; // socket to the parent saver
-+ TQValueList<int> child_sockets;
-+
-+ if (KGlobalSettings::isMultiHead())
-+ {
-+ Display *dpy = XOpenDisplay(NULL);
-+ if (! dpy) {
-+ fprintf(stderr,
-+ "%s: FATAL ERROR: couldn't open display '%s'\n",
-+ argv[0], XDisplayName(NULL));
-+ exit(1);
-+ }
-
-- bool child = false;
-- int parent_connection = 0; // socket to the parent saver
-- TQValueList<int> child_sockets;
--
-- if (KGlobalSettings::isMultiHead())
-- {
-- Display *dpy = XOpenDisplay(NULL);
-- if (! dpy) {
-- fprintf(stderr,
-- "%s: FATAL ERROR: couldn't open display '%s'\n",
-- argv[0], XDisplayName(NULL));
-- exit(1);
-- }
--
-- int number_of_screens = ScreenCount(dpy);
-- starting_screen = kdesktop_screen_number = DefaultScreen(dpy);
-- int pos;
-- TQCString display_name = XDisplayString(dpy);
-- XCloseDisplay(dpy);
-- kdDebug() << "screen " << number_of_screens << " " << kdesktop_screen_number << " " << display_name << " " << starting_screen << endl;
-- dpy = 0;
--
-- if ((pos = display_name.findRev('.')) != -1)
-- display_name.remove(pos, 10);
--
-- TQCString env;
-- if (number_of_screens != 1) {
-- for (int i = 0; i < number_of_screens; i++) {
-- if (i != starting_screen) {
-- int fd[2];
-- if (pipe(fd)) {
-- perror("pipe");
-- break;
-- }
-- if (fork() == 0) {
-- child = true;
-- kdesktop_screen_number = i;
-- parent_connection = fd[0];
-- // break here because we are the child process, we don't
-- // want to fork() anymore
-- break;
-- } else {
-- child_sockets.append(fd[1]);
-+ int number_of_screens = ScreenCount(dpy);
-+ starting_screen = kdesktop_screen_number = DefaultScreen(dpy);
-+ int pos;
-+ TQCString display_name = XDisplayString(dpy);
-+ XCloseDisplay(dpy);
-+ kdDebug() << "screen " << number_of_screens << " " << kdesktop_screen_number << " " << display_name << " " << starting_screen << endl;
-+ dpy = 0;
-+
-+ if ((pos = display_name.findRev('.')) != -1)
-+ display_name.remove(pos, 10);
-+
-+ TQCString env;
-+ if (number_of_screens != 1) {
-+ for (int i = 0; i < number_of_screens; i++) {
-+ if (i != starting_screen) {
-+ int fd[2];
-+ if (pipe(fd)) {
-+ perror("pipe");
-+ break;
-+ }
-+ if (fork() == 0) {
-+ child = true;
-+ kdesktop_screen_number = i;
-+ parent_connection = fd[0];
-+ // break here because we are the child process, we don't
-+ // want to fork() anymore
-+ break;
-+ } else {
-+ child_sockets.append(fd[1]);
-+ }
- }
- }
-+
-+ env.sprintf("DISPLAY=%s.%d", display_name.data(),
-+ kdesktop_screen_number);
-+ kdDebug() << "env " << env << endl;
-+
-+ if (putenv(strdup(env.data()))) {
-+ fprintf(stderr,
-+ "%s: WARNING: unable to set DISPLAY environment variable\n",
-+ argv[0]);
-+ perror("putenv()");
-+ }
- }
-+ }
-
-- env.sprintf("DISPLAY=%s.%d", display_name.data(),
-- kdesktop_screen_number);
-- kdDebug() << "env " << env << endl;
-+ MyApp app;
-+ kdDebug() << "app " << kdesktop_screen_number << " " << starting_screen << " " << child << " " << child_sockets.count() << " " << parent_connection << endl;
-+ app.disableSessionManagement();
-+ KGlobal::locale()->insertCatalogue("libdmctl");
-+
-+ struct stat st;
-+ KSimpleConfig* tdmconfig;
-+ OPEN_TDMCONFIG_AND_SET_GROUP
-+ trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true);
-+
-+ LockProcess process;
-+
-+ // Start loading core functions, such as the desktop wallpaper interface
-+ app.processEvents();
-+
-+ if (args->isSet( "internal" )) {
-+ while (signalled_run == FALSE) {
-+ sigset_t new_mask;
-+ struct sigaction act;
-+
-+ in_internal_mode = TRUE;
-+
-+ // handle SIGUSR1
-+ act.sa_handler= sigusr1_handler;
-+ sigemptyset(&(act.sa_mask));
-+ sigaddset(&(act.sa_mask), SIGUSR1);
-+ act.sa_flags = 0;
-+ sigaction(SIGUSR1, &act, 0L);
-+ // handle SIGUSR2
-+ act.sa_handler= sigusr2_handler;
-+ sigemptyset(&(act.sa_mask));
-+ sigaddset(&(act.sa_mask), SIGUSR2);
-+ act.sa_flags = 0;
-+ sigaction(SIGUSR2, &act, 0L);
-+ // handle SIGWINCH (an ersatz SIGUSR3)
-+ act.sa_handler= sigusr3_handler;
-+ sigemptyset(&(act.sa_mask));
-+ sigaddset(&(act.sa_mask), SIGWINCH);
-+ act.sa_flags = 0;
-+ sigaction(SIGWINCH, &act, 0L);
-+ // handle SIGTTIN (an ersatz SIGUSR4)
-+ act.sa_handler= sigusr4_handler;
-+ sigemptyset(&(act.sa_mask));
-+ sigaddset(&(act.sa_mask), SIGTTIN);
-+ act.sa_flags = 0;
-+ sigaction(SIGTTIN, &act, 0L);
-+ // handle SIGTTOU (an ersatz SIGUSR5)
-+ act.sa_handler= sigusr5_handler;
-+ sigemptyset(&(act.sa_mask));
-+ sigaddset(&(act.sa_mask), SIGTTOU);
-+ act.sa_flags = 0;
-+ sigaction(SIGTTOU, &act, 0L);
-+
-+ // initialize the signal masks
-+ sigfillset(&new_mask);
-+ sigdelset(&new_mask,SIGUSR1);
-+ sigdelset(&new_mask,SIGUSR2);
-+ sigdelset(&new_mask,SIGWINCH);
-+ sigdelset(&new_mask,SIGTTIN);
-+ sigdelset(&new_mask,SIGTTOU);
-
-- if (putenv(strdup(env.data()))) {
-- fprintf(stderr,
-- "%s: WARNING: unable to set DISPLAY environment variable\n",
-- argv[0]);
-- perror("putenv()");
-+ // wait for SIGUSR1, SIGUSR2, SIGWINCH, SIGTTIN, or SIGTTOU
-+ sigsuspend(&new_mask);
- }
- }
-- }
-
-- MyApp app;
-- kdDebug() << "app " << kdesktop_screen_number << " " << starting_screen << " " << child << " " << child_sockets.count() << " " << parent_connection << endl;
-- app.disableSessionManagement();
-- KGlobal::locale()->insertCatalogue("libdmctl");
--
-- // we need to read from the right rc file - possibly taking screen number in account
-- KDesktopSettings::instance("kdesktoprc");
--
-- trinity_desktop_lock_use_system_modal_dialogs = !KDesktopSettings::useUnmanagedLockWindows();
-- trinity_desktop_lock_delay_screensaver_start = KDesktopSettings::delaySaverStart();
-- trinity_desktop_lock_use_sak = KDesktopSettings::useTDESAK();
--
-- LockProcess process(child, args->isSet( "blank" ));
-- if (!child)
-- process.setChildren(child_sockets);
-- else
-- process.setParent(parent_connection);
--
-- bool rt;
-- bool sig = false;
-- if( !child && args->isSet( "forcelock" ))
-- {
-- rt = process.lock();
-- sig = true;
-- }
-- else if( child || args->isSet( "dontlock" )) {
-- rt = process.dontLock();
-- }
-- else if( child || args->isSet( "securedialog" )) {
-- int retcode = tde_sak_verify_calling_process();
-- if (retcode == 0) {
-- rt = process.runSecureDialog();
-+ // load settings here so that they actually reflect reality
-+ // there is no way to force a reload once KDesktopSettings::instance has been called!
-+ // we need to read from the right rc file - possibly taking screen number in account
-+ KDesktopSettings::instance("kdesktoprc");
-+ trinity_desktop_lock_use_system_modal_dialogs = !KDesktopSettings::useUnmanagedLockWindows();
-+ trinity_desktop_lock_delay_screensaver_start = KDesktopSettings::delaySaverStart();
-+ if (trinity_desktop_lock_use_system_modal_dialogs) {
-+ trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true);
- }
- else {
-- return 1;
-+ trinity_desktop_lock_use_sak = false; // If SAK is enabled with unmanaged windows, the SAK dialog will never close and will "burn in" the screen
-+ trinity_desktop_lock_delay_screensaver_start = false; // If trinity_desktop_lock_delay_screensaver_start is true with unmanaged windows, the lock dialog may never appear
- }
-- }
-- else {
-- rt = process.defaultSave();
-- }
-- if (!rt) {
-- return 1;
-- }
-
-- if( sig )
-- {
-- DCOPRef ref( "kdesktop", "KScreensaverIface");
-- ref.send( "saverLockReady" );
-- }
-+ delete tdmconfig;
-+
-+ if (args->isSet( "forcelock" ) || (signalled_forcelock == TRUE)) {
-+ trinity_desktop_lock_forced = TRUE;
-+ }
-
-- return app.exec();
-+ process.init(child, (args->isSet( "blank" ) || (signalled_blank == TRUE)));
-+ if (!child) {
-+ process.setChildren(child_sockets);
-+ }
-+ else {
-+ process.setParent(parent_connection);
-+ }
-+
-+ bool rt;
-+ bool sig = false;
-+ if( (((!child) && (args->isSet( "forcelock" ))) || (signalled_forcelock == TRUE))) {
-+ rt = process.lock();
-+ sig = true;
-+ }
-+ else if( child || (args->isSet( "dontlock" ) || (signalled_dontlock == TRUE))) {
-+ rt = process.dontLock();
-+ }
-+ else if( child || (args->isSet( "securedialog" ) || (signalled_securedialog == TRUE))) {
-+ int retcode = tde_sak_verify_calling_process();
-+ if (retcode == 0) {
-+ rt = process.runSecureDialog();
-+ }
-+ else {
-+ return 1;
-+ }
-+ }
-+ else {
-+ rt = process.defaultSave();
-+ }
-+ if (!rt) {
-+ return 0;
-+ }
-+
-+ if( sig )
-+ {
-+ DCOPRef ref( "kdesktop", "KScreensaverIface");
-+ ref.send( "saverLockReady" );
-+ }
-+
-+ if (in_internal_mode == FALSE) {
-+ return app.exec();
-+ }
-+ else {
-+ pid_t kdesktop_pid = atoi(args->getOption( "internal" ));
-+ if (kill(kdesktop_pid, SIGUSR2) < 0) {
-+ // The controlling kdesktop process probably died. Commit suicide...
-+ return 12;
-+ }
-+ app.exec();
-+ if (kill(kdesktop_pid, SIGUSR1) < 0) {
-+ // The controlling kdesktop process probably died. Commit suicide...
-+ return 12;
-+ }
-+
-+ // FIXME
-+ // We should not have to return (restart) at all,
-+ // but it seems that some X11 connections are left active,
-+ // preventing the lock process from restarting properly in the while() loop above.
-+ return 0;
-+ }
-+ }
- }
-
- #include "main.moc"
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/lock/main.h v3.5.13-sru/kdesktop/lock/main.h
---- /tmp/stable//kdebase/kdesktop/lock/main.h 2010-08-12 05:29:22.000000000 +0200
-+++ v3.5.13-sru/kdesktop/lock/main.h 2012-07-31 17:17:50.000000000 +0200
-@@ -32,6 +32,7 @@
- bool x11EventFilter( XEvent * );
- signals:
- void activity();
-+ void mouseInteraction(XEvent *event);
- private:
- time_t lastTick;
- };
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/lock/querydlg.cc v3.5.13-sru/kdesktop/lock/querydlg.cc
---- /tmp/stable//kdebase/kdesktop/lock/querydlg.cc 2011-09-14 07:31:14.000000000 +0200
-+++ v3.5.13-sru/kdesktop/lock/querydlg.cc 2012-07-31 17:17:50.000000000 +0200
-@@ -86,8 +86,8 @@
- KUser user;
-
- mStatusLabel = new TQLabel( "<b> </b>", frame );
-- //mStatusLabel->tqsetAlignment( TQLabel::AlignCenter );
-- mStatusLabel->tqsetAlignment( TQLabel::AlignLeft );
-+ //mStatusLabel->setAlignment( TQLabel::AlignCenter );
-+ mStatusLabel->setAlignment( TQLabel::AlignLeft );
-
- KSeparator *sep = new KSeparator( KSeparator::HLine, frame );
-
-@@ -118,6 +118,7 @@
- connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK()));
-
- installEventFilter(this);
-+ setFixedSize( sizeHint() );
- }
-
- QueryDlg::~QueryDlg()
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/lock/sakdlg.cc v3.5.13-sru/kdesktop/lock/sakdlg.cc
---- /tmp/stable//kdebase/kdesktop/lock/sakdlg.cc 2011-09-16 04:01:44.000000000 +0200
-+++ v3.5.13-sru/kdesktop/lock/sakdlg.cc 2012-07-31 17:17:50.000000000 +0200
-@@ -87,7 +87,7 @@
- KUser user;
-
- mStatusLabel = new TQLabel( "<b> </b>", frame );
-- mStatusLabel->tqsetAlignment( TQLabel::AlignVCenter );
-+ mStatusLabel->setAlignment( TQLabel::AlignVCenter );
-
- TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
- unlockDialogLayout->addWidget( frame );
-@@ -102,6 +102,7 @@
- mStatusLabel->setText("<b>" + i18n("Press Ctrl+Alt+Del to begin.") + "</b><p>" + i18n("This process helps keep your password secure.") + "<br>" + i18n("It prevents unauthorized users from emulating the login screen."));
-
- installEventFilter(this);
-+ setFixedSize( sizeHint() );
-
- mSAKProcess = new KProcess;
- *mSAKProcess << "kdmtsak";
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/lock/securedlg.cc v3.5.13-sru/kdesktop/lock/securedlg.cc
---- /tmp/stable//kdebase/kdesktop/lock/securedlg.cc 2011-09-18 10:01:59.000000000 +0200
-+++ v3.5.13-sru/kdesktop/lock/securedlg.cc 2012-07-31 17:17:50.000000000 +0200
-@@ -87,7 +87,16 @@
- KUser user;
-
- mLogonStatus = new TQLabel( frame );
-- mLogonStatus->setText(i18n("'%1' is currently logged on").arg( user.fullName() ));
-+ TQString userString = user.fullName();
-+ if (userString == "") {
-+ userString = user.loginName();
-+ }
-+ if (userString != "") {
-+ mLogonStatus->setText(i18n("'%1' is currently logged on").arg( user.fullName() ));
-+ }
-+ else {
-+ mLogonStatus->setText(i18n("You are currently logged on")); // We should never get here, and this message is somewhat obtuse, but it is better than displaying two qotation marks with no text between them...
-+ }
-
- KSeparator *sep = new KSeparator( KSeparator::HLine, frame );
-
-@@ -97,12 +106,11 @@
- mTaskButton = new TQPushButton( frame );
- mTaskButton->setText(i18n("Task Manager"));
-
-- mCancelButton = new TQPushButton( frame );
-- mCancelButton->setText(i18n("Cancel"));
--
- mShutdownButton = new TQPushButton( frame );
- mShutdownButton->setText(i18n("Logoff Menu"));
-- mShutdownButton->setEnabled(false); // FIXME
-+
-+ mCancelButton = new TQPushButton( frame );
-+ mCancelButton->setText(i18n("Cancel"));
-
- mSwitchButton = new TQPushButton( frame );
- mSwitchButton->setText(i18n("Switch User"));
-@@ -144,6 +152,7 @@
- mSwitchButton->setFixedWidth(btnSize);
-
- installEventFilter(this);
-+ setFixedSize( sizeHint() );
- }
-
- SecureDlg::~SecureDlg()
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/lockeng.cc v3.5.13-sru/kdesktop/lockeng.cc
---- /tmp/stable//kdebase/kdesktop/lockeng.cc 2011-09-23 06:06:43.000000000 +0200
-+++ v3.5.13-sru/kdesktop/lockeng.cc 2012-07-31 17:17:50.000000000 +0200
-@@ -1,8 +1,9 @@
- //===========================================================================
- //
--// This file is part of the KDE project
-+// This file is part of the TDE project
- //
- // Copyright (c) 1999 Martin R. Jones <mjones@kde.org>
-+// Copyright (c) 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net>
- //
-
-
-@@ -29,6 +30,20 @@
-
- bool trinity_lockeng_sak_available = TRUE;
-
-+SaverEngine* m_masterSaverEngine = NULL;
-+static void sigusr1_handler(int)
-+{
-+ if (m_masterSaverEngine) {
-+ m_masterSaverEngine->slotLockProcessWaiting();
-+ }
-+}
-+static void sigusr2_handler(int)
-+{
-+ if (m_masterSaverEngine) {
-+ m_masterSaverEngine->slotLockProcessFullyActivated();
-+ }
-+}
-+
- //===========================================================================
- //
- // Screen saver engine. Doesn't handle the actual screensaver window,
-@@ -36,11 +51,30 @@
- // a newly started process.
- //
- SaverEngine::SaverEngine()
-- : KScreensaverIface(),
-- TQWidget(),
-+ : TQWidget(),
-+ KScreensaverIface(),
- mBlankOnly(false),
-- mSAKProcess(NULL)
-+ mSAKProcess(NULL),
-+ mTerminationRequested(false)
- {
-+ struct sigaction act;
-+
-+ // handle SIGUSR1
-+ m_masterSaverEngine = this;
-+ act.sa_handler= sigusr1_handler;
-+ sigemptyset(&(act.sa_mask));
-+ sigaddset(&(act.sa_mask), SIGUSR1);
-+ act.sa_flags = 0;
-+ sigaction(SIGUSR1, &act, 0L);
-+
-+ // handle SIGUSR2
-+ m_masterSaverEngine = this;
-+ act.sa_handler= sigusr2_handler;
-+ sigemptyset(&(act.sa_mask));
-+ sigaddset(&(act.sa_mask), SIGUSR2);
-+ act.sa_flags = 0;
-+ sigaction(SIGUSR2, &act, 0L);
-+
- // Save X screensaver parameters
- XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval,
- &mXBlanking, &mXExposures);
-@@ -59,6 +93,19 @@
- TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) );
-
- configure();
-+
-+ mLockProcess.clearArguments();
-+ TQString path = KStandardDirs::findExe( "kdesktop_lock" );
-+ if( path.isEmpty())
-+ {
-+ kdDebug( 1204 ) << "Can't find kdesktop_lock!" << endl;
-+ }
-+ mLockProcess << path;
-+ mLockProcess << TQString( "--internal" ) << TQString( "%1" ).arg(getpid());
-+ if (mLockProcess.start() == false )
-+ {
-+ kdDebug( 1204 ) << "Failed to start kdesktop_lock!" << endl;
-+ }
- }
-
- //---------------------------------------------------------------------------
-@@ -67,6 +114,10 @@
- //
- SaverEngine::~SaverEngine()
- {
-+ if (mState == Waiting) {
-+ kill(mLockProcess.pid(), SIGKILL);
-+ }
-+
- mLockProcess.detach(); // don't kill it if we crash
- delete mXAutoLock;
-
-@@ -81,13 +132,13 @@
- void SaverEngine::lock()
- {
- bool ok = true;
-- if (mState == Waiting)
-+ if (mState != Saving)
- {
- mSAKProcess->kill(SIGTERM);
- ok = startLockProcess( ForceLock );
--// It takes a while for kdesktop_lock to start and lock the screen.
--// Therefore delay the DCOP call until it tells kdesktop that the locking is in effect.
--// This is done only for --forcelock .
-+ // It takes a while for kdesktop_lock to start and lock the screen.
-+ // Therefore delay the DCOP call until it tells kdesktop that the locking is in effect.
-+ // This is done only for --forcelock .
- if( ok && mState != Saving )
- {
- DCOPClientTransaction* trans = kapp->dcopClient()->beginTransaction();
-@@ -200,6 +251,27 @@
- return (mState != Waiting);
- }
-
-+void SaverEngine::enableExports()
-+{
-+#ifdef Q_WS_X11
-+ kdDebug(270) << k_lineinfo << "activating background exports.\n";
-+ DCOPClient *client = kapp->dcopClient();
-+ if (!client->isAttached()) {
-+ client->attach();
-+ }
-+ TQByteArray data;
-+ TQDataStream args( data, IO_WriteOnly );
-+ args << 1;
-+
-+ TQCString appname( "kdesktop" );
-+ int screen_number = DefaultScreen(qt_xdisplay());
-+ if ( screen_number )
-+ appname.sprintf("kdesktop-screen-%d", screen_number );
-+
-+ client->send( appname, "KBackgroundIface", "setExport(int)", data );
-+#endif
-+}
-+
- //---------------------------------------------------------------------------
- void SaverEngine::handleSecureDialog()
- {
-@@ -210,7 +282,10 @@
- void SaverEngine::slotSAKProcessExited()
- {
- int retcode = mSAKProcess->exitStatus();
-- if ((retcode != 0) && (mSAKProcess->normalExit())) trinity_lockeng_sak_available = FALSE;
-+ if ((retcode != 0) && (mSAKProcess->normalExit())) {
-+ trinity_lockeng_sak_available = FALSE;
-+ printf("[kdesktop] SAK driven secure dialog is not available for use (retcode %d). Check tdmtsak for proper functionality.\n", retcode); fflush(stdout);
-+ }
-
- if ((mSAKProcess->normalExit()) && (trinity_lockeng_sak_available == TRUE)) {
- bool ok = true;
-@@ -276,46 +351,50 @@
- //
- bool SaverEngine::startLockProcess( LockType lock_type )
- {
-- if (mState != Waiting)
-+ if (mState == Saving)
- return true;
-
-+ enableExports();
-+
- kdDebug(1204) << "SaverEngine: starting saver" << endl;
- emitDCOPSignal("KDE_start_screensaver()", TQByteArray());
-
-- if (mLockProcess.isRunning())
-- {
-- stopLockProcess();
-- }
-- mLockProcess.clearArguments();
-- TQString path = KStandardDirs::findExe( "kdesktop_lock" );
-- if( path.isEmpty())
-- {
-- kdDebug( 1204 ) << "Can't find kdesktop_lock!" << endl;
-- return false;
-+ if (!mLockProcess.isRunning()) {
-+ mLockProcess.clearArguments();
-+ TQString path = KStandardDirs::findExe( "kdesktop_lock" );
-+ if( path.isEmpty())
-+ {
-+ kdDebug( 1204 ) << "Can't find kdesktop_lock!" << endl;
-+ return false;
-+ }
-+ mLockProcess << path;
-+ mLockProcess << TQString( "--internal" ) << TQString( "%1" ).arg(getpid());
-+ if (mLockProcess.start() == false )
-+ {
-+ kdDebug( 1204 ) << "Failed to start kdesktop_lock!" << endl;
-+ return false;
-+ }
- }
-- mLockProcess << path;
-+
- switch( lock_type )
- {
- case ForceLock:
-- mLockProcess << TQString( "--forcelock" );
-+ mLockProcess.kill(SIGUSR1); // Request forcelock
- break;
- case DontLock:
-- mLockProcess << TQString( "--dontlock" );
-+ mLockProcess.kill(SIGUSR2); // Request dontlock
- break;
- case SecureDialog:
-- mLockProcess << TQString( "--securedialog" );
-+ mLockProcess.kill(SIGWINCH); // Request secure dialog
- break;
- default:
- break;
- }
-- if (mBlankOnly)
-- mLockProcess << TQString( "--blank" );
--
-- if (mLockProcess.start() == false )
-- {
-- kdDebug( 1204 ) << "Failed to start kdesktop_lock!" << endl;
-- return false;
-+ if (mBlankOnly) {
-+ mLockProcess.kill(SIGTTIN); // Request blanking
- }
-+
-+ mLockProcess.kill(SIGTTOU); // Start lock
- XSetScreenSaver(qt_xdisplay(), 0, mXInterval, PreferBlanking, mXExposures);
-
- mState = Preparing;
-@@ -340,6 +419,7 @@
- kdDebug(1204) << "SaverEngine: stopping lock" << endl;
- emitDCOPSignal("KDE_stop_screensaver()", TQByteArray());
-
-+ mTerminationRequested=true;
- mLockProcess.kill();
-
- if (mEnabled)
-@@ -357,6 +437,65 @@
-
- void SaverEngine::lockProcessExited()
- {
-+ bool abnormalExit = false;
-+ if (mLockProcess.normalExit() == false) {
-+ abnormalExit = true;
-+ }
-+ else {
-+ if (mLockProcess.exitStatus() != 0) {
-+ abnormalExit = true;
-+ }
-+ }
-+ if (mTerminationRequested == true) {
-+ abnormalExit = false;
-+ mTerminationRequested = false;
-+ }
-+ if (abnormalExit == true) {
-+ // PROBABLE HACKING ATTEMPT DETECTED
-+ // Terminate the TDE session ASAP!
-+ // Values are explained at http://lists.kde.org/?l=kde-linux&m=115770988603387
-+ TQByteArray data;
-+ TQDataStream arg(data, IO_WriteOnly);
-+ arg << (int)0 << (int)0 << (int)2;
-+ if ( ! kapp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data) ) {
-+ // Someone got to DCOP before we did
-+ // Try an emergency system logout
-+ system("logout");
-+ }
-+ }
-+ else {
-+ // Restart the lock process
-+ if (!mLockProcess.isRunning()) {
-+ mLockProcess.clearArguments();
-+ TQString path = KStandardDirs::findExe( "kdesktop_lock" );
-+ if( path.isEmpty())
-+ {
-+ kdDebug( 1204 ) << "Can't find kdesktop_lock!" << endl;
-+ }
-+ mLockProcess << path;
-+ mLockProcess << TQString( "--internal" ) << TQString( "%1" ).arg(getpid());
-+ if (mLockProcess.start() == false )
-+ {
-+ kdDebug( 1204 ) << "Failed to start kdesktop_lock!" << endl;
-+ }
-+ }
-+ }
-+}
-+
-+void SaverEngine::slotLockProcessWaiting()
-+{
-+ // lockProcessWaiting cannot be called directly from a signal handler, as it will hang in certain obscure circumstances
-+ // Instead we use a single-shot timer to immediately call lockProcessWaiting once control has returned to the Qt main loop
-+ TQTimer::singleShot(0, this, SLOT(lockProcessWaiting()));
-+}
-+
-+void SaverEngine::slotLockProcessFullyActivated()
-+{
-+ mState = Saving;
-+}
-+
-+void SaverEngine::lockProcessWaiting()
-+{
- kdDebug(1204) << "SaverEngine: lock exited" << endl;
- if (trinity_lockeng_sak_available == TRUE) {
- handleSecureDialog();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/lockeng.h v3.5.13-sru/kdesktop/lockeng.h
---- /tmp/stable//kdebase/kdesktop/lockeng.h 2011-09-16 04:01:44.000000000 +0200
-+++ v3.5.13-sru/kdesktop/lockeng.h 2012-07-31 17:17:50.000000000 +0200
-@@ -78,14 +78,24 @@
- */
- virtual void saverLockReady();
-
-+public slots:
-+ void slotLockProcessWaiting();
-+ void slotLockProcessFullyActivated();
-+
- protected slots:
- void idleTimeout();
- void lockProcessExited();
-+ void lockProcessWaiting();
-
- private slots:
- void handleSecureDialog();
- void slotSAKProcessExited();
-
-+ /**
-+ * Enable wallpaper exports
-+ */
-+ void enableExports();
-+
- protected:
- enum LockType { DontLock, DefaultLock, ForceLock, SecureDialog };
- bool startLockProcess( LockType lock_type );
-@@ -114,6 +124,7 @@
-
- private:
- KProcess* mSAKProcess;
-+ bool mTerminationRequested;
- };
-
- #endif
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/minicli.cpp v3.5.13-sru/kdesktop/minicli.cpp
---- /tmp/stable//kdebase/kdesktop/minicli.cpp 2011-10-26 21:06:48.000000000 +0200
-+++ v3.5.13-sru/kdesktop/minicli.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -87,7 +87,7 @@
- mainLayout->addWidget(m_dlg);
-
- m_dlg->lbRunIcon->setPixmap(DesktopIcon("kmenu"));
-- m_dlg->lbComment->tqsetAlignment( TQt::WordBreak );
-+ m_dlg->lbComment->setAlignment( TQt::WordBreak );
-
- m_dlg->cbCommand->setDuplicatesEnabled( false );
- m_dlg->cbCommand->setTrapReturnKey( true );
-@@ -182,7 +182,7 @@
- }
- }
-
--TQSize Minicli::tqsizeHint() const
-+TQSize Minicli::sizeHint() const
- {
- int maxWidth = tqApp->desktop()->screenGeometry((TQWidget*)this).width();
- if (maxWidth < 603)
-@@ -784,7 +784,7 @@
-
- // Set the focus back to the widget that had it to begin with, i.e.
- // do not put the focus on the "Options" button.
-- m_FocusWidget = tqfocusWidget();
-+ m_FocusWidget = focusWidget();
-
- if( m_FocusWidget )
- m_FocusWidget->setFocus();
-@@ -846,7 +846,7 @@
- void Minicli::setIcon ()
- {
- if( m_iconName.isEmpty() || m_iconName == "unknown" || m_iconName == "kde" )
-- m_iconName = TQString::tqfromLatin1("kmenu");
-+ m_iconName = TQString::fromLatin1("kmenu");
-
- TQPixmap icon = DesktopIcon( m_iconName );
-
-@@ -891,9 +891,9 @@
- m_prevChecked = m_dlg->cbRunAsOther->isChecked();
- m_prevCached = true;
- }
-- if (m_dlg->leUsername->text() != TQString::tqfromLatin1("root"))
-+ if (m_dlg->leUsername->text() != TQString::fromLatin1("root"))
- m_dlg->lePassword->setText(TQString::null);
-- m_dlg->leUsername->setText(TQString::tqfromLatin1("root"));
-+ m_dlg->leUsername->setText(TQString::fromLatin1("root"));
- m_dlg->cbRunAsOther->setChecked(true);
- m_dlg->cbRunAsOther->setEnabled(false);
- m_dlg->leUsername->setEnabled(false);
-@@ -938,7 +938,7 @@
- if (enable)
- {
- m_prevIconName = m_iconName;
-- m_iconName = TQString::tqfromLatin1( "konsole" );
-+ m_iconName = TQString::fromLatin1( "konsole" );
- setIcon();
- }
- else if (!m_prevIconName.isEmpty())
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/minicli.h v3.5.13-sru/kdesktop/minicli.h
---- /tmp/stable//kdebase/kdesktop/minicli.h 2011-10-26 21:06:48.000000000 +0200
-+++ v3.5.13-sru/kdesktop/minicli.h 2012-07-31 17:17:50.000000000 +0200
-@@ -57,7 +57,7 @@
- void clearHistory();
-
- virtual void show();
-- virtual TQSize tqsizeHint() const;
-+ virtual TQSize sizeHint() const;
-
- public slots:
- void saveConfig();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesktop/minicli_ui.ui v3.5.13-sru/kdesktop/minicli_ui.ui
---- /tmp/stable//kdebase/kdesktop/minicli_ui.ui 2011-10-26 21:06:48.000000000 +0200
-+++ v3.5.13-sru/kdesktop/minicli_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -61,7 +61,7 @@
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>80</width>
- <height>20</height>
-@@ -123,7 +123,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>57</width>
- <height>20</height>
-@@ -157,7 +157,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>30</height>
-@@ -331,7 +331,7 @@
- <property name="sizeType">
- <enum>Minimum</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>9</height>
-@@ -405,7 +405,7 @@
- <property name="text">
- <string>High</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignVCenter|AlignRight</set>
- </property>
- <property name="whatsThis" stdset="0">
-@@ -460,7 +460,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>40</height>
-@@ -527,7 +527,7 @@
- <property name="text">
- <string></string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>AlignCenter</set>
- </property>
- </widget>
-@@ -543,7 +543,7 @@
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
-- <property name="tqminimumSize">
-+ <property name="minimumSize">
- <size>
- <width>388</width>
- <height>0</height>
-@@ -568,7 +568,7 @@
- <property name="text">
- <string>Enter the name of the application you want to run or the URL you want to view</string>
- </property>
-- <property name="tqalignment">
-+ <property name="alignment">
- <set>WordBreak|AlignVCenter</set>
- </property>
- </widget>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesu/kdesu/kdesu.cpp v3.5.13-sru/kdesu/kdesu/kdesu.cpp
---- /tmp/stable//kdebase/kdesu/kdesu/kdesu.cpp 2011-10-26 21:06:48.000000000 +0200
-+++ v3.5.13-sru/kdesu/kdesu/kdesu.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -62,7 +62,8 @@
- { "t", I18N_NOOP("Enable terminal output (no password keeping)"), 0 },
- { "p <prio>", I18N_NOOP("Set priority value: 0 <= prio <= 100, 0 is lowest"), "50" },
- { "r", I18N_NOOP("Use realtime scheduling"), 0 },
-- { "newdcop", I18N_NOOP("Create a new dcopserver instance (this can break your current TDE session)"), 0 },
-+ { "nonewdcop", I18N_NOOP("Let command use existing dcopserver"), 0 },
-+ { "comment <comment>", I18N_NOOP("Ignored"), "" },
- { "noignorebutton", I18N_NOOP("Do not display ignore button"), 0 },
- { "i <icon name>", I18N_NOOP("Specify icon to use in the password dialog"), 0},
- { "d", I18N_NOOP("Do not show the command to be run in the dialog"), 0},
-@@ -178,7 +179,7 @@
- TQString file = TQFile::decodeName(args->getOption("f"));
- if (change_uid && !file.isEmpty())
- {
-- if (file.tqat(0) != '/')
-+ if (file.at(0) != '/')
- {
- KStandardDirs dirs;
- dirs.addKDEDefaults();
-@@ -274,7 +275,7 @@
-
- // Try to exec the command with kdesud.
- bool keep = !args->isSet("n") && have_daemon;
-- bool terminal = true;
-+ bool terminal = args->isSet("t");
- bool new_dcop = args->isSet("newdcop");
- bool withIgnoreButton = args->isSet("ignorebutton");
-
-@@ -360,7 +361,7 @@
- KStartupInfoData data;
- data.setSilent( KStartupInfoData::Yes );
- KStartupInfo::sendChange( id, data );
-- KDEsuDialog dlg(user, auth_user, keep && !terminal,icon, withIgnoreButton);
-+ KDEsuDialog dlg(user, auth_user, keep && !terminal,icon, withIgnoreButton, timeout);
- if (prompt)
- dlg.addLine(i18n("Command:"), command);
- if ((priority != 50) || (scheduler != SuProcess::SchedNormal))
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesu/kdesu/sudlg.cpp v3.5.13-sru/kdesu/kdesu/sudlg.cpp
---- /tmp/stable//kdebase/kdesu/kdesu/sudlg.cpp 2011-03-12 07:58:06.000000000 +0100
-+++ v3.5.13-sru/kdesu/kdesu/sudlg.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -14,7 +14,7 @@
- #include <kdesu/su.h>
- #include "sudlg.h"
-
--KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton)
-+KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton, int timeout)
- : KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon)
- {
- KConfig* config = KGlobal::config();
-@@ -43,6 +43,7 @@
- }
- }
- setPrompt(prompt);
-+ setKeepWarning(i18n("<qt>The stored password will be:<br> * Kept for up to %1 minutes<br> * Destroyed on logout").arg(timeout/60));
-
- if( withIgnoreButton )
- setButtonText(User1, i18n("&Ignore"));
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdesu/kdesu/sudlg.h v3.5.13-sru/kdesu/kdesu/sudlg.h
---- /tmp/stable//kdebase/kdesu/kdesu/sudlg.h 2010-08-13 00:39:11.000000000 +0200
-+++ v3.5.13-sru/kdesu/kdesu/sudlg.h 2012-07-31 17:17:50.000000000 +0200
-@@ -15,7 +15,7 @@
- Q_OBJECT
-
- public:
-- KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon , bool withIgnoreButton=false);
-+ KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon , bool withIgnoreButton=false, int timeout=-1);
- ~KDEsuDialog();
-
- enum ResultCodes { AsUser = 10 };
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdialog/kdialog.cpp v3.5.13-sru/kdialog/kdialog.cpp
---- /tmp/stable//kdebase/kdialog/kdialog.cpp 2011-08-11 07:25:50.000000000 +0200
-+++ v3.5.13-sru/kdialog/kdialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -241,9 +241,9 @@
-
- TQString text = TQString::fromLocal8Bit(args->getOption( option ));
- int pos;
-- while ((pos = text.find( TQString::tqfromLatin1("\\n") )) >= 0)
-+ while ((pos = text.find( TQString::fromLatin1("\\n") )) >= 0)
- {
-- text.replace(pos, 2, TQString::tqfromLatin1("\n"));
-+ text.replace(pos, 2, TQString::fromLatin1("\n"));
- }
-
- if ( type == KMessageBox::WarningContinueCancel ) {
-@@ -492,7 +492,7 @@
- filter = TQString::fromLocal8Bit(args->arg(0));
- }
- // copied from KFileDialog::getSaveFileName(), so we can add geometry
-- bool specialDir = ( startDir.tqat(0) == ':' );
-+ bool specialDir = ( startDir.at(0) == ':' );
- KFileDialog dlg( specialDir ? startDir : TQString::null, filter, 0, "filedialog", true );
- if ( !specialDir )
- dlg.setSelection( startDir );
-@@ -597,43 +597,43 @@
- contextStr = TQString::fromLocal8Bit(args->arg(0));
- }
- KIcon::Group group = KIcon::NoGroup;
-- if ( groupStr == TQString::tqfromLatin1( "Desktop" ) )
-+ if ( groupStr == TQString::fromLatin1( "Desktop" ) )
- group = KIcon::Desktop;
-- else if ( groupStr == TQString::tqfromLatin1( "Toolbar" ) )
-+ else if ( groupStr == TQString::fromLatin1( "Toolbar" ) )
- group = KIcon::Toolbar;
-- else if ( groupStr == TQString::tqfromLatin1( "MainToolbar" ) )
-+ else if ( groupStr == TQString::fromLatin1( "MainToolbar" ) )
- group = KIcon::MainToolbar;
-- else if ( groupStr == TQString::tqfromLatin1( "Small" ) )
-+ else if ( groupStr == TQString::fromLatin1( "Small" ) )
- group = KIcon::Small;
-- else if ( groupStr == TQString::tqfromLatin1( "Panel" ) )
-+ else if ( groupStr == TQString::fromLatin1( "Panel" ) )
- group = KIcon::Panel;
-- else if ( groupStr == TQString::tqfromLatin1( "User" ) )
-+ else if ( groupStr == TQString::fromLatin1( "User" ) )
- group = KIcon::User;
- KIcon::Context context = KIcon::Any;
- // From kicontheme.cpp
-- if ( contextStr == TQString::tqfromLatin1( "Devices" ) )
-+ if ( contextStr == TQString::fromLatin1( "Devices" ) )
- context = KIcon::Device;
-- else if ( contextStr == TQString::tqfromLatin1( "MimeTypes" ) )
-+ else if ( contextStr == TQString::fromLatin1( "MimeTypes" ) )
- context = KIcon::MimeType;
-- else if ( contextStr == TQString::tqfromLatin1( "FileSystems" ) )
-+ else if ( contextStr == TQString::fromLatin1( "FileSystems" ) )
- context = KIcon::FileSystem;
-- else if ( contextStr == TQString::tqfromLatin1( "Applications" ) )
-+ else if ( contextStr == TQString::fromLatin1( "Applications" ) )
- context = KIcon::Application;
-- else if ( contextStr == TQString::tqfromLatin1( "Actions" ) )
-+ else if ( contextStr == TQString::fromLatin1( "Actions" ) )
- context = KIcon::Action;
-- else if ( contextStr == TQString::tqfromLatin1( "Animations" ) )
-+ else if ( contextStr == TQString::fromLatin1( "Animations" ) )
- context = KIcon::Animation;
-- else if ( contextStr == TQString::tqfromLatin1( "Categories" ) )
-+ else if ( contextStr == TQString::fromLatin1( "Categories" ) )
- context = KIcon::Category;
-- else if ( contextStr == TQString::tqfromLatin1( "Emblems" ) )
-+ else if ( contextStr == TQString::fromLatin1( "Emblems" ) )
- context = KIcon::Emblem;
-- else if ( contextStr == TQString::tqfromLatin1( "Emotes" ) )
-+ else if ( contextStr == TQString::fromLatin1( "Emotes" ) )
- context = KIcon::Emote;
-- else if ( contextStr == TQString::tqfromLatin1( "International" ) )
-+ else if ( contextStr == TQString::fromLatin1( "International" ) )
- context = KIcon::International;
-- else if ( contextStr == TQString::tqfromLatin1( "Places" ) )
-+ else if ( contextStr == TQString::fromLatin1( "Places" ) )
- context = KIcon::Place;
-- else if ( contextStr == TQString::tqfromLatin1( "Status" ) )
-+ else if ( contextStr == TQString::fromLatin1( "Status" ) )
- context = KIcon::StatusIcon;
-
- KIconDialog dlg(0, "icon dialog");
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdialog/klistboxdialog.cpp v3.5.13-sru/kdialog/klistboxdialog.cpp
---- /tmp/stable//kdebase/kdialog/klistboxdialog.cpp 2011-03-12 07:58:14.000000000 +0100
-+++ v3.5.13-sru/kdialog/klistboxdialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -32,7 +32,7 @@
- TQVBox *page = makeVBoxMainWidget();
-
- label = new TQLabel(text, page);
-- label->tqsetAlignment(AlignCenter);
-+ label->setAlignment(AlignCenter);
-
- table = new TQListBox(page);
- table->setFocus();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdialog/widgets.cpp v3.5.13-sru/kdialog/widgets.cpp
---- /tmp/stable//kdebase/kdialog/widgets.cpp 2011-03-12 07:58:14.000000000 +0100
-+++ v3.5.13-sru/kdialog/widgets.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -218,7 +218,7 @@
- table.setCurrentItem(0); // This is to circumvent a Qt bug
-
- for (unsigned int i=0; i+2<args.count(); i += 3) {
-- table.setSelected( i/3, args[i+2] == TQString::tqfromLatin1("on") );
-+ table.setSelected( i/3, args[i+2] == TQString::fromLatin1("on") );
- }
-
- handleXGeometry(&box);
-@@ -233,7 +233,7 @@
- } else {
- for (unsigned int i=0; i<table.count(); i++)
- if (table.isSelected(i))
-- rs += TQString::tqfromLatin1("\"") + tags[i] + TQString::tqfromLatin1("\" ");
-+ rs += TQString::fromLatin1("\"") + tags[i] + TQString::fromLatin1("\" ");
- result.append(rs);
- }
- }
-@@ -260,7 +260,7 @@
- table.insertStringList(entries);
-
- for (unsigned int i=0; i+2<args.count(); i += 3) {
-- table.setSelected( i/3, args[i+2] == TQString::tqfromLatin1("on") );
-+ table.setSelected( i/3, args[i+2] == TQString::fromLatin1("on") );
- }
-
- handleXGeometry(&box);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/backend/CMakeLists.txt v3.5.13-sru/kdm/backend/CMakeLists.txt
---- /tmp/stable//kdebase/kdm/backend/CMakeLists.txt 2011-09-03 21:32:00.000000000 +0200
-+++ v3.5.13-sru/kdm/backend/CMakeLists.txt 2012-07-31 17:17:50.000000000 +0200
-@@ -43,6 +43,6 @@
- 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_TQT_LIBRARIES} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
-+ LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
- DESTINATION ${BIN_INSTALL_DIR}
- )
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/backend/printf.c v3.5.13-sru/kdm/backend/printf.c
---- /tmp/stable//kdebase/kdm/backend/printf.c 2010-08-12 05:29:20.000000000 +0200
-+++ v3.5.13-sru/kdm/backend/printf.c 2012-07-31 17:17:50.000000000 +0200
-@@ -207,7 +207,7 @@
- {
- int padlen, strln, curcol;
- #ifdef PRINT_QUOTES
-- int lastcol;
-+ int lastcol = 0;
- #endif
- char ch;
-
-@@ -295,9 +295,9 @@
- void *arptr;
- #endif
- unsigned long value;
-- int radix, min, max, flags, cflags, errn;
-+ int radix = 0, min, max, flags, cflags, errn;
- #ifdef PRINT_ARRAYS
-- int arlen;
-+ int arlen = 0;
- unsigned aridx;
- char sch;
- #endif
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/ConfigureChecks.cmake v3.5.13-sru/kdm/ConfigureChecks.cmake
---- /tmp/stable//kdebase/kdm/ConfigureChecks.cmake 2011-03-16 21:49:38.000000000 +0100
-+++ v3.5.13-sru/kdm/ConfigureChecks.cmake 2012-07-31 17:17:50.000000000 +0200
-@@ -27,6 +27,16 @@
- check_function_exists( auth_timeok HAVE_AUTH_TIMEOK )
- tde_restore( CMAKE_REQUIRED_LIBRARIES )
-
-+check_function_exists( crypt LIBC_HAVE_CRYPT )
-+if( LIBC_HAVE_CRYPT )
-+ set( HAVE_CRYPT 1 CACHE INTERNAL "" FORCE )
-+else( )
-+ check_library_exists( crypt crypt "" HAVE_CRYPT )
-+ if( HAVE_CRYPT )
-+ set( CRYPT_LIBRARY crypt )
-+ endif( )
-+endif( )
-+
- check_include_file( lastlog.h HAVE_LASTLOG_H )
- check_include_file( termio.h HAVE_TERMIO_H )
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/confproc.pl v3.5.13-sru/kdm/confproc.pl
---- /tmp/stable//kdebase/kdm/confproc.pl 2011-03-12 07:58:23.000000000 +0100
-+++ v3.5.13-sru/kdm/confproc.pl 2012-07-31 17:17:50.000000000 +0200
-@@ -212,7 +212,7 @@
- "list" => [ "C_TYPE_ARGV", "", "char\t**", "TQStringList\t", "GetCfgStrArr", "GetCfgQStrList" ]
- );
-
--my @tl = ("QFont\t", "TQStringList\t", "TQString\t", "char\t**", "char\t*", "int\t", "bool\t");
-+my @tl = ("TQFont\t", "TQStringList\t", "TQString\t", "char\t**", "char\t*", "int\t", "bool\t");
-
- sub init_defs($)
- {
-@@ -444,7 +444,7 @@
- } else { # greeter(-c)?
- my ($typ, $gtr, $isc);
- if ($isfn) {
-- $typ = "QFont\t";
-+ $typ = "TQFont\t";
- $gtr = "Str2Font( GetCfgQStr( ".$kid." ) )";
- $isc = 0;
- } elsif ($user eq "greeter" && $cppget) {
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/genkdmconf.c v3.5.13-sru/kdm/kfrontend/genkdmconf.c
---- /tmp/stable//kdebase/kdm/kfrontend/genkdmconf.c 2011-08-21 09:08:18.000000000 +0200
-+++ v3.5.13-sru/kdm/kfrontend/genkdmconf.c 2012-07-31 17:17:50.000000000 +0200
-@@ -945,10 +945,6 @@
- static void
- getInitTab( void )
- {
-- File it;
-- char *p, *eol, *ep;
-- int tty;
--
- if (maxTTY)
- return;
- if (!maxTTY) {
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/kchooser.cpp v3.5.13-sru/kdm/kfrontend/kchooser.cpp
---- /tmp/stable//kdebase/kdm/kfrontend/kchooser.cpp 2011-03-12 07:58:23.000000000 +0100
-+++ v3.5.13-sru/kdm/kfrontend/kchooser.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -59,7 +59,7 @@
- TQBoxLayout *vbox = new TQVBoxLayout( this, 10, 10 );
-
- TQLabel *title = new TQLabel( i18n("XDMCP Host Menu"), this );
-- title->tqsetAlignment( AlignCenter );
-+ title->setAlignment( AlignCenter );
- vbox->addWidget( title );
-
- host_view = new TQListView( this, "hosts" );
-@@ -145,14 +145,14 @@
-
- void ChooserDlg::accept()
- {
-- if (tqfocusWidget() == iline) {
-+ if (focusWidget() == iline) {
- if (!iline->text().isEmpty()) {
- GSendInt( G_Ch_DirectChoice );
- GSendStr( iline->text().latin1() );
- iline->clear();
- }
- return;
-- } else /*if (tqfocusWidget() == host_view)*/ {
-+ } else /*if (focusWidget() == host_view)*/ {
- TQListViewItem *item = host_view->currentItem();
- if (item) {
- GSendInt( G_Ready );
-@@ -170,7 +170,7 @@
- {
- char *arr = GRecvStr();
- if (arr) {
-- TQString str = TQString::tqfromLatin1( arr );
-+ TQString str = TQString::fromLatin1( arr );
- free( arr );
- return str;
- } else
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/kdmadmindialog.cpp v3.5.13-sru/kdm/kfrontend/kdmadmindialog.cpp
---- /tmp/stable//kdebase/kdm/kfrontend/kdmadmindialog.cpp 2011-03-12 07:58:23.000000000 +0100
-+++ v3.5.13-sru/kdm/kfrontend/kdmadmindialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -75,10 +75,10 @@
- box->addWidget( new KSeparator( KSeparator::HLine, this ) );
-
- okButton = new KPushButton( KStdGuiItem::ok(), this );
-- okButton->tqsetSizePolicy( fp );
-+ okButton->setSizePolicy( fp );
- okButton->setDefault( true );
- cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
-- cancelButton->tqsetSizePolicy( fp );
-+ cancelButton->setSizePolicy( fp );
-
- hlay = new TQHBoxLayout( box );
- hlay->addStretch( 1 );
-@@ -103,7 +103,7 @@
- KDMAdmin::slotActivatePlugMenu()
- {
- TQPopupMenu *cmnu = verify->getPlugMenu();
-- TQSize sh( cmnu->tqsizeHint() / 2 );
-+ TQSize sh( cmnu->sizeHint() / 2 );
- cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
- }
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/kdmclock.cpp v3.5.13-sru/kdm/kfrontend/kdmclock.cpp
---- /tmp/stable//kdebase/kdm/kfrontend/kdmclock.cpp 2011-03-12 07:58:23.000000000 +0100
-+++ v3.5.13-sru/kdm/kfrontend/kdmclock.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -50,7 +50,7 @@
- mBorder = false;//config->readNumEntry( "border", FALSE );
-
- //config->setGroup( "Font" );
-- mFont.setFamily( TQString::tqfromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ );
-+ mFont.setFamily( TQString::fromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ );
- mFont.setPointSize( 51/*config->readNumEntry( "Point Size", 51)*/ );
- mFont.setWeight( 75/*config->readNumEntry( "Weight", 75)*/ );
- mFont.setItalic( TRUE/*config->readNumEntry( "Italic",TRUE )*/ );
-@@ -76,19 +76,19 @@
- //setBackgroundOrigin( WindowOrigin );
- mBackgroundBrush = backgroundBrush();
- setBackgroundMode( NoBackground );
-- tqrepaint();
-+ repaint();
- }
-
-
- void KdmClock::showEvent( TQShowEvent * )
- {
-- tqrepaint();
-+ repaint();
- }
-
-
- void KdmClock::timeout()
- {
-- tqrepaint();
-+ repaint();
- }
-
- void KdmClock::paintEvent( TQPaintEvent * )
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/kdmconfig.cpp v3.5.13-sru/kdm/kfrontend/kdmconfig.cpp
---- /tmp/stable//kdebase/kdm/kfrontend/kdmconfig.cpp 2011-03-12 07:58:23.000000000 +0100
-+++ v3.5.13-sru/kdm/kfrontend/kdmconfig.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -72,7 +72,7 @@
- TQFont aRetFont;
- TQString chStr;
-
-- TQStringList sl = TQStringList::split( TQString::tqfromLatin1(","), aValue );
-+ TQStringList sl = TQStringList::split( TQString::fromLatin1(","), aValue );
-
- if (sl.count() == 1) {
- /* X11 font spec */
-@@ -160,7 +160,7 @@
- sess->vt ?
- TQString("vt%1").arg( sess->vt ) :
- #endif
-- TQString::tqfromLatin1( *sess->from ? sess->from : sess->display );
-+ TQString::fromLatin1( *sess->from ? sess->from : sess->display );
- } else {
- user =
- !sess->user ?
-@@ -174,6 +174,6 @@
- sess->vt ?
- TQString("%1, vt%2").arg( sess->display ).arg( sess->vt ) :
- #endif
-- TQString::tqfromLatin1( sess->display );
-+ TQString::fromLatin1( sess->display );
- }
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/kdm_greet.c v3.5.13-sru/kdm/kfrontend/kdm_greet.c
---- /tmp/stable//kdebase/kdm/kfrontend/kdm_greet.c 2011-03-12 07:58:23.000000000 +0100
-+++ v3.5.13-sru/kdm/kfrontend/kdm_greet.c 2012-07-31 17:17:50.000000000 +0200
-@@ -700,11 +700,11 @@
- }
-
- void
--setCursor( Display *mdpy, int window, int tqshape )
-+setCursor( Display *mdpy, int window, int shape )
- {
- Cursor xcursor;
-
-- if ((xcursor = XCreateFontCursor( mdpy, tqshape ))) {
-+ if ((xcursor = XCreateFontCursor( mdpy, shape ))) {
- XDefineCursor( mdpy, window, xcursor );
- XFreeCursor( mdpy, xcursor );
- XFlush( mdpy );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/kdm_greet.h v3.5.13-sru/kdm/kfrontend/kdm_greet.h
---- /tmp/stable//kdebase/kdm/kfrontend/kdm_greet.h 2011-03-12 07:58:23.000000000 +0100
-+++ v3.5.13-sru/kdm/kfrontend/kdm_greet.h 2012-07-31 17:17:50.000000000 +0200
-@@ -77,7 +77,7 @@
- void setup_modifiers( struct _XDisplay *mdpy, int numlock );
- void restore_modifiers( void );
-
--void setCursor( struct _XDisplay *mdpy, int window, int tqshape );
-+void setCursor( struct _XDisplay *mdpy, int window, int shape );
-
-
- extern int rfd; /* for select() loops */
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/kdmshutdown.cpp v3.5.13-sru/kdm/kfrontend/kdmshutdown.cpp
---- /tmp/stable//kdebase/kdm/kfrontend/kdmshutdown.cpp 2011-10-04 04:05:34.000000000 +0200
-+++ v3.5.13-sru/kdm/kfrontend/kdmshutdown.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -117,7 +117,7 @@
- hlay->addStretch( 1 );
- if (mayOk) {
- okButton = new KPushButton( KStdGuiItem::ok(), this );
-- okButton->tqsetSizePolicy( fp );
-+ okButton->setSizePolicy( fp );
- okButton->setDefault( true );
- hlay->addWidget( okButton );
- hlay->addStretch( 1 );
-@@ -126,13 +126,13 @@
- if (maySched) {
- KPushButton *schedButton =
- new KPushButton( KGuiItem( i18n("&Schedule...") ), this );
-- schedButton->tqsetSizePolicy( fp );
-+ schedButton->setSizePolicy( fp );
- hlay->addWidget( schedButton );
- hlay->addStretch( 1 );
- connect( schedButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) );
- }
- cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
-- cancelButton->tqsetSizePolicy( fp );
-+ cancelButton->setSizePolicy( fp );
- if (!mayOk)
- cancelButton->setDefault( true );
- hlay->addWidget( cancelButton );
-@@ -149,7 +149,7 @@
- TQPopupMenu *cmnu = verify->getPlugMenu();
- if (!cmnu)
- return;
-- TQSize sh( cmnu->tqsizeHint() / 2 );
-+ TQSize sh( cmnu->sizeHint() / 2 );
- cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
- }
- }
-@@ -276,7 +276,7 @@
- freeStrArr( tlist );
- targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget );
- TQHBoxLayout *hb = new TQHBoxLayout( hlp, 0, KDsh );
-- int spc = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth )
-+ int spc = kapp->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth )
- + howGroup->insideSpacing();
- hb->addSpacing( spc );
- hb->addWidget( targets );
-@@ -284,7 +284,7 @@
- }
- GSet( 0 );
-
-- howGroup->tqsetSizePolicy( fp );
-+ howGroup->setSizePolicy( fp );
-
- schedGroup = new TQGroupBox( i18n("Scheduling"), this );
- hlay->addWidget( schedGroup, 0, AlignTop );
-@@ -310,7 +310,7 @@
- grid->addWidget( le_timeout, 2, 1 );
- grid->addMultiCellWidget( cb_force, 3,3, 0,1 );
-
-- schedGroup->tqsetSizePolicy( fp );
-+ schedGroup->setSizePolicy( fp );
-
- le_start->setText( "0" );
- if (_defSdMode == SHUT_SCHEDULE)
-@@ -484,7 +484,7 @@
- lfrm->setFrameStyle( TQFrame::NoFrame );
- else
- lfrm->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
-- lfrm->setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) );
-+ lfrm->setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) );
- // we need to set the minimum size for the logout box, since it
- // gets too small if there all options are not available
- lfrm->setMinimumSize(300,120);
-@@ -494,7 +494,7 @@
-
- // first line of buttons
- hbuttonbox = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() );
-- hbuttonbox->tqsetAlignment( Qt::AlignHCenter );
-+ hbuttonbox->setAlignment( Qt::AlignHCenter );
-
- // Reboot
- FlatButton* btnReboot = new FlatButton( lfrm );
-@@ -538,7 +538,7 @@
-
- // cancel buttonbox
- TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() );
-- hbuttonbox2->tqsetAlignment( Qt::AlignRight );
-+ hbuttonbox2->setAlignment( Qt::AlignRight );
-
- // Back to kdm
- KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/kfdialog.cpp v3.5.13-sru/kdm/kfrontend/kfdialog.cpp
---- /tmp/stable//kdebase/kdm/kfrontend/kfdialog.cpp 2011-09-16 04:01:46.000000000 +0200
-+++ v3.5.13-sru/kdm/kfrontend/kfdialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -169,10 +169,10 @@
- TQLabel *label2 = new TQLabel( text, this );
- TQRect d = KGlobalSettings::desktopGeometry(this);
- if ( label2->fontMetrics().size( 0, text).width() > d.width() * 3 / 5)
-- label2->tqsetAlignment(TQt::WordBreak | TQt::AlignAuto );
-+ label2->setAlignment(TQt::WordBreak | TQt::AlignAuto );
- KPushButton *button = new KPushButton( KStdGuiItem::ok(), this );
- button->setDefault( true );
-- button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
-+ button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
- connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
-
- TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/kgapp.cpp v3.5.13-sru/kdm/kfrontend/kgapp.cpp
---- /tmp/stable//kdebase/kdm/kfrontend/kgapp.cpp 2011-10-29 23:02:15.000000000 +0200
-+++ v3.5.13-sru/kdm/kfrontend/kgapp.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -65,6 +65,8 @@
-
- #include <pwd.h>
-
-+#define TSAK_FIFO_FILE "/tmp/ksocket-global/tsak"
-+
- bool argb_visual_available = false;
- bool has_kwin = false;
- bool is_themed = false;
-@@ -190,16 +192,21 @@
- KProcess *tsak = 0;
- KProcess *proc = 0;
- KProcess *comp = 0;
-+ KProcess *dcop = 0;
- KProcess *kwin = 0;
-
- trinity_desktop_lock_use_sak = _useSAK;
- if (trinity_desktop_lock_use_sak) {
- tsak = new KProcess;
- *tsak << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "tsak";
-- tsak->start(KProcess::Block);
-+ tsak->start(KProcess::Block, KProcess::AllOutput);
-+ }
-+ else {
-+ remove(TSAK_FIFO_FILE);
- }
- if (tsak) {
- tsak->closeStdin();
-+ tsak->closeStdout();
- tsak->detach();
- delete tsak;
- }
-@@ -257,6 +264,7 @@
-
- XSetIOErrorHandler( xIOErr );
- TQString login_user;
-+ TQString login_session_wm;
-
- Display *dpy = qt_xdisplay();
-
-@@ -310,6 +318,13 @@
- }
-
- if (!_windowManager.isEmpty()) {
-+ if (_windowManager == "kwin") {
-+ // Special case
-+ // Start DCOP...
-+ dcop = new KProcess;
-+ *dcop << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "dcopserver" << TQCString("--suicide");
-+ dcop->start();
-+ }
- kwin = new KProcess;
- *kwin << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _windowManager.ascii();
- kwin->start();
-@@ -356,7 +371,7 @@
- if ((cmd != G_GreetTimed && !_autoLoginAgain) ||
- _autoLoginUser.isEmpty())
- _autoLoginDelay = 0;
-- if (_useTheme && !_theme.isEmpty()) {
-+ if (_useTheme && !_theme.isEmpty() && !trinity_desktop_lock_use_sak) {
- // Qt4 has a nasty habit of generating BadWindow errors in normal operation, so we simply ignore them
- // This also prevents the user from being dropped to a console login if Xorg glitches or is buggy
- XSetErrorHandler( ignoreXError );
-@@ -370,7 +385,9 @@
- is_themed = false;
- has_kwin = has_kwin_bkp;
- delete tgrt;
-- checkSAK(app);
-+ if (trinity_desktop_lock_use_sak) {
-+ checkSAK(app);
-+ }
- dialog = new KStdGreeter;
- #ifdef WITH_XRANDR
- dialog->move(dialog->x() + primaryScreenPosition.x(), dialog->y() + primaryScreenPosition.y());
-@@ -383,7 +400,9 @@
- }
- XSetErrorHandler( (XErrorHandler)0 );
- } else {
-- checkSAK(app);
-+ if (trinity_desktop_lock_use_sak) {
-+ checkSAK(app);
-+ }
- dialog = new KStdGreeter;
- #ifdef WITH_XRANDR
- dialog->move(dialog->x() + primaryScreenPosition.x(), dialog->y() + primaryScreenPosition.y());
-@@ -409,6 +428,7 @@
- Debug( "left event loop\n" );
-
- login_user = static_cast<KGreeter*>(dialog)->curUser;
-+ login_session_wm = static_cast<KGreeter*>(dialog)->curWMSession;
-
- if (rslt != ex_greet) {
- delete dialog;
-@@ -432,28 +452,40 @@
- KGVerify::done();
-
- if (comp) {
-- if (_compositor == "kompmgr") {
-- // Change process UID
-- // Get user UID
-- passwd* userinfo = getpwnam(login_user.ascii());
-- if (userinfo) {
-- TQString newuid = TQString("%1").arg(userinfo->pw_uid);
-- // kompmgr allows us to change its uid in this manner:
-- // 1.) Send SIGUSER1
-- // 2.) Send the new UID to it on the command line
-- comp->kill(SIGUSR1);
-- comp->writeStdin(newuid.ascii(), newuid.length());
-- usleep(50000); // Give the above function some time to execute. Note that on REALLY slow systems this could fail, leaving kompmgr running as root. TODO: Look into ways to make this more robust.
-+ if (comp->isRunning()) {
-+ if (_compositor == "kompmgr") {
-+ // Change process UID
-+ // Get user UID
-+ passwd* userinfo = getpwnam(login_user.ascii());
-+ if (userinfo) {
-+ TQString newuid = TQString("%1").arg(userinfo->pw_uid);
-+ // kompmgr allows us to change its uid in this manner:
-+ // 1.) Send SIGUSER1
-+ // 2.) Send the new UID to it on the command line
-+ comp->kill(SIGUSR1);
-+ comp->writeStdin(newuid.ascii(), newuid.length());
-+ usleep(50000); // Give the above function some time to execute. Note that on REALLY slow systems this could fail, leaving kompmgr running as root. TODO: Look into ways to make this more robust.
-+ }
- }
-+ comp->closeStdin();
-+ comp->detach();
- }
-- comp->closeStdin();
-- comp->detach();
- delete comp;
- }
- if (kwin) {
-- kwin->closeStdin();
-- kwin->detach();
-+ if (kwin->isRunning()) {
-+ if (login_session_wm.endsWith("/startkde") || (login_session_wm == "failsafe")) {
-+ kwin->closeStdin();
-+ kwin->detach();
-+ dcop->detach();
-+ }
-+ else {
-+ kwin->kill();
-+ dcop->kill();
-+ }
-+ }
- delete kwin;
-+ delete dcop;
- }
- delete proc;
- UnsecureDisplay( dpy );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/kgdialog.cpp v3.5.13-sru/kdm/kfrontend/kgdialog.cpp
---- /tmp/stable//kdebase/kdm/kfrontend/kgdialog.cpp 2011-08-11 07:25:56.000000000 +0200
-+++ v3.5.13-sru/kdm/kfrontend/kgdialog.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -134,7 +134,7 @@
- KGDialog::slotActivateMenu( int id )
- {
- TQPopupMenu *cmnu = optMenu->findItem( id )->popup();
-- TQSize sh( cmnu->tqsizeHint() / 2 );
-+ TQSize sh( cmnu->sizeHint() / 2 );
- cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
- }
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/kgreeter.cpp v3.5.13-sru/kdm/kfrontend/kgreeter.cpp
---- /tmp/stable//kdebase/kdm/kfrontend/kgreeter.cpp 2011-09-22 21:55:09.000000000 +0200
-+++ v3.5.13-sru/kdm/kfrontend/kgreeter.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -83,6 +83,7 @@
- #include <sys/time.h>
- #include <termios.h>
- #include <signal.h>
-+#include <libgen.h>
-
- #include <X11/Xlib.h>
-
-@@ -96,7 +97,7 @@
- : KListView( parent, name )
- , themed(_them), cachedSizeHint( -1, 0 )
- {
-- tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored );
-+ setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored );
- header()->hide();
- addColumn( TQString::null );
- setColumnAlignment( 0, AlignVCenter );
-@@ -122,10 +123,10 @@
- return sum;
- }
- public:
-- virtual TQSize tqsizeHint() const
-+ virtual TQSize sizeHint() const
- {
- if (themed)
-- return KListView::tqsizeHint();
-+ return KListView::sizeHint();
-
- if (!cachedSizeHint.isValid()) {
- constPolish();
-@@ -136,7 +137,7 @@
- maxw = thisw;
- }
- cachedSizeHint.setWidth(
-- tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) +
-+ style().pixelMetric( TQStyle::PM_ScrollBarExtent ) +
- frameWidth() * 2 + maxw );
- }
- return cachedSizeHint;
-@@ -157,7 +158,7 @@
- kdDebug() << "paintEmpty " << rect << endl;
- TQRect devRect = p->xForm( rect );
- kdDebug() << "paintEmpty2 " << devRect << endl;
-- p->tqdrawPixmap(0, 0, *pm, devRect.left(), devRect.top() );
-+ p->drawPixmap(0, 0, *pm, devRect.left(), devRect.top() );
- }
-
- TQPixmap background;
-@@ -243,13 +244,20 @@
- currentDisplay = TQString(getenv("DISPLAY"));
- currentDisplay = currentDisplay.replace(":", "");
- displayNumber = currentDisplay.toInt();
-- mPipeFilename = TQString(FIFO_FILE).tqarg(displayNumber);
-- ::unlink((TQString(FIFO_SAK_FILE).tqarg(displayNumber)).ascii());
-+ mPipeFilename = TQString(FIFO_FILE).arg(displayNumber);
-+ ::unlink((TQString(FIFO_SAK_FILE).arg(displayNumber)).ascii());
-
- /* Create the FIFOs if they do not exist */
- umask(0);
- struct stat buffer;
- int status;
-+ char *fifo_parent_dir = strdup(FIFO_DIR);
-+ dirname(fifo_parent_dir);
-+ status = stat(fifo_parent_dir, &buffer);
-+ if (status != 0) {
-+ mkdir(fifo_parent_dir, 0644);
-+ }
-+ free(fifo_parent_dir);
- status = stat(FIFO_DIR, &buffer);
- if (status == 0) {
- int file_mode = ((buffer.st_mode & S_IRWXU) >> 6) * 100;
-@@ -273,6 +281,9 @@
- readbuf[numread] = 0;
- readbuf[2047] = 0;
- inputcommand += readbuf;
-+ if (!tqApp->hasPendingEvents()) {
-+ usleep(500);
-+ }
- tqApp->processEvents();
- }
- if (closingDown) {
-@@ -338,12 +349,12 @@
- parent->cachedSizeHint.setWidth( -1 );
- }
-
-- virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
-+ virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
- {
- if (((UserListView*)listView())->themed)
-- TQListViewItem::paintCell(p, cg, column, width, tqalignment);
-+ TQListViewItem::paintCell(p, cg, column, width, alignment);
- else
-- KListViewItem::paintCell(p, cg, column, width, tqalignment);
-+ KListViewItem::paintCell(p, cg, column, width, alignment);
- }
-
- TQString login;
-@@ -422,7 +433,7 @@
- if ( randomFace.isNull() ) {
- TQStringList::size_type index = 0;
- for ( size_t i = 0; i < username.length(); ++i )
-- index += ( 0x7f - username.tqat( i ).latin1() ) % 37;
-+ index += ( 0x7f - username.at( i ).latin1() ) % 37;
- randomFace = randomFaces[ index % randomFaces.count() ];
- }
- p.load( _faceDir + "/../pics/users/" + randomFace + ".png" );
-@@ -508,11 +519,11 @@
- int count = 0;
- for (setpwent(); (ps = getpwent()) != 0;) {
- if (*ps->pw_dir && *ps->pw_shell &&
-- (ps->pw_uid >= (unsigned)_lowUserId ||
-- !ps->pw_uid && _showRoot) &&
-- ps->pw_uid <= (unsigned)_highUserId &&
-- !noUsers.hasUser( ps->pw_name ) &&
-- !noUsers.hasGroup( ps->pw_gid ))
-+ ((ps->pw_uid >= (unsigned)_lowUserId) ||
-+ ((!ps->pw_uid) && _showRoot)) &&
-+ (ps->pw_uid <= (unsigned)_highUserId) &&
-+ (!noUsers.hasUser( ps->pw_name )) &&
-+ (!noUsers.hasGroup( ps->pw_gid )))
- {
- TQString username( TQFile::decodeName( ps->pw_name ) );
- if (!dupes.find( username )) {
-@@ -574,7 +585,7 @@
- for (setpwent(); (ps = getpwent()) != 0;) {
- if (*ps->pw_dir && *ps->pw_shell &&
- (ps->pw_uid >= (unsigned)_lowUserId ||
-- !ps->pw_uid && _showRoot) &&
-+ ((!ps->pw_uid) && _showRoot)) &&
- ps->pw_uid <= (unsigned)_highUserId &&
- (users.hasUser( ps->pw_name ) ||
- users.hasGroup( ps->pw_gid )))
-@@ -839,10 +850,12 @@
- GSendInt( G_PutDmrc );
- GSendStr( "Session" );
- GSendStr( sessionTypes[curSel].type.utf8() );
-+ curWMSession = sessionTypes[curSel].type.utf8();
- } else if (!prevValid) {
- GSendInt( G_PutDmrc );
- GSendStr( "Session" );
- GSendStr( "default" );
-+ curWMSession = sessionTypes[curSel].type.utf8();
- }
- GSendInt( G_Ready );
- closingDown = true;
-@@ -890,14 +903,14 @@
- i18n("This display requires no X authorization.\n"
- "This means that anybody can connect to it,\n"
- "open windows on it or intercept your input.") );
-- complainLabel->tqsetAlignment( AlignCenter );
-+ complainLabel->setAlignment( AlignCenter );
- complainLabel->setFont( _failFont );
- complainLabel->setPaletteForegroundColor( Qt::red );
- inner_box->addWidget( complainLabel );
- }
- if (!_greetString.isEmpty()) {
- TQLabel *welcomeLabel = new TQLabel( _greetString, this );
-- welcomeLabel->tqsetAlignment( AlignCenter );
-+ welcomeLabel->setAlignment( AlignCenter );
- welcomeLabel->setFont( _greetFont );
- inner_box->addWidget( welcomeLabel );
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/kgreeter.h v3.5.13-sru/kdm/kfrontend/kgreeter.h
---- /tmp/stable//kdebase/kdm/kfrontend/kgreeter.h 2011-09-22 21:55:09.000000000 +0200
-+++ v3.5.13-sru/kdm/kfrontend/kgreeter.h 2012-07-31 17:17:50.000000000 +0200
-@@ -75,7 +75,7 @@
- void handleInputPipe();
-
- public:
-- TQString curUser, dName;
-+ TQString curUser, curWMSession, dName;
-
- protected:
- void readFacesList();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/kgverify.cpp v3.5.13-sru/kdm/kfrontend/kgverify.cpp
---- /tmp/stable//kdebase/kdm/kfrontend/kgverify.cpp 2011-09-22 19:56:10.000000000 +0200
-+++ v3.5.13-sru/kdm/kfrontend/kgverify.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -150,7 +150,7 @@
- TQString name( greetPlugins[pluginList[curPlugin]].library->fileName() );
- uint st = name.findRev( '/' ) + 1;
- uint en = name.find( '.', st );
-- if (en - st > 7 && TQConstString( name.tqunicode() + st, 7 ).string() == "kgreet_")
-+ if (en - st > 7 && TQConstString( name.unicode() + st, 7 ).string() == "kgreet_")
- st += 7;
- return name.mid( st, en - st );
- }
-@@ -163,7 +163,7 @@
-
- if ((w = li->widget()))
- w->show();
-- else if ((l = li->tqlayout())) {
-+ else if ((l = li->layout())) {
- TQLayoutIterator it = l->iterator();
- for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
- showWidgets( itm );
-@@ -856,7 +856,7 @@
- if (!qstrcmp( key, "EchoMode" ))
- return TQVariant( _echoMode );
- else {
-- TQString fkey = TQString::tqfromLatin1( key ) + '=';
-+ TQString fkey = TQString::fromLatin1( key ) + '=';
- for (TQStringList::ConstIterator it = _pluginOptions.begin();
- it != _pluginOptions.end(); ++it)
- if ((*it).startsWith( fkey ))
-@@ -930,7 +930,7 @@
- , failedLabelState( 0 )
- {
- grid = new TQGridLayout;
-- grid->tqsetAlignment( AlignCenter );
-+ grid->setAlignment( AlignCenter );
-
- failedLabel = new TQLabel( parent );
- failedLabel->setFont( _failFont );
-@@ -959,7 +959,7 @@
- return;
- if (id != curPlugin) {
- plugMenu->setItemChecked( curPlugin, false );
-- parent->tqsetUpdatesEnabled( false );
-+ parent->setUpdatesEnabled( false );
- grid->removeItem( greet->getLayoutItem() );
- Debug( "delete %s\n", pName.data() );
- delete greet;
-@@ -967,7 +967,7 @@
- handler->verifyPluginChanged( id );
- if (running)
- start();
-- parent->tqsetUpdatesEnabled( true );
-+ parent->setUpdatesEnabled( true );
- }
- }
-
-@@ -1087,10 +1087,10 @@
- {
- TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
- okButton = new KPushButton( KStdGuiItem::ok(), this );
-- okButton->tqsetSizePolicy( fp );
-+ okButton->setSizePolicy( fp );
- okButton->setDefault( true );
- cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
-- cancelButton->tqsetSizePolicy( fp );
-+ cancelButton->setSizePolicy( fp );
-
- verify = new KGStdVerify( this, this, cancelButton, user, pluginList, func, ctx );
- verify->selectPlugin( curPlugin );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/krootimage.cpp v3.5.13-sru/kdm/kfrontend/krootimage.cpp
---- /tmp/stable//kdebase/kdm/kfrontend/krootimage.cpp 2011-08-13 06:07:04.000000000 +0200
-+++ v3.5.13-sru/kdm/kfrontend/krootimage.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -73,7 +73,7 @@
-
- // ...set it to the desktop widget...
- TQT_TQWIDGET(desktop())->setBackgroundPixmap( pm );
-- TQT_TQWIDGET(desktop())->tqrepaint( true );
-+ TQT_TQWIDGET(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 -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/sakdlg.cc v3.5.13-sru/kdm/kfrontend/sakdlg.cc
---- /tmp/stable//kdebase/kdm/kfrontend/sakdlg.cc 2011-09-22 19:56:10.000000000 +0200
-+++ v3.5.13-sru/kdm/kfrontend/sakdlg.cc 2012-07-31 17:17:50.000000000 +0200
-@@ -66,6 +66,7 @@
- #include <sys/time.h>
- #include <termios.h>
- #include <signal.h>
-+#include <libgen.h>
-
- #include "kfdialog.h"
-
-@@ -108,7 +109,7 @@
- KUser user;
-
- mStatusLabel = new TQLabel( "<b> </b>", frame );
-- mStatusLabel->tqsetAlignment( TQLabel::AlignVCenter );
-+ mStatusLabel->setAlignment( TQLabel::AlignVCenter );
-
- TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
- unlockDialogLayout->addWidget( frame );
-@@ -157,13 +158,20 @@
- currentDisplay = TQString(getenv("DISPLAY"));
- currentDisplay = currentDisplay.replace(":", "");
- displayNumber = currentDisplay.toInt();
-- mPipeFilename = TQString(FIFO_SAK_FILE).tqarg(displayNumber);
-- ::unlink((TQString(FIFO_FILE).tqarg(displayNumber)).ascii());
-+ mPipeFilename = TQString(FIFO_SAK_FILE).arg(displayNumber);
-+ ::unlink((TQString(FIFO_FILE).arg(displayNumber)).ascii());
-
- /* Create the FIFOs if they do not exist */
- umask(0);
- struct stat buffer;
- int status;
-+ char *fifo_parent_dir = strdup(FIFO_DIR);
-+ dirname(fifo_parent_dir);
-+ status = stat(fifo_parent_dir, &buffer);
-+ if (status != 0) {
-+ mkdir(fifo_parent_dir, 0644);
-+ }
-+ free(fifo_parent_dir);
- status = stat(FIFO_DIR, &buffer);
- if (status == 0) {
- int file_mode = ((buffer.st_mode & S_IRWXU) >> 6) * 100;
-@@ -187,6 +195,9 @@
- readbuf[numread] = 0;
- readbuf[2047] = 0;
- inputcommand += readbuf;
-+ if (!tqApp->hasPendingEvents()) {
-+ usleep(500);
-+ }
- tqApp->processEvents();
- }
- if (closingDown) {
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/themer/CMakeLists.txt v3.5.13-sru/kdm/kfrontend/themer/CMakeLists.txt
---- /tmp/stable//kdebase/kdm/kfrontend/themer/CMakeLists.txt 2011-03-12 07:58:23.000000000 +0100
-+++ v3.5.13-sru/kdm/kfrontend/themer/CMakeLists.txt 2012-07-31 17:17:50.000000000 +0200
-@@ -16,6 +16,7 @@
- ${CMAKE_SOURCE_DIR}/kdmlib
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
-+ ${LIBART_INCLUDE_DIRS}
- )
-
- link_directories(
-@@ -38,4 +39,5 @@
- SOURCES
- kdmthemer.cpp kdmitem.cpp kdmpixmap.cpp
- kdmrect.cpp kdmlabel.cpp kdmlayout.cpp
-+ LINK ${LIBART_LIBRARIES}
- )
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/themer/kdmitem.cpp v3.5.13-sru/kdm/kfrontend/themer/kdmitem.cpp
---- /tmp/stable//kdebase/kdm/kfrontend/themer/kdmitem.cpp 2011-08-13 06:07:04.000000000 +0200
-+++ v3.5.13-sru/kdm/kfrontend/themer/kdmitem.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -280,7 +280,7 @@
- if (fixedManager && !fixedManager->isEmpty())
- fixedManager->update( newGeometry, force );
-
-- // TODO send *selective* tqrepaint signal
-+ // TODO send *selective* repaint signal
- }
-
- void
-@@ -299,7 +299,7 @@
- if ((_compositor.isEmpty()) || (!argb_visual_available)) {
- // Software blend only (no compositing support)
- TQPixmap copy( myWidget->size() );
-- kdDebug() << myWidget->tqgeometry() << " " << area << " " << myWidget->size() << endl;
-+ kdDebug() << myWidget->geometry() << " " << area << " " << myWidget->size() << endl;
- bitBlt( &copy, TQPoint( 0, 0), p->device(), myWidget->geometry(), TQt::CopyROP );
- // Lighten it slightly
- TQImage lightVersion;
-@@ -443,12 +443,12 @@
- // BEGIN protected inheritable
-
- TQSize
--KdmItem::tqsizeHint()
-+KdmItem::sizeHint()
- {
- if (myWidget)
- return myWidget->size();
- if (myLayoutItem)
-- return myLayoutItem->tqsizeHint();
-+ return myLayoutItem->sizeHint();
- int w = pos.wType == DTpixel ? kAbs( pos.width ) : -1,
- h = pos.hType == DTpixel ? kAbs( pos.height ) : -1;
- return TQSize( w, h );
-@@ -457,7 +457,7 @@
- TQRect
- KdmItem::placementHint( const TQRect &parentRect )
- {
-- TQSize hintedSize = tqsizeHint();
-+ TQSize hintedSize = sizeHint();
- TQSize boxHint;
-
- int x = parentRect.left(),
-@@ -474,7 +474,7 @@
- else {
- if (!boxManager)
- return parentRect;
-- boxHint = boxManager->tqsizeHint();
-+ boxHint = boxManager->sizeHint();
- }
- kdDebug() << timestamp() << " boxHint " << boxHint << endl;
- }
-@@ -592,7 +592,7 @@
- } else { // int value
- dType = DTpixel;
- TQString sCopy = s;
-- if (sCopy.tqat( 0 ) == '-') {
-+ if (sCopy.at( 0 ) == '-') {
- sCopy.remove( 0, 1 );
- dType = DTnpixel;
- }
-@@ -616,7 +616,7 @@
- void
- KdmItem::parseColor( const TQString &s, TQColor &color )
- {
-- if (s.tqat( 0 ) != '#')
-+ if (s.at( 0 ) != '#')
- return;
- bool ok;
- TQString sCopy = s;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/themer/kdmitem.h v3.5.13-sru/kdm/kfrontend/themer/kdmitem.h
---- /tmp/stable//kdebase/kdm/kfrontend/themer/kdmitem.h 2011-08-11 07:25:55.000000000 +0200
-+++ v3.5.13-sru/kdm/kfrontend/themer/kdmitem.h 2012-07-31 17:17:50.000000000 +0200
-@@ -96,7 +96,7 @@
-
- /**
- * Fixup the geometry of an item and its children (even if fixed
-- * or boxed ones). Note that this will generate tqrepaint signals
-+ * or boxed ones). Note that this will generate repaint signals
- * when needed. The default implementation should fit all needs.
- */
- virtual void setGeometry( const TQRect &newGeometry, bool force );
-@@ -109,7 +109,7 @@
- void paint( TQPainter *painter, const TQRect &boundaries );
-
- /**
-- * Update representation of contents and tqrepaint.
-+ * Update representation of contents and repaint.
- */
- virtual void update();
-
-@@ -120,7 +120,7 @@
- void mouseEvent( int x, int y, bool pressed = false, bool released = false );
-
- /**
-- * Similar to tqsizeHint(..), this returns the area of the item
-+ * Similar to sizeHint(..), this returns the area of the item
- * given the @p parentGeometry. The default implementation
- * takes into account geometric constraints and layoutings.
- * @param parentGeometry the geometry of the caller item or a
-@@ -181,7 +181,7 @@
- * @return (-1,-1) if no size can be determined (so it should
- * default to parent's size).
- */
-- virtual TQSize tqsizeHint();
-+ virtual TQSize sizeHint();
-
- /**
- * Low level graphical function to paint the item.
-@@ -195,7 +195,7 @@
-
- /**
- * Called when item changes its 'state' variable. This must
-- * handle item's tqrepaint.
-+ * handle item's repaint.
- */
- virtual void statusChanged();
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/themer/kdmlabel.cpp v3.5.13-sru/kdm/kfrontend/themer/kdmlabel.cpp
---- /tmp/stable//kdebase/kdm/kfrontend/themer/kdmlabel.cpp 2011-08-11 07:25:55.000000000 +0200
-+++ v3.5.13-sru/kdm/kfrontend/themer/kdmlabel.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -116,7 +116,7 @@
- if (cAccel != -1) {
- cText.remove('&');
- myAccel = new TQAccel(parentWidget());
-- myAccel->insertItem(ALT + UNICODE_ACCEL + cText.tqat(cAccel).lower().tqunicode());
-+ myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().unicode());
- connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel()));
- }
- }
-@@ -138,7 +138,7 @@
- }
-
- TQSize
--KdmLabel::tqsizeHint()
-+KdmLabel::sizeHint()
- {
- // choose the correct label class
- struct LabelStruct::LabelClass *l = &label.normal;
-@@ -177,8 +177,8 @@
- TQFont f(l->font);
- f.setUnderline(true);
- p->setFont ( f );
-- p->drawText( tarea, AlignLeft | SingleLine, TQString(cText.tqat(cAccel)));
-- tarea.rLeft() += fm.width(cText.tqat(cAccel));
-+ p->drawText( tarea, AlignLeft | SingleLine, TQString(cText.at(cAccel)));
-+ tarea.rLeft() += fm.width(cText.at(cAccel));
- p->setFont( l->font );
- p->drawText( tarea, AlignLeft | SingleLine, right);
- } else {
-@@ -268,7 +268,7 @@
- m['s'] = KThemedGreeter::timedUser;
- // xgettext:no-c-format
- KGlobal::locale()->setDateFormat( i18n("date format", "%a %d %B") );
-- m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false, false );
-+ m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false, false );
-
- return KMacroExpander::expandMacros( text, m );
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/themer/kdmlabel.h v3.5.13-sru/kdm/kfrontend/themer/kdmlabel.h
---- /tmp/stable//kdebase/kdm/kfrontend/themer/kdmlabel.h 2011-03-12 07:58:23.000000000 +0100
-+++ v3.5.13-sru/kdm/kfrontend/themer/kdmlabel.h 2012-07-31 17:17:50.000000000 +0200
-@@ -42,7 +42,7 @@
-
- protected:
- // reimplemented; returns the minimum size of rendered text
-- virtual TQSize tqsizeHint();
-+ virtual TQSize sizeHint();
-
- // draw the label
- virtual void drawContents( TQPainter *p, const TQRect &r );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/themer/kdmlayout.cpp v3.5.13-sru/kdm/kfrontend/themer/kdmlayout.cpp
---- /tmp/stable//kdebase/kdm/kfrontend/themer/kdmlayout.cpp 2011-03-12 07:58:23.000000000 +0100
-+++ v3.5.13-sru/kdm/kfrontend/themer/kdmlayout.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -74,7 +74,7 @@
- // Check if box size was computed. If not compute it
- // TODO check if this prevents updating changing items
- // if (!hintedSize.isValid())
--// tqsizeHint();
-+// sizeHint();
-
- // kdDebug() << this << " hintedSize " << hintedSize << endl;
-
-@@ -114,30 +114,30 @@
- if ((*it)->isExplicitlyHidden())
- continue;
-
-- TQRect temp = childrenRect, tqitemRect;
-+ TQRect temp = childrenRect, itemRect;
- if (box.isVertical) {
- temp.setHeight( 0 );
-- tqitemRect = (*it)->placementHint( temp );
-- temp.setHeight( tqitemRect.height() );
-- childrenRect.setTop( childrenRect.top() + tqitemRect.size().height() + box.spacing );
-+ itemRect = (*it)->placementHint( temp );
-+ temp.setHeight( itemRect.height() );
-+ childrenRect.setTop( childrenRect.top() + itemRect.size().height() + box.spacing );
- } else {
- temp.setWidth( 0 );
-- tqitemRect = (*it)->placementHint( temp );
-- kdDebug() << this << " placementHint " << *it << " " << temp << " " << tqitemRect << endl;
-- temp.setWidth( tqitemRect.width() );
-- childrenRect.setLeft( childrenRect.left() + tqitemRect.size().width() + box.spacing );
-+ itemRect = (*it)->placementHint( temp );
-+ kdDebug() << this << " placementHint " << *it << " " << temp << " " << itemRect << endl;
-+ temp.setWidth( itemRect.width() );
-+ childrenRect.setLeft( childrenRect.left() + itemRect.size().width() + box.spacing );
- kdDebug() << timestamp() << " childrenRect after " << *it << " " << childrenRect << endl;
- }
-- tqitemRect = (*it)->placementHint( temp );
-- kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << tqitemRect << endl;
-- (*it)->setGeometry( tqitemRect, force );
-+ itemRect = (*it)->placementHint( temp );
-+ kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << itemRect << endl;
-+ (*it)->setGeometry( itemRect, force );
- }
- }
- }
-
- //FIXME truly experimental (is so close to greeter_geometry.c)
- TQSize
--KdmLayoutBox::tqsizeHint()
-+KdmLayoutBox::sizeHint()
- {
- // Sum up area taken by children
- int w = 0, h = 0;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/themer/kdmlayout.h v3.5.13-sru/kdm/kfrontend/themer/kdmlayout.h
---- /tmp/stable//kdebase/kdm/kfrontend/themer/kdmlayout.h 2011-03-12 07:58:23.000000000 +0100
-+++ v3.5.13-sru/kdm/kfrontend/themer/kdmlayout.h 2012-07-31 17:17:50.000000000 +0200
-@@ -80,7 +80,7 @@
-
- // Computes the size hint of the box, telling which is the
- // smallest size inside which boxed items will fit
-- TQSize tqsizeHint();
-+ TQSize sizeHint();
-
- private:
- struct {
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/themer/kdmpixmap.cpp v3.5.13-sru/kdm/kfrontend/themer/kdmpixmap.cpp
---- /tmp/stable//kdebase/kdm/kfrontend/themer/kdmpixmap.cpp 2011-08-13 06:07:04.000000000 +0200
-+++ v3.5.13-sru/kdm/kfrontend/themer/kdmpixmap.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -107,7 +107,7 @@
- }
-
- TQSize
--KdmPixmap::tqsizeHint()
-+KdmPixmap::sizeHint()
- {
- // choose the correct pixmap class
- PixmapStruct::PixmapClass * pClass = &pixmap.normal;
-@@ -118,7 +118,7 @@
- // use the pixmap size as the size hint
- if (!pClass->pixmap.isNull())
- return pClass->pixmap.size();
-- return KdmItem::tqsizeHint();
-+ return KdmItem::sizeHint();
- }
-
- void
-@@ -138,7 +138,7 @@
- return TQString::null;
-
- TQString fullName = fileName;
-- if (fullName.tqat( 0 ) != '/')
-+ if (fullName.at( 0 ) != '/')
- fullName = baseDir() + "/" + fileName;
- return fullName;
- }
-@@ -177,7 +177,7 @@
- TQString ext = fullpath.right(fullpath.length() - index);
- fullpath = fullpath.left(index);
- kdDebug() << timestamp() << " ext " << ext << " " << fullpath << endl;
-- TQString testpath = TQString("-%1x%2").tqarg(area.width()).arg(area.height()) + ext;
-+ TQString testpath = TQString("-%1x%2").arg(area.width()).arg(area.height()) + ext;
- kdDebug() << timestamp() << " testing for " << fullpath + testpath << endl;
- if (KStandardDirs::exists(fullpath + testpath))
- pClass->pixmap.load(fullpath + testpath);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/themer/kdmpixmap.h v3.5.13-sru/kdm/kfrontend/themer/kdmpixmap.h
---- /tmp/stable//kdebase/kdm/kfrontend/themer/kdmpixmap.h 2011-03-12 07:58:23.000000000 +0100
-+++ v3.5.13-sru/kdm/kfrontend/themer/kdmpixmap.h 2012-07-31 17:17:50.000000000 +0200
-@@ -42,7 +42,7 @@
-
- protected:
- // reimplemented; returns the size of loaded pixmap
-- virtual TQSize tqsizeHint();
-+ virtual TQSize sizeHint();
-
- // draw the pixmap
- virtual void drawContents( TQPainter *p, const TQRect &r );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdm/kfrontend/themer/kdmthemer.h v3.5.13-sru/kdm/kfrontend/themer/kdmthemer.h
---- /tmp/stable//kdebase/kdm/kfrontend/themer/kdmthemer.h 2011-08-13 06:07:04.000000000 +0200
-+++ v3.5.13-sru/kdm/kfrontend/themer/kdmthemer.h 2012-07-31 17:17:50.000000000 +0200
-@@ -61,9 +61,9 @@
-
- bool isOK() { return rootItem != 0; }
- /*
-- * Gives a tqsizeHint to the widget (parent size)
-+ * Gives a sizeHint to the widget (parent size)
- */
-- //TQSize tqsizeHint() const{ return parentWidget()->size(); }
-+ //TQSize sizeHint() const{ return parentWidget()->size(); }
-
- /*
- * Takes a shot of the current widget
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdmlib/kdmtsak.cpp v3.5.13-sru/kdmlib/kdmtsak.cpp
---- /tmp/stable//kdebase/kdmlib/kdmtsak.cpp 2011-09-19 03:46:39.000000000 +0200
-+++ v3.5.13-sru/kdmlib/kdmtsak.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -76,7 +76,7 @@
- if (intFound == false) {
- return true;
- }
-- curConsole = TQString("vt%1").tqarg(curConsoleNum);;
-+ curConsole = TQString("vt%1").arg(curConsoleNum);;
- TQStringList sessionList = TQStringList::split('\t', output, false);
- for ( TQStringList::Iterator it = sessionList.begin(); it != sessionList.end(); ++it ) {
- TQStringList sessionInfoList = TQStringList::split(',', *it, true);
-@@ -121,10 +121,14 @@
- int verifier_result = tde_sak_verify_calling_process();
-
- bool isdm = false;
-+ bool checkonly = false;
- if (argc == 2) {
- if (strcmp(argv[1], "dm") == 0) {
- isdm = true;
- }
-+ if (strcmp(argv[1], "check") == 0) {
-+ checkonly = true;
-+ }
- }
-
- if (!isdm) {
-@@ -139,6 +143,14 @@
- // OK, the calling process is authorized to retrieve SAK data
- // First, flush the buffer
- mPipe_fd = open(FIFO_FILE, O_RDONLY | O_NONBLOCK);
-+ if (checkonly) {
-+ if (mPipe_fd < 0) {
-+ return 6; // SAK not available
-+ }
-+ else {
-+ return 0;
-+ }
-+ }
- numread = 1;
- while (numread > 0) {
- numread = read(mPipe_fd, readbuf, 6);
-@@ -177,4 +189,4 @@
- else {
- return verifier_result;
- }
--}
-\ Pas de fin de ligne à la fin du fichier
-+}
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdmlib/kgreet_classic.cpp v3.5.13-sru/kdmlib/kgreet_classic.cpp
---- /tmp/stable//kdebase/kdmlib/kgreet_classic.cpp 2011-09-22 19:56:10.000000000 +0200
-+++ v3.5.13-sru/kdmlib/kgreet_classic.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -167,7 +167,7 @@
- delete passwdEdit;
- return;
- }
-- TQLayoutIterator it = TQT_TQLAYOUT(static_cast<QLayoutItem*>(layoutItem))->iterator();
-+ TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator();
- for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
- delete itm->widget();
- delete layoutItem;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdmlib/kgreet_pam.cpp v3.5.13-sru/kdmlib/kgreet_pam.cpp
---- /tmp/stable//kdebase/kdmlib/kgreet_pam.cpp 2011-09-22 19:56:10.000000000 +0200
-+++ v3.5.13-sru/kdmlib/kgreet_pam.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -209,7 +209,7 @@
- delete loginEdit;
- return;
- }
-- TQLayoutIterator it = TQT_TQLAYOUT(static_cast<QLayoutItem*>(layoutItem))->iterator();
-+ TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator();
- for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
- delete itm->widget();
- delete layoutItem;
-@@ -354,7 +354,6 @@
- }
- else if (m_themer) {
- kg_debug("themer found!");
-- KdmItem *pw_label = 0;
-
- KdmLabel *kdmlabel = static_cast<KdmLabel*>(m_themer->findNode("pw-label"));
- if (kdmlabel) {
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdmlib/kgreet_pam.h v3.5.13-sru/kdmlib/kgreet_pam.h
---- /tmp/stable//kdebase/kdmlib/kgreet_pam.h 2011-09-22 19:56:10.000000000 +0200
-+++ v3.5.13-sru/kdmlib/kgreet_pam.h 2012-07-31 17:17:50.000000000 +0200
-@@ -65,7 +65,7 @@
- virtual void revive();
- virtual void clear();
-
-- TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(TQT_TQLAYOUT(static_cast<QLayoutItem*>(layoutItem))); }
-+ TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(TQT_TQLAYOUT(layoutItem)); }
-
- public slots:
- void slotLoginLostFocus();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kdmlib/kgreet_winbind.cpp v3.5.13-sru/kdmlib/kgreet_winbind.cpp
---- /tmp/stable//kdebase/kdmlib/kgreet_winbind.cpp 2011-09-22 19:56:10.000000000 +0200
-+++ v3.5.13-sru/kdmlib/kgreet_winbind.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -213,7 +213,7 @@
- delete domainCombo;
- return;
- }
-- TQLayoutIterator it = TQT_TQLAYOUT(static_cast<QLayoutItem *>(layoutItem))->iterator();
-+ TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator();
- for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
- delete itm->widget();
- delete layoutItem;
-@@ -607,14 +607,14 @@
-
- TQString current = domainCombo->currentText();
-
-- for (int i = 0; i < domainList.count(); ++i) {
-- if (i < domainCombo->count())
-+ for (unsigned int i = 0; i < domainList.count(); ++i) {
-+ if (i < (uint)domainCombo->count())
- domainCombo->changeItem(domainList[i], i);
- else
- domainCombo->insertItem(domainList[i], i);
- }
-
-- while (domainCombo->count() > domainList.count())
-+ while ((uint)domainCombo->count() > domainList.count())
- domainCombo->removeItem(domainCombo->count()-1);
-
- domainCombo->setCurrentItem( current );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kfind/kdatecombo.cpp v3.5.13-sru/kfind/kdatecombo.cpp
---- /tmp/stable//kdebase/kfind/kdatecombo.cpp 2011-08-11 07:25:45.000000000 +0200
-+++ v3.5.13-sru/kfind/kdatecombo.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -33,7 +33,7 @@
- popupFrame = new KPopupFrame(this, "popupFrame");
- popupFrame->installEventFilter(this);
- datePicker = new KDatePicker(popupFrame, date, "datePicker");
-- datePicker->setMinimumSize(datePicker->tqsizeHint());
-+ datePicker->setMinimumSize(datePicker->sizeHint());
- datePicker->installEventFilter(this);
- popupFrame->setMainWidget(datePicker);
- setDate(date);
-@@ -57,9 +57,9 @@
- return *qd = KGlobal::locale()->readDate(str);
- }
-
--TQDate & KDateCombo::getDate(TQDate *tqcurrentDate)
-+TQDate & KDateCombo::getDate(TQDate *currentDate)
- {
-- return string2Date(currentText(), tqcurrentDate);
-+ return string2Date(currentText(), currentDate);
- }
-
- bool KDateCombo::setDate(const TQDate & newDate)
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kfind/kdatecombo.h v3.5.13-sru/kfind/kdatecombo.h
---- /tmp/stable//kdebase/kfind/kdatecombo.h 2011-03-12 07:58:07.000000000 +0100
-+++ v3.5.13-sru/kfind/kdatecombo.h 2012-07-31 17:17:50.000000000 +0200
-@@ -26,7 +26,7 @@
- KDateCombo(const TQDate & date, TQWidget *parent=0, const char *name=0);
- ~KDateCombo();
-
-- TQDate & getDate(TQDate *tqcurrentDate);
-+ TQDate & getDate(TQDate *currentDate);
- bool setDate(const TQDate & newDate);
-
- private:
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kfind/kfind.cpp v3.5.13-sru/kfind/kfind.cpp
---- /tmp/stable//kdebase/kfind/kfind.cpp 2011-03-12 07:58:07.000000000 +0100
-+++ v3.5.13-sru/kfind/kfind.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -70,7 +70,7 @@
- mTopLayout->addWidget(mButtonBox);
-
- mSearch = new KPushButton( KGuiItem(i18n("&Find"), "find"), mButtonBox );
-- mButtonBox->setSpacing( (tabWidget->tqsizeHint().height()-4*mSearch->tqsizeHint().height()) / 4);
-+ mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4);
- connect( mSearch, TQT_SIGNAL(clicked()), this, TQT_SLOT( startSearch() ) );
- mStop = new KPushButton( KGuiItem(i18n("Stop"), "stop"), mButtonBox );
- connect( mStop, TQT_SIGNAL(clicked()), this, TQT_SLOT( stopSearch() ) );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kfind/kfindpart.cpp v3.5.13-sru/kfind/kfindpart.cpp
---- /tmp/stable//kdebase/kfind/kfindpart.cpp 2011-07-09 08:16:54.000000000 +0200
-+++ v3.5.13-sru/kfind/kfindpart.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -44,7 +44,7 @@
-
- kdDebug() << "KFindPart::KFindPart " << this << endl;
- m_kfindWidget = new Kfind( parentWidget, widgetName );
-- m_kfindWidget->setMaximumHeight(m_kfindWidget->tqminimumSizeHint().height());
-+ m_kfindWidget->setMaximumHeight(m_kfindWidget->minimumSizeHint().height());
- const KFileItem *item = ((KonqDirPart*)parent)->currentItem();
- kdDebug() << "Kfind: currentItem: " << ( item ? item->url().path().local8Bit() : TQString("null") ) << endl;
- TQDir d;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kfind/kftabdlg.cpp v3.5.13-sru/kfind/kftabdlg.cpp
---- /tmp/stable//kdebase/kfind/kftabdlg.cpp 2011-08-11 07:25:45.000000000 +0200
-+++ v3.5.13-sru/kfind/kftabdlg.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -60,11 +60,11 @@
- pages[0] = new TQWidget( this, "page1" );
-
- nameBox = new KComboBox(TRUE, pages[0], "combo1");
-- nameBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry
-+ nameBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry
- TQLabel * namedL = new TQLabel(nameBox, i18n("&Named:"), pages[0], "named");
- TQToolTip::add( namedL, i18n("You can use wildcard matching and \";\" for separating multiple names") );
- dirBox = new KComboBox(TRUE, pages[0], "combo2");
-- dirBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry
-+ dirBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry
- TQLabel * lookinL = new TQLabel(dirBox, i18n("Look &in:"), pages[0], "named");
- subdirsCb = new TQCheckBox(i18n("Include &subfolders"), pages[0]);
- caseSensCb = new TQCheckBox(i18n("Case s&ensitive search"), pages[0]);
-@@ -187,7 +187,7 @@
- sizeUnitBox ->setCurrentItem(1);
-
- int tmp = sizeEdit->fontMetrics().width(" 000000000 ");
-- sizeEdit->setMinimumSize(tmp, sizeEdit->tqsizeHint().height());
-+ sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height());
-
- m_usernameBox->setDuplicatesEnabled(FALSE);
- m_groupBox->setDuplicatesEnabled(FALSE);
-@@ -245,7 +245,7 @@
- pages[2] = new TQWidget( this, "page3" );
-
- typeBox =new KComboBox(FALSE, pages[2], "typeBox");
-- typeBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry
-+ typeBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry
- TQLabel * typeL =new TQLabel(typeBox, i18n("File &type:"), pages[2], "type");
- textEdit=new KLineEdit(pages[2], "textEdit" );
- TQLabel * textL =new TQLabel(textEdit, i18n("C&ontaining text:"), pages[2], "text");
-@@ -315,7 +315,7 @@
-
- // Layout
- tmp = sizeEdit->fontMetrics().width(" 00000 ");
-- sizeEdit->setMinimumSize(tmp, sizeEdit->tqsizeHint().height());
-+ sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height());
-
- TQGridLayout *grid2 = new TQGridLayout( pages[2], 5, 4,
- KDialog::marginHint(),
-@@ -854,13 +854,13 @@
- conf->writePathEntry(entry, sl);
- }
-
--TQSize KfindTabWidget::tqsizeHint() const
-+TQSize KfindTabWidget::sizeHint() const
- {
- // #44662: avoid a huge default size when the comboboxes have very large items
- // Like in minicli, we changed the combobox size policy so that they can resize down,
- // and then we simply provide a reasonable size hint for the whole window, depending
- // on the screen width.
-- TQSize sz = TQTabWidget::tqsizeHint();
-+ TQSize sz = TQTabWidget::sizeHint();
- KfindTabWidget* me = const_cast<KfindTabWidget*>( this );
- const int screenWidth = tqApp->desktop()->screenGeometry(me).width();
- if ( sz.width() > screenWidth / 2 )
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kfind/kftabdlg.h v3.5.13-sru/kfind/kftabdlg.h
---- /tmp/stable//kdebase/kfind/kftabdlg.h 2011-03-12 07:58:07.000000000 +0100
-+++ v3.5.13-sru/kfind/kftabdlg.h 2012-07-31 17:17:50.000000000 +0200
-@@ -49,7 +49,7 @@
-
- void setURL( const KURL & url );
-
-- virtual TQSize tqsizeHint() const;
-+ virtual TQSize sizeHint() const;
-
- public slots:
- void setFocus();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kfind/kfwin.cpp v3.5.13-sru/kfind/kfwin.cpp
---- /tmp/stable//kdebase/kfind/kfwin.cpp 2011-08-11 07:25:45.000000000 +0200
-+++ v3.5.13-sru/kfind/kfwin.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -178,7 +178,7 @@
-
- if (drag_obj)
- {
-- TQClipboard *cb = kapp->tqclipboard();
-+ TQClipboard *cb = kapp->clipboard();
- cb->setData(drag_obj);
- }
- }
-@@ -222,7 +222,7 @@
- stream.setEncoding( TQTextStream::Locale );
-
- if ( mimeType->name() == "text/html") {
-- stream << TQString::tqfromLatin1("<HTML><HEAD>\n"
-+ stream << TQString::fromLatin1("<HTML><HEAD>\n"
- "<!DOCTYPE %1>\n"
- "<TITLE>%2</TITLE></HEAD>\n"
- "<BODY><H1>%3</H1>"
-@@ -236,13 +236,13 @@
- {
- TQString path=((KfFileLVI*)item)->fileitem.url().url();
- TQString pretty=((KfFileLVI*)item)->fileitem.url().htmlURL();
-- stream << TQString::tqfromLatin1("<DT><A HREF=\"") << path
-- << TQString::tqfromLatin1("\">") << pretty
-- << TQString::tqfromLatin1("</A>\n");
-+ stream << TQString::fromLatin1("<DT><A HREF=\"") << path
-+ << TQString::fromLatin1("\">") << pretty
-+ << TQString::fromLatin1("</A>\n");
-
- item = item->nextSibling();
- }
-- stream << TQString::tqfromLatin1("</DL><P></BODY></HTML>\n");
-+ stream << TQString::fromLatin1("</DL><P></BODY></HTML>\n");
- }
- else {
- item = firstChild();
-@@ -293,7 +293,7 @@
- // Iterate on all selected elements
- TQPtrList<TQListViewItem> selected = selectedItems();
- for ( uint i = 0; i < selected.count(); i++ ) {
-- KfFileLVI *item = (KfFileLVI *) selected.tqat(i);
-+ KfFileLVI *item = (KfFileLVI *) selected.at(i);
- KFileItem file = item->fileitem;
-
- KIO::NetAccess::del(file.url(), this);
-@@ -335,7 +335,7 @@
- {
- KListView::resizeEvent(e);
- resetColumns(false);
-- clipper()->tqrepaint();
-+ clipper()->repaint();
- }
-
- TQDragObject * KfindWindow::dragObject()
-@@ -346,7 +346,7 @@
- // create a list of URIs from selection
- for ( uint i = 0; i < selected.count(); i++ )
- {
-- KfFileLVI *item = (KfFileLVI *) selected.tqat( i );
-+ KfFileLVI *item = (KfFileLVI *) selected.at( i );
- if (item)
- {
- uris.append( item->fileitem.url() );
-@@ -372,7 +372,7 @@
- {
- setColumnWidth(2, QMAX(fm.width(columnText(2)), fm.width("0000000")) + 15);
- TQString sampleDate =
-- KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime());
-+ KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
- setColumnWidth(3, QMAX(fm.width(columnText(3)), fm.width(sampleDate)) + 15);
- setColumnWidth(4, QMAX(fm.width(columnText(4)), fm.width(i18n(perm[RO]))) + 15);
- setColumnWidth(5, QMAX(fm.width(columnText(5)), fm.width("some text")) + 15);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/docentry.cpp v3.5.13-sru/khelpcenter/docentry.cpp
---- /tmp/stable//kdebase/khelpcenter/docentry.cpp 2011-08-11 07:25:33.000000000 +0200
-+++ v3.5.13-sru/khelpcenter/docentry.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -278,7 +278,7 @@
- entry->weight() < mChildren[ i + 1 ]->weight() ) {
- entry->setNextSibling( mChildren[ i + 1 ] );
- mChildren[ i ]->setNextSibling( entry );
-- mChildren.insert( mChildren.tqat( i + 1 ), entry );
-+ mChildren.insert( mChildren.at( i + 1 ), entry );
- break;
- }
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/docmetainfo.cpp v3.5.13-sru/khelpcenter/docmetainfo.cpp
---- /tmp/stable//kdebase/khelpcenter/docmetainfo.cpp 2011-08-11 07:25:33.000000000 +0200
-+++ v3.5.13-sru/khelpcenter/docmetainfo.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -108,7 +108,7 @@
- if ( langcode == "en" ) return i18n("English");
-
- TQString cfgfile = locate( "locale",
-- TQString::tqfromLatin1( "%1/entry.desktop" ).arg( langcode ) );
-+ TQString::fromLatin1( "%1/entry.desktop" ).arg( langcode ) );
-
- kdDebug() << "-- langcode: " << langcode << " cfgfile: " << cfgfile << endl;
-
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/glossary.cpp v3.5.13-sru/khelpcenter/glossary.cpp
---- /tmp/stable//kdebase/khelpcenter/glossary.cpp 2011-08-11 07:25:33.000000000 +0200
-+++ v3.5.13-sru/khelpcenter/glossary.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -49,7 +49,7 @@
- {
- KListViewItem::setOpen(open);
-
-- setPixmap( 0, SmallIcon( TQString::tqfromLatin1( open ? "contents" : "contents2" ) ) );
-+ setPixmap( 0, SmallIcon( TQString::fromLatin1( open ? "contents" : "contents2" ) ) );
-
- }
- };
-@@ -92,7 +92,7 @@
-
- m_cacheFile = locateLocal( "cache", "help/glossary.xml" );
-
-- m_sourceFile = View::View::langLookup( TQString::tqfromLatin1( "khelpcenter/glossary/index.docbook" ) );
-+ m_sourceFile = View::View::langLookup( TQString::fromLatin1( "khelpcenter/glossary/index.docbook" ) );
-
- m_config = kapp->config();
- m_config->setGroup( "Glossary" );
-@@ -150,10 +150,10 @@
- connect( meinproc, TQT_SIGNAL( processExited( KProcess * ) ),
- this, TQT_SLOT( meinprocExited( KProcess * ) ) );
-
-- *meinproc << locate( "exe", TQString::tqfromLatin1( "meinproc" ) );
-- *meinproc << TQString::tqfromLatin1( "--output" ) << m_cacheFile;
-- *meinproc << TQString::tqfromLatin1( "--stylesheet" )
-- << locate( "data", TQString::tqfromLatin1( "khelpcenter/glossary.xslt" ) );
-+ *meinproc << locate( "exe", TQString::fromLatin1( "meinproc" ) );
-+ *meinproc << TQString::fromLatin1( "--output" ) << m_cacheFile;
-+ *meinproc << TQString::fromLatin1( "--stylesheet" )
-+ << locate( "data", TQString::fromLatin1( "khelpcenter/glossary.xslt" ) );
- *meinproc << m_sourceFile;
-
- meinproc->start( KProcess::NotifyOnExit );
-@@ -189,21 +189,21 @@
- if ( !doc.setContent( &cacheFile ) )
- return;
-
-- TQDomNodeList sectionNodes = doc.documentElement().elementsByTagName( TQString::tqfromLatin1( "section" ) );
-+ TQDomNodeList sectionNodes = doc.documentElement().elementsByTagName( TQString::fromLatin1( "section" ) );
- for ( unsigned int i = 0; i < sectionNodes.count(); i++ ) {
- TQDomElement sectionElement = sectionNodes.item( i ).toElement();
-- TQString title = sectionElement.attribute( TQString::tqfromLatin1( "title" ) );
-+ TQString title = sectionElement.attribute( TQString::fromLatin1( "title" ) );
- SectionItem *topicSection = new SectionItem( m_byTopicItem, title );
-
-- TQDomNodeList entryNodes = sectionElement.elementsByTagName( TQString::tqfromLatin1( "entry" ) );
-+ TQDomNodeList entryNodes = sectionElement.elementsByTagName( TQString::fromLatin1( "entry" ) );
- for ( unsigned int j = 0; j < entryNodes.count(); j++ ) {
- TQDomElement entryElement = entryNodes.item( j ).toElement();
-
-- TQString entryId = entryElement.attribute( TQString::tqfromLatin1( "id" ) );
-+ TQString entryId = entryElement.attribute( TQString::fromLatin1( "id" ) );
- if ( entryId.isNull() )
- continue;
-
-- TQDomElement termElement = childElement( entryElement, TQString::tqfromLatin1( "term" ) );
-+ TQDomElement termElement = childElement( entryElement, TQString::fromLatin1( "term" ) );
- TQString term = termElement.text().simplifyWhiteSpace();
-
- EntryItem *entry = new EntryItem(topicSection, term, entryId );
-@@ -221,19 +221,19 @@
-
- new EntryItem( alphabSection, term, entryId );
-
-- TQDomElement definitionElement = childElement( entryElement, TQString::tqfromLatin1( "definition" ) );
-+ TQDomElement definitionElement = childElement( entryElement, TQString::fromLatin1( "definition" ) );
- TQString definition = definitionElement.text().simplifyWhiteSpace();
-
- GlossaryEntryXRef::List seeAlso;
-
-- TQDomElement referencesElement = childElement( entryElement, TQString::tqfromLatin1( "references" ) );
-- TQDomNodeList referenceNodes = referencesElement.elementsByTagName( TQString::tqfromLatin1( "reference" ) );
-+ TQDomElement referencesElement = childElement( entryElement, TQString::fromLatin1( "references" ) );
-+ TQDomNodeList referenceNodes = referencesElement.elementsByTagName( TQString::fromLatin1( "reference" ) );
- if ( referenceNodes.count() > 0 )
- for ( unsigned int k = 0; k < referenceNodes.count(); k++ ) {
- TQDomElement referenceElement = referenceNodes.item( k ).toElement();
-
-- TQString term = referenceElement.attribute( TQString::tqfromLatin1( "term" ) );
-- TQString id = referenceElement.attribute( TQString::tqfromLatin1( "id" ) );
-+ TQString term = referenceElement.attribute( TQString::fromLatin1( "term" ) );
-+ TQString id = referenceElement.attribute( TQString::fromLatin1( "id" ) );
-
- seeAlso += GlossaryEntryXRef( term, id );
- }
-@@ -279,10 +279,10 @@
- GlossaryEntryXRef::List::ConstIterator it = seeAlsos.begin();
- GlossaryEntryXRef::List::ConstIterator end = seeAlsos.end();
- for (; it != end; ++it) {
-- seeAlso += TQString::tqfromLatin1("<a href=\"glossentry:");
-+ seeAlso += TQString::fromLatin1("<a href=\"glossentry:");
- seeAlso += (*it).id();
-- seeAlso += TQString::tqfromLatin1("\">") + (*it).term();
-- seeAlso += TQString::tqfromLatin1("</a>, ");
-+ seeAlso += TQString::fromLatin1("\">") + (*it).term();
-+ seeAlso += TQString::fromLatin1("</a>, ");
- }
- seeAlso = seeAlso.left(seeAlso.length() - 2);
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/history.cpp v3.5.13-sru/khelpcenter/history.cpp
---- /tmp/stable//kdebase/khelpcenter/history.cpp 2011-08-11 07:25:33.000000000 +0200
-+++ v3.5.13-sru/khelpcenter/history.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -93,7 +93,7 @@
- Entry * current = m_entries.current();
- if (current)
- {
-- m_entries.tqat( m_entries.count() - 1 ); // go to last one
-+ m_entries.at( m_entries.count() - 1 ); // go to last one
- for ( ; m_entries.current() != current ; )
- {
- if ( !m_entries.removeLast() ) { // and remove from the end (faster and easier)
-@@ -101,7 +101,7 @@
- return;
- }
- else
-- m_entries.tqat( m_entries.count() - 1 );
-+ m_entries.at( m_entries.count() - 1 );
- }
- // Now current is the current again.
-
-@@ -111,7 +111,7 @@
-
- // Append a new entry
- m_entries.append( new Entry ); // made current
-- Q_ASSERT( m_entries.tqat() == (int) m_entries.count() - 1 );
-+ Q_ASSERT( m_entries.at() == (int) m_entries.count() - 1 );
- }
-
- void History::updateCurrentEntry( View *view )
-@@ -199,9 +199,9 @@
- Entry *current = m_entries.current();
- if ( current && !current->view ) m_entries.remove();
-
-- int newPos = m_entries.tqat() + steps;
-+ int newPos = m_entries.at() + steps;
-
-- current = m_entries.tqat( newPos );
-+ current = m_entries.at( newPos );
- if ( !current ) {
- kdError() << "No History entry at position " << newPos << endl;
- return;
-@@ -257,7 +257,7 @@
- void History::fillGoMenu()
- {
- KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() );
-- TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::tqfromLatin1( "go" ), mainWindow ) );
-+ TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
- if ( !goMenu || m_goMenuIndex == -1 )
- return;
-
-@@ -276,21 +276,21 @@
- // Second case: big history, in one or both directions
- {
- // Assume both directions first (in this case we place the current URL in the middle)
-- m_goMenuHistoryStartPos = m_entries.tqat() + 4;
-+ m_goMenuHistoryStartPos = m_entries.at() + 4;
-
- // Forward not big enough ?
-- if ( m_entries.tqat() > (int)m_entries.count() - 4 )
-+ if ( m_entries.at() > (int)m_entries.count() - 4 )
- m_goMenuHistoryStartPos = m_entries.count() - 1;
- }
- Q_ASSERT( m_goMenuHistoryStartPos >= 0 && (uint)m_goMenuHistoryStartPos < m_entries.count() );
-- m_goMenuHistoryCurrentPos = m_entries.tqat(); // for slotActivated
-+ m_goMenuHistoryCurrentPos = m_entries.at(); // for slotActivated
- fillHistoryPopup( goMenu, false, false, true, m_goMenuHistoryStartPos );
- }
-
- void History::goMenuActivated( int id )
- {
- KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() );
-- TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::tqfromLatin1( "go" ), mainWindow ) );
-+ TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
- if ( !goMenu )
- return;
-
-@@ -314,7 +314,7 @@
- TQPtrListIterator<Entry> it( m_entries );
- if (onlyBack || onlyForward)
- {
-- it += m_entries.tqat(); // Jump to current item
-+ it += m_entries.at(); // Jump to current item
- if ( !onlyForward ) --it; else ++it; // And move off it
- } else if ( startPos )
- it += startPos; // Jump to specified start pos
-@@ -339,12 +339,12 @@
-
- bool History::canGoBack() const
- {
-- return m_entries.tqat() > 0;
-+ return m_entries.at() > 0;
- }
-
- bool History::canGoForward() const
- {
-- return m_entries.tqat() != static_cast<int>( m_entries.count() ) - 1;
-+ return m_entries.at() != static_cast<int>( m_entries.count() ) - 1;
- }
-
- #include "history.moc"
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/htmlsearch/htmlsearch.cpp v3.5.13-sru/khelpcenter/htmlsearch/htmlsearch.cpp
---- /tmp/stable//kdebase/khelpcenter/htmlsearch/htmlsearch.cpp 2011-08-11 07:25:33.000000000 +0200
-+++ v3.5.13-sru/khelpcenter/htmlsearch/htmlsearch.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -28,7 +28,7 @@
-
- void HTMLSearch::scanDir(const TQString& dir)
- {
-- assert( dir.tqat( dir.length() - 1 ) == '/' );
-+ assert( dir.at( dir.length() - 1 ) == '/' );
-
- TQStringList::ConstIterator it;
-
-@@ -83,7 +83,7 @@
- TQStringList add = config->readListEntry("Paths");
- TQStringList::Iterator it;
- for (it = add.begin(); it != add.end(); ++it) {
-- if ( ( *it ).tqat( ( *it ).length() - 1 ) != '/' )
-+ if ( ( *it ).at( ( *it ).length() - 1 ) != '/' )
- ( *it ) += '/';
- dirs.append(*it);
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/htmlsearch/kcmhtmlsearch.cpp v3.5.13-sru/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
---- /tmp/stable//kdebase/khelpcenter/htmlsearch/kcmhtmlsearch.cpp 2011-08-11 07:25:33.000000000 +0200
-+++ v3.5.13-sru/khelpcenter/htmlsearch/kcmhtmlsearch.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -50,15 +50,15 @@
- TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the "
- "ht://dig HTML search engine. "
- "You can get ht://dig at the"), gb);
-- l->tqsetAlignment(TQLabel::WordBreak);
-- l->setMinimumSize(l->tqsizeHint());
-+ l->setAlignment(TQLabel::WordBreak);
-+ l->setMinimumSize(l->sizeHint());
- grid->addMultiCellWidget(l, 1, 1, 0, 1);
- TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) );
-
- KURLLabel *url = new KURLLabel(gb);
- url->setURL("http://www.htdig.org");
- url->setText(i18n("ht://dig home page"));
-- url->tqsetAlignment(TQLabel::AlignHCenter);
-+ url->setAlignment(TQLabel::AlignHCenter);
- grid->addMultiCellWidget(url, 2,2, 0, 1);
- connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
- this, TQT_SLOT(urlClicked(const TQString&)));
-@@ -157,7 +157,7 @@
-
- runButton = new TQPushButton(i18n("Generate Index..."), this);
- TQWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) );
-- runButton->setFixedSize(runButton->tqsizeHint());
-+ runButton->setFixedSize(runButton->sizeHint());
- vbox->addWidget(runButton, AlignRight);
- connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex()));
-
-@@ -179,14 +179,14 @@
-
- // add all languages to the list
- TQStringList langs = KGlobal::dirs()->findAllResources("locale",
-- TQString::tqfromLatin1("*/entry.desktop"));
-+ TQString::fromLatin1("*/entry.desktop"));
- langs.sort();
-
- for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it)
- {
- KSimpleConfig entry(*it);
-- entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-- TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), KGlobal::locale()->translate("without name"));
-+ entry.setGroup(TQString::fromLatin1("KCM Locale"));
-+ TQString name = entry.readEntry(TQString::fromLatin1("Name"), KGlobal::locale()->translate("without name"));
-
- TQString path = *it;
- int index = path.findRev('/');
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/htmlsearch/klangcombo.cpp v3.5.13-sru/khelpcenter/htmlsearch/klangcombo.cpp
---- /tmp/stable//kdebase/khelpcenter/htmlsearch/klangcombo.cpp 2011-03-12 07:57:50.000000000 +0100
-+++ v3.5.13-sru/khelpcenter/htmlsearch/klangcombo.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -39,14 +39,14 @@
-
- void KLanguageCombo::insertLanguage(const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu, int index)
- {
-- TQString output = name + TQString::tqfromLatin1(" (") + path + TQString::tqfromLatin1(")");
-- TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/flag.png")));
-+ TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")");
-+ TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png")));
- insertItem(TQIconSet(flag), output, path, submenu, index);
- }
-
- void KLanguageCombo::changeLanguage(const TQString& name, int i)
- {
- if (i < 0 || i >= count()) return;
-- TQString output = name + TQString::tqfromLatin1(" (") + tag(i) + TQString::tqfromLatin1(")");
-+ TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")");
- changeItem(output, i);
- }
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/htmlsearch/ktagcombobox.cpp v3.5.13-sru/khelpcenter/htmlsearch/ktagcombobox.cpp
---- /tmp/stable//kdebase/khelpcenter/htmlsearch/ktagcombobox.cpp 2011-08-11 07:25:33.000000000 +0200
-+++ v3.5.13-sru/khelpcenter/htmlsearch/ktagcombobox.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -83,7 +83,7 @@
- if (current == index) return;
- current = index;
- emit activated( index );
-- tqrepaint();
-+ repaint();
- }
-
- void KTagComboBox::internalHighlight( int index )
-@@ -192,7 +192,7 @@
- TQRect clip(2, 2, width() - 4, height() - 4);
- #if 0
- if ( hasFocus() && style().guiStyle() != MotifStyle )
-- p.setPen( tqcolorGroup().highlightedText() );
-+ p.setPen( colorGroup().highlightedText() );
- #endif
- p.drawText(clip, AlignCenter | SingleLine, popup->text( current ));
-
-@@ -211,7 +211,7 @@
-
- TQString KTagComboBox::currentTag() const
- {
-- return *tags->tqat(currentItem());
-+ return *tags->at(currentItem());
- }
-
- TQString KTagComboBox::tag(int i) const
-@@ -221,7 +221,7 @@
- kdDebug() << "KTagComboBox::tag(), unknown tag " << i << endl;
- return TQString::null;
- }
-- return *tags->tqat(i);
-+ return *tags->at(i);
- }
-
- int KTagComboBox::currentItem() const
-@@ -233,7 +233,7 @@
- {
- if (i < 0 || i >= count()) return;
- current = i;
-- tqrepaint();
-+ repaint();
- }
-
- void KTagComboBox::setCurrentItem(const TQString &code)
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/htmlsearchconfig.cpp v3.5.13-sru/khelpcenter/htmlsearchconfig.cpp
---- /tmp/stable//kdebase/khelpcenter/htmlsearchconfig.cpp 2011-03-12 07:57:50.000000000 +0100
-+++ v3.5.13-sru/khelpcenter/htmlsearchconfig.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -51,15 +51,15 @@
- TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the "
- "ht://dig HTML search engine. "
- "You can get ht://dig at the"), gb);
-- l->tqsetAlignment(TQLabel::WordBreak);
-- l->setMinimumSize(l->tqsizeHint());
-+ l->setAlignment(TQLabel::WordBreak);
-+ l->setMinimumSize(l->sizeHint());
- grid->addMultiCellWidget(l, 1, 1, 0, 1);
- TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) );
-
- KURLLabel *url = new KURLLabel(gb);
- url->setURL("http://www.htdig.org");
- url->setText(i18n("ht://dig home page"));
-- url->tqsetAlignment(TQLabel::AlignHCenter);
-+ url->setAlignment(TQLabel::AlignHCenter);
- grid->addMultiCellWidget(url, 2,2, 0, 1);
- connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
- this, TQT_SLOT(urlClicked(const TQString&)));
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/kcmhelpcenter.cpp v3.5.13-sru/khelpcenter/kcmhelpcenter.cpp
---- /tmp/stable//kdebase/khelpcenter/kcmhelpcenter.cpp 2011-08-11 07:25:33.000000000 +0200
-+++ v3.5.13-sru/khelpcenter/kcmhelpcenter.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -101,7 +101,7 @@
- topLayout->setSpacing( spacingHint() );
-
- mLabel = new TQLabel( this );
-- mLabel->tqsetAlignment( AlignHCenter );
-+ mLabel->setAlignment( AlignHCenter );
- topLayout->addWidget( mLabel );
-
- mProgressBar = new TQProgressBar( this );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/mainwindow.cpp v3.5.13-sru/khelpcenter/mainwindow.cpp
---- /tmp/stable//kdebase/khelpcenter/mainwindow.cpp 2011-03-12 07:57:50.000000000 +0100
-+++ v3.5.13-sru/khelpcenter/mainwindow.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -325,7 +325,7 @@
-
- mDoc->browserExtension()->setURLArgs( args );
-
-- if ( proto == TQString::tqfromLatin1("glossentry") ) {
-+ if ( proto == TQString::fromLatin1("glossentry") ) {
- TQString decodedEntryId = KURL::decode_string( url.encodedPathAndQuery() );
- slotGlossSelected( mNavigator->glossEntry( decodedEntryId ) );
- mNavigator->slotSelectGlossEntry( decodedEntryId );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/navigator.cpp v3.5.13-sru/khelpcenter/navigator.cpp
---- /tmp/stable//kdebase/khelpcenter/navigator.cpp 2011-08-11 07:25:33.000000000 +0200
-+++ v3.5.13-sru/khelpcenter/navigator.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -262,8 +262,8 @@
-
- void Navigator::insertAppletDocs( NavigatorItem *topItem )
- {
-- TQDir appletDir( locate( "data", TQString::tqfromLatin1( "kicker/applets/" ) ) );
-- appletDir.setNameFilter( TQString::tqfromLatin1( "*.desktop" ) );
-+ TQDir appletDir( locate( "data", TQString::fromLatin1( "kicker/applets/" ) ) );
-+ appletDir.setNameFilter( TQString::fromLatin1( "*.desktop" ) );
-
- TQStringList files = appletDir.entryList( TQDir::Files | TQDir::Readable );
- TQStringList::ConstIterator it = files.begin();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/plugins/CMakeLists.txt v3.5.13-sru/khelpcenter/plugins/CMakeLists.txt
---- /tmp/stable//kdebase/khelpcenter/plugins/CMakeLists.txt 2011-03-12 07:57:50.000000000 +0100
-+++ v3.5.13-sru/khelpcenter/plugins/CMakeLists.txt 2012-07-31 17:17:50.000000000 +0200
-@@ -17,6 +17,6 @@
- install( FILES
- applets.desktop contact.desktop faq.desktop info.desktop
- links.desktop support.desktop userguide.desktop welcome.desktop
-- kicmodules.desktop kcontrolmodules.desktop konqplugins.desktop
-+ hardwaremodules.desktop kcontrolmodules.desktop konqplugins.desktop
- kioslaves.desktop
- DESTINATION ${DATA_INSTALL_DIR}/khelpcenter/plugins )
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/plugins/hardwaremodules.desktop v3.5.13-sru/khelpcenter/plugins/hardwaremodules.desktop
---- /tmp/stable//kdebase/khelpcenter/plugins/hardwaremodules.desktop 1970-01-01 01:00:00.000000000 +0100
-+++ v3.5.13-sru/khelpcenter/plugins/hardwaremodules.desktop 2012-07-31 17:17:50.000000000 +0200
-@@ -0,0 +1,63 @@
-+[Desktop Entry]
-+
-+Name=Hardware
-+Name[af]=Hardeware
-+Name[ar]=العتاد
-+Name[be]=Апаратнае забеспячэнне
-+Name[bg]=Хардуер
-+Name[bn]=হার্ডওয়্যার
-+Name[br]=Periantel
-+Name[bs]=Hardver
-+Name[csb]=Nôrzãdza
-+Name[cy]=Caledwedd
-+Name[el]=Υλικό
-+Name[eo]=Aparataro
-+Name[et]=Riistvara
-+Name[fa]=سخت‌افزار
-+Name[fi]=Laitteisto
-+Name[fr]=Matériel
-+Name[ga]=Crua-Earraí
-+Name[he]=חומרה
-+Name[hr]=Hardver
-+Name[hu]=Hardver
-+Name[id]=Perangkat Keras
-+Name[is]=Vélbúnaður
-+Name[ja]=ハードウェア
-+Name[ka]=მოწყობილობები
-+Name[kk]=Жабдықтар
-+Name[km]=ផ្នែក​រឹង
-+Name[ko]=하드웨어
-+Name[lt]=Aparatinė įranga
-+Name[mk]=Хардвер
-+Name[ms]=Perkakasan
-+Name[nb]=Maskinvare
-+Name[ne]=हार्डवेयर
-+Name[nn]=Maskinvare
-+Name[pa]=ਜੰਤਰ
-+Name[pl]=Sprzęt
-+Name[ru]=Оборудование
-+Name[rw]=Icyuma
-+Name[se]=Mašiidnagálvu
-+Name[sl]=Strojna oprema
-+Name[sr]=Хардвер
-+Name[sr@Latn]=Hardver
-+Name[sv]=Hårdvara
-+Name[ta]=வன்பொருள்
-+Name[te]=హార్డ్ వేర్
-+Name[tg]=Сахтафзор
-+Name[th]=อุปกรณ์ภายในเครื่อง
-+Name[tr]=Donanım
-+Name[tt]=Cıhazlar
-+Name[uk]=Обладнання
-+Name[uz]=Asbob-uskunalar
-+Name[uz@cyrillic]=Асбоб-ускуналар
-+Name[vi]=Phần cứng
-+Name[wa]=Éndjolreye
-+Name[zh_CN]=硬件
-+Name[zh_TW]=硬體
-+
-+Icon=contents2
-+
-+X-DOC-Weight=-400
-+
-+X-KDE-KHelpcenter-Special=kinfocenter
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/plugins/kicmodules.desktop v3.5.13-sru/khelpcenter/plugins/kicmodules.desktop
---- /tmp/stable//kdebase/khelpcenter/plugins/kicmodules.desktop 2010-08-12 05:28:42.000000000 +0200
-+++ v3.5.13-sru/khelpcenter/plugins/kicmodules.desktop 1970-01-01 01:00:00.000000000 +0100
-@@ -1,87 +0,0 @@
--[Desktop Entry]
--
--Name=KInfoCenter Modules
--Name[af]=K Inligting Sentrum Modules
--Name[ar]=وحدات مركز المعلومات
--Name[be]=Модулі інфармацыйнага цэнтра
--Name[bg]=Информационен център
--Name[bn]=KInfoCenter মডিউল
--Name[br]=Molladoù KInfoCenter
--Name[bs]=Moduli za KInfoCenter
--Name[ca]=Mòduls del KInfoCenter
--Name[cs]=Moduly Informačního centra
--Name[csb]=Wëdowiédny mòdułë centróm kòntrolë
--Name[cy]=Modiwlau KInfoCenter
--Name[da]=KInfoCenter-moduler
--Name[de]=Infozentrum-Module
--Name[el]=Αρθρώματα KInfoCenter
--Name[en_GB]=KInfoCentre Modules
--Name[eo]=Infocentraj moduloj
--Name[es]=Módulos del KInfoCenter
--Name[et]=Infokeskuse moodulid
--Name[eu]=KInfoCenter moduluak
--Name[fa]=پیمانه‌های KInfoCenter
--Name[fi]=KInfoCenter-moduulit
--Name[fr]=Modules du Centre d'informations
--Name[fy]=Ynformaasjesintrummodules
--Name[ga]=Modúil KInfoCenter
--Name[gl]=Módulos do Centro de Información de KDE
--Name[he]=מודולי מרכז המידע
--Name[hi]=के-जानकारी-सेंटर मॉड्यूल्स
--Name[hr]=KInfoCenter moduli
--Name[hu]=KInfoCenter-modulok
--Name[is]=Upplýsingaborðseiningar
--Name[it]=Moduli del centro informazioni
--Name[ja]=KInfoCenter モジュール
--Name[ka]=საინფორმაციო ცენტრის მოდულები
--Name[kk]=KInfoCenter модульдері
--Name[km]=ម៉ូឌុល KInfoCenter
--Name[ko]=KInfoCenter 모듈
--Name[lo]=ສູນຄວບຄຸມ
--Name[lt]=KInfoCenter moduliai
--Name[lv]=KInfo centra moduļi
--Name[mk]=KInfoCenter модули
--Name[mn]=Мэд төв-модул
--Name[ms]=Modul KInfoCenter
--Name[mt]=Moduli taċ-Ċentru tal-Informazzjoni
--Name[nb]=Infosentermoduler
--Name[nds]=Modulen för dat KDE-Infozentrum
--Name[ne]=केडीई सूचना केन्द्र मोड्युल
--Name[nl]=Informatiecentrummodules
--Name[nn]=Infosentermodular
--Name[nso]=Diripa tsa Bogareng bja Tshedimoso ya K
--Name[pa]=ਕੇਜਾਣਕਾਰੀ ਕੇਂਦਰ ਮੈਡੀਊਲ
--Name[pl]=Moduły informacyjne Centrum sterowania
--Name[pt]=Módulos do KInfoCenter
--Name[pt_BR]=Módulo do Centro de Informações do KDE
--Name[ro]=Module Centru de Informații
--Name[ru]=Модули Центра информации
--Name[rw]=Ibice K-UmwanyaAmakuru
--Name[se]=Diehtoguovddášmoduvllat
--Name[sk]=Moduly pre Informačné centrum
--Name[sl]=Moduli Informacijega središča
--Name[sr]=KInfoCenter модули
--Name[sr@Latn]=KInfoCenter moduli
--Name[sv]=Moduler i Informationscentralen
--Name[ta]=கேதகவல் மைய பகுதிகள்
--Name[te]=కెసమాచార కేంద్రం మాడ్యూళ్లు
--Name[tg]=Бахшҳои маркази иттилоот
--Name[th]=โมดูลของศูนย์ข้อมูล
--Name[tr]=KInfoCenter Modülleri
--Name[tt]=KInfoCenter Öleşläre
--Name[uk]=Модулі KInfoCenter
--Name[uz]=KInfoCenter modullari
--Name[uz@cyrillic]=KInfoCenter модуллари
--Name[ven]=Modulu ya senthara ya mafhungo a K
--Name[vi]=Mô đun Trung tâm Thông tin của KDE
--Name[wa]=Modules do cinte d' informåcion di KDE
--Name[xh]=Izicatshulwa ze KInfoCenter
--Name[zh_CN]=KInfoCenter 模块
--Name[zh_TW]=KInfoCenter 模組
--Name[zu]=Izingxenye ze-KInfoCenter
--
--Icon=contents2
--
--X-DOC-Weight=-400
--
--X-KDE-KHelpcenter-Special=kinfocenter
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/toc.cpp v3.5.13-sru/khelpcenter/toc.cpp
---- /tmp/stable//kdebase/khelpcenter/toc.cpp 2011-08-11 07:25:33.000000000 +0200
-+++ v3.5.13-sru/khelpcenter/toc.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -164,7 +164,7 @@
- TQDomComment timestamp = doc.createComment( TQString::number( sourceFileCTime() ) );
- doc.documentElement().appendChild( timestamp );
-
-- f.tqat( 0 );
-+ f.at( 0 );
- TQTextStream stream( &f );
- stream.setEncoding( TQTextStream::UnicodeUTF8 );
- stream << doc.toString();
-@@ -188,9 +188,9 @@
- TQDomNodeList chapters = doc.documentElement().elementsByTagName( "chapter" );
- for ( unsigned int chapterCount = 0; chapterCount < chapters.count(); chapterCount++ ) {
- TQDomElement chapElem = chapters.item( chapterCount ).toElement();
-- TQDomElement chapTitleElem = childElement( chapElem, TQString::tqfromLatin1( "title" ) );
-+ TQDomElement chapTitleElem = childElement( chapElem, TQString::fromLatin1( "title" ) );
- TQString chapTitle = chapTitleElem.text().simplifyWhiteSpace();
-- TQDomElement chapRefElem = childElement( chapElem, TQString::tqfromLatin1( "anchor" ) );
-+ TQDomElement chapRefElem = childElement( chapElem, TQString::fromLatin1( "anchor" ) );
- TQString chapRef = chapRefElem.text().stripWhiteSpace();
-
- chapItem = new TOCChapterItem( this, m_parentItem, chapItem, chapTitle, chapRef );
-@@ -199,9 +199,9 @@
- TQDomNodeList sections = chapElem.elementsByTagName( "section" );
- for ( unsigned int sectCount = 0; sectCount < sections.count(); sectCount++ ) {
- TQDomElement sectElem = sections.item( sectCount ).toElement();
-- TQDomElement sectTitleElem = childElement( sectElem, TQString::tqfromLatin1( "title" ) );
-+ TQDomElement sectTitleElem = childElement( sectElem, TQString::fromLatin1( "title" ) );
- TQString sectTitle = sectTitleElem.text().simplifyWhiteSpace();
-- TQDomElement sectRefElem = childElement( sectElem, TQString::tqfromLatin1( "anchor" ) );
-+ TQDomElement sectRefElem = childElement( sectElem, TQString::fromLatin1( "anchor" ) );
- TQString sectRef = sectRefElem.text().stripWhiteSpace();
-
- sectItem = new TOCSectionItem( this, chapItem, sectItem, sectTitle, sectRef );
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khelpcenter/view.cpp v3.5.13-sru/khelpcenter/view.cpp
---- /tmp/stable//kdebase/khelpcenter/view.cpp 2011-08-11 07:25:33.000000000 +0200
-+++ v3.5.13-sru/khelpcenter/view.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -62,7 +62,7 @@
-
- void View::copySelectedText()
- {
-- kapp->tqclipboard()->setText( selectedText() );
-+ kapp->clipboard()->setText( selectedText() );
- }
-
- bool View::openURL( const KURL &url )
-@@ -276,7 +276,7 @@
-
- void View::slotCopyLink()
- {
-- TQApplication::tqclipboard()->setText(mCopyURL);
-+ TQApplication::clipboard()->setText(mCopyURL);
- }
-
- bool View::prevPage(bool checkOnly)
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/gesturedrawer.cpp v3.5.13-sru/khotkeys/kcontrol/gesturedrawer.cpp
---- /tmp/stable//kdebase/khotkeys/kcontrol/gesturedrawer.cpp 2011-03-12 07:58:19.000000000 +0100
-+++ v3.5.13-sru/khotkeys/kcontrol/gesturedrawer.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -20,7 +20,7 @@
- GestureDrawer::GestureDrawer(TQWidget *parent, const char *name)
- : TQFrame(parent, name), _data(TQString::null)
- {
-- setBackgroundColor( tqcolorGroup().base());
-+ setBackgroundColor( colorGroup().base());
- setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
- setMinimumSize(30, 30);
- }
-@@ -33,7 +33,7 @@
- {
- _data = data;
-
-- tqrepaint();
-+ repaint();
- }
-
- void GestureDrawer::paintEvent(TQPaintEvent *ev)
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/gesturedrawer.h v3.5.13-sru/khotkeys/kcontrol/gesturedrawer.h
---- /tmp/stable//kdebase/khotkeys/kcontrol/gesturedrawer.h 2011-03-12 07:58:19.000000000 +0100
-+++ v3.5.13-sru/khotkeys/kcontrol/gesturedrawer.h 2012-07-31 17:17:50.000000000 +0200
-@@ -31,7 +31,7 @@
-
- void setData(const TQString &data);
-
-- virtual TQSize tqsizeHint() const { return TQSize(30, 30); }
-+ virtual TQSize sizeHint() const { return TQSize(30, 30); }
-
- protected:
- void paintEvent(TQPaintEvent *ev);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/gesturerecorder.cpp v3.5.13-sru/khotkeys/kcontrol/gesturerecorder.cpp
---- /tmp/stable//kdebase/khotkeys/kcontrol/gesturerecorder.cpp 2011-03-12 07:58:19.000000000 +0100
-+++ v3.5.13-sru/khotkeys/kcontrol/gesturerecorder.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -20,7 +20,7 @@
- GestureRecorder::GestureRecorder(TQWidget *parent, const char *name)
- : TQFrame(parent, name), _mouseButtonDown(false)
- {
-- setBackgroundColor( tqcolorGroup().base());
-+ setBackgroundColor( colorGroup().base());
- setFrameStyle(TQFrame::Sunken | TQFrame::Panel);
- setLineWidth(2);
- setMidLineWidth(0);
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/gesturerecordpage.cpp v3.5.13-sru/khotkeys/kcontrol/gesturerecordpage.cpp
---- /tmp/stable//kdebase/khotkeys/kcontrol/gesturerecordpage.cpp 2011-03-12 07:58:19.000000000 +0100
-+++ v3.5.13-sru/khotkeys/kcontrol/gesturerecordpage.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -43,7 +43,7 @@
- "button below.\n\nDraw here:");
-
- TQLabel *label = new TQLabel(message, this, "label");
-- label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak |
-+ label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak |
- TQLabel::AlignVCenter);
-
- _recorder = new GestureRecorder(this, "recorder");
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/kcmkhotkeys.cpp v3.5.13-sru/khotkeys/kcontrol/kcmkhotkeys.cpp
---- /tmp/stable//kdebase/khotkeys/kcontrol/kcmkhotkeys.cpp 2011-03-12 07:58:19.000000000 +0100
-+++ v3.5.13-sru/khotkeys/kcontrol/kcmkhotkeys.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -272,14 +272,14 @@
-
- void Module::import()
- {
-- TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", tqtopLevelWidget(),
-+ TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", topLevelWidget(),
- i18n( "Select File with Actions to Be Imported" ));
- if( file.isEmpty())
- return;
- KSimpleConfig cfg( file, true );
- if( !settings.import( cfg, true ))
- {
-- KMessageBox::error( tqtopLevelWidget(),
-+ KMessageBox::error( topLevelWidget(),
- i18n( "Import of the specified file failed. Most probably the file is not a valid "
- "file with actions." ));
- return;
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/main_buttons_widget.cpp v3.5.13-sru/khotkeys/kcontrol/main_buttons_widget.cpp
---- /tmp/stable//kdebase/khotkeys/kcontrol/main_buttons_widget.cpp 2011-03-12 07:58:19.000000000 +0100
-+++ v3.5.13-sru/khotkeys/kcontrol/main_buttons_widget.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -38,7 +38,7 @@
- module, TQT_SLOT( changed()));
- connect( delete_action_button, TQT_SIGNAL( clicked()),
- module, TQT_SLOT( changed()));
-- setMaximumHeight( tqsizeHint().height()); // it gets too high and I have no idea why
-+ setMaximumHeight( sizeHint().height()); // it gets too high and I have no idea why
- }
-
- void Main_buttons_widget::enable_delete( bool enable_P )
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/triggers_tab.cpp v3.5.13-sru/khotkeys/kcontrol/triggers_tab.cpp
---- /tmp/stable//kdebase/khotkeys/kcontrol/triggers_tab.cpp 2011-03-12 07:58:19.000000000 +0100
-+++ v3.5.13-sru/khotkeys/kcontrol/triggers_tab.cpp 2012-07-31 17:17:50.000000000 +0200
-@@ -241,8 +241,8 @@
-
- void Shortcut_trigger_widget::capturedShortcut( const KShortcut& s_P )
- {
-- if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, tqtopLevelWidget())
-- || KKeyChooser::checkStandardShortcutsConflict( s_P, true, tqtopLevelWidget()))
-+ if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget())
-+ || KKeyChooser::checkStandardShortcutsConflict( s_P, true, topLevelWidget()))
- return;
- // KHotKeys::Module::changed()
- module->changed();
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/ui/action_group_tab_ui.ui v3.5.13-sru/khotkeys/kcontrol/ui/action_group_tab_ui.ui
---- /tmp/stable//kdebase/khotkeys/kcontrol/ui/action_group_tab_ui.ui 2011-03-12 07:58:19.000000000 +0100
-+++ v3.5.13-sru/khotkeys/kcontrol/ui/action_group_tab_ui.ui 2012-07-31 17:17:50.000000000 +0200
-@@ -48,7 +48,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-@@ -73,7 +73,7 @@
- <property name="sizeType">
- <enum>Fixed</enum>
- </property>
-- <property name="tqsizeHint">
-+ <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
-diff -Nuar '--exclude=admin' '--exclude=cmake' '--e