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-09-08 19:41:29.000000000 +0200 @@ -46,12 +46,19 @@ - Peripherals - kde-settings-peripherals.directory + Hardware + kde-settings-hardware.directory - X-KDE-settings-peripherals + X-KDE-settings-peripherals X-KDE-settings-hardware + + Information + kde-settings-information.directory + + X-KDE-settings-information + + PowerControl 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-09-08 19:41:29.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-09-08 19:41:29.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 @@ -161,3 +174,6 @@ // kdm, kcontrol #cmakedefine WITH_XRANDR "@WITH_XRANDR@" + +// tsak +#cmakedefine BUILD_TSAK "@BUILD_TSAK@" 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-09-08 19:41:29.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-09-08 19:41:29.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: &Ctrl; &Alt; -Del could be done with &Ctrl; then &Alt; -then Del). +Delete could be done with &Ctrl; then &Alt; +then Delete). 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-09-08 19:41:29.000000000 +0200 @@ -18,9 +18,9 @@ The &kdm; Handbook - -&Oswald.Buddenhagen; &Oswald.Buddenhagen.mail; - - -/sbin/halt. The Restart: command +/sbin/halt. The Restart: command defaults to /sbin/reboot. When Show boot options 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 -lilo command and to lilo's map file. Note that this +lilo command and to lilo's map file. Note that this option is not available on all operating systems. @@ -658,7 +712,7 @@ login window. You may disable the user list in &kdm; entirely in the -Show Users section. You can choose from: +Show Users section. You can choose from: @@ -685,18 +739,18 @@ Independently of the users you specify by name, you can use the System UIDs to specify a range of valid -UIDs that are shown in the list. By default user +UIDs 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. You can also enable the Sort users -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 Autocompletion option. 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. @@ -704,12 +758,12 @@ for those images. 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. 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. @@ -725,13 +779,13 @@ options. Every option in the Convenience tab is well-suited to seriously compromise your system security. Practically, these options are only to be used in a completely non-critical -environment, ⪚ a private computer at home. +environment, ⪚ a private computer at home. Automatic Login 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 Enable Auto-login. You can choose the account to be used for automatic login from @@ -748,7 +802,7 @@ 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. Again, this option should only be used in a safe @@ -762,7 +816,7 @@ can choose Previous to have &kdm; default to the last successfully logged in user, or you can Specify 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. @@ -793,7 +847,7 @@ 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 /sbin/init under the control of the configuration file /etc/inittab. The default runlevels used by different &UNIX; systems (and different &Linux; distributions) vary, @@ -860,7 +914,7 @@ 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 @@ 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 PATH and LD_LIBRARY_PATH environment variables are consistent, and that the startup scripts are not over-riding them in @@ -968,7 +1022,7 @@ Supporting multiple window managers &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 Session Type:. If you have a very new window manager, or something that &kdm; does @@ -1031,9 +1085,9 @@ 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 shadowing 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. ;-) @@ -1042,20 +1096,20 @@ Using &kdm; for Remote Logins (&XDMCP;) &XDMCP; is the Open Group standard, the X Display Manager -Control Protocol. This is used to set up connections between +Control Protocol. This is used to set up connections between remote systems over the network. &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. 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. @@ -1079,8 +1133,8 @@ rw-rw-rw- (0666). This is because some systems don't care for the file permission of the socket files. -There are two types of sockets: the global one (dmctl) and the -per-display ones (dmctl-<display>). +There are two types of sockets: the global one (kdmctl) and the +per-display ones (kdmctl-<display>). The global one's subdir is owned by root, the subdirs of the per-display ones' are owned by the user currently owning the session (root or the @@ -1201,9 +1255,9 @@ list [all | alllocal] -Return a list of running sessions. By default all active sessions are -listed. if all is specified, passive sessions are -listed as well. If alllocal is specified, passive +Return a list of running sessions. By default all active sessions are +listed. if all is specified, passive sessions are +listed as well. If alllocal is specified, passive sessions are listed as well, but all incoming remote sessions are skipped. Each session entry is a comma separated tuple of: @@ -1272,14 +1326,14 @@ An OS choice for the next boot may be specified from the list returned by listbootoptions 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 start 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. end is the latest time at which the shutdown -should be performed if active sessions are still running. If it starts with -a plus-sign, the start time is added. -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: @@ -1288,7 +1342,7 @@ force - shut down nonetheless forcemy - shut down nonetheless if -all active sessions belong to the requesting user. Only for per-display sockets. +all active sessions belong to the requesting user. Only for per-display sockets. start and end are specified in seconds since the &UNIX; epoch. @@ -1297,7 +1351,7 @@ force and schedule for 0 -1. ask 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. @@ -1378,9 +1432,9 @@ Themes -&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 UseTheme=true to kdmrc -and Theme=/path/to/theme.xml. +and Theme=/path/to/theme.xml. --> @@ -1405,8 +1459,8 @@ &kdm; is derived from, and includes code from, &xdm; (C) Keith Packard, MIT X Consortium. -&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 +&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;. Other parts of the &kdm; code are copyright by the authors, and @@ -1428,7 +1482,7 @@ Documentation revised for &kde; 2 by &Neal.Crook; &Neal.Crook.mail;. Last update August 6, 2000 -Documentation extended and revised for &kde; 2.2 by &Oswald.Buddenhagen; &Oswald.Buddenhagen.mail;. Last update August, +Documentation extended and revised for &kde; 2.2 by &Oswald.Buddenhagen; &Oswald.Buddenhagen.mail;. Last update August, 2001 @@ -1457,7 +1511,7 @@ entropy The entropy of a system is the measure of its -unpredictability. This is used during the generation of random numbers. +unpredictability. This is used during the generation of random numbers. 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-09-08 19:41:29.000000000 +0200 @@ -0,0 +1,69 @@ +PNG + + IHDRMX. IDATxu|D.N4V"ݵ@!)Jq(-.Hlw~r9]HI̛wff  W%Aq+G +2ҹuUA$Sf]&w?< }Q *5* MGq 6]Q^9A#K S +A$+0tBЦ#IMGtA C8=gnS6iA߉Թ Sz'^[s٬՘-SRJ9=VG}EGtTbaqn{yfbK8cYYlݢZOerH j_(c!؋#k!M)_>nmfD5ئE?_\;oFMu$wз1,K ZgXo*_T|>nrcbn{ԃh.m+O z͍wV"c&X?+@7O&GF5F=\fO'u5^  ip_|n+z˔jiǞV*YsnAfY׈A{ǘL.߲8K[U +c9|p@J۷OޖmРk\ZB ~[JkPBK<|J +V^>x*տu*wn/6A^> ]2M+_u2W7OU_WB1RUMzx1q CV6n.qjzT-\s{[ZɞӶ N6( %t *')܋sI;9S&KCŶtAd8UIwbQ+שCTmjGm˛߷E!W!ͯ+GQ\~?ףbS)-Z}%\p\Ί?hh[:c oo.!6- K:]DՍξ]}s@]JcϞ}k%J)RHboMby<]ڱFj#%߾}w歽.^ +B!]R V!UB:6٫ >yVTe\>$'Sz=)n^*#wqw#@({2%)AD_֟@r̙r.2p[S1!$h(vI(VM8aU(\Tn^>,anhF "D|qҕ#[{R(<\ !a.rR}j]zpD@B=;*,z!@HR,nŰ!~PDưĸ\RoQEKUʕrӕfeRA2k~y +fDK$:oB} >'d~ŀ(!fX*A M,H(xR7% |RE(UT?wYJRgO>#C!S(A$3|Ru"_<}hFQ<% +W B3f|˼\Aqf{mj5  ^Ц#8hA tAm: 6Ay@ }A()?!jWhALϦ~_L޶ wpb_y+鮉pb \q̯x(]#8=tdj> gq)\j@66I^{.VGYyX: `M7x-%D` N%CeZw$]bQ0]5vɎ ع`MԦ[|P1K^SUS:^: +O9 +<&́R a~Ŧz;00$AĈtJaaDud5_.+xRpx=O9xj3İ[Elp )P.I +!a%8NG1q:`VI7mIsY;nNqNS,a6A )"cϽ5Eiu|RM7 !#X0X&EǛyj9¹= C(ed_"in''j)@:DT2NOf M?N@ A +0 5dHMv=\J( #Ok[˜׉{.Fn@)֦JoRIQ0}Y 5Og!2Fx}X&{ Au>D/dһʉFϧhJYӨr`/|X Y 3 ){ aY +}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^jR`uǟ'$r | !^CxS̏nLfǓ ܷKƩ? r88<TZ#%l*5ݢ^ )hxn_BM)^Ջ'—;9mԄke̡wqV 5lO7LSa}us^$<6QTnM73?mQoP¸R-^GRT0z=1Y 20 @֍ӍFe ْ.`+4m q+]Fρԭօ!j\ ]<5fMʫ[aaN-"iN*ӻH-Q {YdATis6l~u[5h4[===v$V矫Pվm:>2#[v?.nE]اasV{.|!A)YrT/`ۗl\{/>PWjާjW)e/u ޲]voggw6_ 2R9Z*`os٧ݧK +(E~ Tw╻ϼV(}Ȉ͊]/c#{a2zJ goQ>FԛW pLdC);Ͼ Nߍ"t)8}Vp Kac>E]<#]O~7.So;?kvۑE=g?ӧ<}'vJtGY0EK4xlն^"`ʧOt}ibjw>suS6O,閪![G3ԧ$~ųs'\S~ɖYսJ:B0wچy_*ť|q{b ߇.}h['RXUzFNnyv*kߒky`xEΰBX gDW +?Ͻ~")y)xBӏ %:=qa_/8zbRd " : ca4ܭԒ _:r#Kd+:̩B`"܉7(މwh X̽ Y?\>ҫ^nһpA$Al \pfdYDz/vED_7V`>EcE.m[׷{zbɛ M'eܨ3 m I?}`M4q̢N \g.Mou7XHсZ 7,5M3;.8K-une.ݫny1Vv9,b2 T!Jf\ JpedO9Pc6B-P~"̲ +um\on&&P8F4Wr\/l@:Etw?E{]]9GVa8[႑dqN S7S>DyxHV-if4 n҈?C$ꄋ~],]mɠ"\M8+^i!`ݶɚ7c&xsx-X0#Zps٥S VJENXq ] +rqa k>K.WD9 Ca,]qaSen@yBq:Q^[JL'CH_g)n g҇Xða+:Pݿl~rJזU {n}$}gӔQRB6B duߏ6?<vR8\K-u^7kZvMtrX*G{dֿ?,(d@O8p<5]B`MiۘP l;0[y;k[@2xu|av2{͘ ?u*.ʮ%CA}.߇\:}+Dկ |o_GscOKv { r\"F*+Nk`Gu; + +rQwOKIG/13Hԁ<_R^|➬;⧉}7kWqZpseavn,C\嬫 ;vч/ߥ3T9K,XZ)g;N{a?t1I)#g +<c/c -P.{`z^J4G=M}/[%9fsüsۼ3zi1Kɕ>_6hc_:E7VKZeB}I/.7kоpv w!\UjiYƅMo*\֗Rla7q1Oy}-n. `)]1q *t!c7}:u@~zuL~9Kd,1ʒ¬aT,1 9nށqBjAxߎ[jczMxyV C.4U(7ٵ[7GCR'p댪,\1lc/>&>}?aԬ{>|xr{ʥ];t&MTU@g +׬2e=Y9[&L;j;T@|sfqn>-yl(cF +v>[ң]=4'xV] ᡻ +rDQ ]ux7nk||^(%D)#JQ0B +/`D"TDC,P 3*`HjTpb4VIhOJYėio)=kt3{_PzrYH"aZ5xϢuV/5ljj|nڸ!CjjE&u uC[eDf] +-WCebv`q7;r5FMm_,DVpIן x]G+ǿ8c͕H.{.v` IDAT veIYp<x`xxQ8ll +A=ڕbO=aY² Gi|Hz5,D=a D'` diK|Zjhшױj_`j000LTh:o1{.fﺽ=vӷIZE]x!zi,r{:~1I:T^EJjдYfB-B]n$ʉv`d?ٹp.^>*йuU/*Xf-ᷞyRJ>Š*Wu2? ǚ QET ܺq1[f_9]%vE+XSxiFLZͽr÷=ŸyqT:j9Sで`xK2Cr@:ֺ +Q 7c/{q`o?sfWfLp>̬}<}^>~qҕ#[{C)E\Fd 1tֺDie X`"æu@x$^L0!WPE):NN0n$ u.t`!h#>1(a,f]8z oiުVG|e2 +<<NWغWۺ_cT&YȽt`xm8%PJ 9U# aA߈#(ˀRN8?*j)/bhytiLBG(UPI[c*^zxud.q4N&3;}bTK8zؘ\>Af)"~|2aR0PU00ZW)J"+[:d ]xs/% +x'|0gڮ ȿ^qA`,9~憳uz==|GaXfVx՞\W~|mbxG&ixg{ٳ-¿\E#Sw+d 2 v~7yX\ +o1jEDs>Cr;4x?1BMy{F 0#d^(˂%zaͥF|n?<,yW+myWɖ(hz/Ȕ 7}/B)-hApdN 5QY cːd,mX9]pAs5#oN\*\ftBxxA$;w>p !rVj! <2 +<,,,1pi?a=Gi\0b4κ8=;!۱sE0%POAFg,O.Xs"x_7HoYp<6NFhھ8 b}6Mj9V{Q[&XST7E嫚u$6E㨖5Sn0NusO\zsQAtgKR݈_~iF_O-x@Q=Or "7Ow1݅L̯jX$tAK9%Opi,A$v `Ц#8hA tA}/F 9lA- 6Ay@ 8dņ9+׊g"TPieC]b2 mPgt58;bf~'"Ε#7/uYc4sK z25NgXw@Pa@tW,ԓC.e_6~c/Silz-Vm\iGqaNҀaK4 uJltLL2L -Qi"?g?;֊VK +!\PUV( +g]6FjU[ؒ$1ÿդRv]GzZZjo,K`o꧚<4{3N VUB]]gƩ~#-/0J׾yx}g(RܣӏZ:OE{ߋOic/=UCta$UZ{Mt +w>w?'X6!Iӑq)_;r8Xkw-0ʌ:͖Dtx]U*hW;. 3DQɏ[VNOv ~s钟 GaW^?@VPhynD]ӭh 0$};n^ػdx5xO^L! _t} 4;S@Y$g`h _h }? _VJ叟9 +iD@ +G%[$s)8'xZҮkVjXŒ+`E<{ШMm=NeyMȽE" c9@AG*"մ=z#`a^z!MOYx+Mok'C9upj\%?ڿX_i F6-eFWٵ$W+io]D5tL ~ydRP?\5zαwkg0aV%KQVUBnW?yAsC"Ej9VMKPJm bBv 'fu*H w +UZ+Ԋ~ܕW.~{#,2sQk7O9+F {:N;d@fSfJϕ^~w,Oq^< (ҪvQ̅?Mb\B]N&T.q?K <ǰk~wa5eVn8הR&m x ,3mG_ǫ[g YS(4"JDy[W…;w,&KzҥA g h?zVR^e` b5ؗK-D26fm2{!L߶Wv@$qהӾe͍omQ-z&]{PQx뺠˵^?YҞu7D]}fK䷜yg=4wWWyY[a"̺X.n=fDI/fb)ICO}wϦ r"sWE$-Cv*(:CM4W'5zxoFߨ){.iޕ#`1s|mXSrEhF%z_M?a%!n=^pQow%ȼk]n6m\n #WndF7>K1<ڰ,<+\UE:{{h1PUEů־-S."SyT] +}mPJVXTe(W;w+דUUu0 UB:60}\r|y?|Yi{0de,!V,mhƥvX-RvG'N+Dտ4h"NG[]݊_ȰvUxs)_5i[# ޏ6vPQHAKz;_}?4k;WOl"ؾlv➦_o Nj4G3oӦ+'bni?hq/߻jlݡWߏR?ꇝ{9}*98rGlOqZ~޵-& $Q\Hj +B]F.Nb`  #~raדʫMj}$Y_Kor҈ ]ҹ!v7NyݷM<۽-H3;CESoa̪2؃uu[^Ǭ-%wB+[eo&$<)Dտe8d|/C%ܾ +{y kgV ϝڬB>9(Y3jت-9ѶidMR=4:"lǬ-%[}_(Qx%5k݅(-e-Vo(Qh-CmnwͰvfUx +$U5[rt‹c&DEErYlӥ|'N/_hF!fZMZPԈS?g^LIUeNy---g֜X! o BMUw,xu9ugzan#^`1ux[{[6LO̠\m^3aiV_Vx͚}o[|xa^;(d.uQRڒSD vHNsvo!}pV7clU-mYp%J|4*~p]>EWS /w7E +o )g(u Z8sТ...և (f #3"*d;V;F1*vg%oէVPM +>.@2K.5u-LQx3Y"9`6j9x^ZOV&R\<8`⽉SJjjc?NBD{TƖ3:~+ϴ<~yoyZOkm9klhSwq! o B\1@dc[y >T۴ox"}a'Iyڒ[էb5IľsyjXa 9t_ĢeX;K1aOٵGҖ<"%vDEEraeҚ&oI Z=ø keӱ2./ZЕش_eN9fҋxMZ?u ʻx3M(_fGRH)ݎ1M3K/)#S*]Wwθ^6xI7X3SǺ)]K/Dۿ_Vd|5!Uΰv{fœ)3Vh3?Җ<"%v>a9R%sn#%njos˓YirZ':]/<[쟍im Y^yD|+G~q:ĩ9wu'06J4h6ӄ`ߌS#\_A.]sgf$䴶B :FqЦ#8hA CmzG0r9\<$gj:/n-eY'Lå5Oĝ]dU>ٗa#*e5?,EJkgd_$g'_e.mv'qvW;jݝ>2A}?A#C" r25N~ nhN-R^/ANzFa鍙zpp5w6Vk[! +ƶ2lL/JkW +"ބ%zCi(%[VĮ26]7|r;Wެn/~hS6W 1k3Dj!%C3FY4 /ձkjMj뮛> Y'pH-ޖx+hmm{QqpN3luv|- FѬ޴K.ǹWVbn^D5QK6۱Vz!YI'.]'*"!Q< +aKynޑΫYB/42q$ڨ /QȬ"{2JwmˡmݮvB$wBW-*'EUwcRm;cDs{Tw")8J%9t_4z\2K͎s T`6IDATE F|5gf (e53(F&="œI -vQ6]h[m]ny#Y'KMK$w2^Y-l$X:T]ҽqӜω4to"8(ٲ"tw.Cy.h&zLZ8U([^iȤtSD:BxR>`[yqKwysdt'"m]f_o6/F"TYZ[x7-/v36,3L4to"8(ٲ"twK."c=ʠdh4ʖ~>RsA$QLzN7E#'GqtysdMXgnQVqnXhcޢ%?nX، ǸR5]4tofGɖd޻@fZ*Y٪JH()T\cj^A#\<[#7d?'&BD+Hcb<ؒ&G: +]ޢ%?2C4b;cSޝ_ +>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'/9\ώ1 ȧu&\I?3;|npϱzɨK7"AC ky̢>Pipr8hqAr&~B~[qD/s/ tAm: 6Ay@ 1nQDAA<d`A\9s d)IENDB` \ 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-09-08 19:41:29.000000000 +0200 @@ -355,9 +355,9 @@ Move to Trash and Delete options. -Del will move the selected item or items to Trash. +Delete will move the selected item or items to Trash. -&Shift;Del +&Shift;Delete will really, truly and irrevocably delete the selected item or items. diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/doc/userguide/kde-for-admins.docbook v3.5.13-sru/doc/userguide/kde-for-admins.docbook --- /tmp/stable//kdebase/doc/userguide/kde-for-admins.docbook 2011-08-21 09:08:15.000000000 +0200 +++ v3.5.13-sru/doc/userguide/kde-for-admins.docbook 2012-09-08 19:41:29.000000000 +0200 @@ -332,7 +332,7 @@ -share/doc/HTML +share/doc/tde/HTML This directory contains documentation for &kde; applications. Documentation is categorized by language and the application it belongs to. Normally at least two files can be found in 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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( + "Sets the number of recent files remembered by Kate.

NOTE: " + "If you set this lower than the current value, the list will be truncated and " + "some items forgotten.") ); + 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; iplugin == 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; iapply(); + editorPages.at(i)->apply(); } v->getDoc()->writeConfig(config); @@ -425,7 +450,7 @@ // for (uint i=0; ipage->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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -191,7 +191,7 @@ // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<(wv->tqtopLevelWidget()); + KateMDI::MainWindow *dmw=tqt_dynamic_cast(wv->topLevelWidget()); if (!dmw) { // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<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-09-08 19:41:29.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 ) ); } @@ -102,7 +102,7 @@ addColumn("Document Name"); setSelectionMode( TQListView::Single ); - setSorting( 0, true ); + setSortType(KateFileList::sortByID); setShowToolTips( false ); setupActions (); @@ -138,8 +138,14 @@ windowPrev = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotNextDocument()), m_main->actionCollection()); sortAction = new KSelectAction( i18n("Sort &By"), 0, m_main->actionCollection(), "filelist_sortby" ); + listMoveFileUp = new KAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" ); + //listMoveFileUp->setShortcut(KShortcut(CTRL + SHIFT + Key_Comma)); + listMoveFileDown = new KAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" ); + //listMoveFileDown->setShortcut(KShortcut(CTRL + SHIFT + Key_Period)); + connect( listMoveFileUp, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileUp()) ); + connect( listMoveFileDown, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileDown()) ); TQStringList l; - l << i18n("Opening Order") << i18n("Document Name") << i18n("URL"); + l << i18n("Opening Order") << i18n("Document Name") << i18n("URL") << i18n("Manual Placement"); sortAction->setItems( l ); connect( sortAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setSortType(int)) ); } @@ -272,8 +278,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 +340,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 +348,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 ) ); } } @@ -353,10 +359,25 @@ if (!item) return; + m_clickedMenuItem = item; + if (m_clickedMenuItem->itemAbove()) { + listMoveFileUp->setEnabled(true); + } + else { + listMoveFileUp->setEnabled(false); + } + if (m_clickedMenuItem->itemBelow()) { + listMoveFileDown->setEnabled(true); + } + else { + listMoveFileDown->setEnabled(false); + } + TQPopupMenu *menu = (TQPopupMenu*) ((viewManager->mainWindow())->factory()->container("filelist_popup", viewManager->mainWindow())); - if (menu) + if (menu) { menu->exec(p); + } } TQString KateFileList::tooltip( TQListViewItem *item, int ) @@ -385,7 +406,49 @@ void KateFileList::setSortType (int s) { m_sort = s; - updateSort (); + if (m_sort == KateFileList::sortManual) { + setSorting( -1, true ); + setDragEnabled(true); + setAcceptDrops(true); + } + else { + setSorting( 0, true ); + setDragEnabled(false); + setAcceptDrops(false); + updateSort (); + } +} + +void KateFileList::moveFileUp() +{ + if (m_clickedMenuItem) { + sortAction->setCurrentItem(KateFileList::sortManual); + setSortType(KateFileList::sortManual); + TQListViewItem* nitemabove = m_clickedMenuItem->itemAbove(); + if (nitemabove) { + nitemabove = nitemabove->itemAbove(); + if (nitemabove) { + m_clickedMenuItem->moveItem(nitemabove); + } + else { + // Qt made this hard + nitemabove = m_clickedMenuItem->itemAbove(); + nitemabove->moveItem(m_clickedMenuItem); + } + } + } +} + +void KateFileList::moveFileDown() +{ + if (m_clickedMenuItem) { + sortAction->setCurrentItem(KateFileList::sortManual); + setSortType(KateFileList::sortManual); + TQListViewItem* nitemabove = m_clickedMenuItem->itemBelow(); + if (nitemabove) { + m_clickedMenuItem->moveItem(nitemabove); + } + } } void KateFileList::updateSort () @@ -441,6 +504,11 @@ m_edithistpos( 0 ), m_docNumber( _doc->documentNumber() ) { + // Move this document to the end of the list where it belongs + TQListViewItem* lastitem = lv->lastItem(); + if (lastitem) { + moveItem(lastitem); + } } KateFileListItem::~KateFileListItem() @@ -616,7 +684,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/katefilelist.h v3.5.13-sru/kate/app/katefilelist.h --- /tmp/stable//kdebase/kate/app/katefilelist.h 2011-03-12 07:57:34.000000000 +0100 +++ v3.5.13-sru/kate/app/katefilelist.h 2012-09-08 19:41:29.000000000 +0200 @@ -90,7 +90,8 @@ enum sorting { sortByID = 0, sortByName = 1, - sortByURL = 2 + sortByURL = 2, + sortManual = 3 }; TQString tooltip( TQListViewItem *item, int ); @@ -111,6 +112,8 @@ public slots: void setSortType (int s); + void moveFileUp(); + void moveFileDown(); void slotNextDocument(); void slotPrevDocument(); @@ -151,6 +154,8 @@ KAction* windowNext; KAction* windowPrev; KSelectAction* sortAction; + KAction* listMoveFileUp; + KAction* listMoveFileDown; TQPtrList m_viewHistory; TQPtrList m_editHistory; @@ -158,6 +163,8 @@ TQColor m_viewShade, m_editShade; bool m_enableBgShading; + TQListViewItem *m_clickedMenuItem; + class ToolTip *m_tooltip; }; 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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 KateMailDialog::selectedDocs() @@ -105,8 +105,8 @@ lInfo->setText( i18n("Press Mail... 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-09-08 19:41:29.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-09-08 19:41:29.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 l=KateDocManager::self()->documentList(); for (uint i=0;ireloadXML(); - TQPtrList l1=l.tqat(i)->views ();//KTextEditor::Document + l.at(i)->reloadXML(); + TQPtrList l1=l.at(i)->views ();//KTextEditor::Document for (uint i1=0;i1reloadXML(); + l1.at(i1)->reloadXML(); // kdDebug(13001)<<"reloading Keysettings for view "<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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -152,7 +152,7 @@ m_documentRoot=new TQListViewItem(m_list,i18n("Documents")); const uint docCnt=documents.count(); for (uint i=0;isetOpen(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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -316,7 +316,7 @@ { uint viewCount=0; for (uint i=0;iviewCount(); + viewCount+=m_viewSpaceContainerList.at(i)->viewCount(); } return viewCount; @@ -326,7 +326,7 @@ { uint viewSpaceCount=0; for (uint i=0;iviewSpaceCount(); + viewSpaceCount+=m_viewSpaceContainerList.at(i)->viewSpaceCount(); } return viewSpaceCount; } @@ -334,7 +334,7 @@ void KateViewManager::setViewActivationBlocked (bool block) { for (uint i=0;im_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;icloseViews(documentNumber); + m_viewSpaceContainerList.at(i)->closeViews(documentNumber); } tabChanged(m_currentContainer); } @@ -454,7 +454,7 @@ { showFullPath=enable; for (uint i=0;isetShowFullPath(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;isaveViewConfiguration(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;irestoreViewConfiguration(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-09-08 19:41:29.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-09-08 19:41:29.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( tqtopLevelWidget() ); + KMainWindow* mainWindow = static_cast( topLevelWidget() ); TQPopupMenu* menu = static_cast( 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-09-08 19:41:29.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/data/kateui.rc v3.5.13-sru/kate/data/kateui.rc --- /tmp/stable//kdebase/kate/data/kateui.rc 2010-08-12 05:29:24.000000000 +0200 +++ v3.5.13-sru/kate/data/kateui.rc 2012-09-08 19:41:29.000000000 +0200 @@ -162,6 +162,9 @@ + + +

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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -95,7 +95,7 @@ Fixed - + 20 20 @@ -244,7 +244,7 @@ Fixed - + 20 20 @@ -338,7 +338,7 @@ Expanding - + 0 15 @@ -363,7 +363,7 @@ Expanding - + 20 0 @@ -420,7 +420,7 @@ Fixed - + 20 20 @@ -534,7 +534,7 @@ Fixed - + 20 20 @@ -625,7 +625,7 @@ Fixed - + 20 20 @@ -683,7 +683,7 @@ Expanding - + 21 61 @@ -789,7 +789,7 @@ Ma&ximum speed: - + AlignVCenter|AlignRight @@ -806,7 +806,7 @@ Acceleration &time: - + AlignVCenter|AlignRight @@ -895,7 +895,7 @@ Fixed - + 20 20 @@ -944,7 +944,7 @@ &Repeat interval: - + AlignVCenter|AlignRight @@ -992,7 +992,7 @@ Acceleration &profile: - + AlignVCenter|AlignRight @@ -1087,7 +1087,7 @@ &Acceleration delay: - + AlignVCenter|AlignRight @@ -1108,7 +1108,7 @@ Expanding - + 20 1 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -12,7 +12,7 @@ 613 - + 0 450 @@ -227,7 +227,7 @@ Expanding - + 173 20 @@ -256,7 +256,7 @@ Expanding - + 40 20 @@ -289,7 +289,7 @@ Expanding - + 40 20 @@ -308,7 +308,7 @@ Expanding - + 20 0 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-09-08 19:41:29.000000000 +0200 @@ -133,7 +133,7 @@ Fixed - + 20 20 @@ -189,7 +189,7 @@ Expanding - + 0 20 @@ -252,7 +252,7 @@ Expanding - + 0 20 @@ -345,7 +345,7 @@ Expanding - + 20 60 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -91,7 +91,7 @@ Expanding - + 20 20 @@ -138,7 +138,7 @@ false - + 400 0 @@ -223,7 +223,7 @@ Expanding - + 220 20 @@ -376,7 +376,7 @@ Expanding - + 20 20 @@ -395,7 +395,7 @@ Expanding - + 20 16 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -105,7 +105,7 @@ Expanding - + 0 0 @@ -132,7 +132,7 @@ 0 - + 100 0 @@ -161,7 +161,7 @@ Minimum - + 4 20 @@ -197,7 +197,7 @@ Minimum - + 4 20 @@ -219,7 +219,7 @@ Minimum - + 4 20 @@ -255,7 +255,7 @@ Minimum - + 4 20 @@ -277,7 +277,7 @@ Minimum - + 4 20 @@ -313,7 +313,7 @@ Minimum - + 4 20 @@ -333,7 +333,7 @@ MinimumExpanding - + 20 0 @@ -522,7 +522,7 @@ Fixed - + 120 10 @@ -539,7 +539,7 @@ Fixed - + 130 10 @@ -613,7 +613,7 @@ Expanding - + 260 20 @@ -641,7 +641,7 @@ Expanding - + 110 16 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -69,7 +69,7 @@ Expanding - + 20 20 @@ -98,7 +98,7 @@ 0 - + 300 100 @@ -123,7 +123,7 @@ Expanding - + 20 20 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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(result))); + m_local->setText(localZone.arg(KTimezoneWidget::displayName(m_zoneDb.local())).arg(static_cast(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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -86,7 +86,7 @@ Fixed - + 20 20 @@ -134,7 +134,7 @@ Expanding - + 20 20 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-09-08 19:41:29.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(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-09-08 19:41:29.000000000 +0200 @@ -91,7 +91,7 @@ - + WordBreak|AlignTop 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-09-08 19:41:29.000000000 +0200 @@ -26,7 +26,7 @@ - + WordBreak|AlignVCenter @@ -45,7 +45,7 @@ Expanding - + 0 91 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-09-08 19:41:29.000000000 +0200 @@ -73,7 +73,7 @@ 0 - + 0 0 @@ -126,7 +126,7 @@ Expanding - + 0 16 @@ -165,7 +165,7 @@ Fixed - + 30 16 @@ -182,7 +182,7 @@ Fixed - + 30 16 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-09-08 19:41:29.000000000 +0200 @@ -57,7 +57,7 @@ Expanding - + 0 87 @@ -82,7 +82,7 @@ Fixed - + 31 20 @@ -120,7 +120,7 @@ 0 - + 0 0 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -103,7 +103,7 @@ Fixed - + 16 20 @@ -157,7 +157,7 @@ Fixed - + 16 20 @@ -185,7 +185,7 @@ Expanding - + 451 20 @@ -206,7 +206,7 @@ Expanding - + 20 50 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-09-08 19:41:29.000000000 +0200 @@ -243,7 +243,7 @@ Expanding - + 0 20 @@ -273,7 +273,7 @@ Expanding - + 20 0 @@ -315,7 +315,7 @@ Expanding - + 0 20 @@ -412,7 +412,7 @@ Expanding - + 0 20 @@ -429,7 +429,7 @@ Fixed - + 21 20 @@ -446,7 +446,7 @@ Fixed - + 20 20 @@ -463,7 +463,7 @@ Expanding - + 0 20 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-09-08 19:41:29.000000000 +0200 @@ -37,7 +37,7 @@ Expanding - + 20 20 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-09-08 19:41:29.000000000 +0200 @@ -65,7 +65,7 @@ Expanding - + 20 20 @@ -310,7 +310,7 @@ Expanding - + 20 20 @@ -403,7 +403,7 @@ Expanding - + 20 20 @@ -420,7 +420,7 @@ Expanding - + 20 20 @@ -597,7 +597,7 @@ Expanding - + 20 20 @@ -649,7 +649,7 @@ Expanding - + 20 20 @@ -749,7 +749,7 @@ Expanding - + 20 20 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -20,7 +20,7 @@ 0 - + 0 0 @@ -204,7 +204,7 @@ Expanding - + 130 21 @@ -264,7 +264,7 @@ Expanding - + 90 20 @@ -281,7 +281,7 @@ Expanding - + 90 21 @@ -300,7 +300,7 @@ Expanding - + 50 110 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -161,7 +161,7 @@ Expanding - + 21 170 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -168,7 +168,7 @@ Expanding - + 20 20 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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 = "" + hint + ""; Widget = new TQLabel("" + title + "", 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -57,7 +57,7 @@ Expanding - + 20 20 @@ -74,7 +74,7 @@ Expanding - + 20 20 @@ -112,7 +112,7 @@ 0 - + 150 115 @@ -181,10 +181,10 @@ - cb_pointertqshape + cb_pointershape - Cha&nge pointer tqshape over icons + Cha&nge pointer shape over icons true @@ -208,7 +208,7 @@ Fixed - + 20 60 @@ -235,7 +235,7 @@ slAutoSelect - + 250 0 @@ -258,7 +258,7 @@ Expanding - + 230 20 @@ -283,7 +283,7 @@ Long - + AlignVCenter|AlignRight @@ -301,7 +301,7 @@ Fixed - + 20 21 @@ -331,7 +331,7 @@ Expanding - + 20 16 @@ -344,7 +344,7 @@ singleClick toggled(bool) - cb_pointertqshape + cb_pointershape setEnabled(bool) @@ -364,7 +364,7 @@ rightHanded leftHanded singleClick - cb_pointertqshape + cb_pointershape cbAutoSelect slAutoSelect doubleClick 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-09-08 19:41:29.000000000 +0200 @@ -31,7 +31,7 @@ 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. - + WordBreak|AlignVCenter 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -131,7 +131,7 @@ , _module(0L) { _busyw = new TQLabel(i18n("Loading..."), 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -42,7 +42,7 @@ helptext = text; else helptext = (text + i18n("

Use the \"What's This?\" (Shift+F1) to get help on specific options.

To read the full manual click here.

") - .tqarg(static_cast(docPath.local8Bit()))); + .arg(static_cast(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-09-08 19:41:29.000000000 +0200 @@ -30,9 +30,9 @@ TQLabel *label = new TQLabel(i18n("You need super user privileges to run this control module.
" "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-09-08 19:41:29.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-09-08 19:41:29.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("Loading..."), _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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -21,7 +21,9 @@ #include #include - +#include +#include +#include #include #include @@ -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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -83,13 +83,13 @@ label->setText(i18n("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 " "KDE menu editor.")); - 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -163,7 +163,7 @@ TQChar space(' '); for(int c=0; c0x7E) + 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -439,7 +439,7 @@ ch; for(ch=0; chcharset, 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -71,7 +71,7 @@ Expanding - + 101 20 @@ -145,7 +145,7 @@ Expanding - + 21 20 @@ -194,7 +194,7 @@ Expanding - + 20 21 @@ -208,7 +208,7 @@ Min - + AlignVCenter|AlignLeft @@ -225,7 +225,7 @@ Expanding - + 81 20 @@ -250,7 +250,7 @@ Max - + AlignVCenter|AlignRight 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-09-08 19:41:29.000000000 +0200 @@ -112,7 +112,7 @@ Expanding - + 20 20 @@ -123,7 +123,7 @@ pb_add - + 0 0 @@ -143,7 +143,7 @@ Minimum - + 20 20 @@ -162,7 +162,7 @@ 0 - + 0 0 @@ -182,7 +182,7 @@ Expanding - + 20 20 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -62,7 +62,7 @@ Expanding - + 342 20 @@ -92,7 +92,7 @@ Fixed - + 30 20 @@ -179,7 +179,7 @@ Expanding - + 20 20 @@ -299,7 +299,7 @@ Expanding - + 20 20 @@ -332,7 +332,7 @@ Fixed - + 50 10 @@ -401,7 +401,7 @@ Expanding - + 20 20 @@ -439,7 +439,7 @@ Expanding - + 20 20 @@ -467,7 +467,7 @@ Fixed - + 30 20 @@ -532,7 +532,7 @@ Expanding - + 20 20 @@ -557,7 +557,7 @@ Fast - + AlignVCenter|AlignRight @@ -573,7 +573,7 @@ Expanding - + 20 20 @@ -598,7 +598,7 @@ Medium - + AlignCenter @@ -637,7 +637,7 @@ Expanding - + 20 16 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-09-08 19:41:29.000000000 +0200 @@ -359,7 +359,7 @@ Expanding - + 66 130 @@ -389,7 +389,7 @@ Fixed - + 20 20 @@ -428,13 +428,13 @@ 0 - + 50 50 - + 50 50 @@ -449,7 +449,7 @@ true - + AlignCenter @@ -527,7 +527,7 @@ Expanding - + 289 20 @@ -546,7 +546,7 @@ Expanding - + 20 0 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -63,7 +63,7 @@ Expanding - + 40 20 @@ -197,7 +197,7 @@ MinimumExpanding - + 20 0 @@ -261,13 +261,13 @@ 0 - + 26 26 - + 26 26 @@ -327,7 +327,7 @@ Expanding - + 20 20 @@ -345,7 +345,7 @@ MinimumExpanding - + 20 0 @@ -389,7 +389,7 @@ 1 - + 0 0 @@ -487,7 +487,7 @@ Expanding - + 20 0 @@ -558,7 +558,7 @@ Expanding - + 20 0 @@ -654,7 +654,7 @@ Expanding - + 20 0 @@ -698,7 +698,7 @@ Expanding - + 20 0 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -66,7 +66,7 @@ Expanding - + 342 20 @@ -104,7 +104,7 @@ Expanding - + 20 0 @@ -123,7 +123,7 @@ 0 - + 151 115 @@ -132,7 +132,7 @@ true - + AlignCenter @@ -149,7 +149,7 @@ Expanding - + 20 0 @@ -176,7 +176,7 @@ Expanding - + 20 0 @@ -235,7 +235,7 @@ Expanding - + 0 101 @@ -357,7 +357,7 @@ Expanding - + 16 16 @@ -426,7 +426,7 @@ Fixed - + 30 40 @@ -538,7 +538,7 @@ Expanding - + 20 0 @@ -555,7 +555,7 @@ Expanding - + 21 0 @@ -590,13 +590,13 @@ 0 - + 32 16 - + 32 16 @@ -624,13 +624,13 @@ 0 - + 32 16 - + 32 16 @@ -658,13 +658,13 @@ 0 - + 32 16 - + 32 16 @@ -702,13 +702,13 @@ 0 - + 16 24 - + 16 24 @@ -736,13 +736,13 @@ 0 - + 16 24 - + 16 24 @@ -770,13 +770,13 @@ 0 - + 16 24 - + 16 24 @@ -814,13 +814,13 @@ 0 - + 32 16 - + 32 16 @@ -848,13 +848,13 @@ 0 - + 32 16 - + 32 16 @@ -882,13 +882,13 @@ 0 - + 32 16 - + 32 16 @@ -926,13 +926,13 @@ 0 - + 16 24 - + 16 24 @@ -960,13 +960,13 @@ 0 - + 16 24 - + 16 24 @@ -994,13 +994,13 @@ 0 - + 16 24 - + 16 24 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-09-08 19:41:29.000000000 +0200 @@ -29,7 +29,7 @@ Fixed - + 16 21 @@ -88,7 +88,7 @@ MinimumExpanding - + 0 21 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -119,7 +119,7 @@ MinimumExpanding - + 21 62 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -161,7 +161,7 @@ MinimumExpanding - + 20 16 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -115,7 +115,7 @@ Fixed - + 16 20 @@ -300,7 +300,7 @@ Fixed - + 16 20 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-09-08 19:41:29.000000000 +0200 @@ -137,7 +137,7 @@ sbHttp - + 32767 32767 @@ -160,7 +160,7 @@ Minimum - + 51 20 @@ -280,7 +280,7 @@ Expanding - + 20 114 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -140,7 +140,7 @@ for (uint i=0; i> 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-09-08 19:41:29.000000000 +0200 @@ -127,7 +127,7 @@ _c_customPath - + 0 20 @@ -211,7 +211,7 @@ _c_newPath - + 0 25 @@ -236,7 +236,7 @@ MinimumExpanding - + 20 20 @@ -281,7 +281,7 @@ Expanding - + 20 0 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -117,7 +117,7 @@ MinimumExpanding - + 21 16 @@ -142,7 +142,7 @@ MinimumExpanding - + 29 20 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-09-08 19:41:29.000000000 +0200 @@ -117,7 +117,7 @@ Fixed - + 16 20 @@ -310,7 +310,7 @@ Expanding - + 21 16 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-09-08 19:41:29.000000000 +0200 @@ -84,7 +84,7 @@ Fixed - + 20 20 @@ -109,7 +109,7 @@ Expanding - + 20 20 @@ -140,7 +140,7 @@ Expanding - + 233 20 @@ -205,7 +205,7 @@ Fixed - + 20 20 @@ -265,7 +265,7 @@ Expanding - + 20 16 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-09-08 19:41:29.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-09-08 19:41:29.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(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-09-08 19:41:29.000000000 +0200 @@ -22,6 +22,7 @@ #define desktopbehavior_h #include "desktopbehavior.h" +#include "tqlistview.h" #include #include 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-09-08 19:41:29.000000000 +0200 @@ -74,7 +74,7 @@ Fixed - + 20 0 @@ -268,7 +268,7 @@ Expanding - + 191 80 @@ -287,7 +287,7 @@ Expanding - + 20 16 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kcontrol/konq/previews.cpp v3.5.13-sru/kcontrol/konq/previews.cpp --- /tmp/stable//kdebase/kcontrol/konq/previews.cpp 2011-03-12 07:57:41.000000000 +0100 +++ v3.5.13-sru/kcontrol/konq/previews.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -67,14 +67,14 @@ setQuickHelp( i18n("

Preview Options

Here you can modify the behavior " "of Konqueror when it shows the files in a folder." - "

The list of protocols:

check the protocols over which " + "

The list of protocols:

Check the protocols over which " "previews should be shown; uncheck those over which they should not. " "For instance, you might want to show previews over SMB if the local " "network is fast enough, but you might disable it for FTP if you often " "visit very slow FTP sites with large images." - "

Maximum File Size:

select the maximum file size for which " - "previews should be generated. For instance, if set to 1 MB (the default), " - "no preview will be generated for files bigger than 1 MB, for speed reasons.")); + "

Maximum File Size:

Select the maximum file size for which " + "previews should be generated. For instance, if set to 10 MB (the default), " + "no preview will be generated for files bigger than 10 MB, for speed reasons.")); // Listview containing checkboxes for all protocols that support listing KListView *listView = new KListView( this, "listView" ); @@ -152,8 +152,8 @@ load(); } -// Default: 1 MB -#define DEFAULT_MAXSIZE (1024*1024) +// Default: 10 MB +#define DEFAULT_MAXSIZE (1024*1024*10) void KPreviewOptions::load(bool useDefaults) { @@ -171,7 +171,7 @@ else it.current()->setOn( group.readBoolEntry( protocol, false ) ); } - // config key is in bytes (default value 1MB), numinput is in MB + // config key is in bytes (default value 10MB), numinput is in MB m_maxSize->setValue( ((double)group.readNumEntry( "MaximumSize", DEFAULT_MAXSIZE )) / (1024*1024) ); m_boostSize->setChecked( group.readBoolEntry( "BoostSize", false /*default*/ ) ); 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-09-08 19:41:29.000000000 +0200 @@ -138,7 +138,7 @@ Expanding - + 20 0 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -72,7 +72,7 @@ Expanding - + 20 20 @@ -96,7 +96,7 @@ GroupBox1 - + 300 0 @@ -184,7 +184,7 @@ Expanding - + 20 20 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -55,7 +55,7 @@ Expanding - + 20 20 @@ -184,7 +184,7 @@ Expanding - + 20 20 @@ -282,7 +282,7 @@ Expanding - + 20 20 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-09-08 19:41:29.000000000 +0200 @@ -108,7 +108,7 @@ Expanding - + 20 20 @@ -158,7 +158,7 @@ Fixed - + 20 20 @@ -357,7 +357,7 @@ Expanding - + 20 20 @@ -389,7 +389,7 @@ Fixed - + 20 20 @@ -498,13 +498,13 @@ 0 - + 180 120 - + 180 120 @@ -540,7 +540,7 @@ Expanding - + 20 20 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -184,13 +184,13 @@ previewIcon - + 100 100 - + 100 100 @@ -212,7 +212,7 @@ 0 - + 90 100 @@ -221,7 +221,7 @@ &Icon: - + AlignTop|AlignLeft @@ -280,7 +280,7 @@ Expanding - + 20 20 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -60,7 +60,7 @@ MinimumExpanding - + 170 20 @@ -109,7 +109,7 @@ Box - + AlignCenter @@ -211,13 +211,13 @@ 0 - + 80 60 - + 32767 60 @@ -251,13 +251,13 @@ 0 - + 80 60 - + 32767 60 @@ -291,13 +291,13 @@ 0 - + 80 60 - + 32767 60 @@ -331,13 +331,13 @@ 0 - + 80 60 - + 32767 60 @@ -371,13 +371,13 @@ 0 - + 80 60 - + 32767 60 @@ -411,13 +411,13 @@ 0 - + 80 60 - + 32767 60 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-09-08 19:41:29.000000000 +0200 @@ -88,7 +88,7 @@ Co&mment: - + AlignTop 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -101,7 +101,7 @@ Expanding - + 40 20 @@ -138,7 +138,7 @@ Expanding - + 20 160 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-09-08 19:41:29.000000000 +0200 @@ -55,7 +55,7 @@ Expanding - + 20 40 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-09-08 19:41:29.000000000 +0200 @@ -79,13 +79,13 @@ 0 - + 0 50 - + 32767 200 @@ -114,13 +114,13 @@ selectAllButton - + 80 0 - + 32767 32767 @@ -134,13 +134,13 @@ selectNoneButton - + 80 0 - + 32767 32767 @@ -160,7 +160,7 @@ Maximum - + 80 20 @@ -179,7 +179,7 @@ 0 - + 32767 32767 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -19,6 +19,7 @@ #ifndef KRANDRAPP_H #define KRANDRAPP_H +#include #include 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -69,7 +69,7 @@ Expanding - + 31 20 @@ -153,7 +153,7 @@ Expanding - + 41 20 @@ -256,7 +256,7 @@ Expanding - + 20 20 @@ -321,7 +321,7 @@ Expanding - + 21 20 @@ -346,7 +346,7 @@ Expanding - + 31 20 @@ -365,7 +365,7 @@ Expanding - + 20 20 @@ -382,7 +382,7 @@ Expanding - + 20 20 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -23,7 +23,7 @@ <b>Unable to contact the KDE smartcard service.</b> - + WordBreak|AlignVCenter @@ -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. - + WordBreak|AlignVCenter @@ -64,7 +64,7 @@ Expanding - + 20 20 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-09-08 19:41:29.000000000 +0200 @@ -74,7 +74,7 @@ Fixed - + 15 20 @@ -118,7 +118,7 @@ Expanding - + 20 20 @@ -250,7 +250,7 @@ To add new readers you have to modify /etc/readers.conf file and re-start pcscd - + WordBreak|AlignVCenter 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -62,6 +62,17 @@ O&ffer shutdown options + + + showLogoutStatusDialog + + + Show logout stat&us dialog + + + Check this option if you want to see a dialog box showing the logout status. + + @@ -190,7 +201,7 @@ Expanding - + 20 130 @@ -205,6 +216,12 @@ toggled(bool) SMServerConfigDlg configChanged() + + + showLogoutStatusDialog + toggled(bool) + SMServerConfigDlg + configChanged() loginGroup 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -29,7 +29,7 @@ Expanding - + 20 50 @@ -177,7 +177,7 @@ Expanding - + 40 20 @@ -196,13 +196,13 @@ 0 - + 0 0 - + 200 32767 @@ -224,13 +224,13 @@ 0 - + 0 0 - + 200 32767 @@ -250,7 +250,7 @@ Expanding - + 30 20 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-09-08 19:41:29.000000000 +0200 @@ -209,7 +209,7 @@ Expanding - + 191 20 @@ -234,7 +234,7 @@ Expanding - + 191 20 @@ -300,7 +300,7 @@ Expanding - + 191 20 @@ -319,7 +319,7 @@ Fixed - + 20 20 @@ -434,7 +434,7 @@ Expanding - + 20 20 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -226,9 +226,9 @@ r += i18n("Power Consumption%1 mA").arg(_power); else r += i18n("Power Consumptionself powered"); - r += i18n("Attached Devicenodes%1").arg(*_devnodes.tqat(0)); + r += i18n("Attached Devicenodes%1").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 += "" + *it + ""; #else r += i18n("Max. Packet Size%1").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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -163,7 +163,7 @@ Expanding - + 40 20 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -156,7 +156,7 @@ Expanding - + 431 21 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-09-08 19:41:29.000000000 +0200 @@ -98,7 +98,7 @@ 0 - + 0 0 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-09-08 19:41:29.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" ) { - 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -32,13 +32,13 @@ 0 - + 74 74 - + 74 74 @@ -154,7 +154,7 @@ Expanding - + 20 16 @@ -182,7 +182,7 @@ - + AlignVCenter @@ -193,7 +193,7 @@ <i>(Click the button to change your image)</i> - + AlignVCenter @@ -217,7 +217,7 @@ Expanding - + 111 20 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-09-08 19:41:29.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 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-09-08 19:41:29.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 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-09-08 19:41:29.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 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-09-08 19:41:29.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 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-09-08 19:41:29.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 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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("
  • %2
    • \n").arg(*it).arg(*it)); + memberContent.append(TQString::fromLatin1("
  • %2
    • \n").arg(*it).arg(*it)); } memberContent.append("\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-09-08 19:41:29.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( 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -207,7 +207,7 @@ The device types which you do not want to see on the desktop. - + @@ -307,28 +307,21 @@ false - + When enabled this restores the old style unmanaged window behavior of desktop locking. - - true - - Set to true to enable usage of the Trinity SAK anti-spoofing system - - - true - Set to true to enable display of the date and time of desktop lock as an additional intrusion detection measure + When enabled the date and time when the desktop was locked is displayed as an additional intrusion detection measure. true - + When disabled the screensaver starts immediately when locking the desktop. @@ -353,7 +346,7 @@ - + @@ -406,7 +399,7 @@ - + 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-09-08 19:41:29.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"<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"<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(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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -55,7 +55,7 @@ TQLabel *infoLabel = new TQLabel(i18n("To prevent being logged out, resume using this session by moving the mouse or pressing a key."), frame); mStatusLabel = new TQLabel(" ", 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -86,7 +86,7 @@ KUser user; mStatusLabel = new TQLabel( " ", 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-09-08 19:41:29.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("The session was locked by %1
    ").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( " ", 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-09-08 19:41:29.000000000 +0200 @@ -4,7 +4,7 @@ // // Copyright (c) 1999 Martin R. Jones // Copyright (c) 2003 Oswald Buddenhagen -// Copyright (c) 2010-2011 Timothy Pearson +// Copyright (c) 2010-2012 Timothy Pearson // //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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -1,6 +1,7 @@ /* This file is part of the KDE project Copyright (C) 1999 David Faure Copyright (c) 2003 Oswald Buddenhagen + Copyright (c) 2010-2012 Timothy Pearson 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 #include #include +#include #include @@ -36,6 +38,15 @@ #include #include +#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,273 @@ { "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 ", 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 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 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 +#ifdef BUILD_TSAK + trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true); +#else + trinity_desktop_lock_use_sak = false; +#endif + 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) { +#ifdef BUILD_TSAK + trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true); +#else + trinity_desktop_lock_use_sak = false; +#endif } 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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -86,8 +86,8 @@ KUser user; mStatusLabel = new TQLabel( " ", 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-09-08 19:41:29.000000000 +0200 @@ -87,7 +87,7 @@ KUser user; mStatusLabel = new TQLabel( " ", frame ); - mStatusLabel->tqsetAlignment( TQLabel::AlignVCenter ); + mStatusLabel->setAlignment( TQLabel::AlignVCenter ); TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this ); unlockDialogLayout->addWidget( frame ); @@ -102,6 +102,7 @@ mStatusLabel->setText("" + i18n("Press Ctrl+Alt+Del to begin.") + "

    " + i18n("This process helps keep your password secure.") + "
    " + 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-09-08 19:41:29.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-09-08 19:41:29.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 +// Copyright (c) 2012 Timothy Pearson // @@ -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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -61,7 +61,7 @@ Expanding - + 80 20 @@ -123,7 +123,7 @@ Fixed - + 57 20 @@ -157,7 +157,7 @@ Fixed - + 20 30 @@ -331,7 +331,7 @@ Minimum - + 20 9 @@ -405,7 +405,7 @@ High - + AlignVCenter|AlignRight @@ -460,7 +460,7 @@ Fixed - + 20 40 @@ -527,7 +527,7 @@ - + AlignCenter @@ -543,7 +543,7 @@ 0 - + 388 0 @@ -568,7 +568,7 @@ Enter the name of the application you want to run or the URL you want to view - + WordBreak|AlignVCenter 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-09-08 19:41:29.000000000 +0200 @@ -62,7 +62,8 @@ { "t", I18N_NOOP("Enable terminal output (no password keeping)"), 0 }, { "p ", 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 ", I18N_NOOP("Ignored"), "" }, { "noignorebutton", I18N_NOOP("Do not display ignore button"), 0 }, { "i ", 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-09-08 19:41:29.000000000 +0200 @@ -14,7 +14,7 @@ #include #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("The stored password will be:
    * Kept for up to %1 minutes
    * 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -218,7 +218,7 @@ table.setCurrentItem(0); // This is to circumvent a Qt bug for (unsigned int i=0; i+2 [ "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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -65,6 +65,8 @@ #include +#define TSAK_FIFO_FILE "/tmp/ksocket-global/tsak" + bool argb_visual_available = false; bool has_kwin = false; bool is_themed = false; @@ -190,16 +192,25 @@ KProcess *tsak = 0; KProcess *proc = 0; KProcess *comp = 0; + KProcess *dcop = 0; KProcess *kwin = 0; +#ifdef BUILD_TSAK trinity_desktop_lock_use_sak = _useSAK; +#else + trinity_desktop_lock_use_sak = false; +#endif 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 +268,7 @@ XSetIOErrorHandler( xIOErr ); TQString login_user; + TQString login_session_wm; Display *dpy = qt_xdisplay(); @@ -310,6 +322,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 +375,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 +389,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 +404,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 +432,7 @@ Debug( "left event loop\n" ); login_user = static_cast(dialog)->curUser; + login_session_wm = static_cast(dialog)->curWMSession; if (rslt != ex_greet) { delete dialog; @@ -432,28 +456,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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -83,6 +83,7 @@ #include #include #include +#include #include @@ -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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -66,6 +66,7 @@ #include #include #include +#include #include "kfdialog.h" @@ -108,7 +109,7 @@ KUser user; mStatusLabel = new TQLabel( " ", 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-09-08 19:41:29.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-09-08 19:41:29.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( ©, 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -167,7 +167,7 @@ delete passwdEdit; return; } - TQLayoutIterator it = TQT_TQLAYOUT(static_cast(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-09-08 19:41:29.000000000 +0200 @@ -209,7 +209,7 @@ delete loginEdit; return; } - TQLayoutIterator it = TQT_TQLAYOUT(static_cast(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(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-09-08 19:41:29.000000000 +0200 @@ -65,7 +65,7 @@ virtual void revive(); virtual void clear(); - TQGridLayout *getLayoutItem() const { return static_cast(TQT_TQLAYOUT(static_cast(layoutItem))); } + TQGridLayout *getLayoutItem() const { return static_cast(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-09-08 19:41:29.000000000 +0200 @@ -213,7 +213,7 @@ delete domainCombo; return; } - TQLayoutIterator it = TQT_TQLAYOUT(static_cast(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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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( 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-09-08 19:41:29.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-09-08 19:41:29.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("\n" + stream << TQString::fromLatin1("\n" "\n" "%2\n" "

    %3

    " @@ -236,13 +236,13 @@ { TQString path=((KfFileLVI*)item)->fileitem.url().url(); TQString pretty=((KfFileLVI*)item)->fileitem.url().htmlURL(); - stream << TQString::tqfromLatin1("
    ") << pretty - << TQString::tqfromLatin1("\n"); + stream << TQString::fromLatin1("
    ") << pretty + << TQString::fromLatin1("\n"); item = item->nextSibling(); } - stream << TQString::tqfromLatin1("

    \n"); + stream << TQString::fromLatin1("

    \n"); } else { item = firstChild(); @@ -293,7 +293,7 @@ // Iterate on all selected elements TQPtrList 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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("") + (*it).term(); - seeAlso += TQString::tqfromLatin1(", "); + seeAlso += TQString::fromLatin1("\">") + (*it).term(); + seeAlso += TQString::fromLatin1(", "); } 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-09-08 19:41:29.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( kapp->mainWidget() ); - TQPopupMenu *goMenu = dynamic_cast( mainWindow->guiFactory()->container( TQString::tqfromLatin1( "go" ), mainWindow ) ); + TQPopupMenu *goMenu = dynamic_cast( 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( kapp->mainWidget() ); - TQPopupMenu *goMenu = dynamic_cast( mainWindow->guiFactory()->container( TQString::tqfromLatin1( "go" ), mainWindow ) ); + TQPopupMenu *goMenu = dynamic_cast( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) ); if ( !goMenu ) return; @@ -314,7 +314,7 @@ TQPtrListIterator 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( m_entries.count() ) - 1; + return m_entries.at() != static_cast( 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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/arts/CMakeLists.txt v3.5.13-sru/khotkeys/arts/CMakeLists.txt --- /tmp/stable//kdebase/khotkeys/arts/CMakeLists.txt 2011-03-12 07:58:19.000000000 +0100 +++ v3.5.13-sru/khotkeys/arts/CMakeLists.txt 2012-09-08 19:41:29.000000000 +0200 @@ -25,6 +25,7 @@ ${CMAKE_SOURCE_DIR}/khotkeys/kcontrol ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${ARTS_INCLUDE_DIRS} ) link_directories( 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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.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-09-08 19:41:29.000000000 +0200 @@ -48,7 +48,7 @@ Fixed - + 20 20 @@ -73,7 +73,7 @@ Fixed - + 20 20 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/ui/dcop_widget_ui.ui v3.5.13-sru/khotkeys/kcontrol/ui/dcop_widget_ui.ui --- /tmp/stable//kdebase/khotkeys/kcontrol/ui/dcop_widget_ui.ui 2011-03-12 07:58:19.000000000 +0100 +++ v3.5.13-sru/khotkeys/kcontrol/ui/dcop_widget_ui.ui 2012-09-08 19:41:29.000000000 +0200 @@ -48,7 +48,7 @@ Expanding - + 0 20 @@ -81,7 +81,7 @@ Expanding - + 0 20 @@ -114,7 +114,7 @@ Expanding - + 0 20 @@ -147,7 +147,7 @@ Expanding - + 0 20 @@ -178,7 +178,7 @@ Expanding - + 20 0 @@ -203,7 +203,7 @@ Expanding - + 20 0 @@ -228,7 +228,7 @@ Expanding - + 20 0 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/ui/general_settings_tab_ui.ui v3.5.13-sru/khotkeys/kcontrol/ui/general_settings_tab_ui.ui --- /tmp/stable//kdebase/khotkeys/kcontrol/ui/general_settings_tab_ui.ui 2011-03-12 07:58:19.000000000 +0100 +++ v3.5.13-sru/khotkeys/kcontrol/ui/general_settings_tab_ui.ui 2012-09-08 19:41:29.000000000 +0200 @@ -42,7 +42,7 @@ Expanding - + 40 20 @@ -67,7 +67,7 @@ Expanding - + 40 20 @@ -86,7 +86,7 @@ Expanding - + 20 40 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/ui/general_tab_ui.ui v3.5.13-sru/khotkeys/kcontrol/ui/general_tab_ui.ui --- /tmp/stable//kdebase/khotkeys/kcontrol/ui/general_tab_ui.ui 2011-03-12 07:58:19.000000000 +0100 +++ v3.5.13-sru/khotkeys/kcontrol/ui/general_tab_ui.ui 2012-09-08 19:41:29.000000000 +0200 @@ -80,7 +80,7 @@ Fixed - + 20 20 @@ -105,7 +105,7 @@ Fixed - + 20 20 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui v3.5.13-sru/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui --- /tmp/stable//kdebase/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui 2011-03-12 07:58:19.000000000 +0100 +++ v3.5.13-sru/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui 2012-09-08 19:41:29.000000000 +0200 @@ -116,7 +116,7 @@ Expanding - + 20 50 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui v3.5.13-sru/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui --- /tmp/stable//kdebase/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui 2011-03-12 07:58:19.000000000 +0100 +++ v3.5.13-sru/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui 2012-09-08 19:41:29.000000000 +0200 @@ -46,7 +46,7 @@ Expanding - + 0 30 @@ -77,7 +77,7 @@ Expanding - + 30 0 @@ -102,7 +102,7 @@ Expanding - + 30 0 @@ -121,7 +121,7 @@ 0 - + 100 100 @@ -138,7 +138,7 @@ Expanding - + 30 0 @@ -163,7 +163,7 @@ Expanding - + 30 0 @@ -182,7 +182,7 @@ Expanding - + 0 30 @@ -213,7 +213,7 @@ Expanding - + 30 0 @@ -238,7 +238,7 @@ Expanding - + 30 0 @@ -257,7 +257,7 @@ 0 - + 100 100 @@ -274,7 +274,7 @@ Expanding - + 30 0 @@ -299,7 +299,7 @@ Expanding - + 30 0 @@ -318,7 +318,7 @@ Expanding - + 0 30 @@ -349,7 +349,7 @@ Expanding - + 30 0 @@ -374,7 +374,7 @@ Expanding - + 30 0 @@ -393,7 +393,7 @@ 0 - + 100 100 @@ -410,7 +410,7 @@ Expanding - + 30 0 @@ -435,7 +435,7 @@ Expanding - + 30 0 @@ -454,7 +454,7 @@ Expanding - + 0 30 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/ui/info_tab_ui.ui v3.5.13-sru/khotkeys/kcontrol/ui/info_tab_ui.ui --- /tmp/stable//kdebase/khotkeys/kcontrol/ui/info_tab_ui.ui 2011-03-12 07:58:19.000000000 +0100 +++ v3.5.13-sru/khotkeys/kcontrol/ui/info_tab_ui.ui 2012-09-08 19:41:29.000000000 +0200 @@ -33,7 +33,7 @@ <p>This module allows configuring input actions, like mouse gestures, keyboard shortcuts for performing commands, launching applications or DCOP calls, and similar.</p> <p><b>NOTE: </b>If you are not an experienced user, you should be careful with modifying the actions, and should limit your changes mainly to enabling/disabling actions, and changing triggers.</p> - + WordBreak|AlignVCenter @@ -47,7 +47,7 @@ Expanding - + 20 20 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/ui/menuentry_widget_ui.ui v3.5.13-sru/khotkeys/kcontrol/ui/menuentry_widget_ui.ui --- /tmp/stable//kdebase/khotkeys/kcontrol/ui/menuentry_widget_ui.ui 2011-03-12 07:58:19.000000000 +0100 +++ v3.5.13-sru/khotkeys/kcontrol/ui/menuentry_widget_ui.ui 2012-09-08 19:41:29.000000000 +0200 @@ -72,7 +72,7 @@ Expanding - + 0 20 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/ui/voice_input_widget_ui.ui v3.5.13-sru/khotkeys/kcontrol/ui/voice_input_widget_ui.ui --- /tmp/stable//kdebase/khotkeys/kcontrol/ui/voice_input_widget_ui.ui 2011-03-12 07:58:19.000000000 +0100 +++ v3.5.13-sru/khotkeys/kcontrol/ui/voice_input_widget_ui.ui 2012-09-08 19:41:29.000000000 +0200 @@ -28,7 +28,7 @@ 0 - + 150 0 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui v3.5.13-sru/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui --- /tmp/stable//kdebase/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui 2011-03-12 07:58:19.000000000 +0100 +++ v3.5.13-sru/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui 2012-09-08 19:41:29.000000000 +0200 @@ -23,7 +23,7 @@ In order to trigger a spoken action, you have to press the key (or combination of keys) configured below, speak the command and then press the same key again once you have finished speaking. - + WordBreak|AlignVCenter @@ -61,7 +61,7 @@ Expanding - + 241 21 @@ -80,7 +80,7 @@ Expanding - + 31 90 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui v3.5.13-sru/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui --- /tmp/stable//kdebase/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui 2011-03-12 07:58:19.000000000 +0100 +++ v3.5.13-sru/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui 2012-09-08 19:41:29.000000000 +0200 @@ -154,7 +154,7 @@ - class QListViewItem; + class TQListViewItem; copy_pressed() diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui v3.5.13-sru/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui --- /tmp/stable//kdebase/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui 2011-03-12 07:58:19.000000000 +0100 +++ v3.5.13-sru/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui 2012-09-08 19:41:29.000000000 +0200 @@ -48,7 +48,7 @@ Expanding - + 0 20 @@ -137,7 +137,7 @@ Expanding - + 0 20 @@ -226,7 +226,7 @@ Expanding - + 0 20 @@ -315,7 +315,7 @@ Expanding - + 0 20 @@ -346,7 +346,7 @@ Expanding - + 20 0 @@ -371,7 +371,7 @@ Expanding - + 20 0 @@ -390,7 +390,7 @@ Expanding - + 0 20 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/kcontrol/voicerecordpage.cpp v3.5.13-sru/khotkeys/kcontrol/voicerecordpage.cpp --- /tmp/stable//kdebase/khotkeys/kcontrol/voicerecordpage.cpp 2011-03-12 07:58:19.000000000 +0100 +++ v3.5.13-sru/khotkeys/kcontrol/voicerecordpage.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -31,7 +31,7 @@ _message = i18n("Enter a code for the sound (e.g. the word you are saying) and record the same word twice."); _label = new TQLabel(_message, this, "label"); - _label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | + _label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | TQLabel::AlignVCenter); _lineEdit = new KLineEdit( this ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/shared/CMakeLists.txt v3.5.13-sru/khotkeys/shared/CMakeLists.txt --- /tmp/stable//kdebase/khotkeys/shared/CMakeLists.txt 2011-03-12 07:58:18.000000000 +0100 +++ v3.5.13-sru/khotkeys/shared/CMakeLists.txt 2012-09-08 19:41:29.000000000 +0200 @@ -18,6 +18,7 @@ link_directories( ${TQT_LIBRARY_DIRS} + ${XTEST_LIBDIR} ) @@ -36,6 +37,6 @@ tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.0.0 - LINK kio-shared + LINK kio-shared ${XTEST_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/shared/input.cpp v3.5.13-sru/khotkeys/shared/input.cpp --- /tmp/stable//kdebase/khotkeys/shared/input.cpp 2011-08-11 07:25:54.000000000 +0200 +++ v3.5.13-sru/khotkeys/shared/input.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -55,7 +55,7 @@ void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; rcv.shortcuts.append( shortcut_P ); if( rcv.active ) grab_shortcut( shortcut_P ); @@ -63,17 +63,17 @@ void Kbd::remove_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; rcv.shortcuts.remove( shortcut_P ); if( rcv.active ) ungrab_shortcut( shortcut_P ); if( rcv.shortcuts.count() == 0 ) - tqreceivers.remove( receiver_P ); + receivers.remove( receiver_P ); } void Kbd::activate_receiver( Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; if( rcv.active ) return; rcv.active = true; @@ -85,7 +85,7 @@ void Kbd::deactivate_receiver( Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; if( !rcv.active ) return; rcv.active = false; @@ -144,8 +144,8 @@ KShortcut shortcut( key_P ); if( !grabs.contains( shortcut )) return; - for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = tqreceivers.begin(); - it != tqreceivers.end(); + for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = receivers.begin(); + it != receivers.end(); ++it ) if( ( *it ).shortcuts.contains( shortcut ) && ( *it ).active && it.key()->handle_key( shortcut )) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/shared/input.h v3.5.13-sru/khotkeys/shared/input.h --- /tmp/stable//kdebase/khotkeys/shared/input.h 2011-03-12 07:58:18.000000000 +0100 +++ v3.5.13-sru/khotkeys/shared/input.h 2012-09-08 19:41:29.000000000 +0200 @@ -58,7 +58,7 @@ TQValueList< KShortcut > shortcuts; bool active; }; - TQMap< Kbd_receiver*, Receiver_data > tqreceivers; + TQMap< Kbd_receiver*, Receiver_data > receivers; TQMap< KShortcut, int > grabs; KGlobalAccel* kga; }; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/shared/sound.cpp v3.5.13-sru/khotkeys/shared/sound.cpp --- /tmp/stable//kdebase/khotkeys/shared/sound.cpp 2011-03-12 07:58:18.000000000 +0100 +++ v3.5.13-sru/khotkeys/shared/sound.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -93,7 +93,7 @@ TQ_INT32 nb=0; for(uint k=0;k> 8; + TQ_UINT16 val= (signed short int) ( (data.at(f) * ((double)(1<<13)/(signed)max) ) ); + SoundData.at( 2*f )= val & 0x00FF; + SoundData.at(2*f+1)= (val & 0xFF00) >> 8; -// kdDebug( 1217 ) << k_funcinfo << data.tqat(f) << " / " << max << " = " << val << " | " << SoundData[ 2*f ] << " "<< SoundData[ 2*f+1 ] << endl; +// kdDebug( 1217 ) << k_funcinfo << data.at(f) << " / " << max << " = " << val << " | " << SoundData[ 2*f ] << " "<< SoundData[ 2*f+1 ] << endl; } TQ_UINT16 NumberOfChannels=2; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/shared/sound.h v3.5.13-sru/khotkeys/shared/sound.h --- /tmp/stable//kdebase/khotkeys/shared/sound.h 2011-03-12 07:58:18.000000000 +0100 +++ v3.5.13-sru/khotkeys/shared/sound.h 2012-09-08 19:41:29.000000000 +0200 @@ -42,7 +42,7 @@ inline float at(int pos) const { - return (float)(data.tqat(pos))/max; + return (float)(data.at(pos))/max; } inline uint fs() const diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/khotkeys/shared/voicesignature.cpp v3.5.13-sru/khotkeys/shared/voicesignature.cpp --- /tmp/stable//kdebase/khotkeys/shared/voicesignature.cpp 2011-03-12 07:58:18.000000000 +0100 +++ v3.5.13-sru/khotkeys/shared/voicesignature.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -210,7 +210,7 @@ for(uint x=start; x Expanding - + 40 20 @@ -149,7 +149,7 @@ Expanding - + 16 20 @@ -241,7 +241,7 @@ Expanding - + 310 20 @@ -269,7 +269,7 @@ Expanding - + 20 50 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/clock/clockapplet.kcfg v3.5.13-sru/kicker/applets/clock/clockapplet.kcfg --- /tmp/stable//kdebase/kicker/applets/clock/clockapplet.kcfg 2011-03-12 07:58:11.000000000 +0100 +++ v3.5.13-sru/kicker/applets/clock/clockapplet.kcfg 2012-09-08 19:41:29.000000000 +0200 @@ -20,16 +20,16 @@ - KApplication::tqpalette().active().text() + KApplication::palette().active().text() - KApplication::tqpalette().active().background() + KApplication::palette().active().background() -QFont defFont=KGlobalSettings::generalFont(); +TQFont defFont=KGlobalSettings::generalFont(); defFont.setPointSize(8); defFont @@ -63,11 +63,11 @@ - KApplication::tqpalette().active().text() + KApplication::palette().active().text() - KApplication::tqpalette().active().background() + KApplication::palette().active().background() @@ -89,15 +89,15 @@ - KApplication::tqpalette().active().text() + KApplication::palette().active().text() - KApplication::tqpalette().active().background() + KApplication::palette().active().background() - KApplication::tqpalette().active().mid() + KApplication::palette().active().mid() @@ -127,15 +127,15 @@ - KApplication::tqpalette().active().text() + KApplication::palette().active().text() - KApplication::tqpalette().active().background() + KApplication::palette().active().background() - KApplication::tqpalette().active().mid() + KApplication::palette().active().mid() @@ -168,11 +168,11 @@ - KApplication::tqpalette().active().text() + KApplication::palette().active().text() - KApplication::tqpalette().active().background() + KApplication::palette().active().background() diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/clock/clock.cpp v3.5.13-sru/kicker/applets/clock/clock.cpp --- /tmp/stable//kdebase/kicker/applets/clock/clock.cpp 2011-08-11 07:25:48.000000000 +0200 +++ v3.5.13-sru/kicker/applets/clock/clock.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -86,23 +86,23 @@ settings = new SettingsWidgetImp(prefs, zone, 0, "General"); connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int))); - settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); - settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); + settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::palette().active().background()); + settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::palette().active().background()); // Digital digitalPage = new DigitalWidget(0, "DigitalClock"); settings->widgetStack->addWidget(digitalPage, 1); - digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); + digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::palette().active().background()); // Analog analogPage = new AnalogWidget(0, "AnalogClock"); settings->widgetStack->addWidget(analogPage, 2); - analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); + analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::palette().active().background()); // Fuzzy fuzzyPage = new FuzzyWidget(0, "FuzzyClock"); settings->widgetStack->addWidget(fuzzyPage, 3); - fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); + fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::palette().active().background()); connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); @@ -123,7 +123,7 @@ connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDayOfWeek), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - addPage(settings, i18n("General"), TQString::tqfromLatin1("package_settings")); + addPage(settings, i18n("General"), TQString::fromLatin1("package_settings")); } void KConfigDialogSingle::updateSettings() @@ -242,7 +242,7 @@ void PlainClock::loadSettings() { setFrameStyle(_prefs->plainShowFrame() ? Panel | Sunken : NoFrame); - tqsetAlignment(AlignVCenter | AlignHCenter | SingleLine); + setAlignment(AlignVCenter | AlignHCenter | SingleLine); setFont(_prefs->plainFont()); } @@ -353,9 +353,9 @@ if (_force || newStr != _timeStr) { _timeStr = newStr; - tqsetUpdatesEnabled( FALSE ); + setUpdatesEnabled( FALSE ); display(_timeStr); - tqsetUpdatesEnabled( TRUE ); + setUpdatesEnabled( TRUE ); update(); } @@ -386,7 +386,7 @@ p.drawTiledPixmap(0, 0, width(), height(), lcdPattern); } else if (_prefs->digitalBackgroundColor() != - KApplication::tqpalette().active().background()) + KApplication::palette().active().background()) { p.fillRect(0, 0, width(), height(), _prefs->digitalBackgroundColor()); } @@ -415,7 +415,7 @@ // but other colors would break the lcd-lock anyway void DigitalClock::drawContents( TQPainter * p) { - tqsetUpdatesEnabled( FALSE ); + setUpdatesEnabled( FALSE ); TQPalette pal = palette(); if (_prefs->digitalLCDStyle()) pal.setColor( TQColorGroup::Foreground, TQColor(128,128,128)); @@ -430,7 +430,7 @@ pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor()); setPalette( pal ); p->translate( -2, -2 ); - tqsetUpdatesEnabled( TRUE ); + setUpdatesEnabled( TRUE ); TQLCDNumber::drawContents( p ); p->translate( +1, +1 ); } @@ -553,7 +553,7 @@ paint.drawTiledPixmap(0, 0, spWidth, spHeight, lcdPattern); } - else if (_prefs->analogBackgroundColor() != KApplication::tqpalette().active().background()) + else if (_prefs->analogBackgroundColor() != KApplication::palette().active().background()) { _spPx->fill(_prefs->analogBackgroundColor()); } @@ -827,7 +827,7 @@ } if (phStart >= 0) newTimeStr.replace(phStart, phLength, hourNames[realHour]); - newTimeStr.replace(0, 1, TQString(newTimeStr.tqat(0).upper())); + newTimeStr.replace(0, 1, TQString(newTimeStr.at(0).upper())); } } else if (_prefs->fuzzyness() == 3) { newTimeStr = dayTime[_time.hour() / 3]; @@ -908,12 +908,12 @@ setBackgroundOrigin(AncestorOrigin); _dayOfWeek = new TQLabel(this); - _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak); _dayOfWeek->setBackgroundOrigin(AncestorOrigin); _dayOfWeek->installEventFilter(this); // catch mouse clicks _date = new TQLabel(this); - _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak); _date->setBackgroundOrigin(AncestorOrigin); _date->installEventFilter(this); // catch mouse clicks @@ -980,18 +980,18 @@ bool mustShowDate = showDate || (zone->zoneIndex() != 0); if (mustShowDate) { - _date->tqsetAlignment(AlignVCenter | AlignHCenter); + _date->setAlignment(AlignVCenter | AlignHCenter); if (!dateToSide) { - shareDateHeight = _date->tqsizeHint().height(); + shareDateHeight = _date->sizeHint().height(); } } if (showDayOfWeek) { - _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter); + _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter); if (!dateToSide) { - shareDayOfWeekHeight = _dayOfWeek->tqsizeHint().height(); + shareDayOfWeekHeight = _dayOfWeek->sizeHint().height(); } } @@ -1007,8 +1007,8 @@ } else { - int dateWidth = mustShowDate ? _date->tqsizeHint().width() + 4 : 0; - int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->tqsizeHint().width() + 4 : 0; + int dateWidth = mustShowDate ? _date->sizeHint().width() + 4 : 0; + int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->sizeHint().width() + 4 : 0; if (dateToSide) { @@ -1020,7 +1020,7 @@ // if the date format STARTS with a year, assume it's in descending // order and should therefore PRECEED the date. TQString dateFormat = KGlobal::locale()->dateFormatShort(); - dateFirst = dateFormat.tqat(1) == 'y' || dateFormat.tqat(1) == 'Y'; + dateFirst = dateFormat.at(1) == 'y' || dateFormat.at(1) == 'Y'; } if (dateFirst) @@ -1064,13 +1064,13 @@ _clock->widget()->move(0, 0); if (showDayOfWeek) { - _dayOfWeek->setFixedSize(w, _dayOfWeek->tqsizeHint().height()); + _dayOfWeek->setFixedSize(w, _dayOfWeek->sizeHint().height()); _dayOfWeek->move(0, _clock->widget()->height()); } if (mustShowDate) { - _date->setFixedSize(w, _date->tqsizeHint().height()); + _date->setFixedSize(w, _date->sizeHint().height()); _date->move(0, _clock->widget()->height() + shareDayOfWeekHeight); } } @@ -1094,16 +1094,16 @@ // add 4 pixels in height for each of date+dayOfWeek, if visible if (showDayOfWeek) { - if (_dayOfWeek->tqminimumSizeHint().width() > w) + if (_dayOfWeek->minimumSizeHint().width() > w) { - _dayOfWeek->tqsetAlignment(AlignVCenter | WordBreak); + _dayOfWeek->setAlignment(AlignVCenter | WordBreak); } else { - _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak); } - _dayOfWeek->setFixedSize(w, _dayOfWeek->tqminimumSizeHint().height()); + _dayOfWeek->setFixedSize(w, _dayOfWeek->minimumSizeHint().height()); _dayOfWeek->move(0, clockHeight); clockHeight += _dayOfWeek->height(); @@ -1116,7 +1116,7 @@ // display on panel that is too narrow and then they made it wider const_cast(this)->updateDateLabel(false); - if (_date->tqminimumSizeHint().width() > w) + if (_date->minimumSizeHint().width() > w) { TQString dateStr = _date->text(); // if we're too wide to fit, replace the first non-digit from the end with a space @@ -1127,13 +1127,13 @@ } } - if (_date->tqminimumSizeHint().width() > w) + if (_date->minimumSizeHint().width() > w) { - _date->tqsetAlignment(AlignVCenter | WordBreak); + _date->setAlignment(AlignVCenter | WordBreak); } else { - _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak); } _date->setFixedSize(w, _date->heightForWidth(w)); _date->move(0, clockHeight); @@ -1169,7 +1169,7 @@ void ClockApplet::updateFollowBackground() { - TQColor globalBgroundColor = KApplication::tqpalette().active().background(); + TQColor globalBgroundColor = KApplication::palette().active().background(); TQColor bgColor; switch (_prefs->type()) @@ -1272,7 +1272,7 @@ _clock->widget()->installEventFilter(this); // catch mouse clicks _clock->widget()->show(); - _clock->forceUpdate(); /* force tqrepaint */ + _clock->forceUpdate(); /* force repaint */ if (showDayOfWeek) { @@ -1306,7 +1306,7 @@ void ClockApplet::setBackground() { - TQColor globalBgroundColor = KApplication::tqpalette().active().background(); + TQColor globalBgroundColor = KApplication::palette().active().background(); TQColor fgColor, bgColor; if (!_clock) @@ -1371,7 +1371,7 @@ if (!m_dateFollowBackgroundSetting && !m_followBackgroundSetting) return; - TQColor globalBgroundColor = KApplication::tqpalette().active().background(); + TQColor globalBgroundColor = KApplication::palette().active().background(); if (m_dateFollowBackgroundSetting) _prefs->setDateBackgroundColor(globalBgroundColor); @@ -1541,7 +1541,7 @@ menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) ); KLocale *loc = KGlobal::locale(); - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset)); KPopupMenu *copyMenu = new KPopupMenu( menu ); @@ -1605,7 +1605,7 @@ { TQPopupMenu *m = (TQPopupMenu *) sender(); TQString s = m->text(id); - TQApplication::tqclipboard()->setText(s); + TQApplication::clipboard()->setText(s); } TQTime ClockApplet::clockGetTime() @@ -1615,7 +1615,7 @@ TQDate ClockApplet::clockGetDate() { - return TQT_TQDATE_OBJECT(TQDateTime::tqcurrentDateTime().addSecs(TZoffset).date()); + return TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().addSecs(TZoffset).date()); } void ClockApplet::showZone(int z) @@ -1623,7 +1623,7 @@ zone->setZone(z); TZoffset = zone->calc_TZ_offset( zone->zone() ); updateDateLabel(); - _clock->forceUpdate(); /* force tqrepaint */ + _clock->forceUpdate(); /* force repaint */ } void ClockApplet::nextZone() @@ -1840,7 +1840,7 @@ (m_clock->type() == Prefs::EnumType::Analog) ) { // show full time (incl. hour) as tooltip for Fuzzy clock - tipText = KGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::tqcurrentDateTime().addSecs(m_clock->TZoffset))); + tipText = KGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset))); } else { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/clock/digital.ui v3.5.13-sru/kicker/applets/clock/digital.ui --- /tmp/stable//kdebase/kicker/applets/clock/digital.ui 2011-03-12 07:58:11.000000000 +0100 +++ v3.5.13-sru/kicker/applets/clock/digital.ui 2012-09-08 19:41:29.000000000 +0200 @@ -83,7 +83,7 @@ Expanding - + 20 20 @@ -193,7 +193,7 @@ Expanding - + 110 20 @@ -226,7 +226,7 @@ Expanding - + 20 20 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/clock/fuzzy.ui v3.5.13-sru/kicker/applets/clock/fuzzy.ui --- /tmp/stable//kdebase/kicker/applets/clock/fuzzy.ui 2011-03-12 07:58:11.000000000 +0100 +++ v3.5.13-sru/kicker/applets/clock/fuzzy.ui 2012-09-08 19:41:29.000000000 +0200 @@ -79,7 +79,7 @@ Expanding - + 40 20 @@ -109,7 +109,7 @@ Expanding - + 20 30 @@ -153,7 +153,7 @@ Expanding - + 51 20 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/clock/settings.ui v3.5.13-sru/kicker/applets/clock/settings.ui --- /tmp/stable//kdebase/kicker/applets/clock/settings.ui 2011-03-12 07:58:11.000000000 +0100 +++ v3.5.13-sru/kicker/applets/clock/settings.ui 2012-09-08 19:41:29.000000000 +0200 @@ -102,7 +102,7 @@ Expanding - + 20 20 @@ -188,7 +188,7 @@ Expanding - + 20 20 @@ -284,7 +284,7 @@ Expanding - + 230 20 @@ -306,7 +306,7 @@ Expanding - + 20 20 @@ -371,7 +371,7 @@ Expanding - + 343 20 @@ -421,7 +421,7 @@ Expanding - + 20 100 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/launcher/configdlgbase.ui v3.5.13-sru/kicker/applets/launcher/configdlgbase.ui --- /tmp/stable//kdebase/kicker/applets/launcher/configdlgbase.ui 2011-08-06 00:56:45.000000000 +0200 +++ v3.5.13-sru/kicker/applets/launcher/configdlgbase.ui 2012-09-08 19:41:29.000000000 +0200 @@ -83,7 +83,7 @@ Expanding - + 332 20 @@ -138,7 +138,7 @@ Expanding - + 140 20 @@ -152,7 +152,7 @@ Short Term - + AlignCenter @@ -163,7 +163,7 @@ Long Term - + AlignCenter @@ -192,7 +192,7 @@ Expanding - + 50 20 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/launcher/easyvector.h v3.5.13-sru/kicker/applets/launcher/easyvector.h --- /tmp/stable//kdebase/kicker/applets/launcher/easyvector.h 2010-08-12 05:30:01.000000000 +0200 +++ v3.5.13-sru/kicker/applets/launcher/easyvector.h 2012-09-08 19:41:29.000000000 +0200 @@ -87,7 +87,7 @@ template < class VALUE, bool CHECKINDEX > void EasyVector< VALUE, CHECKINDEX >::eraseAt(Index index) { _checkIndex(index); - erase(this->begin()+index); + this->erase(this->begin()+index); } @@ -108,7 +108,7 @@ this->push_back(value); return; } - insert(this->begin()+index,value); + this->insert(this->begin()+index,value); } @@ -116,7 +116,7 @@ void EasyVector< VALUE, CHECKINDEX >::insertAt(EasyVector< VALUE, CHECKINDEX >::Index index,const EasyVector< VALUE, CHECKINDEX > &v) { index=_convertInsertIndex(index); _checkInsertIndex(index); - insert(this->begin()+index,v.begin(),v.end()); + this->insert(this->begin()+index,v.begin(),v.end()); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/launcher/quickbutton.cpp v3.5.13-sru/kicker/applets/launcher/quickbutton.cpp --- /tmp/stable//kdebase/kicker/applets/launcher/quickbutton.cpp 2011-09-01 20:40:20.000000000 +0200 +++ v3.5.13-sru/kicker/applets/launcher/quickbutton.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -163,7 +163,7 @@ TQToolTip::add(this, _qurl->name()); resize(int(DEFAULT_ICON_DIM),int(DEFAULT_ICON_DIM)); - TQBrush bgbrush(tqcolorGroup().brush(TQColorGroup::Background)); + TQBrush bgbrush(colorGroup().brush(TQColorGroup::Background)); QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu( parent, this, _qurl->url()); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/launcher/quickbuttongroup.h v3.5.13-sru/kicker/applets/launcher/quickbuttongroup.h --- /tmp/stable//kdebase/kicker/applets/launcher/quickbuttongroup.h 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/applets/launcher/quickbuttongroup.h 2012-09-08 19:41:29.000000000 +0200 @@ -24,15 +24,15 @@ void setDragging(bool drag); void setEnableDrag(bool enable); void deleteContents(); - void tqsetUpdatesEnabled(bool enable); + void setUpdatesEnabled(bool enable); }; QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc) { return findProperty(desc, std::mem_fun(&QuickButton::url));} -inline void QuickButtonGroup::tqsetUpdatesEnabled(bool enable) +inline void QuickButtonGroup::setUpdatesEnabled(bool enable) { for (QuickButtonGroup::iterator i=begin();i!=end();++i) { - (*i)->tqsetUpdatesEnabled(enable); + (*i)->setUpdatesEnabled(enable); if (enable) { (*i)->update();} } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/launcher/quicklauncher.cpp v3.5.13-sru/kicker/applets/launcher/quicklauncher.cpp --- /tmp/stable//kdebase/kicker/applets/launcher/quicklauncher.cpp 2011-08-11 07:25:48.000000000 +0200 +++ v3.5.13-sru/kicker/applets/launcher/quicklauncher.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -770,8 +770,8 @@ unsigned index; TQPoint pos; - tqsetUpdatesEnabled(false); - m_buttons->tqsetUpdatesEnabled(false); + setUpdatesEnabled(false); + m_buttons->setUpdatesEnabled(false); for (index = 0; index < m_buttons->size(); index++) { pos = m_manager->pos(index); @@ -791,9 +791,9 @@ m_dragButtons->setDragging(true); } m_buttons->show(); - tqsetUpdatesEnabled(true); + setUpdatesEnabled(true); update(); - m_buttons->tqsetUpdatesEnabled(true); + m_buttons->setUpdatesEnabled(true); updateGeometry(); emit updateLayout(); updateStickyHighlightLayer(); @@ -1097,7 +1097,7 @@ } } } - tqrepaint(); + repaint(); } void QuickLauncher::paintEvent(TQPaintEvent* e) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/lockout/lockout.cpp v3.5.13-sru/kicker/applets/lockout/lockout.cpp --- /tmp/stable//kdebase/kicker/applets/lockout/lockout.cpp 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/applets/lockout/lockout.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -94,8 +94,8 @@ if (!kapp->authorize("logout")) logoutButton->hide(); - lockButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); - logoutButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); + lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); + logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); @@ -113,7 +113,7 @@ // direction and wasting a lot of space. void Lockout::checkLayout( int height ) const { - TQSize s = tqminimumSizeHint(); + TQSize s = minimumSizeHint(); TQBoxLayout::Direction direction = layout->direction(); if ( direction == TQBoxLayout::LeftToRight && @@ -131,13 +131,13 @@ int Lockout::widthForHeight( int height ) const { checkLayout( height ); - return tqsizeHint().width(); + return sizeHint().width(); } int Lockout::heightForWidth( int width ) const { checkLayout( width ); - return tqsizeHint().height(); + return sizeHint().height(); } void Lockout::lock() @@ -177,9 +177,9 @@ void Lockout::propagateMouseEvent(TQMouseEvent* e) { if ( !isTopLevel() ) { - TQMouseEvent me(e->type(), mapTo( tqtopLevelWidget(), e->pos() ), + TQMouseEvent me(e->type(), mapTo( topLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); - TQApplication::sendEvent( tqtopLevelWidget(), &me ); + TQApplication::sendEvent( topLevelWidget(), &me ); } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/media/mediumbutton.cpp v3.5.13-sru/kicker/applets/media/mediumbutton.cpp --- /tmp/stable//kdebase/kicker/applets/media/mediumbutton.cpp 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/applets/media/mediumbutton.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -145,7 +145,7 @@ { KonqDrag * obj = KonqDrag::newDrag(mFileItem.url(), false); - TQApplication::tqclipboard()->setData( obj ); + TQApplication::clipboard()->setData( obj ); } void MediumButton::dragEnterEvent(TQDragEnterEvent* e) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/menu/menuapplet.cpp v3.5.13-sru/kicker/applets/menu/menuapplet.cpp --- /tmp/stable//kdebase/kicker/applets/menu/menuapplet.cpp 2011-07-09 08:16:55.000000000 +0200 +++ v3.5.13-sru/kicker/applets/menu/menuapplet.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -264,7 +264,7 @@ // Kicker's frame). void Applet::updateTopEdgeOffset() { - TQPoint p = tqtopLevelWidget()->mapToGlobal( TQPoint( 0, 0 )); + TQPoint p = topLevelWidget()->mapToGlobal( TQPoint( 0, 0 )); if( p.y() <= 2 ) // 2 = work also when running in appletproxy topEdgeOffset = mapToGlobal( TQPoint( 0, 0 )).y() - p.y(); else diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/minipager/CMakeLists.txt v3.5.13-sru/kicker/applets/minipager/CMakeLists.txt --- /tmp/stable//kdebase/kicker/applets/minipager/CMakeLists.txt 2011-03-12 07:58:11.000000000 +0100 +++ v3.5.13-sru/kicker/applets/minipager/CMakeLists.txt 2012-09-08 19:41:29.000000000 +0200 @@ -27,7 +27,7 @@ ##### other data ################################ install( FILES minipagerapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) - +install( FILES pagersettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) ##### minipager_panelapplet (module) ############ diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/minipager/pagerapplet.cpp v3.5.13-sru/kicker/applets/minipager/pagerapplet.cpp --- /tmp/stable//kdebase/kicker/applets/minipager/pagerapplet.cpp 2011-03-12 07:58:11.000000000 +0100 +++ v3.5.13-sru/kicker/applets/minipager/pagerapplet.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -365,7 +365,7 @@ if( m_desktopLayoutOwner == NULL ) { // must own manager selection before setting global desktop layout int screen = DefaultScreen( qt_xdisplay()); - m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).tqarg( screen ).latin1(), + m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(), screen, TQT_TQOBJECT(this) ); if( !m_desktopLayoutOwner->claim( false )) { @@ -442,6 +442,10 @@ { int newDesk; int desktops = KWin::numberOfDesktops(); + + + if(cycleWindow()){ + if (m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height() > 1 ) desktops = m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height(); if (e->delta() < 0) @@ -452,8 +456,9 @@ { newDesk = (desktops + m_curDesk - 2) % desktops + 1; } - + slotButtonSelected(newDesk); + } } void KMiniPager::drawButtons() @@ -729,6 +734,7 @@ showMenu->insertItem(i18n("&Window Thumbnails"), WindowThumbnails); showMenu->insertItem(i18n("&Window Icons"), WindowIcons); + showMenu->insertItem(i18n("&Cycle on Wheel"), Cycle); showMenu->insertTitle(i18n("Text Label")); showMenu->insertItem(i18n("Desktop N&umber"), @@ -760,6 +766,7 @@ m_contextMenu->setItemChecked(WindowThumbnails, m_settings->preview()); m_contextMenu->setItemChecked(WindowIcons, m_settings->icons()); + m_contextMenu->setItemChecked(Cycle, m_settings->cycle()); m_contextMenu->setItemEnabled(WindowIcons, m_settings->preview()); m_contextMenu->setItemEnabled(RenameDesktop, m_settings->labelType() == @@ -812,11 +819,12 @@ m_settings->setPreview(!m_settings->preview()); TaskManager::the()->trackGeometry(); break; - + case Cycle: + m_settings->setCycle(!m_settings->cycle()); + break; case WindowIcons: m_settings->setIcons(!m_settings->icons()); break; - case PagerSettings::EnumBackgroundType::BgPlain + bgOffset: m_settings->setBackgroundType(PagerSettings::EnumBackgroundType::BgPlain); break; @@ -865,7 +873,7 @@ { TQString name = m_kwin->desktopName(i); (*it)->setDesktopName(name); - (*it)->tqrepaint(); + (*it)->repaint(); TQToolTip::remove((*it)); TQToolTip::add((*it), name); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/minipager/pagerapplet.h v3.5.13-sru/kicker/applets/minipager/pagerapplet.h --- /tmp/stable//kdebase/kicker/applets/minipager/pagerapplet.h 2011-03-12 07:58:11.000000000 +0100 +++ v3.5.13-sru/kicker/applets/minipager/pagerapplet.h 2012-09-08 19:41:29.000000000 +0200 @@ -64,15 +64,17 @@ void setActive( WId active ) { m_activeWindow = active; } WId activeWindow() { return m_activeWindow; } - enum ConfigOptions { LaunchExtPager = 96, WindowThumbnails, + enum ConfigOptions { LaunchExtPager = 96, WindowThumbnails, Cycle, WindowIcons, ConfigureDesktops, RenameDesktop }; int labelType() const { return m_settings->labelType(); } int bgType() const { return m_settings->backgroundType(); } bool desktopPreview() const { return m_settings->preview(); } + bool cycleWindow() const { return m_settings->cycle(); } bool windowIcons() const { return m_settings->icons(); } + Orientation orientation() const { return KPanelApplet::orientation(); } Direction popupDirection() { return KPanelApplet::popupDirection(); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/minipager/pagerbutton.cpp v3.5.13-sru/kicker/applets/minipager/pagerbutton.cpp --- /tmp/stable//kdebase/kicker/applets/minipager/pagerbutton.cpp 2011-08-11 07:25:48.000000000 +0200 +++ v3.5.13-sru/kicker/applets/minipager/pagerbutton.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -157,8 +157,8 @@ TQRect r = mapGeometryToViewport(*info); if (!info->hasState(NET::Sticky) && - !TQApplication::desktop()->tqgeometry().contains(r.topLeft()) && - !TQApplication::desktop()->tqgeometry().contains(r.topRight())) + !TQApplication::desktop()->geometry().contains(r.topLeft()) && + !TQApplication::desktop()->geometry().contains(r.topRight())) return false; } @@ -404,16 +404,16 @@ // transparent windows get an 1 pixel frame... if (on) { - bp->setPen(tqcolorGroup().midlight()); + bp->setPen(colorGroup().midlight()); } else if (down) { - bp->setPen(KickerLib::blendColors(tqcolorGroup().mid(), - tqcolorGroup().midlight())); + bp->setPen(KickerLib::blendColors(colorGroup().mid(), + colorGroup().midlight())); } else { - bp->setPen(tqcolorGroup().dark()); + bp->setPen(colorGroup().dark()); } bp->drawRect(0, 0, w, h); @@ -424,16 +424,16 @@ if (on) { - background = tqcolorGroup().brush(TQColorGroup::Midlight); + background = colorGroup().brush(TQColorGroup::Midlight); } else if (down) { - background = TQBrush(KickerLib::blendColors(tqcolorGroup().mid(), - tqcolorGroup().midlight())); + background = TQBrush(KickerLib::blendColors(colorGroup().mid(), + colorGroup().midlight())); } else { - background = tqcolorGroup().brush(TQColorGroup::Mid); + background = colorGroup().brush(TQColorGroup::Mid); } bp->fillRect(0, 0, w, h, background); @@ -462,12 +462,12 @@ if (kwin->activeWindow() == info->win()) { - TQBrush brush = tqcolorGroup().brush(TQColorGroup::Highlight); - qDrawShadeRect(bp, r, tqcolorGroup(), false, 1, 0, &brush); + TQBrush brush = colorGroup().brush(TQColorGroup::Highlight); + qDrawShadeRect(bp, r, colorGroup(), false, 1, 0, &brush); } else { - TQBrush brush = tqcolorGroup().brush(TQColorGroup::Button); + TQBrush brush = colorGroup().brush(TQColorGroup::Button); if (on) { @@ -475,7 +475,7 @@ } bp->fillRect(r, brush); - qDrawShadeRect(bp, r, tqcolorGroup(), true, 1, 0); + qDrawShadeRect(bp, r, colorGroup(), true, 1, 0); } if (m_pager->windowIcons() && r.width() > 15 && r.height() > 15) @@ -498,11 +498,11 @@ // makes it look a bit more finished. if (on) { - bp->setPen(tqcolorGroup().midlight()); + bp->setPen(colorGroup().midlight()); } else { - bp->setPen(tqcolorGroup().mid()); + bp->setPen(colorGroup().mid()); } bp->drawRect(0, 0, w, h); @@ -515,7 +515,7 @@ if (transparent || liveBkgnd) { - bp->setPen(on ? tqcolorGroup().midlight() : tqcolorGroup().buttonText()); + bp->setPen(on ? colorGroup().midlight() : colorGroup().buttonText()); m_pager->shadowEngine()->drawText(*bp, TQRect(0, 0, w, h), AlignCenter, label, size()); } else @@ -523,7 +523,7 @@ } if (m_inside) - KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), tqcolorGroup().foreground()); + KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), colorGroup().foreground()); } void KMiniPagerButton::mousePressEvent(TQMouseEvent * e) @@ -586,9 +586,9 @@ TQPixmap windowImage(ww, wh); TQPainter bp(&windowImage, this); - bp.setPen(tqcolorGroup().foreground()); + bp.setPen(colorGroup().foreground()); bp.drawRect(0, 0, ww, wh); - bp.fillRect(1, 1, ww - 2, wh - 2, tqcolorGroup().background()); + bp.fillRect(1, 1, ww - 2, wh - 2, colorGroup().background()); Task::List tasklist; tasklist.append(m_currentWindow); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/minipager/pagersettings.kcfg v3.5.13-sru/kicker/applets/minipager/pagersettings.kcfg --- /tmp/stable//kdebase/kicker/applets/minipager/pagersettings.kcfg 2010-08-12 05:30:03.000000000 +0200 +++ v3.5.13-sru/kicker/applets/minipager/pagersettings.kcfg 2012-09-08 19:41:29.000000000 +0200 @@ -49,10 +49,15 @@ true - + true + + + + true + diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/naughty/NaughtyProcessMonitor.cpp v3.5.13-sru/kicker/applets/naughty/NaughtyProcessMonitor.cpp --- /tmp/stable//kdebase/kicker/applets/naughty/NaughtyProcessMonitor.cpp 2011-08-11 07:25:47.000000000 +0200 +++ v3.5.13-sru/kicker/applets/naughty/NaughtyProcessMonitor.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -255,7 +255,7 @@ } // Now strip 'kdeinit:' prefix. - TQString tqunicode(TQString::fromLocal8Bit(s)); + TQString unicode(TQString::fromLocal8Bit(s)); #elif defined(__OpenBSD__) int mib[4] ; @@ -280,12 +280,12 @@ } // Now strip 'kdeinit:' prefix. - TQString tqunicode(TQString::fromLocal8Bit(argv[0])); + TQString unicode(TQString::fromLocal8Bit(argv[0])); free (argv) ; #endif - TQStringList parts(TQStringList::split(' ', tqunicode)); + TQStringList parts(TQStringList::split(' ', unicode)); TQString processName = parts[0] == "kdeinit:" ? parts[1] : parts[0]; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/run/runapplet.cpp v3.5.13-sru/kicker/applets/run/runapplet.cpp --- /tmp/stable//kdebase/kicker/applets/run/runapplet.cpp 2011-03-12 07:58:11.000000000 +0100 +++ v3.5.13-sru/kicker/applets/run/runapplet.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -121,14 +121,14 @@ _input->reparent(this, TQPoint(0,0), true); _label->setGeometry(0,0, width(), _label->height()); - if(height() >= _input->tqsizeHint().height() + _label->height()) + if(height() >= _input->sizeHint().height() + _label->height()) { - int inputVOffset = height() - _input->tqsizeHint().height() - 2; - int labelHeight = _label->tqsizeHint().height(); + int inputVOffset = height() - _input->sizeHint().height() - 2; + int labelHeight = _label->sizeHint().height(); _label->setGeometry(0, inputVOffset - labelHeight, width(), labelHeight); _input->setGeometry(0, inputVOffset, - width(), _input->tqsizeHint().height()); + width(), _input->sizeHint().height()); _label->show(); } else @@ -138,7 +138,7 @@ // make it as high as the combobox naturally wants to be // but no taller than the panel is! // don't forget to center it vertically either. - int newHeight = _input->tqsizeHint().height(); + int newHeight = _input->sizeHint().height(); if (newHeight > height()) newHeight = height(); _input->setGeometry(0, (height() - newHeight) / 2, @@ -184,7 +184,7 @@ int RunApplet::widthForHeight(int ) const { - return _label->tqsizeHint().width(); + return _label->sizeHint().width(); } int RunApplet::heightForWidth(int ) const diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/swallow/prefwidgetbase.ui v3.5.13-sru/kicker/applets/swallow/prefwidgetbase.ui --- /tmp/stable//kdebase/kicker/applets/swallow/prefwidgetbase.ui 2011-03-12 07:58:11.000000000 +0100 +++ v3.5.13-sru/kicker/applets/swallow/prefwidgetbase.ui 2012-09-08 19:41:29.000000000 +0200 @@ -110,7 +110,7 @@ Expanding - + 20 20 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/systemtray/systemtrayapplet.cpp v3.5.13-sru/kicker/applets/systemtray/systemtrayapplet.cpp --- /tmp/stable//kdebase/kicker/applets/systemtray/systemtrayapplet.cpp 2011-08-28 07:16:19.000000000 +0200 +++ v3.5.13-sru/kicker/applets/systemtray/systemtrayapplet.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -388,7 +388,7 @@ return; } - if (!tqgeometry().contains(mapFromGlobal(TQCursor::pos()))) + if (!geometry().contains(mapFromGlobal(TQCursor::pos()))) { m_autoRetractTimer->stop(); if (m_autoRetract) @@ -427,12 +427,12 @@ if (orientation() == Qt::Vertical) { m_expandButton->setFixedSize(width() - 4, - m_expandButton->tqsizeHint() + m_expandButton->sizeHint() .height()); } else { - m_expandButton->setFixedSize(m_expandButton->tqsizeHint() + m_expandButton->setFixedSize(m_expandButton->sizeHint() .width(), height() - 4); } @@ -869,7 +869,7 @@ me->setFixedHeight(h); } - return tqsizeHint().width(); + return sizeHint().width(); } int SystemTrayApplet::heightForWidth(int w) const @@ -888,7 +888,7 @@ me->setFixedWidth(w); } - return tqsizeHint().height(); + return sizeHint().height(); } void SystemTrayApplet::moveEvent( TQMoveEvent* ) @@ -906,7 +906,7 @@ void SystemTrayApplet::layoutTray() { - tqsetUpdatesEnabled(false); + setUpdatesEnabled(false); int iconCount = m_shownWins.count(); @@ -927,11 +927,11 @@ { if (orientation() == Qt::Vertical) { - m_expandButton->setFixedSize(width() - 4, m_expandButton->tqsizeHint().height()); + m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint().height()); } else { - m_expandButton->setFixedSize(m_expandButton->tqsizeHint().width(), height() - 4); + m_expandButton->setFixedSize(m_expandButton->sizeHint().width(), height() - 4); } } @@ -1102,7 +1102,7 @@ } } - tqsetUpdatesEnabled(true); + setUpdatesEnabled(true); updateGeometry(); setBackground(); @@ -1138,7 +1138,7 @@ void TrayEmbed::getIconSize(int defaultIconSize) { - TQSize minSize = tqminimumSizeHint(); + TQSize minSize = minimumSizeHint(); int width = minSize.width(); int height = minSize.height(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/applets/taskbar/taskbarapplet.cpp v3.5.13-sru/kicker/applets/taskbar/taskbarapplet.cpp --- /tmp/stable//kdebase/kicker/applets/taskbar/taskbarapplet.cpp 2011-03-12 07:58:11.000000000 +0100 +++ v3.5.13-sru/kicker/applets/taskbar/taskbarapplet.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -82,7 +82,7 @@ KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->tqsizeHint(d, TQSize(200, h)).width(); + return container->sizeHint(d, TQSize(200, h)).width(); } int TaskbarApplet::heightForWidth(int w) const @@ -97,7 +97,7 @@ KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->tqsizeHint(d, TQSize(w, 200)).height(); + return container->sizeHint(d, TQSize(w, 200)).height(); } void TaskbarApplet::preferences() diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/light_gray_large_down.png v3.5.13-sru/kicker/data/tiles/light_gray_large_down.png --- /tmp/stable//kdebase/kicker/data/tiles/light_gray_large_down.png 2010-08-12 05:29:57.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/light_gray_large_down.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,14 +1,5 @@ PNG  - IHDR**9igAMA%`M cHRMFKPLTE~~~}}}|||{{{zzzyyyxxxwwwvvvuuutttsssrrrqqqpppnnnmmmkkkjjjiiifffeeedddccc^^^]]]\\\[[[RRRrrrssstttuuuvvvwwwxxxyyyzzz{{{|||}}}~~~qIDATxb`dccfVPP`ffTWefcg`  WW׬ؔ$ HKJINNkbLsT put - -744 5EUIe]W3Me=$*UVtQtt p p###c M##MEgKKEoo i=b*k;\L Õ5̍ll4dee]m luHO^~:jFjꢒjj66&r++W/g ?MEeMMYcIUUcl+UvvqW)Wcc $TDEt5-,4sT%% 4%mmԌ MLs= \uu4EETltuuM  DSA:A -@ 奥45լM 5  #M=%XJWFSXM@MSU@];[ edbcC"]͌tmll!)j``jjj`jn -@@2!~!!!fVVVjj@f @Asw b)W=gqjzj6@#MMRVuR??Xkk3K`(9*+x{;wWd{78Hep?P>XښST@1+bR(ҀQ` 4Z! t#c_/=gg`253334tW W`bVg`m a3@CMlM;+d'3'3kbb\\wHX1(M ,A T* s&&ykZhƺ`z:::Ƭ̬+ 4 N&Ʈ&z&z ƺ  ʩ -tSp(PP#0#&[@FҖF X -L : R* - 7f`%x**ʀi) h`J{[*ڸ%8*m11Db`rebb*vsrLTVCݚ@ @Sֳrs0; *]`MJe!QYH]͉YC]\O V s-YTS -"o.)cg` ;:ds-\٘UY%%%!31Ё sAOecEEDZl R3YY,X)@l$03ꀢY:nn69# ++ - e!~~~J`T -s77b`Seemu += CA dedU$ -t,)J$!FR[RBYF]FXM\TAhd@1y* s$HHHuvU Vi Rj#m.m@ ||L@ "/(@,K:@1Z%AlPh`LjBBFjFB$&$$d [iIENDB` \ Pas de fin de ligne à la fin du fichier + IHDR**ਖ pHYsHHFk> vpAg**܎WqCIDAT85]OH{K7 @%솨INC #cF^h<^mV_~]VR=:6%b~hn8JtϠv ( Ű Q/jZb۸_@AyaRoQHV* ,?0vEi}7aIȲq?$vB٥z^Dш +" $W$Y@ɐ#;MU @"6::=UUm%۶DP*ķUT F` *vBt/Mف8N|[=JwPf4C[18+/P Ӧi6o5n;5ت㨲7"Ahȷ,C{UxBTr Ce[B_nZZ=Ua@u'\or޸vpf(.!!2X,WV *VA`Xy,]q:iɽzmᐷxu6Ѩ lS2HWd!vf`$@F\\\H$/:k@OEQ.79%aojh.)u4yֹ|="8Q7[Vyy>&&eA^^^>> >>J+KBpTi%<hh(piHK[遌5Sn@` @ @U@',!T"bTgc LQ: V7ob`VsWѐѰ2Q0: -@ٸi{7z`nqiiiy sJ}}JiKipbp7VW2FF^. ebkcm@ ab7<006<60BA8110( -`S3SIENDB` \ Pas de fin de ligne à la fin du fichier + IHDR**ਖ pHYsHHFk> vpAg**܎Wq>IDAT8-]oZss1MNfNVb#6 0l0`PF3ILY&$~Pi Ln+w5 ,@8[z@7J%hfۺfɵZˑLLzi4L ++0xI-ԻNq6TOG7`Kl*0\[-Ŷ``bxi.ENboȍ4 ,B"P*14rl;AHOT8 4MWK,f!]e^vj ;P(WP@d9|Pi=jo006גp- lIݬ'*MM7BQ v"?' Av- R::s4I"+"+.|@m(J%_,]^^~eDaVn#+ڜl~2j5QLHuղ:PLE\_,cO\@VUQ Z'*yַ< +AN/7$&2!Nq*#-M -TA7OOP# +a`s׷ çcLW2 # _А5mgItsp.-Y&54=h-P3vYn^s\">fd #Wާۿ%kr KvvP:o]vkfjuqAད dYBYĀnyJ`Q)+cw6`i@g Q0s*M~\0>__ \ђ[̵| +Nu};4Kx>Os]L5jZ.HE݁Qɍ3Z=oDr[@FOZ` +Waz7+&񢆖ݤ8ݐף{c}++#𾱆QҐرȱtŋ-^dɲk/[vx/Yvƍ-Y R* JM]`^Oe޿eǏ/|~so1yAC LnX\t>hή{֞ -2(0akǪL)|@ |ow߿v6o\R.0X`Ε|@ ol;p u2 -\۰{sfN`%@ 6n\tKbxqqٍEMMǃ,K.ͻ;y򲖮'׭:uղ@aV. dnx}w|̢-yL]]&̝` O4\-@+ͿZZK^4$pvrsKszWzc['L8{mk+󥥱fbŴ~/AҥWL*_ҥL شԁ[W, ̣/+(㥱\}ҵʐ'S|}}k~E˧577̭]S1d sQ\\J/iӼ U7`bewY\9ҼE3@1=N-XX\0v`žgOy,?ڋXiU%UU'N;wժUV^+d5X~ ɵN^%s7N.ҥ/- *B7 2790.293{[_㽂-@1k ,(hKvu ϟ_ӳtYUUϹNX_=Y@1=]19yQuu~~myyҥΥ+M  I3*-Z4y ˀ)|r+&lZ1鉍&V} `xĞ=M>NN1AAq))QƟp۷>}PM^xxǏ>0p|dIENDB` \ Pas de fin de ligne à la fin du fichier + IHDR**J^ pHYsHHFk> vpAg**܎Wq IDATXmXK%q=Oyof_U$P- xyxxh^4l-U>̛d׭6@H8 _? OL֫ir`s@]aVK`;zs8pY?H)y*)Z?/{' 8[߼7ￛ_*_ 4 |*?ۯ~庭zIEqn@)30ԏLy@J|y*)1@,ZK}mX3xobkZe..'c@ z@:x(µS5sdzix6*8@ t QTIdBp@X,j7Kэ!4%CGă63y1OWFkcHBpоkߓʾsNyv`}>rb8 e[]殹4rιCuU89v. Ԭ/}n- nA}Ҿ.~4Sg]n׆|>ޞjfMw{c vn~:x0-Ss*3u>\̏j.vdޭׅt3bup%j4x߯s8&Iˆ-[|@eAb +`OpM-ߖ!W5m&KԠ4(hBXg}{LC>'%İH2s8x6ayczPU&O\5t9]V:)+-b׎~{f**jV ڜytKw{CU]wۖ/\WWpmpQYiLӡ_:ytzzaI3VX{]Jkci-UTo.Ziԓ +n\/b03xOE*#2 ]Kδ1|zOQjF_ߕ* +t֋粿${MP!U11Q\^S0tqi'e~;KW櫸~:L! + >úR H]rY\^:̡gsJiSS*@Sx~VN7y++wyo/,eSQh>΃{xfb7{RfxLײ۲[d/7:r`񾧶t85p)p5|W89j(UR5Ç`sY?d22Q8PulxsUգٸ D,3s\ +A:Qc}v<ǮZ KnwHS +^pLv-ԋwHjf "lĬYTt/ۣ2ϏZ49y ā+f^xÞq ΝhyNډc.,&46Bq:';Rk{nTaM?}-rt +u3!,{-k}˞ dCI19 +d o$k1go|^mxdIܺfƒ<́г sS-vw +Z ]RAqShwv@j+l=3aCEs/Y%R穡S^ԅ=x +aE?paR3zYF,A@-+dcE ߄A䈀tw~_s|p)t~]l79*XR10s<'Qh z@xԂT @xhO+tq<9g.?~aTLMu +A߰5 ⵷f-+WJ)]$a4m[E['v8+*HĔKH!hFK[ի#.O9L8x@JW[(>Xf&_TsC6~x4/qhxx3p]]y,x K)@`6a0[rI6 AN'x|\eڂ%k>Ni2% @J/Tܦ$,2 v2{Pemi7L>PxoOF^ojzH%SW ]%+<2 0QnڈThΗ"l٨g|t +0aV"6io_=33ӱ-k֡JsPTwCx +1zE<>>n"ԝܵ{C'wl@ m ˞Zz, G@ \nK.VM]ؤAj;HjCg~ѝ{GpƨE98TOUlPTMK 鹶<+K*v.]8LѺpєs?lȩT/˫/oF܌{Iݽi,qJO;ӿ׻q{_"O{ҿw v+f@:qZs y֫| a p%tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:57-05:00b` IENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/light_green_normal_up.png v3.5.13-sru/kicker/data/tiles/light_green_normal_up.png --- /tmp/stable//kdebase/kicker/data/tiles/light_green_normal_up.png 2010-08-12 05:29:57.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/light_green_normal_up.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,7 +1,17 @@ PNG  - IHDR**9igAMA%`M cHRMFKPLTEɻ{~v{upy|~qt~{np}vzz{xznp{~plwvrqquzpzxxsikokvrmr}tlj{}{wossj{qyvotlpvqfjw}tljerqeeqkowjkyjuqszqttq|lykoqqjvejyptkihw{hdg`fpptoknecdwt_ckrjvc`qoo}ofmwjitovuokjeodind^djcokvcctq_ikiwdqn^chcfzdcdph_chndnj]\hihucYc[oihmZ\cjcvjc]biuh\dncd_g\X\]hon}ob[XXcXcr^migic[bg^cobikzp[Wb[bbX\^^h{cbW^jWW^b^}q[V[{tbxm^Rjx]b|TbxbaxiV[\{igu^[xoeuaUVax\et`btf\zWV~Q[y[[wc_t[Wy[VyOZwPZskasU\shVyWVsl[raap\[r[YuPXqhSwSWs_VsZOyOZrTWoj[m`UsTUsPZlhRsVVmgZnZ^lV[lUVmUZi_UlYOqMZiZZgVTlNYiPPlPOlSNjJRfTSfNNgRNgPX`PT`ONcGJdFM`IJ_GO[MQYKMZJGXFEXC\SIDATxb``acb㓖QTRWu)Vfv)~~Eȟn -򦱱EIfeeQIe^陙rVVVI+=ޣ ޏ֢xZz+ B}Dӏ֬ìE.Zx'.^<ѽ5kN] Rts:ujբEs/=qbޥ'Igל8zw9@Z3nnIWڻwBɓx Z߿k׮jWfɮWܰsicҥ:u3{y+ =xxH}}xX`ͬ̏֋j61wںvj?̥9~{9pniYZ[{9@1^|62g{&W 2([_[mռWUUz@ L@,޵m[۩KW <9sN< Vk[rlܸ\ϟp~ǚ5KL X..ᄛk^{&MZ1u'Zz`?( -= ֬ٻv~ -?],qc9o7NO_+ =̽ӿNN}Э))NQ.))5]%iS'L0gΪU4^,NR~ X m]J**欙T=ʼn%K\^ViCKqtIIIT0#Aywݷ0&fg ⒙ek钕՟Uݽdiyy[vVM]XVo3=bPT]R&*jaEEVVUaa%E%KV8i[)@1p],6IN*}˾wrċ%sV-@ B  ݉AJWfMR` -T>iʉVN,|qxͪ _+iùȥzzþ\״{N_ ϟ_rU@9g~4bLmhhp,]d}o+$vᾡÐ}}V vpAg**܎Wq IDATXMM$qȏȬٙ]KI GؿԾ P\q$gw+#‡^JQ>H 5ԢuU{RQTQu~ +G_? @bއl[kЧfh qν~?ZKZE?O}w?>}J?P¯e|Ww7rJVܦ9n荟)0CL,4^$zCqn@)1ԏLܖyo8uFJ,KN)ZK}m8$\ j7Ŵ 9@rYD[j0<[@ri#mu{*(x@%=p⫑"x?#5oaݖ}0 +*|+t_ BxOqh< + \s uGF$eW͊=hn;}}:qby~<o-e5)Gӓ3< rٿz;#ʏkz9cw{om` ;дP[2;-[F~>^w/ nh?nrjFnKh.^N'M165y.5ڳ}{ +Ȭ3E~uPOPTuiKcDM )wnm _GCwP>֥V)˹7M=4=LJR@JKIk{ +twJfHn,s7o'@ɇ^Ws /նE)EJgv  [NJ9EJW^Z4)׋SV4~ )ԩZIXx"ĊXt8 +ͺy|Ƨ{r.z6-%&g}0O>X"?~tyS0׳#ߓ&ɾVU˹z52H;}pzIJOk[c|Kx[0Nu PMlg]~ ֺ]HF6"€0܉&}d?-kbyvZ7ڝ`0:JxOsȔ1ЕUǃq7Ùx(E3}Re[vTJv* +a@n^4S_ȯo!_; Wh̭;x2,s4ǕM\?.e)Bße}E -uu7˒HrBsGѧ|KI=84"99`hȥMYNOdm90zՖ⢙yPuOwL&vOXD[--W֘5mJ䧯ތB {3)X㮧:l<<좆zI_ , {K?p.>!䑉BQsQ'W$G7ӛү^m,mĢ<3T-}~w8v-ZM=>GR@/Gɸ=c8z+ !ּ +`y {L].#p|_ݕbv5֭om\z j!b)ockI׮m& 1;"G1}&G] IJJy\~ˇ6\#zZ=.*kWx'zZ1g zNN` S{f{VyjS&gl{/1L%khDl#P$oA9Rզ q#P?O_Vv^ER7-"U82ݪfG>Tz+ЫX + R2qL + +kF ~0+}>Egy7.zPWg9Z:}IڬC}0M\?xڇ|ҧKFqnB%;\yiGoۚqn%8=ta5-&!18 =1uahp=tN @R#kFϟ!8z^1ݡt͈X_l] i=kOrY͹ > =gPn}=R}&Z}<}Ҏ5p /g>,/Bagus?*=Q:nc4bq@(klӲ $nҶlȽ寿ȶZPK>\l'_./ۊ`fXDB` ܹzeWj`R%tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:57-05:00b` IENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/light_green_tiny_down.png v3.5.13-sru/kicker/data/tiles/light_green_tiny_down.png --- /tmp/stable//kdebase/kicker/data/tiles/light_green_tiny_down.png 2010-08-12 05:29:57.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/light_green_tiny_down.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,4 +1,6 @@ PNG  - IHDRשgAMA%`M cHRMFKPLTEӾν͹˸˧ǪŬǟ¢¦£v{upqtvz{xnpwvrqquxs}tokmrikvrljos{qsjot{x|~uqlpfjtlrojeeeqkjkowvvyjsvnlyookojvejtkihhdg`vofpokqunecdb`_ckrjvofo}jipnjeokodind^djcokvcc_iki^chcfzdcdph_chnd]\hihucYc[oihmZ\cjcv]biuhbdncd_g\X\]h\hob[XXcXcr^migic[bg^cobikzp\Vb[bbX\^^bWWW^j^b^}qjyZczabxm^Rjx][V[{texab|TaxiV[\{igu^[xoeuaax\UVbtfV~Q\zW[y[[wcdsWXy[_t[ZwPZskVyWVyQ\sh[raVslSwS[r[SwRYuP`o[Vu[ZrTWoj[m`SsSZlhUsPTrTSsOZmYVmgYlUVmUZiZRnUUmNYiPOkOSgORfTNkKOeRMfOOdJNaNN`RR^NJ`NL_HM\HL[OH_IJ\DGYBHYGJUIFTFFTBCSAEPF@K>z򥇗-\:ijkYȼȓf~i,̱:OwsPȨ_oss`ܱ -ᩁ vpAgxLIDAT85K\G෾|ugl,[)CHAbgÚB9+:}vX ?M72 + {)@dZ'"4ؙ|ߝ; 3ң?GM,G~ӤijK^s%RU@͸R>&3`f!xY PHRZZh*"51hzQcs2fڰB]] |g=fz NGY+֪{nP`Z%ZBsCw>VCr. tuB_,UBo70-@Z ]@xSXT ئP[l-+=b.bkZ-)ht P`[@kH"ЄK/'^e_JJ-p_aP#!4{پ?I=)Q~mQde:7bYo/;!Ș>8wͥ-eg_\y RP,*3i=x)&sG6R~e631fs.1{HKX25<~\k7wǡʹdxVi@enem*&)q@)YWAme/&ݧ ;K3>-Y# >WeM ȈgSwJU!iϵ?Du J/h[ d|]{ߒ!C:)ٕ DAXR-VsV-9&ek0fDvҶr9]C7"m[,#|_o~u"zmD5YK +HQBwXc2"7Օ*3\?<$N7;>ɲd~cɻa5r)F1L4 F,sDp iE\3L>>ʔPHb{ مYKo2Guz/}CkrW:Q;JyA'M>2wSCa5k2$.UܺhwrI _{Y7a~aɶM49;NT׽;3]|u +LT14]hV|Tv[R?ov߿xm'%kII8f& MJ $Ld wo/@d/ǫ%tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:57-05:00b` IENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/light_green_tiny_up.png v3.5.13-sru/kicker/data/tiles/light_green_tiny_up.png --- /tmp/stable//kdebase/kicker/data/tiles/light_green_tiny_up.png 2010-08-12 05:29:56.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/light_green_tiny_up.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,7 +1,4 @@ PNG  - IHDRשgAMA%`M cHRMFKPLTEɻ{~v{upy|~qt~{np}vzz{xznp{~plwvrqquzpzxxsikokvrmr}tlj{}{wossj{qyvotlpvqfjw}tljerqeeqkowjkyjuqszqttq|lykoqqjvejyptkihw{hdg`fpptoknecdwt_ckrjvc`qoo}ofmwjitovuokjeodind^djcokvcctq_ikiwdqn^chcfzdcdph_chndnj]\hihucYc[oihmZ\cjcvjc]biuh\dncd_g\X\]hon}ob[XXcXcr^migic[bg^cobikzp[Wb[bbX\^^h{cbW^jWW^b^}q[V[{tbxm^Rjx]b|TbxbaxiV[\{igu^[xoeuaUVax\et`btf\zWV~Q[y[[wc_t[Wy[VyOZwPZskasU\shVyWVsl[raap\[r[YuPXqhSwSWs_VsZOyOZrTWoj[m`UsTUsPZlhRsVVmgZnZ^lV[lUVmUZi_UlYOqMZiZZgVTlNYiPPlPOlSNjJRfTSfNNgRNgPX`PT`ONcGJdFM`IJ_GO[MQYKMZJGXFEXC\SIDATxbO - W-6+*L̴\= ޥȢxz" Xjҥ>fE@&@18MZ4{ҥ{O,=t e  -e.ݿi gNֽ - :ӏ܆ʥlq¥}v4.Zo^tMĠtm56nskw=?o>жkL @ OWkS 6O-XP KqFFFĖ׋^ZU`CWY t/ vpAgxLIDAT8%MI7,U- Ǝ!\-K6 =-ɒ2K 3<߾bJ= ~0+r~\ܤW5u4t֯JQ@!2iUvW׆vo%dLrr:w#<|+gui@aHz,5JtZ<(ŽX5nR(1rrLWe$ʁo+ cILi4snkSk`M7fnCFۼtװ@2A$09/?L"4+yG{)5n3]_˩vUYM9%/U:ũ^<^rLF۰!3ܐRcğ!KÕp[ 'R!rAZ 2z~zotX9qM4fgfuYm0a[ܳ;~>^Vx/_o؋j+:AM1❑6TRkFvOQqTnq}NeV jA*;ɽX8 v4}t[@]@/)-=NHrT97K(A=^ߧѲe>Iyi:$E%EbSWyڤk\U^WG:%,7q nrpLV~L~ ).%xOp qn;hP{.[Jަs]nH>MK/J+M$i㒳my[zQ c$=̇uZN`e ־OǿoDꂿH" )5 SΡX"-.oikHLފV-!^(, r@BEa3-圲8(9 'NrvZEÈ&i$%gYmTI:ݠm=kǭwNZz Sk|'@CFOA%#AEɤp# rdzW?%tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:56-05:00ķkIENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/light_pastel_large_down.png v3.5.13-sru/kicker/data/tiles/light_pastel_large_down.png --- /tmp/stable//kdebase/kicker/data/tiles/light_pastel_large_down.png 2010-08-12 05:29:57.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/light_pastel_large_down.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,12 +1,16 @@ PNG  - IHDR**9igAMA%`M cHRMFKPLTEȿʻȵƺǻŽ¾±ÿͽɹʿɿȽӸĽǺտºȼѭ³ճȩǽŭéƳ}wu~s{jkvz|os{q~}}}w|py~}yz}|}~xz~zw|ytvpwwstux}rkq^vuhot{|pamqummtmlakmgfjlhhh]\`7r IDATxb`debusccg3ӑ51RUT ֿo_k׮_?O߽|%|x۷o EλS5x4.eʕ e@m䓳:#_%@FܽŽ pʕ - - -jzb -B\W7nڔ` LJ`]nʕeb  -M r2[1-@MMMxq+c;pI/̀8GG5iZU~Wnݺv6,vxuXi^VUFUY Խݼym ,0߶!'(gw✘!4uދ{Zv`k4gZ\Uxⶶ+W@>m˻Fki9z-7 /\'O@1Y 3Ǐo=9+;;;kIY~Stֶ|CZ+Wɸkjj[KuPEnO[KWqqWoм;+IIjP2PP[BKnqqq34ιΝ;eɓ'_0kVUr@MT6444/W@ &o<9wKL -[rׯ -H靶bECɦf!<䑆G.` VؐyS: :'iߍSMv- ֬ԺfMknn@IvM@@1(I -.|$84Дnز%t„ Ȯh޾ d^&%_85e;6TO617$h%K?C΃llnbIIIMvիW^X;iREHeM3g.7@ ;ـ=)ȑ#+V+, vpAg**܎Wq\IDATX]Wُyu}\)QulAϷ 5/=pIB D$I;;;WutzˤQU]﫶JOI:]8غ`%+7YҶf{6Y5X"KPܲ\G*TF7mYθӹ? k{g//W֯b +=E!667*OVV `i+ AJ㫑kl΋7׹80R(sʪ,%;>,,-n>kݕUΦ,K|?p5&Izׯ]Zg+ i7ݎD=K;hgi"4†ۙH[vc,ΧcnaM8.kӃdr Ѡߔ"VYS; +] +|e%Q\JCq*bm8Q:;E0;) +SˉIj~[4QLuw?T1\Ք" +¸2aԪTј`QJ(I֛Qe WUm,'zG^]yQZ,I~fH /JUw8M-jJ:dDAr1-89K2KNb껣lʌ.(k2lb2e᩽k-pZG5bu}dXs p)ut\0Y޲}"9\]yGQ5u<͓yv%a>"%\iw|GQwRjU3ENDMKv뵔^`NϳNte hX @GIiPًJWFjEŐ1p3gTge  KSk͹@6_^ۯ!{b `k{66wK +^X\XbR)|[Y:=Xm D^4d~)4OK% +K|p8~y7\x)Aͯ89y ᮽ4& .4tUOA)y +(pєwM) !iz gC}\6^Vv"gFK.J*5Z. e~N\Io|?xHWN]V_ϕvomݼXҪv_1H?hvav9_Lͥwh9]|vtWp=m")С M--,s]F @-M-_h@7Zy꺁kGwm\'^60%OVg'N!Gx/Z^[] @3 +y qE)``ܫ i۶R5֗Gu&:W5([ݨ{{S7EPPQIR֟8;L3;1]BP*)s\OvRm^x[/D7mޖUu<1z,Jε|a5z-tڄ2B%peV]-s(E,aܲ> xLݫE\1!e*ˋ ܲ굶W| ,۽~4bmkpȝ_|}s%~*^I_:KaK]Š"R#R XZɪRz%/ }o/Cadd\R'Ƶȋe-"6֮%?s~oYLwm,=Im/T7lzNi0]X沲zq"Mh u,jgJ#}o7E:"jόc8?c`_xW|˔r6@i4QVpt\fsÍujV-l^}.ZvXubľ5F~U5KzHOxlzo6k H""gw޼'?f̱+m>A1ybFI׵rl4ܷ~;\ZHM4WX3 +B^xJozgqa HwfQj ۉe~wD٣l6'gd4pOo,J8hyt .'M/p@o~gn @:~"ѭmn4J) d9eTWt !#Fu4UG\Vm}t/v惸a~e< KJiBeZ_1c^-1 `#5s,9y\8DU&̫Uن{@.n2Q+Uڣ g(G(; l\x#;rE?ͿE8VTUs81QA$U0ō+=` THijn{WR7A\>n+kT;6߆9`"cU(eಂxOpp]IRdq3}e*5mnN9n 'T7ڈOFsLUQuE #(a2 +jZ yvR~XW?޾Z%b|SZ6E9,w ba(a&|% Gx$c.i"eGI:T S7œ%tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:57-05:00b` IENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/light_pastel_normal_up.png v3.5.13-sru/kicker/data/tiles/light_pastel_normal_up.png --- /tmp/stable//kdebase/kicker/data/tiles/light_pastel_normal_up.png 2010-08-12 05:29:57.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/light_pastel_normal_up.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,8 +1,10 @@ PNG  - IHDR**9igAMA%`M cHRMFKPLTEпĺĽùʿȾ̵ɾͻƿɼ¾ַºͶշϺ³«̩պȩǷŭéƳ|wuuvqsm{{jzyvzgq{zopxpzzszcxn{xkv^ushpmf -IDATxb`攳abҋ`gKKR2443T2PP Ni||lll]];eDfmiffeoeno$n7 4=fZ_ypׯA_d]RÔA33&h[n| }&*L6nՏ,+ @ j@@[@gw޹#YpnUn` v[=eeO>1119zcǎ]wԴ?׹,$DAײl_b: -wٳmű)OٷoC`ӞHSWvuK˒o+-3rũŹ tmFMm1Z1Ib fMA8f;@cw2m2 WRl&hr\@Ҵso|@ گ_M((hkb`$//O1e}_+<&Fؽ`aaa`q0$$$YO0TM5Oov+XAԿ|a``TMkt4METMPeeenn+333`q~M!S4T4=cefdd~~Ç7?wHm۲ev UUUuO 3c?~t$ ؐo{ripdppTʔv+fAAt4u>9>>qqt`cc~~A&5kOb KYұiSGRRpVb@/bPLj|x/))/h=?;.i2v@뷬~ X6^=RܸњtzQ6He[0[g -@@Crpp~ˁȾȔY Jgo9 2B]\CM,-<ڶwBkbkb5H - l r:ef:-L-Үuiʼn՝ Uq=E ㉩@SMY R@@q903[?^%e%e*: ATrB~RVJt4ozUɻ'JOHe:] @ RL@Yؘϙj T:*;Alp'P&$*& vpAg**܎WqIDATXeW[y=uwKQ)Jbӎd[` yȯ)@bر92mْ(Yx.6;skuUWaVc.=Uu}|=CvsḈpӝo8{<Wnny&~6MaqQ8w4\Z[WiRo/TBɬ$g}+Q0U.,y4 W~;)L':Fn2<$<)X +q0n'rmou/ZŽs\/y&jdv喨G8bLӤ4YUMI+]4M+kp6z3 -f:r$8S9%}tG;dp'(4\đ!ãz_TnNkWƓE| ,SA V(j)\D@3p5O;On"UYI]VVk$eǹ&v;w?'.hYr_֔֔gtv*9spJS&e;rhU˧Q'^u| } j;-kTy}yGhzMhpQ KI"t\@rʹiTϲ@Mq6M:Au>ίo_v>|S52[+ +eJ֬vן@+3*ͤ`t9rg @кRV0VVD +D]XXzZ[]RZ4 ni ,:ݼr 5beI'U/_; pXUU@o\Y둊 wgAeL{0@ť9>=Sda9 -Ey%<% p@xPx$2s<%–z+]]U*u;L0Ex:A y!6NN΃fHxrTtD?6xK `ˉ1UK9 `)%,O)B3ʙ#,)-߱ FIT啅e$IKZ4||W?K8HMzIGyR7b%L5хReR:)IY eQD)e_Q|&Lp&DPx+Y[%ͥcmoٸ79ULkF('U6NQV4晪ҙ%ZVm=IrM@ٰdKVPĹd7,6d{G`U^Yխ "ixC &9s#,v0>465l`M&:B<;wDZu58nqgӋ6rJ(E>dy*8V[ݺOd(\*V,(Щ523]4V (+׆%Xq2\,l M#$18EVVAE|TId)@LS +iA@*"cy7FT;+U_vzc>W4>:?:鏩CϑnP0U6|M1*DG4)t$GsRX?}o5?i'{߸-M;ZnP_^$(gMSI^wyOE@ߏ~+ZELYBU RN#c .e*=Q&sDoΫli.\˷^f[0(-$ыeZVHj!G{ݯܹ3JX:G?gŔ7>}^ >dgjM :pF]te`@j鉓^ԟN'}귾fitu~ yr4pz|.ָ۝˛` ʻ7T e |[d֚1)ue/_=gje~ײ^@ ?fi@븃8󥤜E4:6:3BFgy4pO''ZeQ}ۯ߸ݠָեk_Uus:p,*塐)͍oQg0,Ź xc2ν/ʹe_QFQݟvnV7 +oypo'{`Q~2?kR0:CsE>̜Z:Q?Ҵ7?7bl__ƛ0x]Vv?A柵ME8H sIf(Uev!N'FGN~53G>ڹwV^y-r;9v)<.4dnŜ"›[>Lt–Φ7^˯}/W me|`Zt gxS>Kt__mi&I>HϲturvceҽOEQ1K&KgI2~y>I-oTY%-@=yI,4LIԟ J%tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:57-05:00b` IENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/light_purple_normal_down.png v3.5.13-sru/kicker/data/tiles/light_purple_normal_down.png --- /tmp/stable//kdebase/kicker/data/tiles/light_purple_normal_down.png 2010-08-12 05:29:57.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/light_purple_normal_down.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,15 +1,17 @@ PNG  - IHDR**9igAMA%`M cHRMFKPLTE¼||~||wxxvvtt{ustswyqststosmoowmpoukloqjmnqrjnpsykonmhljmffihginykjkh~}lyffix~gzltcgf~wkzbcwkpvlqab~c}exxg~vjsuiwabxygt_}`xd~wdwvequgn\~\}_wz`zrflrevqglnil}\z{]{[|w^|v`su_}pcrtams`mpawwZ|u\|r^xmcjmbpldgkcgn`hjalibgvYsp]pm^pg`nuXtrYvl^gj]mf_loZmnZuj\jf`af_ae^nmYof^bpUsnXmmVulYhhXrf\dkUnb[elTmkUkhVhb[_bYha\^iThfTmdVhbXd^Z\eTjcVd`X`dSgaVc[YZeRfdSbZXYZWX_Q_^Qb\RZZQ^\N^YP[ZMXYOXTMTTMRQMSTKWSJQRIRPIRNILLENKGMJEKGDGEBHDBDB@CB@A@>@999131w!IDATxb`dTPP24TTT4@[U[VVVSZZ~2@10{xѳ?z|݃/^|zs@+$𨑡vד7׀٪÷z^y,+%÷vvVӀͷɷtUZ5yG*Μ{iyN^V J.\*gy{咙w>8̙GloȑU@0iyb/Am]{W5,Zt43{xv Zаdɒ7ĠvҤ-7745<8j涙e3gNyp…! ()^ӳu7o^T̆M3Sgܾpc gŞ3/7xfު|Af/88sƎ ĉ3Ş˗/g0wcw c@bѬ͛WVV= w[lYd׮sVLo'Lz -w3f= g7m:z-߲3gM2k2P[( _yvE[?+@I/_Y9кu݋f -w n`8xc`2l0cƔ)S*fM߰h;+ɽӳQQIT>tJӇs+$򡷑ҷpNN\NҖ܇ȚxңAӤUU - - -BNX1P)0VO_V];w*WLׁ -K+cbb - -zn/Zqz޼3W^=kٲMVY, +"ryyNɂɨbŘ)+$y~~nٲfS¯}ϼGGOWFEythѢڔS_z;y@ S8mͱ)kOaDž {wLH@+򞞷ieǩֳ}ʸ0A˼yL8z͛;;g ط+&Ṇ/A<`Yr{4A׮_٢C\^}aAKbGGoQ{VL*++QY/?ƖS7vsQH j&M}}fzsUr+|WO *.6߳74* -gMYL ڷ/yh T^gfddxŅvL*]ؔ/~Z29J+@1?+ʯiFn<9֯yҠи8__w쒒8`Fwl;xxAQQgwĠqbXXN8_k_ߢy3NٴrĦ^ĠlaiUUEEy&̛wxzo)9@1H?;Xl*{{+͛0a#mty< +V +*WXѻ}{L` -yi[0T0om?yr۶ NtXXM'Oud9:0I @c̙ ^t^3flk}a[[[YAKG/{@ z9 ,O4 ~y+Mk'? +\`6-hP,4@ak_Z <苋HKK48qrqI - -Jʊ 3 O޽-7 w@ÇoG}OeIENDB` \ Pas de fin de ligne à la fin du fichier + IHDR**J^ pHYsHHFk> vpAg**܎Wq CIDATXuXǮlIV]#Ks3e^WQH#~/`&|-1BMu DWzk2oAfݪ [g+|oww~*`Le O ZtJ@axQ8<+y K0츻x任??nm%jyϤ h觘<FJsy )j)Nl#lBN{W. &(K=|˯_}gW9͝[s]y-kWZOCkZ*#__#Qɹ K(V@F$*NV5q"P%81!ỵ +be +V@.+؍w0ڡ-&n+oES 0QB^Ȓ~ S @ XH-JHA +ɕJ\(MnN G)tYk91M)BFE+iT(-'N3ŕLY仸ZSZU OF kh׊N[4)9Ъ׵pFb0 `70N"D7=/8>Tҕha(pu< , },qg +\?qšB^IUS||ąԒ42{lmz܇Hy+yXhjsLCȡ56~~eEC%RHS8@)nR9͊4f -R~=^&F~`kUA)y_di` 9s~6\ȼE:C Q"ò}(Xyxe^]+AE ВZjԫf1:^Hu aa<S +#R!D^5i.:%@F??iҼ}[}qq2։>U;Nyv)c"̓=UcJRJ1fC9HtŘ\v3r>0aVW(f+\UMVDf%U]e*޶j39-xZ$4JM󕏩6Sz2jB!֎^LBdzXF65`يDԤ9hLF}u/N cݫi/R.Ho׼˅)>}? 2Y9,CN0J<ϋEH!o%Z1FDH +P&i+u ݨDіIUjϹm)KUatN":A)ɋ`%9[sAS pz?ZFu\HIMJJoS8saa_ZCتՋ·+;wj^ I`>Ĉ z9-Xz?__-Βbޘ)uߨ%O7i|$ΏogX_6׮n<<ސ+7FOR 0A9L 1Rlw/QOöZ$C-.,56˛˧#TNjQٟc>ߐSPBJɏӠ^]W7%ܥ3F63b~~Tue|^DO$2MV}>3 s˅5RmF"'nTQRJt[bĉl޴FscS)"x +<%S,.ͅəQV x.x `JE@v|עT̽daMQq>ю6aۮx' +qd7੥O=RgFH;SʄIfksJJۉI`̮w!r: }4.i!S.qtB]xX.BD*] +M!d'#4 +TkIeF8,aM!~.>l۵_k&`UK*mL!1,i0IUъR5jmztO_/`C;d7>\e9Q7/ld}{7u޻6UU@:]Sbնa<ɐ6P~ 0u%c?EǃǐQ2 A2<e ` F@;8ש0ykɤtDKB.6]׺9B“1QΦ~1F^XOVeBA J3dKGt]w40l$|N"-%4]g616*?@+4Y) +) +ϼ{V #a9.n? ;KR%tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:57-05:00b` IENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/light_purple_normal_up.png v3.5.13-sru/kicker/data/tiles/light_purple_normal_up.png --- /tmp/stable//kdebase/kicker/data/tiles/light_purple_normal_up.png 2010-08-12 05:29:57.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/light_purple_normal_up.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,6 +1,21 @@ PNG  - IHDR**9igAMA%`M cHRMFKPLTE¼¶~||}{~{y~|~wvvu|wttzwsxtxu{sstqwzsttsowmousnpomsvtkloqjmnrsujnrokq~sy~qhjlmn{q}fihgilnyfkjkh~}ly{l}fix~gzltcgf~wkztntbcewkpvlqa}ex}cxg~vjsuiwbbbxygtxe~_|`wdwvequgnogy\~]|_w{^yayrflrevqglnil|]yw_{t`|z\{v`sodrw\{tamt]{s`mq^wo`vnbnmcjldgkcgn`hjalibguZqo]og`ng`jtYspZul^nl^gf_lmZth]kf`af_akYnh\hf^boVqmYjmXlhXqf\dc\flVtlTkiUhgXefYcfWgb[_a\^a[^hTlcWfbYcbXi^Z\dTj_X_fTcdShcTe`Vb`V^^Va]W[[YZ\V`[V]ZXYZWX_R_`Pb_Q]]Q_XR\YRXYPXYOWVOYXM[PNSPMRQJTOJQRISNIOKJLIHJJGKFDFDBD%sIDATxb```eeni(fcf@ 11fv@`*nk蛘dff1@+@rڑ |̨vV|+ ;rr{|K||̶жiۅ+WX1qMM:5m͟bH)@M]qŊܕ]g>(yfS&M*5izso6g^+ @пѲFF{dig6ĺwXrӢYzyWĠ~.7AA`0]-Z2G^cǎ돽+aÑ{^5Cز液UUsw`ūθΫ||+ mb^ĦزyƸ tBimǯ^iSuk, {]uIyk+(T|y̫|A67-1q]76.̜@>> ^| ~*"eeUuVp};ow(Xɧiy@1ft{EI f^VUk T^ [ SSSü -BgLhQ"e˫5} 6F -Tвۺw9ئ-bQYX-,lIYYNNcVVּyѼyݽoSVF`˺ @ ܪ͜`jcrwwyN;uÇ̛hb]XN[Rpam53){޼i7[Nzsaۢo?wۅ [.?a`a5h0vu-phG͛ݢ߼ `6/o|߼yo`!y߿@*NcIENDB` \ Pas de fin de ligne à la fin du fichier + IHDR**J^ pHYsHHFk> vpAg**܎Wq IDATXmXI-9R<9;要 }XV-X@ RjTwϘgŹU􂐕r&M߾К0sLYpiBrQ gO;fT˨5Ov<zt8H2X:4XNPU=CXR1%C"4]!@5+%"NɯΆ49La4wy>'l@_~j_26Vm\7Zk8|IG+j@f!M3f_B'rq4WXZ01H!$ƻae*EyD>JHt5HiڥI/ɚ\Fun[h!U :%nj7w'SUʉpJ8„rDa|e.R!0eca5SJSXia0Zsez^Gݭ7B3j}@8m%;qD]ʉQSHͤiM1պO8't];?t^ Q\$mKgVI*Fd{% +S&R+Giy<+11[95Bk>m&S~%XOWMaƬKV1H-__=;k? 3'k.eq+[ֵ{wH€NdFq\5Y`p%ս{@mzs}ڦ17M}.@Icm7SJʖh]ўySʏ#+h@x9RfSxv72" 3L('l +B^EPEӋ[{JQ ΉF׬ <}U}Կٯ>yT0;KG[i*j霒UH$vE_#)(x@#PJ )\i{աS\l+iTl8~`v5ҡ\Te9V _g9SN;XR Xr. 0R࣋qۯnϗR"l:/!7jF*0r!X(ͪaj.`?ӵjTR=/Zg\Zqpo_[c>v:ϔIwn +VlTD +Q ^2})]p:K(›W;sz~۾w8o.=~᫔j\}\+Ȝlǔ`>eDXC*)?b񃛹Q+*咮YtjUSX5PʪRr,B8)'IK™dTJ*e`9xϠ -{pU0I2s%35吊w+*BV\HIMIJ|1nZ7+_-b;԰5[.y[wѝ3C )eFnxə3"R[Y04\CO}kzW/~¢e+|z}#O/.ͥL.LS?v + MRYZH,Dsz31,;jPh\ɞ3>ڃ2:rkn66S]~B0{{b2s|-mtOIA⒈K_xuphܪzb}GSۨtޙWz8xRCIwZ+Y4'۩n<-_8k +Έ\Y>=^6SN4Z(ڭW #(+ 1#N19D'7#ѡě~M2XW*}j[9!pA?'nes!TP=XSxnW n&L&R@0! +bk5VnX[iBFil΄é: og +PH'7BjZYlK`PJl!ڬojNy Cyvzam]lZ@;nuwTmub]W1bs44Bm%;_gkM׳?~&*յ +\-cY~k[>^6Z+} + mn  /Q oLb&StA˺\MM<͔aɽ^ݪZjt{ 9emưbĨJ +PeK W$!ʩ8ǥ!F +Dэԏ.enl6%MDDKVdעTi`za)}ÃlBF%3`׿s?xQjK)P?uzϵ\el})Χaira\]5^&I + @g1(jBZm.7 =L,$%1 ~X!Քty#T?I.G7Xw֢`(h`*Ӵ̒iNdך}տ ,*|7kvN,N(o@2J_w+MFq 4D*!mH{.@[Du#mi$JJc>n!:̈Pb|o +bqDw_Ór%VڦnOl̆]YlbnuJ~}098E$cRv.LxnFELQ%ViݨVKLIm`|rCr~?}J{6JCPmX܇CڗD*Ҝe ZZK(12<<ybu.F7V(UTS9xǟx8} nQ y^>N(Rߧ59.'1S<#)%]:Mgğj8hxׇKT}XQR#+O + ? G9ɟ%PL-i/gڼ%tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:57-05:00b` IENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/nuts_and_bolts_normal_down.png v3.5.13-sru/kicker/data/tiles/nuts_and_bolts_normal_down.png --- /tmp/stable//kdebase/kicker/data/tiles/nuts_and_bolts_normal_down.png 2010-08-12 05:29:57.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/nuts_and_bolts_normal_down.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,18 +1,13 @@ PNG  - IHDR**[iCCPPhotoshop ICC profilexb``qtqre``+) -rwRR` \\yy 5F}Yd<^\PTJJjq2P^RglE) vQH3KwI  H}:lW$d/FcJ~RBpeqIjng^=`Z FbC,>$Ag fD30 !p0,bV l KgAMA%`M cHRMFK -IDATx!K$!鐈DD]:?ϟޛsNiQkBΙ1FBxqaRϋWFPe" .'Lkr͌GޙYkaΙ1TwH95Z3JDpr1"{{{}a`1 ޵k͛7}v!w!GVHX( [D cǎk׮% RPH޻wl - [nb -P*xy!p@Ơà4;ǠA6 ߴiE=VNv "XUYu(/C!c 9b9SJJk;cEo 0k-](`!砜|ar1(-[I766;@[2Xz3f?ŋ m6]p!H?`@W @_ED  wDU.Ls>+%LjDZcSU_HH@FDg@-0 (3{Y2Fa`*)|iw#&">O)"_Hf_f!.j -8G(^*c`Y #29=wOR2"&8<ܔ/t QDΫj` μY( C|'w !SU`L =Ir809 ɈX+D3ġQ[Q@ ׯ_vQPP.aPhB#%%AHPуˑs?(4A@FX bTzNB^cA>EcKRQmZ33HusASCH4J\ gϞs3CAQqFp IXˑ4ˑt@=ȑ"(Sb=C -@@g@>HC/qwK59|aAH'Edwa'$NFa_P [Ȋ@50@벳aN ݠHPMs$Ȏ( u@ZB(T ֐D`oHq-@5Qpm@2}FץJOa ܠ*ۆL2+lHRq]| CQwjy7!hP$!P2;I;`/$kF5؋ ٕ+@ -AEtd9Fvd__iّ #;T,b<At* A!T$̑4HP} *׭[ӑ { vB Uy\#NA 뿋yĸM -m6 Pbq [ݐɅ$KR>c`jsywa` UKed 3[,H\j0~v`Je=% P ;M@U(A! kr$H -̑PK Bwhww7:A _M3&tjqn'FԸr.KZe$58-H%#iǠIu - kXYr(; 4DI% 94~T_.(@ Z(AuppbH&(j@QJ "$#A#A b j䀒׋^3º"k:  ȣ "8+O~`5T2PA*(zY5@Eàd /a1 -0_п983W:{9riްchI,H 0lʨVULE]fv8.DIENDB` \ Pas de fin de ligne à la fin du fichier + IHDR**obKGD) pHYsHHFk> vpAg**܎Wq#IDATHǍoTEsΜJT@&@ ,@ r7 @D$|xE _a("l D )@ D v[lv:{>Ƌ3ɞ33'3 +Ee)t)<<<TKW|Y9d)w2B?O64H_};[PǝttH7PHL$f@.o|.O.wI_Y&d%5y0Rl/3;Om +A3N0Y`YY!#tA&l#+9/x;A(Ng\imxD"Z(Geu> Qn uf +mgtPJJK$Ef5N%ifxM0HW |DU/8HP1I)L<`"UֈcqI|_R8bhS E*Ʃ4G +H9u! +IF Z$,K 2S"41~ N} /ƩlY;H5$ԑNJ dpi%d|屎8+<>j@Oe +7Ω R"\NM$S;{shȔ@YZ\LQ cA }2.wY[a^S(f9B!zq9V +C'%22ۅ©0VKR-0b"ͤ `^Qʹg|v4] +pεՑn"L`1N1&pIH XKp>Rxݏ_7@0^$&"ܱ$Im_?olA#ԇjj⛤8pɉ`f9u7xtd/ ʞK~RSzv%54-VOWI;Yv7X]BTK%wԸ"Qk +Z%=v;.1DerVM X<qΞ7ɢ7%tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:57-05:00b` IENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/nuts_and_bolts_normal_up.png v3.5.13-sru/kicker/data/tiles/nuts_and_bolts_normal_up.png --- /tmp/stable//kdebase/kicker/data/tiles/nuts_and_bolts_normal_up.png 2010-08-12 05:29:59.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/nuts_and_bolts_normal_up.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,20 +1,5 @@ PNG  - IHDR**[iCCPPhotoshop ICC profilexb``qtqre``+) -rwRR` \\yy 5F}Yd<^\PTJJjq2P^RglE) vQH3KwI  H}:lW$d/FcJ~RBpeqIjng^=`Z FbC,>$Ag fD30 !p0,bV l uu'gAMA%`M cHRMFK -cIDATx!K$!鐈DD]:?ϟޛsNiQkBΙ1FBxqaRϋWFPe" .'Lkr͌GޙYkaΙ1TwH95Z3JDpr1"{{{}a`1 ޵k͛7}v!w!GVHX( [D cǎk׮% RPH޻wl - [nb -P*xy!p@Ơà4;ǠA6 ߴiE=VNvxD -Qv+ $_H9Ch{k-sx ! "I)sBw/HX9`ιZr(CbnEIxHY&h@A`HR}m[$PJ -}C("0@̌1%9Xk}6` NA8;8~}rB_"Aoq֤PCAy-iqOhe&iK"͋#ep1Y`*P &(w!h|M=LuN0IAb"34 #f񾻫fеQA xNonbmX{|f)B u+$I#}R@(Jлڙ[7ßlDu;M6 E;[P1z,H -:>$gqTI滫ZҼ 9p3@iŪ:d抈5&A GjdGHP4rŋ?m4C@1n?,@EU@LVfv+,73Ĝ*YUq8@M2!帐U)358# ߃/rT| 84 K .AEw$(̙̙`  } s -R,`vnũ\!,Ot@OfVD/QƜe)O!ɑܽ4|BPU{[bA@ /_=tjP*'A=3ȑ֭ItGBݑSNG=(@١4 -SQQ ={Xea8T-2 эy@DnE7#ATp[[8P̡ =j @EPPTwjOAԑ&LG= PWWN^),,@ >Ad[(="谲#s8.G?%%%?ȡ =@ PԘ@w((A r CHPt0( ١@cP2 `7Av(H(<2[D/Б IPFCd!(A vww1I A粲CtPkP!PHu@DIl;Ԋ @ebttbCw((:@Pl \Dv$( -|P( -җ @E6-Pڃup#A#[[[E(} -}PUP^KLL@ @VJ+A!AJHBH 2 h(#'bCPA #s8A5@QVV1P~%Ct2]LLbO CA5@9Ć$U-AQ -X/""j8Bw(H/(u' -*PZ5)+AfBّ G'$$;T q^P @A޺5A8(@b -uFHXE7 @r9mPL lDYP( P(0( IX.{ Ga]P<j NAvl;woI 3bl0(j PvS޷!Qs+nBQ\}ݍBOAb|¨y./O; -ܣ E S9qjDIё3]9l1 '0XLLqrJ -{Xz^od ShP\j5hh{:&d6@f{GUS6 *k,,z&8&--?%Un QJg\XDG,Z+=iO̠dgj|G: ҫy[O([.hҏ3xힺ;rkT< {-n -憹9$PL|t9NmKaChPAr R d.>ʌ>-A&?~p } 4t(%"R 8"g`i~ljPcA>>>@x!L[@ 21h260h4FA!/ Ί -@ ޚR)lU @?h\ HxAB ,PY *;A%K h  .OA~HHp9+Mc >5mIENDB` \ Pas de fin de ligne à la fin du fichier + IHDR**obKGD) pHYsHHFk> vpAg**܎Wq IDATHǍoUgf~ RR0("$b#. Q>𢅊0bo`B !hBmt[9Nj={"̛3;<>;MV>&OkbbbG(sU;>jq(|T~ch-2;[^k~xTɒ)sG;Qgb4Z\Aᙽ A6h⭍ʧٷde zh3*' 4XLl-Iٟ#2,[0D7;L'y(E&"K(CC3n Oȁ,cg˙)2?@XKN |X8V>cˇ\`+yLHc7Ut8OMO+f90.h@"iemN1'77,S FPDP6R8&Ƿ ro" qDY5Dtn0eEY5M4Lu"b%3ghUPU;L󈺮7q *jN!CԋBXEi'**Oۺ)_M4k+<G2uf6=']'T̫(Nn>|KuHHYud@lzhdL#^RFID+d&&5E[<\v +UD )5Uf%ȱ0cۉMuXDi1 ,P1eʔxH7y<6Ir \4zўRlhB MՔ$FzYɿqHqa|q}Vh khlOV0G"y +MWhe ZvoaKl`R*u}'vy"||3!}|nqȪ9lvM|S;4U4O}xVFĶV wu.,}a؀ 76*KyyYްh"ۇ\Q*/=@c\}*>>rš{r21El9Weu|9I%tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:59-05:002QIENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/solid_green_normal_down.png v3.5.13-sru/kicker/data/tiles/solid_green_normal_down.png --- /tmp/stable//kdebase/kicker/data/tiles/solid_green_normal_down.png 2010-08-12 05:29:57.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/solid_green_normal_down.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,8 +1,3 @@ PNG  - IHDR**J^ iCCPPhotoshop ICC profilexb``qtqre``+) -rwRR` \\yy 5F}Yd<^\PTJJjq2P^RglE) vQH3KwI  H}:lW$d/FcJ~RBpeqIjng^=`Z FbC,>$Ag fD30 !p0,bV l z,}gAMA%`M cHRMFK1IDATxb -3p16 -rvw)rpM  WcyEeC5}SK`;"PWd/uRX77(%%5%=(#-+#-5)-oB @1X9Ʒ*ɞVD50gjqƦ S -2N/xjL( ݬOW2rʹN~@ 4[@l=@ 4[@l=@ 4[@l=@ 4[@l=@ 4[@l=@ 4[@l=@ 4[@l=@ *ì P,z~f5 ,@ ni>q -3hR'_iU3肸E+RLKT2tfuג{w,ٸ | B|ZfL^:"ykܴj]^}#@1E%L(kտd209M]>eVlܱ {F-tIENDB` \ Pas de fin de ligne à la fin du fichier + IHDR**J^ pHYsHHFk> vpAg**܎Wq5IDATXIN@m'3qY1, XDBBbP T$+@DUQT"S+ILIBUT4&v+D@ƉF^vޮv~;EsAA&&4͚@/'l3H(,IKo`l\N.[*_W|+_WG$Ag fD30 !p0,bV l z,}gAMA%`M cHRMFK_IDATxb8sw/=r=WlhkOo^zds;w;/{ ]?g/ܷkU:b7>mϼL5kΙBfM9s&&f['n==}ϼu{:6OYZQ@ /;y ߭z7unX+; $ #wNoX%/? @wN z`h z`h z`h z`h z`h z`h z`h `N`aӹs&T>'' ֜ڸ;6O24ZޝS+[ٺ+YԺfEKՒ E ^OlNӰձr -vswwsrsv1ҴҖU2 սsjz2k}s}shs]#M- ;IENDB` \ Pas de fin de ligne à la fin du fichier + IHDR**J^ pHYsHHFk> vpAg**܎WqeIDATXؽ1=$HG@$+A"9'zf(NA-/n.8/@D$Ւr4ll|"p\kYm΢O!'{aV|DcǯD}7~tF;_21`50jJ+d!vV/TcI jf.!ׅ5{lMDdiw|;wǯ]e֕2q?S"BDLF +c@4 m1B%re&nO׳68z}v1[Bf!D\p-f5SAmv<0vwO`ug_%tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:57-05:00b` IENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/solid_pastel_normal_down.png v3.5.13-sru/kicker/data/tiles/solid_pastel_normal_down.png --- /tmp/stable//kdebase/kicker/data/tiles/solid_pastel_normal_down.png 2010-08-12 05:29:57.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/solid_pastel_normal_down.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,11 +1,10 @@ PNG  - IHDR**9igAMA%`M cHRMFKPLTE˸Ŕ̯Ȥ±νx㻇ٺŻڹüָe讍ɺ쾺ܺd魁Ǽĵح٧ӭ}ȭܼգŮͫء~Ƞ̞ħY뿠y̙f~?ϼJp-ş,l1N\ÎxU왙oȾbUqՇNeޅ2z_ᘖ9΃T}}rK~JoąY|B|Jp~߃6栒]\{:p{0{?IyR:~c3jը|KG[yB~yW^yKkt1sҠKiz[uzQ\j{aqH}`pD\Jo}ΒoJizIv}"i1?u|ydz3xkv{lRqIo7tZXw]vȎtJlxv -iz}uwr}u]}wOuBXxbvu3o-kvlsrt\csxs9urJXt|jXhmtmr@EryjEe\Jifffyi&|e)XitWkjq]FddDVhLF_bXILV}yO$[VLzN%RV`YTDhN:ISqBQMPSVS$WMcC.7JtlBc;%D_qqcss%4&SgϞ=fӧ_ߟU^8=55^ @1}Mvŋ/^3a.)4%ɫ+ҿhrc{{jybˏ !&'.dђ% ڇ/prjjYY^;@1H̙Sn=i˒ ,XRVU^ -⻜IWUVnݺe5kBf/,(K*o˫+^T -@ J&M?^UU#nipolPVV h?VR+lIóajvNZ%a?+O}/37+kByyyGGu_T_! '+kׯ߸qpٳ}ek'M:tj0*f -@@SOqqq^~ƞȚȢ]IMMS;J+KJfWy@ XYXܽ8::GF꛺fz_u_u3TT̬h{ @ V99Y쒧zq[շfiWuuIIIsIsskkCyY=]ʕA@S顢D1@2OcBhkXXX4yyj4PС,fi,BLVL -R -T -*y?333 Oh~ @?U@UԵ։ l@yY4-Hi+ N*}@ Yݕ$B4w[M^ R -+F>D=?Ъ~VKa_f@ZdmI,<(ͶIؕkTWcV]0}z+(*&}@ zgϞ  3v͞=#f[glm)]vu෉WQQA@IC*PH4%$Ede-de~ɍ>}xgO|  vpAg**܎WqIDATXeVily~ٝcgvgr$KMdɒXrՈ&;MI("p@4GQ Nn: R7ANFDEJ<=˽fw돥)}a03̐[+f޼ԽSn-M9 ``zWٱʹ_8vߐhtͶvwܘț6: 7i/aE#l:*r})ӯL \u:stx`vL|[cx!t /m3,D\ҝ==v߸#/{~66~YKOYۦՎII3n _z$Yx{ @@|/I9#lJ, U'%4utSˌ"w'6F)q~R%L $2W6,mc~g8=3aK$9BN0]4L|li;cF擹V{cP^H |zY!i%eDb }>^o-@ӽ}4do\|R޺Pl0LGKh1#OiY'Fx0j66w3T OIұuElwN.7 ^v'Q*`It&t)Nbc:V[S쒗T|̣+/=tzI=>dH%#&'c?qhb~-KPq)KMX!~Ұ u)%c $ev0C9p _>3d_,-5`e Ϋ;H.<y5UH(#AcpyP" t\ ILP,{sa6n;BPhjUyZ }'}aDnT`"cp-}a6 +K.0P>0E?3 rNyf^]\OWٮ+]䚯?r3  WDh%%_(Bݏ#E/}u]ǍǾZxc쉓3+2W1n9%7jyddA1”G"0 ->-? 6NYXXKc_뎫(7j]}3ߘŇá/Տ=UV^Wa=t٭Jrb~J궑~O Wi^Msfw__slXS4 +@@4[V[?z qgڥ y鞡$ GݩkgiuT,ݪ'@W6E^才wk"zWV &DL3b(8د vf =w=wUbTpK* :}ؽa|'zZY={;qR2 j>kЧҷ;nfSqqe/>K?"P"$ֽH |U9~-y/>`ow\%{$?-<}g>Mu\7{ 8R`|`F)?9<|jbc7nl?4`4_,L7]+n}描ܴi@(z(b1Lٓ NX"!NXeMuIXϢtS?:Vrmf<՛n~sGǶ_i?X>V]>I"ۅȏ0e%_$GbC_ꬶv.OTӛ*y__Ϳ$-щ4&kj^&3zS^K{#n׽ߓwV2C\]B{//-e?w=$7y?<̧o +nEEL@U1d.z9;QIھAcG^w~0CwWm6fL1,œ}AOzp!_{mMd%tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:57-05:00b` IENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/solid_pastel_normal_up.png v3.5.13-sru/kicker/data/tiles/solid_pastel_normal_up.png --- /tmp/stable//kdebase/kicker/data/tiles/solid_pastel_normal_up.png 2010-08-12 05:29:57.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/solid_pastel_normal_up.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,8 +1,16 @@ PNG  - IHDR**9igAMA%`M cHRMFKPLTEѻݴθѷ̮ţŽƢ»Ͻǽͳ٬ʰήҬ|ǭ˺Ǩpޜͤ~ϟ{ħY޺o띢̙f?p̦-Jş,z}N1\ÎxUkqboȿUefՇN|ؽ9o}ꦐqK}΃T|V~JąYopbU|C|J{:6߃\߄Cuņ1{0:yR{?p~c3|KjզoE[yB|Sw闋iiތ^yKkt1|\rҜTwp]Q_zQwIK{jqH}`pD||zY\o}Β{-mj~ǮqX~kk1u|"?JyQxN{zw^}{orLtViJyW:RmV:IYyXCP^U'tE,|CTN$9IxJ?&3;IDATxb`0 fb(`14Ҕ2Q u<{;뢑[pDp27y4U٪ճW>̍۷o_zͼynn:q ҊziiqC xv̙سg݋'[ɧ)ENv'@+@QدͼYaS8HS)?)5ljHa$pπݵbɲ@$$2MsN䐀%ӦM|?byߗ/l\pzcĉeu-=rR_ܞmax?С^8Vz [Ow$&okIKVZX>3}Pdkde0;!a{ĽۋڋpfaW`<`Ee[ӋӋ+O~ -xfKn+ԅӧק|@f /O&OOIk%% @e@C#(je;+xzMR^"i<ݸh+HM=P)@@CAyd=ŷHL/,,bddaZ4KyPt *a@?pTI%-%%%jӧª_R_hrZ%þ~= x%c303MRUSP4=bgcSabZ;lʾ@-^ - Rի@ lSEJ&śm?i@EK^^Q/ #:e(SXz33K -QU\~|wbQv" -S֯z w8&fyzPx9=Uz?uM9vOG˗-O JPx @ 1]@usT¤^8O^?}z1ХA~ ^)ffs̱)O_>~zS*W=Z_b( q׹Yc pgޕ+=~Ω] + <"IENDB` \ Pas de fin de ligne à la fin du fichier + IHDR**J^ pHYsHHFk> vpAg**܎Wq IDATXmU{\Wysޙٙٙ}ػm'4!Q`h +**T +EBUQi G )" 9Nb{އ}y޹sߏ?f=|}rڕVG\\}=[v\6;X|n!{𱽍v:#_[}$c5U;fI0T =;v3թJwaT%_-q0;6Zy ~eYtEG}_LTyZGMfHصxQ Isof{ + 0&Wko46&{Crwm|?^8㼚wv~yꗡcq4kd'4-͓٫G-=& " +g%"3*5Cw׳ܗIuJjzU_9Wc:}߷{ १/0P@avtTDg]^1:\Fg ;WvCJu}≷}*1;S3NR,``(֌6Qr͛O="GB]! x Ja0춯OZ_hˆwd)9,Gn޻lFB+li9va\{4[7$|)ҘTHTLmWN[TlW-CɒYBG);l%FTC-5L4 OJ~PvۇZr=BijB+;Z$ױ XƇ+W31PHl]n28%=<8 +MޥBue*'c1~˱|`ٝcǡQ&äXNWn^"_YؓSY6%8e4u 1 m`/1AYLVYQ0nIF$&鍦]u{=~ *pt|ȏBnX:GHJwV\Oo|:Yd5E"w'gwmjܺאR|߬w{L?bgp>ow; V+Mֻ ˻F걆ǰX`1ŏdzlt- fLҰʺȅɜ7>1M(,4 uVNā+&Ni/Y[L:f[Uf@-|h4늢V!mo3`-[*FQg&-XȤK/|2qgYxhO% kbn~RCb^ݩb_odK D8QN NWLF `)S +/z@n%ĸ +w¯ DK.N^U]%=0}(}ȺԲ}uvju/}\^vP,ӗx/{/:+)l鵖^X]2O@W ~}cbm7(D V;^Pm8!&TFDcpҠHhz=;6oHrC +7-ԑ#Mpv@^#Z1$WɧwcM5i~u]=zzcaBm?Npz{,[Ҫ"j@yڽ \-IC<__ #~D4j?a~R]Fߥ9+8άْpkRBx5jBIU(lzh {~:l$ngM6h cԡ8~k?;ۮH^¿?AHmwO&[Osz #ߞ浽rR M/~ >,=%Ͻo9TܟPd)*HW A e׿ک>=[`f'{߷!KwWR[[zW`K`D0⯵;u-q[n4ͯ><ԏvy7OdYȩh?h[WuvTէEߨ$&?Ưl 2bQ5tcK2o C60O025s|`iYOoKCVkjkv ԁ8ʂ4O"'|;ic=#LR?ݾ'V ^\Jkp#ۛ|nf{E8dqt=@)>'@⧌~nhx[?Y1;7;=JU~P#ّ.^5{[%iΑ_nrs3iVztr[e]?:h5mq~|O/و#"܉;7de9LlWZ H'Զ`mtCWXXY|@X_凴 +a}u_숪Z-@lp@3l3񦰾z{O l_Jj %tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:57-05:00b` IENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/solid_purple_normal_down.png v3.5.13-sru/kicker/data/tiles/solid_purple_normal_down.png --- /tmp/stable//kdebase/kicker/data/tiles/solid_purple_normal_down.png 2010-08-12 05:29:57.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/solid_purple_normal_down.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,5 +1,13 @@ PNG  - IHDR**9igAMA%`M cHRMFKPLTEѾohhikicccoe`ej`b^`^eh]b`a_b[}dyX|fs[[\WYW[{^w[Yz_}w`}tclU[y~Zz]W{US|\ryZt[T|S}U|YwyZ|PPQyXzuYtt\l|TwUqZl}SrzStn[fNvyQ{uQ|tUjrS|iYnMz{MtRsjZaiYeh[b}K~hWj{LurQlrN|nTgjSs{IzzKyuNmmPtsJ{lQlhU^_Y]wFxiRceT]vFysJlqGzoKodRicU\sFplIrjLfhN^hJscPeqErgM_^Pc]RVmDseImbLk^QZ\QV\O^hFrZPWkDgdId`MXjCifDk^JcWM^VL`cFa`Ej^JX\I\[I_VNPVMPTJ`bCa_EZ_DcXITVKQd?hZBg_?jRHVQJM^?^]?bZAZRHN_>`NHJ\?[SEUQEZW>`TBUTAZPEPJGHX=YV>]QBTIFGU>ZU>RIEFP=PNII=OI4@<5:82;80<7184042-51-1/+0-+,,),#$#~IDATxb`dVАW24tt @SUSNNN[ZZv2@10{x?z|݃/^|zs@+"񩒠sՓ8ՃݪƵ}bÜ|-+%Ƶssy[փ͵̵õtUzWZ5yMkϙsզMs֭L^V J,Y*oug͒9;w<<9켵U@0qybAmսs+W5/\x4sxV Zܼdɒf7Ġvļm65759<jΖ9s̜sx.% (*Zѱcɕ6mZX sRfٺ`Cg;;Ş9s5{.zÚ#@f>|Ym=[++ֲ̼SSyIWqڵM*f< طȦK&WṂ/++䟵`|z֬ă#Kjww_iʹL,.ήUSzBV֬m'pEZ9 x%%'M8qAmvv%0&t͈jlsUEM̳\>ȃڤ,иڤ7v-K^6;Y~ W9eIeeb4f56N0a֬ +Zz=)^Wic '%%8{edDfڟ9ՙc^ oAEYHhRt{NQQQR0#Ac㙛>43s);bP0)::/oR_tiisiMgg9onX`kMjcg3byvkRҚws}xSvF`c@ og&m<6Xؖ-|5BĠvJ`;s=Pʕ+nmLϼپtf3[NhTz @̙-[V.X߷ _ṢKϜOyfc]p[.ݹ;g9 42mWN,^& >y X0gL`67WzF[6iRo$ tzfҭ[7߸kws)vK--m_nze1[bxj .$-- 2b@*%)((%''  =}˗@ހW> į=zo? M?IENDB` \ Pas de fin de ligne à la fin du fichier + IHDR**J^ pHYsHHFk> vpAg**܎Wq IDATXuWɎ$q}KDFDfVˬ(Hv $A}Nt At@P@!*2#3ub/2=ۃs_@ae(-E `_dNHT'ǸI2F 3|4JViϮJwovO\ X"` oЂdwv(SJhzC<9 Qru4SF؛_~qٟosiCDټ{՗?|mҴ4͠bvY?-,Y)%? OaT2da!V0a):IľK`~P%h`yOGI$uڈ荀mӱt)U} V{KZDZVXXCN\`wؕYօ6JAE֛NV!_nm3#/0xl4_2K2?ePؐ@n4UJe)MmA#@F_YT "(p`X0+?869lR`2lF%>ɹ&OӴ Τ8q֫eOs~SXOׂ?a{ma>.mЬaԉحSiUVpv`)B|_.Ysd) Pzw;k Q!:(kgO4LGԫB/e H>YWqDխb,KfNLaZ pSnEeԙX7iH#dYժm)%أy`%`>.VA>Pp0?!5zߨ$b\@Ri|YFR"Wd!ղ^ +`Jq@T<яu4/OE}]θ.V/_o;3ynSCqȿ|/?o# eyQd0Ӭ+hVAp!)hD Jil!;,\.d=ɦ5R9^H+zY@㒳KPxk %^(I,JZ3 +S<݉UD|mxqC0˺E0?f?e1[_ +Jv`v IIu&fBi=//g=7M"e칸ގw/KEwe$izK>8 {HY4N`G1:҄yo^]3F]/5 ֽoi[- fM¨څ:{~yUT\#ׅRZ8ѻ˥Bp)jܕjs]}h*61 +~zvMy)ϚvޙgӱaiKX ( A8Z*.+R>y-֗Ń=2RjӞc0I䣙_?=,ŘZ\gYʌpVlt誺*:C+:_f,c6&+Zf8#$i*b C]q,a A5\%Y!4 HCbL+6t=9*"PHa.RWq=\s ԅ5^M\Δ +.LQXyU!oKV > +p=WL觬?jA i$rKS _PԕTиhŦ样?%dnD2-sd %lgwE+j l,lb($Z(vOECSUq_,6bp,mn<\pE\Q!Z0+YWk-sf]Hi"$ccCr ԙmhbT ¯?+)_Q=nܟ-6vfrsN3j䌉%0驧Tf\1Ym R!" `8hتGۇlv8Su,B2 盋w[ЙXFThUQ@qpy#Z)T77rAu x),4ײz>oXʖ]o Pg"/JZ@䀆p6,X}U.wKkL[U?~/b&48Y&yz C %/ EJR)N!{TJVՔmRHiQ0NB2hl֓)ð.eFEQ)*8q&=e `3YTpf-Vĥw8l͝D6hR]B6[#-ת_X @`!2Vyʜ*C[*T&_Ȣ`jg?^}] + ;7{4޴XИXU-ոs|#҃=h,hR(%OYR%pAUIĢQ+qEsMy t4F{ aNYTWuvIl[4:YC‚p{wWREY(b~1NUHȲD8(2+5(Lt`9zގ m8g޼|~;RbEYnL. +2y}'5N/uŒMh81Si}%esۣxs.rHnଶG-Wgi&.p7>8 iVťr73V}@xJBQ$*V-\MD}jh{<u9˒@--!2ÖB;ZGߪJ V:w͒1 F(=|{~j8o-.D)~d[ƃ ݦ9>*)@A(Y n!g-c8G<La(<]|<;9 +v0k^-"ئ,%tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:57-05:00b` IENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/solid_purple_normal_up.png v3.5.13-sru/kicker/data/tiles/solid_purple_normal_up.png --- /tmp/stable//kdebase/kicker/data/tiles/solid_purple_normal_up.png 2010-08-12 05:29:57.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/solid_purple_normal_up.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,8 +1,18 @@ PNG  - IHDR**9igAMA%`M cHRMFKPLTEz~qnzlvqnsvhwhtphlmjethmjcccladd`h`ea^bf^_j|]bfb{jybaa[aX[|fsZa}~dwye{Y\Wybteu[{W^w[wb~za|Ytcl~ZU[yw`{W{Ux_qS|\ryZt[q_toaqT|S}U|YwxY~PQyXzt\lP|TuYtwUqZlnZq}SrzStn[fNvxQzuQ{tUjrS|iYnf]fMz{MtRsjZaiYeh[b}K~hWjzLtyLxrQlrN{nTgjSs{IzuNmlQsrJzlQlhU^_Y]iRceT]_TnwFxvGyrJlpHznLndRicU\rGokJq`RepFqjLfhN^gKrgM_aP`lFqgGqaLj^QZ]RV\QV\O^dIlZPWjEebIb`MX]JaWN[iDhdEjWM^VL`^JXVNPVMP_Ei]EbZIZYI]`E]`D_XITVKQc@fYCeRIV^@iYDWXFSQJM\@[XCYSFTRHN_>^QHLNHJRD[Z>_OEOY?TSBXQBSU?]JGHU>[PBNNBRMEJT?WIFGKCQIEFP>PIBLP=NR;TG>MLGH;A>:@A4B?5B=5?<4=96:6477383031-1WIDATxb```ce9)Vfv)>>ۉcnVJJb:a))a)YY1YYYa+>qב#ׁ̮ĶzYyȶ +Wn8lccȵ3@Ѷ{/o66 ?{Wu=+׭8qƃ{gƍ{Ol}m{O\$ ._^n]ʉw ֶu {@@vlYY2l]E{]6mm7on - xgn^Yhjc% [gΞ=coܷw'+ >zzDvvz]aڶ̇|k W_]|h#ٙn{gyĞ0avYف'jw-9[&o< -d,PlU7)< >yC WN o'Lj -w3g|@ g6l< 䚸Y; ,ۼ -SL:pJm X O>cZY;:fwN9fMs;7,#zk۶{{oݺ*6%/oⳉ;76Μ9eʔSft7n~%@+ >ӾֱFFv;L+mMvևvvn+ =ضgCCZCؗއ•sؤAлq]UccxڼtMtg<}Xtw/-oNޱnݍgg{0׭2*5*=Gk={ժUS.-O0oŞ%_+ bpyyC絽ħ[ʒÙdʎZ+>s_| >"#k"CWsjp};o]ɯfy@1WUEYwTEVM ouZ!H{5())&2?7|~}Z}}__̙-Ry;1L[Wb`ԫKJ - J#}fo619;^NodHqFnnnd$0#A}姧= :za#b5!A!}O7l?2>ºubQ]T-2ryUUAAezzyѼyѱwcz`K @ J{͂#`zeFGGy8u놃̛hb]XXRpa8 L͸׺pF{@ |Y._޺u <޾򑎎{6TEy@lx ,:q֙6PK65H:K8 +dħӎvv^;RC*yNoǨŐ+}ӧp5^ppoool׶ؤ! X\g{z܍3/߱cK{W^;@+콽̽ ^IENDB` \ Pas de fin de ligne à la fin du fichier + IHDR**J^ pHYsHHFk> vpAg**܎WqIDATXMXY$uV[Ww߾H#Xb Cq8 ysA'vlI#ifܭڸyb(Yg!ɯWn|č@c:ژR)8f,3,GsSozM{I)=mwۯ힞a'v^_ʴvp>dlJ@AtR)9bz뺪]` @?OWa"+$oz{?ׯcL +:ژqH8[5,=l*bȌIա1i7l|yGx;Y+)"' PIFjN M|YasFBmQr D&cN`TTR[s[eUTyW%1l0!O?j_pGHm $ҟ 4R^H+iʂ0EZ7j"],|0lbq`5 +:pڶf^:CIraydqz%O.e)M lTC/ߓhd+:**ɔ+,RMlI2vI*I% dUBJܻ-ekxvAՂc9C!Ybv<^j;,Œ}6,xC~\+VTΜ-(lgoKb;?ZN^;Fe ßG$k’[ xPK^Iij$K7઼gIs骭y~}SW|u[ǣAUX0 컑ؐiLQVwR81%ltP&?F(Se **(=NvrEXŽ}K(' n}ŝHh$d` ,"K*]p3 7Rdњ'a~z&x~}~! gq!z_W1m7, :ώ\q-h$w$&x y +K``8M۽W6=v,yFe} LG3x.W>}}J5m!qx`F75) c~xWx#%rZ% HF"GwbB0U%,<@%n><(9 ExN6ޅ"i(6';RI3qEVu(A Gty `*"%lv?ܰO?g&& n^aL ;$g F REadKYW*h| +lͥO{fr-,UDUfMׅPG3ٔEH)X.Hc!EH(B  P"! y̒ +Db`)˲$Rfb:B +J昮}Lams6EWrs%7FFbS^kI<{o}f)zƨ#{uMf&>tY; 0KwfR7#qwvTey{ig.zO|kNSR^Z섏G4aOo^ +c:4"{к[u]A\ @= jFf +u3,VfNO󩑵Oz?;p]3E-].E;'UOW%$0㜧vASQ|Vl䣍d( Y&GN咯ܜ!y#^,OO [sb>ҡVe{IV)Jfn <3WJ݆LI|e}[q6ݰL~>yi0^Ԕ&fTXlt@[&MdI34rEWSR +b{x +APWlqC$Tm ok `)8@3Hdm)$&db59vv@s=Eg\@3- q!DI3ˉmŔm" h1QhBs^WNԤ==#4멟|+>d1La`:Lnר4J,2D!ڦ*p z.zW2,XϘ|!U2xFV.¯}pJV gTP1ab%+P(,Ph)Cqj*XLOhj8j{-/~|ՍVeY^0UX^d3BIZ)EdU听A&W:;^~dw|whawl*z!*V;x /䌡H('0Lf( IMLT!%9AZՏ?}u2S +ΊTll6?#fXA u?\ U-C ) z99&mbC 9(~}#AA73͂fNNcO@6t}fvo}\ӀBE[nF9L*MSFGm^O7³ŲXfvjucYTշw8'G.9M#GEQYM.:=+UEgGi!QUBJN5,;vz)ow9QCV.*@RtZ + x(eb1, {v{Ǝ`wi镺7Y) xJj7 VapK^fNKK,e5RIB^'}@ߜ0nV H":ه߲xd?kH϶eAc)+,ՌTS> i)js-6/ 5yю,bvNl^P Fz]BlK&͜ +ɦBq>|h+2C,!oč8>QYܟ($1o+Z25ѱ%K9u;7rs)/_~zz>$k޶PfubE:gqVüyqӮOh, +W.hE--1D%FqRܴdEoNb,S&;{>{BAܣHWJ|Έp?ۑ~\!*Y<9crV\\[>;BTH`gଶUa* LɿdaPO~c)jtc'x% :_s \JV]v!O@YW'G* +hH%ð{mOs?`<-ld$GA?)Ze(c @? wE9z %tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:57-05:00b` IENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/solid_tigereye_normal_down.png v3.5.13-sru/kicker/data/tiles/solid_tigereye_normal_down.png --- /tmp/stable//kdebase/kicker/data/tiles/solid_tigereye_normal_down.png 2010-08-12 05:29:57.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/solid_tigereye_normal_down.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,16 +1,7 @@ PNG  - IHDR**9igAMA%`M cHRMFKPLTE|||ysissstqkupdsmapmhpi[nh\fffkeYibTua0ua,ca[e_Qa^Yq])c\Ma\Qm\2h[~N)X$0CXiS8.CSZgk -@`uJ.k8Q滻ǥdžقP)0k&G!KT`v;PRU@98q]|wĈ[SU+8!rBipBM$PS{RBUZI)@q@x`>'R s؀? O`e*HQ vpAg**܎WqkIDATXýXMs}F~˶-=99bWm*$Lghegx--heYꛟ޼W ϛ.Z.޽~p¯WnOt.fjq/+Ѹ} XeQpQBrUVuk׾Զm9FURB4m9}BU^xRp$W.(4$V)|eޏ&VhEQt&D&vLz1>oi5f6oa-X|bOkˆhK˪-Z49YCyz^5#}ۜ{hL*/qYbBϿ 44j6..ѽ7fc aMN2ԋIyr T~VLDӌ$Eԋ zw-Zc$.Z$#,gi3zW/kB3 QR͘|N=]o=mNoh|]W,lwV4\7^,$!&#ƈc5g\ߵԂeÞgZNY\Btj5XP!`P7KQ.MnQDRnZ0 e%rn, dmr-˖oHXk)xJ˺ⷞjEc9١YQҊ8TqPiJ +*%&# 8#>(S}MrFekT|jƸbc_ȾPVO{\M^X//y1tlo]2C32VӾRǽ1KCP]}T/25G}5j hrL+UY3iyE7^ 7,vj;giU.'M @FId>/"932/|}'mNi}Jt ʊdjj7ag>N-@l_[y$a E[@3Vʈă7AeWkdT{ܩچ!u ezEZ(qμOE/  @&DE kj@tvP_9|Imp y ><>o)6^elHqz8hۃ(-|}NmYd}?ߍǍ#~5?j'E +k8\>{ +!FB?=&VՁ5K:^ZkӌX+ֶ+/2+b Yh$A{'ǻn>:>˴h-h"2[+ܔMPOĴ~9pl<.O{}`fYI]CKLC&?*MfVOP!v\ot?@"U}fm75hsxwn9kM˚̡jI3Z'd?lvE^͠YUoVs0"С64(AlP+*m Mi#hBsԃoԁ/t5mIj +YJBX` ̳@&FE b.[Ueռ͜~ʭ303'KD,:OEQMF#/Lq*֖ۧs5b&>z*?] 3gq$5 C^hɩL3ӵUEl㧇? WуιFc#r5)5yOx40E僯hv@{95իVUb^lf !;_߾} w a%tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:57-05:00b` IENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/data/tiles/solid_tigereye_normal_up.png v3.5.13-sru/kicker/data/tiles/solid_tigereye_normal_up.png --- /tmp/stable//kdebase/kicker/data/tiles/solid_tigereye_normal_up.png 2010-08-12 05:29:57.000000000 +0200 +++ v3.5.13-sru/kicker/data/tiles/solid_tigereye_normal_up.png 2012-09-08 19:41:29.000000000 +0200 @@ -1,18 +1,13 @@ PNG  - IHDR**9igAMA%`M cHRMFKPLTEdZFmW nWjU ZTIjTZRBTQJbQ#eQhP[P;SOERNGeO_MbMXK2[L(PK@bKRJ:ZJ [JSI2KHBMG;[G]G UF MF3HE?PE/WEVFYEOD(JD;QDXB JB1SARAKA*DA:K@#U@N?C?2A=6K>P=J= G=)A;1J;Q;P;C:#J:B:)M9D9J9 -;91F7=8*>6!G5 ?5 @4H333393)@291!B191C1=/ ;/40#1/(?-8-2-'9,1+ :+1):)1(*'!-&4&2&+&'$1$)#/")!, # *#'& "! -  - yyyzzz{{{|||}}}~~~ASpIDATxbtv+5Wop 522r"3@NNT9ĝ}@GXJ@CQ:m@VوiSO'Spbfcaґ`5hTr2i''33]WbeaabdT v -?'' S]bАbaa*0:)mML8nt00u 3Q^IQR1NY~@DK@\?3'bPeaU50711 -  @M:IU  I_;EsRyII b0T344׏L e _XXB 4 45cCrs 99Z3DDLWX *,/c*ɱ!2VN -6R -ZYpkܢ\*MM5625Ӑ   JM]%7 - -Rsl DX < *<--s S AJ溨;+rjh8e89 (*F[M\KK/iEqJaaS+bpr2S#ET=r%ƾ|6@hʙCH@^Dq~iEY $fcm&!!@ fkdWXX\RTgh LfrrA -0J[痖fEkJC @iKX|0_eea||V@NAif fmVZr7XC@1z bmU\\\Q45>@FZ\ 4 P'`xx8$L*) 445SPp @ `4N:$hcc7ggS'`W  g`lid[eI5Qtu1'+b:TJXGXX]PXhof,c [6 L@H+)..lYY>0\dd` g @03f=kҲ -P**p26w133q @S3p_kTBS!lb 1 AsxBW%+>.ƑV6Qf |[ˁn. HNV4556.+88,Ԅ@SOob - -IN͍K &RSLN  po`a ̪>٥x',?tp@ 1 ɹY~qqq@YD&$$C$HCNNjjImTTp~i)UZ엕̏@kxxzNnnaI~_pe 86qRrs"#CB!22!! @ -.( - M PZ44-*l0sC{6_T @ %QŅ`G@Cn4),̊(UtnF\\FI>PqX.@y kIENDB` \ Pas de fin de ligne à la fin du fichier + IHDR**J^ pHYsHHFk> vpAg**܎Wq LIDATX]XMGr}UU=3CRDjm@' ETOwF!BȪ̈|ETۿ/f|u9ʧl )g&4?&q>}$[2䭟?yc#doVeKRɿ}NtUV6ZkUM^W+|n?2ר.7m[fp:g{%W iޭi[>Nb³#˟Sm@@\p֜cEWd5C[@ KⵔX}oLF5|=Ӕz㘑RR\RӖJ$f9 qQ@.˲L +Ԙ5I!0Ѷ eTQQE\F^t;TZ*wzzIϨ?]ܮ 앒5i;_ +^rW jFcQV#l2LƕNnWK  Z\\^_5JW"XR:GIJ)۫SSg4ORTg҉Q<=+C+/DIR9V<Ъ&{-A:ג +ѱoBdܺ-6jk9~JRȎVEw`o/1k5popCzǣt&p}q8 ]eu*VC^l5TK<-0yQH9zam+[KK MXAD 0*a{r ùPK~NNwzhƇGTV+Pܫ:}6oZϣZMb&-.]ܜրP0^KJis?t >=arihϯfvmRh^i:kΎtyQVJSɩKbUϑTtEZ7zÔK僋rUAɛwoh XVinZ{ȗIEPސ禤EF-vɆ44JNʍ!MÃ<.\J=Sػ)8HcR>a̞mtX +𔿈 ֽw˗ɛ` BK8 ťunݴC23xr‚gjG]i ׷7 /^BQnkM6:,LW'ERem [윱F;^,>59yK(tQ]ACZLS;+P\wVV^qi?Эsd|k^&D}I_ޛWG?\wJ{-#%tEXtdate:create2011-12-22T23:29:35-06:00F%tEXtdate:modify2010-08-11T22:29:57-05:00b` IENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/dockbar/dockbarextension.cpp v3.5.13-sru/kicker/extensions/dockbar/dockbarextension.cpp --- /tmp/stable//kdebase/kicker/extensions/dockbar/dockbarextension.cpp 2011-08-11 07:25:47.000000000 +0200 +++ v3.5.13-sru/kicker/extensions/dockbar/dockbarextension.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -60,7 +60,7 @@ kwin_module = new KWinModule(TQT_TQOBJECT(this)); connect( kwin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); loadContainerConfig(); } @@ -77,7 +77,7 @@ if (dragging_container) delete dragging_container; } -TQSize DockBarExtension::tqsizeHint(Position p, TQSize) const +TQSize DockBarExtension::sizeHint(Position p, TQSize) const { if (p == Left || p == Right) return TQSize(DockContainer::sz(), DockContainer::sz() * containers.count()); @@ -335,7 +335,7 @@ it != containers.constEnd(); ++it, ++i) { - if ((*it)->tqgeometry().contains(p)) + if ((*it)->geometry().contains(p)) { return i; } @@ -350,7 +350,7 @@ mclic_pos = e->pos(); } else if (e->button() == Qt::RightButton) { int pos = findContainerAtPoint(e->pos()); - if (pos != -1) containers.tqat(pos)->popupMenu(e->globalPos()); + if (pos != -1) containers.at(pos)->popupMenu(e->globalPos()); } } @@ -374,7 +374,7 @@ int pos = findContainerAtPoint(e->pos()); original_container = 0; if (pos > -1) { - original_container = containers.tqat(pos); + original_container = containers.at(pos); mclic_dock_pos = e->pos() - original_container->pos(); dragged_container_original_pos = pos; dragging_container = new DockContainer(original_container->command(), 0, original_container->resName(), original_container->resClass(), true); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/dockbar/dockbarextension.h v3.5.13-sru/kicker/extensions/dockbar/dockbarextension.h --- /tmp/stable//kdebase/kicker/extensions/dockbar/dockbarextension.h 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/extensions/dockbar/dockbarextension.h 2012-09-08 19:41:29.000000000 +0200 @@ -40,7 +40,7 @@ virtual ~DockBarExtension(); - TQSize tqsizeHint(Position, TQSize maxSize) const; + TQSize sizeHint(Position, TQSize maxSize) const; Position preferedPosition() const { return Right; } protected slots: diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/kasbar/kasbar.cpp v3.5.13-sru/kicker/extensions/kasbar/kasbar.cpp --- /tmp/stable//kdebase/kicker/extensions/kasbar/kasbar.cpp 2011-08-11 07:25:47.000000000 +0200 +++ v3.5.13-sru/kicker/extensions/kasbar/kasbar.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -93,7 +93,7 @@ rootPix( 0 ), enableTint_( false ), tintAmount_( 0.1 ), - tintColour_( tqcolorGroup().mid() ), + tintColour_( colorGroup().mid() ), useMask_( true ), res(0) { @@ -102,7 +102,7 @@ setMouseTracking( true ); setMaxBoxes( 0 ); - connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) ); + connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); } KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f ) @@ -122,7 +122,7 @@ rootPix( 0 ), enableTint_( false ), tintAmount_( 0.1 ), - tintColour_( tqcolorGroup().mid() ), + tintColour_( colorGroup().mid() ), useMask_( true ), res(0) { @@ -130,7 +130,7 @@ items.setAutoDelete( true ); setMouseTracking( true ); setMaxBoxes( 0 ); - connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) ); + connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); } KasBar::~KasBar() @@ -255,7 +255,7 @@ } emit configChanged(); - tqrepaint( true ); + repaint( true ); } } @@ -269,7 +269,7 @@ emit configChanged(); if ( rootPix->isAvailable() ) - rootPix->tqrepaint( true ); + rootPix->repaint( true ); } } @@ -375,7 +375,7 @@ emit detachedChanged( detached ); } -TQSize KasBar::tqsizeHint( Orientation o, TQSize sz ) +TQSize KasBar::sizeHint( Orientation o, TQSize sz ) { if ( o == Qt::Horizontal ) setBoxesPerLine( sz.width() / itemExtent() ); @@ -414,7 +414,7 @@ if ( !isUpdatesEnabled() ) return; bool updates = isUpdatesEnabled(); - tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); // This is for testing a rectangular layout // boxesPerLine_ = (uint) ceil(sqrt( items.count() )); @@ -443,32 +443,32 @@ resize( sz ); } - tqsetUpdatesEnabled( updates ); + setUpdatesEnabled( updates ); - TQWidget *top = tqtopLevelWidget(); + TQWidget *top = topLevelWidget(); TQRegion mask; KasItem *i; if ( orient == Qt::Horizontal ) { for ( i = items.first(); i; i = items.next() ) { - int x = (items.tqat() % c) * itemExtent(); + int x = (items.at() % c) * itemExtent(); if ( direction_ == TQBoxLayout::RightToLeft ) x = width() - x - itemExtent(); - i->setPos( x, (items.tqat() / c) * itemExtent() ); + i->setPos( x, (items.at() / c) * itemExtent() ); i->update(); mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } } else { for ( i = items.first(); i; i = items.next() ) { - int y = (items.tqat() / r) * itemExtent(); + int y = (items.at() / r) * itemExtent(); if ( direction_ == TQBoxLayout::BottomToTop ) y = height() - y - itemExtent(); - i->setPos( (items.tqat() % r) * itemExtent(), y ); + i->setPos( (items.at() % r) * itemExtent(), y ); i->update(); mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } @@ -658,7 +658,7 @@ paintBackground( &p, TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) ); i->paint( &p, pos.x(), pos.y() ); - tqrepaint( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ), transparent_ || erase ); + repaint( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ), transparent_ || erase ); } KasItem* KasBar::itemAt(const TQPoint &p) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/kasbar/kasbarextension.cpp v3.5.13-sru/kicker/extensions/kasbar/kasbarextension.cpp --- /tmp/stable//kdebase/kicker/extensions/kasbar/kasbarextension.cpp 2011-07-09 08:16:55.000000000 +0200 +++ v3.5.13-sru/kicker/extensions/kasbar/kasbarextension.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -141,7 +141,7 @@ { updateGeometry(); resize( kasbar->size() ); - tqrepaint( true ); + repaint( true ); } TQSize KasBarExtension::detachedSize() @@ -153,7 +153,7 @@ } -TQSize KasBarExtension::tqsizeHint(Position p, TQSize maxSize ) const +TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const { Orientation o = Qt::Horizontal; @@ -167,7 +167,7 @@ return TQSize( 0, kasbar->itemExtent()/2 ); } - return kasbar->tqsizeHint( o, maxSize ); + return kasbar->sizeHint( o, maxSize ); } void KasBarExtension::positionChange( Position /* position */) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/kasbar/kasbarextension.h v3.5.13-sru/kicker/extensions/kasbar/kasbarextension.h --- /tmp/stable//kdebase/kicker/extensions/kasbar/kasbarextension.h 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/extensions/kasbar/kasbarextension.h 2012-09-08 19:41:29.000000000 +0200 @@ -76,7 +76,7 @@ virtual ~KasBarExtension(); - TQSize tqsizeHint( Position, TQSize maxSize ) const; + TQSize sizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const { return Right; } virtual void positionChange( Position position ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/kasbar/kasbar.h v3.5.13-sru/kicker/extensions/kasbar/kasbar.h --- /tmp/stable//kdebase/kicker/extensions/kasbar/kasbar.h 2011-08-11 07:25:47.000000000 +0200 +++ v3.5.13-sru/kicker/extensions/kasbar/kasbar.h 2012-09-08 19:41:29.000000000 +0200 @@ -120,7 +120,7 @@ void remove( KasItem *i ); void clear(); KasItem *take( KasItem *i ) { return items.take( indexOf(i) ); } - KasItem *itemAt( uint i ) { return items.tqat( i ); } + KasItem *itemAt( uint i ) { return items.at( i ); } int indexOf( KasItem *i ) { return items.find( i ); } KasItemList *itemList() { return &items; } @@ -152,7 +152,7 @@ bool isDrag() const { return inDrag; } - TQSize tqsizeHint( Qt::Orientation, TQSize max ); + TQSize sizeHint( Qt::Orientation, TQSize max ); // // Look and feel options diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/kasbar/kasclockitem.cpp v3.5.13-sru/kicker/extensions/kasbar/kasclockitem.cpp --- /tmp/stable//kdebase/kicker/extensions/kasbar/kasclockitem.cpp 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/extensions/kasbar/kasclockitem.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -45,7 +45,7 @@ lcd = new LCD( parent ); lcd->hide(); - lcd->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + lcd->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); lcd->setBackgroundMode( NoBackground ); lcd->setFrameStyle( TQFrame::NoFrame ); lcd->setSegmentStyle( TQLCDNumber::Flat ); @@ -89,7 +89,7 @@ p->save(); p->translate( 3, 15 ); - lcd->setPaletteForegroundColor( kasbar()->tqcolorGroup().mid() ); + lcd->setPaletteForegroundColor( kasbar()->colorGroup().mid() ); lcd->draw( p ); p->restore(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/kasbar/kasgroupitem.cpp v3.5.13-sru/kicker/extensions/kasbar/kasgroupitem.cpp --- /tmp/stable//kdebase/kicker/extensions/kasbar/kasgroupitem.cpp 2011-07-09 08:16:55.000000000 +0200 +++ v3.5.13-sru/kicker/extensions/kasbar/kasgroupitem.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -213,7 +213,7 @@ int ypos = 16; for ( int i = 0; ( i < (int) items.count() ) && ( i < microsPerCol ); i++ ) { - Task::Ptr t = items.tqat( i ); + Task::Ptr t = items.at( i ); if( t->isIconified() ) p->drawPixmap( xpos, ypos, res->microMinIcon() ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/kasbar/kasgroupitem.h v3.5.13-sru/kicker/extensions/kasbar/kasgroupitem.h --- /tmp/stable//kdebase/kicker/extensions/kasbar/kasgroupitem.h 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/extensions/kasbar/kasgroupitem.h 2012-09-08 19:41:29.000000000 +0200 @@ -91,7 +91,7 @@ KasTasker *kasbar() const; - Task::Ptr task( uint i ) { return items.tqat( i ); } + Task::Ptr task( uint i ) { return items.at( i ); } int taskCount() const { return items.count(); } TQPixmap icon(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/kasbar/kasitem.cpp v3.5.13-sru/kicker/extensions/kasbar/kasitem.cpp --- /tmp/stable//kdebase/kicker/extensions/kasbar/kasitem.cpp 2011-07-08 00:00:32.000000000 +0200 +++ v3.5.13-sru/kicker/extensions/kasbar/kasitem.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -301,7 +301,7 @@ if ( !frame ) return; - qDrawShadePanel(p, 0, 0, extent(), extent(), tqcolorGroup(), false, 2); + qDrawShadePanel(p, 0, 0, extent(), extent(), colorGroup(), false, 2); TQPen pen; @@ -547,12 +547,12 @@ p->restore(); } -void KasItem::tqrepaint() +void KasItem::repaint() { - tqrepaint( true ); + repaint( true ); } -void KasItem::tqrepaint( bool erase ) +void KasItem::repaint( bool erase ) { if ( kas->isVisible() ) kas->repaintItem( this, erase ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/kasbar/kasitem.h v3.5.13-sru/kicker/extensions/kasbar/kasitem.h --- /tmp/stable//kdebase/kicker/extensions/kasbar/kasitem.h 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/extensions/kasbar/kasitem.h 2012-09-08 19:41:29.000000000 +0200 @@ -171,8 +171,8 @@ void paintModified( TQPainter *p ); public slots: - void tqrepaint(); - void tqrepaint( bool erase ); + void repaint(); + void repaint( bool erase ); void update(); void setActive( bool yes ); @@ -218,7 +218,7 @@ TQFontMetrics fontMetrics() const { return kas->fontMetrics(); } /** Gets the color group from the parent. */ - const TQColorGroup &tqcolorGroup() const { return kas->tqcolorGroup(); } + const TQColorGroup &colorGroup() const { return kas->colorGroup(); } /** Factory method that creates a popup widget for the item. */ virtual KasPopup *createPopup(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/kasbar/kasloaditem.cpp v3.5.13-sru/kicker/extensions/kasbar/kasloaditem.cpp --- /tmp/stable//kdebase/kicker/extensions/kasbar/kasloaditem.cpp 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/extensions/kasbar/kasloaditem.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -95,7 +95,7 @@ KasItem::paint( p ); - TQColor light = kasbar()->tqcolorGroup().highlight(); + TQColor light = kasbar()->colorGroup().highlight(); TQColor dark = light.dark(); KPixmap pix; @@ -103,7 +103,7 @@ KPixmapEffect::gradient( pix, light, dark, KPixmapEffect::DiagonalGradient ); p->drawPixmap( 2, extent()-2-h, pix ); - p->setPen( kasbar()->tqcolorGroup().mid() ); + p->setPen( kasbar()->colorGroup().mid() ); for ( double pos = 0.2 ; pos < 1.0 ; pos += 0.2 ) { int ypos = (int) floor((extent()-2) - (dh*maxValue*pos)); p->drawLine( 2, ypos, extent()-3, ypos ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/kasbar/kasresources.cpp v3.5.13-sru/kicker/extensions/kasbar/kasresources.cpp --- /tmp/stable//kdebase/kicker/extensions/kasbar/kasresources.cpp 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/extensions/kasbar/kasresources.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -308,7 +308,7 @@ if ( actBg.isNull() ) { actBg.resize( kasbar->itemExtent(), kasbar->itemExtent() ); KPixmapEffect::gradient( actBg, - kasbar->tqcolorGroup().light(), kasbar->tqcolorGroup().mid(), + kasbar->colorGroup().light(), kasbar->colorGroup().mid(), KPixmapEffect::DiagonalGradient ); } @@ -320,7 +320,7 @@ if ( inactBg.isNull() ) { inactBg.resize( kasbar->itemExtent(), kasbar->itemExtent() ); KPixmapEffect::gradient( inactBg, - kasbar->tqcolorGroup().mid(), kasbar->tqcolorGroup().dark(), + kasbar->colorGroup().mid(), kasbar->colorGroup().dark(), KPixmapEffect::DiagonalGradient ); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/kasbar/kastasker.cpp v3.5.13-sru/kicker/extensions/kasbar/kastasker.cpp --- /tmp/stable//kdebase/kicker/extensions/kasbar/kastasker.cpp 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/extensions/kasbar/kastasker.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -315,7 +315,7 @@ void KasTasker::moveToMain( KasGroupItem *gi ) { bool updates = isUpdatesEnabled(); - tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); int i = indexOf( gi ); @@ -327,7 +327,7 @@ gi->hidePopup(); remove( gi ); - tqsetUpdatesEnabled( updates ); + setUpdatesEnabled( updates ); updateLayout(); } @@ -346,7 +346,7 @@ void KasTasker::refreshAll() { bool updates = isUpdatesEnabled(); - tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); clear(); @@ -365,7 +365,7 @@ addTask( t.data() ); } - tqsetUpdatesEnabled( updates ); + setUpdatesEnabled( updates ); updateLayout(); } @@ -572,7 +572,7 @@ } bool updates = isUpdatesEnabled(); - tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); // @@ -653,7 +653,7 @@ // fillActiveBg = conf->readBoolEntry( "FillActiveIconBackground", true ); // enablePopup = conf->readBoolEntry( "EnablePopup", true ); - tqsetUpdatesEnabled( updates ); + setUpdatesEnabled( updates ); emit configChanged(); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/kasbar/kastaskitem.cpp v3.5.13-sru/kicker/extensions/kasbar/kastaskitem.cpp --- /tmp/stable//kdebase/kicker/extensions/kasbar/kastaskitem.cpp 2011-08-11 07:25:47.000000000 +0200 +++ v3.5.13-sru/kicker/extensions/kasbar/kastaskitem.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -135,7 +135,7 @@ TQPixmap thumb = task_->thumbnail(); TQSize sz = thumb.size(); - sz.tqscale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], TQSize::ScaleMin ); + sz.scale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], TQSize::ScaleMin ); TQImage img = thumb.convertToImage(); img = img.smoothScale( sz ); @@ -173,14 +173,14 @@ } bool updates = kasbar()->isUpdatesEnabled(); - kasbar()->tqsetUpdatesEnabled( false ); + kasbar()->setUpdatesEnabled( false ); setProgress( kasbar()->showProgress() ? 0 : -1 ); setText( task_->visibleIconicName() ); setModified( task_->isModified() ); setActive( task_->isActive() ); - kasbar()->tqsetUpdatesEnabled( updates ); + kasbar()->setUpdatesEnabled( updates ); update(); } @@ -422,7 +422,7 @@ taskprops->addColumn( i18n("Value") ); // Create List Items - TQMetaObject *mo = target->tqmetaObject(); + TQMetaObject *mo = target->metaObject(); for ( int i = 0; i < mo->numProperties( recursive ); i++ ) { const TQMetaProperty *p = mo->property(i, recursive); @@ -456,7 +456,7 @@ TQWidget *KasTaskItem::createX11Props( TQWidget *parent ) { TQVBox *vb2 = new TQVBox( parent ); - vb2->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); + vb2->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); vb2->setSpacing( KDialog::spacingHint() ); vb2->setMargin( KDialog::marginHint() ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/kasbar/kastaskpopup.cpp v3.5.13-sru/kicker/extensions/kasbar/kastaskpopup.cpp --- /tmp/stable//kdebase/kicker/extensions/kasbar/kastaskpopup.cpp 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/extensions/kasbar/kastaskpopup.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -91,7 +91,7 @@ } KPixmapEffect::gradient( titleBg, - Qt::black, tqcolorGroup().mid(), + Qt::black, colorGroup().mid(), KPixmapEffect::DiagonalGradient ); connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/sidebar/sidebarextension.cpp v3.5.13-sru/kicker/extensions/sidebar/sidebarextension.cpp --- /tmp/stable//kdebase/kicker/extensions/sidebar/sidebarextension.cpp 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/extensions/sidebar/sidebarextension.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -94,7 +94,7 @@ m_currentWidth=24; m_resizeHandle->hide(); } - tqtopLevelWidget()->setFixedWidth(m_currentWidth); + topLevelWidget()->setFixedWidth(m_currentWidth); emit updateLayout(); } @@ -117,7 +117,7 @@ return true; } else if (e->type()==TQEvent::MouseButtonRelease) { m_resizing=false; - m_expandedSize=tqtopLevelWidget()->width(); + m_expandedSize=topLevelWidget()->width(); needLayoutUpdate(true); return true; } else if (e->type()==TQEvent::MouseMove) { @@ -126,14 +126,14 @@ if (p==Left) { int diff=((TQMouseEvent*)e)->globalX()-m_x; if (abs(diff)>3) { - tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()+diff); + topLevelWidget()->setFixedWidth(topLevelWidget()->width()+diff); m_x=((TQMouseEvent*)e)->globalX(); } } else if (p==Right) { int diff=((TQMouseEvent*)e)->globalX()-m_x; if (abs(diff)>3) { - tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()-diff); - tqtopLevelWidget()->move(tqtopLevelWidget()->x()+diff,tqtopLevelWidget()->y()); + topLevelWidget()->setFixedWidth(topLevelWidget()->width()-diff); + topLevelWidget()->move(topLevelWidget()->x()+diff,topLevelWidget()->y()); m_x=((TQMouseEvent*)e)->globalX(); } } @@ -148,7 +148,7 @@ return KPanelExtension::Left; } -TQSize SidebarExtension::tqsizeHint(Position, TQSize maxSize ) const +TQSize SidebarExtension::sizeHint(Position, TQSize maxSize ) const { return TQSize(m_currentWidth,maxSize.height()); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/sidebar/sidebarextension.h v3.5.13-sru/kicker/extensions/sidebar/sidebarextension.h --- /tmp/stable//kdebase/kicker/extensions/sidebar/sidebarextension.h 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/extensions/sidebar/sidebarextension.h 2012-09-08 19:41:29.000000000 +0200 @@ -36,7 +36,7 @@ virtual ~SidebarExtension(); - TQSize tqsizeHint( Position, TQSize maxSize ) const; + TQSize sizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const; virtual void positionChange( Position position ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/taskbar/taskbarextension.cpp v3.5.13-sru/kicker/extensions/taskbar/taskbarextension.cpp --- /tmp/stable//kdebase/kicker/extensions/taskbar/taskbarextension.cpp 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/extensions/taskbar/taskbarextension.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -123,17 +123,17 @@ m_container->preferences(); } -TQSize TaskBarExtension::tqsizeHint(Position p, TQSize maxSize) const +TQSize TaskBarExtension::sizeHint(Position p, TQSize maxSize) const { if (p == Left || p == Right) maxSize.setWidth(sizeInPixels()); else maxSize.setHeight(sizeInPixels()); -// kdDebug(1210) << "TaskBarExtension::tqsizeHint( Position, TQSize )" << endl; +// kdDebug(1210) << "TaskBarExtension::sizeHint( Position, TQSize )" << endl; // kdDebug(1210) << " width: " << size.width() << endl; // kdDebug(1210) << "height: " << size.height() << endl; - return m_container->tqsizeHint(p, maxSize); + return m_container->sizeHint(p, maxSize); } void TaskBarExtension::configure() @@ -155,7 +155,7 @@ } else { - m_rootPixmap->tqrepaint(true); + m_rootPixmap->repaint(true); } double tint = double(KickerSettings::tintValue()) / 100; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/extensions/taskbar/taskbarextension.h v3.5.13-sru/kicker/extensions/taskbar/taskbarextension.h --- /tmp/stable//kdebase/kicker/extensions/taskbar/taskbarextension.h 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/extensions/taskbar/taskbarextension.h 2012-09-08 19:41:29.000000000 +0200 @@ -49,7 +49,7 @@ int actions = 0, TQWidget *parent = 0, const char *name = 0 ); ~TaskBarExtension(); - TQSize tqsizeHint( Position, TQSize maxSize ) const; + TQSize sizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const { return Bottom; } protected: diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/buttons/browserbutton.cpp v3.5.13-sru/kicker/kicker/buttons/browserbutton.cpp --- /tmp/stable//kdebase/kicker/kicker/buttons/browserbutton.cpp 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/buttons/browserbutton.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -103,7 +103,7 @@ { KURL path ( topMenu->path() ); _menuTimer->stop(); - KFileItem item( path, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( path, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, path, ev, this ); PanelButton::dropEvent(ev); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/buttons/desktopbutton.cpp v3.5.13-sru/kicker/kicker/buttons/desktopbutton.cpp --- /tmp/stable//kdebase/kicker/kicker/buttons/desktopbutton.cpp 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/buttons/desktopbutton.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -77,7 +77,7 @@ void DesktopButton::dropEvent( TQDropEvent *ev ) { KURL dPath ( KGlobalSettings::desktopPath() ); - KFileItem item( dPath, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( dPath, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, dPath, ev, this ); PanelButton::dropEvent(ev); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/buttons/knewbutton.cpp v3.5.13-sru/kicker/kicker/buttons/knewbutton.cpp --- /tmp/stable//kdebase/kicker/kicker/buttons/knewbutton.cpp 2011-08-11 07:25:50.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/buttons/knewbutton.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -55,26 +55,28 @@ : KButton( parent ), m_oldPos(0,0) { + + setTitle(i18n("K Menu")); Q_ASSERT( !m_self ); m_self = this; - m_hoverTimer = -1; m_openTimer = -1; - m_active = false; + m_hoverTimer = -1; m_mouseInside = false; m_drag = false; - - setIconAlignment((TQ_Alignment)(AlignTop|AlignRight)); - setAcceptDrops(true); - setIcon("kmenu-suse"); - setDrawArrow(false); - - m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng")); - m_movie->connectUpdate(this, TQT_SLOT(updateMovie())); - m_movie->connectStatus(TQT_TQOBJECT(this), TQT_SLOT(slotStatus(int))); - m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&))); - + + setIcon("kmenu"); + setIcon(KickerSettings::customKMenuIcon()); + TQApplication::desktop()->screen()->installEventFilter(this); - setMouseTracking(true); + + if (KickerSettings::showKMenuText()) + { + setButtonText(KickerSettings::kMenuText()); + setFont(KickerSettings::buttonFont()); + setTextColor(KickerSettings::buttonTextColor()); + } + + repaint(); } KNewButton::~KNewButton() @@ -82,28 +84,15 @@ if ( m_self == this ) m_self = 0; setMouseTracking(false); - delete m_movie; } -void KNewButton::slotStatus(int status) -{ - if(status == TQMovie::EndOfLoop) - slotStopAnimation(); -} -TQColor KNewButton::borderColor() const +void KNewButton::drawButton(TQPainter *p) { - TQImage img = m_active_pixmap.convertToImage(); - - for (int i = 0; i < img.width(); ++i) { - QRgb rgb = img.pixel(orientation() == Qt::Horizontal ? img.width() - i - 1 : - i, 2); - - if (tqGreen(rgb) > 0x50) - return rgb; - } - - return img.pixel( orientation() == Qt::Horizontal ? img.width() - 2 : 2, 2); + if (KickerSettings::showDeepButtons()) + PanelPopupButton::drawDeepButton(p); + else + PanelPopupButton::drawButton(p); } void KNewButton::show() @@ -111,103 +100,12 @@ KButton::show(); if (KickerSettings::firstRun()) { - TQTimer::singleShot(500,this,TQT_SLOT(slotExecMenu())); + TQTimer::singleShot(0,this,TQT_SLOT(slotExecMenu())); KickerSettings::setFirstRun(false); KickerSettings::writeConfig(); } } -void KNewButton::updateMovie() -{ - m_oldPos = TQPoint( -1, -1 ); - drawEye(); - - if (!m_active && m_movie->running()) - m_movie->pause(); -} - -void KNewButton::setPopupDirection(KPanelApplet::Direction d) -{ - KButton::setPopupDirection(d); - - delete m_movie; - - switch (d) { - case KPanelApplet::Left: - setIconAlignment((TQ_Alignment)(AlignTop|AlignLeft)); - m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng")); - break; - case KPanelApplet::Right: - setIconAlignment((TQ_Alignment)(AlignTop|AlignRight)); - m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng")); - break; - case KPanelApplet::Up: - setIconAlignment((TQ_Alignment)(AlignTop|AlignHCenter)); - m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng")); - break; - case KPanelApplet::Down: - setIconAlignment((TQ_Alignment)(AlignBottom|AlignHCenter)); - m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_flipped.mng")); - } - - m_movie->connectUpdate(this, TQT_SLOT(updateMovie())); - m_movie->connectStatus(TQT_TQOBJECT(this), TQT_SLOT(slotStatus(int))); - m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&))); -} - -void KNewButton::slotSetSize(const TQSize& s) -{ - m_iconSize = s; -} - -double KNewButton::buttonScaleFactor(const TQSize& s) const -{ - double sf = 1.0; - - switch (popupDirection()) { - case KPanelApplet::Left: - case KPanelApplet::Right: -// sf = kMin(double(s.width()) / m_iconSize.height(), double(s.height()) / m_iconSize.width()); -// break; - case KPanelApplet::Up: - case KPanelApplet::Down: - sf = kMin(double(s.width()) / m_iconSize.width(), double(s.height()) / m_iconSize.height()); - break; - } - - if (sf > 0.8) sf = 1.0; - return sf; -} - -int KNewButton::widthForHeight(int height) const -{ - int r = m_iconSize.width() * buttonScaleFactor(TQSize(m_iconSize.width(), height)); - - if (!m_movie->running() && height != m_active_pixmap.height()) - { - KNewButton* that = const_cast(this); - TQTimer::singleShot(0, that, TQT_SLOT(slotStopAnimation())); - } - - return r; -} - -int KNewButton::preferredDimension(int panelDim) const -{ - return kMax(m_icon.width(), m_icon.height()); -} - -int KNewButton::heightForWidth(int width) const -{ - int r = m_iconSize.width() * buttonScaleFactor(TQSize(width, m_iconSize.height())); - if (!m_movie->running() && width != m_active_pixmap.width()) - { - KNewButton* that = const_cast(this); - TQTimer::singleShot(0, that, TQT_SLOT(slotStopAnimation())); - } - return r; -} - bool KNewButton::eventFilter(TQObject *o, TQEvent *e) { if (e->type() == TQEvent::MouseButtonRelease || @@ -223,75 +121,9 @@ } } - if (KickerSettings::kickoffDrawGeekoEye() && e->type() == TQEvent::MouseMove) - { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if ((me->state() & Qt::MouseButtonMask) == Qt::NoButton) - drawEye(); - } - return KButton::eventFilter(o, e); } -void KNewButton::drawEye() -{ -#define eye_x 62 -#define eye_y 13 - TQPoint mouse = TQCursor::pos(); - TQPoint me = mapToGlobal(TQPoint(eye_x, eye_y)); - double a = atan2(mouse.y() - me.y(), mouse.x() - me.x()); - int dx = int(2.1 * cos(a)); - int dy = int(2.1 * sin(a)); - - TQPoint newpos(eye_x+dx,eye_y+dy); - if (newpos!=m_oldPos) { - m_oldPos = newpos; - TQPixmap pixmap = m_active_pixmap; - - double sf = 1.0; - - if(!m_movie->framePixmap().isNull()) - { - pixmap = m_movie->framePixmap(); - pixmap.detach(); - m_iconSize = pixmap.size(); - sf = buttonScaleFactor(size()); - - if (KickerSettings::kickoffDrawGeekoEye()) { - TQPainter p(&pixmap); - p.setPen(white); - p.setBrush(white); - // p.setPen(TQColor(110,185,55)); - p.drawRect(eye_x+dx, eye_y+dy, 2, 2); - p. end(); - } - } - - TQWMatrix matrix; - switch (popupDirection()) { - case KPanelApplet::Left: - matrix.scale(sf, -sf); - matrix.rotate(90); - break; - case KPanelApplet::Up: - matrix.scale(sf, sf); - break; - case KPanelApplet::Right: - matrix.scale(sf, -sf); - matrix.rotate(90); - break; - case KPanelApplet::Down: - matrix.scale(sf, sf); - break; - } - m_active_pixmap = pixmap.xForm(matrix); - - tqrepaint(false); - } -#undef eye_x -#undef eye_y -} - void KNewButton::enterEvent(TQEvent* e) { KButton::enterEvent(e); @@ -315,15 +147,8 @@ } m_active = true; - m_movie->unpause(); - m_movie->restart(); } -void KNewButton::rewindMovie() -{ - m_oldPos = TQPoint( -1, -1 ); - m_movie->unpause(); -} void KNewButton::dragEnterEvent(TQDragEnterEvent* /*e*/) { @@ -369,31 +194,12 @@ } } -void KNewButton::slotStopAnimation() -{ - m_active = false; - m_movie->pause(); - m_movie->restart(); - TQTimer::singleShot(200, this, TQT_SLOT(rewindMovie())); -} - -const TQPixmap& KNewButton::labelIcon() const -{ - return m_active_pixmap; -} - void KNewButton::slotExecMenu() { - if (m_openTimer != -1) - killTimer(m_openTimer); - - m_openTimer = startTimer(TQApplication::doubleClickInterval() * 3); if (m_active) { m_active = false; - m_movie->pause(); - m_movie->restart(); } KButton::slotExecMenu(); @@ -401,40 +207,12 @@ assert(!KickerTip::tippingEnabled()); assert(dynamic_cast(m_popup)); - disconnect(dynamic_cast(m_popup), TQT_SIGNAL(aboutToHide()), this, - TQT_SLOT(slotStopAnimation())); - connect(dynamic_cast(m_popup), TQT_SIGNAL(aboutToHide()), - TQT_SLOT(slotStopAnimation())); - m_popup->move(KickerLib::popupPosition(popupDirection(), m_popup, this)); // I wish KMenu would properly done itself when it closes. But it doesn't. - bool useEffect = true; // could be TQApplication::isEffectEnabled() - useEffect = false; // too many TQt bugs to be useful - if (m_drag) - useEffect = false; - m_drag = false; // once is enough - if (useEffect) - { - switch (popupDirection()) { - case KPanelApplet::Left: - qScrollEffect(m_popup, TQEffects::LeftScroll); - break; - case KPanelApplet::Up: - qScrollEffect(m_popup, TQEffects::UpScroll); - break; - case KPanelApplet::Right: - qScrollEffect(m_popup, TQEffects::RightScroll); - break; - case KPanelApplet::Down: - qScrollEffect(m_popup, TQEffects::DownScroll); - break; - } - } - else - static_cast(m_popup)->show(); + static_cast(m_popup)->show(); } void KNewButton::timerEvent(TQTimerEvent* e) @@ -447,9 +225,4 @@ killTimer(m_hoverTimer); m_hoverTimer = -1; } - if (e->timerId() == m_openTimer) - { - killTimer(m_openTimer); - m_openTimer = -1; - } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/buttons/knewbutton.h v3.5.13-sru/kicker/kicker/buttons/knewbutton.h --- /tmp/stable//kdebase/kicker/kicker/buttons/knewbutton.h 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/buttons/knewbutton.h 2012-09-08 19:41:29.000000000 +0200 @@ -28,7 +28,6 @@ #include "kbutton.h" -#include #include /** @@ -43,25 +42,10 @@ ~KNewButton(); static KNewButton *self() { return m_self; } - void loadConfig( const KConfigGroup& config ); - - virtual const TQPixmap& labelIcon() const; - - virtual int widthForHeight(int height) const; - virtual int preferredDimension(int panelDim) const; - virtual int heightForWidth(int width) const; - TQColor borderColor() const; + //virtual void setPopupDirection(KPanelApplet::Direction d); - virtual void setPopupDirection(KPanelApplet::Direction d); - -private slots: - void slotStatus(int); - void slotSetSize(const TQSize&); - void slotStopAnimation(); - void rewindMovie(); - void updateMovie(); protected: virtual void show(); @@ -78,17 +62,15 @@ void timerEvent(TQTimerEvent*); private: - void drawEye(); - double buttonScaleFactor(const TQSize& s) const; - TQMovie* m_movie; + void drawButton(TQPainter *p); TQPixmap m_active_pixmap; TQPoint m_oldPos; TQSize m_iconSize; TQRect m_sloppyRegion; - int m_hoverTimer; int m_openTimer; - bool m_active; + int m_hoverTimer; + bool m_active; bool m_mouseInside; bool m_drag; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/applethandle.cpp v3.5.13-sru/kicker/kicker/core/applethandle.cpp --- /tmp/stable//kdebase/kicker/kicker/core/applethandle.cpp 2011-08-11 07:25:49.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/core/applethandle.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -75,14 +75,14 @@ int AppletHandle::heightForWidth( int /* w */ ) const { - int size = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } int AppletHandle::widthForHeight( int /* h */ ) const { - int size = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } @@ -269,7 +269,7 @@ { if (!m_handleHoverTimer || (m_menuButton && m_menuButton->isOn()) || - m_applet->tqgeometry().contains(m_applet->mapToParent( + m_applet->geometry().contains(m_applet->mapToParent( m_applet->mapFromGlobal(TQCursor::pos())))) { return; @@ -282,7 +282,7 @@ bool AppletHandle::onMenuButton(const TQPoint& point) const { - return m_menuButton && (tqchildAt(mapFromGlobal(point)) == m_menuButton); + return m_menuButton && (childAt(mapFromGlobal(point)) == m_menuButton); } void AppletHandle::toggleMenuButtonOff() @@ -308,9 +308,9 @@ setBackgroundOrigin( AncestorOrigin ); } -TQSize AppletHandleDrag::tqminimumSizeHint() const +TQSize AppletHandleDrag::minimumSizeHint() const { - int wh = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); if (m_parent->orientation() == Qt::Horizontal) { @@ -367,8 +367,8 @@ TQRect r = rect(); - tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, - tqcolorGroup(), flags); + style().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, + colorGroup(), flags); } else { @@ -382,9 +382,9 @@ { } -TQSize AppletHandleButton::tqminimumSizeHint() const +TQSize AppletHandleButton::minimumSizeHint() const { - int height = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int width = height; if (m_parent->orientation() == Qt::Horizontal) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/applethandle.h v3.5.13-sru/kicker/kicker/core/applethandle.h --- /tmp/stable//kdebase/kicker/kicker/core/applethandle.h 2011-03-12 07:58:12.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/core/applethandle.h 2012-09-08 19:41:29.000000000 +0200 @@ -92,9 +92,9 @@ public: AppletHandleDrag(AppletHandle* parent); - TQSize tqminimumSizeHint() const; - TQSize tqminimumSize() const { return tqminimumSizeHint(); } - TQSize tqsizeHint() const { return tqminimumSize(); } + TQSize minimumSizeHint() const; + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } TQSizePolicy sizePolicy() const; protected: @@ -113,9 +113,9 @@ public: AppletHandleButton(AppletHandle *parent); - TQSize tqminimumSizeHint() const; - TQSize tqminimumSize() const { return tqminimumSizeHint(); } - TQSize tqsizeHint() const { return tqminimumSize(); } + TQSize minimumSizeHint() const; + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } TQSizePolicy sizePolicy() const; private: diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/container_applet.cpp v3.5.13-sru/kicker/kicker/core/container_applet.cpp --- /tmp/stable//kdebase/kicker/kicker/core/container_applet.cpp 2011-07-09 08:16:55.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/core/container_applet.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -117,7 +117,7 @@ _valid = true; _applet->setPosition((KPanelApplet::Position)KickerLib::directionToPosition(popupDirection())); - _applet->tqsetAlignment((KPanelApplet::Alignment)tqalignment()); + _applet->setAlignment((KPanelApplet::Alignment)alignment()); _actions = _applet->actions(); _type = _applet->type(); @@ -275,14 +275,14 @@ void AppletContainer::activateWindow() { - KWin::forceActiveWindow(tqtopLevelWidget()->winId()); + KWin::forceActiveWindow(topLevelWidget()->winId()); } void AppletContainer::focusRequested(bool focus) { if (focus) { - KWin::forceActiveWindow(tqtopLevelWidget()->winId()); + KWin::forceActiveWindow(topLevelWidget()->winId()); } emit maintainFocus(focus); @@ -361,7 +361,7 @@ return; } - _applet->tqsetAlignment( (KPanelApplet::Alignment)a ); + _applet->setAlignment( (KPanelApplet::Alignment)a ); } int AppletContainer::widthForHeight(int h) const diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/containerarea.cpp v3.5.13-sru/kicker/kicker/core/containerarea.cpp --- /tmp/stable//kdebase/kicker/kicker/core/containerarea.cpp 2011-08-26 01:00:16.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/core/containerarea.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -1430,7 +1430,7 @@ if (KickerSettings::transparent() && (KickerSettings::menubarPanelTransparent() || - !ExtensionManager::the()->isMenuBar(tqtopLevelWidget()))) + !ExtensionManager::the()->isMenuBar(topLevelWidget()))) { if (!_rootPixmap) { @@ -1441,7 +1441,7 @@ } else { - _rootPixmap->tqrepaint(true); + _rootPixmap->repaint(true); } double tint = double(KickerSettings::tintValue()) / 100; @@ -1639,7 +1639,7 @@ void ContainerArea::updateBackground( const TQPixmap& pm ) { - TQBrush bgBrush(tqcolorGroup().background(), pm); + TQBrush bgBrush(colorGroup().background(), pm); TQPalette pal = kapp->palette(); pal.setBrush(TQColorGroup::Background, bgBrush); setPalette(pal); @@ -1725,16 +1725,16 @@ setBackground(); // container extension repaints for us! - //tqrepaint(); + //repaint(); } -void ContainerArea::tqsetAlignment(KPanelExtension::Alignment a) +void ContainerArea::setAlignment(KPanelExtension::Alignment a) { for (BaseContainer::ConstIterator it = m_containers.begin(); it != m_containers.end(); ++it) { - (*it)->tqsetAlignment(a); + (*it)->setAlignment(a); } } @@ -1900,9 +1900,9 @@ return m_layout->listItems(); } -void ContainerArea::tqrepaint() +void ContainerArea::repaint() { - Panner::tqrepaint(); + Panner::repaint(); } void ContainerArea::showAddAppletDialog() @@ -1958,8 +1958,8 @@ { TQPainter painter(this); TQRect rect(0, 0, width(), height()); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, tqcolorGroup(), - TQStyle::Style_Default, tqcolorGroup().base() ); + style().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(), + TQStyle::Style_Default, colorGroup().base() ); } void DragIndicator::mousePressEvent(TQMouseEvent*) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/containerarea.h v3.5.13-sru/kicker/kicker/core/containerarea.h --- /tmp/stable//kdebase/kicker/kicker/core/containerarea.h 2011-03-12 07:58:12.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/core/containerarea.h 2012-09-08 19:41:29.000000000 +0200 @@ -101,9 +101,9 @@ void removeContainers(BaseContainer::List containers); void takeContainer(BaseContainer* a); void setPosition(KPanelExtension::Position p); - void tqsetAlignment(KPanelExtension::Alignment a); + void setAlignment(KPanelExtension::Alignment a); void slotSaveContainerConfig(); - void tqrepaint(); + void repaint(); void showAddAppletDialog(); void addAppletDialogDone(); @@ -153,7 +153,7 @@ KConfig* _config; DragIndicator* _dragIndicator; BaseContainer* _dragMoveAC; - QPoint _dragMoveOffset; + TQPoint _dragMoveOffset; TQPopupMenu* m_opMenu; KRootPixmap* _rootPixmap; bool _transparent; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/containerarealayout.cpp v3.5.13-sru/kicker/kicker/core/containerarealayout.cpp --- /tmp/stable//kdebase/kicker/kicker/core/containerarealayout.cpp 2011-08-11 07:25:49.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/core/containerarealayout.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -43,7 +43,7 @@ TQLayoutItem* current() { - return m_idx < int(m_list->count()) ? (*m_list->tqat(m_idx))->item : 0; + return m_idx < int(m_list->count()) ? (*m_list->at(m_idx))->item : 0; } TQLayoutItem* next() @@ -55,7 +55,7 @@ TQLayoutItem* takeCurrent() { TQLayoutItem* item = 0; - ContainerAreaLayout::ItemList::iterator b = m_list->tqat(m_idx); + ContainerAreaLayout::ItemList::iterator b = m_list->at(m_idx); if (b != m_list->end()) { ContainerAreaLayoutItem* layoutItem = *b; @@ -81,7 +81,7 @@ } else { - return item->tqsizeHint().height(); + return item->sizeHint().height(); } } @@ -94,7 +94,7 @@ } else { - return item->tqsizeHint().width(); + return item->sizeHint().width(); } } @@ -223,7 +223,7 @@ \reimp */ TQLayoutItem* ContainerAreaLayout::itemAt(int index) const { - return index >= 0 && index < m_items.count() ? (*m_items.tqat(index))->item : 0; + return index >= 0 && index < m_items.count() ? (*m_items.at(index))->item : 0; } /*! @@ -232,8 +232,8 @@ TQLayoutItem* ContainerAreaLayout::takeAt(int index) { if (index < 0 || index >= m_items.count()) return 0; - ContainerAreaLayoutItem *b = *m_items.tqat(index); - m_items.remove(m_items.tqat(index)); + ContainerAreaLayoutItem *b = *m_items.at(index); + m_items.remove(m_items.at(index)); TQLayoutItem *item = b->item; b->item = 0; delete b; @@ -243,7 +243,7 @@ } #endif // USE_QT4 -void ContainerAreaLayout::addItem(QLayoutItem* item) +void ContainerAreaLayout::addItem(TQLayoutItem* item) { m_items.append(new ContainerAreaLayoutItem(static_cast(item), this)); } @@ -415,7 +415,7 @@ return m_items[index]->item->widget(); } -TQSize ContainerAreaLayout::tqsizeHint() const +TQSize ContainerAreaLayout::sizeHint() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeSmall); @@ -429,7 +429,7 @@ } } -TQSize ContainerAreaLayout::tqminimumSize() const +TQSize ContainerAreaLayout::minimumSize() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/containerarealayout.h v3.5.13-sru/kicker/kicker/core/containerarealayout.h --- /tmp/stable//kdebase/kicker/kicker/core/containerarealayout.h 2011-03-12 07:58:12.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/core/containerarealayout.h 2012-09-08 19:41:29.000000000 +0200 @@ -79,12 +79,12 @@ ContainerAreaLayout(TQWidget* parent); - void addItem(QLayoutItem* item); + void addItem(TQLayoutItem* item); void insertIntoFreeSpace(TQWidget* item, TQPoint insertionPoint); TQStringList listItems() const; TQWidget* widgetAt(int index) const; - TQSize tqsizeHint() const; - TQSize tqminimumSize() const; + TQSize sizeHint() const; + TQSize minimumSize() const; TQLayoutIterator iterator(); void setGeometry(const TQRect& rect); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/container_base.cpp v3.5.13-sru/kicker/kicker/core/container_base.cpp --- /tmp/stable//kdebase/kicker/kicker/core/container_base.cpp 2011-07-09 08:16:55.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/core/container_base.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -38,7 +38,7 @@ : TQWidget( parent, name ) , _dir(KPanelApplet::Up) , _orient(Qt::Horizontal) - , _tqalignment(KPanelExtension::LeftTop) + , _alignment(KPanelExtension::LeftTop) , _fspace(0) , _moveOffset(TQPoint(0,0)) , _aid(TQString::null) @@ -110,14 +110,14 @@ config->sync(); } -void BaseContainer::tqsetAlignment(KPanelExtension::Alignment a) +void BaseContainer::setAlignment(KPanelExtension::Alignment a) { - if (_tqalignment == a) + if (_alignment == a) { return; } - _tqalignment = a; + _alignment = a; alignmentChange(a); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/container_base.h v3.5.13-sru/kicker/kicker/core/container_base.h --- /tmp/stable//kdebase/kicker/kicker/core/container_base.h 2011-07-09 08:16:55.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/core/container_base.h 2012-09-08 19:41:29.000000000 +0200 @@ -73,7 +73,7 @@ KPanelApplet::Direction popupDirection() const { return _dir; } KPanelExtension::Orientation orientation() const { return _orient; } - KPanelExtension::Alignment tqalignment() const { return _tqalignment; } + KPanelExtension::Alignment alignment() const { return _alignment; } virtual void setBackground() {} @@ -97,7 +97,7 @@ virtual void setPopupDirection(KPanelApplet::Direction d) { _dir = d; } virtual void setOrientation(KPanelExtension::Orientation o) { _orient = o; } - void tqsetAlignment(KPanelExtension::Alignment a); + void setAlignment(KPanelExtension::Alignment a); signals: void removeme(BaseContainer*); @@ -118,7 +118,7 @@ KPanelApplet::Direction _dir; KPanelExtension::Orientation _orient; - KPanelExtension::Alignment _tqalignment; + KPanelExtension::Alignment _alignment; double _fspace; TQPoint _moveOffset; TQString _aid; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/container_extension.cpp v3.5.13-sru/kicker/kicker/core/container_extension.cpp --- /tmp/stable//kdebase/kicker/kicker/core/container_extension.cpp 2011-09-01 16:50:23.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/core/container_extension.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -224,7 +224,7 @@ { } -TQSize ExtensionContainer::tqsizeHint(KPanelExtension::Position p, const TQSize &maxSize) const +TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &maxSize) const { int width = 0; int height = 0; @@ -284,7 +284,7 @@ if (m_extension) { - size = m_extension->tqsizeHint(p, maxSize - size) + size; + size = m_extension->sizeHint(p, maxSize - size) + size; } return size.boundedTo(maxSize); @@ -315,7 +315,7 @@ } positionChange(position()); - alignmentChange(tqalignment()); + alignmentChange(alignment()); setSize(static_cast(m_settings.size()), m_settings.customSize()); @@ -510,7 +510,7 @@ // on other parameters this can lead to Bad Things(tm) // // we need to find a way to do this that doesn't result in - // tqsizeHint's getting called on the extension =/ + // sizeHint's getting called on the extension =/ // // or else we need to change the semantics for applets so that // they don't get their "you're changing position" signals through @@ -523,7 +523,7 @@ } UserRectSel::PanelStrut newStrut = UserRectSel::select(rects, rect().center(), m_highlightColor); - arrange(newStrut.m_pos, newStrut.m_tqalignment, newStrut.m_screen); + arrange(newStrut.m_pos, newStrut.m_alignment, newStrut.m_screen); _is_lmb_down = false; @@ -578,7 +578,7 @@ KickerTip::enableTipping(true); TQPoint globalPos = TQCursor::pos(); TQPoint localPos = mapFromGlobal(globalPos); - TQWidget* child = tqchildAt(localPos); + TQWidget* child = childAt(localPos); if (child) { @@ -788,7 +788,7 @@ blockUserInput(true); TQPoint oldpos = pos(); - TQRect newextent = initialGeometry( position(), tqalignment(), xineramaScreen(), hide, Unhidden ); + TQRect newextent = initialGeometry( position(), alignment(), xineramaScreen(), hide, Unhidden ); TQPoint newpos = newextent.topLeft(); if (hide) @@ -900,7 +900,7 @@ } TQPoint oldpos = pos(); - TQRect newextent = initialGeometry(position(), tqalignment(), xineramaScreen(), false, newState); + TQRect newextent = initialGeometry(position(), alignment(), xineramaScreen(), false, newState); TQPoint newpos(newextent.topLeft()); if (newState != Unhidden) @@ -987,7 +987,7 @@ return !m_extension || m_extension->reserveStrut(); } -KPanelExtension::Alignment ExtensionContainer::tqalignment() const +KPanelExtension::Alignment ExtensionContainer::alignment() const { // KConfigXT really needs to get support for vars that are enums that // are defined in other classes @@ -1005,7 +1005,7 @@ int w = 0; int h = 0; - TQRect geom = initialGeometry(position(), tqalignment(), xineramaScreen()); + TQRect geom = initialGeometry(position(), alignment(), xineramaScreen()); TQRect virtRect(TQApplication::desktop()->geometry()); TQRect screenRect(TQApplication::desktop()->screenGeometry(xineramaScreen())); @@ -1378,7 +1378,7 @@ { KConfig *config = KGlobal::config(); config->setGroup("WM"); - TQColor color = TQApplication::tqpalette().active().highlight(); + TQColor color = TQApplication::palette().active().highlight(); m_highlightColor = config->readColorEntry("activeBackground", &color); update(); } @@ -1408,11 +1408,11 @@ // KPanelExtension::Left/Right don't seem to draw the separators at all! if (position() == KPanelExtension::Left) { rect = TQRect(width()-2,0,PANEL_RESIZE_HANDLE_WIDTH,height()); - tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, tqcolorGroup(), TQStyle::Style_Horizontal ); + style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); } else if (position() == KPanelExtension::Right) { rect = TQRect(0,0,PANEL_RESIZE_HANDLE_WIDTH,height()); - tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, tqcolorGroup(), TQStyle::Style_Horizontal ); + style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); } else if (position() == KPanelExtension::Top) { // Nastiness to both vertically flip the PE_Separator @@ -1420,14 +1420,14 @@ TQPixmap inv_pm(width(),PANEL_RESIZE_HANDLE_WIDTH); TQPainter myp(TQT_TQPAINTDEVICE(&inv_pm)); rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); - TQColorGroup darkcg = tqcolorGroup(); - darkcg.setColor(TQColorGroup::Light, tqcolorGroup().dark()); - tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default ); + TQColorGroup darkcg = colorGroup(); + darkcg.setColor(TQColorGroup::Light, colorGroup().dark()); + style().tqdrawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default ); p.drawPixmap(0,height()-2,inv_pm); } else { rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); - tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, tqcolorGroup(), TQStyle::Style_Default ); + style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default ); } } } @@ -1444,7 +1444,7 @@ return; } - m_extension->tqsetAlignment(a); + m_extension->setAlignment(a); } void ExtensionContainer::setSize(KPanelExtension::Size size, int custom) @@ -1551,7 +1551,7 @@ if (a != m_settings.alignment()) { m_settings.setAlignment(a); - tqsetAlignment(a); + setAlignment(a); } if (XineramaScreen != xineramaScreen()) @@ -1590,7 +1590,7 @@ void ExtensionContainer::resetLayout() { - TQRect g = initialGeometry(position(), tqalignment(), xineramaScreen(), + TQRect g = initialGeometry(position(), alignment(), xineramaScreen(), autoHidden(), userHidden()); // Disable the layout while we rearrange the panel. @@ -1777,7 +1777,7 @@ ", " << workArea.topLeft().y() << ") to (" << workArea.bottomRight().x() << ", " << workArea.bottomRight().y() << ")" << endl;*/ - TQSize hint = tqsizeHint(p, workArea.size()).boundedTo(workArea.size()); + TQSize hint = sizeHint(p, workArea.size()).boundedTo(workArea.size()); int width = 0; int height = 0; @@ -1997,12 +1997,12 @@ return; } - arrange(position(),tqalignment(), screen); + arrange(position(),alignment(), screen); } TQRect ExtensionContainer::currentGeometry() const { - return initialGeometry(position(), tqalignment(), xineramaScreen(), + return initialGeometry(position(), alignment(), xineramaScreen(), autoHidden(), userHidden()); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/container_extension.h v3.5.13-sru/kicker/kicker/core/container_extension.h --- /tmp/stable//kdebase/kicker/kicker/core/container_extension.h 2011-08-06 00:56:46.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/core/container_extension.h 2012-09-08 19:41:29.000000000 +0200 @@ -66,7 +66,7 @@ TQWidget *parent = 0); virtual ~ExtensionContainer(); - virtual TQSize tqsizeHint(KPanelExtension::Position, const TQSize &maxSize) const; + virtual TQSize sizeHint(KPanelExtension::Position, const TQSize &maxSize) const; const AppletInfo& info() const { return _info; } @@ -86,7 +86,7 @@ KPanelExtension::Orientation orientation() const; KPanelExtension::Position position() const; - void setPosition(KPanelExtension::Position p) { arrange( p, tqalignment(), xineramaScreen() ); } + void setPosition(KPanelExtension::Position p) { arrange( p, alignment(), xineramaScreen() ); } int xineramaScreen() const; void setXineramaScreen(int screen); @@ -100,8 +100,8 @@ void unhideIfHidden(int showForHowManyMS = 0); bool reserveStrut() const; - KPanelExtension::Alignment tqalignment() const; - void tqsetAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); } + KPanelExtension::Alignment alignment() const; + void setAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); } TQRect currentGeometry() const; TQRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a, diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/extensionmanager.cpp v3.5.13-sru/kicker/kicker/core/extensionmanager.cpp --- /tmp/stable//kdebase/kicker/kicker/core/extensionmanager.cpp 2011-08-11 07:25:49.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/core/extensionmanager.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -371,7 +371,7 @@ KMenuBar tmpmenu; tmpmenu.insertItem("KDE Rocks!"); m_menubarPanel->setSize(KPanelExtension::SizeCustom, - tmpmenu.tqsizeHint().height()); + tmpmenu.sizeHint().height()); m_menubarPanel->writeConfig(); emit desktopIconsAreaChanged(desktopIconsArea(m_menubarPanel->xineramaScreen()), @@ -702,7 +702,7 @@ return; } - TQRect geom = extension->initialGeometry(extension->position(), extension->tqalignment(), + TQRect geom = extension->initialGeometry(extension->position(), extension->alignment(), extension->xineramaScreen()); // reduce given area (TQRect) to the space not covered by the given extension diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/extensionSettings.kcfg v3.5.13-sru/kicker/kicker/core/extensionSettings.kcfg --- /tmp/stable//kdebase/kicker/kicker/core/extensionSettings.kcfg 2011-03-12 07:58:12.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/core/extensionSettings.kcfg 2012-09-08 19:41:29.000000000 +0200 @@ -30,7 +30,7 @@ - QApplication::desktop()->primaryScreen() + TQApplication::desktop()->primaryScreen() diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/kicker.cpp v3.5.13-sru/kicker/kicker/core/kicker.cpp --- /tmp/stable//kdebase/kicker/kicker/core/kicker.cpp 2011-03-12 07:58:12.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/core/kicker.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -199,7 +199,7 @@ { KConfigGroup c(KGlobal::config(), "General"); KickerSettings::setTintColor(c.readColorEntry("TintColor", - &tqpalette().active().mid())); + &palette().active().mid())); KickerSettings::self()->writeConfig(); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/kmenubase.ui v3.5.13-sru/kicker/kicker/core/kmenubase.ui --- /tmp/stable//kdebase/kicker/kicker/core/kmenubase.ui 2011-03-12 07:58:12.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/core/kmenubase.ui 2012-09-08 19:41:29.000000000 +0200 @@ -55,13 +55,13 @@ 0 - + 0 52 - + 32767 52 @@ -129,13 +129,13 @@ 0 - + 32 32 - + 32 32 @@ -165,7 +165,7 @@ Preferred - + 16 20 @@ -222,7 +222,7 @@ MinimumExpanding - + 10 20 @@ -241,7 +241,7 @@ 0 - + 90 24 @@ -270,7 +270,7 @@ Fixed - + 14 20 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/menumanager.cpp v3.5.13-sru/kicker/kicker/core/menumanager.cpp --- /tmp/stable//kdebase/kicker/kicker/core/menumanager.cpp 2011-08-11 07:25:49.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/core/menumanager.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -156,8 +156,8 @@ r = desktop->geometry(); else r = desktop->screenGeometry(desktop->screenNumber(TQCursor::pos())); - // kMenu->rect() is not valid before showing, use tqsizeHint() - p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->tqsizeHint()).center(); + // kMenu->rect() is not valid before showing, use sizeHint() + p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->sizeHint()).center(); m_kmenu->popup(p); // when the cursor is in the area where the menu pops up, @@ -170,8 +170,8 @@ { // We need the kmenu's size to place it at the right position. // We cannot rely on the popup menu's current size(), if it wasn't - // shown before, so we resize it here according to its tqsizeHint(). - const TQSize size = m_kmenu->tqsizeHint(); + // shown before, so we resize it here according to its sizeHint(). + const TQSize size = m_kmenu->sizeHint(); m_kmenu->resize(size.width(),size.height()); PanelPopupButton* button = findKButtonFor(m_kmenu->widget()); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/panelextension.cpp v3.5.13-sru/kicker/kicker/core/panelextension.cpp --- /tmp/stable//kdebase/kicker/kicker/core/panelextension.cpp 2011-03-12 07:58:12.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/core/panelextension.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -100,7 +100,7 @@ { _containerArea->show(); - if (ExtensionManager::the()->isMainPanel(tqtopLevelWidget())) + if (ExtensionManager::the()->isMainPanel(topLevelWidget())) { setObjId("Panel"); _containerArea->initialize(true); @@ -139,7 +139,7 @@ _containerArea->setPosition(p); } -TQSize PanelExtension::tqsizeHint(Position p, TQSize maxSize) const +TQSize PanelExtension::sizeHint(Position p, TQSize maxSize) const { TQSize size; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/panelextension.h v3.5.13-sru/kicker/kicker/core/panelextension.h --- /tmp/stable//kdebase/kicker/kicker/core/panelextension.h 2011-03-12 07:58:12.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/core/panelextension.h 2012-09-08 19:41:29.000000000 +0200 @@ -80,7 +80,7 @@ void configure(); // KDE4: remove, moved to Kikcker public: - TQSize tqsizeHint(Position, TQSize maxSize) const; + TQSize sizeHint(Position, TQSize maxSize) const; Position preferedPosition() const { return Bottom; } bool eventFilter( TQObject *, TQEvent * ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/core/userrectsel.h v3.5.13-sru/kicker/kicker/core/userrectsel.h --- /tmp/stable//kdebase/kicker/kicker/core/userrectsel.h 2011-03-12 07:58:12.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/core/userrectsel.h 2012-09-08 19:41:29.000000000 +0200 @@ -43,17 +43,17 @@ PanelStrut() : m_screen(-1), m_pos(KPanelExtension::Bottom), - m_tqalignment(KPanelExtension::LeftTop) + m_alignment(KPanelExtension::LeftTop) { } PanelStrut(const TQRect& rect, int XineramaScreen, KPanelExtension::Position pos, - KPanelExtension::Alignment tqalignment) + KPanelExtension::Alignment alignment) : m_rect(rect), m_screen(XineramaScreen), m_pos(pos), - m_tqalignment(tqalignment) + m_alignment(alignment) { } @@ -61,7 +61,7 @@ { return m_screen == rhs.m_screen && m_pos == rhs.m_pos && - m_tqalignment == rhs.m_tqalignment; + m_alignment == rhs.m_alignment; } bool operator!=(const PanelStrut& rhs) @@ -72,7 +72,7 @@ TQRect m_rect; int m_screen; KPanelExtension::Position m_pos; - KPanelExtension::Alignment m_tqalignment; + KPanelExtension::Alignment m_alignment; }; typedef TQValueVector RectList; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/plugins/beaglesearch.cpp v3.5.13-sru/kicker/kicker/plugins/beaglesearch.cpp --- /tmp/stable//kdebase/kicker/kicker/plugins/beaglesearch.cpp 2011-03-12 07:58:11.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/plugins/beaglesearch.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -347,7 +347,7 @@ //kdDebug () << "datetime string:" << timestring << endl; // FIXME: error check timestring format if (timestring.isNull () || timestring.stripWhiteSpace () == "" || timestring.length() != 8 ) - return beagle_timestamp_new_from_unix_time (TQDateTime::tqcurrentDateTime ().toTime_t ()); + return beagle_timestamp_new_from_unix_time (TQDateTime::currentDateTime ().toTime_t ()); //TQDateTime dt = TQDateTime::fromString (timestring, Qt::ISODate); struct tm tm_time; time_t timet_time; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/addapplet.cpp v3.5.13-sru/kicker/kicker/ui/addapplet.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/addapplet.cpp 2011-08-11 07:25:49.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/ui/addapplet.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -291,7 +291,7 @@ { m_appletBox->layout()->activate(); w = v->visibleWidth(); - h = m_appletBox->tqlayout()->tqminimumSize().height(); + h = m_appletBox->layout()->minimumSize().height(); v->resizeContents(w, QMAX(h, v->visibleHeight())); if (w == m_appletBox->width() && h == m_appletBox->height()) break; @@ -456,7 +456,7 @@ if (appletContainer) { ExtensionContainer* ec = - dynamic_cast(m_containerArea->tqtopLevelWidget()); + dynamic_cast(m_containerArea->topLevelWidget()); if (ec) { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/addappletvisualfeedback.cpp v3.5.13-sru/kicker/kicker/ui/addappletvisualfeedback.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/addappletvisualfeedback.cpp 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/addappletvisualfeedback.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -157,7 +157,7 @@ // draw background TQPainter bufferPainter(&m_pixmap); bufferPainter.setPen(Qt::black); - bufferPainter.setBrush(tqcolorGroup().background()); + bufferPainter.setBrush(colorGroup().background()); bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); @@ -175,14 +175,14 @@ int textY = (height - textRect.height()) / 2; // draw text shadow - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); cg.setColor(TQColorGroup::Text, cg.background().dark(115)); int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; m_richText->draw(&bufferPainter, 5 + textX + shadowOffset, textY + 1, TQRect(), cg); // draw text - cg = tqcolorGroup(); + cg = colorGroup(); m_richText->draw(&bufferPainter, 5 + textX, textY, rect(), cg); } } @@ -225,7 +225,7 @@ void AddAppletVisualFeedback::internalUpdate() { m_dirty = true; - tqrepaint(false); + repaint(false); } #include "addappletvisualfeedback.moc" diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/appletitem.ui v3.5.13-sru/kicker/kicker/ui/appletitem.ui --- /tmp/stable//kdebase/kicker/kicker/ui/appletitem.ui 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/appletitem.ui 2012-09-08 19:41:29.000000000 +0200 @@ -20,13 +20,13 @@ 0 - + 0 0 - + 32767 80 @@ -65,7 +65,7 @@ RichText - + WordBreak|AlignTop @@ -87,7 +87,7 @@ RichText - + WordBreak|AlignTop @@ -105,7 +105,7 @@ itemPixmap - + 64 64 @@ -117,7 +117,7 @@ - + AlignTop diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/appletop_mnu.cpp v3.5.13-sru/kicker/kicker/ui/appletop_mnu.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/appletop_mnu.cpp 2011-08-11 07:25:49.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/ui/appletop_mnu.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -52,7 +52,7 @@ TQString text = isButton ? (isMenu ? i18n("&Move %1 Menu") : i18n("&Move %1 Button")) : i18n("&Move %1"); - insertItem(SmallIcon("move"), text.tqarg(titleText), Move); + insertItem(SmallIcon("move"), text.arg(titleText), Move); // we look for a container area to see if we can add containers // this is part of the kiosk support in kicker, allowing @@ -76,7 +76,7 @@ text = isButton ? (isMenu ? i18n("&Remove %1 Menu") : i18n("&Remove %1 Button")) : i18n("&Remove %1"); - insertItem(SmallIcon("remove"), text.tqarg(titleText), Remove); + insertItem(SmallIcon("remove"), text.arg(titleText), Remove); needSeparator = true; } } @@ -103,7 +103,7 @@ KIcon::Small, 0, KIcon::DefaultState, 0, true)); - insertItem(iconPix, i18n("&About %1").tqarg( titleText ), About); + insertItem(iconPix, i18n("&About %1").arg( titleText ), About); needSeparator = !(actions & KPanelApplet::Help); } @@ -123,12 +123,12 @@ if (isButton) { insertItem(SmallIcon("configure"), - i18n("&Configure %1 Button...").tqarg(titleText), Preferences); + i18n("&Configure %1 Button...").arg(titleText), Preferences); } else { insertItem(SmallIcon("configure"), - i18n("&Configure %1...").tqarg(titleText), Preferences); + i18n("&Configure %1...").arg(titleText), Preferences); } needSeparator = true; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/appletview.ui v3.5.13-sru/kicker/kicker/ui/appletview.ui --- /tmp/stable//kdebase/kicker/kicker/ui/appletview.ui 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/appletview.ui 2012-09-08 19:41:29.000000000 +0200 @@ -110,7 +110,7 @@ 1 - + 32767 32767 @@ -141,7 +141,7 @@ Expanding - + 284 20 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/browser_mnu.cpp v3.5.13-sru/kicker/kicker/ui/browser_mnu.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/browser_mnu.cpp 2011-08-11 07:25:49.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/ui/browser_mnu.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -429,7 +429,7 @@ void PanelBrowserMenu::dropEvent( TQDropEvent *ev ) { KURL u( path() ); - KFileItem item( u, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( u, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, u, ev, this ); KPanelMenu::dropEvent(ev); // ### TODO: Update list diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/clicklineedit.cpp v3.5.13-sru/kicker/kicker/ui/clicklineedit.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/clicklineedit.cpp 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/clicklineedit.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -39,13 +39,13 @@ void ClickLineEdit::setClickMessage( const TQString &msg ) { mClickMessage = msg; - tqrepaint(); + repaint(); } void ClickLineEdit::setText( const TQString &txt ) { mDrawClickMsg = txt.isEmpty(); - tqrepaint(); + repaint(); KLineEdit::setText( txt ); } @@ -67,7 +67,7 @@ if ( mDrawClickMsg == true ) { mDrawClickMsg = false; - tqrepaint(); + repaint(); } TQLineEdit::focusInEvent( ev ); } @@ -77,7 +77,7 @@ if ( text().isEmpty() ) { mDrawClickMsg = true; - tqrepaint(); + repaint(); } TQLineEdit::focusOutEvent( ev ); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/client_mnu.cpp v3.5.13-sru/kicker/kicker/ui/client_mnu.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/client_mnu.cpp 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/client_mnu.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -59,7 +59,7 @@ TQCString KickerClientMenu::insertMenu( TQPixmap icon, TQString text, int id ) { TQString subname("%1-submenu%2"); - TQCString subid = subname.tqarg(static_cast(objId())).tqarg(id).local8Bit(); + TQCString subid = subname.arg(static_cast(objId())).arg(id).local8Bit(); KickerClientMenu *sub = new KickerClientMenu(this, subid); int globalid = TQPopupMenu::insertItem( icon, text, sub, id); setItemParameter( globalid, id ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/exe_dlg.cpp v3.5.13-sru/kicker/kicker/ui/exe_dlg.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/exe_dlg.cpp 2011-08-11 07:25:49.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/ui/exe_dlg.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -78,8 +78,8 @@ this, TQT_SLOT(slotIconChanged(TQString))); // leave decent space for the commandline - resize(tqsizeHint().width() > 300 ? tqsizeHint().width() : 300, - tqsizeHint().height()); + resize(sizeHint().width() > 300 ? sizeHint().width() : 300, + sizeHint().height()); } void PanelExeDialog::slotOk() diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/extensionop_mnu.cpp v3.5.13-sru/kicker/kicker/ui/extensionop_mnu.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/extensionop_mnu.cpp 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/extensionop_mnu.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -59,7 +59,7 @@ if (!Kicker::the()->isImmutable() && (actions & KPanelExtension::Preferences)) { insertSeparator(); - insertItem(SmallIcon("configure"), i18n("&Configure %1...").tqarg(extension), Preferences); + insertItem(SmallIcon("configure"), i18n("&Configure %1...").arg(extension), Preferences); } adjustSize(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/flipscrollview.cpp v3.5.13-sru/kicker/kicker/ui/flipscrollview.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/flipscrollview.cpp 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/flipscrollview.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -57,7 +57,7 @@ { TQColor gray( 230, 230, 230 ); if ( mouse_inside ) - p->fillRect( 3, 3, width() - 6, height() - 6, tqcolorGroup().color( TQColorGroup::Highlight ) ); + p->fillRect( 3, 3, width() - 6, height() - 6, colorGroup().color( TQColorGroup::Highlight ) ); else p->fillRect( 3, 3, width() - 6, height() - 6, gray ); p->setPen( gray.dark(110) ); @@ -270,7 +270,7 @@ if (!mSelectMenuPath.isEmpty()) { if (mSelectMenuPath=="kicker:/goup/") { currentView()->setSelected(currentView()->firstChild(),true); - currentView()->firstChild()->tqrepaint(); + currentView()->firstChild()->repaint(); } else { TQListViewItem * child = currentView()->firstChild(); @@ -278,8 +278,8 @@ KMenuItem* kitem = dynamic_cast(child); if (kitem && kitem->menuPath()==mSelectMenuPath) { currentView()->setSelected(child,true); - kdDebug() << "child tqrepaint\n"; - child->tqrepaint(); + kdDebug() << "child repaint\n"; + child->repaint(); break; } child = child->nextSibling(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/hidebutton.cpp v3.5.13-sru/kicker/kicker/ui/hidebutton.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/hidebutton.cpp 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/hidebutton.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -51,22 +51,22 @@ { if (m_arrow == Qt::LeftArrow) { - p->setPen(tqcolorGroup().mid()); + p->setPen(colorGroup().mid()); p->drawLine(width()-1, 0, width()-1, height()); } else if (m_arrow == Qt::RightArrow) { - p->setPen(tqcolorGroup().mid()); + p->setPen(colorGroup().mid()); p->drawLine(0, 0, 0, height()); } else if (m_arrow == Qt::UpArrow) { - p->setPen(tqcolorGroup().mid()); + p->setPen(colorGroup().mid()); p->drawLine(0, height()-1, width(), height()-1); } else if (m_arrow == Qt::DownArrow) { - p->setPen(tqcolorGroup().mid()); + p->setPen(colorGroup().mid()); p->drawLine(0, 0, width(), 0); } @@ -173,14 +173,14 @@ } generateIcons(); - tqrepaint(false); + repaint(false); } void HideButton::enterEvent(TQEvent *e) { m_highlight = true; - tqrepaint(false); + repaint(false); TQButton::enterEvent(e); } @@ -188,7 +188,7 @@ { m_highlight = false; - tqrepaint(false); + repaint(false); TQButton::enterEvent(e); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/itemview.cpp v3.5.13-sru/kicker/kicker/ui/itemview.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/itemview.cpp 2011-08-11 07:25:49.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/ui/itemview.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -145,7 +145,7 @@ void KMenuItem::setHasChildren( bool flag ) { m_has_children = flag; - tqrepaint(); + repaint(); } void KMenuItem::setup() @@ -166,7 +166,7 @@ void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align) { ItemView *listview = static_cast( listView() ); - int bottom = listView()->tqitemRect( this ).bottom(); + int bottom = listView()->itemRect( this ).bottom(); int diff = bottom - listView()->viewport()->height(); KPixmap pm; @@ -197,7 +197,7 @@ else listview->m_lastOne = static_cast( itemBelow() ); listview->m_old_contentY = -1; - tqrepaint(); + repaint(); } } } @@ -350,7 +350,7 @@ { // the listview caches paint events m_old_width = width; - tqrepaint(); + repaint(); } } @@ -608,7 +608,7 @@ if ( item->toolTip().isNull() ) return; - TQRect r = view->tqitemRect( item ); + TQRect r = view->itemRect( item ); int headerPos = view->header()->sectionPos( 0 ); r.setLeft( headerPos ); r.setRight( headerPos + view->header()->sectionSize( 0 ) ); @@ -915,7 +915,7 @@ KMenuItemSeparator *si = dynamic_cast( itemAt( vp ) ); if ( si ) { - if ( si->hitsLink( vp - tqitemRect(si).topLeft() ) ) + if ( si->hitsLink( vp - itemRect(si).topLeft() ) ) emit startURL( si->linkUrl() ); } } @@ -928,7 +928,7 @@ bool link_cursor = false; KMenuItemSeparator *si = dynamic_cast( i ); if ( si ) - link_cursor = si->hitsLink( vp - tqitemRect(si).topLeft() ); + link_cursor = si->hitsLink( vp - itemRect(si).topLeft() ); if (i && !i->isSelectable() && !link_cursor) { unsetCursor(); @@ -965,7 +965,7 @@ { KListView::resizeEvent( e ); // if ( m_lastOne ) -// int diff = tqitemRect( m_lastOne ).bottom() - viewport()->height(); +// int diff = itemRect( m_lastOne ).bottom() - viewport()->height(); } void ItemView::viewportPaintEvent ( TQPaintEvent * pe ) @@ -975,7 +975,7 @@ if ( m_lastOne && m_old_contentY != contentsY() ) { m_old_contentY = contentsY(); - m_lastOne->tqrepaint(); + m_lastOne->repaint(); } } @@ -1052,7 +1052,7 @@ else if(!kitem->path().isEmpty() && !kitem->path().startsWith("kicker:/") && !kitem->path().startsWith("kaddressbook:/")) { TQString uri = kitem->path(); - if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } @@ -1103,7 +1103,7 @@ return 0; } -TQByteArray KMenuItemDrag::tqencodedData(const char* mimeType) const +TQByteArray KMenuItemDrag::encodedData(const char* mimeType) const { if (TQString("application/kmenuitem") == mimeType) return a; @@ -1138,7 +1138,7 @@ bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item) { - TQByteArray a = e->tqencodedData("application/kmenuitem"); + TQByteArray a = e->encodedData("application/kmenuitem"); if (a.isEmpty()) { TQStringList l; @@ -1211,7 +1211,7 @@ TQString uri = item.m_path; - if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/itemview.h v3.5.13-sru/kicker/kicker/ui/itemview.h --- /tmp/stable//kdebase/kicker/kicker/ui/itemview.h 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/itemview.h 2012-09-08 19:41:29.000000000 +0200 @@ -248,7 +248,7 @@ ~KMenuItemDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray tqencodedData(const char *) const; + virtual TQByteArray encodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, KMenuItemInfo& item); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/kickoff_bar.cpp v3.5.13-sru/kicker/kicker/ui/kickoff_bar.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/kickoff_bar.cpp 2011-08-11 07:25:49.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/ui/kickoff_bar.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -58,8 +58,8 @@ //selection flags if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; - tqstyle().tqdrawControl( TQStyle::CE_TabBarTab, p, this, t->rect(), - tqcolorGroup(), flags, TQStyleOption(t) ); + style().drawControl( TQStyle::CE_TabBarTab, p, this, t->rect(), + colorGroup(), flags, TQStyleOption(t) ); paintLabel( p, t->rect(), t, t->identifier() == keyboardFocusTab() ); } @@ -70,7 +70,7 @@ TQRect r = br; bool selected = m_tabsActivated && (currentTab() == t->identifier()); - int vframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this ); + int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this ); p->setFont( font() ); TQFontMetrics fm = p->fontMetrics(); @@ -116,14 +116,14 @@ // flags |= TQStyle::Style_Sunken; if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; - tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, rt, - t->isEnabled() ? tqcolorGroup(): tqpalette().disabled(), + style().drawControl( TQStyle::CE_TabBarLabel, p, this, rt, + t->isEnabled() ? colorGroup(): palette().disabled(), flags, TQStyleOption(t) ); } -TQSize KickoffTabBar::tqsizeHint() const +TQSize KickoffTabBar::sizeHint() const { - TQSize s = TQTabBar::tqsizeHint(); + TQSize s = TQTabBar::sizeHint(); return s; } @@ -135,9 +135,9 @@ TQFontMetrics fm = fontMetrics(); int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4; - int hframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this ); - int vframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this ); - int overlap = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this ); + int hframe = style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this ); + int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this ); + int overlap = style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this ); TQSize s; for (int t = 0; t < count(); ++t) @@ -161,7 +161,7 @@ iw = tab->iconSet()->pixmap( TQIconSet::Large, TQIconSet::Normal ).width(); int w = QMAX(iw, fw + 6 + 6 ) + hframe; h += ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + vframe; - tab->setRect(TQRect(TQPoint(x, 0), tqstyle().tqsizeFromContents(TQStyle::CT_TabBarTab, this, + tab->setRect(TQRect(TQPoint(x, 0), style().tqsizeFromContents(TQStyle::CT_TabBarTab, this, TQSize(w, h), TQStyleOption(tab)))); x += tab->rect().width() - overlap; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/kickoff_bar.h v3.5.13-sru/kicker/kicker/ui/kickoff_bar.h --- /tmp/stable//kdebase/kicker/kicker/ui/kickoff_bar.h 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/kickoff_bar.h 2012-09-08 19:41:29.000000000 +0200 @@ -32,7 +32,7 @@ KickoffTabBar(TQWidget* parent, const char* name); void deactivateTabs(bool b); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected: virtual void paint(TQPainter*, TQTab*, bool) const; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/kmenuitembase.ui v3.5.13-sru/kicker/kicker/ui/kmenuitembase.ui --- /tmp/stable//kdebase/kicker/kicker/ui/kmenuitembase.ui 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/kmenuitembase.ui 2012-09-08 19:41:29.000000000 +0200 @@ -20,13 +20,13 @@ 0 - + 0 0 - + 32767 80 @@ -73,7 +73,7 @@ RichText - + WordBreak|AlignTop @@ -102,7 +102,7 @@ RichText - + WordBreak|AlignTop @@ -120,7 +120,7 @@ itemPixmap - + 64 64 @@ -129,7 +129,7 @@ - + AlignTop|AlignHCenter diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/k_mnu.cpp v3.5.13-sru/kicker/kicker/ui/k_mnu.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/k_mnu.cpp 2011-10-24 02:08:24.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/ui/k_mnu.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -211,7 +211,7 @@ if (!loadSidePixmap()) { sidePixmap = sideTilePixmap = TQPixmap(); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); } } @@ -273,6 +273,8 @@ connect(searchEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT( slotUpdateSearch( const TQString&))); insertItem(hbox, searchLineID, 0); + } else { + searchEdit = NULL; } //TQToolTip::add(clearButton, i18n("Clear Search")); @@ -348,7 +350,7 @@ if (clients.count() > 0) { TQIntDictIterator it(clients); while (it){ - if (it.current()->text.tqat(0) != '.') + if (it.current()->text.at(0) != '.') insertItem( it.current()->icon, it.current()->text, @@ -419,10 +421,10 @@ displayRepairTimer->stop(); // Now do a nasty hack to prevent search bar merging into the side image - // This forces a layout/tqrepaint of the qpopupmenu - tqrepaint(); // This ensures that the side bar image was applied - styleChange(tqstyle()); // This forces a call to the private function updateSize(TRUE) inside the qpopupmenu. - update(); // This repaints the entire popup menu to apply the widget size/tqalignment changes made above + // This forces a layout/repaint of the qpopupmenu + repaint(); // This ensures that the side bar image was applied + styleChange(style()); // This forces a call to the private function updateSize(TRUE) inside the qpopupmenu. + update(); // This repaints the entire popup menu to apply the widget size/alignment changes made above } } @@ -584,7 +586,7 @@ TQRect PanelKMenu::sideImageRect() { - return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(), + return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(), height() - 2*frameWidth() ), this ); } @@ -595,21 +597,21 @@ PanelServiceMenu::resizeEvent(e); - setFrameRect( TQStyle::tqvisualRect( TQRect( sidePixmap.width(), 0, + setFrameRect( TQStyle::visualRect( TQRect( sidePixmap.width(), 0, width() - sidePixmap.width(), height() ), this ) ); } //Workaround Qt3.3.x sizing bug, by ensuring we're always wide enough. void PanelKMenu::resize(int width, int height) { - width = kMax(width, tqmaximumSize().width()); + width = kMax(width, maximumSize().width()); PanelServiceMenu::resize(width, height); } -TQSize PanelKMenu::tqsizeHint() const +TQSize PanelKMenu::sizeHint() const { - TQSize s = PanelServiceMenu::tqsizeHint(); -// kdDebug(1210) << "PanelKMenu::tqsizeHint()" << endl; + TQSize s = PanelServiceMenu::sizeHint(); +// kdDebug(1210) << "PanelKMenu::sizeHint()" << endl; // kdDebug(1210) << s.width() << ", " << s.height() << endl; return s; } @@ -624,9 +626,9 @@ TQPainter p(this); p.setClipRegion(e->region()); - tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, + style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), - tqcolorGroup(), TQStyle::Style_Default, + colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); TQRect r = sideImageRect(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/k_mnu.h v3.5.13-sru/kicker/kicker/ui/k_mnu.h --- /tmp/stable//kdebase/kicker/kicker/ui/k_mnu.h 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/k_mnu.h 2012-09-08 19:41:29.000000000 +0200 @@ -59,7 +59,7 @@ int insertClientMenu(KickerClientMenu *p); void removeClientMenu(int id); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void setMinimumSize(const TQSize &); virtual void setMaximumSize(const TQSize &); virtual void setMinimumSize(int, int); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/k_mnu_stub.cpp v3.5.13-sru/kicker/kicker/ui/k_mnu_stub.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/k_mnu_stub.cpp 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/k_mnu_stub.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -97,11 +97,11 @@ return m_w.panelkmenu->resize(w, h); } -TQSize KMenuStub::tqsizeHint() const +TQSize KMenuStub::sizeHint() const { if(m_type == t_KMenu) - return m_w.kmenu->tqsizeHint(); - return m_w.panelkmenu->tqsizeHint(); + return m_w.kmenu->sizeHint(); + return m_w.panelkmenu->sizeHint(); } bool KMenuStub::highlightMenuItem( const TQString &menuId ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/k_mnu_stub.h v3.5.13-sru/kicker/kicker/ui/k_mnu_stub.h --- /tmp/stable//kdebase/kicker/kicker/ui/k_mnu_stub.h 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/k_mnu_stub.h 2012-09-08 19:41:29.000000000 +0200 @@ -53,7 +53,7 @@ void popup(const TQPoint &pos, int indexAtPoint = -1); void selectFirstItem(); void resize(int, int); - TQSize tqsizeHint() const; + TQSize sizeHint() const; bool highlightMenuItem( const TQString &menuId ); void clearRecentMenuItems(); void initialize(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/k_new_mnu.cpp v3.5.13-sru/kicker/kicker/ui/k_new_mnu.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/k_new_mnu.cpp 2011-08-11 07:25:49.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/ui/k_new_mnu.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -302,7 +302,7 @@ m_searchInternet->setPixmap(0,icon); setTabOrder(m_kcommand, m_searchResultsWidget); - m_kerryInstalled = !KStandardDirs::findExe(TQString::tqfromLatin1("kerry")).isEmpty(); + m_kerryInstalled = !KStandardDirs::findExe(TQString::fromLatin1("kerry")).isEmpty(); m_isShowing = false; if (!m_kerryInstalled) { @@ -421,7 +421,7 @@ { m_stacker = new TQWidgetStack( this, "m_stacker" ); m_stacker->setGeometry( TQRect( 90, 260, 320, 220 ) ); - m_stacker->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); + m_stacker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); m_stacker->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) ); // m_stacker->setFocusPolicy( TQ_StrongFocus ); m_stacker->setLineWidth( 0 ); @@ -522,7 +522,7 @@ m_sloppySourceClicked = true; if (!m_sloppyTimer.isActive() || m_sloppySource != raiseRect) { - int timeout= tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay); + int timeout= style().styleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay); if (m_sloppySourceClicked) timeout = 3000; m_sloppyTimer.start(timeout); @@ -1131,7 +1131,7 @@ } // Ignore dotfiles. - if ((g->name().tqat(0) == '.')) + if ((g->name().at(0) == '.')) { continue; } @@ -1699,14 +1699,12 @@ TQWidget *footer = m_footer->mainWidget(); TQPixmap pix( 64, footer->height() ); TQPainter p( &pix ); - p.fillRect( 0, 0, 64, footer->height(), m_branding->tqcolorGroup().brush( TQColorGroup::Base ) ); - p.fillRect( 0, m_orientation == BottomUp ? footer->height() - 2 : 0, - 64, 3, KNewButton::self()->borderColor() ); + p.fillRect( 0, 0, 64, footer->height(), m_branding->colorGroup().brush( TQColorGroup::Base ) ); p.end(); footer->setPaletteBackgroundPixmap( pix ); } - resizeEvent(new TQResizeEvent(tqsizeHint(), tqsizeHint())); + resizeEvent(new TQResizeEvent(sizeHint(), sizeHint())); } void KMenu::showMenu() @@ -1762,7 +1760,7 @@ const BackgroundMode bgmode = backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - p.setBrush( tqcolorGroup().brush( crole ) ); + p.setBrush( colorGroup().brush( crole ) ); p.drawRect( 0, 0, width(), height() ); int ypos = m_search->mainWidget()->geometry().bottom(); @@ -1923,7 +1921,7 @@ m_seenPrograms = KickerSettings::firstSeenApps(); m_newInstalledPrograms.clear(); - m_tqcurrentDate = TQDate::currentDate().toString(Qt::ISODate); + m_currentDate = TQDate::currentDate().toString(Qt::ISODate); bool initialize = (m_seenPrograms.count() == 0); @@ -1978,7 +1976,7 @@ if (!found) { m_seenProgramsChanged=true; m_seenPrograms+=shortStorageId; - m_seenPrograms+=m_tqcurrentDate; + m_seenPrograms+=m_currentDate; if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end()) m_newInstalledPrograms+=s->storageId(); } @@ -2744,7 +2742,7 @@ m_popupPath.path = kitem->path(); m_popupPath.icon = kitem->icon(); - if (m_popupPath.path.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { + if (m_popupPath.path.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { KDesktopFile df(m_popupPath.path,true); m_popupPath.path=df.readURL(); } @@ -2936,7 +2934,7 @@ case EditMenu: accept(); proc = new KProcess(TQT_TQOBJECT(this)); - *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1); proc->start(); break; @@ -3074,24 +3072,24 @@ // put the search widget at the top of the menu and give it its desired // height m_search->mainWidget()->setGeometry( 0, ypos, width(), - m_search->tqminimumSize().height() ); - left_height -= m_search->tqminimumSize().height(); - ypos += m_search->tqminimumSize().height(); + m_search->minimumSize().height() ); + left_height -= m_search->minimumSize().height(); + ypos += m_search->minimumSize().height(); // place the footer widget at the bottom of the menu and give it its desired // height - m_footer->mainWidget()->setGeometry( 0, height() - m_footer->tqminimumSize().height(), - width(), m_footer->tqminimumSize().height() ); - left_height -= m_footer->tqminimumSize().height(); + m_footer->mainWidget()->setGeometry( 0, height() - m_footer->minimumSize().height(), + width(), m_footer->minimumSize().height() ); + left_height -= m_footer->minimumSize().height(); // place the button box above the footer widget, horizontal placement // has the width of the edge graphics subtracted m_tabBar->setGeometry(button_box_left.width(), - height() - m_footer->tqminimumSize().height() - - m_tabBar->tqsizeHint().height(), + height() - m_footer->minimumSize().height() - + m_tabBar->sizeHint().height(), width() - button_box_left.width(), - m_tabBar->tqsizeHint().height() ); - left_height -= m_tabBar->tqsizeHint().height(); + m_tabBar->sizeHint().height() ); + left_height -= m_tabBar->sizeHint().height(); // place the main (stacker) widget below the search widget, // in the remaining vertical space @@ -3105,28 +3103,28 @@ // place the 'footer' widget at the top of the menu and give it // its desired height m_footer->mainWidget()->setGeometry( 0, - ypos /*height() - m_footer->tqminimumSize().height()*/, + ypos /*height() - m_footer->minimumSize().height()*/, width(), - m_footer->tqminimumSize().height() ); - ypos += m_footer->tqminimumSize().height(); - left_height -= m_footer->tqminimumSize().height(); + m_footer->minimumSize().height() ); + ypos += m_footer->minimumSize().height(); + left_height -= m_footer->minimumSize().height(); // place the button box next at the top of the menu. // has the width of the edge graphics subtracted m_tabBar->setGeometry(button_box_left.width(), ypos, width() - button_box_left.width(), - m_tabBar->tqsizeHint().height()); + m_tabBar->sizeHint().height()); - ypos += m_tabBar->tqsizeHint().height(); - left_height -= m_tabBar->tqsizeHint().height(); + ypos += m_tabBar->sizeHint().height(); + left_height -= m_tabBar->sizeHint().height(); // put the search widget above the footer widget // height m_search->mainWidget()->setGeometry( 0, - height() - m_search->tqminimumSize().height(), + height() - m_search->minimumSize().height(), width(), - m_search->tqminimumSize().height() + m_search->minimumSize().height() ); - left_height -= m_search->tqminimumSize().height(); + left_height -= m_search->minimumSize().height(); // place the main (stacker) widget below the button box, // in the remaining vertical space @@ -3167,14 +3165,14 @@ if ( hasMouseTracking() && m_isresizing ) { m_stacker->setMinimumSize( TQSize(0, 0) ); m_stacker->setMaximumSize( TQSize(32000, 32000) ); - int newWidth = QMAX( e->x() - x(), tqminimumSizeHint().width() ); + int newWidth = QMAX( e->x() - x(), minimumSizeHint().width() ); if ( m_orientation == BottomUp ) { - int newHeight = QMAX( height() - e->y(), tqminimumSizeHint().height() + 10 ); + int newHeight = QMAX( height() - e->y(), minimumSizeHint().height() + 10 ); int newY = y() + height() - newHeight; setGeometry( x(), newY, newWidth, newHeight); } else { - setGeometry( x(), y(), newWidth, QMAX( e->y(), tqminimumSizeHint().height() + 10 )); + setGeometry( x(), y(), newWidth, QMAX( e->y(), minimumSizeHint().height() + 10 )); } } } @@ -3331,7 +3329,7 @@ RecentlyLaunchedApps::the().m_bNeedToUpdate = true; } -TQSize KMenu::tqsizeHint() const +TQSize KMenu::sizeHint() const { #warning FIXME // this should be only for the inner area so layout changes do not break it @@ -3339,28 +3337,28 @@ const int height = kMin(KickerSettings::kMenuHeight(), TQApplication::desktop()->screen()->height()-50); TQSize wanted(width, height); - kdDebug() << "show " << tqminimumSizeHint() << " " << m_stacker->tqminimumSizeHint() << " " - << m_searchFrame->tqminimumSizeHint() << " " << wanted << endl; + kdDebug() << "show " << minimumSizeHint() << " " << m_stacker->minimumSizeHint() << " " + << m_searchFrame->minimumSizeHint() << " " << wanted << endl; bool isDefault = wanted.isNull(); - wanted = wanted.expandedTo(tqminimumSizeHint()); + wanted = wanted.expandedTo(minimumSizeHint()); if ( isDefault ) - wanted.setHeight( wanted.height() + ( m_favoriteView->goodHeight() - m_stacker->tqminimumSizeHint().height() ) ); + wanted.setHeight( wanted.height() + ( m_favoriteView->goodHeight() - m_stacker->minimumSizeHint().height() ) ); return wanted; } -TQSize KMenu::tqminimumSizeHint() const +TQSize KMenu::minimumSizeHint() const { TQSize minsize; - minsize.setWidth( minsize.width() + m_tabBar->tqsizeHint().width() ); + minsize.setWidth( minsize.width() + m_tabBar->sizeHint().width() ); minsize.setWidth( QMAX( minsize.width(), - m_search->tqminimumSize().width() ) ); + m_search->minimumSize().width() ) ); minsize.setWidth( QMAX( minsize.width(), - m_search->tqminimumSize().width() ) ); + m_search->minimumSize().width() ) ); minsize.setHeight( minsize.height() + - m_search->tqminimumSize().height() + - m_footer->tqminimumSize().height() + + m_search->minimumSize().height() + + m_footer->minimumSize().height() + 180 ); // 180 is a very rough guess for 32 icon size return minsize; } @@ -3500,7 +3498,8 @@ } m_systemView->insertItem( iconName, userLabel.isEmpty() ? label : userLabel, descr, "system:/media/" + name, nId++, -1 ); - + ++it; + ++it; ++it; // skip separator } } @@ -3558,7 +3557,7 @@ else { TQString uri = item.m_path; - if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } @@ -3625,7 +3624,7 @@ df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", item->name()); - df.writeEntry("GenericName", i18n("Directory: %1").tqarg(kurl.upURL().path())); + df.writeEntry("GenericName", i18n("Directory: %1").arg(kurl.upURL().path())); df.writeEntry("Icon", item->iconName()); df.writeEntry("URL", text); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/k_new_mnu.h v3.5.13-sru/kicker/kicker/ui/k_new_mnu.h --- /tmp/stable//kdebase/kicker/kicker/ui/k_new_mnu.h 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/k_new_mnu.h 2012-09-08 19:41:29.000000000 +0200 @@ -104,8 +104,8 @@ enum MaskEffect { Plain, Dissolve }; - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; void searchOver(); void initCategoryTitlesUpdate(); @@ -319,7 +319,7 @@ TQStringList m_programsInMenu; TQStringList m_newInstalledPrograms, m_seenPrograms; bool m_seenProgramsChanged; - TQString m_tqcurrentDate; + TQString m_currentDate; MenuOrientation m_orientation; bool m_toolTipsEnabled; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/nonKDEButtonSettings.ui v3.5.13-sru/kicker/kicker/ui/nonKDEButtonSettings.ui --- /tmp/stable//kdebase/kicker/kicker/ui/nonKDEButtonSettings.ui 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/nonKDEButtonSettings.ui 2012-09-08 19:41:29.000000000 +0200 @@ -121,7 +121,7 @@ Expanding - + 20 16 @@ -140,13 +140,13 @@ 0 - + 58 58 - + 58 58 @@ -199,7 +199,7 @@ Minimum - + 20 8 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/popupmenutitle.h v3.5.13-sru/kicker/kicker/ui/popupmenutitle.h --- /tmp/stable//kdebase/kicker/kicker/ui/popupmenutitle.h 2011-08-06 00:56:46.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/ui/popupmenutitle.h 2012-09-08 19:41:29.000000000 +0200 @@ -46,7 +46,7 @@ { p->save(); TQRect r(x, y, w, h); - kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu, + kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu, p, r, cg); if (!m_desktopName.isEmpty()) @@ -69,11 +69,11 @@ m_font.setBold(true); } - TQSize tqsizeHint() + TQSize sizeHint() { TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName); size.setHeight(size.height() + - (kapp->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); + (kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); return size; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/removeapplet_mnu.cpp v3.5.13-sru/kicker/kicker/ui/removeapplet_mnu.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/removeapplet_mnu.cpp 2011-08-11 07:25:49.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/ui/removeapplet_mnu.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -87,9 +87,9 @@ void PanelRemoveAppletMenu::slotExec(int id) { - if (m_containers.tqat(id) != m_containers.end()) + if (m_containers.at(id) != m_containers.end()) { - m_containerArea->removeContainer(*m_containers.tqat(id)); + m_containerArea->removeContainer(*m_containers.at(id)); } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/removebutton_mnu.cpp v3.5.13-sru/kicker/kicker/ui/removebutton_mnu.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/removebutton_mnu.cpp 2011-03-12 07:58:13.000000000 +0100 +++ v3.5.13-sru/kicker/kicker/ui/removebutton_mnu.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -95,9 +95,9 @@ void PanelRemoveButtonMenu::slotExec( int id ) { - if (containers.tqat(id) != containers.end()) + if (containers.at(id) != containers.end()) { - containerArea->removeContainer(*containers.tqat(id)); + containerArea->removeContainer(*containers.at(id)); } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/removeextension_mnu.cpp v3.5.13-sru/kicker/kicker/ui/removeextension_mnu.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/removeextension_mnu.cpp 2011-08-11 07:25:49.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/ui/removeextension_mnu.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -100,9 +100,9 @@ { ExtensionManager::the()->removeAllContainers(); } - else if (m_containers.tqat(id) != m_containers.end()) + else if (m_containers.at(id) != m_containers.end()) { - ExtensionManager::the()->removeContainer(*m_containers.tqat(id)); + ExtensionManager::the()->removeContainer(*m_containers.at(id)); } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/kicker/ui/service_mnu.cpp v3.5.13-sru/kicker/kicker/ui/service_mnu.cpp --- /tmp/stable//kdebase/kicker/kicker/ui/service_mnu.cpp 2011-08-11 07:25:49.000000000 +0200 +++ v3.5.13-sru/kicker/kicker/ui/service_mnu.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -281,7 +281,7 @@ } // Ignore dotfiles. - if ((g->name().tqat(0) == '.')) + if ((g->name().at(0) == '.')) { continue; } @@ -445,7 +445,7 @@ return; // ignore dotfiles. - if ((serviceName.tqat(0) == '.')) + if ((serviceName.at(0) == '.')) return; // item names may contain ampersands. To avoid them being converted @@ -695,7 +695,7 @@ case EditItem: proc = new KProcess(TQT_TQOBJECT(this)); - *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+relPath_ << static_cast(contextKSycocaEntry_)->menuId(); proc->start(); break; @@ -739,7 +739,7 @@ case EditMenu: proc = new KProcess(TQT_TQOBJECT(this)); - *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+static_cast(contextKSycocaEntry_)->relPath(); proc->start(); break; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/libkicker/global.cpp v3.5.13-sru/kicker/libkicker/global.cpp --- /tmp/stable//kdebase/kicker/libkicker/global.cpp 2011-08-11 07:25:47.000000000 +0200 +++ v3.5.13-sru/kicker/libkicker/global.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -161,7 +161,7 @@ int maxDim; //return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge; - KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" )); + KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); kickerconfig->setGroup("General"); maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);; delete kickerconfig; @@ -236,13 +236,13 @@ { case KPanelApplet::Left: case KPanelApplet::Right: - r.setLeft( source->tqtopLevelWidget()->x() ); - r.setWidth( source->tqtopLevelWidget()->width() ); + r.setLeft( source->topLevelWidget()->x() ); + r.setWidth( source->topLevelWidget()->width() ); break; case KPanelApplet::Up: case KPanelApplet::Down: - r.setTop( source->tqtopLevelWidget()->y() ); - r.setHeight( source->tqtopLevelWidget()->height() ); + r.setTop( source->topLevelWidget()->y() ); + r.setHeight( source->topLevelWidget()->height() ); break; } } @@ -328,7 +328,7 @@ { KConfig *config = KGlobal::config(); config->setGroup("WM"); - TQColor color = TQApplication::tqpalette().active().highlight(); + TQColor color = TQApplication::palette().active().highlight(); TQColor activeTitle = config->readColorEntry("activeBackground", &color); TQColor inactiveTitle = config->readColorEntry("inactiveBackground", &color); @@ -336,7 +336,7 @@ int h1, s1, v1, h2, s2, v2, h3, s3, v3; activeTitle.hsv(&h1, &s1, &v1); inactiveTitle.hsv(&h2, &s2, &v2); - TQApplication::tqpalette().active().background().hsv(&h3, &s3, &v3); + TQApplication::palette().active().background().hsv(&h3, &s3, &v3); if ( (kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < kAbs(h2-h3)+kAbs(s2-s3)+kAbs(v2-v3)) && ((kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < 32) || (s1 < 32)) && (s2 > s1)) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/libkicker/kickerSettings.kcfg v3.5.13-sru/kicker/libkicker/kickerSettings.kcfg --- /tmp/stable//kdebase/kicker/libkicker/kickerSettings.kcfg 2011-08-26 01:00:16.000000000 +0200 +++ v3.5.13-sru/kicker/libkicker/kickerSettings.kcfg 2012-09-08 19:41:29.000000000 +0200 @@ -81,7 +81,7 @@ - (TQApplication::tqpalette().active().mid()) + (TQApplication::palette().active().mid()) This option sets the color to use when tinting transparent panels diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/libkicker/kickertip.cpp v3.5.13-sru/kicker/libkicker/kickertip.cpp --- /tmp/stable//kdebase/kicker/libkicker/kickertip.cpp 2011-09-11 06:57:56.000000000 +0200 +++ v3.5.13-sru/kicker/libkicker/kickertip.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -392,8 +392,8 @@ // draw background TQPainter bufferPainter(&m_pixmap); - bufferPainter.setPen(tqcolorGroup().foreground()); - bufferPainter.setBrush(tqcolorGroup().background()); + bufferPainter.setPen(colorGroup().foreground()); + bufferPainter.setBrush(colorGroup().background()); //bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); drawRoundRect(bufferPainter, TQRect(0, 0, width, height)); @@ -409,13 +409,13 @@ if (KickerSettings::mouseOversShowText()) { // draw text shadow - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); cg.setColor(TQColorGroup::Text, cg.background().dark(115)); int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, TQRect(), cg); // draw text - cg = tqcolorGroup(); + cg = colorGroup(); m_richText->draw(&bufferPainter, textX, textY, rect(), cg); } } @@ -458,7 +458,7 @@ void KickerTip::internalUpdate() { m_dirty = true; - tqrepaint(false); + repaint(false); } void KickerTip::enableTipping(bool tip) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/libkicker/menuinfo.cpp v3.5.13-sru/kicker/libkicker/menuinfo.cpp --- /tmp/stable//kdebase/kicker/libkicker/menuinfo.cpp 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/libkicker/menuinfo.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -35,7 +35,7 @@ MenuInfo::MenuInfo(const TQString& desktopFile) { - KSimpleConfig df(locate("data", TQString::tqfromLatin1("kicker/menuext/%1").arg(desktopFile))); + KSimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile))); df.setGroup("Desktop Entry"); TQStringList list = df.readListEntry("X-KDE-AuthorizeAction"); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/libkicker/panelbutton.cpp v3.5.13-sru/kicker/libkicker/panelbutton.cpp --- /tmp/stable//kdebase/kicker/libkicker/panelbutton.cpp 2011-08-11 07:25:47.000000000 +0200 +++ v3.5.13-sru/kicker/libkicker/panelbutton.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -438,7 +438,7 @@ if (!m_highlight && m_disableHighlighting == FALSE) { m_highlight = true; - tqrepaint(false); + repaint(false); } TQButton::enterEvent(e); @@ -449,7 +449,7 @@ if (m_highlight) { m_highlight = false; - tqrepaint(false); + repaint(false); } TQButton::leaveEvent(e); @@ -539,7 +539,7 @@ if (m_tileColor.isValid()) { p->fillRect(rect(), m_tileColor); - tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup()); + style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); } else if (paletteBackgroundPixmap()) { @@ -558,8 +558,8 @@ } else if (isDown() || isOn()) { - // Draw tqshapes to indicate the down state. - tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup(), TQStyle::Style_Sunken); + // Draw shapes to indicate the down state. + style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken); } drawButtonLabel(p); @@ -569,8 +569,8 @@ int x1, y1, x2, y2; TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(), - TQStyle::Style_Default, tqcolorGroup().button()); + style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), + TQStyle::Style_Default, colorGroup().button()); } } @@ -581,7 +581,7 @@ if (m_tileColor.isValid()) { p->fillRect(rect(), m_tileColor); - tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup()); + style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); } else if (paletteBackgroundPixmap()) { @@ -595,10 +595,10 @@ TQRect btn_rect = TQRect(rect().x(), rect().y()+1, rect().width(), rect().height()-2); if (isDown() || isOn()) { - tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, tqcolorGroup(), TQStyle::Style_Down); + style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down); } else { - tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, tqcolorGroup(), TQStyle::Style_Raised); + style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised); } drawButtonLabel(p,0,FALSE); @@ -608,8 +608,8 @@ int x1, y1, x2, y2; TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(), - TQStyle::Style_Default, tqcolorGroup().button()); + style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), + TQStyle::Style_Default, colorGroup().button()); } } @@ -718,7 +718,7 @@ if (m_drawArrow && (m_highlight || active) && drawArrow) { TQStyle::PrimitiveElement e = TQStyle::PE_ArrowUp; - int arrowSize = tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator); + int arrowSize = style().pixelMetric(TQStyle::PM_MenuButtonIndicator); TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize); switch (m_arrowDirection) @@ -762,7 +762,7 @@ { flags |= TQStyle::Style_Down; } - tqstyle().tqdrawPrimitive(e, p, r, tqcolorGroup(), flags); + style().tqdrawPrimitive(e, p, r, colorGroup(), flags); } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/libkicker/paneldrag.cpp v3.5.13-sru/kicker/libkicker/paneldrag.cpp --- /tmp/stable//kdebase/kicker/libkicker/paneldrag.cpp 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/libkicker/paneldrag.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -46,7 +46,7 @@ bool PanelDrag::decode(const TQMimeSource* e, BaseContainer** container) { - TQByteArray a = e->tqencodedData("application/basecontainerptr"); + TQByteArray a = e->encodedData("application/basecontainerptr"); if (a.size() != PANELDRAG_BUFSIZE) { @@ -73,7 +73,7 @@ return false; } - TQByteArray a = e->tqencodedData("application/basecontainerptr"); + TQByteArray a = e->encodedData("application/basecontainerptr"); if (a.size() != PANELDRAG_BUFSIZE) { return false; @@ -91,7 +91,7 @@ return true; } -TQByteArray PanelDrag::tqencodedData(const char * mimeType) const +TQByteArray PanelDrag::encodedData(const char * mimeType) const { if (TQString("application/basecontainerptr") == mimeType && a.size() == PANELDRAG_BUFSIZE) @@ -136,7 +136,7 @@ return 0; } -TQByteArray AppletInfoDrag::tqencodedData(const char* mimeType) const +TQByteArray AppletInfoDrag::encodedData(const char* mimeType) const { if (TQString("application/appletinfo") == mimeType) { @@ -158,7 +158,7 @@ bool AppletInfoDrag::decode(const TQMimeSource* e, AppletInfo& container) { - TQByteArray a = e->tqencodedData("application/appletinfo"); + TQByteArray a = e->encodedData("application/appletinfo"); if (a.isEmpty()) { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/libkicker/paneldrag.h v3.5.13-sru/kicker/libkicker/paneldrag.h --- /tmp/stable//kdebase/kicker/libkicker/paneldrag.h 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/libkicker/paneldrag.h 2012-09-08 19:41:29.000000000 +0200 @@ -39,7 +39,7 @@ ~PanelDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray tqencodedData(const char *) const; + virtual TQByteArray encodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, BaseContainer** container); @@ -55,7 +55,7 @@ ~AppletInfoDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray tqencodedData(const char *) const; + virtual TQByteArray encodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, AppletInfo& container); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/libkicker/panner.cpp v3.5.13-sru/kicker/libkicker/panner.cpp --- /tmp/stable//kdebase/kicker/libkicker/panner.cpp 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/libkicker/panner.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -103,8 +103,8 @@ { _luSB->setArrowType(Qt::LeftArrow); _rdSB->setArrowType(Qt::RightArrow); - _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - _rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); TQToolTip::add(_luSB, i18n("Scroll left")); TQToolTip::add(_rdSB, i18n("Scroll right")); setMinimumSize(24, 0); @@ -117,8 +117,8 @@ { _luSB->setArrowType(Qt::UpArrow); _rdSB->setArrowType(Qt::DownArrow); - _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); - _rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); TQToolTip::add(_luSB, i18n("Scroll up")); TQToolTip::add(_rdSB, i18n("Scroll down")); setMinimumSize(0, 24); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/libkicker/panner.h v3.5.13-sru/kicker/libkicker/panner.h --- /tmp/stable//kdebase/kicker/libkicker/panner.h 2011-03-12 07:58:10.000000000 +0100 +++ v3.5.13-sru/kicker/libkicker/panner.h 2012-09-08 19:41:29.000000000 +0200 @@ -39,7 +39,7 @@ Panner( TQWidget* parent, const char* name = 0 ); ~Panner(); - TQSize tqminimumSizeHint() const { return TQWidget::tqminimumSizeHint(); } + TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); } Qt::Orientation orientation() const { return _orient; } virtual void setOrientation(Qt::Orientation orientation); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/libkicker/simplebutton.cpp v3.5.13-sru/kicker/libkicker/simplebutton.cpp --- /tmp/stable//kdebase/kicker/libkicker/simplebutton.cpp 2011-08-06 00:56:45.000000000 +0200 +++ v3.5.13-sru/kicker/libkicker/simplebutton.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -71,22 +71,22 @@ update(); } -TQSize SimpleButton::tqsizeHint() const +TQSize SimpleButton::sizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::tqsizeHint(); + return TQButton::sizeHint(); else return TQSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN); } -TQSize SimpleButton::tqminimumSizeHint() const +TQSize SimpleButton::minimumSizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::tqminimumSizeHint(); + return TQButton::minimumSizeHint(); else return TQSize(pm->width(), pm->height()); } @@ -99,7 +99,7 @@ if (m_highlight || isDown() || isOn()) { int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, tqcolorGroup(), flags); + style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags); } } @@ -202,7 +202,7 @@ if (KickerSettings::showMouseOverEffects()) m_highlight = true; - tqrepaint( false ); + repaint( false ); TQButton::enterEvent( e ); } @@ -210,7 +210,7 @@ { m_highlight = false; - tqrepaint( false ); + repaint( false ); TQButton::enterEvent( e ); } @@ -229,7 +229,7 @@ _inside = false; } -TQSize SimpleArrowButton::tqsizeHint() const +TQSize SimpleArrowButton::sizeHint() const { return TQSize( 12, 12 ); } @@ -263,7 +263,7 @@ int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags); + style().tqdrawPrimitive(pe, p, r, colorGroup(), flags); if (m_forceStandardCursor) { SimpleButton::drawButton(p); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/libkicker/simplebutton.h v3.5.13-sru/kicker/libkicker/simplebutton.h --- /tmp/stable//kdebase/kicker/libkicker/simplebutton.h 2011-08-06 00:56:45.000000000 +0200 +++ v3.5.13-sru/kicker/libkicker/simplebutton.h 2012-09-08 19:41:29.000000000 +0200 @@ -34,8 +34,8 @@ SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = FALSE); void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; protected: void drawButton( TQPainter *p ); @@ -68,7 +68,7 @@ public: SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE); virtual ~SimpleArrowButton() {}; - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: virtual void enterEvent( TQEvent *e ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/menuext/konsole/konsole_mnu.cpp v3.5.13-sru/kicker/menuext/konsole/konsole_mnu.cpp --- /tmp/stable//kdebase/kicker/menuext/konsole/konsole_mnu.cpp 2011-03-12 07:58:09.000000000 +0100 +++ v3.5.13-sru/kicker/menuext/konsole/konsole_mnu.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -185,7 +185,7 @@ screenList.append(TQFile::decodeName(entry->d_name)); insertItem(SmallIconSet("konsole"), i18n("Screen is a program controlling screens!", - "Screen at %1").tqarg(entry->d_name), id); + "Screen at %1").arg(entry->d_name), id); id++; } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/menuext/prefmenu/prefmenu.cpp v3.5.13-sru/kicker/menuext/prefmenu/prefmenu.cpp --- /tmp/stable//kdebase/kicker/menuext/prefmenu/prefmenu.cpp 2011-08-11 07:25:45.000000000 +0200 +++ v3.5.13-sru/kicker/menuext/prefmenu/prefmenu.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -113,7 +113,7 @@ } // ignore dotfiles. - if ((serviceName.tqat(0) == '.')) + if ((serviceName.at(0) == '.')) { return; } @@ -290,7 +290,7 @@ } // Ignore dotfiles. - if ((g->name().tqat(0) == '.')) + if ((g->name().at(0) == '.')) { continue; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/menuext/tom/tom.cc v3.5.13-sru/kicker/menuext/tom/tom.cc --- /tmp/stable//kdebase/kicker/menuext/tom/tom.cc 2011-08-11 07:25:45.000000000 +0200 +++ v3.5.13-sru/kicker/menuext/tom/tom.cc 2012-09-08 19:41:29.000000000 +0200 @@ -109,7 +109,7 @@ l2->setBuddy(this); runLayout->addWidget(l2);*/ m_runEdit = new KHistoryCombo(this); - m_runEdit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); + m_runEdit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); runLayout->addWidget(m_runEdit, 10); runLayout->addSpacing(KDialog::spacingHint()); @@ -143,7 +143,7 @@ TQPainter p(this); TQRect r(rect()); // ew, nasty hack. may result in coredumps due to horrid C-style cast??? - kapp->style().tqdrawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, + kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, TQStyleOption(static_cast(this), 0, KIcon::SizeMedium )); p.drawPixmap(KDialog::spacingHint(), 1, icon); p.drawText((KDialog::spacingHint() * 2) + KIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:")); @@ -736,13 +736,13 @@ TQRect TOM::sideImageRect() { - return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), m_sidePixmap.width(), + return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), m_sidePixmap.width(), height() - 2*frameWidth() ), this ); } void TOM::resizeEvent(TQResizeEvent * e) { - setFrameRect( TQStyle::tqvisualRect( TQRect( m_sidePixmap.width(), 0, + setFrameRect( TQStyle::visualRect( TQRect( m_sidePixmap.width(), 0, width() - m_sidePixmap.width(), height() ), this ) ); } @@ -755,9 +755,9 @@ TQPainter p(this); - tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, + style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), - tqcolorGroup(), TQStyle::Style_Default, + colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); TQRect r = sideImageRect(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/proxy/appletproxy.cpp v3.5.13-sru/kicker/proxy/appletproxy.cpp --- /tmp/stable//kdebase/kicker/proxy/appletproxy.cpp 2011-07-08 00:00:31.000000000 +0200 +++ v3.5.13-sru/kicker/proxy/appletproxy.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -228,7 +228,7 @@ void AppletProxy::repaintApplet(TQWidget* widget) { - widget->tqrepaint(); + widget->repaint(); const TQObjectList children = widget->childrenListObject(); @@ -372,14 +372,14 @@ } return true; } - else if ( fun == "tqsetAlignment(int)" ) + else if ( fun == "setAlignment(int)" ) { TQDataStream dataStream( data, IO_ReadOnly ); - int tqalignment; - dataStream >> tqalignment; + int alignment; + dataStream >> alignment; if(_applet) { - _applet->tqsetAlignment( (KPanelApplet::Alignment)tqalignment ); + _applet->setAlignment( (KPanelApplet::Alignment)alignment ); } return true; } @@ -435,7 +435,7 @@ if(_applet) if ( _bg.isNull() ) { // no transparency _applet->unsetPalette(); - _applet->tqrepaint(); + _applet->repaint(); } else { //transparency _applet->blockSignals(true); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/proxy/extensionproxy.cpp v3.5.13-sru/kicker/proxy/extensionproxy.cpp --- /tmp/stable//kdebase/kicker/proxy/extensionproxy.cpp 2011-03-12 07:58:08.000000000 +0100 +++ v3.5.13-sru/kicker/proxy/extensionproxy.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -258,7 +258,7 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData) { - if ( fun == "tqsizeHint(int,TQSize)" ) + if ( fun == "sizeHint(int,TQSize)" ) { TQDataStream dataStream( data, IO_ReadOnly ); int pos; @@ -272,7 +272,7 @@ if(!_extension) reply << maxSize; else - reply << _extension->tqsizeHint((KPanelExtension::Position)pos, maxSize); + reply << _extension->sizeHint((KPanelExtension::Position)pos, maxSize); return true; } @@ -287,14 +287,14 @@ } return true; } - else if ( fun == "tqsetAlignment(int)" ) + else if ( fun == "setAlignment(int)" ) { TQDataStream dataStream( data, IO_ReadOnly ); - int tqalignment; - dataStream >> tqalignment; + int alignment; + dataStream >> alignment; if(_extension) { - _extension->tqsetAlignment( (KPanelExtension::Alignment)tqalignment ); + _extension->setAlignment( (KPanelExtension::Alignment)alignment ); } return true; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/taskbar/taskbarcontainer.cpp v3.5.13-sru/kicker/taskbar/taskbarcontainer.cpp --- /tmp/stable//kdebase/kicker/taskbar/taskbarcontainer.cpp 2011-03-12 07:58:09.000000000 +0100 +++ v3.5.13-sru/kicker/taskbar/taskbarcontainer.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -135,7 +135,7 @@ windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, KIcon::Panel, 16)); - windowListButton->setMinimumSize(windowListButton->tqsizeHint()); + windowListButton->setMinimumSize(windowListButton->sizeHint()); layout->insertWidget(0, windowListButton); windowListButton->show(); } @@ -230,7 +230,7 @@ windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, KIcon::Panel, 16)); - windowListButton->setMinimumSize(windowListButton->tqsizeHint()); + windowListButton->setMinimumSize(windowListButton->sizeHint()); } } @@ -249,13 +249,13 @@ pos.setX( pos.x() + width() ); break; case KPanelApplet::Left: - pos.setX( pos.x() - windowListMenu->tqsizeHint().width() ); + pos.setX( pos.x() - windowListMenu->sizeHint().width() ); break; case KPanelApplet::Down: pos.setY( pos.y() + height() ); break; case KPanelApplet::Up: - pos.setY( pos.y() - windowListMenu->tqsizeHint().height() ); + pos.setY( pos.y() - windowListMenu->sizeHint().height() ); default: break; } @@ -277,9 +277,9 @@ connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) ); } -TQSize TaskBarContainer::tqsizeHint( KPanelExtension::Position p, TQSize maxSize) const +TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const { - TQSize size = taskBar->tqsizeHint( p, maxSize ); + TQSize size = taskBar->sizeHint( p, maxSize ); if ( (p == KPanelExtension::Left || p == KPanelExtension::Right) && showWindowListButton ) { return TQSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE ); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/taskbar/taskbarcontainer.h v3.5.13-sru/kicker/taskbar/taskbarcontainer.h --- /tmp/stable//kdebase/kicker/taskbar/taskbarcontainer.h 2011-03-12 07:58:09.000000000 +0100 +++ v3.5.13-sru/kicker/taskbar/taskbarcontainer.h 2012-09-08 19:41:29.000000000 +0200 @@ -48,7 +48,7 @@ void popupDirectionChange( KPanelApplet::Direction ); void preferences(); //FIXME: don't use Position, use Orientation - TQSize tqsizeHint( KPanelExtension::Position, TQSize maxSize ) const; + TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const; void setBackground(); k_dcop: diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/taskbar/taskbar.cpp v3.5.13-sru/kicker/taskbar/taskbar.cpp --- /tmp/stable//kdebase/kicker/taskbar/taskbar.cpp 2011-08-11 07:25:46.000000000 +0200 +++ v3.5.13-sru/kicker/taskbar/taskbar.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -66,7 +66,7 @@ blocklayout = true; // init - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); // setup animation frames for (int i = 1; i < 11; i++) @@ -160,7 +160,7 @@ } -TQSize TaskBar::tqsizeHint() const +TQSize TaskBar::sizeHint() const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest @@ -171,7 +171,7 @@ return TQSize(BUTTON_MIN_WIDTH, minButtonHeight); } -TQSize TaskBar::tqsizeHint( KPanelExtension::Position p, TQSize maxSize) const +TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest @@ -898,9 +898,9 @@ { if ( !isTopLevel() ) { - TQMouseEvent me( e->type(), mapTo( tqtopLevelWidget(), e->pos() ), + TQMouseEvent me( e->type(), mapTo( topLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); - TQApplication::sendEvent( tqtopLevelWidget(), &me ); + TQApplication::sendEvent( topLevelWidget(), &me ); } } @@ -1074,7 +1074,7 @@ TaskContainer::List::iterator it; for (int i = 0; i < numContainers; ++i) { - it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1); + it = forward ? list.at(i) : list.at(numContainers - i - 1); if (it != list.end() && (*it)->activateNextTask(forward, forcenext)) { @@ -1087,7 +1087,7 @@ // moving forward from the last, or backward from the first, loop around for (int i = 0; i < numContainers; ++i) { - it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1); + it = forward ? list.at(i) : list.at(numContainers - i - 1); if (it != list.end() && (*it)->activateNextTask(forward, forcenext)) { @@ -1101,7 +1101,7 @@ forcenext = true; // select first for (int i = 0; i < numContainers; ++i) { - it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1); + it = forward ? list.at(i) : list.at(numContainers - i - 1); if (it == list.end()) { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/taskbar/taskbar.h v3.5.13-sru/kicker/taskbar/taskbar.h --- /tmp/stable//kdebase/kicker/taskbar/taskbar.h 2011-03-12 07:58:09.000000000 +0100 +++ v3.5.13-sru/kicker/taskbar/taskbar.h 2012-09-08 19:41:29.000000000 +0200 @@ -47,8 +47,8 @@ TaskBar( TQWidget *parent = 0, const char *name = 0 ); ~TaskBar(); - TQSize tqsizeHint() const; - TQSize tqsizeHint( KPanelExtension::Position, TQSize maxSize ) const; + TQSize sizeHint() const; + TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const; void setOrientation( Orientation ); void setArrowType( TQt::ArrowType at ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/taskbar/taskcontainer.cpp v3.5.13-sru/kicker/taskbar/taskcontainer.cpp --- /tmp/stable//kdebase/kicker/taskbar/taskcontainer.cpp 2011-09-01 16:50:23.000000000 +0200 +++ v3.5.13-sru/kicker/taskbar/taskcontainer.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -233,9 +233,9 @@ void TaskContainer::animationTimerFired() { - if (!frames.isEmpty() && taskBar->showIcon() && frames.tqat(currentFrame) != frames.end()) + if (!frames.isEmpty() && taskBar->showIcon() && frames.at(currentFrame) != frames.end()) { - TQPixmap *pm = *frames.tqat(currentFrame); + TQPixmap *pm = *frames.at(currentFrame); // draw pixmap if ( pm && !pm->isNull() ) { @@ -314,8 +314,8 @@ void TaskContainer::resizeEvent( TQResizeEvent * ) { // calculate the icon rect - TQRect br( tqstyle().subRect( TQStyle::SR_PushButtonContents, this ) ); - iconRect = TQStyle::tqvisualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); + TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) ); + iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); } void TaskContainer::add(Task::Ptr task) @@ -477,7 +477,7 @@ } TQPainter p; - p.tqbegin(pm ,this); + p.begin(pm ,this); drawButton(&p); p.end(); @@ -533,7 +533,7 @@ font.setBold(active); - TQColorGroup colors = tqpalette().active(); + TQColorGroup colors = palette().active(); if (TaskBarSettings::useCustomColors()) { @@ -582,20 +582,20 @@ bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate)); bool reverse = TQApplication::reverseLayout(); - TQRect br(tqstyle().subRect(TQStyle::SR_PushButtonContents, this)); - TQPoint shift = TQPoint(tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftHorizontal), - tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftVertical)); + TQRect br(style().subRect(TQStyle::SR_PushButtonContents, this)); + TQPoint shift = TQPoint(style().pixelMetric(TQStyle::PM_ButtonShiftHorizontal), + style().pixelMetric(TQStyle::PM_ButtonShiftVertical)); // draw button background if (drawButton) { if (KickerSettings::showDeepButtons()) { - tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, + style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, TQRect(1, 1, width()-3, height()-2), colors, sunken ? TQStyle::Style_On : TQStyle::Style_Raised); } else { - tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, + style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, TQRect(1, 1, width()-2, height()-2), colors, sunken ? TQStyle::Style_Down : TQStyle::Style_Raised); } @@ -653,7 +653,7 @@ // draw modified overlay if (!modPixmap.isNull()) { - TQRect r = TQStyle::tqvisualRect(TQRect(br.x() + textPos, + TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos, (height() - 16) / 2, 16, 16), this); @@ -670,7 +670,7 @@ // draw text if (!text.isEmpty()) { - TQRect tr = TQStyle::tqvisualRect(TQRect(br.x() + textPos + 1, 0, + TQRect tr = TQStyle::visualRect(TQRect(br.x() + textPos + 1, 0, width() - textPos, height()), this); int textFlags = AlignVCenter | SingleLine; @@ -733,10 +733,10 @@ KImageEffect::blend(img, timg, *taskBar->blendGradient(size()), KImageEffect::Red); // End painting before assigning the pixmap - QPaintDevice* opd = p->device(); + TQPaintDevice* opd = p->device(); p->end(); pm->convertFromImage(img); - p->tqbegin(opd ,this); + p->begin(opd ,this); } else { @@ -754,9 +754,9 @@ } } - if (!frames.isEmpty() && m_startup && frames.tqat(currentFrame) != frames.end()) + if (!frames.isEmpty() && m_startup && frames.at(currentFrame) != frames.end()) { - TQPixmap *anim = *frames.tqat(currentFrame); + TQPixmap *anim = *frames.at(currentFrame); if (anim && !anim->isNull()) { @@ -787,19 +787,19 @@ } int flags = TQStyle::Style_Enabled; - TQRect ar = TQStyle::tqvisualRect(TQRect(br.x() + br.width() - 8 - 2, + TQRect ar = TQStyle::visualRect(TQRect(br.x() + br.width() - 8 - 2, br.y(), 8, br.height()), this); if (sunken) { flags |= TQStyle::Style_Down; } - tqstyle().tqdrawPrimitive(e, p, ar, colors, flags); + style().tqdrawPrimitive(e, p, ar, colors, flags); } // draw mouse over frame in transparent mode if (m_mouseOver && halo) - KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), tqcolorGroup().foreground()); + KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), colorGroup().foreground()); if (aboutToActivate) { @@ -830,13 +830,13 @@ // in common, and then use everything UP TO that as the name in the button while (i < maxLength) { - TQChar check = match.tqat(i).lower(); + TQChar check = match.at(i).lower(); Task::List::iterator itEnd = m_filteredTasks.end(); for (Task::List::iterator it = m_filteredTasks.begin(); it != itEnd; ++it) { // we're doing a lot of Utf8 -> TQString conversions here // by repeatedly calling visibleIconicName() =/ - if (check != (*it)->visibleName().tqat(i).lower()) + if (check != (*it)->visibleName().at(i).lower()) { if (i > 0) { @@ -856,7 +856,7 @@ } // strip trailing crap - while (i > 0 && !match.tqat(i).isLetterOrNumber()) + while (i > 0 && !match.at(i).isLetterOrNumber()) { --i; } @@ -1161,17 +1161,17 @@ pos.setX(pos.x() + width()); break; case LeftArrow: - pos.setX(pos.x() - m_menu->tqsizeHint().width()); + pos.setX(pos.x() - m_menu->sizeHint().width()); break; case DownArrow: if ( TQApplication::reverseLayout() ) - pos.setX( pos.x() + width() - m_menu->tqsizeHint().width() ); + pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); pos.setY( pos.y() + height() ); break; case UpArrow: if ( TQApplication::reverseLayout() ) - pos.setX( pos.x() + width() - m_menu->tqsizeHint().width() ); - pos.setY(pos.y() - m_menu->tqsizeHint().height()); + pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); + pos.setY(pos.y() - m_menu->sizeHint().height()); break; default: break; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/taskmanager/tasklmbmenu.cpp v3.5.13-sru/kicker/taskmanager/tasklmbmenu.cpp --- /tmp/stable//kdebase/kicker/taskmanager/tasklmbmenu.cpp 2011-08-11 07:25:46.000000000 +0200 +++ v3.5.13-sru/kicker/taskmanager/tasklmbmenu.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -75,7 +75,7 @@ p->drawText(x, y, w, h, AlignAuto|AlignVCenter|DontClip|ShowPrefix, m_text); } -TQSize TaskMenuItem::tqsizeHint() +TQSize TaskMenuItem::sizeHint() { TQFont font = TQFont(); if (m_isActive) @@ -213,7 +213,7 @@ void TaskLMBMenu::dragSwitch() { bool ok = false; - Task::Ptr t = m_tasks.tqat(indexOf(m_lastDragId), &ok); + Task::Ptr t = m_tasks.at(indexOf(m_lastDragId), &ok); if (ok) { t->activate(); @@ -264,7 +264,7 @@ if (index != -1) { bool ok = false; - Task::Ptr task = m_tasks.tqat(index, &ok); + Task::Ptr task = m_tasks.at(index, &ok); if (ok) { Task::List tasks; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/taskmanager/tasklmbmenu.h v3.5.13-sru/kicker/taskmanager/tasklmbmenu.h --- /tmp/stable//kdebase/kicker/taskmanager/tasklmbmenu.h 2011-03-12 07:58:09.000000000 +0100 +++ v3.5.13-sru/kicker/taskmanager/tasklmbmenu.h 2012-09-08 19:41:29.000000000 +0200 @@ -38,7 +38,7 @@ ~TaskMenuItem(); void paint(TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int); - TQSize tqsizeHint(); + TQSize sizeHint(); void setAttentionState(bool state) { m_attentionState = state; } private: diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kicker/taskmanager/taskmanager.cpp v3.5.13-sru/kicker/taskmanager/taskmanager.cpp --- /tmp/stable//kdebase/kicker/taskmanager/taskmanager.cpp 2011-08-11 07:25:46.000000000 +0200 +++ v3.5.13-sru/kicker/taskmanager/taskmanager.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -1356,7 +1356,7 @@ Picture picture = XRenderCreatePicture(dpy, m_windowPixmap, format, CPSubwindowMode, &picAttr); - // Get tqshaped windows handled correctly. + // Get shaped windows handled correctly. XserverRegion region = XFixesCreateRegionFromWindow(dpy, m_frameId, WindowRegionBounding); XFixesSetPictureClipRegion(dpy, picture, 0, 0, region); @@ -1375,7 +1375,7 @@ int thumbnailHeight = (int)(winAttr.height * factor); TQPixmap thumbnail(thumbnailWidth, thumbnailHeight); - thumbnail.fill(TQApplication::tqpalette().active().background()); + thumbnail.fill(TQApplication::palette().active().background()); #if 0 // TQImage::smoothScale() scaling TQPixmap full(winAttr.width, winAttr.height); @@ -1499,7 +1499,7 @@ Task::List TaskDrag::decode( const TQMimeSource* e ) { - TQByteArray data(e->tqencodedData("taskbar/task")); + TQByteArray data(e->encodedData("taskbar/task")); Task::List tasks; if (data.size()) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/filter/filter.cc v3.5.13-sru/kioslave/filter/filter.cc --- /tmp/stable//kdebase/kioslave/filter/filter.cc 2011-03-12 07:57:56.000000000 +0100 +++ v3.5.13-sru/kioslave/filter/filter.cc 2012-09-08 19:41:29.000000000 +0200 @@ -56,7 +56,7 @@ FilterProtocol::FilterProtocol( const TQCString & protocol, const TQCString &pool, const TQCString &app ) : KIO::SlaveBase( protocol, pool, app ) { - TQString mimetype = TQString::tqfromLatin1("application/x-") + TQString::tqfromLatin1(protocol); + TQString mimetype = TQString::fromLatin1("application/x-") + TQString::fromLatin1(protocol); filter = KFilterBase::findFilterByMimeType( mimetype ); Q_ASSERT(filter); } @@ -157,7 +157,7 @@ void FilterProtocol::put( const KURL &/*url*/, int, bool /*_overwrite*/, bool /*_resume*/ ) { - error( KIO::ERR_UNSUPPORTED_ACTION, TQString::tqfromLatin1("put")); + error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("put")); } void FilterProtocol::setSubURL(const KURL &url) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/fish/fish.cpp v3.5.13-sru/kioslave/fish/fish.cpp --- /tmp/stable//kdebase/kioslave/fish/fish.cpp 2011-08-11 07:25:36.000000000 +0200 +++ v3.5.13-sru/kioslave/fish/fish.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -1436,7 +1436,7 @@ if (rc > 0) { int noff = received(buf,rc+offset); if (noff > 0) memmove(buf,buf+offset+rc-noff,noff); - //myDebug( << "left " << noff << " bytes: " << TQString::tqfromLatin1(buf,offset) << endl); + //myDebug( << "left " << noff << " bytes: " << TQString::fromLatin1(buf,offset) << endl); offset = noff; } else { if (errno == EINTR) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/ldap/kio_ldap.cpp v3.5.13-sru/kioslave/ldap/kio_ldap.cpp --- /tmp/stable//kdebase/kioslave/ldap/kio_ldap.cpp 2011-08-11 07:25:35.000000000 +0200 +++ v3.5.13-sru/kioslave/ldap/kio_ldap.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -166,8 +166,8 @@ { TQString oid; bool critical; TQByteArray value; int i = 0; - while ( hasMetaData( TQString::tqfromLatin1("SERVER_CTRL%1").arg(i) ) ) { - TQCString val = metaData( TQString::tqfromLatin1("SERVER_CTRL%1").arg(i) ).utf8(); + while ( hasMetaData( TQString::fromLatin1("SERVER_CTRL%1").arg(i) ) ) { + TQCString val = metaData( TQString::fromLatin1("SERVER_CTRL%1").arg(i) ).utf8(); LDIF::splitControl( val, oid, critical, value ); kdDebug(7125) << "server ctrl #" << i << " value: " << val << " oid: " << oid << " critical: " << critical << " value: " << @@ -176,8 +176,8 @@ i++; } i = 0; - while ( hasMetaData( TQString::tqfromLatin1("CLIENT_CTRL%1").arg(i) ) ) { - TQCString val = metaData( TQString::tqfromLatin1("CLIENT_CTRL%1").arg(i) ).utf8(); + while ( hasMetaData( TQString::fromLatin1("CLIENT_CTRL%1").arg(i) ) ) { + TQCString val = metaData( TQString::fromLatin1("CLIENT_CTRL%1").arg(i) ).utf8(); LDIF::splitControl( val, oid, critical, value ); kdDebug(7125) << "client ctrl #" << i << " value: " << val << " oid: " << oid << " critical: " << critical << " value: " << @@ -197,7 +197,7 @@ if ( count > 0 ) { attrs = static_cast( malloc((count+1) * sizeof(char*)) ); for (int i=0; i tqcurrentDate.month()) { - year = tqcurrentDate.year() - 1; + if (month > currentDate.month()) { + year = currentDate.year() - 1; } else { - year = tqcurrentDate.year(); + year = currentDate.year(); } TQString h(hourMin.cap(1)); TQString m(hourMin.cap(2)); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/man/kio_man.cpp v3.5.13-sru/kioslave/man/kio_man.cpp --- /tmp/stable//kdebase/kioslave/man/kio_man.cpp 2011-08-11 07:25:38.000000000 +0200 +++ v3.5.13-sru/kioslave/man/kio_man.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -82,7 +82,7 @@ section = TQString::null; TQString url = _url; - if (url.tqat(0) == '/') { + if (url.at(0) == '/') { if (KStandardDirs::exists(url)) { title = url; return true; @@ -93,7 +93,7 @@ } } - while (url.tqat(0) == '/') + while (url.at(0) == '/') url.remove(0,1); title = url; @@ -259,7 +259,7 @@ TQStringList list; // kdDebug() << "findPages '" << section << "' '" << title << "'\n"; - if (title.tqat(0) == '/') { + if (title.at(0) == '/') { list.append(title); return list; } @@ -279,7 +279,7 @@ // Section given as argument // sect_list += section; - while (section.tqat(section.length() - 1).isLetter()) { + while (section.at(section.length() - 1).isLetter()) { section.truncate(section.length() - 1); sect_list += section; } @@ -400,11 +400,11 @@ { m_outputBuffer.writeBlock(insert,strlen(insert)); } - if (!insert || m_outputBuffer.tqat() >= 2048) + if (!insert || m_outputBuffer.at() >= 2048) { m_outputBuffer.close(); data(m_outputBuffer.buffer()); - m_outputBuffer.tqsetBufferFromCopy(TQByteArray()); + m_outputBuffer.setBuffer(TQByteArray()); m_outputBuffer.open(IO_WriteOnly); } } @@ -505,7 +505,7 @@ m_outputBuffer.close(); data(m_outputBuffer.buffer()); - m_outputBuffer.tqsetBufferFromCopy(TQByteArray()); + m_outputBuffer.setBuffer(TQByteArray()); // tell we are done data(TQByteArray()); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/man/man2html.cpp v3.5.13-sru/kioslave/man/man2html.cpp --- /tmp/stable//kdebase/kioslave/man/man2html.cpp 2011-08-16 01:07:51.000000000 +0200 +++ v3.5.13-sru/kioslave/man/man2html.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -1905,7 +1905,7 @@ return (index >= 0) && (index < (int)items.count()); } TABLEITEM &at(int index) { - return *items.tqat(index); + return *items.at(index); } TABLEROW *copyLayout() const; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/kcmodule/main.cpp v3.5.13-sru/kioslave/media/kcmodule/main.cpp --- /tmp/stable//kdebase/kioslave/media/kcmodule/main.cpp 2011-03-12 07:57:54.000000000 +0100 +++ v3.5.13-sru/kioslave/media/kcmodule/main.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -67,6 +67,7 @@ I18N_NOOP("(c) 2005 Jean-Remy Falleri")); about->addAuthor("Jean-Remy Falleri", I18N_NOOP("Maintainer"), "jr.falleri@laposte.net"); about->addAuthor("Kevin Ottens", 0, "ervin ipsquad net"); + about->addAuthor("Valentine Sinitsyn", 0, "e_val@inbox.ru"); about->addCredit("Achim Bohnet", I18N_NOOP("Help for the application design")); setAboutData( about ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/kcmodule/managermodule.cpp v3.5.13-sru/kioslave/media/kcmodule/managermodule.cpp --- /tmp/stable//kdebase/kioslave/media/kcmodule/managermodule.cpp 2010-08-13 00:37:22.000000000 +0200 +++ v3.5.13-sru/kioslave/media/kcmodule/managermodule.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -1,5 +1,6 @@ /* This file is part of the KDE Project Copyright (c) 2005 Kvin Ottens + Copyright (c) 2006 Valentine Sinitsyn This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -20,9 +21,13 @@ #include "managermodule.h" +#include #include #include +#include #include +#include +#include #include #include "managermoduleview.h" @@ -31,7 +36,7 @@ ManagerModule::ManagerModule( TQWidget* parent, const char* name ) : KCModule( parent, name ) { - ManagerModuleView *view = new ManagerModuleView( this ); + view = new ManagerModuleView( this ); addConfig( MediaManagerSettings::self(), view ); @@ -49,12 +54,87 @@ #endif view->kcfg_CdPollingEnabled->setEnabled( false ); + connect( view->option_automount, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_ro, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_quiet, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_flush, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_uid, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_utf8, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_sync, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_atime, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_shortname, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_journaling, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) ); + load(); +} + + +void ManagerModule::load() +{ + KCModule::load(); + + KConfig config("mediamanagerrc"); + config.setGroup("DefaultOptions"); + + view->option_automount->setChecked( config.readBoolEntry("automount", false) ); + view->option_ro->setChecked( config.readBoolEntry("ro", false) ); + view->option_quiet->setChecked( config.readBoolEntry("quiet", false) ); + if (config.hasKey("flush")) + view->option_flush->setChecked( config.readBoolEntry("flush") ); + else + view->option_flush->setNoChange(); + view->option_uid->setChecked( config.readBoolEntry("uid", true) ); + view->option_utf8->setChecked( config.readBoolEntry("utf8", true) ); + if (config.hasKey("sync")) + view->option_sync->setChecked( config.readBoolEntry("sync") ); + else + view->option_sync->setNoChange(); + if (config.hasKey("atime")) + view->option_atime->setChecked( config.readBoolEntry("atime") ); + else + view->option_atime->setNoChange(); + + QString value; + + value = config.readEntry("shortname", "lower").lower(); + for (int i = 0; i < view->option_shortname->count(); i++) + if (view->option_shortname->text(i).lower() == value) view->option_shortname->setCurrentItem(i); + + value = config.readEntry("journaling", "ordered").lower(); + for (int i = 0; i < view->option_journaling->count(); i++) + if (view->option_journaling->text(i).lower() == value) view->option_journaling->setCurrentItem(i); + + rememberSettings(); } void ManagerModule::save() { KCModule::save(); + + KConfig config("mediamanagerrc"); + config.setGroup("DefaultOptions"); + + config.writeEntry("automount", view->option_automount->isChecked()); + config.writeEntry("ro", view->option_ro->isChecked()); + config.writeEntry("quiet", view->option_quiet->isChecked()); + if (view->option_flush->state() == TQButton::NoChange) + config.deleteEntry("flush"); + else + config.writeEntry("flush", view->option_flush->isChecked()); + config.writeEntry("uid", view->option_uid->isChecked()); + config.writeEntry("utf8", view->option_utf8->isChecked()); + if (view->option_sync->state() == TQButton::NoChange) + config.deleteEntry("sync"); + else + config.writeEntry("sync", view->option_sync->isChecked()); + if (view->option_atime->state() == TQButton::NoChange) + config.deleteEntry("atime"); + else + config.writeEntry("atime", view->option_atime->isChecked()); + config.writeEntry("journaling", view->option_journaling->currentText().lower()); + config.writeEntry("shortname", view->option_shortname->currentText().lower()); + + rememberSettings(); //Well... reloadBackends is buggy with HAL, it seems to be linked //to a bug in the unmaintained Qt3 DBUS binding ;-/ @@ -70,5 +150,64 @@ notifier.FilesAdded( "media:/" ); } +void ManagerModule::defaults() +{ + KCModule::defaults(); + + view->option_automount->setChecked(false); + view->option_ro->setChecked(false); + view->option_quiet->setChecked(false); + view->option_flush->setNoChange(); + view->option_uid->setChecked(true); + view->option_utf8->setChecked(true); + view->option_sync->setNoChange(); + view->option_atime->setNoChange(); + view->option_journaling->setCurrentItem(1); + view->option_shortname->setCurrentItem(0); +} + +void ManagerModule::rememberSettings() +{ + TQObjectList *options = view->queryList(0, "^option_"); + TQObject *current = 0; + TQObjectListIterator it(*options); + + settings.clear(); + while ( (current = it.current()) != 0 ) { + if (current->isA("TQCheckBox")) + settings[current] = ((TQCheckBox *)current)->state(); + else if (current->isA("TQComboBox")) + settings[current] = ((TQComboBox *)current)->currentItem(); + ++it; + } + delete options; + +} + +void ManagerModule::emitChanged() +{ + TQObjectList *options = view->queryList(0, "^option_"); + TQObject *current = 0; + TQObjectListIterator it(*options); + int value = -1; + bool somethingChanged = false; + + while ( (current = it.current()) != 0 ) { + if (current->isA("TQCheckBox")) + value = ((TQCheckBox *)current)->state(); + else if (current->isA("TQComboBox")) + value = ((TQComboBox *)current)->currentItem(); + + if (settings[current] != value) { + somethingChanged = true; + break; + } + + ++it; + } + delete options; + + emit changed(somethingChanged); +} #include "managermodule.moc" diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/kcmodule/managermodule.h v3.5.13-sru/kioslave/media/kcmodule/managermodule.h --- /tmp/stable//kdebase/kioslave/media/kcmodule/managermodule.h 2010-08-13 00:37:22.000000000 +0200 +++ v3.5.13-sru/kioslave/media/kcmodule/managermodule.h 2012-09-08 19:41:29.000000000 +0200 @@ -1,5 +1,6 @@ /* This file is part of the KDE Project Copyright (c) 2005 Kvin Ottens + Copyright (c) 2006 Valentine Sinitsyn This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -19,8 +20,11 @@ #ifndef _MANAGERMODULE_H_ #define _MANAGERMODULE_H_ +#include #include +class ManagerModuleView; + class ManagerModule : public KCModule { Q_OBJECT @@ -28,7 +32,18 @@ public: ManagerModule( TQWidget* parent = 0, const char* name = 0); + void load(); void save(); + void defaults(); + +private: + void rememberSettings(); + + ManagerModuleView *view; + TQMap settings; + +private slots: + void emitChanged(); }; #endif diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/kcmodule/managermoduleview.ui v3.5.13-sru/kioslave/media/kcmodule/managermoduleview.ui --- /tmp/stable//kdebase/kioslave/media/kcmodule/managermoduleview.ui 2011-03-12 07:57:54.000000000 +0100 +++ v3.5.13-sru/kioslave/media/kcmodule/managermoduleview.ui 2012-09-08 19:41:29.000000000 +0200 @@ -12,6 +12,9 @@ 480 + + ManagerModuleView + unnamed @@ -49,6 +52,245 @@ Select this if you want to enable application autostart after mounting a device. + + + groupbox_mount + + + Mount options + + + + unnamed + + + + textLabel3 + + + Here you can specify default mount options for your storage media. Please note that some options are not supported for certain filesystems and/or medium. You will be able to redefine all these options on per-volume basis later, using Properties dialog of the corresponding volume.<br> +Some of the options are tristate. Leave them "undefined" to let KDE choose the best value depending on your media. + + + WordBreak|AlignVCenter + + + + + layout30 + + + + unnamed + + + + option_ro + + + Read only + + + By default, mount all file systems read-only. + + + + + option_uid + + + Mount as user + + + Mount this file system as user. + + + + + option_flush + + + Flushed IO + + + true + + + Always flush all data to the hot plug devices immediately and don't cache it. + + + + + option_sync + + + Synchronous + + + true + + + All I/O to the file system should be done synchronously. + + + + + option_quiet + + + Quiet + + + Attempts to chown or chmod files do not return errors, although they fail. Use with caution! + + + + + option_utf8 + + + UTF-8 charset + + + UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option. + + + + + layout29 + + + + unnamed + + + + text_shortname + + + Short names: + + + option_shortname + + + <h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> + +<h3><b>Lower</b></h3> +Force the short name to lower case upon display; store a long name when the short name is not all upper case. + +<h3><b>Windows 95</b></h3> +Force the short name to upper case upon display; store a long name when the short name is not all upper case. + +<h3><b>Windows NT</b></h3> +Display the shortname as is; store a long name when the short name is not all lower case or all upper case. + +<h3><b>Mixed</b></h3> +Display the short name as is; store a long name when the short name is not all upper case. + + + + + + All Data + + + + + Ordered + + + + + Writeback + + + + option_journaling + + + 1 + + + + + text_journaling + + + Journaling: + + + option_journaling + + + <h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> + +<h3><b>All Data</b></h3> + All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. + +<h3><b>Ordered</b></h3> + All data is forced directly out to the main file system prior to its metadata being committed to the journal. + +<h3><b>Write Back</b></h3> + Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery. + + + + + + Lower + + + + + Windows 95 + + + + + Windows NT + + + + + Mixed + + + + option_shortname + + + + + + + option_automount + + + Mount automatically + + + By default, mount all file systems automatically. + + + + + option_atime + + + Access time updates + + + true + + + Update inode access time for each access. + + + + + + spacer1 @@ -59,14 +301,43 @@ Expanding - + 21 - 360 + 130 + + + kcfg_HalBackendEnabled + toggled(bool) + groupbox_mount + setEnabled(bool) + + + + kcfg_HalBackendEnabled + kcfg_CdPollingEnabled + kcfg_AutostartEnabled + option_automount + option_ro + option_quiet + option_sync + option_atime + option_flush + option_utf8 + option_uid + option_journaling + option_shortname + + + managermoduleview.ui.h + + + init() + diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/kcmodule/notifiermodule.cpp v3.5.13-sru/kioslave/media/kcmodule/notifiermodule.cpp --- /tmp/stable//kdebase/kioslave/media/kcmodule/notifiermodule.cpp 2011-08-11 07:25:34.000000000 +0200 +++ v3.5.13-sru/kioslave/media/kcmodule/notifiermodule.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -159,7 +159,7 @@ if ( value == TQDialog::Accepted ) { - m_settings.tqaddAction( action ); + m_settings.addAction( action ); updateListBox(); emit changed( true ); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/kcmodule/notifiermodule.h v3.5.13-sru/kioslave/media/kcmodule/notifiermodule.h --- /tmp/stable//kdebase/kioslave/media/kcmodule/notifiermodule.h 2010-08-13 00:37:22.000000000 +0200 +++ v3.5.13-sru/kioslave/media/kcmodule/notifiermodule.h 2012-09-08 19:41:29.000000000 +0200 @@ -1,6 +1,6 @@ /* This file is part of the KDE Project Copyright (c) 2005 Jean-Remy Falleri - Copyright (c) 2005 Kvin Ottens + Copyright (c) 2005 K�vin Ottens This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -21,6 +21,7 @@ #define _NOTIFIERMODULE_H_ #include +#include #include "notifiersettings.h" #include "notifiermoduleview.h" diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/kcmodule/notifiermoduleview.ui v3.5.13-sru/kioslave/media/kcmodule/notifiermoduleview.ui --- /tmp/stable//kdebase/kioslave/media/kcmodule/notifiermoduleview.ui 2011-03-12 07:57:54.000000000 +0100 +++ v3.5.13-sru/kioslave/media/kcmodule/notifiermoduleview.ui 2012-09-08 19:41:29.000000000 +0200 @@ -138,7 +138,7 @@ Expanding - + 70 101 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/kcmodule/serviceview.ui v3.5.13-sru/kioslave/media/kcmodule/serviceview.ui --- /tmp/stable//kdebase/kioslave/media/kcmodule/serviceview.ui 2011-03-12 07:57:54.000000000 +0100 +++ v3.5.13-sru/kioslave/media/kcmodule/serviceview.ui 2012-09-08 19:41:29.000000000 +0200 @@ -20,7 +20,7 @@ 0 - + 640 480 @@ -80,13 +80,13 @@ 0 - + 40 40 - + 40 40 @@ -117,7 +117,7 @@ Minimum - + 20 20 @@ -147,7 +147,7 @@ Minimum - + 20 21 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/kfile-plugin/kfilemediaplugin.cpp v3.5.13-sru/kioslave/media/kfile-plugin/kfilemediaplugin.cpp --- /tmp/stable//kdebase/kioslave/media/kfile-plugin/kfilemediaplugin.cpp 2011-03-12 07:57:54.000000000 +0100 +++ v3.5.13-sru/kioslave/media/kfile-plugin/kfilemediaplugin.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -140,7 +140,7 @@ group = appendGroup(info, "mediumSummary"); - appendItem(group, "percent", TQString("%1%").tqarg(percent)); + appendItem(group, "percent", TQString("%1%").arg(percent)); TQPixmap bar(150, 20); TQPainter p(&bar); @@ -148,9 +148,9 @@ p.fillRect(0, 0, length, 20, Qt::red); p.fillRect(length, 0, 150-length, 20, Qt::green); - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); - TQApplication::tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &p, + TQApplication::style().tqdrawPrimitive(TQStyle::PE_Panel, &p, TQRect(0, 0, 150, 20), cg, TQStyle::Style_Sunken); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/libmediacommon/notifiersettings.cpp v3.5.13-sru/kioslave/media/libmediacommon/notifiersettings.cpp --- /tmp/stable//kdebase/kioslave/media/libmediacommon/notifiersettings.cpp 2011-08-11 07:25:34.000000000 +0200 +++ v3.5.13-sru/kioslave/media/libmediacommon/notifiersettings.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -109,7 +109,7 @@ return result; } -bool NotifierSettings::tqaddAction( NotifierServiceAction *action ) +bool NotifierSettings::addAction( NotifierServiceAction *action ) { if ( !m_idMap.contains( action->id() ) ) { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/libmediacommon/notifiersettings.h v3.5.13-sru/kioslave/media/libmediacommon/notifiersettings.h --- /tmp/stable//kdebase/kioslave/media/libmediacommon/notifiersettings.h 2011-03-12 07:57:53.000000000 +0100 +++ v3.5.13-sru/kioslave/media/libmediacommon/notifiersettings.h 2012-09-08 19:41:29.000000000 +0200 @@ -36,7 +36,7 @@ TQValueList actions(); TQValueList actionsForMimetype( const TQString &mimetype ); - bool tqaddAction( NotifierServiceAction *action ); + bool addAction( NotifierServiceAction *action ); bool deleteAction( NotifierServiceAction *action ); void setAutoAction( const TQString &mimetype, NotifierAction *action ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/mediamanager/CMakeLists.txt v3.5.13-sru/kioslave/media/mediamanager/CMakeLists.txt --- /tmp/stable//kdebase/kioslave/media/mediamanager/CMakeLists.txt 2011-08-28 02:02:07.000000000 +0200 +++ v3.5.13-sru/kioslave/media/mediamanager/CMakeLists.txt 2012-09-08 19:41:29.000000000 +0200 @@ -20,6 +20,7 @@ ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ${HAL_INCLUDE_DIRS} + ${DBUS_TQT_INCLUDE_DIRS} ) link_directories( diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/mediamanager/halbackend.cpp v3.5.13-sru/kioslave/media/mediamanager/halbackend.cpp --- /tmp/stable//kdebase/kioslave/media/mediamanager/halbackend.cpp 2011-08-30 22:53:58.000000000 +0200 +++ v3.5.13-sru/kioslave/media/mediamanager/halbackend.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -1,5 +1,6 @@ /* This file is part of the KDE Project Copyright (c) 2004-2005 Jérôme Lodewyck + Copyright (c) 2006 Valentine Sinitsyn This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -56,9 +57,7 @@ { char* _ppt_string; TQString _ppt_QString; - DBusError error; - dbus_error_init(&error); - _ppt_string = libhal_device_get_property_string(ctx, udi, key, &error); + _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); if ( _ppt_string ) _ppt_QString = _ppt_string; libhal_free_string(_ppt_string); @@ -447,7 +446,7 @@ void HALBackend::ResetProperties(const char* mediumUdi, bool allowNotification) { kdDebug(1219) << "HALBackend::setProperties" << endl; - if ( TQString::tqfromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) + if ( TQString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) { const Medium *cmedium = m_mediaList.findById(mediumUdi); if ( cmedium ) @@ -873,6 +872,33 @@ s_HALBackend->DeviceCondition(udi, condition_name); } +TQStringList HALBackend::getHALmountoptions(TQString udi) +{ + const char* _ppt_string; + LibHalVolume* volume; + LibHalDrive* drive; + + TQString _ppt_TQString; + + volume = libhal_volume_from_udi( m_halContext, udi.latin1() ); + if( volume ) + drive = libhal_drive_from_udi( m_halContext, libhal_volume_get_storage_device_udi( volume ) ); + else + drive = libhal_drive_from_udi( m_halContext, udi.latin1() ); + + if( !drive ) + return TQString::null; + + if( volume ) + _ppt_string = libhal_volume_policy_get_mount_options ( drive, volume, NULL ); + else + _ppt_string = libhal_drive_policy_get_mount_options ( drive, NULL ); + + _ppt_TQString = TQString(_ppt_string ? _ppt_string : ""); + + return TQStringList::split(",",_ppt_TQString); +} + TQStringList HALBackend::mountoptions(const TQString &name) { const Medium* medium = m_mediaList.findById(name); @@ -902,7 +928,16 @@ } KConfig config("mediamanagerrc"); - config.setGroup(name); + + bool use_defaults = true; + if (config.hasGroup(name)) + { + config.setGroup(name); + use_defaults = config.readBoolEntry("use_defaults", false); + } + + if (use_defaults) + config.setGroup("DefaultOptions"); char ** array = libhal_device_get_property_strlist(m_halContext, volume_udi.latin1(), "volume.mount.valid_options", NULL); TQMap valids; @@ -917,6 +952,8 @@ libhal_free_string_array(array); TQStringList result; TQString tmp; + + result << TQString("use_defaults=%1").arg(use_defaults ? "true" : "false"); TQString fstype = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "volume.fstype"); if (fstype.isNull()) @@ -929,9 +966,18 @@ removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); - config.setGroup(drive_udi); - bool value = config.readBoolEntry("automount", false); - config.setGroup(name); + bool value; + if (use_defaults) + { + value = config.readBoolEntry("automount", false); + } + else + { + QString current_group = config.group(); + config.setGroup(drive_udi); + value = config.readBoolEntry("automount", false); + config.setGroup(current_group); + } if (libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_blank", NULL) || libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_vcd", NULL) @@ -1056,7 +1102,7 @@ TQMap valids = MediaManagerUtils::splitOptions(options); - const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; + const char *names[] = { "use_defaults", "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; for (int index = 0; names[index]; ++index) if (valids.contains(names[index])) config.writeEntry(names[index], valids[names[index]] == "true"); @@ -1472,10 +1518,26 @@ soptions << TQString("data=ordered"); } + TQStringList hal_mount_options = getHALmountoptions(medium->id()); + for (TQValueListIterator it=hal_mount_options.begin();it!=hal_mount_options.end();it++) + { + soptions << *it; + kdDebug()<<"HALOption: "<<*it<halBackendEnabled() ) { + m_mediaList.blockSignals(false); m_halbackend = new HALBackend(m_mediaList, this); if (m_halbackend->InitHal()) { @@ -97,6 +98,7 @@ { delete m_halbackend; m_halbackend = 0; + m_mediaList.blockSignals(true); } } #endif // COMPILE_HALBACKEND diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/medianotifier/notificationdialog.cpp v3.5.13-sru/kioslave/media/medianotifier/notificationdialog.cpp --- /tmp/stable//kdebase/kioslave/media/medianotifier/notificationdialog.cpp 2011-03-12 07:57:53.000000000 +0100 +++ v3.5.13-sru/kioslave/media/medianotifier/notificationdialog.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -53,7 +53,7 @@ updateActionsListBox(); - resize( TQSize(400,400).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize(400,400).expandedTo( minimumSizeHint() ) ); m_actionWatcher = new KDirWatch(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/medianotifier/notificationdialogview.ui v3.5.13-sru/kioslave/media/medianotifier/notificationdialogview.ui --- /tmp/stable//kdebase/kioslave/media/medianotifier/notificationdialogview.ui 2011-03-12 07:57:53.000000000 +0100 +++ v3.5.13-sru/kioslave/media/medianotifier/notificationdialogview.ui 2012-09-08 19:41:29.000000000 +0200 @@ -42,13 +42,13 @@ 0 - + 64 64 - + 64 64 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/mounthelper/decryptdialog.ui v3.5.13-sru/kioslave/media/mounthelper/decryptdialog.ui --- /tmp/stable//kdebase/kioslave/media/mounthelper/decryptdialog.ui 2011-03-12 07:57:54.000000000 +0100 +++ v3.5.13-sru/kioslave/media/mounthelper/decryptdialog.ui 2012-09-08 19:41:29.000000000 +0200 @@ -55,13 +55,13 @@ 0 - + 48 48 - + 32 32 @@ -70,7 +70,7 @@ true - + AlignTop @@ -84,7 +84,7 @@ Expanding - + 31 41 @@ -109,7 +109,7 @@ <p><b>%1</b> is an encrypted storage device.</p> <p>Please enter the password to decrypt the storage device.</p> - + WordBreak|AlignTop @@ -189,7 +189,7 @@ - + WordBreak|AlignTop diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/propsdlgplugin/propertiespage.cpp v3.5.13-sru/kioslave/media/propsdlgplugin/propertiespage.cpp --- /tmp/stable//kdebase/kioslave/media/propsdlgplugin/propertiespage.cpp 2011-08-11 07:25:34.000000000 +0200 +++ v3.5.13-sru/kioslave/media/propsdlgplugin/propertiespage.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -140,12 +140,23 @@ option_automount->setChecked(options["automount"] == "true"); connect( option_automount, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); + bool has_groupbox_specific = true; if (!options.contains("journaling") && !options.contains("shortname") && !options.contains("uid") && !options.contains("utf8") && - !options.contains("flush")) + !options.contains("flush")) { groupbox_specific->hide(); + has_groupbox_specific = false; + } + + // The order is important - we want groupboxes to hide automatically depending on use_defaults + // but don't want to emit changed() until user actually changes something. + connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_generic, SLOT( setHidden(bool) ) ); + if (has_groupbox_specific) + connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_specific, SLOT( setHidden(bool) ) ); + option_defaults->setChecked(options["use_defaults"] == "true"); + connect( option_defaults, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); } else { @@ -198,6 +209,7 @@ } result << TQString("mountpoint=%1").arg(mp); result << TQString("automount=%1").arg(option_automount->isChecked() ? "true" : "false"); + result << TQString("use_defaults=%1").arg(option_defaults->isChecked() ? "true" : "false"); kdDebug() << result << endl; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/media/propsdlgplugin/propertiespagegui.ui v3.5.13-sru/kioslave/media/propsdlgplugin/propertiespagegui.ui --- /tmp/stable//kdebase/kioslave/media/propsdlgplugin/propertiespagegui.ui 2011-03-26 05:26:22.000000000 +0100 +++ v3.5.13-sru/kioslave/media/propsdlgplugin/propertiespagegui.ui 2012-09-08 19:41:29.000000000 +0200 @@ -8,207 +8,207 @@ 0 0 - 527 - 476 + 219 + 446 - + + PropertiesPageGUI + + unnamed - - 0 - - + + + option_defaults + + + Use default mount options + + + - layout17 + groupbox_generic + + + Generic Mount Options unnamed - + - groupbox_generic - - - Generic Mount Options + layout15 unnamed + + + option_ro + + + Read only + + + Mount the file system read-only. + + + + + option_quiet + + + Quiet + + + Attempts to chown or chmod files do not return errors, although they fail. Use with caution! + + + + + option_sync + + + Synchronous + + + All I/O to the file system should be done synchronously. + + + + + option_atime + + + Access time updates + + + Update inode access time for each access. + + - layout15 + layout14 - + unnamed - - - option_ro - - - Read only - - - Mount the file system read-only. - - - - - option_quiet - - - Quiet - - - Attempts to chown or chmod files do not return errors, although they fail. Use with caution! - - - + - option_sync + textLabel3 - Synchronous - - - All I/O to the file system should be done synchronously. + Mountpoint: - - - - option_atime - - - Access time updates + + option_mountpoint - Update inode access time for each access. + Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist. - + - layout14 - - - - unnamed - - - - textLabel3 - - - Mountpoint: - - - option_mountpoint - - - Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist. - - - - - option_mountpoint - - - - - - - - - - option_automount + option_mountpoint - Mount automatically - - - Mount this file system automatically. + - + + + + + option_automount + + + Mount automatically + + + Mount this file system automatically. + - + + + + + groupbox_specific + + + Filesystem Specific Mount Options + + + + unnamed + + - groupbox_specific - - - Filesystem Specific Mount Options + layout11 unnamed + + + option_flush + + + Flushed IO + + + Always flush all data to the hot plug devices immediately and don't cache it. + + + + + option_utf8 + + + UTF-8 charset + + + UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option. + + + + + option_uid + + + Mount as user + + + Mount this file system as user. + + - layout11 + layout7 - + unnamed - + - option_flush + text_journaling - Flushed IO - - - Always flush all data to the hot plug devices immediately and don't cache it. - - - - - option_utf8 - - - UTF-8 charset - - - UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option. - - - - - option_uid + Journaling: - - Mount as user + + option_journaling - Mount this file system as user. - - - - - layout7 - - - - unnamed - - - - text_journaling - - - Journaling: - - - option_journaling - - - <h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> + <h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> <h3><b>All Data</b></h3> All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. @@ -218,29 +218,29 @@ <h3><b>Write Back</b></h3> Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery. - - - - - - All Data - - - - - Ordered - - - - - Write Back - - - - option_journaling - - - <h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> + + + + + + All Data + + + + + Ordered + + + + + Write Back + + + + option_journaling + + + <h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> <h3><b>All Data</b></h3> All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. @@ -250,30 +250,30 @@ <h3><b>Write Back</b></h3> Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery. - - - + - + + + + + layout14 + + + + unnamed + + - layout14 + text_shortname - - - unnamed - - - - text_shortname - - - Short names: - - - option_shortname - - - <h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> + + Short names: + + + option_shortname + + + <h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> <h3><b>Lower</b></h3> Force the short name to lower case upon display; store a long name when the short name is not all upper case. @@ -286,34 +286,34 @@ <h3><b>Mixed</b></h3> Display the short name as is; store a long name when the short name is not all upper case. - - - - - - Lower - - - - - Windows 95 - - - - - Windows NT - - - - - Mixed - - - - option_shortname - - - <h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> + + + + + + Lower + + + + + Windows 95 + + + + + Windows NT + + + + + Mixed + + + + option_shortname + + + <h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> <h3><b>Lower</b></h3> Force the short name to lower case upon display; store a long name when the short name is not all upper case. @@ -326,42 +326,40 @@ <h3><b>Mixed</b></h3> Display the short name as is; store a long name when the short name is not all upper case. - - - + - + - - - label_filesystem - - - Filesystem: iso9660 - - - - - spacer1 - - - Vertical - - - Expanding - - - - 20 - 20 - - - - + + + label_filesystem + + + Filesystem: iso9660 + + + + + spacer1 + + + Vertical + + + Expanding + + + + 20 + 20 + + + + diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/nfs/kio_nfs.cpp v3.5.13-sru/kioslave/nfs/kio_nfs.cpp --- /tmp/stable//kdebase/kioslave/nfs/kio_nfs.cpp 2011-08-16 01:07:51.000000000 +0200 +++ v3.5.13-sru/kioslave/nfs/kio_nfs.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -807,7 +807,7 @@ struct passwd *user = getpwuid( uid ); if ( user ) { - m_usercache.insert( uid, new TQString(TQString::tqfromLatin1(user->pw_name)) ); + m_usercache.insert( uid, new TQString(TQString::fromLatin1(user->pw_name)) ); atom.m_str = user->pw_name; } else @@ -825,7 +825,7 @@ struct group *grp = getgrgid( gid ); if ( grp ) { - m_groupcache.insert( gid, new TQString(TQString::tqfromLatin1(grp->gr_name)) ); + m_groupcache.insert( gid, new TQString(TQString::fromLatin1(grp->gr_name)) ); atom.m_str = grp->gr_name; } else diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/pop3/pop3.cc v3.5.13-sru/kioslave/pop3/pop3.cc --- /tmp/stable//kdebase/kioslave/pop3/pop3.cc 2011-08-11 07:25:35.000000000 +0200 +++ v3.5.13-sru/kioslave/pop3/pop3.cc 2012-09-08 19:41:29.000000000 +0200 @@ -242,8 +242,8 @@ QMIN(r_len, (buf[4] == ' ' ? recv_len - 5 : recv_len - 4))); } - TQString command = TQString::tqfromLatin1(cmd); - TQString serverMsg = TQString::tqfromLatin1(buf).mid(5).stripWhiteSpace(); + TQString command = TQString::fromLatin1(cmd); + TQString serverMsg = TQString::fromLatin1(buf).mid(5).stripWhiteSpace(); if (command.left(4) == "PASS") { command = i18n("PASS "); @@ -353,7 +353,7 @@ { char buf[512]; - TQString apop_string = TQString::tqfromLatin1("APOP "); + TQString apop_string = TQString::fromLatin1("APOP "); if (m_sUser.isEmpty() || m_sPass.isEmpty()) { // Prompt for usernames if (!openPassDlg(ai)) { @@ -461,7 +461,7 @@ { #ifdef HAVE_LIBSASL2 char buf[512]; - TQString sasl_buffer = TQString::tqfromLatin1("AUTH"); + TQString sasl_buffer = TQString::fromLatin1("AUTH"); int result; sasl_conn_t *conn = NULL; @@ -525,13 +525,13 @@ TQByteArray challenge, tmp; - TQString firstCommand = "AUTH " + TQString::tqfromLatin1( mechusing ); + TQString firstCommand = "AUTH " + TQString::fromLatin1( mechusing ); challenge.setRawData( out, outlen ); KCodecs::base64Encode( challenge, tmp ); challenge.resetRawData( out, outlen ); if ( !tmp.isEmpty() ) { firstCommand += " "; - firstCommand += TQString::tqfromLatin1( tmp.data(), tmp.size() ); + firstCommand += TQString::fromLatin1( tmp.data(), tmp.size() ); } challenge.resize( 2049 ); @@ -624,7 +624,7 @@ m_sOldUser = m_sUser; m_sOldPass = m_sPass; - TQString one_string = TQString::tqfromLatin1("USER "); + TQString one_string = TQString::fromLatin1("USER "); one_string.append( m_sUser ); if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) { @@ -638,7 +638,7 @@ return false; } - one_string = TQString::tqfromLatin1("PASS "); + one_string = TQString::fromLatin1("PASS "); one_string.append(m_sPass); if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) { @@ -857,7 +857,7 @@ TQString cmd, path = url.path(); int maxCommands = (metaData("pipelining") == "on") ? MAX_COMMANDS : 1; - if (path.tqat(0) == '/') + if (path.at(0) == '/') path.remove(0, 1); if (path.isEmpty()) { POP3_DEBUG << "We should be a dir!!" << endl; @@ -1176,7 +1176,7 @@ uds_url.setUser(m_sUser); uds_url.setPass(m_sPass); uds_url.setHost(m_sServer); - uds_url.setPath(TQString::tqfromLatin1("/download/%1").arg(i + 1)); + uds_url.setPath(TQString::fromLatin1("/download/%1").arg(i + 1)); atom.m_str = uds_url.url(); atom.m_long = 0; entry.append(atom); @@ -1207,7 +1207,7 @@ { TQString _path = url.path(); - if (_path.tqat(0) == '/') + if (_path.at(0) == '/') _path.remove(0, 1); UDSEntry entry; @@ -1244,7 +1244,7 @@ } TQString _path = url.path(); - if (_path.tqat(0) == '/') { + if (_path.at(0) == '/') { _path.remove(0, 1); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/settings/kio_settings.cc v3.5.13-sru/kioslave/settings/kio_settings.cc --- /tmp/stable//kdebase/kioslave/settings/kio_settings.cc 2011-03-12 07:57:56.000000000 +0100 +++ v3.5.13-sru/kioslave/settings/kio_settings.cc 2012-09-08 19:41:29.000000000 +0200 @@ -127,7 +127,7 @@ kdDebug() << "Trying harder to find group " << relPath << endl; for (unsigned int i=0; iname().tqat(0) == '.')) + if ((g->name().at(0) == '.')) continue; TQString relPath = g->relPath(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/sftp/kio_sftp.cpp v3.5.13-sru/kioslave/sftp/kio_sftp.cpp --- /tmp/stable//kdebase/kioslave/sftp/kio_sftp.cpp 2011-03-12 07:57:57.000000000 +0100 +++ v3.5.13-sru/kioslave/sftp/kio_sftp.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -481,11 +481,7 @@ if( port > 0 ) mPort = port; else { - struct servent *pse; - if( (pse = getservbyname("ssh", "tcp") ) == NULL ) - mPort = 22; - else - mPort = ntohs(pse->s_port); + mPort = -1; } mUsername = user; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/sftp/ksshprocess.cpp v3.5.13-sru/kioslave/sftp/ksshprocess.cpp --- /tmp/stable//kdebase/kioslave/sftp/ksshprocess.cpp 2011-08-11 07:25:38.000000000 +0200 +++ v3.5.13-sru/kioslave/sftp/ksshprocess.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -206,7 +206,7 @@ KSshProcess::KSshProcess() : mVersion(UNKNOWN_VER), mConnected(false), mRunning(false), mConnectState(0) { - mSshPath = KStandardDirs::findExe(TQString::tqfromLatin1("ssh")); + mSshPath = KStandardDirs::findExe(TQString::fromLatin1("ssh")); kdDebug(KSSHPROC) << "KSshProcess::KSshProcess(): ssh path [" << mSshPath << "]" << endl; @@ -292,7 +292,7 @@ return TQString::null; } - return TQString::tqfromLatin1(versionStrs[mVersion]); + return TQString::fromLatin1(versionStrs[mVersion]); } */ @@ -569,7 +569,9 @@ // If we still don't have anything in our buffer so there must // not be anything on the pty or stderr. Setup a select() // to wait for some data from SSH. - if( buffer.empty() ) { + // Hack around select() failure on newer systems + unsigned long milliseconds = 0; + while ((buffer.size() == 0) && (milliseconds < (60*1000))) { //kdDebug(KSSHPROC) << "KSshProcess::getLine(): " << // "Line buffer empty, calling select() to wait for data." << endl; int errfd = ssh.stderrFd(); @@ -616,14 +618,18 @@ // had data on it first. if( FD_ISSET(ptyfd, &rfds) ) { ptyLine = ssh.readLineFromPty(false); - buffer.prepend(TQString(ptyLine)); + if (ptyLine.size() > 0) { + buffer.prepend(TQString(ptyLine)); + } //kdDebug(KSSHPROC) << "KSshProcess::getLine(): " // "line from pty -" << ptyLine << endl; } - + if( FD_ISSET(errfd, &rfds) ) { errLine = ssh.readLineFromStderr(false); - buffer.prepend(TQString(errLine)); + if (errLine.size() > 0) { + buffer.prepend(TQString(errLine)); + } //kdDebug(KSSHPROC) << "KSshProcess::getLine(): " // "line from err -" << errLine << endl; } @@ -637,7 +643,11 @@ kdDebug(KSSHPROC) << "KSshProcess::getLine(): " "Exception on std err file descriptor." << endl; } - + + if (buffer.size() == 0) { + milliseconds++; + usleep(1000); + } } } @@ -776,7 +786,7 @@ i18n("Error encountered while talking to ssh."); mConnectState = STATE_FATAL; } - else if( line.find(TQString::tqfromLatin1(passwordPrompt[mVersion]), 0, false) != -1 ) { + else if( line.find(TQString::fromLatin1(passwordPrompt[mVersion]), 0, false) != -1 ) { mConnectState = STATE_TRY_PASSWD; } else if( line.find(passphrasePrompt[mVersion]) != -1 ) { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/smb/kio_smb_auth.cpp v3.5.13-sru/kioslave/smb/kio_smb_auth.cpp --- /tmp/stable//kdebase/kioslave/smb/kio_smb_auth.cpp 2011-08-11 07:25:35.000000000 +0200 +++ v3.5.13-sru/kioslave/smb/kio_smb_auth.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -121,7 +121,7 @@ int index = share.find('/', 1); if (index > 1) share = share.left(index); - if (share.tqat(0) == '/') + if (share.at(0) == '/') share = share.mid(1); info.url.setPath("/" + share); info.verifyPath = true; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/smb/kio_smb_browse.cpp v3.5.13-sru/kioslave/smb/kio_smb_browse.cpp --- /tmp/stable//kdebase/kioslave/smb/kio_smb_browse.cpp 2011-08-11 07:25:35.000000000 +0200 +++ v3.5.13-sru/kioslave/smb/kio_smb_browse.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -199,7 +199,7 @@ if (surl.length() == 5) // just the above return kurl; // unchanged - if (surl.tqat(5) != '/') { + if (surl.at(5) != '/') { surl = "smb://" + surl.mid(5); kdDebug(KIO_SMB) << "checkURL return1 " << surl << " " << KURL(surl) << endl; return KURL(surl); @@ -349,7 +349,7 @@ TQString comment = TQString::fromUtf8( dirp->comment ); if ( dirp->smbc_type == SMBC_SERVER || dirp->smbc_type == SMBC_WORKGROUP ) { atom.m_str = dirpName.lower(); - atom.m_str.tqat( 0 ) = dirpName.tqat( 0 ).upper(); + atom.m_str.at( 0 ) = dirpName.at( 0 ).upper(); if ( !comment.isEmpty() && dirp->smbc_type == SMBC_SERVER ) atom.m_str += " (" + comment + ")"; } else @@ -409,7 +409,7 @@ udsentry.append(atom); atom.m_uds = KIO::UDS_MIME_TYPE; - atom.m_str = TQString::tqfromLatin1("application/x-smb-server"); + atom.m_str = TQString::fromLatin1("application/x-smb-server"); udsentry.append(atom); } @@ -429,7 +429,7 @@ udsentry.append(atom); atom.m_uds = KIO::UDS_MIME_TYPE; - atom.m_str = TQString::tqfromLatin1("application/x-smb-workgroup"); + atom.m_str = TQString::fromLatin1("application/x-smb-workgroup"); udsentry.append(atom); atom.m_uds = KIO::UDS_URL; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/smb/kio_smb_mount.cpp v3.5.13-sru/kioslave/smb/kio_smb_mount.cpp --- /tmp/stable//kdebase/kioslave/smb/kio_smb_mount.cpp 2011-08-11 07:25:35.000000000 +0200 +++ v3.5.13-sru/kioslave/smb/kio_smb_mount.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -54,8 +54,8 @@ TQString share,host; if (sl.count()>=2) { - host=(*sl.tqat(0)).mid(2); - share=(*sl.tqat(1)); + host=(*sl.at(0)).mid(2); + share=(*sl.at(1)); kdDebug(KIO_SMB)<<"special() host -"<< host <<"- share -" << share <<"-"< 127 ) return false; + if ( s[i].unicode() > 127 ) return false; return true; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/system/entries/documents.desktop v3.5.13-sru/kioslave/system/entries/documents.desktop --- /tmp/stable//kdebase/kioslave/system/entries/documents.desktop 2010-09-24 08:36:47.000000000 +0200 +++ v3.5.13-sru/kioslave/system/entries/documents.desktop 2012-09-08 19:41:29.000000000 +0200 @@ -1,69 +1,58 @@ [Desktop Entry] Type=Link -Path=$( kxdglauncher --getpath --xdgname DOCUMENTS ) +URL=$( kxdglauncher --getpath --xdgname DOCUMENTS ) Icon=folder_man Name=Documents Folder Name[af]=Dokument Gids -Name[ar]=مستنداتي +Name[ar]=مستنداتي Name[be]=Тэчка для дакументаў Name[bg]=Директория с документи Name[bn]=ডকুমেন্ট ফোল্ডার -Name[br]=Renkell an teulioù +Name[br]=Renkell an teulioù Name[bs]=Direktorij dokumenata Name[ca]=Carpeta de documents -Name[cs]=Složka s dokumenty -Name[csb]=Katalog dokùmentów +Name[cs]=Složka s dokumenty +Name[csb]=Katalog dokùmentów Name[da]=Dokumentmappe Name[de]=Dokumente -Name[el]=Φάκελος εγγράφων Name[eo]=Dokumenta dosierujo Name[es]=Carpeta de documentos Name[et]=Dokumentide kataloog Name[eu]=Dokumentuen karpeta -Name[fa]=پوشۀ مستندات +Name[fa]=پوشۀ مستندات Name[fi]=Asiakirjakansio Name[fr]=Dossier des documents Name[fy]=Ofkeppele kamera -Name[ga]=Fillteán na gCáipéisí +Name[ga]=Fillteán na gCáipéisí Name[gl]=Cartafol de Documentos -Name[he]=תיקיית מסמכים Name[hr]=Mapa dokumenata -Name[hu]=Dokumentumok könyvtár +Name[hu]=Dokumentumok könyvtár Name[is]=Skjalamappa Name[it]=Cartella documenti -Name[ja]=ドキュメントフォルダ -Name[ka]=დოკუმენტების დასტა -Name[kk]=Құжаттар қапшығы -Name[km]=ថត​ឯកសារ -Name[ko]=문서 탐색기 -Name[lt]=Dokumentų aplankai -Name[mk]=Папка со документи +Name[ja]=ドキュメントフォルダ +Name[kk]=Құжаттар қапшығы +Name[lt]=Dokumentų aplankai Name[nb]=Dokumentmappe Name[nds]=Dokmenten-Orner -Name[ne]=कागजात फोल्डर Name[nl]=Documenten Name[nn]=Dokumentmappe -Name[pa]=ਦਸਤਾਵੇਜ਼ ਫੋਲਡਰ -Name[pl]=Katalog dokumentów +Name[pa]=ਦਸਤਾਵੇਜ਼ ਫੋਲਡਰ +Name[pl]=Katalog dokumentów Name[pt]=Pasta de Documentos Name[pt_BR]=Pasta de Documentos Name[ro]=Folder documente -Name[ru]=Документы -Name[se]=Dokumeantamáhppa -Name[sk]=Priečinok dokumentov +Name[ru]=Документы +Name[se]=Dokumeantamáhppa Name[sl]=Mapa z dokumenti -Name[sr]=Фасцикла са документима Name[sr@Latn]=Fascikla sa dokumentima Name[sv]=Dokumentkatalog -Name[te]=పత్రాల ఫొల్డర్ -Name[tg]=Ҳуҷҷатҳо -Name[th]=โฟลเดอร์เอกสาร +Name[tg]=Ҳуҷҷатҳо Name[tr]=Belgeler Dizini -Name[uk]=Тека документів +Name[uk]=Тека документів Name[uz]=Hujjatlar jildi -Name[uz@cyrillic]=Ҳужжатлар жилди -Name[vi]=ThÆ° mục Tà i liệu +Name[uz@cyrillic]=Ҳужжатлар жилди +Name[vi]=Thư mục T� i liệu Name[wa]=Ridant documints -Name[zh_CN]=文档文件夹 -Name[zh_TW]=文件目錄 +Name[zh_CN]=文档文件夹 +Name[zh_TW]=文件目錄 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/system/kdedmodule/systemdirnotify.cpp v3.5.13-sru/kioslave/system/kdedmodule/systemdirnotify.cpp --- /tmp/stable//kdebase/kioslave/system/kdedmodule/systemdirnotify.cpp 2011-08-11 07:25:36.000000000 +0200 +++ v3.5.13-sru/kioslave/system/kdedmodule/systemdirnotify.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -36,6 +36,9 @@ void SystemDirNotify::init() { if( mInited ) + // FIXME Work around a probable race condition by inserting printf delay before following + // code is executed -- the root cause of the race needs investigation and resolution. + printf("[systemdirnotify] SystemDirNotify::init(mInited)"); return; mInited = true; KGlobal::dirs()->addResourceType("system_entries", diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/tar/tar.cc v3.5.13-sru/kioslave/tar/tar.cc --- /tmp/stable//kdebase/kioslave/tar/tar.cc 2011-08-11 07:25:36.000000000 +0200 +++ v3.5.13-sru/kioslave/tar/tar.cc 2012-09-08 19:41:29.000000000 +0200 @@ -125,7 +125,7 @@ path.truncate( len - 1 ); } else - path = TQString::tqfromLatin1("/"); + path = TQString::fromLatin1("/"); kdDebug(7109) << "Found. archiveFile=" << archiveFile << " path=" << path << endl; break; } @@ -248,9 +248,9 @@ if ( path.isEmpty() ) { - KURL redir( url.protocol() + TQString::tqfromLatin1( ":/") ); + KURL redir( url.protocol() + TQString::fromLatin1( ":/") ); kdDebug( 7109 ) << "url.path()==" << url.path() << endl; - redir.setPath( url.path() + TQString::tqfromLatin1("/") ); + redir.setPath( url.path() + TQString::fromLatin1("/") ); kdDebug( 7109 ) << "ArchiveProtocol::listDir: redirection " << redir.url() << endl; redirection( redir ); finished(); @@ -360,7 +360,7 @@ const KArchiveEntry* archiveEntry; if ( path.isEmpty() ) { - path = TQString::tqfromLatin1( "/" ); + path = TQString::fromLatin1( "/" ); archiveEntry = root; } else { path = TQString::fromLocal8Bit(remoteEncoding()->encode(path)); @@ -504,7 +504,7 @@ if ( !firstRead ) { bufferSize = kMin( maxSize, fileSize ); - buffer.tqresize( bufferSize, TQGArray::SpeedOptim ); + buffer.resize( bufferSize, TQGArray::SpeedOptim ); } const TQ_LONG read = io->readBlock( buffer.data(), buffer.size() ); // Avoid to use bufferSize here, in case something went wrong. if ( read != bufferSize ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/thumbnail/textcreator.cpp v3.5.13-sru/kioslave/thumbnail/textcreator.cpp --- /tmp/stable//kdebase/kioslave/thumbnail/textcreator.cpp 2011-08-11 07:25:35.000000000 +0200 +++ v3.5.13-sru/kioslave/thumbnail/textcreator.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -158,13 +158,13 @@ } // check for newlines in the text (unix,dos) - TQChar ch = text.tqat( i ); + TQChar ch = text.at( i ); if ( ch == '\n' ) { newLine = true; continue; } - else if ( ch == '\r' && text.tqat(i+1) == '\n' ) + else if ( ch == '\r' && text.at(i+1) == '\n' ) { newLine = true; i++; // skip the next character (\n) as well diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/trash/kio_trash.cpp v3.5.13-sru/kioslave/trash/kio_trash.cpp --- /tmp/stable//kdebase/kioslave/trash/kio_trash.cpp 2011-03-12 07:57:55.000000000 +0100 +++ v3.5.13-sru/kioslave/trash/kio_trash.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -78,10 +78,10 @@ { struct passwd *user = getpwuid( getuid() ); if ( user ) - m_userName = TQString::tqfromLatin1(user->pw_name); + m_userName = TQString::fromLatin1(user->pw_name); struct group *grp = getgrgid( getgid() ); if ( grp ) - m_groupName = TQString::tqfromLatin1(grp->gr_name); + m_groupName = TQString::fromLatin1(grp->gr_name); } TrashProtocol::~TrashProtocol() diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kioslave/trash/trashimpl.cpp v3.5.13-sru/kioslave/trash/trashimpl.cpp --- /tmp/stable//kdebase/kioslave/trash/trashimpl.cpp 2011-08-11 07:25:35.000000000 +0200 +++ v3.5.13-sru/kioslave/trash/trashimpl.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -262,7 +262,7 @@ info += KURL::encode_string( makeRelativePath( topDirectoryPath( trashId ), origPath ), m_mibEnum ).latin1(); info += "\n"; info += "DeletionDate="; - info += TQDateTime::tqcurrentDateTime().toString( Qt::ISODate ).latin1(); + info += TQDateTime::currentDateTime().toString( Qt::ISODate ).latin1(); info += "\n"; size_t sz = info.size() - 1; // avoid trailing 0 from QCString @@ -429,7 +429,7 @@ kdDebug() << k_funcinfo << src << " -> " << dest << endl; if ( ::rename( TQFile::encodeName( src ), TQFile::encodeName( dest ) ) != 0 ) { if (errno == EXDEV) { - error( KIO::ERR_UNSUPPORTED_ACTION, TQString::tqfromLatin1("rename") ); + error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename") ); } else { if (( errno == EACCES ) || (errno == EPERM)) { error( KIO::ERR_ACCESS_DENIED, dest ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/klipper/applet.cpp v3.5.13-sru/klipper/applet.cpp --- /tmp/stable//kdebase/klipper/applet.cpp 2011-03-12 07:58:08.000000000 +0100 +++ v3.5.13-sru/klipper/applet.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -91,7 +91,7 @@ void KlipperApplet::help() { - kapp->invokeHelp(TQString::null, TQString::tqfromLatin1("klipper")); + kapp->invokeHelp(TQString::null, TQString::fromLatin1("klipper")); } void KlipperApplet::about() diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/klipper/clipboardpoll.cpp v3.5.13-sru/klipper/clipboardpoll.cpp --- /tmp/stable//kdebase/klipper/clipboardpoll.cpp 2011-04-04 02:00:41.000000000 +0200 +++ v3.5.13-sru/klipper/clipboardpoll.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -109,8 +109,8 @@ void ClipboardPoll::initPolling() { - connect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged() ), TQT_SLOT(qtSelectionChanged())); - connect( kapp->tqclipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( qtClipboardChanged() )); + connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged() ), TQT_SLOT(qtSelectionChanged())); + connect( kapp->clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( qtClipboardChanged() )); connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( timeout())); timer.start( 1000, false ); selection.atom = XA_PRIMARY; @@ -147,7 +147,7 @@ if( xfixes_event_base != -1 && e->type == xfixes_event_base + XFixesSelectionNotify ) { XFixesSelectionNotifyEvent* ev = reinterpret_cast< XFixesSelectionNotifyEvent* >( e ); - if( ev->selection == XA_PRIMARY && !kapp->tqclipboard()->ownsSelection()) + if( ev->selection == XA_PRIMARY && !kapp->clipboard()->ownsSelection()) { #ifdef NOISY_KLIPPER_ kdDebug() << "SELECTION CHANGED (XFIXES)" << endl; @@ -155,7 +155,7 @@ SET_QT_X_TIME(ev->timestamp); emit clipboardChanged( true ); } - else if( ev->selection == xa_clipboard && !kapp->tqclipboard()->ownsClipboard()) + else if( ev->selection == xa_clipboard && !kapp->clipboard()->ownsClipboard()) { #ifdef NOISY_KLIPPER_ kdDebug() << "CLIPBOARD CHANGED (XFIXES)" << endl; @@ -218,13 +218,13 @@ void ClipboardPoll::timeout() { KlipperWidget::updateTimestamp(); - if( !kapp->tqclipboard()->ownsSelection() && checkTimestamp( selection ) ) { + if( !kapp->clipboard()->ownsSelection() && checkTimestamp( selection ) ) { #ifdef NOISY_KLIPPER_ kdDebug() << "SELECTION CHANGED" << endl; #endif emit clipboardChanged( true ); } - if( !kapp->tqclipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) { + if( !kapp->clipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) { #ifdef NOISY_KLIPPER_ kdDebug() << "CLIPBOARD CHANGED" << endl; #endif diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/klipper/CMakeLists.txt v3.5.13-sru/klipper/CMakeLists.txt --- /tmp/stable//kdebase/klipper/CMakeLists.txt 2011-08-21 09:08:16.000000000 +0200 +++ v3.5.13-sru/klipper/CMakeLists.txt 2012-09-08 19:41:29.000000000 +0200 @@ -27,7 +27,7 @@ install( FILES klipper.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES klipper.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) install( FILES klipper.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) -install( FILES klipper.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME klipperrc ) +install( FILES klipperrc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME klipperrc ) install( FILES klipperrc.upd klippershortcuts.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) install( PROGRAMS klipper-1-2.pl klipper-trinity1.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/klipper/configdialog.cpp v3.5.13-sru/klipper/configdialog.cpp --- /tmp/stable//kdebase/klipper/configdialog.cpp 2011-08-11 07:25:45.000000000 +0200 +++ v3.5.13-sru/klipper/configdialog.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -66,7 +66,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(); @@ -299,13 +299,13 @@ connect( delActionButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDeleteAction() )); TQLabel *label = new TQLabel(i18n("Click on a highlighted item's column to change it. \"%s\" in a command will be replaced with the clipboard contents."), box); - label->tqsetAlignment( WordBreak | AlignLeft | AlignVCenter ); + label->setAlignment( WordBreak | AlignLeft | AlignVCenter ); box->setStretchFactor( label, 5 ); box = new TQHBox( this ); TQPushButton *advanced = new TQPushButton( i18n("Advanced..."), box ); - advanced->setFixedSize( advanced->tqsizeHint() ); + advanced->setFixedSize( advanced->sizeHint() ); connect( advanced, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdvanced() )); (void) new TQWidget( box ); // spacer @@ -410,8 +410,8 @@ AdvancedWidget *widget = new AdvancedWidget( box ); widget->setWMClasses( m_wmClasses ); - dlg.resize( dlg.tqsizeHint().width(), - dlg.tqsizeHint().height() +40); // or we get an ugly scrollbar :( + dlg.resize( dlg.sizeHint().width(), + dlg.sizeHint().height() +40); // or we get an ugly scrollbar :( if ( dlg.exec() == TQDialog::Accepted ) { m_wmClasses = widget->wmClasses(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/klipper/configdialog.h v3.5.13-sru/klipper/configdialog.h --- /tmp/stable//kdebase/klipper/configdialog.h 2011-03-12 07:58:08.000000000 +0100 +++ v3.5.13-sru/klipper/configdialog.h 2012-09-08 19:41:29.000000000 +0200 @@ -237,11 +237,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/klipper/historyitem.cpp v3.5.13-sru/klipper/historyitem.cpp --- /tmp/stable//kdebase/klipper/historyitem.cpp 2011-03-12 07:58:08.000000000 +0100 +++ v3.5.13-sru/klipper/historyitem.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -52,8 +52,8 @@ TQMap metaData; if( KURLDrag::decode( &aSource, urls, metaData )) { // this is from KonqDrag (libkonq) - TQByteArray a = aSource.tqencodedData( "application/x-kde-cutselection" ); - bool cut = !a.isEmpty() && (a.tqat(0) == '1'); // true if 1 + TQByteArray a = aSource.encodedData( "application/x-kde-cutselection" ); + bool cut = !a.isEmpty() && (a.at(0) == '1'); // true if 1 return new HistoryURLItem( urls, metaData, cut ); } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/klipper/popupproxy.cpp v3.5.13-sru/klipper/popupproxy.cpp --- /tmp/stable//kdebase/klipper/popupproxy.cpp 2011-08-11 07:25:45.000000000 +0200 +++ v3.5.13-sru/klipper/popupproxy.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -109,7 +109,7 @@ Q_ASSERT( id != -1 ); // Be sure that the item was inserted. TQMenuItem* mi = proxy_for_menu->findItem( id ); int fontheight = TQFontMetrics( proxy_for_menu->fontMetrics() ).height(); - int itemheight = proxy_for_menu->tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, + int itemheight = proxy_for_menu->style().tqsizeFromContents(TQStyle::CT_PopupMenuItem, proxy_for_menu, TQSize( 0, fontheight ), TQStyleOption(mi,10,0) ).height(); @@ -133,7 +133,7 @@ // discarding any that doesn't match the current filter. // stop when the total number of items equal m_itemsPerMenu; int count = 0; - int remainingHeight = m_menu_height - proxy_for_menu->tqsizeHint().height(); + int remainingHeight = m_menu_height - proxy_for_menu->sizeHint().height(); // Force at least one item to be inserted. remainingHeight = QMAX( remainingHeight, 0 ); for ( const HistoryItem* item = spillPointer.current(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/klipper/toplevel.cpp v3.5.13-sru/klipper/toplevel.cpp --- /tmp/stable//kdebase/klipper/toplevel.cpp 2011-07-09 08:16:55.000000000 +0200 +++ v3.5.13-sru/klipper/toplevel.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -110,7 +110,7 @@ * * Saving history on session save */ - virtual bool commitData( QSessionManager& ) { + virtual bool commitData( TQSessionManager& ) { klipper->saveSession(); return true; } @@ -119,7 +119,7 @@ }; extern bool qt_qclipboard_bailout_hack; -#if KDE_IS_VERSION( 3, 9, 0 ) +#if KDE_IS_VERSION( 15, 0, 0 ) #error Check status of #80072 with Qt4. #endif @@ -142,7 +142,7 @@ updateTimestamp(); // read initial X user time setBackgroundMode( X11ParentRelative ); - clip = kapp->tqclipboard(); + clip = kapp->clipboard(); connect( &m_overflowClearTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotClearOverflow())); m_overflowClearTimer.start( 1000 ); @@ -327,7 +327,7 @@ { Q_ASSERT( menu != 0L ); - TQSize size = menu->tqsizeHint(); // geometry is not valid until it's shown + TQSize size = menu->sizeHint(); // geometry is not valid until it's shown if (bPopupAtMouse) { TQPoint g = TQCursor::pos(); if ( size.height() < g.y() ) @@ -1013,13 +1013,13 @@ // bool KlipperWidget::ignoreClipboardChanges() const { - TQWidget *tqfocusWidget = tqApp->tqfocusWidget(); - if ( tqfocusWidget ) + TQWidget *focusWidget = tqApp->focusWidget(); + if ( focusWidget ) { - if ( tqfocusWidget->inherits( TQSPINBOX_OBJECT_NAME_STRING ) || - (tqfocusWidget->parentWidget() && - tqfocusWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) && - tqfocusWidget->parentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) ) + if ( focusWidget->inherits( TQSPINBOX_OBJECT_NAME_STRING ) || + (focusWidget->parentWidget() && + focusWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) && + focusWidget->parentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) ) { return true; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/klipper/urlgrabber.cpp v3.5.13-sru/klipper/urlgrabber.cpp --- /tmp/stable//kdebase/klipper/urlgrabber.cpp 2011-08-11 07:25:45.000000000 +0200 +++ v3.5.13-sru/klipper/urlgrabber.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -379,7 +379,7 @@ { if ( myMenu && myMenu->isVisible() ) { - if ( myMenu->tqgeometry().contains( TQCursor::pos() ) && + if ( myMenu->geometry().contains( TQCursor::pos() ) && myPopupKillTimeout > 0 ) { myPopupKillTimer->start( 1000 * myPopupKillTimeout, true ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/klipper/urlgrabber.h v3.5.13-sru/klipper/urlgrabber.h --- /tmp/stable//kdebase/klipper/urlgrabber.h 2011-03-12 07:58:08.000000000 +0100 +++ v3.5.13-sru/klipper/urlgrabber.h 2012-09-08 19:41:29.000000000 +0200 @@ -132,7 +132,7 @@ inline bool matches( const TQString& string ) { int res = myRegExp.search( string ) ; if ( res != -1 ) { - myCapturedTexts = myRegExp.tqcapturedTexts(); + myCapturedTexts = myRegExp.capturedTexts(); return true; } return false; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kmenuedit/basictab.cpp v3.5.13-sru/kmenuedit/basictab.cpp --- /tmp/stable//kdebase/kmenuedit/basictab.cpp 2011-03-12 07:57:59.000000000 +0100 +++ v3.5.13-sru/kmenuedit/basictab.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -468,8 +468,8 @@ if (signalsBlocked()) return; - if( KKeyChooser::checkGlobalShortcutsConflict( cut, true, tqtopLevelWidget()) - || KKeyChooser::checkStandardShortcutsConflict( cut, true, tqtopLevelWidget())) + if( KKeyChooser::checkGlobalShortcutsConflict( cut, true, topLevelWidget()) + || KKeyChooser::checkStandardShortcutsConflict( cut, true, topLevelWidget())) return; if ( KHotKeys::present() ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kmenuedit/kmenuedit.cpp v3.5.13-sru/kmenuedit/kmenuedit.cpp --- /tmp/stable//kdebase/kmenuedit/kmenuedit.cpp 2011-03-12 07:58:00.000000000 +0100 +++ v3.5.13-sru/kmenuedit/kmenuedit.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -121,7 +121,7 @@ #endif // disabling the updates prevents unnecessary redraws - tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); guiFactory()->removeClient( this ); delete m_actionDelete; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/knetattach/knetattach.ui v3.5.13-sru/knetattach/knetattach.ui --- /tmp/stable//kdebase/knetattach/knetattach.ui 2011-03-12 07:58:00.000000000 +0100 +++ v3.5.13-sru/knetattach/knetattach.ui 2012-09-08 19:41:29.000000000 +0200 @@ -96,7 +96,7 @@ 0 - + 250 0 @@ -131,7 +131,7 @@ Expanding - + 31 16 @@ -145,7 +145,7 @@ Select the type of network folder you wish to connect to and press the Next button. - + WordBreak|AlignVCenter @@ -159,7 +159,7 @@ Fixed - + 20 21 @@ -186,7 +186,7 @@ Enter a name for this <i>%1</i> as well as the server address, port and folder path to use and press the Next button. - + WordBreak|AlignVCenter @@ -200,7 +200,7 @@ Fixed - + 20 21 @@ -327,7 +327,7 @@ Expanding - + 560 16 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/about/konq_aboutpage.cc v3.5.13-sru/konqueror/about/konq_aboutpage.cc --- /tmp/stable//kdebase/konqueror/about/konq_aboutpage.cc 2011-08-11 07:25:52.000000000 +0200 +++ v3.5.13-sru/konqueror/about/konq_aboutpage.cc 2012-09-08 19:41:29.000000000 +0200 @@ -77,9 +77,9 @@ res = t.read(); // otherwise all embedded objects are referenced as about:/... - TQString basehref = TQString::tqfromLatin1("\n"); + TQString::fromLatin1("/\">\n"); TQRegExp reg(""); reg.setCaseSensitive(FALSE); res.replace(reg, "\n\t" + basehref); @@ -110,11 +110,11 @@ TQString home_folder = TQDir::homeDirPath(); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); - res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); else - res = res.tqarg( "" ); + res = res.arg( "" ); // Try to split page in three. If it succeeds, insert the default search into the middle part. TQStringList parts = TQStringList::split( "", res ); @@ -123,56 +123,56 @@ config.setGroup( "General" ); TQString name = config.readEntry("DefaultSearchEngine"); KService::Ptr service = - KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(name)); + KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(name)); if ( service ) { TQString searchBar = parts[1]; searchBar = searchBar - .tqarg( iconSize ).tqarg( iconSize ) - .tqarg( service->name() ) - .tqarg( service->property("Keys").toStringList()[0] ) + .arg( iconSize ).arg( iconSize ) + .arg( service->name() ) + .arg( service->property("Keys").toStringList()[0] ) ; res = parts[0] + searchBar + parts[2]; } else res = parts[0] + parts[2]; } - res = res.tqarg( i18n("Conquer your Desktop!") ) - .tqarg( i18n( "Konqueror" ) ) - .tqarg( i18n("Conquer your Desktop!") ) - .tqarg( i18n("Konqueror is your file manager, web browser and universal document viewer.") ) - .tqarg( i18n( "Starting Points" ) ) - .tqarg( i18n( "Introduction" ) ) - .tqarg( i18n( "Tips" ) ) - .tqarg( i18n( "Specifications" ) ) - .tqarg( home_folder ) - .tqarg( home_icon_path ) - .tqarg(iconSize).tqarg(iconSize) - .tqarg( home_folder ) - .tqarg( i18n( "Home Folder" ) ) - .tqarg( i18n( "Your personal files" ) ) - .tqarg( storage_icon_path ) - .tqarg(iconSize).tqarg(iconSize) - .tqarg( i18n( "Storage Media" ) ) - .tqarg( i18n( "Disks and removable media" ) ) - .tqarg( remote_icon_path ) - .tqarg(iconSize).tqarg(iconSize) - .tqarg( i18n( "Network Folders" ) ) - .tqarg( i18n( "Shared files and folders" ) ) - .tqarg( wastebin_icon_path ) - .tqarg(iconSize).tqarg(iconSize) - .tqarg( i18n( "Trash" ) ) - .tqarg( i18n( "Browse and restore the trash" ) ) - .tqarg( applications_icon_path ) - .tqarg(iconSize).tqarg(iconSize) - .tqarg( i18n( "Applications" ) ) - .tqarg( i18n( "Installed programs" ) ) - .tqarg( help_icon_path ) - .tqarg(iconSize).tqarg(iconSize) - .tqarg( i18n( "About Kubuntu" ) ) - .tqarg( i18n( "Kubuntu Documentation" ) ) - .tqarg( continue_icon_path ) - .tqarg( KIcon::SizeSmall ).tqarg( KIcon::SizeSmall ) - .tqarg( i18n( "Next: An Introduction to Konqueror" ) ) + res = res.arg( i18n("Conquer your Desktop!") ) + .arg( i18n( "Konqueror" ) ) + .arg( i18n("Conquer your Desktop!") ) + .arg( i18n("Konqueror is your file manager, web browser and universal document viewer.") ) + .arg( i18n( "Starting Points" ) ) + .arg( i18n( "Introduction" ) ) + .arg( i18n( "Tips" ) ) + .arg( i18n( "Specifications" ) ) + .arg( home_folder ) + .arg( home_icon_path ) + .arg(iconSize).arg(iconSize) + .arg( home_folder ) + .arg( i18n( "Home Folder" ) ) + .arg( i18n( "Your personal files" ) ) + .arg( storage_icon_path ) + .arg(iconSize).arg(iconSize) + .arg( i18n( "Storage Media" ) ) + .arg( i18n( "Disks and removable media" ) ) + .arg( remote_icon_path ) + .arg(iconSize).arg(iconSize) + .arg( i18n( "Network Folders" ) ) + .arg( i18n( "Shared files and folders" ) ) + .arg( wastebin_icon_path ) + .arg(iconSize).arg(iconSize) + .arg( i18n( "Trash" ) ) + .arg( i18n( "Browse and restore the trash" ) ) + .arg( applications_icon_path ) + .arg(iconSize).arg(iconSize) + .arg( i18n( "Applications" ) ) + .arg( i18n( "Installed programs" ) ) + .arg( settings_icon_path ) + .arg(iconSize).arg(iconSize) + .arg( i18n( "Settings" ) ) + .arg( i18n( "Desktop configuration" ) ) + .arg( continue_icon_path ) + .arg( KIcon::SizeSmall ).arg( KIcon::SizeSmall ) + .arg( i18n( "Next: An Introduction to Konqueror" ) ) ; i18n("Search the Web");//i18n for possible future use @@ -195,42 +195,42 @@ TQString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small ); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); - res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); else - res = res.tqarg( "" ); + res = res.arg( "" ); - res = res.tqarg( i18n("Conquer your Desktop!") ) - .tqarg( i18n( "Konqueror" ) ) - .tqarg( i18n( "Conquer your Desktop!") ) - .tqarg( i18n( "Konqueror is your file manager, web browser and universal document viewer.") ) - .tqarg( i18n( "Starting Points" ) ) - .tqarg( i18n( "Introduction" ) ) - .tqarg( i18n( "Tips" ) ) - .tqarg( i18n( "Specifications" ) ) - .tqarg( i18n( "Konqueror makes working with and managing your files easy. You can browse " + res = res.arg( i18n("Conquer your Desktop!") ) + .arg( i18n( "Konqueror" ) ) + .arg( i18n( "Conquer your Desktop!") ) + .arg( i18n( "Konqueror is your file manager, web browser and universal document viewer.") ) + .arg( i18n( "Starting Points" ) ) + .arg( i18n( "Introduction" ) ) + .arg( i18n( "Tips" ) ) + .arg( i18n( "Specifications" ) ) + .arg( i18n( "Konqueror makes working with and managing your files easy. You can browse " "both local and networked folders while enjoying advanced features " "such as the powerful sidebar and file previews." ) ) - .tqarg( i18n( "Konqueror is also a full featured and easy to use web browser which you " + .arg( i18n( "Konqueror is also a full featured and easy to use web browser which you " "can use to explore the Internet. " "Enter the address (e.g. http://www.kde.org) " "of a web page you would like to visit in the location bar and press Enter, " "or choose an entry from the Bookmarks menu.") ) - .tqarg( i18n( "To return to the previous " + .arg( i18n( "To return to the previous " "location, press the back button " - "in the toolbar. ").tqarg( back_icon_path ) ) - .tqarg( i18n( "To quickly go to your Home folder press the " - " home button ." ).tqarg(gohome_icon_path) ) - .tqarg( i18n( "For more detailed documentation on Konqueror click here." ) - .tqarg("exec:/khelpcenter") ) - .tqarg( i18n( "Tuning Tip: If you want the Konqueror web browser to start faster," + "in the toolbar. ").arg( back_icon_path ) ) + .arg( i18n( "To quickly go to your Home folder press the " + " home button ." ).arg(gohome_icon_path) ) + .arg( i18n( "For more detailed documentation on Konqueror click here." ) + .arg("exec:/khelpcenter") ) + .arg( i18n( "Tuning Tip: If you want the Konqueror web browser to start faster," " you can turn off this information screen by clicking here. You can re-enable it" " by choosing the Help -> Konqueror Introduction menu option, and then pressing " - "Settings -> Save View Profile \"Web Browsing\".").tqarg("config:/disable_overview") ) - .tqarg( "" ).tqarg( continue_icon_path ) - .tqarg( i18n( "Next: Tips & Tricks" ) ) + "Settings -> Save View Profile \"Web Browsing\".").arg("config:/disable_overview") ) + .arg( "" ).arg( continue_icon_path ) + .arg( i18n( "Next: Tips & Tricks" ) ) ; @@ -250,69 +250,69 @@ if ( res.isEmpty() ) return res; - res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); else - res = res.tqarg( "" ); + res = res.arg( "" ); - res = res.tqarg( i18n("Conquer your Desktop!") ) - .tqarg( i18n( "Konqueror" ) ) - .tqarg( i18n("Conquer your Desktop!") ) - .tqarg( i18n("Konqueror is your file manager, web browser and universal document viewer.") ) - .tqarg( i18n( "Starting Points" ) ) - .tqarg( i18n( "Introduction" ) ) - .tqarg( i18n( "Tips" ) ) - .tqarg( i18n( "Specifications" ) ) - .tqarg( i18n("Specifications") ) - .tqarg( i18n("Konqueror is designed to embrace and support Internet standards. " + res = res.arg( i18n("Conquer your Desktop!") ) + .arg( i18n( "Konqueror" ) ) + .arg( i18n("Conquer your Desktop!") ) + .arg( i18n("Konqueror is your file manager, web browser and universal document viewer.") ) + .arg( i18n( "Starting Points" ) ) + .arg( i18n( "Introduction" ) ) + .arg( i18n( "Tips" ) ) + .arg( i18n( "Specifications" ) ) + .arg( i18n("Specifications") ) + .arg( i18n("Konqueror is designed to embrace and support Internet standards. " "The aim is to fully implement the officially sanctioned standards " "from organizations such as the W3 and OASIS, while also adding " "extra support for other common usability features that arise as " "de facto standards across the Internet. Along with this support, " "for such functions as favicons, Internet Keywords, and XBEL bookmarks, " - "Konqueror also implements:").tqarg("http://pyxml.sourceforge.net/topics/xbel/") ) - .tqarg( i18n("Web Browsing") ) - .tqarg( i18n("Supported standards") ) - .tqarg( i18n("Additional requirements*") ) - .tqarg( i18n("DOM (Level 1, partially Level 2) based " - "HTML 4.01").tqarg("http://www.w3.org/DOM").tqarg("http://www.w3.org/TR/html4/") ) - .tqarg( i18n("built-in") ) - .tqarg( i18n("Cascading Style Sheets (CSS 1, partially CSS 2)").tqarg("http://www.w3.org/Style/CSS/") ) - .tqarg( i18n("built-in") ) - .tqarg( i18n("ECMA-262 Edition 3 (roughly equals JavaScript 1.5)").tqarg("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM") ) - .tqarg( i18n("JavaScript disabled (globally). Enable JavaScript here.").tqarg("exec:/kcmshell khtml_java_js") ) - .tqarg( i18n("JavaScript enabled (globally). Configure JavaScript here.").tqarg("exec:/kcmshell khtml_java_js") ) // leave the double backslashes here, they are necessary for javascript ! - .tqarg( i18n("Secure Java® support").tqarg("http://java.sun.com") ) - .tqarg( i18n("JDK 1.2.0 (Java 2) compatible VM (Blackdown, IBM or Sun)") - .tqarg("http://www.blackdown.org").tqarg("http://www.ibm.com").tqarg("http://java.sun.com") ) - .tqarg( i18n("Enable Java (globally) here.").tqarg("exec:/kcmshell khtml_java_js") ) // TODO Maybe test if Java is enabled ? - .tqarg( i18n("Netscape Communicator® plugins (for viewing Flash®, Real®Audio, Real®Video, etc.)") - .tqarg("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash") - .tqarg("http://www.real.com").tqarg("http://www.real.com") - .tqarg("about:plugins") ) - .tqarg( i18n("built-in") ) - .tqarg( i18n("Secure Sockets Layer") ) - .tqarg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") ) - .tqarg( i18n("OpenSSL") ) - .tqarg( i18n("Bidirectional 16bit tqunicode support") ) - .tqarg( i18n("built-in") ) - .tqarg( i18n("AutoCompletion for forms") ) - .tqarg( i18n("built-in") ) - .tqarg( i18n("G E N E R A L") ) - .tqarg( i18n("Feature") ) - .tqarg( i18n("Details") ) - .tqarg( i18n("Image formats") ) - .tqarg( i18n("Transfer protocols") ) - .tqarg( i18n("HTTP 1.1 (including gzip/bzip2 compression)") ) - .tqarg( i18n("FTP") ) - .tqarg( i18n("and many more...").tqarg("exec:/kcmshell ioslaveinfo") ) - .tqarg( i18n("URL-Completion") ) - .tqarg( i18n("Manual")) - .tqarg( i18n("Popup")) - .tqarg( i18n("(Short-) Automatic")) - .tqarg( "" ).tqarg( continue_icon_path ) - .tqarg( i18n("Return to Starting Points").tqarg("launch.html") ) + "Konqueror also implements:").arg("http://pyxml.sourceforge.net/topics/xbel/") ) + .arg( i18n("Web Browsing") ) + .arg( i18n("Supported standards") ) + .arg( i18n("Additional requirements*") ) + .arg( i18n("DOM (Level 1, partially Level 2) based " + "HTML 4.01").arg("http://www.w3.org/DOM").arg("http://www.w3.org/TR/html4/") ) + .arg( i18n("built-in") ) + .arg( i18n("Cascading Style Sheets (CSS 1, partially CSS 2)").arg("http://www.w3.org/Style/CSS/") ) + .arg( i18n("built-in") ) + .arg( i18n("ECMA-262 Edition 3 (roughly equals JavaScript 1.5)").arg("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM") ) + .arg( i18n("JavaScript disabled (globally). Enable JavaScript here.").arg("exec:/kcmshell khtml_java_js") ) + .arg( i18n("JavaScript enabled (globally). Configure JavaScript here.").arg("exec:/kcmshell khtml_java_js") ) // leave the double backslashes here, they are necessary for javascript ! + .arg( i18n("Secure Java® support").arg("http://java.sun.com") ) + .arg( i18n("JDK 1.2.0 (Java 2) compatible VM (Blackdown, IBM or Sun)") + .arg("http://www.blackdown.org").arg("http://www.ibm.com").arg("http://java.sun.com") ) + .arg( i18n("Enable Java (globally) here.").arg("exec:/kcmshell khtml_java_js") ) // TODO Maybe test if Java is enabled ? + .arg( i18n("Netscape Communicator® plugins (for viewing Flash®, Real®Audio, Real®Video, etc.)") + .arg("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash") + .arg("http://www.real.com").arg("http://www.real.com") + .arg("about:plugins") ) + .arg( i18n("built-in") ) + .arg( i18n("Secure Sockets Layer") ) + .arg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") ) + .arg( i18n("OpenSSL") ) + .arg( i18n("Bidirectional 16bit unicode support") ) + .arg( i18n("built-in") ) + .arg( i18n("AutoCompletion for forms") ) + .arg( i18n("built-in") ) + .arg( i18n("G E N E R A L") ) + .arg( i18n("Feature") ) + .arg( i18n("Details") ) + .arg( i18n("Image formats") ) + .arg( i18n("Transfer protocols") ) + .arg( i18n("HTTP 1.1 (including gzip/bzip2 compression)") ) + .arg( i18n("FTP") ) + .arg( i18n("and many more...").arg("exec:/kcmshell ioslaveinfo") ) + .arg( i18n("URL-Completion") ) + .arg( i18n("Manual")) + .arg( i18n("Popup")) + .arg( i18n("(Short-) Automatic")) + .arg( "" ).arg( continue_icon_path ) + .arg( i18n("Return to Starting Points").arg("launch.html") ) ; @@ -347,57 +347,57 @@ iconloader->iconPath("view_left_right", KIcon::Small ); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); - res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); else - res = res.tqarg( "" ); + res = res.arg( "" ); - res = res.tqarg( i18n("Conquer your Desktop!") ) - .tqarg( i18n( "Konqueror" ) ) - .tqarg( i18n("Conquer your Desktop!") ) - .tqarg( i18n("Konqueror is your file manager, web browser and universal document viewer.") ) - .tqarg( i18n( "Starting Points" ) ) - .tqarg( i18n( "Introduction" ) ) - .tqarg( i18n( "Tips" ) ) - .tqarg( i18n( "Specifications" ) ) - .tqarg( i18n( "Tips & Tricks" ) ) - .tqarg( i18n( "Use Internet-Keywords and Web-Shortcuts: by typing \"gg: KDE\" one can search the Internet, " + res = res.arg( i18n("Conquer your Desktop!") ) + .arg( i18n( "Konqueror" ) ) + .arg( i18n("Conquer your Desktop!") ) + .arg( i18n("Konqueror is your file manager, web browser and universal document viewer.") ) + .arg( i18n( "Starting Points" ) ) + .arg( i18n( "Introduction" ) ) + .arg( i18n( "Tips" ) ) + .arg( i18n( "Specifications" ) ) + .arg( i18n( "Tips & Tricks" ) ) + .arg( i18n( "Use Internet-Keywords and Web-Shortcuts: by typing \"gg: KDE\" one can search the Internet, " "using Google, for the search phrase \"KDE\". There are a lot of " "Web-Shortcuts predefined to make searching for software or looking " "up certain words in an encyclopedia a breeze. You can even " - "create your own Web-Shortcuts." ).tqarg("exec:/kcmshell ebrowsing") ) - .tqarg( i18n( "Use the magnifier button in the" - " toolbar to increase the font size on your web page.").tqarg(viewmag_icon_path) ) - .tqarg( i18n( "When you want to paste a new address into the Location toolbar you might want to " + "create your own Web-Shortcuts." ).arg("exec:/kcmshell ebrowsing") ) + .arg( i18n( "Use the magnifier button in the" + " toolbar to increase the font size on your web page.").arg(viewmag_icon_path) ) + .arg( i18n( "When you want to paste a new address into the Location toolbar you might want to " "clear the current entry by pressing the black arrow with the white cross " " in the toolbar.") - .tqarg(TQApplication::reverseLayout() ? locationbar_erase_rtl_icon_path : locationbar_erase_icon_path)) - .tqarg( i18n( "To create a link on your desktop pointing to the current page, " + .arg(TQApplication::reverseLayout() ? locationbar_erase_rtl_icon_path : locationbar_erase_icon_path)) + .arg( i18n( "To create a link on your desktop pointing to the current page, " "simply drag the \"Location\" label that is to the left of the Location toolbar, drop it on to " "the desktop, and choose \"Link\"." ) ) - .tqarg( i18n( "You can also find \"Full-Screen Mode\" " + .arg( i18n( "You can also find \"Full-Screen Mode\" " "in the Settings menu. This feature is very useful for \"Talk\" " - "sessions.").tqarg(window_fullscreen_icon_path) ) - .tqarg( i18n( "Divide et impera (lat. \"Divide and conquer\") - by splitting a window " + "sessions.").arg(window_fullscreen_icon_path) ) + .arg( i18n( "Divide et impera (lat. \"Divide and conquer\") - by splitting a window " "into two parts (e.g. Window -> Split View " "Left/Right) you can make Konqueror appear the way you like. You" " can even load some example view-profiles (e.g. Midnight Commander)" - ", or create your own ones." ).tqarg(view_left_right_icon_path)) - .tqarg( i18n( "Use the user-agent feature if the website you are visiting " + ", or create your own ones." ).arg(view_left_right_icon_path)) + .arg( i18n( "Use the user-agent feature if the website you are visiting " "asks you to use a different browser " - "(and do not forget to send a complaint to the webmaster!)" ).tqarg("exec:/kcmshell useragent") ) - .tqarg( i18n( "The History in your SideBar ensures " - "that you can keep track of the pages you have visited recently.").tqarg(history_icon_path) ) - .tqarg( i18n( "Use a caching proxy to speed up your" - " Internet connection.").tqarg("exec:/kcmshell proxy") ) - .tqarg( i18n( "Advanced users will appreciate the Konsole which you can embed into " + "(and do not forget to send a complaint to the webmaster!)" ).arg("exec:/kcmshell useragent") ) + .arg( i18n( "The History in your SideBar ensures " + "that you can keep track of the pages you have visited recently.").arg(history_icon_path) ) + .arg( i18n( "Use a caching proxy to speed up your" + " Internet connection.").arg("exec:/kcmshell proxy") ) + .arg( i18n( "Advanced users will appreciate the Konsole which you can embed into " "Konqueror (Window -> Show " - "Terminal Emulator).").tqarg(openterm_icon_path)) - .tqarg( i18n( "Thanks to DCOP you can have full control over Konqueror using a script." -).tqarg("exec:/kdcop") ) - .tqarg( i18n( "" ).tqarg( continue_icon_path ) ) - .tqarg( i18n( "Next: Specifications" ) ) + "Terminal Emulator).").arg(openterm_icon_path)) + .arg( i18n( "Thanks to DCOP you can have full control over Konqueror using a script." +).arg("exec:/kdcop") ) + .arg( i18n( "" ).arg( continue_icon_path ) ) + .arg( i18n( "Next: Specifications" ) ) ; @@ -413,10 +413,10 @@ return *s_plugins_html; TQString res = loadFile( locate( "data", kapp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" )) - .tqarg(i18n("Installed Plugins")) - .tqarg(i18n("PluginDescriptionFileTypes")) - .tqarg(i18n("Installed")) - .tqarg(i18n("Mime TypeDescriptionSuffixesPlugin")); + .arg(i18n("Installed Plugins")) + .arg(i18n("PluginDescriptionFileTypes")) + .arg(i18n("Installed")) + .arg(i18n("Mime TypeDescriptionSuffixesPlugin")); if ( res.isEmpty() ) return res; @@ -489,7 +489,7 @@ void KonqAboutPage::serve( const TQString& html, const TQString& what ) { m_what = what; - begin( KURL( TQString("about:%1").tqarg(what) ) ); + begin( KURL( TQString("about:%1").arg(what) ) ); write( html ); end(); m_htmlDoc = html; @@ -507,32 +507,32 @@ return; } - if ( url == TQString::tqfromLatin1("launch.html") ) + if ( url == TQString::fromLatin1("launch.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::launch(), "konqueror" ); return; } - else if ( url == TQString::tqfromLatin1("intro.html") ) + else if ( url == TQString::fromLatin1("intro.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::intro(), "konqueror" ); return; } - else if ( url == TQString::tqfromLatin1("specs.html") ) + else if ( url == TQString::fromLatin1("specs.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::specs(), "konqueror" ); return; } - else if ( url == TQString::tqfromLatin1("tips.html") ) + else if ( url == TQString::fromLatin1("tips.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::tips(), "konqueror" ); return; } - else if ( url == TQString::tqfromLatin1("config:/disable_overview") ) + else if ( url == TQString::fromLatin1("config:/disable_overview") ) { if ( KMessageBox::questionYesNo( widget(), i18n("Do you want to disable showing " diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/about/launch.html v3.5.13-sru/konqueror/about/launch.html --- /tmp/stable//kdebase/konqueror/about/launch.html 2011-03-12 07:58:17.000000000 +0100 +++ v3.5.13-sru/konqueror/about/launch.html 2012-09-08 19:41:29.000000000 +0200 @@ -110,10 +110,10 @@ %1
    %1 - + - %1
    %1 + %1
    %1 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/about/specs.html v3.5.13-sru/konqueror/about/specs.html --- /tmp/stable//kdebase/konqueror/about/specs.html 2011-03-12 07:58:17.000000000 +0100 +++ v3.5.13-sru/konqueror/about/specs.html 2012-09-08 19:41:29.000000000 +0200 @@ -121,7 +121,7 @@ %1 - %1 + %1   %1 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/client/kfmclient.cc v3.5.13-sru/konqueror/client/kfmclient.cc --- /tmp/stable//kdebase/konqueror/client/kfmclient.cc 2011-08-11 07:25:52.000000000 +0200 +++ v3.5.13-sru/konqueror/client/kfmclient.cc 2012-09-08 19:41:29.000000000 +0200 @@ -178,33 +178,33 @@ */ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& profile ) { - KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true ); + KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "Reusing" ); TQStringList allowed_parts; // is duplicated in ../KonquerorIface.cc - allowed_parts << TQString::tqfromLatin1( "konq_iconview.desktop" ) - << TQString::tqfromLatin1( "konq_multicolumnview.desktop" ) - << TQString::tqfromLatin1( "konq_sidebartng.desktop" ) - << TQString::tqfromLatin1( "konq_infolistview.desktop" ) - << TQString::tqfromLatin1( "konq_treeview.desktop" ) - << TQString::tqfromLatin1( "konq_detailedlistview.desktop" ); + allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" ) + << TQString::fromLatin1( "konq_multicolumnview.desktop" ) + << TQString::fromLatin1( "konq_sidebartng.desktop" ) + << TQString::fromLatin1( "konq_infolistview.desktop" ) + << TQString::fromLatin1( "konq_treeview.desktop" ) + << TQString::fromLatin1( "konq_detailedlistview.desktop" ); if( cfg.hasKey( "SafeParts" ) - && cfg.readEntry( "SafeParts" ) != TQString::tqfromLatin1( "SAFE" )) + && cfg.readEntry( "SafeParts" ) != TQString::fromLatin1( "SAFE" )) allowed_parts = cfg.readListEntry( "SafeParts" ); - if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::tqfromLatin1( "ALL" )) + if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "ALL" )) return false; // all parts allowed if( url.isEmpty()) { if( profile.isEmpty()) return true; - TQString profilepath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profile ); + TQString profilepath = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profile ); if( profilepath.isEmpty()) return true; KConfig cfg( profilepath, true ); cfg.setDollarExpansion( true ); cfg.setGroup( "Profile" ); - TQMap< TQString, TQString > entries = cfg.entryMap( TQString::tqfromLatin1( "Profile" )); - TQRegExp urlregexp( TQString::tqfromLatin1( "^View[0-9]*_URL$" )); + TQMap< TQString, TQString > entries = cfg.entryMap( TQString::fromLatin1( "Profile" )); + TQRegExp urlregexp( TQString::fromLatin1( "^View[0-9]*_URL$" )); TQStringList urls; for( TQMap< TQString, TQString >::ConstIterator it = entries.begin(); it != entries.end(); @@ -218,16 +218,16 @@ if( urls.count() != 1 ) return true; url = urls.first(); - mimetype = TQString::tqfromLatin1( "" ); + mimetype = TQString::fromLatin1( "" ); } if( mimetype.isEmpty()) mimetype = KMimeType::findByURL( KURL( url ) )->name(); - KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::tqfromLatin1( "KParts/ReadOnlyPart" ), + KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::fromLatin1( "KParts/ReadOnlyPart" ), TQString::null, TQString::null ); KService::Ptr serv; if( offers.count() > 0 ) serv = offers.first(); - return serv == NULL || !allowed_parts.contains( serv->desktopEntryName() + TQString::tqfromLatin1(".desktop") ); + return serv == NULL || !allowed_parts.contains( serv->desktopEntryName() + TQString::fromLatin1(".desktop") ); } static int currentScreen() @@ -248,7 +248,7 @@ // when reusing a preloaded konqy, make sure your always use a DCOP call which opens a profile ! static TQCString getPreloadedKonqy() { - KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true ); + KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "Reusing" ); if( cfg.readNumEntry( "MaxPreloadCount", 1 ) == 0 ) return ""; @@ -301,8 +301,8 @@ // check if user wants to use external browser // ###### this option seems to have no GUI and to be redundant with BrowserApplication now. // ###### KDE4: remove - KConfig config( TQString::tqfromLatin1("kfmclientrc")); - config.setGroup( TQString::tqfromLatin1("Settings")); + KConfig config( TQString::fromLatin1("kfmclientrc")); + config.setGroup( TQString::fromLatin1("Settings")); TQString strBrowser = config.readPathEntry("ExternalBrowser"); if (!strBrowser.isEmpty()) { @@ -314,7 +314,7 @@ return true; } - if (url.protocol().startsWith(TQString::tqfromLatin1("http"))) + if (url.protocol().startsWith(TQString::fromLatin1("http"))) { config.setGroup("General"); if (!config.readEntry("BrowserApplication").isEmpty()) @@ -330,7 +330,7 @@ } } - KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true ); + KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "FMSettings" ); if ( newTab || cfg.readBoolEntry( "KonquerorTabforExternalURL", false ) ) { @@ -361,7 +361,7 @@ { TQString error; /* Well, we can't pass a mimetype through startServiceByDesktopPath ! - if ( KApplication::startServiceByDesktopPath( TQString::tqfromLatin1("konqueror.desktop"), + if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"), url.url(), &error ) > 0 ) { kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl; @@ -391,8 +391,8 @@ if( appId.isEmpty()) { TQString error; - if ( KApplication::startServiceByDesktopPath( TQString::tqfromLatin1("konqueror.desktop"), - TQString::tqfromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 ) + if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"), + TQString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 ) { kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl; return false; @@ -401,10 +401,10 @@ // so when we arrive here, konq is up and running already, and appId contains the identification } - TQString profile = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profileName ); + TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName ); if ( profile.isEmpty() ) { - fprintf( stderr, "%s", i18n("Profile %1 not found\n").tqarg(profileName).local8Bit().data() ); + fprintf( stderr, "%s", i18n("Profile %1 not found\n").arg(profileName).local8Bit().data() ); ::exit( 0 ); } KonquerorIface_stub konqy( appId, "KonquerorIface" ); @@ -479,7 +479,7 @@ } if ( argc == 3 ) { - return createNewWindow( args->url(1), command == "newTab", tempFile, TQString::tqfromLatin1(args->arg(2)) ); + return createNewWindow( args->url(1), command == "newTab", tempFile, TQString::fromLatin1(args->arg(2)) ); } } else if ( command == "openProfile" ) @@ -529,7 +529,7 @@ { KURL::List urls; urls.append( args->url(1) ); - const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::tqfromLatin1( "Application" ), TQString::null, TQString::null ); + const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null ); if (offers.isEmpty()) return 1; KService::Ptr serv = offers.first(); return KRun::run( *serv, urls ); @@ -630,7 +630,7 @@ } else { - fprintf( stderr, "%s", i18n("Syntax Error: Unknown command '%1'\n").tqarg(TQString::fromLocal8Bit(command)).local8Bit().data() ); + fprintf( stderr, "%s", i18n("Syntax Error: Unknown command '%1'\n").arg(TQString::fromLocal8Bit(command)).local8Bit().data() ); return false; } return true; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/iconview/konq_iconview.cc v3.5.13-sru/konqueror/iconview/konq_iconview.cc --- /tmp/stable//kdebase/konqueror/iconview/konq_iconview.cc 2011-08-11 07:25:51.000000000 +0200 +++ v3.5.13-sru/konqueror/iconview/konq_iconview.cc 2012-09-08 19:41:29.000000000 +0200 @@ -206,7 +206,7 @@ setXMLFile( "konq_iconview.rc" ); - // Don't tqrepaint on configuration changes during construction + // Don't repaint on configuration changes during construction m_bInit = true; m_paDotFiles = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), @@ -359,7 +359,7 @@ // Create the directory lister m_dirLister = new KDirLister( true ); setDirLister( m_dirLister ); - m_dirLister->setMainWindow(m_pIconView->tqtopLevelWidget()); + m_dirLister->setMainWindow(m_pIconView->topLevelWidget()); connect( m_dirLister, TQT_SIGNAL( started( const KURL & ) ), this, TQT_SLOT( slotStarted() ) ); @@ -686,7 +686,7 @@ // Stop a preview job that might be running m_pIconView->stopImagePreview(); - // Set icons size, arrage items in grid and tqrepaint the whole view + // Set icons size, arrage items in grid and repaint the whole view m_pIconView->setIcons( size ); // If previews are enabled start a new job @@ -872,8 +872,8 @@ // the completed() signal, so handle that case. if ( !m_pIconView->viewport()->isUpdatesEnabled() ) { - m_pIconView->viewport()->tqsetUpdatesEnabled( true ); - m_pIconView->viewport()->tqrepaint(); + m_pIconView->viewport()->setUpdatesEnabled( true ); + m_pIconView->viewport()->repaint(); } if ( m_pEnsureVisible ){ m_pIconView->ensureItemVisible( m_pEnsureVisible ); @@ -889,11 +889,11 @@ m_pTimeoutRefreshTimer->stop(); // If updates to the viewport are still blocked (so slotNewItems() has - // not been called), a viewport tqrepaint is forced. + // not been called), a viewport repaint is forced. if ( !m_pIconView->viewport()->isUpdatesEnabled() ) { - m_pIconView->viewport()->tqsetUpdatesEnabled( true ); - m_pIconView->viewport()->tqrepaint(); + m_pIconView->viewport()->setUpdatesEnabled( true ); + m_pIconView->viewport()->repaint(); } // Root item ? Store root item in konqiconviewwidget (whether 0L or not) @@ -952,7 +952,7 @@ // We need to disable graphics updates on the iconview when // inserting items, or else a blank paint operation will be // performed on the top-left corner for each inserted item! - m_pIconView->tqsetUpdatesEnabled( false ); + m_pIconView->setUpdatesEnabled( false ); for (KFileItemListIterator it(entries); it.current(); ++it) { //kdDebug(1202) << "KonqKfmIconView::slotNewItem(...)" << _fileitem->url().url() << endl; @@ -1006,11 +1006,11 @@ m_itemDict.insert( *it, item ); } // After filtering out updates-on-insertions we can re-enable updates - m_pIconView->tqsetUpdatesEnabled( true ); + m_pIconView->setUpdatesEnabled( true ); // Locking the viewport has filtered out blanking and now, since we // have some items to draw, we can restore updating. if ( !m_pIconView->viewport()->isUpdatesEnabled() ) - m_pIconView->viewport()->tqsetUpdatesEnabled( true ); + m_pIconView->viewport()->setUpdatesEnabled( true ); KonqDirPart::newItems( entries ); } @@ -1136,7 +1136,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. if ( bNeedRepaint ) m_pIconView->updateContents(); } @@ -1150,7 +1150,7 @@ // meaningless paint operations (such as a clear() just before drawing // fresh contents) we disable updating the viewport until we'll // receive some data or a timeout timer expires. - m_pIconView->viewport()->tqsetUpdatesEnabled( false ); + m_pIconView->viewport()->setUpdatesEnabled( false ); if ( !m_pTimeoutRefreshTimer ) { m_pTimeoutRefreshTimer = new TQTimer( this ); @@ -1247,9 +1247,9 @@ kdDebug(1202) << "KonqKfmIconView::slotRefreshViewport()" << endl; TQWidget * vp = m_pIconView->viewport(); bool prevState = vp->isUpdatesEnabled(); - vp->tqsetUpdatesEnabled( true ); - vp->tqrepaint(); - vp->tqsetUpdatesEnabled( prevState ); + vp->setUpdatesEnabled( true ); + vp->repaint(); + vp->setUpdatesEnabled( prevState ); } bool KonqKfmIconView::doOpenURL( const KURL & url ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/keditbookmarks/actionsimpl.cpp v3.5.13-sru/konqueror/keditbookmarks/actionsimpl.cpp --- /tmp/stable//kdebase/konqueror/keditbookmarks/actionsimpl.cpp 2011-03-12 07:58:18.000000000 +0100 +++ v3.5.13-sru/konqueror/keditbookmarks/actionsimpl.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -345,7 +345,7 @@ TQValueList bookmarks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap()); KBookmarkDrag* data = KBookmarkDrag::newDrag(bookmarks, 0 /* not this ! */); - kapp->tqclipboard()->setData(data, TQClipboard::Clipboard); + kapp->clipboard()->setData(data, TQClipboard::Clipboard); } void ActionsImpl::slotPaste() { @@ -353,7 +353,7 @@ KEBMacroCommand *mcmd = CmdGen::insertMimeSource( i18n("Paste"), - kapp->tqclipboard()->data(TQClipboard::Clipboard), + kapp->clipboard()->data(TQClipboard::Clipboard), ListView::self()->userAddress()); CmdHistory::self()->didCommand(mcmd); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/keditbookmarks/commands.cpp v3.5.13-sru/konqueror/keditbookmarks/commands.cpp --- /tmp/stable//kdebase/konqueror/keditbookmarks/commands.cpp 2011-03-12 07:58:18.000000000 +0100 +++ v3.5.13-sru/konqueror/keditbookmarks/commands.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -218,7 +218,7 @@ KBookmark bk = CurrentMgr::bookmarkAt(m_to); Q_ASSERT(!bk.isNull() && !bk.parentGroup().isNull()); - ListView::self()->tqinvalidate(bk.address()); + ListView::self()->invalidate(bk.address()); bk.parentGroup().deleteBookmark(bk); } @@ -643,13 +643,13 @@ bool modified = false; const char *format = 0; for (int i = 0; format = data->format(i), format; i++) { - // qt docs don't say if tqencodedData(blah) where + // qt docs don't say if encodedData(blah) where // blah is not a stored mimetype should return null // or not. so, we search. sucky... if (strcmp(format, "GALEON_BOOKMARK") == 0) { modified = true; TQStoredDrag *mydrag = new TQStoredDrag("application/x-xbel"); - mydrag->setEncodedData(data->tqencodedData("GALEON_BOOKMARK")); + mydrag->setEncodedData(data->encodedData("GALEON_BOOKMARK")); data = mydrag; break; } else if( strcmp(format, "application/x-xbel" )==0) { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/keditbookmarks/listview.cpp v3.5.13-sru/konqueror/keditbookmarks/listview.cpp --- /tmp/stable//kdebase/konqueror/keditbookmarks/listview.cpp 2011-08-11 07:25:53.000000000 +0200 +++ v3.5.13-sru/konqueror/keditbookmarks/listview.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -158,12 +158,12 @@ return bookmarks; } -void ListView::tqinvalidate(const TQString & address) +void ListView::invalidate(const TQString & address) { - tqinvalidate(getItemAtAddress(address)); + invalidate(getItemAtAddress(address)); } -void ListView::tqinvalidate(TQListViewItem * item) +void ListView::invalidate(TQListViewItem * item) { if(item->isSelected()) { @@ -181,7 +181,7 @@ TQListViewItem * child = item->firstChild(); while(child) { - //tqinvalidate(child); + //invalidate(child); child = child->nextSibling(); } } @@ -277,7 +277,7 @@ else deselectAllChildren(child); } - child->tqrepaint(); + child->repaint(); child = static_cast(child->nextSibling()); } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/keditbookmarks/listview.h v3.5.13-sru/konqueror/keditbookmarks/listview.h --- /tmp/stable//kdebase/konqueror/keditbookmarks/listview.h 2011-03-12 07:58:18.000000000 +0100 +++ v3.5.13-sru/konqueror/keditbookmarks/listview.h 2012-09-08 19:41:29.000000000 +0200 @@ -56,7 +56,7 @@ void setTmpStatus(const TQString &); void restoreStatus(); - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); void setSelected ( bool s ); virtual void setOpen(bool); @@ -140,8 +140,8 @@ // selected item stuff void selected(KEBListViewItem * item, bool s); - void tqinvalidate(const TQString & address); - void tqinvalidate(TQListViewItem * item); + void invalidate(const TQString & address); + void invalidate(TQListViewItem * item); void fixUpCurrent(const TQString & address); KEBListViewItem * firstSelected() const; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/keditbookmarks/main.cpp v3.5.13-sru/konqueror/keditbookmarks/main.cpp --- /tmp/stable//kdebase/konqueror/keditbookmarks/main.cpp 2011-03-12 07:58:18.000000000 +0100 +++ v3.5.13-sru/konqueror/keditbookmarks/main.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -139,8 +139,8 @@ bool gotArg = (args->count() == 1); TQString filename = gotArg - ? TQString::tqfromLatin1(args->arg(0)) - : locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml")); + ? TQString::fromLatin1(args->arg(0)) + : locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); if (!isGui) { CurrentMgr::self()->createManager(filename); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/keditbookmarks/toplevel.cpp v3.5.13-sru/konqueror/keditbookmarks/toplevel.cpp --- /tmp/stable//kdebase/konqueror/keditbookmarks/toplevel.cpp 2011-07-09 08:16:57.000000000 +0200 +++ v3.5.13-sru/konqueror/keditbookmarks/toplevel.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -184,7 +184,7 @@ { TQDateTime dt; dt.setTime_t(b); - return (dt.daysTo(TQDateTime::tqcurrentDateTime()) > 31) + return (dt.daysTo(TQDateTime::currentDateTime()) > 31) ? KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false) : KGlobal::locale()->formatDateTime(dt, false); } @@ -233,11 +233,11 @@ vsplitter->setOrientation(Qt::Vertical); vsplitter->setSizes(TQValueList() << h << 380 - << m_bkinfo->tqsizeHint().height() ); + << m_bkinfo->sizeHint().height() ); setCentralWidget(vsplitter); - resize(ListView::self()->widget()->tqsizeHint().width(), - vsplitter->tqsizeHint().height()); + resize(ListView::self()->widget()->sizeHint().width(), + vsplitter->sizeHint().height()); createActions(); if (m_browser) @@ -247,7 +247,7 @@ m_dcopIface = new KBookmarkEditorIface(); - connect(kapp->tqclipboard(), TQT_SIGNAL( dataChanged() ), + connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( slotClipboardDataChanged() )); ListView::self()->connectSignals(); @@ -319,7 +319,7 @@ // kdDebug() << "KEBApp::slotClipboardDataChanged" << endl; if (!m_readOnly) { m_canPaste = KBookmarkDrag::canDecode( - kapp->tqclipboard()->data(TQClipboard::Clipboard)); + kapp->clipboard()->data(TQClipboard::Clipboard)); updateActions(); } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/konq_actions.cc v3.5.13-sru/konqueror/konq_actions.cc --- /tmp/stable//kdebase/konqueror/konq_actions.cc 2011-08-11 07:25:53.000000000 +0200 +++ v3.5.13-sru/konqueror/konq_actions.cc 2012-09-08 19:41:29.000000000 +0200 @@ -48,12 +48,12 @@ { assert ( popup ); // kill me if this 0... :/ - //kdDebug(1202) << "fillHistoryPopup position: " << history.tqat() << endl; + //kdDebug(1202) << "fillHistoryPopup position: " << history.at() << endl; HistoryEntry * current = history.current(); TQPtrListIterator it( history ); if (onlyBack || onlyForward) { - it += history.tqat(); // Jump to current item + it += history.at(); // Jump to current item if ( !onlyForward ) --it; else ++it; // And move off it } else if ( startPos ) it += startPos; // Jump to specified start pos @@ -75,7 +75,7 @@ break; if ( !onlyForward ) --it; else ++it; } - //kdDebug(1202) << "After fillHistoryPopup position: " << history.tqat() << endl; + //kdDebug(1202) << "After fillHistoryPopup position: " << history.at() << endl; } /////////////////////////////// @@ -116,7 +116,7 @@ if (history.isEmpty()) return; // nothing to do - //kdDebug(1202) << "fillGoMenu position: " << history.tqat() << endl; + //kdDebug(1202) << "fillGoMenu position: " << history.at() << endl; if ( m_firstIndex == 0 ) // should never happen since done in plug m_firstIndex = m_goMenu->count(); else @@ -136,10 +136,10 @@ // 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_startPos = history.tqat() + 4; + m_startPos = history.at() + 4; // Forward not big enough ? - if ( history.tqat() > (int)history.count() - 4 ) + if ( history.at() > (int)history.count() - 4 ) m_startPos = history.count() - 1; } Q_ASSERT( m_startPos >= 0 && (uint)m_startPos < history.count() ); @@ -148,7 +148,7 @@ kdWarning() << "m_startPos=" << m_startPos << " history.count()=" << history.count() << endl; return; } - m_currentPos = history.tqat(); // for slotActivated + m_currentPos = history.at(); // for slotActivated KonqBidiHistoryAction::fillHistoryPopup( history, m_goMenu, false, false, true, m_startPos ); } @@ -444,7 +444,7 @@ m_popupList.clear(); int id = s_mostEntries->count() -1; - KonqHistoryEntry *entry = s_mostEntries->tqat( id ); + KonqHistoryEntry *entry = s_mostEntries->at( id ); while ( entry ) { // we take either title, typedURL or URL (in this order) TQString text = entry->title.isEmpty() ? (entry->typedURL.isEmpty() ? @@ -459,7 +459,7 @@ // This prevents crashes when another process tells us to remove an entry. m_popupList.prepend( entry->url ); - entry = (id > 0) ? s_mostEntries->tqat( --id ) : 0L; + entry = (id > 0) ? s_mostEntries->at( --id ) : 0L; } setEnabled( !s_mostEntries->isEmpty() ); Q_ASSERT( s_mostEntries->count() == m_popupList.count() ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/konq_actions.h v3.5.13-sru/konqueror/konq_actions.h --- /tmp/stable//kdebase/konqueror/konq_actions.h 2011-03-12 07:58:18.000000000 +0100 +++ v3.5.13-sru/konqueror/konq_actions.h 2012-09-08 19:41:29.000000000 +0200 @@ -62,7 +62,7 @@ private: uint m_firstIndex; // first index in the Go menu int m_startPos; - int m_currentPos; // == history.tqat() + int m_currentPos; // == history.at() TQPopupMenu *m_goMenu; // hack }; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/konq_combo.cc v3.5.13-sru/konqueror/konq_combo.cc --- /tmp/stable//kdebase/konqueror/konq_combo.cc 2011-08-11 07:25:53.000000000 +0200 +++ v3.5.13-sru/konqueror/konq_combo.cc 2012-09-08 19:41:29.000000000 +0200 @@ -99,7 +99,7 @@ m_pageSecurity( KonqMainWindow::NotCrypted ) { setInsertionPolicy( NoInsertion ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); Q_ASSERT( s_config ); @@ -272,14 +272,14 @@ listBox()->changeItem( item, index ); /* - tqsetUpdatesEnabled( false ); - lineEdit()->tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); + lineEdit()->setUpdatesEnabled( false ); removeItem( index ); insertItem( pix, t, index ); - tqsetUpdatesEnabled( true ); - lineEdit()->tqsetUpdatesEnabled( true ); + setUpdatesEnabled( true ); + lineEdit()->setUpdatesEnabled( true ); update(); */ } @@ -301,13 +301,13 @@ { saveState(); - tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); KonqPixmapProvider *prov = KonqPixmapProvider::self(); for ( int i = 1; i < count(); i++ ) { updateItem( prov->pixmapFor( text( i ) ), text( i ), i, titleOfURL( text( i ) ) ); } - tqsetUpdatesEnabled( true ); - tqrepaint(); + setUpdatesEnabled( true ); + repaint(); restoreState(); } @@ -521,15 +521,15 @@ void KonqCombo::removeURL( const TQString& url ) { - tqsetUpdatesEnabled( false ); - lineEdit()->tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); + lineEdit()->setUpdatesEnabled( false ); removeFromHistory( url ); applyPermanent(); setTemporary( currentText() ); - tqsetUpdatesEnabled( true ); - lineEdit()->tqsetUpdatesEnabled( true ); + setUpdatesEnabled( true ); + lineEdit()->setUpdatesEnabled( true ); update(); } @@ -540,7 +540,7 @@ if ( e->button() == Qt::LeftButton && pixmap( currentItem()) ) { // check if the pixmap was clicked int x = e->pos().x(); - int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); + int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); if ( x > x0 + 2 && x < lineEdit()->x() ) { m_dragStart = e->pos(); @@ -551,7 +551,7 @@ if ( e->button() == Qt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) { // check if the lock icon was clicked int x = e->pos().x(); - int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x(); + int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x(); if ( x < x0 ) emit showPageSecurity(); @@ -604,8 +604,8 @@ TQComboBox::paintEvent( pe ); TQLineEdit *edit = lineEdit(); - TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); - re = TQStyle::tqvisualRect(re, this); + TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); + re = TQStyle::visualRect(re, this); if ( m_pageSecurity!=KonqMainWindow::NotCrypted ) { TQColor color(245, 246, 190); @@ -646,7 +646,7 @@ void KonqCombo::setPageSecurity( int pageSecurity ) { m_pageSecurity = pageSecurity; - tqrepaint(); + repaint(); } bool KonqCombo::hasSufficientContrast(const TQColor &c1, const TQColor &c2) @@ -723,8 +723,8 @@ pmWidth = pm->width() + 5; } - int entryWidth = listBox()->width() - listBox()->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) - - 2 * listBox()->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); + int entryWidth = listBox()->width() - listBox()->style().pixelMetric( TQStyle::PM_ScrollBarExtent ) - + 2 * listBox()->style().pixelMetric( TQStyle::PM_DefaultFrameWidth ); int titleWidth = ( entryWidth / 3 ) - 1; int urlWidth = entryWidth - titleWidth - pmWidth - 2; @@ -850,7 +850,7 @@ insertStringList( items ); else { //Keep track of whether we need to change anything, - //so we can avoid a tqrepaint for identical updates, + //so we can avoid a repaint for identical updates, //to reduce flicker bool dirty = false; @@ -884,7 +884,7 @@ triggerUpdate( false ); } - if ( isVisible() && size().height() != tqsizeHint().height() ) + if ( isVisible() && size().height() != sizeHint().height() ) sizeAndPosition(); blockSignals( block ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/konq_factory.cc v3.5.13-sru/konqueror/konq_factory.cc --- /tmp/stable//kdebase/konqueror/konq_factory.cc 2011-08-11 07:25:53.000000000 +0200 +++ v3.5.13-sru/konqueror/konq_factory.cc 2012-09-08 19:41:29.000000000 +0200 @@ -42,7 +42,7 @@ : m_factory( factory ), m_args( args ), m_createBrowser( createBrowser ) { if ( m_createBrowser ) - m_args << TQString::tqfromLatin1( "Browser/View" ); + m_args << TQString::fromLatin1( "Browser/View" ); } KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const char *widgetName, diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/konq_frame.cc v3.5.13-sru/konqueror/konq_frame.cc --- /tmp/stable//kdebase/konqueror/konq_frame.cc 2011-03-12 07:58:18.000000000 +0100 +++ v3.5.13-sru/konqueror/konq_frame.cc 2012-09-08 19:41:29.000000000 +0200 @@ -68,20 +68,20 @@ setSizeGripEnabled( false ); m_led = new TQLabel( this ); - m_led->tqsetAlignment( Qt::AlignCenter ); - m_led->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + m_led->setAlignment( Qt::AlignCenter ); + m_led->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); addWidget( m_led, 0, false ); // led (active view indicator) m_led->hide(); m_pStatusLabel = new KSqueezedTextLabel( this ); m_pStatusLabel->setMinimumSize( 0, 0 ); - m_pStatusLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); + m_pStatusLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); m_pStatusLabel->installEventFilter(this); addWidget( m_pStatusLabel, 1 /*stretch*/, false ); // status label m_pLinkedViewCheckBox = new KonqCheckBox( this, "m_pLinkedViewCheckBox" ); m_pLinkedViewCheckBox->setFocusPolicy(TQ_NoFocus); - m_pLinkedViewCheckBox->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + m_pLinkedViewCheckBox->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); TQWhatsThis::add( m_pLinkedViewCheckBox, i18n("Checking this box on at least two views sets those views as 'linked'. " "Then, when you change directories in one view, the other views " @@ -274,7 +274,7 @@ bool hasFocus = m_pParentKonqFrame->isActivePart(); - const TQColorGroup& activeCg = kapp->tqpalette().active(); + const TQColorGroup& activeCg = kapp->palette().active(); setPaletteBackgroundColor( hasFocus ? activeCg.midlight() : activeCg.mid() ); static TQPixmap indicator_viewactive( UserIcon( "indicator_viewactive" ) ); @@ -301,7 +301,7 @@ // the frame statusbar m_pStatusBar = new KonqFrameStatusBar( this, "KonquerorFrameStatusBar"); - m_pStatusBar->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + m_pStatusBar->setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); connect(m_pStatusBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStatusBarClicked())); connect( m_pStatusBar, TQT_SIGNAL( linkedViewClicked( bool ) ), this, TQT_SLOT( slotLinkedViewClicked( bool ) ) ); m_separator = 0; @@ -327,16 +327,16 @@ void KonqFrame::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ ) { if (saveURLs) - config->writePathEntry( TQString::tqfromLatin1( "URL" ).prepend( prefix ), + config->writePathEntry( TQString::fromLatin1( "URL" ).prepend( prefix ), childView()->url().url() ); - config->writeEntry( TQString::tqfromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() ); - config->writeEntry( TQString::tqfromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() ); - config->writeEntry( TQString::tqfromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() ); - config->writeEntry( TQString::tqfromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() ); - config->writeEntry( TQString::tqfromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() ); - config->writeEntry( TQString::tqfromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() ); - //config->writeEntry( TQString::tqfromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() ); - if (this == docContainer) config->writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true ); + config->writeEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() ); + config->writeEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() ); + config->writeEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() ); + config->writeEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() ); + config->writeEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() ); + config->writeEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() ); + //config->writeEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() ); + if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true ); KonqConfigEvent ev( config, prefix+"_", true/*save*/); TQApplication::sendEvent( childView()->part(), &ev ); @@ -352,8 +352,8 @@ { TQString className = "NoPart"; if (part()) className = part()->widget()->className(); - kdDebug(1202) << spaces << "KonqFrame " << this << " visible=" << TQString("%1").tqarg(isVisible()) << " containing view " - << childView() << " visible=" << TQString("%1").tqarg(isVisible()) + kdDebug(1202) << spaces << "KonqFrame " << this << " visible=" << TQString("%1").arg(isVisible()) << " containing view " + << childView() << " visible=" << TQString("%1").arg(isVisible()) << " and part " << part() << " whose widget is a " << className << endl; } @@ -463,7 +463,7 @@ #ifdef USE_QT4 #warning [INFO] Repaint call disabled in Qt4 to prevent recursive repaint (which otherwise occurs for unknown reasons) #else // USE_QT4 - m_pStatusBar->tqrepaint(); + m_pStatusBar->repaint(); #endif // USE_QT4 } @@ -521,40 +521,40 @@ int idSecond = id + (int)pow( 2.0, depth ); //write children sizes - config->writeEntry( TQString::tqfromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() ); + config->writeEntry( TQString::fromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() ); //write children TQStringList strlst; if( firstChild() ) - strlst.append( TQString::tqfromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1) ); + strlst.append( TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1) ); if( secondChild() ) - strlst.append( TQString::tqfromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ) ); + strlst.append( TQString::fromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ) ); - config->writeEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), strlst ); + config->writeEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), strlst ); //write orientation TQString o; if( orientation() == Qt::Horizontal ) - o = TQString::tqfromLatin1("Horizontal"); + o = TQString::fromLatin1("Horizontal"); else if( orientation() == Qt::Vertical ) - o = TQString::tqfromLatin1("Vertical"); - config->writeEntry( TQString::tqfromLatin1( "Orientation" ).prepend( prefix ), o ); + o = TQString::fromLatin1("Vertical"); + config->writeEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ), o ); //write docContainer - if (this == docContainer) config->writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true ); + if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true ); - if (m_pSecondChild == m_pActiveChild) config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ), 1 ); - else config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ), 0 ); + if (m_pSecondChild == m_pActiveChild) config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 1 ); + else config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 0 ); //write child configs if( firstChild() ) { - TQString newPrefix = TQString::tqfromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1); + TQString newPrefix = TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1); newPrefix.append( '_' ); firstChild()->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + 1 ); } if( secondChild() ) { - TQString newPrefix = TQString::tqfromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ); + TQString newPrefix = TQString::fromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ); newPrefix.append( '_' ); secondChild()->saveConfig( config, newPrefix, saveURLs, docContainer, idSecond, depth + 1 ); } @@ -580,7 +580,7 @@ void KonqFrameContainer::printFrameInfo( const TQString& spaces ) { - kdDebug(1202) << spaces << "KonqFrameContainer " << this << " visible=" << TQString("%1").tqarg(isVisible()) + kdDebug(1202) << spaces << "KonqFrameContainer " << this << " visible=" << TQString("%1").arg(isVisible()) << " activeChild=" << m_pActiveChild << endl; if (!m_pActiveChild) kdDebug(1202) << "WARNING: " << this << " has a null active child!" << endl; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/konq_guiclients.cc v3.5.13-sru/konqueror/konq_guiclients.cc --- /tmp/stable//kdebase/konqueror/konq_guiclients.cc 2011-08-11 07:25:53.000000000 +0200 +++ v3.5.13-sru/konqueror/konq_guiclients.cc 2012-09-08 19:41:29.000000000 +0200 @@ -104,8 +104,8 @@ openInSameWindow.setAttribute( "name", "sameview" ); openInSameWindow.setAttribute( "group", "tabhandling" ); menu.appendChild( openInSameWindow ); - - TQDomElement openInWindow = m_doc.createElement( "action" ); + + TQDomElement openInWindow = m_doc.createElement( "action" ); openInWindow.setAttribute( "name", "newview" ); openInWindow.setAttribute( "group", "tabhandling" ); menu.appendChild( openInWindow ); @@ -115,6 +115,11 @@ openInTabElement.setAttribute( "group", "tabhandling" ); menu.appendChild( openInTabElement ); + TQDomElement openInTabFrontElement = m_doc.createElement( "action" ); + openInTabFrontElement.setAttribute( "name", "openintabfront" ); + openInTabFrontElement.setAttribute( "group", "tabhandling" ); + menu.appendChild( openInTabFrontElement ); + TQDomElement separatorElement = m_doc.createElement( "separator" ); separatorElement.setAttribute( "group", "tabhandling" ); menu.appendChild( separatorElement ); @@ -191,7 +196,7 @@ TQString name = (*cIt)->desktopEntryName(); //kdDebug(1202) << "ToggleViewGUIClient: name=" << name << endl; KToggleAction *action = new KToggleAction( description, 0, mainWindow->actionCollection(), name.latin1() ); - action->setCheckedState( i18n( "Hide %1" ).tqarg( (*cIt)->name() ) ); + action->setCheckedState( i18n( "Hide %1" ).arg( (*cIt)->name() ) ); // HACK if ( (*cIt)->icon() != "unknown" ) @@ -230,7 +235,7 @@ void ToggleViewGUIClient::slotToggleView( bool toggle ) { - TQString serviceName = TQString::tqfromLatin1( TQT_TQOBJECT_CONST(sender())->name() ); + TQString serviceName = TQString::fromLatin1( TQT_TQOBJECT_CONST(sender())->name() ); bool horizontal = m_mapOrientation[ serviceName ]; @@ -240,7 +245,7 @@ { KonqView *childView = viewManager->splitWindow( horizontal ? Qt::Vertical : Qt::Horizontal, - TQString::tqfromLatin1( "Browser/View" ), + TQString::fromLatin1( "Browser/View" ), serviceName, !horizontal /* vertical = make it first */); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/konq_main.cc v3.5.13-sru/konqueror/konq_main.cc --- /tmp/stable//kdebase/konqueror/konq_main.cc 2011-08-11 07:25:53.000000000 +0200 +++ v3.5.13-sru/konqueror/konq_main.cc 2012-09-08 19:41:29.000000000 +0200 @@ -76,7 +76,7 @@ while ( KonqMainWindow::canBeRestored( n ) ) { TQString className = KMainWindow::classNameOfToplevel( n ); - if( className == TQString::tqfromLatin1( "KonqMainWindow" )) + if( className == TQString::fromLatin1( "KonqMainWindow" )) (new KonqMainWindow( KURL(), false ) )->restore( n ); else kdWarning() << "Unknown class " << className << " in session saved data!" << endl; @@ -104,7 +104,7 @@ TQString profile = TQString::fromLocal8Bit(args->getOption("profile")); TQString profilePath = profile; if (profile[0] != '/') - profilePath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ); + profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ); TQString url; TQStringList filesToSelect; if (args->count() == 1) @@ -150,7 +150,7 @@ { // By default try to open in webbrowser mode. People can use "konqueror ." to get a filemanager. TQString profile = "webbrowsing"; - TQString profilePath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ); + TQString profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ); if ( !profilePath.isEmpty() ) { KonqMisc::createBrowserWindowFromProfile( profilePath, profile ); } else { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/konq_mainwindow.cc v3.5.13-sru/konqueror/konq_mainwindow.cc --- /tmp/stable//kdebase/konqueror/konq_mainwindow.cc 2011-08-20 09:14:06.000000000 +0200 +++ v3.5.13-sru/konqueror/konq_mainwindow.cc 2012-09-08 19:41:29.000000000 +0200 @@ -235,7 +235,7 @@ connect(toolBarMenuAction(),TQT_SIGNAL(activated()),this,TQT_SLOT(slotForceSaveMainWindowSettings()) ); if ( !m_toggleViewGUIClient->empty() ) - plugActionList( TQString::tqfromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); + plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); else { delete m_toggleViewGUIClient; @@ -342,8 +342,8 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ) { - static TQString nameBookmarkBar = TQString::tqfromLatin1( "bookmarkToolBar" ); - static TQString tagToolBar = TQString::tqfromLatin1( "ToolBar" ); + static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" ); + static TQString tagToolBar = TQString::fromLatin1( "ToolBar" ); TQWidget *res = KParts::MainWindow::createContainer( parent, index, element, id ); @@ -393,8 +393,8 @@ void KonqMainWindow::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id ) { - static TQString nameBookmarkBar = TQString::tqfromLatin1( "bookmarkToolBar" ); - static TQString tagToolBar = TQString::tqfromLatin1( "ToolBar" ); + static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" ); + static TQString tagToolBar = TQString::fromLatin1( "ToolBar" ); if ( element.tagName() == tagToolBar && element.attribute( "name" ) == nameBookmarkBar ) { @@ -966,10 +966,10 @@ if ( !frameName.isEmpty() ) { - static TQString _top = TQString::tqfromLatin1( "_top" ); - static TQString _self = TQString::tqfromLatin1( "_self" ); - static TQString _parent = TQString::tqfromLatin1( "_parent" ); - static TQString _blank = TQString::tqfromLatin1( "_blank" ); + static TQString _top = TQString::fromLatin1( "_top" ); + static TQString _self = TQString::fromLatin1( "_self" ); + static TQString _parent = TQString::fromLatin1( "_parent" ); + static TQString _blank = TQString::fromLatin1( "_blank" ); if ( frameName.lower() == _blank ) { @@ -1234,7 +1234,7 @@ mainWindow->viewManager()->setActivePart( part, true ); } - TQString profileName = TQString::tqfromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" ); + TQString profileName = TQString::fromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" ); KSimpleConfig cfg( locate( "data", profileName ), true ); cfg.setGroup( "Profile" ); @@ -1284,7 +1284,7 @@ if ( !windowArgs.resizable ) // ### this doesn't seem to work :-( - mainWindow->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mainWindow->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); // Trying to show the window initially behind the current window is a bit tricky, // as this involves the window manager, which may see things differently. @@ -1336,12 +1336,12 @@ if ( profile.isEmpty() ) { if ( m_currentView && m_currentView->url().protocol().startsWith( "http" ) ) - profile = TQString::tqfromLatin1("webbrowsing"); + profile = TQString::fromLatin1("webbrowsing"); else - profile = TQString::tqfromLatin1("filemanagement"); + profile = TQString::fromLatin1("filemanagement"); } KonqMisc::createBrowserWindowFromProfile( - locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ), + locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ), profile ); } @@ -1528,7 +1528,7 @@ else url.setPath( TQDir::homeDirPath() ); KonqMainWindow * mw = KonqMisc::createBrowserWindowFromProfile( - locate( "data", TQString::tqfromLatin1("konqueror/profiles/filemanagement") ), + locate( "data", TQString::fromLatin1("konqueror/profiles/filemanagement") ), "filemanagement", url, KParts::URLArgs(), true /* forbid "use html"*/ ); mw->m_paFindFiles->setChecked(true); // Delay it after the openURL call (hacky!) @@ -1652,7 +1652,7 @@ // current viewmode TQPtrListIterator it( m_toolBarViewModeActions ); for (; it.current(); ++it ) - if ( TQString::tqfromLatin1( it.current()->name() ) == oldService->desktopEntryName() ) + if ( TQString::fromLatin1( it.current()->name() ) == oldService->desktopEntryName() ) { assert( it.current()->inherits( "KonqViewModeAction" ) ); @@ -1815,7 +1815,7 @@ if ( !reloadView || reloadView->url().isEmpty() ) return; - if ( reloadView->part() && (reloadView->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if ( reloadView->part() && (reloadView->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = reloadView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -2032,7 +2032,7 @@ void KonqMainWindow::slotNewToolbarConfig() // This is called when OK or Apply is clicked { if ( m_toggleViewGUIClient ) - plugActionList( TQString::tqfromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); + plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); if ( m_currentView && m_currentView->appServiceOffers().count() > 0 ) plugActionList( "openwith", m_openWithActions ); @@ -2048,7 +2048,7 @@ if ( avail && m_currentView && m_currentView->part() ) { // Avoid qWarning from TQObject::property if it doesn't exist - if ( m_currentView->part()->tqmetaObject()->findProperty( "supportsUndo" ) != -1 ) + if ( m_currentView->part()->metaObject()->findProperty( "supportsUndo" ) != -1 ) { TQVariant prop = m_currentView->part()->property( "supportsUndo" ); if ( prop.isValid() && prop.toBool() ) @@ -2665,7 +2665,7 @@ void KonqMainWindow::slotBreakOffTab() { if (m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) { + (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -2682,7 +2682,7 @@ { KonqView* originalView = m_currentView; KonqView *view = m_pWorkingTab->activeChildView(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -2726,6 +2726,14 @@ openURL( 0L, popupItems.getFirst()->url() ); } +void KonqMainWindow::slotPopupNewTabAtFront() +{ + KConfig *config = KGlobal::config(); + KConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") ); + bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false ); + popupNewTab(true, openAfterCurrentPage); +} + void KonqMainWindow::slotPopupNewTab() { bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage(); @@ -2787,7 +2795,7 @@ void KonqMainWindow::slotRemoveView() { if (m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) { + (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -2803,7 +2811,7 @@ void KonqMainWindow::slotRemoveTab() { if (m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) { + (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -2819,7 +2827,7 @@ { KonqView *originalView = m_currentView; KonqView *view = m_pWorkingTab->activeChildView(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -2856,7 +2864,7 @@ MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) { KonqView *view = it.data(); - if ( view != originalView && view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if ( view != originalView && view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -2889,7 +2897,7 @@ MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) { KonqView *view = it.data(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -3454,7 +3462,7 @@ ext = m_currentView->browserExtension(); TQStrList slotNames; if (ext) - slotNames = ext->tqmetaObject()->slotNames(); + slotNames = ext->metaObject()->slotNames(); //for ( char * s = slotNames.first() ; s ; s = slotNames.next() ) //{ @@ -3494,7 +3502,7 @@ connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); connect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) ); - connect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); + connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) ); connect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) ); @@ -3535,7 +3543,7 @@ disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); disconnect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) ); - disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); + disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); disconnect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) ); disconnect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) ); @@ -3563,7 +3571,7 @@ void KonqMainWindow::slotClipboardDataChanged() { //kdDebug(1202) << "KonqMainWindow::slotClipboardDataChanged()" << endl; - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); m_paPaste->setEnabled( data->provides( "text/plain" ) ); slotCheckComboSelection(); } @@ -3583,7 +3591,7 @@ m_combo->clearTemporary(); focusLocationBar(); if ( state & Qt::MidButton ) - m_combo->setURL( TQApplication::tqclipboard()->text( TQClipboard::Selection ) ); + m_combo->setURL( TQApplication::clipboard()->text( TQClipboard::Selection ) ); } void KonqMainWindow::slotForceSaveMainWindowSettings() @@ -4327,7 +4335,7 @@ KParts::BrowserExtension::ActionSlotMap::ConstIterator it = actionSlotMap->begin(); KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end(); - TQStrList slotNames = ext->tqmetaObject()->slotNames(); + TQStrList slotNames = ext->metaObject()->slotNames(); for ( ; it != itEnd ; ++it ) { @@ -4361,7 +4369,7 @@ KParts::BrowserExtension::ActionSlotMap::ConstIterator it = actionSlotMap->begin(); KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end(); - TQStrList slotNames = ext->tqmetaObject()->slotNames(); + TQStrList slotNames = ext->metaObject()->slotNames(); for ( ; it != itEnd ; ++it ) { @@ -4782,8 +4790,14 @@ else tab_new_x = "tab_new_bg" ; - actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); - actNewTab->setToolTip( i18n( "Open the document in a new tab" ) ); + KAction *actNewTab = new KAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" ); + actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) ); + KAction *actNewTabFront = new KAction( i18n( "Open in &New Tab" ), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" ); + actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) ); + actNewTab = new KAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); + actNewTabFront = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" ); + actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) ); + actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) ); doTabHandling = true; } @@ -4888,7 +4902,7 @@ m_currentView = m_oldView; } // Special case: RMB + renaming in sidebar; setFocus would abort editing. - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if ( !fw || !::tqqt_cast( fw ) ) m_oldView->part()->widget()->setFocus(); } @@ -5111,7 +5125,7 @@ itname = (*it)->name(); TQString icon = (*it)->icon(); - if ( icon != TQString::tqfromLatin1( "unknown" ) ) + if ( icon != TQString::fromLatin1( "unknown" ) ) // we *have* to specify a parent qobject, otherwise the exclusive group stuff doesn't work!(Simon) action = new KRadioAction( itname, icon, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); else @@ -5282,7 +5296,7 @@ if ( tabContainer->count() > 1 ) { KConfig *config = KGlobal::config(); - KConfigGroupSaver cs( config, TQString::tqfromLatin1("Notification Messages") ); + KConfigGroupSaver cs( config, TQString::fromLatin1("Notification Messages") ); if ( !config->hasKey( "MultipleTabConfirm" ) ) { @@ -5320,7 +5334,7 @@ MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) { KonqView *view = it.data(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -5338,7 +5352,7 @@ // m_pViewManager->showTab( originalView ); } else if ( m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) + (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/konq_mainwindow.h v3.5.13-sru/konqueror/konq_mainwindow.h --- /tmp/stable//kdebase/konqueror/konq_mainwindow.h 2011-03-12 07:58:18.000000000 +0100 +++ v3.5.13-sru/konqueror/konq_mainwindow.h 2012-09-08 19:41:29.000000000 +0200 @@ -444,6 +444,7 @@ void slotPopupNewWindow(); void slotPopupThisWindow(); void slotPopupNewTab(); + void slotPopupNewTabAtFront(); void slotPopupNewTabRight(); void slotPopupPasteTo(); void slotRemoveView(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/konq_misc.cc v3.5.13-sru/konqueror/konq_misc.cc --- /tmp/stable//kdebase/konqueror/konq_misc.cc 2011-03-12 07:58:18.000000000 +0100 +++ v3.5.13-sru/konqueror/konq_misc.cc 2012-09-08 19:41:29.000000000 +0200 @@ -106,7 +106,7 @@ KMimeType::findByURL(url)->name() == "text/html") ? "webbrowsing" : "filemanagement"; - TQString profile = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profileName ); + TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName ); return createBrowserWindowFromProfile(profile, profileName, url, args, forbidUseHTML, filesToSelect, tempFile, openURL ); @@ -225,7 +225,7 @@ , m_mw(mw) { setBackgroundMode( TQt::PaletteButton ); - tqsetAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | + setAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | Qt::AlignVCenter | TQt::ShowPrefix ); setAcceptDrops(true); adjustSize(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/konq_profiledlg.cc v3.5.13-sru/konqueror/konq_profiledlg.cc --- /tmp/stable//kdebase/konqueror/konq_profiledlg.cc 2011-08-11 07:25:53.000000000 +0200 +++ v3.5.13-sru/konqueror/konq_profiledlg.cc 2012-09-08 19:41:29.000000000 +0200 @@ -104,7 +104,7 @@ TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) ); loadAllProfiles( preselectProfile ); - m_pListView->setMinimumSize( m_pListView->tqsizeHint() ); + m_pListView->setMinimumSize( m_pListView->sizeHint() ); m_cbSaveURLs = new TQCheckBox( i18n("Save &URLs in profile"), box ); m_cbSaveURLs->setChecked( KonqSettings::saveURLInProfile() ); @@ -121,7 +121,7 @@ enableButton( BTN_RENAME, m_pListView->selectedItem ()!=0 ); enableButton( BTN_DELETE, m_pListView->selectedItem ()!=0 ); - resize( tqsizeHint() ); + resize( sizeHint() ); } KonqProfileDlg::~KonqProfileDlg() diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/konq_tabs.cc v3.5.13-sru/konqueror/konq_tabs.cc --- /tmp/stable//kdebase/konqueror/konq_tabs.cc 2011-03-12 07:58:18.000000000 +0100 +++ v3.5.13-sru/konqueror/konq_tabs.cc 2012-09-08 19:41:29.000000000 +0200 @@ -196,16 +196,16 @@ TQString newPrefix; for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next()) { - newPrefix = TQString::tqfromLatin1( it->frameType() ) + "T" + TQString::number(i); + newPrefix = TQString::fromLatin1( it->frameType() ) + "T" + TQString::number(i); strlst.append( newPrefix ); newPrefix.append( '_' ); it->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + i ); i++; } - config->writeEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), strlst ); + config->writeEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), strlst ); - config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ), + config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), currentPageIndex() ); } @@ -218,14 +218,14 @@ for (uint i = 0; i < m_pChildFrameList->count(); i++ ) { - m_pChildFrameList->tqat(i)->copyHistory( static_cast( other )->m_pChildFrameList->tqat(i) ); + m_pChildFrameList->at(i)->copyHistory( static_cast( other )->m_pChildFrameList->at(i) ); } } void KonqFrameTabs::printFrameInfo( const TQString& spaces ) { kdDebug(1202) << spaces << "KonqFrameTabs " << this << " visible=" - << TQString("%1").tqarg(isVisible()) << " activeChild=" + << TQString("%1").arg(isVisible()) << " activeChild=" << m_pActiveChild << endl; if (!m_pActiveChild) @@ -234,7 +234,7 @@ KonqFrameBase* child; int childFrameCount = m_pChildFrameList->count(); for (int i = 0 ; i < childFrameCount ; i++) { - child = m_pChildFrameList->tqat(i); + child = m_pChildFrameList->at(i); if (child != 0L) child->printFrameInfo(spaces + " "); else @@ -346,7 +346,7 @@ void KonqFrameTabs::slotMovedTab( int from, int to ) { - KonqFrameBase* fromFrame = m_pChildFrameList->tqat( from ); + KonqFrameBase* fromFrame = m_pChildFrameList->at( from ); m_pChildFrameList->remove( fromFrame ); m_pChildFrameList->insert( to, fromFrame ); @@ -440,8 +440,8 @@ void KonqFrameTabs::slotMouseMiddleClick() { - TQApplication::tqclipboard()->setSelectionMode( TQClipboard::Selection ); - KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::tqclipboard()->text() ) ); + TQApplication::clipboard()->setSelectionMode( TQClipboard::Selection ); + KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) ); if ( !filteredURL.isEmpty() ) { KonqView* newView = m_pViewManager->addTab(TQString::null, TQString::null, false, false); if (newView == 0L) return; @@ -461,8 +461,8 @@ } } else { - TQApplication::tqclipboard()->setSelectionMode( TQClipboard::Selection ); - KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::tqclipboard()->text() ) ); + TQApplication::clipboard()->setSelectionMode( TQClipboard::Selection ); + KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) ); if ( !filteredURL.isEmpty() ) { KonqFrameBase* frame = tqt_dynamic_cast(w); if (frame) { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/KonquerorIface.cc v3.5.13-sru/konqueror/KonquerorIface.cc --- /tmp/stable//kdebase/konqueror/KonquerorIface.cc 2011-08-11 07:25:53.000000000 +0200 +++ v3.5.13-sru/konqueror/KonquerorIface.cc 2012-09-08 19:41:29.000000000 +0200 @@ -251,18 +251,18 @@ TQStringList allowed_parts = KonqSettings::safeParts(); bool all_parts_allowed = false; - if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::tqfromLatin1( "SAFE" )) + if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "SAFE" )) { allowed_parts.clear(); // is duplicated in client/kfmclient.cc - allowed_parts << TQString::tqfromLatin1( "konq_iconview.desktop" ) - << TQString::tqfromLatin1( "konq_multicolumnview.desktop" ) - << TQString::tqfromLatin1( "konq_sidebartng.desktop" ) - << TQString::tqfromLatin1( "konq_infolistview.desktop" ) - << TQString::tqfromLatin1( "konq_treeview.desktop" ) - << TQString::tqfromLatin1( "konq_detailedlistview.desktop" ); + allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" ) + << TQString::fromLatin1( "konq_multicolumnview.desktop" ) + << TQString::fromLatin1( "konq_sidebartng.desktop" ) + << TQString::fromLatin1( "konq_infolistview.desktop" ) + << TQString::fromLatin1( "konq_treeview.desktop" ) + << TQString::fromLatin1( "konq_detailedlistview.desktop" ); } - else if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::tqfromLatin1( "ALL" )) + else if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "ALL" )) { allowed_parts.clear(); all_parts_allowed = true; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/konq_view.cc v3.5.13-sru/konqueror/konq_view.cc --- /tmp/stable//kdebase/konqueror/konq_view.cc 2011-08-11 07:25:53.000000000 +0200 +++ v3.5.13-sru/konqueror/konq_view.cc 2012-09-08 19:41:29.000000000 +0200 @@ -117,7 +117,7 @@ if (part_url.isNull()) part_url = ""; TQCString line; - line = ( TQString("close(%1):%2\n").tqarg(m_randID,0,16).tqarg(part_url) ).utf8(); + line = ( TQString("close(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8(); KonqMainWindow::s_crashlog_file->writeBlock(line, line.length()); KonqMainWindow::s_crashlog_file->flush(); } @@ -155,9 +155,9 @@ TQCString line; - line = ( TQString("closed(%1):%2\n").tqarg(m_randID,0,16).tqarg(part_url) ).utf8(); + line = ( TQString("closed(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8(); KonqMainWindow::s_crashlog_file->writeBlock(line,line.length()); - line = ( TQString("opened(%3):%4\n").tqarg(m_randID,0,16).tqarg(url_url) ).utf8(); + line = ( TQString("opened(%3):%4\n").arg(m_randID,0,16).arg(url_url) ).utf8(); KonqMainWindow::s_crashlog_file->writeBlock(line,line.length()); KonqMainWindow::s_crashlog_file->flush(); } @@ -227,7 +227,7 @@ KonqHistoryManager::kself()->addPending( url, locationBarURL, TQString::null); #ifdef DEBUG_HISTORY - kdDebug(1202) << "Current position : " << m_lstHistory.tqat() << endl; + kdDebug(1202) << "Current position : " << m_lstHistory.at() << endl; #endif } @@ -528,8 +528,8 @@ // Manage passwords properly... if (m_pMainWindow) { - kdDebug(7035) << "slotStarted: Window ID = " << m_pMainWindow->tqtopLevelWidget()->winId() << endl; - job->setWindow (m_pMainWindow->tqtopLevelWidget ()); + kdDebug(7035) << "slotStarted: Window ID = " << m_pMainWindow->topLevelWidget()->winId() << endl; + job->setWindow (m_pMainWindow->topLevelWidget ()); } connect( job, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( KIO::Job *, unsigned long ) ) ); @@ -711,7 +711,7 @@ #ifdef DEBUG_HISTORY kdDebug(1202) << "Truncating history" << endl; #endif - m_lstHistory.tqat( m_lstHistory.count() - 1 ); // go to last one + m_lstHistory.at( m_lstHistory.count() - 1 ); // go to last one for ( ; m_lstHistory.current() != current ; ) { if ( !m_lstHistory.removeLast() ) // and remove from the end (faster and easier) @@ -720,7 +720,7 @@ // makes current() null if it's the last item. however in qt2 // the behaviour was different than the documentation. this is // changed in qt3 to behave as documented ;-) (Simon) - m_lstHistory.tqat( m_lstHistory.count() - 1 ); + m_lstHistory.at( m_lstHistory.count() - 1 ); } // Now current is the current again. } @@ -730,9 +730,9 @@ #endif m_lstHistory.append( new HistoryEntry ); // made current #ifdef DEBUG_HISTORY - kdDebug(1202) << "at=" << m_lstHistory.tqat() << " count=" << m_lstHistory.count() << endl; + kdDebug(1202) << "at=" << m_lstHistory.at() << " count=" << m_lstHistory.count() << endl; #endif - assert( m_lstHistory.tqat() == (int) m_lstHistory.count() - 1 ); + assert( m_lstHistory.at() == (int) m_lstHistory.count() - 1 ); } void KonqView::updateHistoryEntry( bool saveLocationBarURL ) @@ -752,20 +752,20 @@ } #ifdef DEBUG_HISTORY - kdDebug(1202) << "Saving part URL : " << m_pPart->url() << " in history position " << m_lstHistory.tqat() << endl; + kdDebug(1202) << "Saving part URL : " << m_pPart->url() << " in history position " << m_lstHistory.at() << endl; #endif current->url = m_pPart->url(); if (saveLocationBarURL) { #ifdef DEBUG_HISTORY - kdDebug(1202) << "Saving location bar URL : " << m_sLocationBarURL << " in history position " << m_lstHistory.tqat() << endl; + kdDebug(1202) << "Saving location bar URL : " << m_sLocationBarURL << " in history position " << m_lstHistory.at() << endl; #endif current->locationBarURL = m_sLocationBarURL; current->pageSecurity = m_pageSecurity; } #ifdef DEBUG_HISTORY - kdDebug(1202) << "Saving title : " << m_caption << " in history position " << m_lstHistory.tqat() << endl; + kdDebug(1202) << "Saving title : " << m_caption << " in history position " << m_lstHistory.at() << endl; #endif current->title = m_caption; current->strServiceType = m_serviceType; @@ -800,7 +800,7 @@ return; } - int newPos = m_lstHistory.tqat() + steps; + int newPos = m_lstHistory.at() + steps; #ifdef DEBUG_HISTORY kdDebug(1202) << "go : steps=" << steps << " newPos=" << newPos @@ -813,13 +813,13 @@ stop(); // Yay, we can move there without a loop ! - HistoryEntry *currentHistoryEntry = m_lstHistory.tqat( newPos ); // sets current item + HistoryEntry *currentHistoryEntry = m_lstHistory.at( newPos ); // sets current item assert( currentHistoryEntry ); - assert( newPos == m_lstHistory.tqat() ); // check we moved (i.e. if I understood the docu) + assert( newPos == m_lstHistory.at() ); // check we moved (i.e. if I understood the docu) assert( currentHistoryEntry == m_lstHistory.current() ); #ifdef DEBUG_HISTORY - kdDebug(1202) << "New position " << m_lstHistory.tqat() << endl; + kdDebug(1202) << "New position " << m_lstHistory.at() << endl; #endif restoreHistory(); @@ -866,7 +866,7 @@ m_pMainWindow->updateToolBarActions(); #ifdef DEBUG_HISTORY - kdDebug(1202) << "New position (2) " << m_lstHistory.tqat() << endl; + kdDebug(1202) << "New position (2) " << m_lstHistory.at() << endl; #endif } @@ -874,9 +874,9 @@ { if(pos<0 || pos>=(int)m_lstHistory.count()) return 0L; - int oldpos = m_lstHistory.tqat(); - const HistoryEntry* h = m_lstHistory.tqat(pos); - m_lstHistory.tqat( oldpos ); + int oldpos = m_lstHistory.at(); + const HistoryEntry* h = m_lstHistory.at(pos); + m_lstHistory.at( oldpos ); return h; } @@ -887,7 +887,7 @@ TQPtrListIterator it( other->m_lstHistory ); for (; it.current(); ++it ) m_lstHistory.append( new HistoryEntry( *it.current() ) ); - m_lstHistory.tqat(other->m_lstHistory.tqat()); + m_lstHistory.at(other->m_lstHistory.at()); } KURL KonqView::url() const @@ -1077,7 +1077,7 @@ if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->findSlot( methodName ); + int id = obj->metaObject()->findSlot( methodName ); if ( id == -1 ) return false; TQUObject o[ 1 ]; @@ -1092,7 +1092,7 @@ if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->findSlot( methodName ); + int id = obj->metaObject()->findSlot( methodName ); if ( id == -1 ) return false; TQUObject o[ 2 ]; @@ -1109,7 +1109,7 @@ if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->findSlot( methodName ); + int id = obj->metaObject()->findSlot( methodName ); if ( id == -1 ) return false; TQUObject o[ 2 ]; @@ -1126,7 +1126,7 @@ if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->findSlot( methodName ); + int id = obj->metaObject()->findSlot( methodName ); if ( id == -1 ) return false; TQUObject o[ 2 ]; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/konq_view.h v3.5.13-sru/konqueror/konq_view.h --- /tmp/stable//kdebase/konqueror/konq_view.h 2011-03-12 07:58:18.000000000 +0100 +++ v3.5.13-sru/konqueror/konq_view.h 2012-09-08 19:41:29.000000000 +0200 @@ -125,17 +125,17 @@ /** * @return true if view can go back */ - bool canGoBack()const { return m_lstHistory.tqat() > 0; } + bool canGoBack()const { return m_lstHistory.at() > 0; } /** * @return true if view can go forward */ - bool canGoForward()const { return m_lstHistory.tqat() != ((int)m_lstHistory.count())-1; } + bool canGoForward()const { return m_lstHistory.at() != ((int)m_lstHistory.count())-1; } /** * @return the position in the history */ - int historyPos() const { return m_lstHistory.tqat(); } + int historyPos() const { return m_lstHistory.at(); } uint historyLength() { return m_lstHistory.count(); } @@ -149,7 +149,7 @@ */ void restoreHistory(); - void setHistoryPos(int newPos) { m_lstHistory.tqat( newPos ); } + void setHistoryPos(int newPos) { m_lstHistory.at( newPos ); } /** * @return the history of this view diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/konq_viewmgr.cc v3.5.13-sru/konqueror/konq_viewmgr.cc --- /tmp/stable//kdebase/konqueror/konq_viewmgr.cc 2011-08-11 07:25:53.000000000 +0200 +++ v3.5.13-sru/konqueror/konq_viewmgr.cc 2012-09-08 19:41:29.000000000 +0200 @@ -132,7 +132,7 @@ //printSizeInfo( splitFrame, parentContainer, "before split"); #endif - parentContainer->widget()->tqsetUpdatesEnabled( false ); + parentContainer->widget()->setUpdatesEnabled( false ); //kdDebug(1202) << "Move out child" << endl; TQPoint pos = splitFrame->widget()->pos(); @@ -184,7 +184,7 @@ //newView->frame()->show(); newContainer->show(); - parentContainer->widget()->tqsetUpdatesEnabled( true ); + parentContainer->widget()->setUpdatesEnabled( true ); if (m_pDocContainer == splitFrame) m_pDocContainer = newContainer; @@ -226,7 +226,7 @@ KonqFrameBase* mainFrame = m_pMainWindow->childFrame(); - mainFrame->widget()->tqsetUpdatesEnabled( false ); + mainFrame->widget()->setUpdatesEnabled( false ); //kdDebug(1202) << "Move out child" << endl; TQPoint pos = mainFrame->widget()->pos(); @@ -249,7 +249,7 @@ newContainer->show(); - mainFrame->widget()->tqsetUpdatesEnabled( true ); + mainFrame->widget()->setUpdatesEnabled( true ); if( childView ) childView->openURL( url, locationBarURL ); @@ -279,7 +279,7 @@ splitterSizes = static_cast(parentContainer)->sizes(); } - parentContainer->widget()->tqsetUpdatesEnabled( false ); + parentContainer->widget()->setUpdatesEnabled( false ); //kdDebug(1202) << "Move out child" << endl; TQPoint pos = m_pDocContainer->widget()->pos(); @@ -302,7 +302,7 @@ newContainer->show(); - parentContainer->widget()->tqsetUpdatesEnabled( true ); + parentContainer->widget()->setUpdatesEnabled( true ); m_pDocContainer = newContainer; } @@ -423,7 +423,7 @@ KConfig config( tempFile.name() ); config.setGroup( "View Profile" ); - TQString prefix = TQString::tqfromLatin1( currentFrame->frameType() ) + TQString::number(0); + TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0); config.writeEntry( "RootItem", prefix ); prefix.append( '_' ); currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1); @@ -493,10 +493,10 @@ KConfig config( tempFile.name() ); config.setGroup( "View Profile" ); - TQString prefix = TQString::tqfromLatin1( currentFrame->frameType() ) + TQString::number(0); + TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0); config.writeEntry( "RootItem", prefix ); prefix.append( '_' ); - config.writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true ); + config.writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true ); currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1); KonqMainWindow *mainWindow = new KonqMainWindow( KURL(), false ); @@ -784,7 +784,7 @@ if (m_pDocContainer == parentContainer) m_pDocContainer = otherFrame; - grandParentContainer->widget()->tqsetUpdatesEnabled( false ); + grandParentContainer->widget()->setUpdatesEnabled( false ); static_cast(parentContainer)->setAboutToBeDeleted(); //kdDebug(1202) << "--- Reparenting otherFrame to m_pMainWindow " << m_pMainWindow << endl; @@ -826,7 +826,7 @@ grandParentContainer->setActiveChild( otherFrame ); grandParentContainer->activateChild(); - grandParentContainer->widget()->tqsetUpdatesEnabled( true ); + grandParentContainer->widget()->setUpdatesEnabled( true ); } else if (parentContainer->frameType()=="Tabs") { kdDebug(1202) << "parentContainer " << parentContainer << " is a KonqFrameTabs" << endl; @@ -1077,7 +1077,7 @@ void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString & profileName, bool saveURLs, bool saveWindowSize ) { - TQString path = locateLocal( "data", TQString::tqfromLatin1( "konqueror/profiles/" ) + + TQString path = locateLocal( "data", TQString::fromLatin1( "konqueror/profiles/" ) + fileName, KGlobal::instance() ); if ( TQFile::exists( path ) ) @@ -1096,7 +1096,7 @@ { //kdDebug(1202) << "KonqViewManager::saveViewProfile" << endl; if( m_pMainWindow->childFrame() != 0L ) { - TQString prefix = TQString::tqfromLatin1( m_pMainWindow->childFrame()->frameType() ) + TQString prefix = TQString::fromLatin1( m_pMainWindow->childFrame()->frameType() ) + TQString::number(0); cfg.writeEntry( "RootItem", prefix ); prefix.append( '_' ); @@ -1156,7 +1156,7 @@ for ( it.toFirst(); it != 0L; ++it ) { KonqView *view = it.current()->activeChildView(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1)) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { showTab( view ); @@ -1175,7 +1175,7 @@ else { KonqView *view = m_pMainWindow->currentView(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1)) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( 0, @@ -1465,8 +1465,8 @@ serviceType = "text/html"; serviceName = "html"; } else { - serviceType = cfg.readEntry( TQString::tqfromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory"); - serviceName = cfg.readEntry( TQString::tqfromLatin1( "ServiceName" ).prepend( prefix ) ); + serviceType = cfg.readEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory"); + serviceName = cfg.readEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ) ); } //kdDebug(1202) << "KonqViewManager::loadItem: ServiceType " << serviceType << " " << serviceName << endl; @@ -1480,17 +1480,17 @@ return; //ugh.. } - bool passiveMode = cfg.readBoolEntry( TQString::tqfromLatin1( "PassiveMode" ).prepend( prefix ), false ); + bool passiveMode = cfg.readBoolEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), false ); //kdDebug(1202) << "KonqViewManager::loadItem: Creating View Stuff" << endl; KonqView *childView = setupView( parent, viewFactory, service, partServiceOffers, appServiceOffers, serviceType, passiveMode, openAfterCurrentPage ); - if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( TQString::tqfromLatin1( "LinkedView" ).prepend( prefix ), false ) ); - childView->setToggleView( cfg.readBoolEntry( TQString::tqfromLatin1( "ToggleView" ).prepend( prefix ), false ) ); - if( !cfg.readBoolEntry( TQString::tqfromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) ) + if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), false ) ); + childView->setToggleView( cfg.readBoolEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), false ) ); + if( !cfg.readBoolEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) ) childView->frame()->statusbar()->hide(); - if (cfg.readBoolEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), false )) + if (cfg.readBoolEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), false )) m_pDocContainer = childView->frame(); if (!m_pDocContainer) @@ -1536,7 +1536,7 @@ childView->frame()->show(); - TQString key = TQString::tqfromLatin1( "URL" ).prepend( prefix ); + TQString key = TQString::fromLatin1( "URL" ).prepend( prefix ); if ( openURL ) { KURL url; @@ -1546,11 +1546,11 @@ { TQString u = cfg.readPathEntry( key ); if ( u.isEmpty() ) - u = TQString::tqfromLatin1("about:blank"); + u = TQString::fromLatin1("about:blank"); url = u; } else if(key == "empty_URL") - url = TQString::tqfromLatin1("about:blank"); + url = TQString::fromLatin1("about:blank"); else url = defaultURL; @@ -1567,13 +1567,13 @@ //else kdDebug(1202) << "KonqViewManager::loadItem: url is empty" << endl; } // Do this after opening the URL, so that it's actually possible to open it :) - childView->setLockedLocation( cfg.readBoolEntry( TQString::tqfromLatin1( "LockedLocation" ).prepend( prefix ), false ) ); + childView->setLockedLocation( cfg.readBoolEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), false ) ); } else if( name.startsWith("Container") ) { //kdDebug(1202) << "KonqViewManager::loadItem Item is Container" << endl; //load container config - TQString ostr = cfg.readEntry( TQString::tqfromLatin1( "Orientation" ).prepend( prefix ) ); + TQString ostr = cfg.readEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ) ); //kdDebug(1202) << "Orientation: " << ostr << endl; Qt::Orientation o; if( ostr == "Vertical" ) @@ -1586,12 +1586,12 @@ } TQValueList sizes = - cfg.readIntListEntry( TQString::tqfromLatin1( "SplitterSizes" ).prepend( prefix )); + cfg.readIntListEntry( TQString::fromLatin1( "SplitterSizes" ).prepend( prefix )); - int index = cfg.readNumEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend(prefix), -1 ); + int index = cfg.readNumEntry( TQString::fromLatin1( "activeChildIndex" ).prepend(prefix), -1 ); TQStrList childList; - if( cfg.readListEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), childList ) < 2 ) + if( cfg.readListEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), childList ) < 2 ) { kdWarning() << "Profile Loading Error: Less than two children in " << name << endl; // fallback to defaults @@ -1608,11 +1608,11 @@ parent->insertChildFrame( newContainer, tabindex ); - if (cfg.readBoolEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), false )) + if (cfg.readBoolEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), false )) m_pDocContainer = newContainer; - loadItem( cfg, newContainer, childList.tqat(0), defaultURL, openURL ); - loadItem( cfg, newContainer, childList.tqat(1), defaultURL, openURL ); + loadItem( cfg, newContainer, childList.at(0), defaultURL, openURL ); + loadItem( cfg, newContainer, childList.at(1), defaultURL, openURL ); newContainer->setSizes( sizes ); @@ -1634,9 +1634,9 @@ parent->insertChildFrame( newContainer ); m_pDocContainer = newContainer; - int index = cfg.readNumEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend(prefix), 0 ); + int index = cfg.readNumEntry( TQString::fromLatin1( "activeChildIndex" ).prepend(prefix), 0 ); - TQStringList childList = cfg.readListEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ) ); + TQStringList childList = cfg.readListEntry( TQString::fromLatin1( "Children" ).prepend( prefix ) ); for ( TQStringList::Iterator it = childList.begin(); it != childList.end(); ++it ) { loadItem( cfg, newContainer, *it, defaultURL, openURL ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/kttsplugin/khtmlkttsd.cpp v3.5.13-sru/konqueror/kttsplugin/khtmlkttsd.cpp --- /tmp/stable//kdebase/konqueror/kttsplugin/khtmlkttsd.cpp 2011-03-12 07:58:15.000000000 +0100 +++ v3.5.13-sru/konqueror/kttsplugin/khtmlkttsd.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -118,13 +118,13 @@ } // kdDebug() << "KHTMLPluginKTTSD::slotReadOut: query = " << query << endl; - dataBuf.tqat(0); // reset data + dataBuf.at(0); // reset data arg << query << ""; if ( !client->call("kttsd", "KSpeech", "setText(TQString,TQString)", data, replyType, replyData, true) ) TQMessageBox::warning( 0, i18n( "DCOP Call Failed" ), i18n( "The DCOP call setText failed." )); - dataBuf.tqat(0); + dataBuf.at(0); arg << 0; if ( !client->call("kttsd", "KSpeech", "startText(uint)", data, replyType, replyData, true) ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/listview/konq_infolistviewitem.cc v3.5.13-sru/konqueror/listview/konq_infolistviewitem.cc --- /tmp/stable//kdebase/konqueror/listview/konq_infolistviewitem.cc 2011-03-12 07:58:16.000000000 +0100 +++ v3.5.13-sru/konqueror/listview/konq_infolistviewitem.cc 2012-09-08 19:41:29.000000000 +0200 @@ -206,7 +206,7 @@ setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) ); } -void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) +void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { TQColorGroup cg( _cg ); @@ -242,7 +242,7 @@ _width = newWidth; } - KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment ); + KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } void KonqInfoListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/listview/konq_infolistviewitem.h v3.5.13-sru/konqueror/listview/konq_infolistviewitem.h --- /tmp/stable//kdebase/konqueror/listview/konq_infolistviewitem.h 2011-03-12 07:58:16.000000000 +0100 +++ v3.5.13-sru/konqueror/listview/konq_infolistviewitem.h 2012-09-08 19:41:29.000000000 +0200 @@ -56,7 +56,7 @@ virtual ~KonqInfoListViewItem() { } virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg, - int column, int width, int tqalignment ); + int column, int width, int alignment ); virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r ); virtual void updateContents(); virtual void setDisabled( bool disabled ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/listview/konq_infolistviewwidget.cc v3.5.13-sru/konqueror/listview/konq_infolistviewwidget.cc --- /tmp/stable//kdebase/konqueror/listview/konq_infolistviewwidget.cc 2011-08-11 07:25:51.000000000 +0200 +++ v3.5.13-sru/konqueror/listview/konq_infolistviewwidget.cc 2012-09-08 19:41:29.000000000 +0200 @@ -181,8 +181,8 @@ if ( !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } } @@ -215,8 +215,8 @@ if ( !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/listview/konq_listview.cc v3.5.13-sru/konqueror/listview/konq_listview.cc --- /tmp/stable//kdebase/konqueror/listview/konq_listview.cc 2011-08-11 07:25:51.000000000 +0200 +++ v3.5.13-sru/konqueror/listview/konq_listview.cc 2012-09-08 19:41:29.000000000 +0200 @@ -144,7 +144,7 @@ void ListViewBrowserExtension::copySelection( bool move ) { KonqDrag *urlData = new KonqDrag( m_listView->listViewWidget()->selectedUrls(false), m_listView->listViewWidget()->selectedUrls(true), move ); - TQApplication::tqclipboard()->setData( urlData ); + TQApplication::clipboard()->setData( urlData ); } void ListViewBrowserExtension::paste() @@ -169,7 +169,7 @@ const TQString txt = le->text(); TQString pattern; KMimeType::diagnoseFileName( txt, pattern ); - if (!pattern.isEmpty() && pattern.tqat(0)=='*' && pattern.find('*',1)==-1) + if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1) le->setSelection(0, txt.length()-pattern.stripWhiteSpace().length()+1); else { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/listview/konq_listviewitems.cc v3.5.13-sru/konqueror/listview/konq_listviewitems.cc --- /tmp/stable//kdebase/konqueror/listview/konq_listviewitems.cc 2011-07-09 08:16:57.000000000 +0200 +++ v3.5.13-sru/konqueror/listview/konq_listviewitems.cc 2012-09-08 19:41:29.000000000 +0200 @@ -173,7 +173,7 @@ if ( m_bActive == active ) return; - //#### Optimize away tqrepaint if possible, like the iconview does? + //#### Optimize away repaint if possible, like the iconview does? KonqBaseListViewItem::setActive( active ); int iconSize = m_pListViewWidget->iconSize(); iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small @@ -203,7 +203,7 @@ int newWidth = pm.isNull() ? 0 : pm.width(); int newHeight = pm.isNull() ? 0 : pm.height(); - // If the height or width have changed then we're going to have to tqrepaint + // If the height or width have changed then we're going to have to repaint // this whole thing. Fortunately since most of the calls are coming from // setActive() this is the uncommon case. @@ -234,7 +234,7 @@ if ((int)m_pixmaps.count() <= column) return 0; - TQPixmap *pm = m_pixmaps.tqat( column, &ok ); + TQPixmap *pm = m_pixmaps.at( column, &ok ); if( !ok ) return 0; return pm; @@ -294,7 +294,7 @@ } } -void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) +void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { TQColorGroup cg( _cg ); @@ -330,7 +330,7 @@ _width = newWidth; } - KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment ); + KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } void KonqListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) @@ -421,7 +421,7 @@ TQRect KonqBaseListViewItem::rect() const { - TQRect r = m_pListViewWidget->tqitemRect(this); + TQRect r = m_pListViewWidget->itemRect(this); return TQRect( m_pListViewWidget->viewportToContents( r.topLeft() ), TQSize( r.width(), r.height() ) ); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/listview/konq_listviewitems.h v3.5.13-sru/konqueror/listview/konq_listviewitems.h --- /tmp/stable//kdebase/konqueror/listview/konq_listviewitems.h 2011-03-12 07:58:16.000000000 +0100 +++ v3.5.13-sru/konqueror/listview/konq_listviewitems.h 2012-09-08 19:41:29.000000000 +0200 @@ -107,7 +107,7 @@ virtual ~KonqListViewItem(); virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg, - int column, int width, int tqalignment ); + int column, int width, int alignment ); virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r ); virtual void updateContents(); virtual void setDisabled( bool disabled ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/listview/konq_listviewwidget.cc v3.5.13-sru/konqueror/listview/konq_listviewwidget.cc --- /tmp/stable//kdebase/konqueror/listview/konq_listviewwidget.cc 2011-08-11 07:25:51.000000000 +0200 +++ v3.5.13-sru/konqueror/listview/konq_listviewwidget.cc 2012-09-08 19:41:29.000000000 +0200 @@ -107,7 +107,7 @@ { kdDebug(1202) << "+KonqBaseListViewWidget" << endl; - m_dirLister->setMainWindow(tqtopLevelWidget()); + m_dirLister->setMainWindow(topLevelWidget()); m_bTopLevelComplete = true; @@ -259,7 +259,7 @@ //search the column in confColumns for ( unsigned int j = 0; j < NumberOfAtoms; j++ ) { - if ( confColumns[j].name == *lstColumns.tqat(i) ) + if ( confColumns[j].name == *lstColumns.at(i) ) { confColumns[j].displayThisOne = true; confColumns[j].displayInColumn = currentColumn; @@ -268,7 +268,7 @@ currentColumn++; if ( i < lstColumnWidths.count() ) - confColumns[j].width = *lstColumnWidths.tqat(i); + confColumns[j].width = *lstColumnWidths.at(i); else { // Default Column widths @@ -489,7 +489,7 @@ emit m_pBrowserView->setStatusBarText( item->item()->getStatusBarInfo() ); m_pBrowserView->emitMouseOver( item->item() ); - vp.setY( tqitemRect( item ).y() ); + vp.setY( itemRect( item ).y() ); TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) ); m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) ); m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) ); @@ -551,9 +551,9 @@ TQPoint pt( m_rubber->x(), m_rubber->y() ); pt = contentsToViewport( pt ); - tqstyle().tqdrawPrimitive( TQStyle::PE_RubberBand, p, + style().tqdrawPrimitive( TQStyle::PE_RubberBand, p, TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ), - tqcolorGroup(), TQStyle::Style_Default, tqcolorGroup().base() ); + colorGroup(), TQStyle::Style_Default, colorGroup().base() ); } @@ -591,9 +591,9 @@ { TQRect rect; if ( allColumnsShowFocus() ) - rect = tqitemRect( cur ); + rect = itemRect( cur ); else { - rect = tqitemRect( cur ); + rect = itemRect( cur ); rect.setWidth( executeArea( cur ) ); } @@ -623,7 +623,7 @@ { setSelected( cur, true ); changed = TRUE; - rr = rr.unite( tqitemRect( cur ) ); + rr = rr.unite( itemRect( cur ) ); } } else @@ -631,7 +631,7 @@ if ( cur->isSelected() ) { changed = TRUE; - rr = rr.unite( tqitemRect( cur ) ); + rr = rr.unite( itemRect( cur ) ); } if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) @@ -659,7 +659,7 @@ { setSelected( cur, true ); changed = TRUE; - rr = rr.unite( tqitemRect( cur ) ); + rr = rr.unite( itemRect( cur ) ); } } else @@ -667,7 +667,7 @@ if ( cur->isSelected() ) { changed = TRUE; - rr = rr.unite( tqitemRect( cur ) ); + rr = rr.unite( itemRect( cur ) ); } if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) @@ -985,7 +985,7 @@ if (_item->pixmap(0) != 0) { // Rect of the TQListViewItem's pixmap area. - TQRect rect = _item->listView()->tqitemRect(_item); + TQRect rect = _item->listView()->itemRect(_item); // calculate nesting depth int nestingDepth = 0; @@ -1009,9 +1009,12 @@ // gather pixmap TQPixmap *pix = new TQPixmap(*(_item->pixmap(0))); - // call the icon effect - KIconEffect::visualActivate(viewport(), rect, pix); - + // call the icon effect if enabled + if (KGlobalSettings::showKonqIconActivationEffect() == true) { + KIconEffect::visualActivate(viewport(), rect, pix); + } + + // clean up delete(pix); } } @@ -1111,7 +1114,7 @@ args.yOffset = contentsY(); m_pBrowserView->extension()->setURLArgs( args ); - if ( currentItem() && tqitemRect( currentItem() ).isValid() ) + if ( currentItem() && itemRect( currentItem() ).isValid() ) m_itemToGoTo = currentItem()->text(0); m_pBrowserView->m_filesToSelect.clear(); @@ -1192,8 +1195,8 @@ if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } @@ -1237,8 +1240,8 @@ m_pBrowserView->resetCount(); m_pBrowserView->lstPendingMimeIconItems().clear(); - viewport()->tqsetUpdatesEnabled( false ); - tqsetUpdatesEnabled( false ); + viewport()->setUpdatesEnabled( false ); + setUpdatesEnabled( false ); clear(); } @@ -1268,8 +1271,8 @@ if ( !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } slotUpdateBackground(); @@ -1314,8 +1317,8 @@ // OK, but this code also gets activated when deleting a hidden file... (dfaure) if ( !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } slotUpdateBackground(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/listview/konq_listviewwidget.h v3.5.13-sru/konqueror/listview/konq_listviewwidget.h --- /tmp/stable//kdebase/konqueror/listview/konq_listviewwidget.h 2011-07-09 08:16:57.000000000 +0200 +++ v3.5.13-sru/konqueror/listview/konq_listviewwidget.h 2012-09-08 19:41:29.000000000 +0200 @@ -177,7 +177,7 @@ virtual void slotRedirection( const KURL & ); void slotPopupMenu( TQListViewItem *, const TQPoint&, int ); - // forces a tqrepaint on column size changes / branch expansion + // forces a repaint on column size changes / branch expansion // when there is a background pixmap void slotUpdateBackground(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/listview/konq_textviewitem.cc v3.5.13-sru/konqueror/listview/konq_textviewitem.cc --- /tmp/stable//kdebase/konqueror/listview/konq_textviewitem.cc 2011-03-12 07:58:16.000000000 +0100 +++ v3.5.13-sru/konqueror/listview/konq_textviewitem.cc 2012-09-08 19:41:29.000000000 +0200 @@ -200,7 +200,7 @@ }; } -void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) +void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { TQColorGroup cg( _cg ); cg.setColor(TQColorGroup::Text, static_cast(listView())->colors[type]); @@ -208,7 +208,7 @@ // cg.setColor(TQColorGroup::HighlightedText, static_cast(listView())->highlight[type]); // cg.setColor(TQColorGroup::Highlight, Qt::darkGray); - KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment ); + KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } /*void KonqTextViewItem::paintFocus( TQPainter *_p, const TQColorGroup &_cg, const TQRect &_r ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/listview/konq_textviewitem.h v3.5.13-sru/konqueror/listview/konq_textviewitem.h --- /tmp/stable//kdebase/konqueror/listview/konq_textviewitem.h 2011-03-12 07:58:16.000000000 +0100 +++ v3.5.13-sru/konqueror/listview/konq_textviewitem.h 2012-09-08 19:41:29.000000000 +0200 @@ -57,7 +57,7 @@ // virtual TQString key( int _column, bool asc) const; /** Call this before destroying the text view (decreases reference count * on the view)*/ - virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ); + virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ); // virtual void paintFocus( TQPainter *_painter, const TQColorGroup & _cg, const TQRect & r ); virtual void updateContents(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/listview/konq_textviewwidget.cc v3.5.13-sru/konqueror/listview/konq_textviewwidget.cc --- /tmp/stable//kdebase/konqueror/listview/konq_textviewwidget.cc 2011-08-11 07:25:51.000000000 +0200 +++ v3.5.13-sru/konqueror/listview/konq_textviewwidget.cc 2012-09-08 19:41:29.000000000 +0200 @@ -101,8 +101,8 @@ if ( !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } slotUpdateBackground(); @@ -146,8 +146,8 @@ if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/listview/konq_treeviewwidget.cc v3.5.13-sru/konqueror/listview/konq_treeviewwidget.cc --- /tmp/stable//kdebase/konqueror/listview/konq_treeviewwidget.cc 2011-08-11 07:25:51.000000000 +0200 +++ v3.5.13-sru/konqueror/listview/konq_treeviewwidget.cc 2012-09-08 19:41:29.000000000 +0200 @@ -121,8 +121,8 @@ if ( !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } } @@ -268,8 +268,8 @@ if ( !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/preloader/preloader.cc v3.5.13-sru/konqueror/preloader/preloader.cc --- /tmp/stable//kdebase/konqueror/preloader/preloader.cc 2011-03-12 07:58:17.000000000 +0100 +++ v3.5.13-sru/konqueror/preloader/preloader.cc 2012-09-08 19:41:29.000000000 +0200 @@ -109,8 +109,8 @@ { if( !check_always_preloaded_timer.isActive()) { - if( kapp->kdeinitExec( TQString::tqfromLatin1( "konqueror" ), - TQStringList() << TQString::tqfromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 ) + if( kapp->kdeinitExec( TQString::fromLatin1( "konqueror" ), + TQStringList() << TQString::fromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 ) { kdDebug( 1202 ) << "Preloading Konqueror instance" << endl; check_always_preloaded_timer.start( 5000, true ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp v3.5.13-sru/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp --- /tmp/stable//kdebase/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp 2011-08-11 07:25:51.000000000 +0200 +++ v3.5.13-sru/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -41,7 +41,7 @@ #include "kremoteencodingplugin.h" -#define DATA_KEY TQString::tqfromLatin1("Charset") +#define DATA_KEY TQString::fromLatin1("Charset") KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent, const char *name, diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/shellcmdplugin/kshellcmddialog.cpp v3.5.13-sru/konqueror/shellcmdplugin/kshellcmddialog.cpp --- /tmp/stable//kdebase/konqueror/shellcmdplugin/kshellcmddialog.cpp 2011-03-12 07:58:17.000000000 +0100 +++ v3.5.13-sru/konqueror/shellcmdplugin/kshellcmddialog.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -43,10 +43,10 @@ closeButton= new KPushButton(KStdGuiItem::close(), buttonsBox); closeButton->setDefault(true); - label->resize(label->tqsizeHint()); - m_shell->resize(m_shell->tqsizeHint()); - closeButton->setFixedSize(closeButton->tqsizeHint()); - cancelButton->setFixedSize(cancelButton->tqsizeHint()); + label->resize(label->sizeHint()); + m_shell->resize(m_shell->sizeHint()); + closeButton->setFixedSize(closeButton->sizeHint()); + cancelButton->setFixedSize(cancelButton->sizeHint()); box->addWidget(label,0); box->addWidget(m_shell,1); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/sidebar/konqsidebar.cpp v3.5.13-sru/konqueror/sidebar/konqsidebar.cpp --- /tmp/stable//kdebase/konqueror/sidebar/konqsidebar.cpp 2011-08-11 07:25:52.000000000 +0200 +++ v3.5.13-sru/konqueror/sidebar/konqsidebar.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -30,7 +30,7 @@ setInstance( KonqSidebarFactory::instance() ); m_extension = 0; // this should be your custom internal widget - m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->tqtopLevelWidget()->property("currentProfile").toString() ); + m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() ); m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" ); connect(m_widget,TQT_SIGNAL(started(KIO::Job *)), this, TQT_SIGNAL(started(KIO::Job*))); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/sidebar/sidebar_widget.cpp v3.5.13-sru/konqueror/sidebar/sidebar_widget.cpp --- /tmp/stable//kdebase/konqueror/sidebar/sidebar_widget.cpp 2011-08-11 07:25:52.000000000 +0200 +++ v3.5.13-sru/konqueror/sidebar/sidebar_widget.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -169,7 +169,7 @@ void addBackEnd::activatedAddMenu(int id) { - kdDebug() << "activatedAddMenu: " << TQString("%1").tqarg(id) << endl; + kdDebug() << "activatedAddMenu: " << TQString("%1").arg(id) << endl; if (((uint)id) == libNames.size()) doRollBack(); if(((uint)id) >= libNames.size()) @@ -178,13 +178,13 @@ KLibLoader *loader = KLibLoader::self(); // try to load the library - TQString libname = *libNames.tqat(id); + TQString libname = *libNames.at(id); KLibrary *lib = loader->library(TQFile::encodeName(libname)); if (lib) { // get the create_ function TQString factory("add_"); - factory = factory+(*libNames.tqat(id)); + factory = factory+(*libNames.at(id)); void *add = lib->symbol(TQFile::encodeName(factory)); if (add) @@ -194,7 +194,7 @@ TQMap map; func = (bool (*)(TQString*, TQString*, TQMap *)) add; TQString *tmp = new TQString(""); - if (func(tmp,libParam.tqat(id),&map)) + if (func(tmp,libParam.at(id),&map)) { TQString myFile = findFileName(tmp,m_universal,m_currentProfile); @@ -219,7 +219,7 @@ delete tmp; } } else { - kdWarning() << "libname:" << libNames.tqat(id) + kdWarning() << "libname:" << libNames.at(id) << " doesn't specify a library!" << endl; } } @@ -252,7 +252,7 @@ m_buttons.setAutoDelete(true); m_hasStoredUrl = false; m_latestViewed = -1; - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); TQSplitter *splitterWidget = splitter(); if (splitterWidget) { @@ -262,7 +262,7 @@ } m_area = new KDockArea(this); - m_area->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + m_area->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_mainDockWidget = m_area->createDockWidget("free", 0); m_mainDockWidget->setWidget(new TQWidget(m_mainDockWidget)); m_area->setMainDockWidget(m_mainDockWidget); @@ -574,7 +574,7 @@ { int tmpViewID=m_latestViewed; for (uint i=0; idock && button->dock->isVisibleTo(this)) @@ -598,7 +598,7 @@ m_mainDockWidget->show(); if ((tmpLatestViewed>=0) && (tmpLatestViewed < (int) m_buttons.count())) { - ButtonInfo *button = m_buttons.tqat(tmpLatestViewed); + ButtonInfo *button = m_buttons.at(tmpLatestViewed); if (button && button->dock) { m_noUpdate=true; @@ -675,7 +675,7 @@ kdDebug() << "Try calling >active< module's (" << mod->module->className() << ") slot " << handlestd << endl; - int id = mod->module->tqmetaObject()->findSlot( handlestd ); + int id = mod->module->metaObject()->findSlot( handlestd ); if ( id == -1 ) return; kdDebug() << "Action slot was found, it will be called now" << endl; @@ -694,7 +694,7 @@ { for (uint i = 0; i < m_buttons.count(); i++) { - ButtonInfo *button = m_buttons.tqat(i); + ButtonInfo *button = m_buttons.at(i); if (button->dock) { m_noUpdate = true; @@ -742,7 +742,7 @@ for (uint i = 0; i < m_buttons.count(); i++) { - ButtonInfo *button = m_buttons.tqat(i); + ButtonInfo *button = m_buttons.at(i); if (m_openViews.contains(button->file)) { m_buttonBar->setTab(i,true); @@ -763,7 +763,7 @@ if (url.protocol()=="sidebar") { for (unsigned int i=0;ifile==url.path()) + if (m_buttons.at(i)->file==url.path()) { KMultiTabBarTab *tab = m_buttonBar->tab(i); if (!tab->isOn()) @@ -778,7 +778,7 @@ bool ret = false; for (unsigned int i=0;idock) { if ((button->dock->isVisibleTo(this)) && (button->module)) @@ -845,7 +845,7 @@ { if (bt==m_buttonBar->tab(i)) { - m_currentButton = m_buttons.tqat(i); + m_currentButton = m_buttons.at(i); break; } } @@ -953,7 +953,7 @@ void Sidebar_Widget::showHidePage(int page) { - ButtonInfo *info = m_buttons.tqat(page); + ButtonInfo *info = m_buttons.at(page); if (!info->dock) { if (m_buttonBar->isTabRaised(page)) @@ -1049,7 +1049,7 @@ if (m_visibleViews.count()==0) { m_somethingVisible = false; - parentWidget()->setMaximumWidth(tqminimumSizeHint().width()); + parentWidget()->setMaximumWidth(minimumSizeHint().width()); updateGeometry(); emit panelHasBeenExpanded(false); } else { @@ -1060,11 +1060,11 @@ } } -TQSize Sidebar_Widget::tqsizeHint() const +TQSize Sidebar_Widget::sizeHint() const { if (m_somethingVisible) return TQSize(m_savedWidth,200); - return tqminimumSizeHint(); + return minimumSizeHint(); } void Sidebar_Widget::dockWidgetHasUndocked(KDockWidget* wid) @@ -1072,7 +1072,7 @@ kdDebug()<<" Sidebar_Widget::dockWidgetHasUndocked(KDockWidget*)"<dock==wid) { if (m_buttonBar->isTabRaised(i)) @@ -1195,50 +1195,50 @@ void Sidebar_Widget::connectModule(TQObject *mod) { - if (mod->tqmetaObject()->findSignal("started(KIO::Job*)") != -1) { + if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) { connect(mod,TQT_SIGNAL(started(KIO::Job *)),this, TQT_SIGNAL(started(KIO::Job*))); } - if (mod->tqmetaObject()->findSignal("completed()") != -1) { + if (mod->metaObject()->findSignal("completed()") != -1) { connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); } - if (mod->tqmetaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { + if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const TQPoint &, const KURL&, const TQString &, mode_t))); } - if (mod->tqmetaObject()->findSignal("popupMenu(KXMLGUIClient*,const " TQPOINT_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { + if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const " TQPOINT_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t)),this, TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t))); } - if (mod->tqmetaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KFileItemList&)") != -1) { + if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KFileItemList&)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & ))); } - if (mod->tqmetaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) { + if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) { connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } - if (mod->tqmetaObject()->findSignal("submitFormRequest(const char*,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -1) { + if (mod->metaObject()->findSignal("submitFormRequest(const char*,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -1) { connect(mod, TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); } - if (mod->tqmetaObject()->findSignal("enableAction(const char*,bool)") != -1) { + if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) { connect(mod,TQT_SIGNAL(enableAction( const char *, bool)), this,TQT_SLOT(enableAction(const char *, bool))); } - if (mod->tqmetaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) { + if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) { connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); } @@ -1255,7 +1255,7 @@ m_noUpdate = true; for (uint i=0;idock) button->dock->undock(); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/sidebar/sidebar_widget.h v3.5.13-sru/konqueror/sidebar/sidebar_widget.h --- /tmp/stable//kdebase/konqueror/sidebar/sidebar_widget.h 2011-03-12 07:58:17.000000000 +0100 +++ v3.5.13-sru/konqueror/sidebar/sidebar_widget.h 2012-09-08 19:41:29.000000000 +0200 @@ -107,7 +107,7 @@ void stdAction(const char *handlestd); //virtual KParts::ReadOnlyPart *getPart(); KParts::BrowserExtension *getExtension(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: void addWebSideBar(const KURL& url, const TQString& name); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp v3.5.13-sru/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp --- /tmp/stable//kdebase/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp 2011-08-11 07:25:52.000000000 +0200 +++ v3.5.13-sru/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -387,7 +387,7 @@ else return; - DCOPRef ref(kapp->dcopClient()->appId(), tree()->tqtopLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name()); if (bookmark.isGroup()) { KBookmarkGroup group = bookmark.toGroup(); @@ -412,9 +412,9 @@ if ( !bookmark.isGroup() ) { - kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), TQClipboard::Selection ); - kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), TQClipboard::Clipboard ); } } @@ -490,7 +490,7 @@ item->setOpen(false); } else if ( bk.isSeparator() ) - item->tqsetVisible( false ); + item->setVisible( false ); else item->setExpandable( false ); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp v3.5.13-sru/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp --- /tmp/stable//kdebase/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp 2011-08-11 07:25:52.000000000 +0200 +++ v3.5.13-sru/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -108,7 +108,7 @@ return m_fileItem->iconName() == "folder"; } -void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) +void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { if (m_fileItem->isLink()) { @@ -116,7 +116,7 @@ f.setItalic( TRUE ); _painter->setFont( f ); } - TQListViewItem::paintCell( _painter, _cg, _column, _width, _tqalignment ); + TQListViewItem::paintCell( _painter, _cg, _column, _width, _alignment ); } KURL KonqSidebarDirTreeItem::externalURL() const @@ -162,8 +162,8 @@ if ( m_fileItem->url().directory(false) == KGlobalSettings::trashPath() ) bInTrash = true; - TQMimeSource *data = TQApplication::tqclipboard()->data(); - bool paste = ( data->tqencodedData( data->format() ).size() != 0 ); + TQMimeSource *data = TQApplication::clipboard()->data(); + bool paste = ( data->encodedData( data->format() ).size() != 0 ); tree()->enableActions( true, true, paste, true && !bInTrash, true, true ); } @@ -197,7 +197,7 @@ { // move or not move ? bool move = false; - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); if ( data->provides( "application/x-kde-cutselection" ) ) { move = KonqDrag::decodeIsCutSelection( data ); kdDebug(1201) << "move (from clipboard data) = " << move << endl; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/sidebar/trees/dirtree_module/dirtree_item.h v3.5.13-sru/konqueror/sidebar/trees/dirtree_module/dirtree_item.h --- /tmp/stable//kdebase/konqueror/sidebar/trees/dirtree_module/dirtree_item.h 2011-03-12 07:58:16.000000000 +0100 +++ v3.5.13-sru/konqueror/sidebar/trees/dirtree_module/dirtree_item.h 2012-09-08 19:41:29.000000000 +0200 @@ -36,7 +36,7 @@ virtual void setOpen( bool open ); - virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ); + virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ); virtual bool acceptsDrops( const TQStrList & formats ); virtual void drop( TQDropEvent * ev ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp v3.5.13-sru/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp --- /tmp/stable//kdebase/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp 2011-08-11 07:25:52.000000000 +0200 +++ v3.5.13-sru/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -357,7 +357,7 @@ if (openItem) { // We have this directory listed already, just copy the entries as we - // can't use the dirlister, it would tqinvalidate the old entries + // can't use the dirlister, it would invalidate the old entries int size = KGlobal::iconLoader()->currentSize( KIcon::Small ); KonqSidebarTreeItem * parentItem = item; KonqSidebarDirTreeItem *oldItem = static_cast (openItem->firstChild()); @@ -400,7 +400,7 @@ kdDebug(1201) << this << " KonqSidebarDirTreeModule::slotNewItems " << entries.count() << endl; Q_ASSERT(entries.count()); - KFileItem * firstItem = const_cast(entries).first(); // qlist sucks for constness + KFileItem * firstItem = const_cast(entries).last(); // qlist sucks for constness // Find parent item - it's the same for all the items KURL dir( firstItem->url().url(-1) ); @@ -574,7 +574,7 @@ if ( item->childCount() == 0 ) { item->setExpandable( false ); - item->tqrepaint(); + item->repaint(); } m_pTree->stopAnimation( item ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/sidebar/trees/history_module/history_dlg.ui v3.5.13-sru/konqueror/sidebar/trees/history_module/history_dlg.ui --- /tmp/stable//kdebase/konqueror/sidebar/trees/history_module/history_dlg.ui 2011-03-12 07:58:16.000000000 +0100 +++ v3.5.13-sru/konqueror/sidebar/trees/history_module/history_dlg.ui 2012-09-08 19:41:29.000000000 +0200 @@ -40,7 +40,7 @@ Expanding - + 240 16 @@ -193,7 +193,7 @@ Expanding - + 418 0 @@ -212,7 +212,7 @@ Expanding - + 16 30 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/sidebar/trees/history_module/history_item.cpp v3.5.13-sru/konqueror/sidebar/trees/history_module/history_item.cpp --- /tmp/stable//kdebase/konqueror/sidebar/trees/history_module/history_item.cpp 2011-08-11 07:25:52.000000000 +0200 +++ v3.5.13-sru/konqueror/sidebar/trees/history_module/history_item.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -126,10 +126,10 @@ } void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { TQDateTime dt; - TQDateTime current = TQDateTime::tqcurrentDateTime(); + TQDateTime current = TQDateTime::currentDateTime(); if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS ) dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueYoungerThan )); @@ -149,7 +149,7 @@ p->setFont( s_settings->m_fontOlderThan ); } - KonqSidebarTreeItem::paintCell( p, cg, column, width, tqalignment ); + KonqSidebarTreeItem::paintCell( p, cg, column, width, alignment ); } /////////////////////////////////////////////////////////////////// diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/sidebar/trees/history_module/history_item.h v3.5.13-sru/konqueror/sidebar/trees/history_module/history_item.h --- /tmp/stable//kdebase/konqueror/sidebar/trees/history_module/history_item.h 2011-03-12 07:58:16.000000000 +0100 +++ v3.5.13-sru/konqueror/sidebar/trees/history_module/history_item.h 2012-09-08 19:41:29.000000000 +0200 @@ -60,7 +60,7 @@ static void setSettings( KonqSidebarHistorySettings *s ) { s_settings = s; } virtual void paintCell( TQPainter *, const TQColorGroup & cg, int column, - int width, int tqalignment ); + int width, int alignment ); private: const KonqHistoryEntry *m_entry; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/sidebar/trees/history_module/history_module.cpp v3.5.13-sru/konqueror/sidebar/trees/history_module/history_module.cpp --- /tmp/stable//kdebase/konqueror/sidebar/trees/history_module/history_module.cpp 2011-08-11 07:25:52.000000000 +0200 +++ v3.5.13-sru/konqueror/sidebar/trees/history_module/history_module.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -54,7 +54,7 @@ connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() )); m_dict.setAutoDelete( true ); - m_currentTime = TQDateTime::tqcurrentDateTime(); + m_currentTime = TQDateTime::currentDateTime(); KConfig *kc = KGlobal::config(); KConfigGroupSaver cs( kc, "HistorySettings" ); @@ -132,7 +132,7 @@ KonqHistoryEntry *entry; KonqHistoryList entries( KonqHistoryManager::kself()->entries() ); KonqHistoryIterator it( entries ); - m_currentTime = TQDateTime::tqcurrentDateTime(); + m_currentTime = TQDateTime::currentDateTime(); // the group item and the item of the serverroot '/' get a fav-icon // if available. All others get the protocol icon. @@ -171,7 +171,7 @@ if ( !m_initialized ) return; - m_currentTime = TQDateTime::tqcurrentDateTime(); + m_currentTime = TQDateTime::currentDateTime(); KonqSidebarHistoryGroupItem *group = getGroupItem( entry->url ); KonqSidebarHistoryItem *item = group->findChild( entry ); if ( !item ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/sidebar/trees/history_module/history_settings.cpp v3.5.13-sru/konqueror/sidebar/trees/history_module/history_settings.cpp --- /tmp/stable//kdebase/konqueror/sidebar/trees/history_module/history_settings.cpp 2011-03-12 07:58:16.000000000 +0100 +++ v3.5.13-sru/konqueror/sidebar/trees/history_module/history_settings.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -56,8 +56,8 @@ m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 ); m_valueOlderThan = config->readNumEntry("Value olderThan", 2 ); - TQString minutes = TQString::tqfromLatin1("minutes"); - TQString days = TQString::tqfromLatin1("days"); + TQString minutes = TQString::fromLatin1("minutes"); + TQString days = TQString::fromLatin1("days"); TQString metric = config->readEntry("Metric youngerThan", days ); m_metricYoungerThan = (metric == days) ? DAYS : MINUTES; metric = config->readEntry("Metric olderThan", days ); @@ -83,8 +83,8 @@ config->writeEntry("Value youngerThan", m_valueYoungerThan ); config->writeEntry("Value olderThan", m_valueOlderThan ); - TQString minutes = TQString::tqfromLatin1("minutes"); - TQString days = TQString::tqfromLatin1("days"); + TQString minutes = TQString::fromLatin1("minutes"); + TQString days = TQString::fromLatin1("days"); config->writeEntry("Metric youngerThan", m_metricYoungerThan == DAYS ? days : minutes ); config->writeEntry("Metric olderThan", m_metricOlderThan == DAYS ? diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/sidebar/trees/konq_sidebartree.cpp v3.5.13-sru/konqueror/sidebar/trees/konq_sidebartree.cpp --- /tmp/stable//kdebase/konqueror/sidebar/trees/konq_sidebartree.cpp 2011-08-11 07:25:52.000000000 +0200 +++ v3.5.13-sru/konqueror/sidebar/trees/konq_sidebartree.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -516,7 +516,7 @@ return; m_dropItem->setOpen( true ); - m_dropItem->tqrepaint(); + m_dropItem->repaint(); } void KonqSidebarTree::rescanConfiguration() @@ -606,7 +606,7 @@ // Version 5 includes the audiocd browser // Version 6 includes the printmanager and lan browser const int currentVersion = 6; - TQString key = TQString::tqfromLatin1("X-KDE-DirTreeVersionNumber"); + TQString key = TQString::fromLatin1("X-KDE-DirTreeVersionNumber"); KSimpleConfig versionCfg( path + "/.directory" ); int versionNumber = versionCfg.readNumEntry( key, 1 ); kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl; @@ -813,7 +813,7 @@ for (; it != end; ++it ) { uint & iconNumber = it.data().iconNumber; - TQString icon = TQString::tqfromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); + TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); it.key()->setPixmap( 0, SmallIcon( icon)); iconNumber++; @@ -882,7 +882,7 @@ bool KonqSidebarTree::tabSupport() { // see if the newTab() dcop function is available (i.e. the sidebar is embedded into konqueror) - DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name()); DCOPReply reply = ref.call("functions()"); if (reply.isValid()) { QCStringList funcs; @@ -1023,7 +1023,7 @@ void KonqSidebarTree::slotOpenTab() { if (!m_currentTopLevelItem) return; - DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name()); ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() ); } @@ -1031,8 +1031,8 @@ { if (!m_currentTopLevelItem) return; KURL url = m_currentTopLevelItem->externalURL(); - kapp->tqclipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection ); - kapp->tqclipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard ); + kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection ); + kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard ); } /////////////////////////////////////////////////////////////////// @@ -1045,7 +1045,7 @@ if ( item ) { TQString text = static_cast( item )->toolTipText(); if ( !text.isEmpty() ) - tip ( m_view->tqitemRect( item ), text ); + tip ( m_view->itemRect( item ), text ); } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/sidebar/trees/konqsidebar_tree.cpp v3.5.13-sru/konqueror/sidebar/trees/konqsidebar_tree.cpp --- /tmp/stable//kdebase/konqueror/sidebar/trees/konqsidebar_tree.cpp 2011-08-11 07:25:52.000000000 +0200 +++ v3.5.13-sru/konqueror/sidebar/trees/konqsidebar_tree.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -76,14 +76,14 @@ { TQDragObject * drag = static_cast(tree->selectedItem())->dragObject( 0L, true ); if (drag) - TQApplication::tqclipboard()->setData( drag ); + TQApplication::clipboard()->setData( drag ); } void KonqSidebar_Tree::copy() { TQDragObject * drag = static_cast(tree->selectedItem())->dragObject( 0L ); if (drag) - TQApplication::tqclipboard()->setData( drag ); + TQApplication::clipboard()->setData( drag ); } void KonqSidebar_Tree::paste() @@ -150,7 +150,7 @@ { int id=names.findIndex( item ); if (id==-1) return false; - KSimpleConfig ksc2(*list.tqat(id)); + KSimpleConfig ksc2(*list.at(id)); ksc2.setGroup("Desktop Entry"); map->insert("Type","Link"); map->insert("Icon",ksc2.readEntry("Icon")); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp v3.5.13-sru/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp --- /tmp/stable//kdebase/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp 2011-08-11 07:25:52.000000000 +0200 +++ v3.5.13-sru/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -50,7 +50,7 @@ void KonqSidebarTreeTopLevelItem::itemSelected() { kdDebug() << "KonqSidebarTreeTopLevelItem::itemSelected" << endl; - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); bool paste = m_bTopLevelGroup && data->provides("text/uri-list"); tree()->enableActions( true, true, paste, true, true, true /*rename*/ ); } @@ -157,7 +157,7 @@ { // move or not move ? bool move = false; - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); if ( data->provides( "application/x-kde-cutselection" ) ) { move = KonqDrag::decodeIsCutSelection( data ); kdDebug(1201) << "move (from clipboard data) = " << move << endl; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konsole/doc/VT100/Table.Codes v3.5.13-sru/konsole/doc/VT100/Table.Codes --- /tmp/stable//kdebase/konsole/doc/VT100/Table.Codes 2011-03-12 07:58:21.000000000 +0100 +++ v3.5.13-sru/konsole/doc/VT100/Table.Codes 2012-09-08 19:41:29.000000000 +0200 @@ -1070,7 +1070,7 @@ DECALN.code HSH|8| DECALN.text Causes the VT100 to fill it's screen with - uppercase Es for screen focus and tqalignment. + uppercase Es for screen focus and alignment. DECALN.table.XPS Subcode|Emulation|Scope|Operation|Args|Meaning N/A|VT100|scr|helpAlign||see above diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konsole/doc/VT100/techref.html v3.5.13-sru/konsole/doc/VT100/techref.html --- /tmp/stable//kdebase/konsole/doc/VT100/techref.html 2011-03-12 07:58:21.000000000 +0100 +++ v3.5.13-sru/konsole/doc/VT100/techref.html 2012-09-08 19:41:29.000000000 +0200 @@ -2234,7 +2234,7 @@

    Causes the VT100 to fill it's screen with - uppercase Es for screen focus and tqalignment. + uppercase Es for screen focus and alignment.

    diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konsole/konsole/keytrans.cpp v3.5.13-sru/konsole/konsole/keytrans.cpp --- /tmp/stable//kdebase/konsole/konsole/keytrans.cpp 2011-08-16 01:07:51.000000000 +0200 +++ v3.5.13-sru/konsole/konsole/keytrans.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -362,7 +362,7 @@ ; TQBuffer* newbuf; newbuf = new TQBuffer(); - newbuf->tqsetBufferFromCopy(txt); + newbuf->setBuffer(txt); buf=TQT_TQIODEVICE(newbuf); } else diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konsole/konsole/konsole.cpp v3.5.13-sru/konsole/konsole/konsole.cpp --- /tmp/stable//kdebase/konsole/konsole/konsole.cpp 2011-10-16 21:40:23.000000000 +0200 +++ v3.5.13-sru/konsole/konsole/konsole.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -1158,7 +1158,7 @@ TQT_TQOBJECT(this), TQT_SLOT(nextSession()), m_shortcuts, "next_session"); for (int i=1;i<13;i++) { // Due to 12 function keys? - new KAction(i18n("Switch to Session %1").tqarg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); + new KAction(i18n("Switch to Session %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); } new KAction(i18n("Enlarge Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font"); @@ -1289,7 +1289,7 @@ te->setSize(columns, lines); adjustSize(); if (b_fixedSize) - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); notifySize(columns, lines); // set menu items } } @@ -1313,7 +1313,7 @@ if (!m_menuCreated) makeGUI(); - m_contextMenuSession = sessions.tqat( tabwidget->indexOf( _te ) ); + m_contextMenuSession = sessions.at( tabwidget->indexOf( _te ) ); m_tabDetachSession->setEnabled( tabwidget->count()>1 ); @@ -1384,12 +1384,12 @@ for(int i = 0; i < tabwidget->count(); i++) { TQWidget *page = tabwidget->page(i); - TQIconSet icon = iconSetForSession(sessions.tqat(i)); + TQIconSet icon = iconSetForSession(sessions.at(i)); TQString title; if (b_matchTabWinTitle) - title = sessions.tqat(i)->fullTitle(); + title = sessions.at(i)->fullTitle(); else - title = sessions.tqat(i)->Title(); + title = sessions.at(i)->Title(); title=title.replace('&',"&&"); switch(mode) { @@ -1437,7 +1437,7 @@ TQString::null, &ok, this ); if ( ok ) { TQString path = locateLocal( "data", - TQString::tqfromLatin1( "konsole/profiles/" ) + prof, + TQString::fromLatin1( "konsole/profiles/" ) + prof, KGlobal::instance() ); if ( TQFile::exists( path ) ) @@ -1622,7 +1622,7 @@ ColorSchema* sch = colors->find(schema.isEmpty() ? s_kconfigSchema : schema); if (!sch) { - sch = (ColorSchema*)colors->tqat(0); //the default one + sch = (ColorSchema*)colors->at(0); //the default one kdWarning() << "Could not find schema named " <relPath()<relPath(); } @@ -1650,7 +1650,7 @@ delete rootxpms[te]; rootxpms.remove(te); } - pixmap_menu_activated(sch->tqalignment()); + pixmap_menu_activated(sch->alignment()); } te->setColorTable(sch->table()); //FIXME: set twice here to work around a bug @@ -1886,7 +1886,7 @@ m_schema->clear(); for (int i = 0; i < (int) colors->count(); i++) { - ColorSchema* s = (ColorSchema*)colors->tqat(i); + ColorSchema* s = (ColorSchema*)colors->at(i); assert( s ); TQString title=s->title(); m_schema->insertItem(title.replace('&',"&&"),s->numb(),0); @@ -1927,7 +1927,7 @@ if (b_fixedSize) { adjustSize(); - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); } if (!showMenubar->isChecked()) { setCaption(i18n("Use the right mouse button to bring back the menu")); @@ -2002,12 +2002,12 @@ /* FIXME: Still necessary ? */ TQPtrDictIterator it(rootxpms); for (;it.current();++it) - it.current()->tqrepaint(true); + it.current()->repaint(true); if (b_fixedSize) { adjustSize(); - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); } } @@ -2129,7 +2129,7 @@ ColorSchema* sch = colors->find(s_kconfigSchema); if (!sch) { - sch = (ColorSchema*)colors->tqat(0); //the default one + sch = (ColorSchema*)colors->at(0); //the default one kdWarning() << "Could not find schema named " <relPath()<relPath(); } @@ -2500,7 +2500,7 @@ if (position<=0 || position>(int)sessions.count()) return ""; - return sessions.tqat(position-1)->SessionId(); + return sessions.at(position-1)->SessionId(); } void Konsole::listSessions() @@ -2526,7 +2526,7 @@ { if (position<0 || position>=(int)sessions.count()) return; - activateSession( sessions.tqat(position) ); + activateSession( sessions.at(position) ); } void Konsole::activateSession(TQWidget* w) @@ -2586,11 +2586,11 @@ // Set the required schema variables for the current session ColorSchema* cs = colors->find( se->schemaNo() ); if (!cs) - cs = (ColorSchema*)colors->tqat(0); //the default one + cs = (ColorSchema*)colors->at(0); //the default one s_schema = cs->relPath(); curr_schema = cs->numb(); pmPath = cs->imagePath(); - n_render = cs->tqalignment(); + n_render = cs->alignment(); // BR 106464 temporary fix... // only 2 sessions opened, 2nd session viewable, right-click on 1st tab and @@ -2632,7 +2632,7 @@ if (monitorSilence) monitorSilence->setChecked( se->isMonitorSilence() ); masterMode->setChecked( se->isMasterMode() ); sessions.find(se); - uint position=sessions.tqat(); + uint position=sessions.at(); if (m_moveSessionLeft) m_moveSessionLeft->setEnabled(position>0); if (m_moveSessionRight) m_moveSessionRight->setEnabled(positionfind(sch); if (!schema) - schema=(ColorSchema*)colors->tqat(0); //the default one + schema=(ColorSchema*)colors->at(0); //the default one int schmno = schema->numb(); if (sessions.count()==1 && n_tabbar!=TabNone) @@ -3063,7 +3063,7 @@ se = 0; if (sessions.count()) { - se = sessions.tqat(sessionIndex ? sessionIndex - 1 : 0); + se = sessions.at(sessionIndex ? sessionIndex - 1 : 0); session2action.find(se)->setChecked(true); //FIXME: this Timer stupidity originated from the connected @@ -3081,7 +3081,7 @@ } else { sessions.find(se); - uint position=sessions.tqat(); + uint position=sessions.at(); m_moveSessionLeft->setEnabled(position>0); m_moveSessionRight->setEnabled(positionwriteEntry("Name", socket); TQString txt = i18n("Screen is a program controlling screens!", "Screen at %1").arg(socket); co->writeEntry("Comment", txt); - co->writePathEntry("Exec", TQString::tqfromLatin1("SCREENDIR=%1 screen -r %2") + co->writePathEntry("Exec", TQString::fromLatin1("SCREENDIR=%1 screen -r %2") .arg(path).arg(socket)); TQString icon = "konsole"; cmd_serial++; @@ -3570,7 +3570,7 @@ ColorSchema* s = colors->find(numb); if (!s) { - s = (ColorSchema*)colors->tqat(0); + s = (ColorSchema*)colors->at(0); kdWarning() << "No schema with serial #"<relPath()<<" (#"<numb()<<")." << endl; s_kconfigSchema = s->relPath(); } @@ -3587,7 +3587,7 @@ ColorSchema* s = colors->find(path); if (!s) { - s = (ColorSchema*)colors->tqat(0); //the default one + s = (ColorSchema*)colors->at(0); //the default one kdWarning() << "No schema with the name " <relPath()<relPath(); } @@ -3639,7 +3639,7 @@ delete rootxpms[tewidget]; rootxpms.remove(tewidget); } - pixmap_menu_activated(s->tqalignment(), tewidget); + pixmap_menu_activated(s->alignment(), tewidget); tewidget->setBlendColor(tqRgba(0, 0, 0, 0xff)); } @@ -3718,7 +3718,7 @@ if (se_previous) se = se_previous; else - se = sessions.tqat(sessionIndex ? sessionIndex - 1 : 0); + se = sessions.at(sessionIndex ? sessionIndex - 1 : 0); session2action.find(se)->setChecked(true); TQTimer::singleShot(1,this,TQT_SLOT(activateSession())); } @@ -3992,7 +3992,7 @@ m_filterData = new KURIFilterData( selectedURL ); KURIFilter::self()->filterURI( *(m_filterData) ); - m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).tqarg(m_filterData->uri().url()), 1 ); + m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).arg(m_filterData->uri().url()), 1 ); connect(m_openSelection, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenURI(int))); } @@ -4207,7 +4207,7 @@ TQPtrList tes = activeTEs(); for (TEWidget *_te = tes.first(); _te; _te = tes.next()) { _te->setBidiEnabled(b_bidiEnabled); - _te->tqrepaint(); + _te->repaint(); } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konsole/konsole/konsole_part.cpp v3.5.13-sru/konsole/konsole/konsole_part.cpp --- /tmp/stable//kdebase/konsole/konsole/konsole_part.cpp 2011-10-16 21:40:23.000000000 +0200 +++ v3.5.13-sru/konsole/konsole/konsole_part.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -577,7 +577,7 @@ s_kconfigSchema=config->readEntry("schema"); ColorSchema* sch = colors->find(schema.isEmpty() ? s_kconfigSchema : schema); if (!sch) { - sch=(ColorSchema*)colors->tqat(0); //the default one + sch=(ColorSchema*)colors->at(0); //the default one } if (sch->hasSchemaFileChanged()) sch->rereadSchemaFile(); s_schema = sch->relPath(); @@ -591,7 +591,7 @@ rootxpm = new KRootPixmap(TQT_TQWIDGET(te)); rootxpm->setFadeEffect(sch->tr_x(), TQColor(sch->tr_r(), sch->tr_g(), sch->tr_b())); rootxpm->start(); - rootxpm->tqrepaint(true); + rootxpm->repaint(true); } else { te->setBlendColor(tqRgba(sch->tr_r(), sch->tr_g(), sch->tr_b(), int(sch->tr_x() * 255))); @@ -604,7 +604,7 @@ delete rootxpm; rootxpm=0; } - pixmap_menu_activated(sch->tqalignment()); + pixmap_menu_activated(sch->alignment()); } te->setBellMode(n_bell); @@ -737,7 +737,7 @@ m_schema->clear(); for (int i = 0; i < (int) colors->count(); i++) { - ColorSchema* s = (ColorSchema*)colors->tqat(i); + ColorSchema* s = (ColorSchema*)colors->at(i); TQString title=s->title(); m_schema->insertItem(title.replace('&',"&&"),s->numb(),0); } @@ -752,7 +752,7 @@ ColorSchema* s = colors->find(numb); if (!s) { kdWarning() << "No schema found. Using default." << endl; - s=(ColorSchema*)colors->tqat(0); + s=(ColorSchema*)colors->at(0); } if (s->numb() != numb) { kdWarning() << "No schema with number " << numb << endl; @@ -785,7 +785,7 @@ rootxpm = new KRootPixmap(TQT_TQWIDGET(te)); rootxpm->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b())); rootxpm->start(); - rootxpm->tqrepaint(true); + rootxpm->repaint(true); } else { te->setBlendColor(tqRgba(s->tr_r(), s->tr_g(), s->tr_b(), int(s->tr_x() * 255))); @@ -798,7 +798,7 @@ delete rootxpm; rootxpm=0; } - pixmap_menu_activated(s->tqalignment()); + pixmap_menu_activated(s->alignment()); } te->setColorTable(s->table()); @@ -809,8 +809,8 @@ { ColorSchema *sch=colors->find(s_schema); - if (sch && sch->tqalignment() >= 3) - pixmap_menu_activated(sch->tqalignment()); + if (sch && sch->alignment() >= 3) + pixmap_menu_activated(sch->alignment()); } void konsolePart::pixmap_menu_activated(int item) @@ -1137,7 +1137,7 @@ { TQString text = dir; KRun::shellQuote(text); - text = TQString::tqfromLatin1("cd ") + text + '\n'; + text = TQString::fromLatin1("cd ") + text + '\n'; te->emitText( text ); }; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konsole/konsole/konsole_wcwidth.cpp v3.5.13-sru/konsole/konsole/konsole_wcwidth.cpp --- /tmp/stable//kdebase/konsole/konsole/konsole_wcwidth.cpp 2011-03-12 07:58:22.000000000 +0100 +++ v3.5.13-sru/konsole/konsole/konsole_wcwidth.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -214,7 +214,7 @@ int w = 0; for ( uint i = 1; i < txt.length(); ++i ) { - w += konsole_wcwidth(txt[i].tqunicode()); + w += konsole_wcwidth(txt[i].unicode()); } return w; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konsole/konsole/main.cpp v3.5.13-sru/konsole/konsole/main.cpp --- /tmp/stable//kdebase/konsole/konsole/main.cpp 2011-10-16 21:40:23.000000000 +0200 +++ v3.5.13-sru/konsole/konsole/main.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -271,7 +271,7 @@ TQString term = ""; if(args->isSet("tn")) { - term=TQString::tqfromLatin1(args->getOption("tn")); + term=TQString::fromLatin1(args->getOption("tn")); } login_shell = args->isSet("ls"); @@ -591,7 +591,7 @@ //// Temporary code, waiting for Qt to do this properly // Delete all toplevel widgets that have WDestructiveClose - TQWidgetList *list = TQApplication::tqtopLevelWidgets(); + TQWidgetList *list = TQApplication::topLevelWidgets(); // remove all toplevel widgets that have a parent (i.e. they // got WTopLevel explicitly), they'll be deleted by the parent list->first(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konsole/konsole/schema.cpp v3.5.13-sru/konsole/konsole/schema.cpp --- /tmp/stable//kdebase/konsole/konsole/schema.cpp 2011-08-11 07:25:55.000000000 +0200 +++ v3.5.13-sru/konsole/konsole/schema.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -131,7 +131,7 @@ ,lastRead(new TQDateTime()) { //start with a valid time, aleXXX - *lastRead = TQDateTime::tqcurrentDateTime(); + *lastRead = TQDateTime::currentDateTime(); TQString fPath = pathname.startsWith("/") ? pathname : locate("data", "konsole/"+pathname); if (fPath.isEmpty() || !TQFile::exists(fPath)) { @@ -169,7 +169,7 @@ m_title = c.readEntry("Title",i18n("[no title]")); m_imagePath = c.readEntry("ImagePath"); - m_tqalignment = c.readNumEntry("ImageAlignment",1); + m_alignment = c.readNumEntry("ImageAlignment",1); m_useTransparency = c.readBoolEntry("UseTransparency",false); m_tr_r = c.readNumEntry("TransparentR",0); @@ -203,7 +203,7 @@ } m_title = i18n("[no title]"); m_imagePath = ""; - m_tqalignment = 1; + m_alignment = 1; m_useTransparency = false; m_tr_x = 0.0; m_tr_r = 0; @@ -216,7 +216,7 @@ m_numb = 0; m_title = i18n("Konsole Default"); m_imagePath = ""; // background pixmap - m_tqalignment = 1; // none + m_alignment = 1; // none m_useTransparency = false; // not use pseudo-transparency by default m_tr_r = m_tr_g = m_tr_b = 0; // just to be on the safe side m_tr_x = 0.0; @@ -273,7 +273,7 @@ c.setGroup("SchemaGeneral"); c.writeEntry("Title",m_title); c.writeEntry("ImagePath",m_imagePath); - c.writeEntry("ImageAlignment",m_tqalignment); + c.writeEntry("ImageAlignment",m_alignment); c.writeEntry("UseTransparency",m_useTransparency); c.writeEntry("TransparentR",m_tr_r); @@ -313,7 +313,7 @@ char line[100]; - *lastRead = TQDateTime::tqcurrentDateTime(); + *lastRead = TQDateTime::currentDateTime(); while (fscanf(sysin,"%80[^\n]\n",line) > 0) { @@ -334,7 +334,7 @@ TQString qline(line); m_imagePath = locate("wallpaper", qline.mid( qline.find(" ",7)+1 ) ); - m_tqalignment = attr; + m_alignment = attr; } if (!strncmp(line,"transparency",12)) { float rx; @@ -388,7 +388,7 @@ if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (!(0 <= tr && tr <= 1 )) continue; if (!(0 <= bo && bo <= 1 )) continue; - m_table[fi].color = kapp->tqpalette().active().text(); + m_table[fi].color = kapp->palette().active().text(); m_table[fi].transparent = tr; m_table[fi].bold = bo; } @@ -399,7 +399,7 @@ if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (!(0 <= tr && tr <= 1 )) continue; if (!(0 <= bo && bo <= 1 )) continue; - m_table[fi].color = kapp->tqpalette().active().base(); + m_table[fi].color = kapp->palette().active().base(); m_table[fi].transparent = tr; m_table[fi].bold = bo; } @@ -615,7 +615,7 @@ // now. // // - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); r = updateAllSchemaTimes(now); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konsole/konsole/schema.h v3.5.13-sru/konsole/konsole/schema.h --- /tmp/stable//kdebase/konsole/konsole/schema.h 2011-03-12 07:58:22.000000000 +0100 +++ v3.5.13-sru/konsole/konsole/schema.h 2012-09-08 19:41:29.000000000 +0200 @@ -150,7 +150,7 @@ int numb() {if (!m_fileRead) rereadSchemaFile();return m_numb;}; const TQString& title() {if (!m_fileRead) rereadSchemaFile();return m_title;}; const TQString& imagePath() {if (!m_fileRead) rereadSchemaFile();return m_imagePath;}; - int tqalignment() {if (!m_fileRead) rereadSchemaFile();return m_tqalignment;}; + int alignment() {if (!m_fileRead) rereadSchemaFile();return m_alignment;}; const ColorEntry* table() {if (!m_fileRead) rereadSchemaFile();return m_table;}; bool useTransparency() {if (!m_fileRead) rereadSchemaFile();return m_useTransparency;}; double tr_x() {if (!m_fileRead) rereadSchemaFile();return m_tr_x;}; @@ -162,7 +162,7 @@ private: int m_numb; int m_tr_r, m_tr_g, m_tr_b; - int m_tqalignment; + int m_alignment; TQString m_title; TQString m_imagePath; ColorEntry m_table[TABLE_COLORS]; @@ -188,7 +188,7 @@ const ColorSchema *at(unsigned int i) { return TQPtrList::at(i); } ; #ifdef USE_QT4 - const ColorSchema *tqat(unsigned int i) + const ColorSchema *at(unsigned int i) { return at(i); } ; #endif // USE_QT4 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konsole/konsole/session.cpp v3.5.13-sru/konsole/konsole/session.cpp --- /tmp/stable//kdebase/konsole/konsole/session.cpp 2011-08-11 07:25:55.000000000 +0200 +++ v3.5.13-sru/konsole/konsole/session.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -133,11 +133,11 @@ { // FIXME: sh->error() is always empty if ( sh->error().isEmpty() ) - KMessageBox::error( te->tqtopLevelWidget(), + KMessageBox::error( te->topLevelWidget(), i18n("Konsole is unable to open a PTY (pseudo teletype). It is likely that this is due to an incorrect configuration of the PTY devices. Konsole needs to have read/write access to the PTY devices."), i18n("A Fatal Error Has Occurred") ); else - KMessageBox::error(te->tqtopLevelWidget(), sh->error()); + KMessageBox::error(te->topLevelWidget(), sh->error()); emit done(this); } @@ -645,7 +645,7 @@ connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(zmodemRcvBlock(const char*,int)) ); connect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue())); - zmodemProgress = new ZModemDialog(te->tqtopLevelWidget(), false, + zmodemProgress = new ZModemDialog(te->topLevelWidget(), false, i18n("ZModem Progress")); connect(zmodemProgress, TQT_SIGNAL(user1Clicked()), @@ -767,7 +767,7 @@ void TESession::onRcvBlock( const char* buf, int len ) { em->onRcvBlock( buf, len ); - emit receivedData( TQString::tqfromLatin1( buf, len ) ); + emit receivedData( TQString::fromLatin1( buf, len ) ); } void TESession::print( TQPainter &paint, bool friendly, bool exact ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konsole/konsole/TEmulation.cpp v3.5.13-sru/konsole/konsole/TEmulation.cpp --- /tmp/stable//kdebase/konsole/konsole/TEmulation.cpp 2011-08-11 07:25:55.000000000 +0200 +++ v3.5.13-sru/konsole/konsole/TEmulation.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -251,7 +251,7 @@ */ void TEmulation::onRcvChar(int c) -// process application tqunicode input to terminal +// process application unicode input to terminal // this is a trivial scanner { c &= 0xff; @@ -284,7 +284,7 @@ scr->setHistCursor(scr->getHistLines()); if (!ev->text().isEmpty()) { // A block of text - // Note that the text is proper tqunicode. + // Note that the text is proper unicode. // We should do a conversion here, but since this // routine will never be used, we simply emit plain ascii. emit sndBlock(TQString(ev->text()).ascii(),ev->text().length()); @@ -299,7 +299,7 @@ // Unblocking, Byte to Unicode translation --------------------------------- -- /* - We are doing code conversion from locale to tqunicode first. + We are doing code conversion from locale to unicode first. */ void TEmulation::onRcvBlock(const char *s, int len) @@ -345,7 +345,7 @@ if (r[j].category() == TQChar::Mark_NonSpacing) scr->compose(r.mid(j,1)); else - onRcvChar(r[j].tqunicode()); + onRcvChar(r[j].unicode()); } i = l; } @@ -392,7 +392,7 @@ void TEmulation::copySelection() { if (!connected) return; TQString t = scr->getSelText(true); - TQApplication::tqclipboard()->setText(t); + TQApplication::clipboard()->setText(t); } TQString TEmulation::getSelection() { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konsole/konsole/TEmuVt102.cpp v3.5.13-sru/konsole/konsole/TEmuVt102.cpp --- /tmp/stable//kdebase/konsole/konsole/TEmuVt102.cpp 2011-03-12 07:58:22.000000000 +0100 +++ v3.5.13-sru/konsole/konsole/TEmuVt102.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -307,7 +307,7 @@ #define ESC 27 #define CNTL(c) ((c)-'@') -// process an incoming tqunicode character +// process an incoming unicode character void TEmuVt102::onRcvChar(int cc) { int i; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konsole/konsole/TEScreen.cpp v3.5.13-sru/konsole/konsole/TEScreen.cpp --- /tmp/stable//kdebase/konsole/konsole/TEScreen.cpp 2011-03-12 07:58:22.000000000 +0100 +++ v3.5.13-sru/konsole/konsole/TEScreen.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -783,7 +783,7 @@ TQChar c(image[lastPos].c); compose.prepend(c); compose.compose(); - image[lastPos].c = compose[0].tqunicode(); + image[lastPos].c = compose[0].unicode(); } // Region commands ------------------------------------------------------------- @@ -1023,7 +1023,7 @@ } /*! fill screen with 'E' - This is to aid screen tqalignment + This is to aid screen alignment */ void TEScreen::helpAlign() diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konsole/konsole/TEWidget.cpp v3.5.13-sru/konsole/konsole/TEWidget.cpp --- /tmp/stable//kdebase/konsole/konsole/TEWidget.cpp 2011-09-01 03:15:58.000000000 +0200 +++ v3.5.13-sru/konsole/konsole/TEWidget.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -193,10 +193,10 @@ xterm fonts have these at 0x00..0x1f. QT's iso mapping leaves 0x00..0x7f without any changes. But the graphicals - come in here as proper tqunicode characters. + come in here as proper unicode characters. We treat non-iso10646 fonts as VT100 extended and do the requiered mapping - from tqunicode to 0x00..0x1f. The remaining translation is then left to the + from unicode to 0x00..0x1f. The remaining translation is then left to the QCodec. */ @@ -215,7 +215,7 @@ /* static TQChar vt100extended(TQChar c) { - switch (c.tqunicode()) + switch (c.unicode()) { case 0x25c6 : return 1; case 0x2592 : return 2; @@ -391,7 +391,7 @@ // konsole in opaque mode. bY = bX = 1; - cb = TQApplication::tqclipboard(); + cb = TQApplication::clipboard(); TQObject::connect( (TQObject*)cb, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(onClearSelection()) ); @@ -441,7 +441,7 @@ /* ------------------------------------------------------------------------- */ /** - A table for emulating the simple (single width) tqunicode drawing chars. + A table for emulating the simple (single width) unicode drawing chars. It represents the 250x - 257x glyphs. If it's zero, we can't use it. if it's not, it's encoded as follows: imagine a 5x5 grid where the points are numbered 0 to 24 left to top, top to bottom. Each point is represented by the corresponding bit. @@ -564,7 +564,7 @@ int w; for(unsigned int i=0;ic) // This may access image[image_size] See makeImage() { @@ -578,7 +578,7 @@ } //Check for line-drawing char - if (isLineChar(drawstr[0].tqunicode())) + if (isLineChar(drawstr[0].unicode())) { uchar code = drawstr[0].cell(); if (LineChars[code]) @@ -814,7 +814,7 @@ int y,x,len; const TQPixmap* pm = backgroundPixmap(); TQPainter paint; - tqsetUpdatesEnabled(false); + setUpdatesEnabled(false); paint.begin( this ); TQPoint tL = contentsRect().topLeft(); @@ -926,7 +926,7 @@ } drawFrame( &paint ); paint.end(); - tqsetUpdatesEnabled(true); + setUpdatesEnabled(true); if ( hasBlinker && !blinkT->isActive()) blinkT->start(1000); // 1000 ms if (!hasBlinker && blinkT->isActive()) { blinkT->stop(); blinking = false; } free(dirtyMask); @@ -954,7 +954,7 @@ mResizeLabel = new TQLabel(i18n("Size: XXX x XXX"), mResizeWidget); l->addWidget(mResizeLabel, 1, AlignCenter); mResizeWidget->setMinimumWidth(mResizeLabel->fontMetrics().width(i18n("Size: XXX x XXX"))+20); - mResizeWidget->setMinimumHeight(mResizeLabel->tqsizeHint().height()+20); + mResizeWidget->setMinimumHeight(mResizeLabel->sizeHint().height()+20); mResizeTimer = new TQTimer(this); connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide())); } @@ -993,7 +993,7 @@ { const TQPixmap* pm = backgroundPixmap(); TQPainter paint; - tqsetUpdatesEnabled(false); + setUpdatesEnabled(false); paint.begin( this ); paint.setBackgroundMode( Qt::TransparentMode ); @@ -1051,7 +1051,7 @@ erase( er ); paint.end(); - tqsetUpdatesEnabled(true); + setUpdatesEnabled(true); } void TEWidget::print(TQPainter &paint, bool friendly, bool exact) @@ -1072,7 +1072,7 @@ pm.fill(); TQPainter pm_paint; - pm_paint.tqbegin(&pm, TQT_TQWIDGET(this)); + pm_paint.begin(&pm, TQT_TQWIDGET(this)); paintContents(pm_paint, contentsRect(), true); pm_paint.end(); paint.drawPixmap(0, 0, pm); @@ -1159,14 +1159,14 @@ { blinking = !blinking; isBlinkEvent = true; - tqrepaint(false); + repaint(false); isBlinkEvent = false; } void TEWidget::blinkCursorEvent() { cursorBlinking = !cursorBlinking; - tqrepaint(cursorRect, true); + repaint(cursorRect, true); } /* ------------------------------------------------------------------------- */ @@ -1185,9 +1185,9 @@ if (isFixedSize) { setSize(columns, lines); - TQFrame::setFixedSize(tqsizeHint()); + TQFrame::setFixedSize(sizeHint()); parentWidget()->adjustSize(); - parentWidget()->setFixedSize(parentWidget()->tqsizeHint()); + parentWidget()->setFixedSize(parentWidget()->sizeHint()); return; } if (image) @@ -1742,14 +1742,14 @@ void TEWidget::focusInEvent( TQFocusEvent * ) { - tqrepaint(cursorRect, true); // *do* erase area, to get rid of the + repaint(cursorRect, true); // *do* erase area, to get rid of the // hollow cursor rectangle. } void TEWidget::focusOutEvent( TQFocusEvent * ) { - tqrepaint(cursorRect, true); // don't erase area + repaint(cursorRect, true); // don't erase area } bool TEWidget::focusNextPrevChild( bool next ) @@ -1803,8 +1803,8 @@ void TEWidget::emitSelection(bool useXselection,bool appendReturn) // Paste Clipboard by simulating keypress events { - TQApplication::tqclipboard()->setSelectionMode( useXselection ); - TQString text = TQApplication::tqclipboard()->text(); + TQApplication::clipboard()->setSelectionMode( useXselection ); + TQString text = TQApplication::clipboard()->text(); if(appendReturn) text.append("\r"); if ( ! text.isEmpty() ) @@ -1814,13 +1814,13 @@ emit keyPressedSignal(&e); // expose as a big fat keypress event emit clearSelectionSignal(); } - TQApplication::tqclipboard()->setSelectionMode( false ); + TQApplication::clipboard()->setSelectionMode( false ); } void TEWidget::setSelection(const TQString& t) { // Disconnect signal while WE set the clipboard - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQObject::disconnect( cb, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(onClearSelection()) ); @@ -1860,7 +1860,7 @@ //FIXME: an `eventFilter' has been installed instead of a `keyPressEvent' // due to a bug in `QT' or the ignorance of the author to prevent -// tqrepaint events being emitted to the screen whenever one leaves +// repaint events being emitted to the screen whenever one leaves // or reenters the screen to/from another application. // // Troll says one needs to change focusInEvent() and focusOutEvent(), @@ -1880,7 +1880,7 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) { if ( (e->type() == TQEvent::Accel || - e->type() == TQEvent::AccelAvailable ) && tqApp->tqfocusWidget() == this ) + e->type() == TQEvent::AccelAvailable ) && tqApp->focusWidget() == this ) { TQT_TQKEYEVENT( e )->ignore(); return false; @@ -1984,7 +1984,7 @@ m_imPreeditLength = 0; m_isIMEdit = m_isIMSel = false; - tqrepaint( repaintRect, true ); + repaint( repaintRect, true ); } // Override any Ctrl+ accelerator when pressed with the keyboard @@ -2104,7 +2104,7 @@ void TEWidget::calcGeometry() { - scrollbar->resize(TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent), + scrollbar->resize(TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent), contentsRect().height()); switch(scrollLoc) { @@ -2177,7 +2177,7 @@ TQFrame::setFixedSize(m_size); } -TQSize TEWidget::tqsizeHint() const +TQSize TEWidget::sizeHint() const { return m_size; } @@ -2242,7 +2242,7 @@ TQString tmp; if (url.isLocalFile()) { tmp = url.path(); // local URL : remove protocol. This helps "ln" & "cd" and doesn't harm the others - } else if ( url.protocol() == TQString::tqfromLatin1( "mailto" ) ) { + } else if ( url.protocol() == TQString::fromLatin1( "mailto" ) ) { justPaste = true; break; } else { @@ -2268,7 +2268,7 @@ void TEWidget::doDrag() { dragInfo.state = diDragging; - dragInfo.dragObject = new TQTextDrag(TQApplication::tqclipboard()->text(TQClipboard::Selection), this); + dragInfo.dragObject = new TQTextDrag(TQApplication::clipboard()->text(TQClipboard::Selection), this); dragInfo.dragObject->dragCopy(); // Don't delete the TQTextDrag object. Qt will delete it when it's done with it. } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/konsole/konsole/TEWidget.h v3.5.13-sru/konsole/konsole/TEWidget.h --- /tmp/stable//kdebase/konsole/konsole/TEWidget.h 2011-03-12 07:58:22.000000000 +0100 +++ v3.5.13-sru/konsole/konsole/TEWidget.h 2012-09-08 19:41:29.000000000 +0200 @@ -98,7 +98,7 @@ void updateImageSize(); void setSize(int cols, int lins); void setFixedSize(int cols, int lins); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void setWordCharacters(TQString wc); TQString wordCharacters() { return word_characters; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpager/desktop.cpp v3.5.13-sru/kpager/desktop.cpp --- /tmp/stable//kdebase/kpager/desktop.cpp 2011-08-11 07:25:33.000000000 +0200 +++ v3.5.13-sru/kpager/desktop.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -295,7 +295,7 @@ p.begin(pixmap); p.setFont(font()); - p.fillRect( r, tqcolorGroup().brush(TQColorGroup::Dark)); + p.fillRect( r, colorGroup().brush(TQColorGroup::Dark)); paintWindow(p, info, false); p.end(); @@ -425,7 +425,7 @@ p.begin(&pixmap); // p.setFont(font()); -// p.fillRect(rect(), tqcolorGroup().brush(TQColorGroup::Dark)); +// p.fillRect(rect(), colorGroup().brush(TQColorGroup::Dark)); // p.setPen(Qt::black); // p.drawRect(rect()); @@ -450,7 +450,7 @@ else pixmap.fill(Qt::gray); } else - p.fillRect(rect(), tqcolorGroup().brush(TQColorGroup::Mid)); + p.fillRect(rect(), colorGroup().brush(TQColorGroup::Mid)); // set in/active pen if (isCurrent()) @@ -523,8 +523,8 @@ TQBrush brush; - if ( isActive ) brush=tqcolorGroup().brush( TQColorGroup::Highlight ); - else brush=tqcolorGroup().brush( TQColorGroup::Button ); + if ( isActive ) brush=colorGroup().brush( TQColorGroup::Highlight ); + else brush=colorGroup().brush( TQColorGroup::Button ); if ( m_transparentMode==AllWindows || (m_transparentMode==MaximizedWindows && ( info->state() & NET::Max )) ) @@ -532,12 +532,12 @@ if ( isActive ) { - qDrawShadeRect( &p, r, tqcolorGroup(), false, 1, 0, &brush ); + qDrawShadeRect( &p, r, colorGroup(), false, 1, 0, &brush ); } else { p.fillRect( r, brush ); - qDrawShadeRect( &p, r, tqcolorGroup(), true, 1, 0 ); + qDrawShadeRect( &p, r, colorGroup(), true, 1, 0 ); } } @@ -669,7 +669,7 @@ } else kdDebug() << "Error getting the background\n"; } -TQSize Desktop::tqsizeHint() const +TQSize Desktop::sizeHint() const { return TQSize(67,50); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpager/desktop.h v3.5.13-sru/kpager/desktop.h --- /tmp/stable//kdebase/kpager/desktop.h 2011-03-12 07:57:53.000000000 +0100 +++ v3.5.13-sru/kpager/desktop.h 2012-09-08 19:41:29.000000000 +0200 @@ -74,7 +74,7 @@ static void removeCachedPixmap(int nWin) { m_windowPixmaps.remove(nWin); }; - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * active is a bool that specifies if the frame is the active diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpager/kpager.cpp v3.5.13-sru/kpager/kpager.cpp --- /tmp/stable//kdebase/kpager/kpager.cpp 2011-03-12 07:57:53.000000000 +0100 +++ v3.5.13-sru/kpager/kpager.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -76,7 +76,7 @@ if (w > 0 && h > 0) resize(w,h); else - resize(m_pPager->tqsizeHint()); + resize(m_pPager->sizeHint()); // resize(cfg->readNumEntry(lWidth(),200),cfg->readNumEntry(lHeight(),90)); int xpos=cfg->readNumEntry("xPos",-1); @@ -91,7 +91,7 @@ // rect.pos.y+rect.size.height-m_pPager->height()); // antonio:The above lines don't work. I should look at them when I have // more time - move(kapp->desktop()->width()-m_pPager->tqsizeHint().width()-5,kapp->desktop()->height()-m_pPager->tqsizeHint().height()-25); + move(kapp->desktop()->width()-m_pPager->sizeHint().width()-5,kapp->desktop()->height()-m_pPager->sizeHint().height()-25); } // Set the wm flags to this window @@ -374,7 +374,7 @@ updateLayout(); for( TQValueList ::Iterator it = m_desktops.begin(); it != m_desktops.end(); ++it ) - (*it)->tqrepaint(); + (*it)->repaint(); } } @@ -409,7 +409,7 @@ { if ( (inf1 && inf1->isOnDesktop(i)) || (inf2 && inf2->isOnDesktop(i) ) ) - m_desktops[i-1]->tqrepaint(false); + m_desktops[i-1]->repaint(false); } } @@ -422,7 +422,7 @@ for ( int i=1; i <= (int) m_desktops.count(); ++i) { if ( inf->isOnDesktop( i )) - m_desktops[i-1]->tqrepaint(false); + m_desktops[i-1]->repaint(false); } } @@ -438,14 +438,14 @@ for (int i = 1; i <= (int) m_desktops.count(); ++i) { if (onAllDesktops || desktop == i) - m_desktops[i-1]->tqrepaint(false); + m_desktops[i-1]->repaint(false); } } } void KPager::slotWindowChanged( WId win , unsigned int prop) { - bool tqrepaint=false; + bool repaint=false; KWin::WindowInfo* inf = m_windows[win]; if (!inf) @@ -453,7 +453,7 @@ inf=info(win); prop=0; // info already calls KWin::info, so there's no need // to update anything else. - tqrepaint=true; + repaint=true; }; bool onAllDesktops = inf ? inf->onAllDesktops() : false; @@ -466,15 +466,15 @@ } if((prop & ~( NET::WMName | NET::WMVisibleName )) != 0 ) - tqrepaint = true; + repaint = true; - if (tqrepaint) + if (repaint) for ( int i=1; i <= (int) m_desktops.count(); ++i) { if ((inf && (inf->isOnDesktop(i))) || onAllDesktops || desktop == i ) { - m_desktops[i-1]->tqrepaint(false); + m_desktops[i-1]->repaint(false); } } // redrawDesktops(); @@ -485,9 +485,9 @@ m_desktops[m_currentDesktop-1]->m_grabWindows=true; for ( int i=1; i <= (int) m_desktops.count(); ++i) { - m_desktops[i-1]->tqrepaint(false); + m_desktops[i-1]->repaint(false); } -// tqrepaint(true); +// repaint(true); } void KPager::slotDesktopNamesChanged() @@ -547,8 +547,8 @@ m_desktops[m_currentDesktop-1]->update(); m_desktops[desk-1]->paintFrame( true ); m_desktops[desk-1]->update(); -// m_desktops[m_currentDesktop-1]->tqrepaint(); -// m_desktops[desk-1]->tqrepaint(); +// m_desktops[m_currentDesktop-1]->repaint(); +// m_desktops[desk-1]->repaint(); m_currentDesktop=desk; @@ -643,21 +643,21 @@ { TQValueList ::Iterator it; for( it = m_desktops.begin(); it != m_desktops.end(); ++it ) - (*it)->tqrepaint(); + (*it)->repaint(); } void KPager::slotGrabWindows() { m_desktops[m_currentDesktop-1]->m_grabWindows=true; - m_desktops[m_currentDesktop-1]->tqrepaint(); + m_desktops[m_currentDesktop-1]->repaint(); } -TQSize KPager::tqsizeHint() const +TQSize KPager::sizeHint() const { int n=m_desktops.count(); int w=-1,h=-1; - TQSize size=m_desktops[0]->tqsizeHint(); + TQSize size=m_desktops[0]->sizeHint(); int wDsk=size.width(); int hDsk=size.height(); switch (m_layoutType) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpager/kpager.h v3.5.13-sru/kpager/kpager.h --- /tmp/stable//kdebase/kpager/kpager.h 2011-03-12 07:57:53.000000000 +0100 +++ v3.5.13-sru/kpager/kpager.h 2012-09-08 19:41:29.000000000 +0200 @@ -76,7 +76,7 @@ KWin::WindowInfo* info( WId win ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; enum LayoutTypes { Classical=0, Horizontal, Vertical }; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpager/main.cpp v3.5.13-sru/kpager/main.cpp --- /tmp/stable//kdebase/kpager/main.cpp 2011-03-12 07:57:53.000000000 +0100 +++ v3.5.13-sru/kpager/main.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -47,7 +47,7 @@ void commitData(TQSessionManager& sm) { if (mainWidget()->isHidden()) { - sm.setRestartHint( QSessionManager::RestartNever ); + sm.setRestartHint( TQSessionManager::RestartNever ); return; } closed_by_sm = true; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpersonalizer/kcountrypage.cpp v3.5.13-sru/kpersonalizer/kcountrypage.cpp --- /tmp/stable//kdebase/kpersonalizer/kcountrypage.cpp 2011-08-11 07:25:44.000000000 +0200 +++ v3.5.13-sru/kpersonalizer/kcountrypage.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -76,7 +76,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { - TQString sub = TQString::tqfromLatin1("l10n/"); + TQString sub = TQString::fromLatin1("l10n/"); // clear the list combo->clear(); @@ -86,8 +86,8 @@ for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) { KSimpleConfig entry(*it); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); TQString tag = *it; int index; @@ -113,8 +113,8 @@ for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { KSimpleConfig entry(*it); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); TQString submenu = '-' + entry.readEntry("Region"); TQString tag = *it; @@ -123,7 +123,7 @@ index = tag.findRev('/'); tag = tag.mid(index+1); - TQPixmap flag( locate( "locale", TQString::tqfromLatin1("l10n/%1/flag.png").arg(tag) ) ); + TQPixmap flag( locate( "locale", TQString::fromLatin1("l10n/%1/flag.png").arg(tag) ) ); TQIconSet icon( flag ); combo->insertItem( icon, name, tag, submenu ); } @@ -138,7 +138,7 @@ for ( it = langlist.begin(); it != langlist.end(); ++it ) { if ((*it).isNull()) { combo->insertSeparator(); - submenu = TQString::tqfromLatin1("all"); + submenu = TQString::fromLatin1("all"); combo->insertSubmenu(i18n("All"), submenu, TQString::null); continue; } @@ -151,9 +151,9 @@ kdDebug() << "KCountryPage::save()" << endl; KConfigBase *config = KGlobal::config(); - config->setGroup(TQString::tqfromLatin1("Locale")); - config->writeEntry(TQString::tqfromLatin1("Country"), comboCountry->current(), true, true); - config->writeEntry(TQString::tqfromLatin1("Language"), comboLang->current(), true, true); + config->setGroup(TQString::fromLatin1("Locale")); + config->writeEntry(TQString::fromLatin1("Country"), comboCountry->current(), true, true); + config->writeEntry(TQString::fromLatin1("Language"), comboLang->current(), true, true); config->sync(); // only make the system reload the language, if the selected one deferes from the old saved one. @@ -167,7 +167,7 @@ kapp->dcopClient()->attach(); // ksycoca needs to be rebuilt KProcess proc; - proc << TQString::tqfromLatin1("kbuildsycoca"); + proc << TQString::fromLatin1("kbuildsycoca"); proc.start(KProcess::DontCare); kdDebug() << "KLocaleConfig::save : sending signal to kdesktop" << endl; // inform kicker and kdeskop about the new language @@ -182,10 +182,10 @@ void KCountryPage::setLangForCountry(const TQString &country) { KSimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true); - ent.setGroup(TQString::tqfromLatin1("KCM Locale")); - langs = ent.readListEntry(TQString::tqfromLatin1("Languages")); + ent.setGroup(TQString::fromLatin1("KCM Locale")); + langs = ent.readListEntry(TQString::fromLatin1("Languages")); - TQString lang = TQString::tqfromLatin1("en_US"); + TQString lang = TQString::fromLatin1("en_US"); // use the first INSTALLED langauge in the list, or default to C for ( TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) { if (cb_language->contains(*it)) { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpersonalizer/kcountrypagedlg.ui v3.5.13-sru/kpersonalizer/kcountrypagedlg.ui --- /tmp/stable//kdebase/kpersonalizer/kcountrypagedlg.ui 2011-03-12 07:58:07.000000000 +0100 +++ v3.5.13-sru/kpersonalizer/kcountrypagedlg.ui 2012-09-08 19:41:29.000000000 +0200 @@ -36,7 +36,7 @@ 0 - + 150 0 @@ -84,7 +84,7 @@ RichText - + WordBreak|AlignTop|AlignLeft @@ -120,7 +120,7 @@ 0 - + 150 0 @@ -160,7 +160,7 @@ 0 - + 170 430 @@ -189,7 +189,7 @@ Fixed - + 20 30 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpersonalizer/keyecandypagedlg.ui v3.5.13-sru/kpersonalizer/keyecandypagedlg.ui --- /tmp/stable//kdebase/kpersonalizer/keyecandypagedlg.ui 2011-03-12 07:58:07.000000000 +0100 +++ v3.5.13-sru/kpersonalizer/keyecandypagedlg.ui 2012-09-08 19:41:29.000000000 +0200 @@ -28,7 +28,7 @@ 0 - + 170 430 @@ -63,7 +63,7 @@ <P>Trinity offers many visually appealing special effects, such as smoothed fonts, previews in the file manager and animated menus. All this beauty, however, comes at a small performance cost. </P> If you have a fast, new processor, you might want to turn them all on, but for those of us with slower processors, starting off with less eye candy helps to keep your desktop more responsive. - + WordBreak|AlignTop|AlignLeft @@ -98,7 +98,7 @@ PlainText - + AlignCenter @@ -136,7 +136,7 @@ Fast Processor (more effects) - + AlignCenter @@ -222,7 +222,7 @@ 0 - + 0 120 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpersonalizer/kfindlanguage.cpp v3.5.13-sru/kpersonalizer/kfindlanguage.cpp --- /tmp/stable//kdebase/kpersonalizer/kfindlanguage.cpp 2011-08-11 07:25:44.000000000 +0200 +++ v3.5.13-sru/kpersonalizer/kfindlanguage.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -38,7 +38,7 @@ m_country = config->readEntry("Country", "C"); if (m_country == "C") { - m_country = TQString::tqfromLatin1(getenv("LANG")); + m_country = TQString::fromLatin1(getenv("LANG")); if(m_country.left(5) == "nn_NO") // glibc's nn_NO is KDE's no_NY m_country = "no"; if(m_country.contains("_")) @@ -54,7 +54,7 @@ } // get the users primary Languages - KSimpleConfig ent(locate("locale", TQString::tqfromLatin1("l10n/%1/entry.desktop").arg(m_country)), true); + KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop").arg(m_country)), true); ent.setGroup("KCM Locale"); TQStringList langs = ent.readListEntry("Languages"); if (langs.isEmpty()) @@ -96,7 +96,7 @@ if (m_oldlang.isEmpty()) { compare = langs.first(); for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) { - if (*it == TQString::tqfromLatin1(getenv("LANG")).mid(3, 2).lower()) + if (*it == TQString::fromLatin1(getenv("LANG")).mid(3, 2).lower()) compare = *it; } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpersonalizer/kospage.cpp v3.5.13-sru/kpersonalizer/kospage.cpp --- /tmp/stable//kdebase/kpersonalizer/kospage.cpp 2011-08-21 09:08:16.000000000 +0200 +++ v3.5.13-sru/kpersonalizer/kospage.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -142,7 +142,7 @@ ckcmdisplay->writeEntry("macStyle", false, true, true); cglobal->setGroup("KDE"); - cglobal->writeEntry("SingleClick", true, true, true); + cglobal->writeEntry("SingleClick", false, true, true); claunch->setGroup("FeedbackStyle"); claunch->writeEntry("BusyCursor", false); @@ -351,8 +351,8 @@ textview_ospage->setText(i18n( "Window activation: Focus on click
    " "Titlebar double-click: Shade window
    " - "Mouse selection: Single click
    " - "Application startup notification: busy cursor
    " + "Mouse selection: Double click
    " + "Application startup notification: none
    " "Keyboard scheme: Trinity default
    " )); } @@ -376,7 +376,7 @@ "Window activation: Focus on click
    " "Titlebar double-click: Maximize window
    " "Mouse selection: Double click
    " - "Application startup notification: busy cursor
    " + "Application startup notification: none
    " "Keyboard scheme: Windows
    " )); } @@ -400,7 +400,7 @@ b_MacMenuBar = ckcmdisplay->readBoolEntry("macStyle", false); cglobal->setGroup("KDE"); - b_SingleClick = cglobal->readBoolEntry("SingleClick", true); + b_SingleClick = cglobal->readBoolEntry("SingleClick", false); claunch->setGroup("FeedbackStyle"); b_BusyCursor = claunch->readBoolEntry("BusyCursor", false); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpersonalizer/kospagedlg.ui v3.5.13-sru/kpersonalizer/kospagedlg.ui --- /tmp/stable//kdebase/kpersonalizer/kospagedlg.ui 2011-03-12 07:58:07.000000000 +0100 +++ v3.5.13-sru/kpersonalizer/kospagedlg.ui 2012-09-08 19:41:29.000000000 +0200 @@ -33,7 +33,7 @@ 0     - + 170 430 @@ -136,7 +136,7 @@ Fixed - + 22 10 @@ -153,7 +153,7 @@ Fixed - + 22 16 @@ -167,7 +167,7 @@ For motion impaired users, Trinity provides keyboard gestures to activate special keyboard settings. - + WordBreak|AlignVCenter diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpersonalizer/kpersonalizer.cpp v3.5.13-sru/kpersonalizer/kpersonalizer.cpp --- /tmp/stable//kdebase/kpersonalizer/kpersonalizer.cpp 2011-03-12 07:58:07.000000000 +0100 +++ v3.5.13-sru/kpersonalizer/kpersonalizer.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -232,11 +232,11 @@ /** there seems to be a bug in TQWizard, that makes this evil hack necessary */ void KPersonalizer::setPosition() { - TQSize hint = countrypage->tqsizeHint(); - TQSize os_size = ospage->tqsizeHint(); - TQSize candy_size = eyecandy->tqsizeHint(); - TQSize style_size = stylepage->tqsizeHint(); - TQSize refine_size = refinepage->tqsizeHint(); + TQSize hint = countrypage->sizeHint(); + TQSize os_size = ospage->sizeHint(); + TQSize candy_size = eyecandy->sizeHint(); + TQSize style_size = stylepage->sizeHint(); + TQSize refine_size = refinepage->sizeHint(); // get the width of the broadest child-widget if ( hint.width() < os_size.width() ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpersonalizer/krefinepagedlg.ui v3.5.13-sru/kpersonalizer/krefinepagedlg.ui --- /tmp/stable//kdebase/kpersonalizer/krefinepagedlg.ui 2011-03-12 07:58:07.000000000 +0100 +++ v3.5.13-sru/kpersonalizer/krefinepagedlg.ui 2012-09-08 19:41:29.000000000 +0200 @@ -32,7 +32,7 @@ <h3>Finished</h3> <p>After closing this dialog you can always restart this Wizard by choosing the entry <b>Desktop Settings Wizard</b> from the Settings menu.</p> - + WordBreak|AlignVCenter|AlignLeft @@ -80,7 +80,7 @@ You can refine the settings you made by starting the Trinity Control Center by choosing the entry <b>Control Center</b> in the K menu. - + WordBreak|AlignTop|AlignLeft @@ -98,7 +98,7 @@ 0 - + 170 430 @@ -132,7 +132,7 @@ You can also start the Trinity Control Center using the button below. - + WordBreak|AlignCenter @@ -146,7 +146,7 @@ Fixed - + 30 16 @@ -163,7 +163,7 @@ Fixed - + 20 16 @@ -188,7 +188,7 @@ Expanding - + 20 20 @@ -213,7 +213,7 @@ Expanding - + 20 20 @@ -232,7 +232,7 @@ Expanding - + 20 20 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpersonalizer/kstylepage.cpp v3.5.13-sru/kpersonalizer/kstylepage.cpp --- /tmp/stable//kdebase/kpersonalizer/kstylepage.cpp 2011-08-21 09:08:16.000000000 +0200 +++ v3.5.13-sru/kpersonalizer/kstylepage.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -238,7 +238,7 @@ for (KIcon::Group i=KIcon::FirstGroup; isetGroup(TQString::tqfromLatin1(groups[i]) + "Icons"); + KGlobal::config()->setGroup(TQString::fromLatin1(groups[i]) + "Icons"); KGlobal::config()->writeEntry("Size", icontheme.defaultSize(i)); } KGlobal::config()->sync(); @@ -428,12 +428,12 @@ else if (*it == "Light, 3rd revision") kde_light_exist = true; } // and disable the ListItems, if they are not. - if ( !(kde_plastik_exist || kde_light_exist) ) kde->tqsetVisible(false); - if ( !(kde_hc_exist || kde_def_exist) ) classic->tqsetVisible(false); - if (!kde_keramik_exist || TQPixmap::defaultDepth() <= 8) keramik->tqsetVisible(false); - if (!cde_exist) cde->tqsetVisible(false); - if (!win_exist) win->tqsetVisible(false); - if (!platinum_exist) platinum->tqsetVisible(false); + if ( !(kde_plastik_exist || kde_light_exist) ) kde->setVisible(false); + if ( !(kde_hc_exist || kde_def_exist) ) classic->setVisible(false); + if (!kde_keramik_exist || TQPixmap::defaultDepth() <= 8) keramik->setVisible(false); + if (!cde_exist) cde->setVisible(false); + if (!win_exist) win->setVisible(false); + if (!platinum_exist) platinum->setVisible(false); // test, wich KWin-styles are available kwin_keramik_exist = kwin_system_exist = kwin_plastik_exist @@ -542,7 +542,7 @@ // go ahead setStyleRecursive( stylePreview, palette, style ); // this flickers, but reliably draws the widgets corretly. - stylePreview->resize( stylePreview->tqsizeHint() ); + stylePreview->resize( stylePreview->sizeHint() ); delete appliedStyle; appliedStyle = style; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpersonalizer/kstylepagedlg.ui v3.5.13-sru/kpersonalizer/kstylepagedlg.ui --- /tmp/stable//kdebase/kpersonalizer/kstylepagedlg.ui 2011-03-12 07:58:07.000000000 +0100 +++ v3.5.13-sru/kpersonalizer/kstylepagedlg.ui 2012-09-08 19:41:29.000000000 +0200 @@ -31,7 +31,7 @@ Please choose the way your computer should look by selecting one of the items below. - + WordBreak|AlignVCenter|AlignLeft @@ -49,7 +49,7 @@ 0 - + 170 430 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kpersonalizer/ksysinfo.cpp v3.5.13-sru/kpersonalizer/ksysinfo.cpp --- /tmp/stable//kdebase/kpersonalizer/ksysinfo.cpp 2011-08-11 07:25:44.000000000 +0200 +++ v3.5.13-sru/kpersonalizer/ksysinfo.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -99,12 +99,12 @@ void KSysInfo::initFontFamilies() { TQFontDatabase fdb; - TQStringList families = fdb.tqfamilies(); + TQStringList families = fdb.families(); m_normal_font = TQString::null; m_fixed_font = TQString::null; int normal_priority = 0, fixed_priority = 0; for (uint i=0; i < families.count(); i++) { - TQString font = *families.tqat(i); + TQString font = *families.at(i); //add further NORMAL fonts here if ( (font.contains("Arial [") || font=="Arial") && normal_priority < 15 ) { m_normal_font = font; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kreadconfig/kwriteconfig.cpp v3.5.13-sru/kreadconfig/kwriteconfig.cpp --- /tmp/stable//kdebase/kreadconfig/kwriteconfig.cpp 2011-03-12 07:57:53.000000000 +0100 +++ v3.5.13-sru/kreadconfig/kwriteconfig.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -52,7 +52,7 @@ KConfig *konfig; if (file.isEmpty()) - konfig = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false); + konfig = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); else konfig = new KConfig(file, false, false); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/krootbacking/krootbacking.cpp v3.5.13-sru/krootbacking/krootbacking.cpp --- /tmp/stable//kdebase/krootbacking/krootbacking.cpp 2011-08-28 02:02:07.000000000 +0200 +++ v3.5.13-sru/krootbacking/krootbacking.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -54,6 +54,8 @@ KRootBacking::KRootBacking() : TQObject(KApplication::desktop(), "KRootBacking" ), m_Desk(0), m_timeout(0) { + enableExports(); + init(); } @@ -67,7 +69,7 @@ m_bActive = false; connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); - connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(tqrepaint())); + connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint())); #ifdef Q_WS_X11 connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); @@ -111,7 +113,7 @@ } } if (m_bInit) { - tqrepaint(true); + repaint(true); } } @@ -133,16 +135,16 @@ m_Fade = fade; m_FadeColor = color; - if ( m_bActive && m_bInit ) tqrepaint(true); + if ( m_bActive && m_bInit ) repaint(true); } -void KRootBacking::tqrepaint() +void KRootBacking::repaint() { - tqrepaint(false); + repaint(false); } -void KRootBacking::tqrepaint(bool force) +void KRootBacking::repaint(bool force) { TQWidget* desktopWidget = KApplication::desktop(); TQPoint p1 = desktopWidget->mapToGlobal(desktopWidget->rect().topLeft()); @@ -255,7 +257,7 @@ return; if (desk == m_Desk) - tqrepaint(true); + repaint(true); } #include "krootbacking.moc" diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/krootbacking/krootbacking.h v3.5.13-sru/krootbacking/krootbacking.h --- /tmp/stable//kdebase/krootbacking/krootbacking.h 2011-08-28 02:02:07.000000000 +0200 +++ v3.5.13-sru/krootbacking/krootbacking.h 2012-09-08 19:41:29.000000000 +0200 @@ -116,16 +116,16 @@ * Repaints the widget background. Normally, you shouldn't need this * as it is handled automatically. * - * @param force Force a tqrepaint, even if the contents did not change. + * @param force Force a repaint, even if the contents did not change. */ - void tqrepaint( bool force ); + void repaint( bool force ); /** * Repaints the widget background. Normally, you shouldn't need this * as it is handled automatically. This is equivalent to calling - * tqrepaint( false ). + * repaint( false ). */ - void tqrepaint(); + void repaint(); /** * Asks KDesktop to export the desktop background as a KSharedPixmap. diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/krootbacking/main.cpp v3.5.13-sru/krootbacking/main.cpp --- /tmp/stable//kdebase/krootbacking/main.cpp 2011-08-28 02:02:07.000000000 +0200 +++ v3.5.13-sru/krootbacking/main.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -61,7 +61,7 @@ args->clear(); TQObject* mainWin = new KRootBacking(); - TQTimer *timer = new QTimer( mainWin ); + TQTimer *timer = new TQTimer( mainWin ); TQObject::connect( timer, SIGNAL(timeout()), mainWin, SLOT(start()) ); timer->start( 100, TRUE ); // 100ms single shot timer diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kscreensaver/blankscrn.cpp v3.5.13-sru/kscreensaver/blankscrn.cpp --- /tmp/stable//kdebase/kscreensaver/blankscrn.cpp 2011-03-12 07:58:00.000000000 +0100 +++ v3.5.13-sru/kscreensaver/blankscrn.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -69,7 +69,7 @@ grid->setRowStretch( 2, 10 ); grid->setRowStretch( 3, 20 ); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); } // read settings from config file diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kscreensaver/random.cpp v3.5.13-sru/kscreensaver/random.cpp --- /tmp/stable//kdebase/kscreensaver/random.cpp 2011-08-11 07:25:40.000000000 +0200 +++ v3.5.13-sru/kscreensaver/random.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -41,7 +41,7 @@ { puts(i18n("Usage: %1 [-setup] [args]\n" "Starts a random screen saver.\n" - "Any arguments (except -setup) are passed on to the screen saver.").tqarg( name ).local8Bit().data()); + "Any arguments (except -setup) are passed on to the screen saver.").arg( name ).local8Bit().data()); } static const char appName[] = "random"; @@ -201,7 +201,7 @@ KRandomSequence rnd; int indx = rnd.getLong(saverFileList.count()); - TQString filename = *(saverFileList.tqat(indx)); + TQString filename = *(saverFileList.at(indx)); KDesktopFile config(filename, true); @@ -271,7 +271,7 @@ manipulateScreen = new TQCheckBox(i18n("Use screen savers that manipulate the screen"), main); grid->addWidget(manipulateScreen, 1, 0); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); KConfig config("krandom.kssrc"); config.setGroup("Settings"); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksmserver/client.cpp v3.5.13-sru/ksmserver/client.cpp --- /tmp/stable//kdebase/ksmserver/client.cpp 2011-03-12 07:57:33.000000000 +0100 +++ v3.5.13-sru/ksmserver/client.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -146,7 +146,7 @@ SmProp* p = property( SmProgram ); if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1) return TQString::null; - return TQString::tqfromLatin1( (const char*) p->vals[0].value ); + return TQString::fromLatin1( (const char*) p->vals[0].value ); } TQStringList KSMClient::restartCommand() const @@ -156,7 +156,7 @@ if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1) return result; for ( int i = 0; i < p->num_vals; i++ ) - result +=TQString::tqfromLatin1( (const char*) p->vals[i].value ); + result +=TQString::fromLatin1( (const char*) p->vals[i].value ); return result; } @@ -167,7 +167,7 @@ if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1) return result; for ( int i = 0; i < p->num_vals; i++ ) - result +=TQString::tqfromLatin1( (const char*) p->vals[i].value ); + result +=TQString::fromLatin1( (const char*) p->vals[i].value ); return result; } @@ -184,7 +184,7 @@ SmProp* p = property( SmUserID ); if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1) return TQString::null; - return TQString::tqfromLatin1( (const char*) p->vals[0].value ); + return TQString::fromLatin1( (const char*) p->vals[0].value ); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksmserver/legacy.cpp v3.5.13-sru/ksmserver/legacy.cpp --- /tmp/stable//kdebase/ksmserver/legacy.cpp 2011-08-16 01:07:50.000000000 +0200 +++ v3.5.13-sru/ksmserver/legacy.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -315,7 +315,7 @@ if (!data) return result; for (int i=0; i<(int)nitems; i++) { - result << TQString::tqfromLatin1( (const char*)data + i ); + result << TQString::fromLatin1( (const char*)data + i ); while(data[i]) i++; } XFree(data); @@ -363,7 +363,7 @@ } } } - return TQString::tqfromLatin1(result); + return TQString::fromLatin1(result); } WId KSMServer::windowWmClientLeader(WId w) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksmserver/main.cpp v3.5.13-sru/ksmserver/main.cpp --- /tmp/stable//kdebase/ksmserver/main.cpp 2011-08-14 04:41:54.000000000 +0200 +++ v3.5.13-sru/ksmserver/main.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -170,7 +170,7 @@ qmsg.sprintf(msg.data(), path.data()); qmsg = msg_pre+qmsg+msg_post; TQMessageBox::critical(0, "KDE Installation Problem!", - TQString::tqfromLatin1(qmsg.data())); + TQString::fromLatin1(qmsg.data())); exit(255); } } @@ -218,7 +218,7 @@ only_local = false; #endif - KSMServer *server = new KSMServer( TQString::tqfromLatin1(wm), only_local); + KSMServer *server = new KSMServer( TQString::fromLatin1(wm), only_local); kapp->dcopClient()->setDefaultObject( server->objId() ); IceSetIOErrorHandler( IoErrorHandler ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksmserver/shutdown.cpp v3.5.13-sru/ksmserver/shutdown.cpp --- /tmp/stable//kdebase/ksmserver/shutdown.cpp 2011-10-10 03:40:45.000000000 +0200 +++ v3.5.13-sru/ksmserver/shutdown.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -160,23 +160,33 @@ if (sdmode == KApplication::ShutdownModeDefault) sdmode = KApplication::ShutdownModeInteractive; - // shall we show a nice fancy logout screen? - bool showFancyLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showFancyLogout", true); + // shall we show a logout status dialog box? + bool showLogoutStatusDlg = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true); - if (showFancyLogout) { + if (showLogoutStatusDlg) { KSMShutdownIPFeedback::start(); } dialogActive = true; if ( !logoutConfirmed ) { + int selection; KSMShutdownFeedback::start(); // make the screen gray logoutConfirmed = - KSMShutdownDlg::confirmShutdown( maysd, sdtype, bopt ); + KSMShutdownDlg::confirmShutdown( maysd, sdtype, bopt, &selection ); // ###### We can't make the screen remain gray while talking to the apps, // because this prevents interaction ("do you want to save", etc.) // TODO: turn the feedback widget into a list of apps to be closed, // with an indicator of the current status for each. KSMShutdownFeedback::stop(); // make the screen become normal again + if (selection != 0) { + // respect lock on resume & disable suspend/hibernate settings + // from power-manager + KConfig config("power-managerrc"); + bool lockOnResume = config.readBoolEntry("lockOnResume", true); + if (lockOnResume) { + DCOPRef("kdesktop", "KScreensaverIface").send("lock"); + } + } } if ( logoutConfirmed ) { @@ -189,30 +199,12 @@ // shall we save the session on logout? saveSession = ( config->readEntry( "loginMode", "restorePreviousLogout" ) == "restorePreviousLogout" ); - if (showFancyLogout) { - KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user - shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP(); - while (!KSMShutdownIPFeedback::ispainted()) { - tqApp->processEvents(); - } - } - - // synchronize any folders that were requested for shutdown sync - if (shutdownNotifierIPDlg) { - static_cast(shutdownNotifierIPDlg)->setStatusMessage(i18n("Synchronizing remote folders").append("...")); - } - KRsync krs(this, ""); - krs.executeLogoutAutoSync(); - if (shutdownNotifierIPDlg) { - static_cast(shutdownNotifierIPDlg)->setStatusMessage(i18n("Saving your settings...")); - } - if ( saveSession ) sessionGroup = TQString("Session: ") + SESSION_PREVIOUS_LOGOUT; // Set the real desktop background to black so that exit looks // clean regardless of what was on "our" desktop. - if (!showFancyLogout) { + if (!showLogoutStatusDlg) { TQT_TQWIDGET(kapp->desktop())->setBackgroundColor( Qt::black ); } state = Shutdown; @@ -252,9 +244,9 @@ completeShutdownOrCheckpoint(); } else { - if (showFancyLogout) { - KSMShutdownIPFeedback::stop(); - } + if (showLogoutStatusDlg) { + KSMShutdownIPFeedback::stop(); + } } dialogActive = false; } @@ -502,6 +494,25 @@ if ( waitForPhase2 ) return; + bool showLogoutStatusDlg = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true); + if (showLogoutStatusDlg && state != Checkpoint) { + KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user + shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP(); + while (!KSMShutdownIPFeedback::ispainted()) { + tqApp->processEvents(); + } + } + + // synchronize any folders that were requested for shutdown sync + if (shutdownNotifierIPDlg) { + static_cast(shutdownNotifierIPDlg)->setStatusMessage(i18n("Synchronizing remote folders").append("...")); + } + KRsync krs(this, ""); + krs.executeLogoutAutoSync(); + if (shutdownNotifierIPDlg) { + static_cast(shutdownNotifierIPDlg)->setStatusMessage(i18n("Saving your settings...")); + } + if ( saveSession ) storeSession(); else diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksmserver/shutdowndlg.cpp v3.5.13-sru/ksmserver/shutdowndlg.cpp --- /tmp/stable//kdebase/ksmserver/shutdowndlg.cpp 2011-10-10 03:40:45.000000000 +0200 +++ v3.5.13-sru/ksmserver/shutdowndlg.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -519,6 +519,11 @@ : TQWidget( 0L, "systemmodaldialogclass", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0) { + setShown(false); + hide(); + + enableExports(); + m_sharedRootPixmap = new KRootPixmap(this); m_sharedRootPixmap->setCustomPainting(true); connect(m_sharedRootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotSetBackgroundPixmap(const TQPixmap &))); @@ -545,15 +550,36 @@ setBackgroundPixmap( m_root ); setGeometry( TQApplication::desktop()->geometry() ); setBackgroundMode( TQWidget::NoBackground ); - - setShown(true); } void KSMShutdownIPFeedback::showNow() { + setShown(true); + TQTimer::singleShot( 0, this, SLOT(slotPaintEffect()) ); } +void KSMShutdownIPFeedback::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 +} + KSMShutdownIPFeedback::~KSMShutdownIPFeedback() { if (m_sharedRootPixmap) { @@ -639,18 +665,21 @@ ////// KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, - bool maysd, KApplication::ShutdownType sdtype ) - : TQDialog( parent, 0, TRUE, (WFlags)WType_Popup ), targets(0) + bool maysd, KApplication::ShutdownType sdtype, int* selection ) + : TQDialog( parent, 0, TRUE, (WFlags)WType_Popup ), targets(0), m_selection(selection) // this is a WType_Popup on purpose. Do not change that! Not // having a popup here has severe side effects. { TQVBoxLayout* vbox = new TQVBoxLayout( this ); + if (m_selection) { + *m_selection = 0; + } TQFrame* frame = new TQFrame( this ); frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); - frame->setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) ); + frame->setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) ); // we need to set the minimum size for the logout box, since it // gets too small if there isn't all options available frame->setMinimumWidth(400); @@ -691,7 +720,7 @@ { // first line of buttons hbuttonbox = new TQHBoxLayout( hbox, factor * KDialog::spacingHint() ); - hbuttonbox->tqsetAlignment( Qt::AlignHCenter ); + hbuttonbox->setAlignment( Qt::AlignHCenter ); // End session FlatButton* btnLogout = new FlatButton( frame ); btnLogout->setTextLabel( TQString("&") + i18n("Log out"), false ); @@ -711,12 +740,12 @@ hbox->addWidget( lfrm, AlignCenter ); buttonlay = new TQVBoxLayout( hbox, factor * KDialog::spacingHint() ); - buttonlay->tqsetAlignment( Qt::AlignHCenter ); + buttonlay->setAlignment( Qt::AlignHCenter ); TQLabel* icon = new TQLabel( lfrm ); icon->setPixmap( UserIcon( "shutdownkonq" ) ); - lfrm->setFixedSize( icon->tqsizeHint()); - icon->setFixedSize( icon->tqsizeHint()); + lfrm->setFixedSize( icon->sizeHint()); + icon->setFixedSize( icon->sizeHint()); buttonlay->addStretch( 1 ); // End session @@ -832,7 +861,7 @@ // bottom buttons TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); - hbuttonbox2->tqsetAlignment( Qt::AlignHCenter ); + hbuttonbox2->setAlignment( Qt::AlignHCenter ); // Reboot FlatButton* btnReboot = new FlatButton( frame ); @@ -882,7 +911,7 @@ // cancel buttonbox TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); - hbuttonbox3->tqsetAlignment( Qt::AlignRight ); + hbuttonbox3->setAlignment( Qt::AlignRight ); // Back to Desktop KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame ); @@ -969,7 +998,7 @@ { // cancel buttonbox TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); - hbuttonbox3->tqsetAlignment( Qt::AlignRight ); + hbuttonbox3->setAlignment( Qt::AlignRight ); // Back to Desktop KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame ); @@ -1043,17 +1072,15 @@ void KSMShutdownDlg::slotSuspend() { -#ifdef COMPILE_HALBACKEND - if (m_lockOnResume) { - DCOPRef("kdesktop", "KScreensaverIface").send("lock"); - } + *m_selection = 1; // Suspend - if (m_dbusConn) +#ifdef COMPILE_HALBACKEND + if (m_dbusConn) { DBusMessage *msg = dbus_message_new_method_call( "org.freedesktop.Hal", - "/org/freedesktop/Hal/devices/computer", - "org.freedesktop.Hal.Device.SystemPowerManagement", + "/org/freedesktop/Hal/devices/computer", + "org.freedesktop.Hal.Device.SystemPowerManagement", "Suspend"); int wakeup=0; @@ -1063,44 +1090,40 @@ dbus_message_unref(msg); } - - reject(); // continue on resume #endif + reject(); // continue on resume } void KSMShutdownDlg::slotHibernate() { -#ifdef COMPILE_HALBACKEND - if (m_lockOnResume) { - DCOPRef("kdesktop", "KScreensaverIface").send("lock"); - } + *m_selection = 2; // Hibernate - if (m_dbusConn) +#ifdef COMPILE_HALBACKEND + if (m_dbusConn) { DBusMessage *msg = dbus_message_new_method_call( "org.freedesktop.Hal", - "/org/freedesktop/Hal/devices/computer", - "org.freedesktop.Hal.Device.SystemPowerManagement", + "/org/freedesktop/Hal/devices/computer", + "org.freedesktop.Hal.Device.SystemPowerManagement", "Hibernate"); dbus_connection_send(m_dbusConn, msg, NULL); dbus_message_unref(msg); } - - reject(); // continue on resume #endif + reject(); // continue on resume } -bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sdtype, TQString& bootOption ) +bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sdtype, TQString& bootOption, int* selection ) { kapp->enableStyles(); KSMShutdownDlg* l = new KSMShutdownDlg( 0, //KSMShutdownFeedback::self(), - maysd, sdtype ); + maysd, sdtype, selection ); // Show dialog (will save the background in showEvent) - TQSize sh = l->tqsizeHint(); + TQSize sh = l->sizeHint(); TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); l->move(rect.x() + (rect.width() - sh.width())/2, @@ -1230,7 +1253,7 @@ { kapp->enableStyles(); KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay ); - TQSize sh = msg.tqsizeHint(); + TQSize sh = msg.sizeHint(); TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); msg.move(rect.x() + (rect.width() - sh.width())/2, diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksmserver/shutdowndlg.h v3.5.13-sru/ksmserver/shutdowndlg.h --- /tmp/stable//kdebase/ksmserver/shutdowndlg.h 2011-09-21 09:01:03.000000000 +0200 +++ v3.5.13-sru/ksmserver/shutdowndlg.h 2012-09-08 19:41:29.000000000 +0200 @@ -97,6 +97,13 @@ void slotSetBackgroundPixmap(const TQPixmap &); private: + /** + * Asks KDesktop to export the desktop background as a KSharedPixmap. + * This method uses DCOP to call KBackgroundIface/setExport(int). + */ + void enableExports(); + +private: static KSMShutdownIPFeedback * s_pSelf; KSMShutdownIPFeedback(); int m_currentY; @@ -116,7 +123,7 @@ Q_OBJECT public: - static bool confirmShutdown( bool maysd, KApplication::ShutdownType& sdtype, TQString& bopt ); + static bool confirmShutdown( bool maysd, KApplication::ShutdownType& sdtype, TQString& bopt, int* selection=0 ); public slots: void slotLogout(); @@ -130,7 +137,7 @@ ~KSMShutdownDlg(); private: - KSMShutdownDlg( TQWidget* parent, bool maysd, KApplication::ShutdownType sdtype ); + KSMShutdownDlg( TQWidget* parent, bool maysd, KApplication::ShutdownType sdtype, int* selection=0 ); KApplication::ShutdownType m_shutdownType; TQString m_bootOption; TQPopupMenu *targets; @@ -140,6 +147,7 @@ DBusConnection *m_dbusConn; #endif bool m_lockOnResume; + int* m_selection; }; // The shutdown-in-progress dialog diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksmserver/timed.ui v3.5.13-sru/ksmserver/timed.ui --- /tmp/stable//kdebase/ksmserver/timed.ui 2011-03-12 07:57:33.000000000 +0100 +++ v3.5.13-sru/ksmserver/timed.ui 2012-09-08 19:41:29.000000000 +0200 @@ -110,7 +110,7 @@ MinimumExpanding - + 20 2 @@ -129,7 +129,7 @@ 0 - + 48 48 @@ -149,7 +149,7 @@ MinimumExpanding - + 20 2 @@ -192,7 +192,7 @@ PlainText - + AlignVCenter|AlignLeft @@ -215,7 +215,7 @@ RichText - + WordBreak|AlignVCenter @@ -229,7 +229,7 @@ Preferred - + 30 0 @@ -258,7 +258,7 @@ Expanding - + 90 20 @@ -286,7 +286,7 @@ Expanding - + 90 20 @@ -319,7 +319,7 @@ Expanding - + 90 20 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksplashml/kcmksplash/installer.cpp v3.5.13-sru/ksplashml/kcmksplash/installer.cpp --- /tmp/stable//kdebase/ksplashml/kcmksplash/installer.cpp 2011-08-11 07:25:40.000000000 +0200 +++ v3.5.13-sru/ksplashml/kcmksplash/installer.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -99,7 +99,7 @@ hbox->setStretchFactor( leftbox, 1 ); mThemesList = new ThemeListBox(this); - mThemesList->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); + mThemesList->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); connect(mThemesList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSetTheme(int))); connect(mThemesList, TQT_SIGNAL(filesDropped(const KURL::List&)), TQT_SLOT(slotFilesDropped(const KURL::List&))); leftbox->addWidget(mThemesList); @@ -120,16 +120,16 @@ hbox->setStretchFactor( rightbox, 3 ); mPreview = new TQLabel(this); - mPreview->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + mPreview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); mPreview->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); mPreview->setMinimumSize(TQSize(320,240)); - mPreview->tqsetAlignment(Qt::AlignHCenter|Qt::AlignVCenter); + mPreview->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter); rightbox->addWidget(mPreview); rightbox->setStretchFactor( mPreview, 3 ); mText = new TQTextEdit(this); - mText->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); - mText->setMinimumSize(mText->tqsizeHint()); + mText->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); + mText->setMinimumSize(mText->sizeHint()); mText->setReadOnly(true); rightbox->addWidget(mText); rightbox->setStretchFactor( mText, 1 ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksplashml/themeengine/default/themelegacy.cpp v3.5.13-sru/ksplashml/themeengine/default/themelegacy.cpp --- /tmp/stable//kdebase/ksplashml/themeengine/default/themelegacy.cpp 2011-03-12 07:58:00.000000000 +0100 +++ v3.5.13-sru/ksplashml/themeengine/default/themelegacy.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -164,7 +164,7 @@ mProgressBar->setPaletteBackgroundPixmap( blimage ); bottom_label->setFixedWidth( QMAX(blimage.width(),tlimage.width()) ); - bottom_label->setFixedHeight( mLabel->tqsizeHint().height()+4 ); + bottom_label->setFixedHeight( mLabel->sizeHint().height()+4 ); // 3 pixels of whitespace between the label and the progressbar. mLabel->resize( bottom_label->width(), bottom_label->height() ); @@ -274,7 +274,7 @@ p.drawPixmap(0, 0, *mInactivePixmap, 0, 0, tmp.width()-offs ); else #endif - p.tqdrawPixmap(offs, 0, *mInactivePixmap, offs, 0); + p.drawPixmap(offs, 0, *mInactivePixmap, offs, 0); return tmp ; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksplashml/themeengine/redmond/themeredmond.cpp v3.5.13-sru/ksplashml/themeengine/redmond/themeredmond.cpp --- /tmp/stable//kdebase/ksplashml/themeengine/redmond/themeredmond.cpp 2011-03-12 07:58:00.000000000 +0100 +++ v3.5.13-sru/ksplashml/themeengine/redmond/themeredmond.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -199,11 +199,11 @@ kdmconfig->setGroup("X-*-Greeter"); TQString userPicsDir = kdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/'; TQString fs = kdmconfig->readEntry( "FaceSource" ); - if (fs == TQString::tqfromLatin1("UserOnly")) + if (fs == TQString::fromLatin1("UserOnly")) faceSource = fUserOnly; - else if (fs == TQString::tqfromLatin1("PreferUser")) + else if (fs == TQString::fromLatin1("PreferUser")) faceSource = fUserFirst; - else if (fs == TQString::tqfromLatin1("PreferAdmin")) + else if (fs == TQString::fromLatin1("PreferAdmin")) faceSource = fAdminFirst; else faceSource = fAdminOnly; // Admin Only diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksplashml/themeengine/redmond/themeredmond.h v3.5.13-sru/ksplashml/themeengine/redmond/themeredmond.h --- /tmp/stable//kdebase/ksplashml/themeengine/redmond/themeredmond.h 2011-03-12 07:58:00.000000000 +0100 +++ v3.5.13-sru/ksplashml/themeengine/redmond/themeredmond.h 2012-09-08 19:41:29.000000000 +0200 @@ -57,7 +57,7 @@ if( mText != s ) { mText = s; - tqrepaint( false ); + repaint( false ); } }; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksplashml/themeengine/unified/themeunified.cpp v3.5.13-sru/ksplashml/themeengine/unified/themeunified.cpp --- /tmp/stable//kdebase/ksplashml/themeengine/unified/themeunified.cpp 2011-09-16 04:01:45.000000000 +0200 +++ v3.5.13-sru/ksplashml/themeengine/unified/themeunified.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -80,7 +80,7 @@ const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() ); // Center the dialog - TQSize sh = tqsizeHint(); + TQSize sh = sizeHint(); TQRect rect1 = KGlobalSettings::desktopGeometry(TQCursor::pos()); move(rect1.x() + (rect1.width() - sh.width())/2, rect1.y() + (rect1.height() - sh.height())/2); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/KSGAppletSettings.cc v3.5.13-sru/ksysguard/gui/KSGAppletSettings.cc --- /tmp/stable//kdebase/ksysguard/gui/KSGAppletSettings.cc 2011-03-12 07:58:25.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/KSGAppletSettings.cc 2012-09-08 19:41:29.000000000 +0200 @@ -65,7 +65,7 @@ topLayout->addWidget( mInterval, 2, 1 ); label->setBuddy( mInterval ); - resize( TQSize( 250, 130 ).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize( 250, 130 ).expandedTo( minimumSizeHint() ) ); KAcceleratorManager::manage( page ); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/ksgrd/HostConnector.cc v3.5.13-sru/ksysguard/gui/ksgrd/HostConnector.cc --- /tmp/stable//kdebase/ksysguard/gui/ksgrd/HostConnector.cc 2011-03-12 07:58:25.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/ksgrd/HostConnector.cc 2012-09-08 19:41:29.000000000 +0200 @@ -59,9 +59,9 @@ TQButtonGroup *group = new TQButtonGroup( 0, Qt::Vertical, i18n( "Connection Type" ), page ); - TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 4, 4, + TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 4, 4, spacingHint() ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + groupLayout->setAlignment( Qt::AlignTop ); mUseSsh = new TQRadioButton( i18n( "ssh" ), group ); mUseSsh->setEnabled( true ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/ksgrd/StyleEngine.cc v3.5.13-sru/ksysguard/gui/ksgrd/StyleEngine.cc --- /tmp/stable//kdebase/ksysguard/gui/ksgrd/StyleEngine.cc 2011-03-12 07:58:25.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/ksgrd/StyleEngine.cc 2012-09-08 19:41:29.000000000 +0200 @@ -122,7 +122,7 @@ static TQColor dummy; if ( pos < mSensorColors.count() ) - return *mSensorColors.tqat( pos ); + return *mSensorColors.at( pos ); else return dummy; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/ksgrd/StyleSettings.cc v3.5.13-sru/ksysguard/gui/ksgrd/StyleSettings.cc --- /tmp/stable//kdebase/ksysguard/gui/ksgrd/StyleSettings.cc 2011-03-12 07:58:25.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/ksgrd/StyleSettings.cc 2012-09-08 19:41:29.000000000 +0200 @@ -162,7 +162,7 @@ for ( uint i = 0; i < list.count(); ++i ) { TQPixmap pm( 12, 12 ); - pm.fill( *list.tqat( i ) ); + pm.fill( *list.at( i ) ); mColorListBox->insertItem( pm, i18n( "Color %1" ).arg( i ) ); } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/BarGraph.cc v3.5.13-sru/ksysguard/gui/SensorDisplayLib/BarGraph.cc --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/BarGraph.cc 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/BarGraph.cc 2012-09-08 19:41:29.000000000 +0200 @@ -52,7 +52,7 @@ // Anything smaller than this does not make sense. setMinimumSize( 16, 16 ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding, false ) ); } @@ -78,7 +78,7 @@ } samples.resize( --bars ); - footers.remove( footers.tqat( idx ) ); + footers.remove( footers.at( idx ) ); update(); return true; @@ -103,7 +103,7 @@ TQPixmap pm( w, h ); TQPainter p; - p.tqbegin( &pm, this ); + p.begin( &pm, this ); p.setFont( TQFont( p.font().family(), fontSize ) ); TQFontMetrics fm( p.font() ); @@ -111,7 +111,7 @@ /* Draw white line along the bottom and the right side of the * widget to create a 3D like look. */ - p.setPen( TQColor( tqcolorGroup().light() ) ); + p.setPen( TQColor( colorGroup().light() ) ); p.drawLine( 0, h - 1, w - 1, h - 1 ); p.drawLine( w - 1, 0, w - 1, h - 1 ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.cc v3.5.13-sru/ksysguard/gui/SensorDisplayLib/DancingBars.cc --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.cc 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/DancingBars.cc 2012-09-08 19:41:29.000000000 +0200 @@ -53,7 +53,7 @@ else mPlotter = new BarGraph( frame() ); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); /* All RMB clicks to the mPlotter widget will be handled by * SensorDisplay::eventFilter. */ @@ -94,11 +94,11 @@ TQValueList< TQStringList > list; for ( uint i = mBars - 1; i < mBars; i-- ) { TQStringList entry; - entry << sensors().tqat( i )->hostName(); - entry << KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() ); + entry << sensors().at( i )->hostName(); + entry << KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() ); entry << mPlotter->footers[ i ]; - entry << KSGRD::SensorMgr->translateUnit( sensors().tqat( i )->unit() ); - entry << ( sensors().tqat( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) ); + entry << KSGRD::SensorMgr->translateUnit( sensors().at( i )->unit() ); + entry << ( sensors().at( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) ); list.append( entry ); } @@ -135,8 +135,8 @@ for ( uint i = 0; i < sensors().count(); i++ ) { bool found = false; for ( it = list.begin(); it != list.end(); ++it ) { - if ( (*it)[ 0 ] == sensors().tqat( i )->hostName() && - (*it)[ 1 ] == KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() ) ) { + if ( (*it)[ 0 ] == sensors().at( i )->hostName() && + (*it)[ 1 ] == KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() ) ) { mPlotter->footers[ i ] = (*it)[ 2 ]; found = true; break; @@ -147,7 +147,7 @@ removeSensor( i ); } - tqrepaint(); + repaint(); setModified( true ); } @@ -158,7 +158,7 @@ mPlotter->backgroundColor = KSGRD::Style->backgroundColor(); mPlotter->fontSize = KSGRD::Style->fontSize(); - tqrepaint(); + repaint(); setModified( true ); } @@ -185,8 +185,8 @@ TQString tooltip; for ( uint i = 0; i < mBars; ++i ) { tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" ) - .arg( sensors().tqat( i )->hostName() ) - .arg( sensors().tqat( i )->name() ); + .arg( sensors().at( i )->hostName() ) + .arg( sensors().at( i )->name() ); } TQToolTip::remove( mPlotter ); TQToolTip::add( mPlotter, tooltip ); @@ -209,8 +209,8 @@ TQString tooltip; for ( uint i = 0; i < mBars; ++i ) { tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" ) - .arg( sensors().tqat( i )->hostName() ) - .arg( sensors().tqat( i )->name() ); + .arg( sensors().at( i )->hostName() ) + .arg( sensors().at( i )->name() ); } TQToolTip::remove( mPlotter ); TQToolTip::add( mPlotter, tooltip ); @@ -231,12 +231,12 @@ frame()->setGeometry( 0, 0, width(), height() ); } -TQSize DancingBars::tqsizeHint() +TQSize DancingBars::sizeHint() { if ( noFrame() ) - return ( mPlotter->tqsizeHint() ); + return ( mPlotter->sizeHint() ); else - return ( frame()->tqsizeHint() ); + return ( frame()->sizeHint() ); } void DancingBars::answerReceived( int id, const TQString &answer ) @@ -272,7 +272,7 @@ mPlotter->changeRange( info.min(), info.max() ); } - sensors().tqat( id - 100 )->setUnit( info.unit() ); + sensors().at( id - 100 )->setUnit( info.unit() ); } } @@ -331,9 +331,9 @@ for ( uint i = 0; i < mBars; ++i ) { TQDomElement beam = doc.createElement( "beam" ); element.appendChild( beam ); - beam.setAttribute( "hostName", sensors().tqat( i )->hostName() ); - beam.setAttribute( "sensorName", sensors().tqat( i )->name() ); - beam.setAttribute( "sensorType", sensors().tqat( i )->type() ); + beam.setAttribute( "hostName", sensors().at( i )->hostName() ); + beam.setAttribute( "sensorName", sensors().at( i )->name() ); + beam.setAttribute( "sensorType", sensors().at( i )->type() ); beam.setAttribute( "sensorDescr", mPlotter->footers[ i ] ); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.h v3.5.13-sru/ksysguard/gui/SensorDisplayLib/DancingBars.h --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.h 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/DancingBars.h 2012-09-08 19:41:29.000000000 +0200 @@ -54,7 +54,7 @@ void updateSamples( const TQMemArray &samples ); - virtual TQSize tqsizeHint(); + virtual TQSize sizeHint(); virtual void answerReceived( int id, const TQString &answer ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc v3.5.13-sru/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc 2012-09-08 19:41:29.000000000 +0200 @@ -48,7 +48,7 @@ TQGridLayout *pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() ); TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page ); - TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 1 ); + TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 1, 1 ); mTitle = new KLineEdit( groupBox ); TQWhatsThis::add( mTitle, i18n( "Enter the title of the display here." ) ); @@ -57,7 +57,7 @@ pageLayout->addWidget( groupBox, 0, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Display Range" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 5 ); + boxLayout = new TQGridLayout( groupBox->layout(), 1, 5 ); boxLayout->setColStretch( 2, 1 ); TQLabel *label = new TQLabel( i18n( "Minimum value:" ), groupBox ); @@ -85,7 +85,7 @@ pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Minimum Value" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 4 ); + boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 ); boxLayout->setColStretch( 1, 1 ); mUseLowerLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox ); @@ -103,7 +103,7 @@ pageLayout->addWidget( groupBox, 0, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Maximum Value" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 4 ); + boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 ); boxLayout->setColStretch( 1, 1 ); mUseUpperLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc v3.5.13-sru/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc 2012-09-08 19:41:29.000000000 +0200 @@ -52,7 +52,7 @@ mPlotter->setTitle( title ); mPlotter->setThinFrame(!isApplet); //if we aren't an applet, draw a thin white frame on the left and bottom, for a 3d effect - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); /* All RMB clicks to the mPlotter widget will be handled by * SensorDisplay::eventFilter. */ @@ -101,10 +101,10 @@ for ( uint i = 0; i < mBeams; ++i ) { TQStringList entry; entry << TQString::number(i); - entry << sensors().tqat( i )->hostName(); - entry << KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() ); - entry << KSGRD::SensorMgr->translateUnit( sensors().tqat( i )->unit() ); - entry << ( sensors().tqat( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) ); + entry << sensors().at( i )->hostName(); + entry << KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() ); + entry << KSGRD::SensorMgr->translateUnit( sensors().at( i )->unit() ); + entry << ( sensors().at( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) ); entry << ( mPlotter->beamColors()[ i ].name() ); list.append( entry ); @@ -214,10 +214,10 @@ if ( type != "integer" && type != "float" ) return false; - if ( mBeams > 0 && hostName != sensors().tqat( 0 )->hostName() ) { + if ( mBeams > 0 && hostName != sensors().at( 0 )->hostName() ) { KMessageBox::sorry( this, TQString( "All sensors of this display need " "to be from the host %1!" ) - .arg( sensors().tqat( 0 )->hostName() ) ); + .arg( sensors().at( 0 )->hostName() ) ); /* We have to enforce this since the answers to value requests * need to be received in order. */ @@ -238,8 +238,8 @@ TQString tooltip; for ( uint i = 0; i < mBeams; ++i ) { tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" ) - .arg( sensors().tqat( mBeams - i - 1 )->hostName() ) - .arg( sensors().tqat( mBeams - i - 1 )->name() ); + .arg( sensors().at( mBeams - i - 1 )->hostName() ) + .arg( sensors().at( mBeams - i - 1 )->name() ); } TQToolTip::remove( TQT_TQWIDGET(mPlotter) ); @@ -263,8 +263,8 @@ TQString tooltip; for ( uint i = 0; i < mBeams; ++i ) { tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" ) - .arg( sensors().tqat( mBeams - i - 1 )->hostName() ) - .arg( sensors().tqat( mBeams - i - 1 )->name() ); + .arg( sensors().at( mBeams - i - 1 )->hostName() ) + .arg( sensors().at( mBeams - i - 1 )->name() ); } TQToolTip::remove( TQT_TQWIDGET(mPlotter) ); @@ -281,12 +281,12 @@ frame()->setGeometry( 0, 0, width(), height() ); } -TQSize FancyPlotter::tqsizeHint() +TQSize FancyPlotter::sizeHint() { if ( noFrame() ) - return mPlotter->tqsizeHint(); + return mPlotter->sizeHint(); else - return frame()->tqsizeHint(); + return frame()->sizeHint(); } void FancyPlotter::answerReceived( int id, const TQString &answer ) @@ -319,7 +319,7 @@ if ( info.min() == 0.0 && info.max() == 0.0 ) mPlotter->setUseAutoRange( true ); } - sensors().tqat( id - 100 )->setUnit( info.unit() ); + sensors().at( id - 100 )->setUnit( info.unit() ); } } @@ -405,9 +405,9 @@ for ( uint i = 0; i < mBeams; ++i ) { TQDomElement beam = doc.createElement( "beam" ); element.appendChild( beam ); - beam.setAttribute( "hostName", sensors().tqat( i )->hostName() ); - beam.setAttribute( "sensorName", sensors().tqat( i )->name() ); - beam.setAttribute( "sensorType", sensors().tqat( i )->type() ); + beam.setAttribute( "hostName", sensors().at( i )->hostName() ); + beam.setAttribute( "sensorName", sensors().at( i )->name() ); + beam.setAttribute( "sensorType", sensors().at( i )->type() ); saveColor( beam, "color", mPlotter->beamColors()[ i ] ); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/FancyPlotter.h v3.5.13-sru/ksysguard/gui/SensorDisplayLib/FancyPlotter.h --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/FancyPlotter.h 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/FancyPlotter.h 2012-09-08 19:41:29.000000000 +0200 @@ -66,7 +66,7 @@ bool removeSensor( uint pos ); - virtual TQSize tqsizeHint(void); + virtual TQSize sizeHint(void); virtual void answerReceived( int id, const TQString &answer ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc v3.5.13-sru/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc 2011-07-09 08:16:58.000000000 +0200 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc 2012-09-08 19:41:29.000000000 +0200 @@ -79,7 +79,7 @@ pageLayout = new TQGridLayout( page, 2, 1, 0, spacingHint() ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Vertical Scale" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 2, 1 ); mUseAutoRange = new TQCheckBox( i18n( "Automatic range detection" ), groupBox ); @@ -90,7 +90,7 @@ boxLayout->addWidget( label, 1, 0 ); mMinValue = new KLineEdit( groupBox ); - mMinValue->tqsetAlignment( AlignRight ); + mMinValue->setAlignment( AlignRight ); mMinValue->setEnabled( false ); TQWhatsThis::add( mMinValue, i18n( "Enter the minimum value for the display here. If both values are 0, automatic range detection is enabled." ) ); boxLayout->addWidget( mMinValue, 1, 1 ); @@ -100,7 +100,7 @@ boxLayout->addWidget( label, 1, 3 ); mMaxValue = new KLineEdit( groupBox ); - mMaxValue->tqsetAlignment( AlignRight ); + mMaxValue->setAlignment( AlignRight ); mMaxValue->setEnabled( false ); TQWhatsThis::add( mMaxValue, i18n( "Enter the maximum value for the display here. If both values are 0, automatic range detection is enabled." ) ); boxLayout->addWidget( mMaxValue, 1, 4 ); @@ -109,7 +109,7 @@ pageLayout->addWidget( groupBox, 0, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Horizontal Scale" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 2, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->layout(), 2, 2, spacingHint() ); boxLayout->setRowStretch( 1, 1 ); mHorizontalScale = new KIntNumInput( 1, groupBox ); @@ -127,7 +127,7 @@ pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Lines" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); mShowVerticalLines = new TQCheckBox( i18n( "Vertical lines" ), groupBox ); @@ -166,7 +166,7 @@ pageLayout->addMultiCellWidget( groupBox, 0, 0, 0, 1 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Text" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 3, 4, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->layout(), 3, 4, spacingHint() ); boxLayout->setColStretch( 1, 1 ); mShowLabels = new TQCheckBox( i18n( "Labels" ), groupBox ); @@ -191,7 +191,7 @@ pageLayout->addWidget( groupBox, 1, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Colors" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 4, 2, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->layout(), 4, 2, spacingHint() ); label = new TQLabel( i18n( "Vertical lines:" ), groupBox ); boxLayout->addWidget( label, 0, 0 ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/ListView.cc v3.5.13-sru/ksysguard/gui/SensorDisplayLib/ListView.cc --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/ListView.cc 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/ListView.cc 2012-09-08 19:41:29.000000000 +0200 @@ -105,7 +105,7 @@ PrivateListView::PrivateListView(TQWidget *parent, const char *name) : TQListView(parent, name) { - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); cg.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor()); cg.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor()); @@ -116,8 +116,8 @@ void PrivateListView::update(const TQString& answer) { - tqsetUpdatesEnabled(false); - viewport()->tqsetUpdatesEnabled(false); + setUpdatesEnabled(false); + viewport()->setUpdatesEnabled(false); int vpos = verticalScrollBar()->value(); int hpos = horizontalScrollBar()->value(); @@ -143,8 +143,8 @@ verticalScrollBar()->setValue(vpos); horizontalScrollBar()->setValue(hpos); - viewport()->tqsetUpdatesEnabled(true); - tqsetUpdatesEnabled(true); + viewport()->setUpdatesEnabled(true); + setUpdatesEnabled(true); triggerUpdate(); } @@ -239,7 +239,7 @@ void ListView::updateList() { - sendRequest(sensors().tqat(0)->hostName(), sensors().tqat(0)->name(), 19); + sendRequest(sensors().at(0)->hostName(), sensors().at(0)->name(), 19); } void @@ -290,12 +290,12 @@ { addSensor(element.attribute("hostName"), element.attribute("sensorName"), (element.attribute("sensorType").isEmpty() ? "listview" : element.attribute("sensorType")), element.attribute("title")); - TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); - tqcolorGroup.setColor(TQColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor())); - tqcolorGroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor())); - tqcolorGroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", KSGRD::Style->backgroundColor())); + TQColorGroup colorGroup = monitor->colorGroup(); + colorGroup.setColor(TQColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor())); + colorGroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor())); + colorGroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", KSGRD::Style->backgroundColor())); - monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup)); + monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup)); SensorDisplay::restoreSettings(element); @@ -307,14 +307,14 @@ bool ListView::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - element.setAttribute("hostName", sensors().tqat(0)->hostName()); - element.setAttribute("sensorName", sensors().tqat(0)->name()); - element.setAttribute("sensorType", sensors().tqat(0)->type()); - - TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); - saveColor(element, "gridColor", tqcolorGroup.color(TQColorGroup::Link)); - saveColor(element, "textColor", tqcolorGroup.color(TQColorGroup::Text)); - saveColor(element, "backgroundColor", tqcolorGroup.color(TQColorGroup::Base)); + element.setAttribute("hostName", sensors().at(0)->hostName()); + element.setAttribute("sensorName", sensors().at(0)->name()); + element.setAttribute("sensorType", sensors().at(0)->type()); + + TQColorGroup colorGroup = monitor->colorGroup(); + saveColor(element, "gridColor", colorGroup.color(TQColorGroup::Link)); + saveColor(element, "textColor", colorGroup.color(TQColorGroup::Text)); + saveColor(element, "backgroundColor", colorGroup.color(TQColorGroup::Base)); SensorDisplay::saveSettings(doc, element); @@ -331,10 +331,10 @@ Q_CHECK_PTR(lvs); connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings())); - TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); - lvs->setGridColor(tqcolorGroup.color(TQColorGroup::Link)); - lvs->setTextColor(tqcolorGroup.color(TQColorGroup::Text)); - lvs->setBackgroundColor(tqcolorGroup.color(TQColorGroup::Base)); + TQColorGroup colorGroup = monitor->colorGroup(); + lvs->setGridColor(colorGroup.color(TQColorGroup::Link)); + lvs->setTextColor(colorGroup.color(TQColorGroup::Text)); + lvs->setBackgroundColor(colorGroup.color(TQColorGroup::Base)); lvs->setTitle(title()); if (lvs->exec()) @@ -347,11 +347,11 @@ void ListView::applySettings() { - TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); - tqcolorGroup.setColor(TQColorGroup::Link, lvs->gridColor()); - tqcolorGroup.setColor(TQColorGroup::Text, lvs->textColor()); - tqcolorGroup.setColor(TQColorGroup::Base, lvs->backgroundColor()); - monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup)); + TQColorGroup colorGroup = monitor->colorGroup(); + colorGroup.setColor(TQColorGroup::Link, lvs->gridColor()); + colorGroup.setColor(TQColorGroup::Text, lvs->textColor()); + colorGroup.setColor(TQColorGroup::Base, lvs->backgroundColor()); + monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup)); setTitle(lvs->title()); @@ -361,11 +361,11 @@ void ListView::applyStyle() { - TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); - tqcolorGroup.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor()); - tqcolorGroup.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor()); - tqcolorGroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); - monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup)); + TQColorGroup colorGroup = monitor->colorGroup(); + colorGroup.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor()); + colorGroup.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor()); + colorGroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); + monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup)); setModified(true); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/ListView.h v3.5.13-sru/ksysguard/gui/SensorDisplayLib/ListView.h --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/ListView.h 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/ListView.h 2012-09-08 19:41:29.000000000 +0200 @@ -57,9 +57,9 @@ public: PrivateListViewItem(PrivateListView *parent = 0); - void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int tqalignment) { - TQColorGroup cgroup = _parent->tqcolorGroup(); - TQListViewItem::paintCell(p, cgroup, column, width, tqalignment); + void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int alignment) { + TQColorGroup cgroup = _parent->colorGroup(); + TQListViewItem::paintCell(p, cgroup, column, width, alignment); p->setPen(cgroup.color(TQColorGroup::Link)); p->drawLine(0, height() - 1, width - 1, height() - 1); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui v3.5.13-sru/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui 2012-09-08 19:41:29.000000000 +0200 @@ -55,7 +55,7 @@ Colors - + WordBreak|AlignVCenter|AlignLeft diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/LogFile.cc v3.5.13-sru/ksysguard/gui/SensorDisplayLib/LogFile.cc --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/LogFile.cc 2011-08-11 07:25:56.000000000 +0200 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/LogFile.cc 2012-09-08 19:41:29.000000000 +0200 @@ -51,7 +51,7 @@ LogFile::~LogFile(void) { - sendRequest(sensors().tqat(0)->hostName(), TQString("logfile_unregister %1" ).arg(logFileID), 43); + sendRequest(sensors().at(0)->hostName(), TQString("logfile_unregister %1" ).arg(logFileID), 43); } bool @@ -64,10 +64,10 @@ TQString sensorID = sensorName.right(sensorName.length() - (sensorName.findRev("/") + 1)); - sendRequest(sensors().tqat(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42); + sendRequest(sensors().at(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42); if (title.isEmpty()) - setTitle(sensors().tqat(0)->hostName() + ":" + sensorID); + setTitle(sensors().at(0)->hostName() + ":" + sensorID); else setTitle(title); @@ -79,7 +79,7 @@ void LogFile::configureSettings(void) { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); lfs = new LogFileSettings(this); Q_CHECK_PTR(lfs); @@ -147,7 +147,7 @@ void LogFile::applySettings(void) { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, lfs->fgColor->color()); cgroup.setColor(TQColorGroup::Base, lfs->bgColor->color()); @@ -166,7 +166,7 @@ void LogFile::applyStyle() { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor()); cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); @@ -179,7 +179,7 @@ LogFile::restoreSettings(TQDomElement& element) { TQFont font; - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green)); cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black)); @@ -206,14 +206,14 @@ bool LogFile::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - element.setAttribute("hostName", sensors().tqat(0)->hostName()); - element.setAttribute("sensorName", sensors().tqat(0)->name()); - element.setAttribute("sensorType", sensors().tqat(0)->type()); + element.setAttribute("hostName", sensors().at(0)->hostName()); + element.setAttribute("sensorName", sensors().at(0)->name()); + element.setAttribute("sensorType", sensors().at(0)->type()); element.setAttribute("font", monitor->font().toString()); - saveColor(element, "textColor", monitor->tqcolorGroup().text()); - saveColor(element, "backgroundColor", monitor->tqcolorGroup().base()); + saveColor(element, "textColor", monitor->colorGroup().text()); + saveColor(element, "backgroundColor", monitor->colorGroup().base()); for (TQStringList::Iterator it = filterRules.begin(); it != filterRules.end(); it++) @@ -234,8 +234,8 @@ void LogFile::updateMonitor() { - sendRequest(sensors().tqat(0)->hostName(), - TQString("%1 %2" ).arg(sensors().tqat(0)->name()).arg(logFileID), 19); + sendRequest(sensors().at(0)->hostName(), + TQString("%1 %2" ).arg(sensors().at(0)->name()).arg(logFileID), 19); } void diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui v3.5.13-sru/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui 2012-09-08 19:41:29.000000000 +0200 @@ -142,7 +142,7 @@ Expanding - + 20 16 @@ -172,7 +172,7 @@ Expanding - + 20 20 @@ -264,7 +264,7 @@ Expanding - + 20 20 @@ -313,7 +313,7 @@ Expanding - + 20 20 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/MultiMeter.cc v3.5.13-sru/ksysguard/gui/SensorDisplayLib/MultiMeter.cc --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/MultiMeter.cc 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/MultiMeter.cc 2012-09-08 19:41:29.000000000 +0200 @@ -53,7 +53,7 @@ Q_CHECK_PTR(lcd); lcd->setSegmentStyle(TQLCDNumber::Filled); setDigitColor(KSGRD::Style->backgroundColor()); - lcd->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + lcd->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, false)); setBackgroundColor(KSGRD::Style->backgroundColor()); @@ -166,9 +166,9 @@ bool MultiMeter::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - element.setAttribute("hostName", sensors().tqat(0)->hostName()); - element.setAttribute("sensorName", sensors().tqat(0)->name()); - element.setAttribute("sensorType", sensors().tqat(0)->type()); + element.setAttribute("hostName", sensors().at(0)->hostName()); + element.setAttribute("sensorName", sensors().at(0)->name()); + element.setAttribute("sensorType", sensors().at(0)->type()); element.setAttribute("showUnit", showUnit()); element.setAttribute("lowerLimitActive", (int) lowerLimitActive); element.setAttribute("lowerLimit", (int) lowerLimit); @@ -225,7 +225,7 @@ alarmDigitColor = mms->alarmDigitColor(); setBackgroundColor(mms->meterBackgroundColor()); - tqrepaint(); + repaint(); setModified(true); } @@ -234,7 +234,7 @@ { normalDigitColor = KSGRD::Style->firstForegroundColor(); setBackgroundColor(KSGRD::Style->backgroundColor()); - tqrepaint(); + repaint(); setModified(true); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui v3.5.13-sru/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui 2012-09-08 19:41:29.000000000 +0200 @@ -96,7 +96,7 @@ Expanding - + 20 20 @@ -121,7 +121,7 @@ false - + 70 0 @@ -162,7 +162,7 @@ Expanding - + 20 20 @@ -187,7 +187,7 @@ false - + 70 0 @@ -334,14 +334,14 @@ update() update(int,int,int,int) update(const QRect&) - tqrepaint() - tqrepaint(bool) - tqrepaint(int,int,int,int) - tqrepaint(int,int,int,int,bool) - tqrepaint(const QRect&) - tqrepaint(const QRect&,bool) - tqrepaint(const QRegion&) - tqrepaint(const QRegion&,bool) + repaint() + repaint(bool) + repaint(int,int,int,int) + repaint(int,int,int,int,bool) + repaint(const QRect&) + repaint(const QRect&,bool) + repaint(const QRegion&) + repaint(const QRegion&,bool) show() hide() setShown(bool) @@ -377,8 +377,8 @@ enabled geometry sizePolicy - tqminimumSize - tqmaximumSize + minimumSize + maximumSize sizeIncrement baseSize paletteForegroundColor diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/ProcessController.cc v3.5.13-sru/ksysguard/gui/SensorDisplayLib/ProcessController.cc --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/ProcessController.cc 2011-07-09 08:16:58.000000000 +0200 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/ProcessController.cc 2012-09-08 19:41:29.000000000 +0200 @@ -98,11 +98,11 @@ cbFilter->insertItem(i18n("System Processes"), 1); cbFilter->insertItem(i18n("User Processes"), 2); cbFilter->insertItem(i18n("Own Processes"), 3); - cbFilter->setMinimumSize(cbFilter->tqsizeHint()); + cbFilter->setMinimumSize(cbFilter->sizeHint()); // Create the check box to switch between tree view and list view. xbTreeView = new TQCheckBox(i18n("&Tree"), this, "xbTreeView"); Q_CHECK_PTR(xbTreeView); - xbTreeView->setMinimumSize(xbTreeView->tqsizeHint()); + xbTreeView->setMinimumSize(xbTreeView->sizeHint()); connect(xbTreeView, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setTreeView(bool))); @@ -116,13 +116,13 @@ bRefresh = new KPushButton( KGuiItem( i18n( "&Refresh" ), "reload" ), this, "bRefresh" ); Q_CHECK_PTR(bRefresh); - bRefresh->setMinimumSize(bRefresh->tqsizeHint()); + bRefresh->setMinimumSize(bRefresh->sizeHint()); connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList())); // Create the 'Kill' button. bKill = new KPushButton(i18n("&Kill"), this, "bKill"); Q_CHECK_PTR(bKill); - bKill->setMinimumSize(bKill->tqsizeHint()); + bKill->setMinimumSize(bKill->sizeHint()); connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess())); /* Disable the kill button until we know that the daemon supports the * kill command. */ @@ -147,7 +147,7 @@ setPlotterWidget(pList); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); fixTabOrder(); } @@ -213,13 +213,13 @@ void ProcessController::updateList() { - sendRequest(sensors().tqat(0)->hostName(), "ps", 2); + sendRequest(sensors().at(0)->hostName(), "ps", 2); } void ProcessController::killProcess(int pid, int sig) { - sendRequest(sensors().tqat(0)->hostName(), + sendRequest(sensors().at(0)->hostName(), TQString("kill %1 %2" ).arg(pid).arg(sig), 3); if ( !timerOn() ) @@ -269,7 +269,7 @@ // send kill signal to all seleted processes TQValueListConstIterator it; for (it = selectedPIds.begin(); it != selectedPIds.end(); ++it) - sendRequest(sensors().tqat(0)->hostName(), TQString("kill %1 %2" ).arg(*it) + sendRequest(sensors().at(0)->hostName(), TQString("kill %1 %2" ).arg(*it) .arg(MENU_ID_SIGKILL), 3); if ( !timerOn()) @@ -283,9 +283,9 @@ ProcessController::reniceProcess(const TQValueList &pids, int niceValue) { for( TQValueList::ConstIterator it = pids.constBegin(), end = pids.constEnd(); it != end; ++it ) - sendRequest(sensors().tqat(0)->hostName(), + sendRequest(sensors().at(0)->hostName(), TQString("setpriority %1 %2" ).arg(*it).arg(niceValue), 5); - sendRequest(sensors().tqat(0)->hostName(), "ps", 2); //update the display afterwards + sendRequest(sensors().at(0)->hostName(), "ps", 2); //update the display afterwards } void @@ -401,7 +401,7 @@ void ProcessController::sensorError(int, bool err) { - if (err == sensors().tqat(0)->isOk()) + if (err == sensors().at(0)->isOk()) { if (!err) { @@ -409,15 +409,15 @@ * (re-)established we need to requests the full set of * properties again, since the back-end might be a new * one. */ - sendRequest(sensors().tqat(0)->hostName(), "test kill", 4); - sendRequest(sensors().tqat(0)->hostName(), "ps?", 1); - sendRequest(sensors().tqat(0)->hostName(), "ps", 2); + sendRequest(sensors().at(0)->hostName(), "test kill", 4); + sendRequest(sensors().at(0)->hostName(), "ps?", 1); + sendRequest(sensors().at(0)->hostName(), "ps", 2); } /* This happens only when the sensorOk status needs to be changed. */ - sensors().tqat(0)->setIsOk( !err ); + sensors().at(0)->setIsOk( !err ); } - setSensorOk(sensors().tqat(0)->isOk()); + setSensorOk(sensors().at(0)->isOk()); } bool @@ -452,9 +452,9 @@ bool ProcessController::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - element.setAttribute("hostName", sensors().tqat(0)->hostName()); - element.setAttribute("sensorName", sensors().tqat(0)->name()); - element.setAttribute("sensorType", sensors().tqat(0)->type()); + element.setAttribute("hostName", sensors().at(0)->hostName()); + element.setAttribute("sensorName", sensors().at(0)->name()); + element.setAttribute("sensorType", sensors().at(0)->type()); element.setAttribute("tree", (uint) xbTreeView->isChecked()); element.setAttribute("filter", cbFilter->currentItem()); element.setAttribute("sortColumn", pList->getSortColumn()); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/ProcessList.cc v3.5.13-sru/ksysguard/gui/SensorDisplayLib/ProcessList.cc --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/ProcessList.cc 2011-08-11 07:25:56.000000000 +0200 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/ProcessList.cc 2012-09-08 19:41:29.000000000 +0200 @@ -297,8 +297,8 @@ /* Disable painting to avoid flickering effects, * especially when in tree view mode. * Ditto for the scrollbar. */ - tqsetUpdatesEnabled(false); - viewport()->tqsetUpdatesEnabled(false); + setUpdatesEnabled(false); + viewport()->setUpdatesEnabled(false); pl.clear(); @@ -349,8 +349,8 @@ horizontalScrollBar()->setValue(hpos); // Re-enable painting, and force an update. - tqsetUpdatesEnabled(true); - viewport()->tqsetUpdatesEnabled(true); + setUpdatesEnabled(true); + viewport()->setUpdatesEnabled(true); triggerUpdate(); @@ -532,8 +532,8 @@ { unsigned int i; for (i = 0; i < pl.count() && - (!isLeafProcess(pl.tqat(i)->pid()) || - matchesFilter(pl.tqat(i))); i++) + (!isLeafProcess(pl.at(i)->pid()) || + matchesFilter(pl.at(i))); i++) ; if (i == pl.count()) return; @@ -546,7 +546,7 @@ ProcessList::isLeafProcess(int pid) { for (unsigned int i = 0; i < pl.count(); i++) - if (pl.tqat(i)->ppid() == pid) + if (pl.at(i)->ppid() == pid) return (false); return (true); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc v3.5.13-sru/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc 2012-09-08 19:41:29.000000000 +0200 @@ -43,7 +43,7 @@ "the number is the higher the priority.\n\n" "Please enter the desired nice level:").arg(pid); message = new TQLabel(msg, page); - message->setMinimumSize(message->tqsizeHint()); + message->setMinimumSize(message->sizeHint()); vLay->addWidget(message); /* diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc v3.5.13-sru/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc 2011-08-11 07:25:56.000000000 +0200 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc 2012-09-08 19:41:29.000000000 +0200 @@ -66,7 +66,7 @@ if(!nf) { mFrame = new TQGroupBox( 2, Qt::Vertical, "", this, "displayFrame"); mFrame->setFlat(true); - mFrame->tqsetAlignment(Qt::AlignHCenter); + mFrame->setAlignment(Qt::AlignHCenter); mFrame->setInsideMargin(2); setTitle( title ); @@ -219,14 +219,14 @@ if ( sensorId >= (int)mSensors.count() || sensorId < 0 ) return; - if ( err == mSensors.tqat( sensorId )->isOk() ) { + if ( err == mSensors.at( sensorId )->isOk() ) { // this happens only when the sensorOk status needs to be changed. - mSensors.tqat( sensorId )->setIsOk( !err ); + mSensors.at( sensorId )->setIsOk( !err ); } bool ok = true; for ( uint i = 0; i < mSensors.count(); ++i ) - if ( !mSensors.tqat( i )->isOk() ) { + if ( !mSensors.at( i )->isOk() ) { ok = false; break; } @@ -524,7 +524,7 @@ { TQPtrList newSensors; for ( uint i = 0; i < orderOfSensors.count(); ++i ) { - newSensors.append( mSensors.tqat(orderOfSensors[i] )); + newSensors.append( mSensors.at(orderOfSensors[i] )); } mSensors.setAutoDelete( false ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/SensorLogger.cc v3.5.13-sru/ksysguard/gui/SensorDisplayLib/SensorLogger.cc --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/SensorLogger.cc 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/SensorLogger.cc 2012-09-08 19:41:29.000000000 +0200 @@ -50,7 +50,7 @@ pixmap_waiting = UserIcon( "waiting" ); lvi->setPixmap(0, pixmap_waiting); - lvi->setTextColor(monitor->tqcolorGroup().text()); + lvi->setTextColor(monitor->colorGroup().text()); monitor->insertItem(lvi); } @@ -72,8 +72,8 @@ LogSensor::stopLogging(void) { lvi->setPixmap(0, pixmap_waiting); - lvi->setTextColor(monitor->tqcolorGroup().text()); - lvi->tqrepaint(); + lvi->setTextColor(monitor->colorGroup().text()); + lvi->repaint(); timerOff(); } @@ -104,21 +104,21 @@ { timerOff(); lowerLimitActive = false; - lvi->setTextColor(monitor->tqcolorGroup().foreground()); - lvi->tqrepaint(); + lvi->setTextColor(monitor->colorGroup().foreground()); + lvi->repaint(); KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached lower limit").arg(sensorName).arg(hostName)); timerOn(); } else if (upperLimitActive && value > upperLimit) { timerOff(); upperLimitActive = false; - lvi->setTextColor(monitor->tqcolorGroup().foreground()); - lvi->tqrepaint(); + lvi->setTextColor(monitor->colorGroup().foreground()); + lvi->repaint(); KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName)); timerOn(); } - TQDate date = TQT_TQDATE_OBJECT(TQDateTime::tqcurrentDateTime().date()); - TQTime time = TQT_TQTIME_OBJECT(TQDateTime::tqcurrentDateTime().time()); + TQDate date = TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().date()); + TQTime time = TQT_TQTIME_OBJECT(TQDateTime::currentDateTime().time()); stream << TQString("%1 %2 %3 %4 %5: %6\n").arg(date.shortMonthName(date.month())).arg(date.day()).arg(time.toString()).arg(hostName).arg(sensorName).arg(value); } @@ -139,7 +139,7 @@ monitor->addColumn(i18n("Host Name")); monitor->addColumn(i18n("Log File")); - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor()); cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); cgroup.setColor(TQColorGroup::Foreground, KSGRD::Style->alarmColor()); @@ -232,7 +232,7 @@ void SensorLogger::configureSettings() { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); sls = new SensorLoggerSettings(this, "SensorLoggerSettings"); Q_CHECK_PTR(sls); @@ -254,7 +254,7 @@ void SensorLogger::applySettings() { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); setTitle(sls->title()); @@ -269,7 +269,7 @@ void SensorLogger::applyStyle(void) { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor()); cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); @@ -282,7 +282,7 @@ bool SensorLogger::restoreSettings(TQDomElement& element) { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green)); cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black)); @@ -319,9 +319,9 @@ bool SensorLogger::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - saveColor(element, "textColor", monitor->tqcolorGroup().text()); - saveColor(element, "backgroundColor", monitor->tqcolorGroup().base()); - saveColor(element, "alarmColor", monitor->tqcolorGroup().foreground()); + saveColor(element, "textColor", monitor->colorGroup().text()); + saveColor(element, "backgroundColor", monitor->colorGroup().base()); + saveColor(element, "alarmColor", monitor->colorGroup().foreground()); for (LogSensor* sensor = logSensors.first(); sensor != 0; sensor = logSensors.next()) { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui v3.5.13-sru/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui 2012-09-08 19:41:29.000000000 +0200 @@ -102,7 +102,7 @@ Expanding - + 16 20 @@ -127,7 +127,7 @@ false - + 70 0 @@ -168,7 +168,7 @@ Expanding - + 16 20 @@ -193,7 +193,7 @@ false - + 70 0 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/SensorLogger.h v3.5.13-sru/ksysguard/gui/SensorDisplayLib/SensorLogger.h --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/SensorLogger.h 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/SensorLogger.h 2012-09-08 19:41:29.000000000 +0200 @@ -44,10 +44,10 @@ void setTextColor(const TQColor& color) { textColor = color; } - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup cgroup(cg); cgroup.setColor(TQColorGroup::Text, textColor); - TQListViewItem::paintCell(p, cgroup, column, width, tqalignment); + TQListViewItem::paintCell(p, cgroup, column, width, alignment); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui v3.5.13-sru/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui 2011-03-12 07:58:24.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui 2012-09-08 19:41:29.000000000 +0200 @@ -61,7 +61,7 @@ Colors - + WordBreak|AlignVCenter|AlignLeft diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc v3.5.13-sru/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc --- /tmp/stable//kdebase/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc 2011-07-08 00:00:33.000000000 +0200 +++ v3.5.13-sru/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc 2012-09-08 19:41:29.000000000 +0200 @@ -50,7 +50,7 @@ // Anything smaller than this does not make sense. setMinimumSize( 16, 16 ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding, false ) ); mShowVerticalLines = true; @@ -134,8 +134,8 @@ for(uint i = 0; i < newOrder.count(); i++) { int newIndex = newOrder[i]; - newBeamData.append(mBeamData.tqat(newIndex)); - newBeamColor.append(*mBeamColor.tqat(newIndex)); + newBeamData.append(mBeamData.at(newIndex)); + newBeamColor.append(*mBeamColor.at(newIndex)); } mBeamData = newBeamData; mBeamColor = newBeamColor; @@ -159,7 +159,7 @@ void SignalPlotter::removeBeam( uint pos ) { - mBeamColor.remove( mBeamColor.tqat( pos ) ); + mBeamColor.remove( mBeamColor.at( pos ) ); double *p = mBeamData.take( pos ); delete [] p; } @@ -374,7 +374,7 @@ memset( nd, 0, sizeof( double ) * ( newSampleNum - overlap ) ); // copy overlap from old buffer to new buffer - memcpy( nd + ( newSampleNum - overlap ), mBeamData.tqat( i ) + + memcpy( nd + ( newSampleNum - overlap ), mBeamData.at( i ) + ( mSamples - overlap ), overlap * sizeof( double ) ); double *p = mBeamData.take( i ); @@ -396,12 +396,12 @@ TQPixmap pm( w, h ); TQPainter p; - p.tqbegin( &pm, this ); + p.begin( &pm, this ); pm.fill( mBackgroundColor ); /* Draw white line along the bottom and the right side of the * widget to create a 3D like look. */ - p.setPen( TQColor( tqcolorGroup().light() ) ); + p.setPen( TQColor( colorGroup().light() ) ); if(mShowThinFrame) { p.drawLine( 0, h - 1, w - 1, h - 1 ); p.drawLine( w - 1, 0, w - 1, h - 1 ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/WorkSheet.cc v3.5.13-sru/ksysguard/gui/WorkSheet.cc --- /tmp/stable//kdebase/ksysguard/gui/WorkSheet.cc 2011-08-11 07:25:56.000000000 +0200 +++ v3.5.13-sru/ksysguard/gui/WorkSheet.cc 2012-09-08 19:41:29.000000000 +0200 @@ -241,7 +241,7 @@ if ( !currentDisplay() || currentDisplay()->isA( "DummyDisplay" ) ) return; - TQClipboard* clip = TQApplication::tqclipboard(); + TQClipboard* clip = TQApplication::clipboard(); clip->setText( currentDisplayAsXML() ); @@ -253,7 +253,7 @@ if ( !currentDisplay() || currentDisplay()->isA( "DummyDisplay" ) ) return; - TQClipboard* clip = TQApplication::tqclipboard(); + TQClipboard* clip = TQApplication::clipboard(); clip->setText( currentDisplayAsXML() ); } @@ -264,7 +264,7 @@ if ( !currentDisplay( &row, &column ) ) return; - TQClipboard* clip = TQApplication::tqclipboard(); + TQClipboard* clip = TQApplication::clipboard(); TQDomDocument doc; /* Get text from clipboard and check for a valid XML header and @@ -450,14 +450,14 @@ * event and replace or add sensor. */ for ( uint r = 0; r < mRows; ++r ) for ( uint c = 0; c < mColumns; ++c ) - if ( mDisplayList[ r ][ c ]->tqgeometry().contains( e->pos() ) ) { + if ( mDisplayList[ r ][ c ]->geometry().contains( e->pos() ) ) { addDisplay( hostName, sensorName, sensorType, sensorDescr, r, c ); return; } } } -TQSize WorkSheet::tqsizeHint() const +TQSize WorkSheet::sizeHint() const { return TQSize( 200,150 ); } @@ -531,7 +531,7 @@ mDisplayList[ row ][ column ]->show(); } - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); setModified( true ); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/WorkSheet.h v3.5.13-sru/ksysguard/gui/WorkSheet.h --- /tmp/stable//kdebase/ksysguard/gui/WorkSheet.h 2011-03-12 07:58:25.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/WorkSheet.h 2012-09-08 19:41:29.000000000 +0200 @@ -90,7 +90,7 @@ void titleChanged( TQWidget *sheet ); protected: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void dragEnterEvent( TQDragEnterEvent* ); void dropEvent( TQDropEvent* ); void customEvent( TQCustomEvent* ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksysguard/gui/WorkSheetSettings.cc v3.5.13-sru/ksysguard/gui/WorkSheetSettings.cc --- /tmp/stable//kdebase/ksysguard/gui/WorkSheetSettings.cc 2011-03-12 07:58:25.000000000 +0100 +++ v3.5.13-sru/ksysguard/gui/WorkSheetSettings.cc 2012-09-08 19:41:29.000000000 +0200 @@ -46,11 +46,11 @@ TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page ); - group->tqlayout()->setMargin( marginHint() ); - group->tqlayout()->setSpacing( spacingHint() ); + group->layout()->setMargin( marginHint() ); + group->layout()->setSpacing( spacingHint() ); - TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 1, 1 ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 1, 1 ); + groupLayout->setAlignment( Qt::AlignTop ); mSheetTitle = new KLineEdit( group ); groupLayout->addWidget( mSheetTitle, 0, 0 ); @@ -58,11 +58,11 @@ topLayout->addWidget( group ); group = new TQGroupBox( 0, Qt::Vertical, i18n( "Properties" ), page ); - group->tqlayout()->setMargin( marginHint() ); - group->tqlayout()->setSpacing( spacingHint() ); + group->layout()->setMargin( marginHint() ); + group->layout()->setSpacing( spacingHint() ); - groupLayout = new TQGridLayout( group->tqlayout(), 3, 2 ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + groupLayout = new TQGridLayout( group->layout(), 3, 2 ); + groupLayout->setAlignment( Qt::AlignTop ); TQLabel *label = new TQLabel( i18n( "Rows:" ), group ); groupLayout->addWidget( label, 0, 0 ); @@ -103,7 +103,7 @@ mSheetTitle->setFocus(); - resize( TQSize( 250, 230 ).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize( 250, 230 ).expandedTo( minimumSizeHint() ) ); } WorkSheetSettings::~WorkSheetSettings() diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/ksystraycmd/ksystraycmd.cpp v3.5.13-sru/ksystraycmd/ksystraycmd.cpp --- /tmp/stable//kdebase/ksystraycmd/ksystraycmd.cpp 2011-03-12 07:58:25.000000000 +0100 +++ v3.5.13-sru/ksystraycmd/ksystraycmd.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -25,7 +25,7 @@ isVisible(true), lazyStart( false ), noquit( false ), quitOnHide( false ), onTop(false), ownIcon(false), win(0), client(0), kwinmodule(0), top(0), left(0) { - tqsetAlignment( AlignCenter ); + setAlignment( AlignCenter ); kwinmodule = new KWinModule( TQT_TQOBJECT(this) ); refresh(); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/client.cpp v3.5.13-sru/kwin/client.cpp --- /tmp/stable//kdebase/kwin/client.cpp 2011-09-14 07:31:14.000000000 +0200 +++ v3.5.13-sru/kwin/client.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -140,7 +140,7 @@ deleting = false; keep_above = FALSE; keep_below = FALSE; - is_tqshape = FALSE; + is_shape = FALSE; motif_noborder = false; motif_may_move = TRUE; motif_may_resize = TRUE; @@ -285,7 +285,7 @@ destroyDecoration(); cleanGrouping(); workspace()->removeClient( this, Allowed ); - client = None; // tqinvalidate + client = None; // invalidate XDestroyWindow( qt_xdisplay(), wrapper ); wrapper = None; XDestroyWindow( qt_xdisplay(), frame ); @@ -306,7 +306,7 @@ destroyDecoration(); if( !noBorder()) { - setMask( TQRegion()); // reset tqshape mask + setMask( TQRegion()); // reset shape mask decoration = workspace()->createDecoration( bridge ); // TODO check decoration's minimum size? decoration->init(); @@ -344,7 +344,7 @@ decoration = NULL; TQPoint grav = calculateGravitation( true ); border_left = border_right = border_top = border_bottom = 0; - setMask( TQRegion()); // reset tqshape mask + setMask( TQRegion()); // reset shape mask int save_workarea_diff_x = workarea_diff_x; int save_workarea_diff_y = workarea_diff_y; plainResize( sizeForClientSize( clientSize()), ForceGeometrySet ); @@ -515,32 +515,32 @@ void Client::updateShape() { - // workaround for #19644 - tqshaped windows shouldn't have decoration - if( tqshape() && !noBorder()) + // workaround for #19644 - shaped windows shouldn't have decoration + if( shape() && !noBorder()) { noborder = true; updateDecoration( true ); } updateOpacityCache(); - if ( tqshape() ) + if ( shape() ) { XShapeCombineShape(qt_xdisplay(), frameId(), ShapeBounding, clientPos().x(), clientPos().y(), window(), ShapeBounding, ShapeSet); setShapable(TRUE); } - // !tqshape() mask setting is done in setMask() when the decoration + // !shape() mask setting is done in setMask() when the decoration // calls it or when the decoration is created/destroyed - if( Shape::version() >= 0x11 ) // 1.1, has input tqshape support + if( Shape::version() >= 0x11 ) // 1.1, has input shape support { // There appears to be no way to find out if a window has input - // tqshape set or not, so always propagate the input tqshape - // (it's the same like the bounding tqshape by default). - // Also, build the tqshape using a helper window, not directly - // in the frame window, because the sequence set-tqshape-to-frame, - // remove-tqshape-of-client, add-input-tqshape-of-client has the problem - // that after the second step there's a hole in the input tqshape - // until the real tqshape of the client is added and that can make + // shape set or not, so always propagate the input shape + // (it's the same like the bounding shape by default). + // Also, build the shape using a helper window, not directly + // in the frame window, because the sequence set-shape-to-frame, + // remove-shape-of-client, add-input-shape-of-client has the problem + // that after the second step there's a hole in the input shape + // until the real shape of the client is added and that can make // the window lose focus (which is a problem with mouse focus policies) static Window helper_window = None; if( helper_window == None ) @@ -571,7 +571,7 @@ reg.handle(), ShapeSet ); else { - TQMemArray< TQRect > rects = reg.tqrects(); + TQMemArray< TQRect > rects = reg.rects(); XRectangle* xrects = new XRectangle[ rects.count() ]; for( unsigned int i = 0; i < rects.count(); @@ -874,7 +874,7 @@ XSelectInput( qt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask ); //as we hid the unmap event, xcompmgr didn't recognize the client wid has vanished, so we'll extra inform it //done xcompmgr workaround -// FRAME tqrepaint( FALSE ); +// FRAME repaint( FALSE ); // bool wasStaticContents = testWFlags( WStaticContents ); // setWFlags( WStaticContents ); int step = QMAX( 4, QABS( h - s.height() ) / as )+1; @@ -915,7 +915,7 @@ resizeDecoration( TQSize( s.width(), h )); // assume a border // we do not have time to wait for X to send us paint events -// FRAME tqrepaint( 0, h - step-5, width(), step+5, TRUE); +// FRAME repaint( 0, h - step-5, width(), step+5, TRUE); TQApplication::syncX(); } while ( h < s.height() - step ); // if ( !wasStaticContents ) @@ -1078,7 +1078,7 @@ // active window has a shadow. return; - region = tqshapeBoundingRegion; + region = shapeBoundingRegion; // Generate list of Clients whose shadows need to be redrawn. That is, // those that are currently intersecting or intersected by other windows or @@ -1116,7 +1116,7 @@ // active window has a shadow. return; - region = tqshapeBoundingRegion; + region = shapeBoundingRegion; stacking_order = workspace()->stackingOrder(); for (it = stacking_order.fromLast(); it != stacking_order.end(); --it) { @@ -1167,7 +1167,7 @@ /*! Draw shadow after some time has elapsed, to give recently exposed windows a - chance to tqrepaint before a shadow gradient is drawn over them. + chance to repaint before a shadow gradient is drawn over them. */ void Client::drawDelayedShadow() { @@ -1190,7 +1190,7 @@ void Client::drawShadow() { Window shadows[2]; - XRectangle *tqshapes; + XRectangle *shapes; int i, count, ordering; // If we are waiting for another Client's shadow to be drawn, stop waiting now @@ -1206,31 +1206,31 @@ * this type of window. Otherwise, drawIntersectingShadows() won't update * properly when this window is moved/resized/hidden/closed. */ - tqshapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding, + shapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding, &count, &ordering); - if (!tqshapes) + if (!shapes) // XShape extension not supported - tqshapeBoundingRegion = TQRegion(x(), y(), width(), height()); + shapeBoundingRegion = TQRegion(x(), y(), width(), height()); else { - tqshapeBoundingRegion = TQRegion(); + shapeBoundingRegion = TQRegion(); for (i = 0; i < count; i++) { // Translate XShaped window into a TQRegion - TQRegion tqshapeRectangle(tqshapes[i].x, tqshapes[i].y, tqshapes[i].width, - tqshapes[i].height); - tqshapeBoundingRegion += tqshapeRectangle; + TQRegion shapeRectangle(shapes[i].x, shapes[i].y, shapes[i].width, + shapes[i].height); + shapeBoundingRegion += shapeRectangle; } if (isShade()) // Since XResize() doesn't change a window's XShape regions, ensure that - // tqshapeBoundingRegion is not taller than the window's shaded height, + // shapeBoundingRegion is not taller than the window's shaded height, // or the bottom shadow will appear to be missing - tqshapeBoundingRegion &= TQRegion(0, 0, width(), height()); - tqshapeBoundingRegion.translate(x(), y()); + shapeBoundingRegion &= TQRegion(0, 0, width(), height()); + shapeBoundingRegion.translate(x(), y()); } if (!isShadowed() || hidden || isMinimized() || maximizeMode() == MaximizeFull || !options->shadowWindowType(windowType())) { - XFree(tqshapes); + XFree(shapes); // Tell whatever Clients are listening that this Client's shadow has been drawn. // It hasn't, but there's no sense waiting for something that won't happen. @@ -1264,9 +1264,9 @@ ButtonPressMask | ButtonReleaseMask | StructureNotifyMask); shadowWidget->installEventFilter(this); - if (!tqshapes) { + if (!shapes) { // XShape extension not supported - exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(), + exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(), shadow.y(), shadow.width(), shadow.height(), thickness, xOffset, yOffset); shadowRegion.region = exposedRegion; @@ -1274,7 +1274,7 @@ shadowRegions.append(shadowRegion); if (opacityCache->isNull()) - imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion, + imposeRegionShadow(shadowPixmap, shapeBoundingRegion, exposedRegion, thickness, options->shadowOpacity(isActive())); else @@ -1285,7 +1285,7 @@ TQMemArray::Iterator it, itEnd; XRectangle *shadowShapes; - exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(), + exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(), shadow.y(), shadow.width(), shadow.height(), thickness, xOffset, yOffset); shadowRegion.region = exposedRegion; @@ -1293,7 +1293,7 @@ shadowRegions.append(shadowRegion); // XShape the shadow - exposedRects = exposedRegion.tqrects(); + exposedRects = exposedRegion.rects(); i = 0; itEnd = exposedRects.end(); shadowShapes = new XRectangle[exposedRects.count()]; @@ -1311,14 +1311,14 @@ delete [] shadowShapes; if (opacityCache->isNull()) - imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion, + imposeRegionShadow(shadowPixmap, shapeBoundingRegion, exposedRegion, thickness, options->shadowOpacity(isActive())); else imposeCachedShadow(shadowPixmap, exposedRegion); } - XFree(tqshapes); + XFree(shapes); // Set the background pixmap //shadowPixmap.convertFromImage(shadowImage); @@ -1391,10 +1391,10 @@ TQMemArray::Iterator it, itEnd; TQRegion shadowRegion; - occludedRects = occludedRegion.tqrects(); + occludedRects = occludedRegion.rects(); itEnd = occludedRects.end(); for (it = occludedRects.begin(); it != itEnd; ++it) { - // Expand each of the occluded region's tqshape rectangles to contain + // Expand each of the occluded region's shape rectangles to contain // where a shadow of the specified thickness will be drawn. Create // a new TQRegion that contains the expanded occluded region it->setTop(it->top() - thickness + yOffset); @@ -1425,7 +1425,7 @@ Window rootWindow; int thickness, windowX, windowY, xOffset, yOffset; - rectangles = exposed.tqrects(); + rectangles = exposed.rects(); rootWindow = qt_xrootwin(); thickness = options->shadowThickness(isActive()); windowX = this->x(); @@ -1485,7 +1485,7 @@ Window rootWindow; int windowX, windowY, xOffset, yOffset; - rectangles = exposed.tqrects(); + rectangles = exposed.rects(); rootWindow = qt_xrootwin(); windowX = this->x(); windowY = this->y(); @@ -2430,7 +2430,7 @@ } /*! - Sets an appropriate cursor tqshape for the logical mouse position \a m + Sets an appropriate cursor shape for the logical mouse position \a m */ void Client::setCursor( Position m ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/client.h v3.5.13-sru/kwin/client.h --- /tmp/stable//kdebase/kwin/client.h 2011-09-11 06:57:55.000000000 +0200 +++ v3.5.13-sru/kwin/client.h 2012-09-08 19:41:29.000000000 +0200 @@ -214,8 +214,8 @@ // window to be redrawn. friend void Workspace::updateOverlappingShadows(WId); - // tqshape extensions - bool tqshape() const; + // shape extensions + bool shape() const; void updateShape(); void setGeometry( int x, int y, int w, int h, ForceGeometry_t force = NormalGeometrySet ); @@ -501,7 +501,7 @@ uint active :1; uint deleting : 1; // true when doing cleanup and destroying the client uint keep_above : 1; // NET::KeepAbove (was stays_on_top) - uint is_tqshape :1; + uint is_shape :1; uint skip_taskbar :1; uint original_skip_taskbar :1; // unaffected by KWin uint Pdeletewindow :1; // does the window understand the DeleteWindow protocol? @@ -570,7 +570,7 @@ TQMemArray activeOpacityCache; TQMemArray inactiveOpacityCache; TQMemArray* opacityCache; - TQRegion tqshapeBoundingRegion; + TQRegion shapeBoundingRegion; TQTimer* shadowDelayTimer; bool shadowMe; @@ -797,9 +797,9 @@ return keep_below; } -inline bool Client::tqshape() const +inline bool Client::shape() const { - return is_tqshape; + return is_shape; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/b2/b2client.cpp v3.5.13-sru/kwin/clients/b2/b2client.cpp --- /tmp/stable//kdebase/kwin/clients/b2/b2client.cpp 2011-09-19 16:26:16.000000000 +0200 +++ v3.5.13-sru/kwin/clients/b2/b2client.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -419,7 +419,7 @@ titleLayout->addSpacing(3); - TQColor c = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive()). + TQColor c = options()->colorGroup(KDecoration::ColorTitleBar, isActive()). color(TQColorGroup::Button); for (int i = 0; i < BtnCount; i++) { @@ -558,7 +558,7 @@ void B2Client::iconChange() { if (button[BtnMenu]) - button[BtnMenu]->tqrepaint(false); + button[BtnMenu]->repaint(false); } // Gallium: New button show/hide magic for customizable @@ -607,7 +607,7 @@ titleMoveAbs(bar_x_ofs); doShape(); - widget()->tqrepaint(); // the frame is misrendered without this + widget()->repaint(); // the frame is misrendered without this } void B2Client::captionChange() @@ -616,7 +616,7 @@ titleMoveAbs(bar_x_ofs); doShape(); titlebar->recalcBuffer(); - titlebar->tqrepaint(false); + titlebar->repaint(false); } void B2Client::paintEvent(TQPaintEvent* e) @@ -635,7 +635,7 @@ int bb = mustDrawHandle() ? 4 : 0; int bDepth = thickness + bb; - TQColorGroup fillColor = options()->tqcolorGroup(frameColorGroup, isActive()); + TQColorGroup fillColor = options()->colorGroup(frameColorGroup, isActive()); TQBrush fillBrush(options()->color(frameColorGroup, isActive())); // outer frame rect @@ -710,7 +710,7 @@ visibilitinotify events until its state changes, so we just try */ if (titlebar->isFullyObscured()) { - /* We first see, if our tqrepaint contained the titlebar area */ + /* We first see, if our repaint contained the titlebar area */ TQRegion reg(TQRect(0, 0, width(), buttonSize + 4)); reg = reg.intersect(e->region()); if (!reg.isEmpty()) @@ -815,8 +815,8 @@ bar_x_ofs = new_ofs; positionButtons(); doShape(); - widget()->tqrepaint(0, 0, width(), buttonSize + 4, false); - titlebar->tqrepaint(false); + widget()->repaint(0, 0, width(), buttonSize + 4, false); + titlebar->repaint(false); } } @@ -841,7 +841,7 @@ bool m = maximizeMode() == MaximizeFull; if (button[BtnMax]) { button[BtnMax]->setPixmaps(m ? P_NORMALIZE : P_MAX); - button[BtnMax]->tqrepaint(); + button[BtnMax]->repaint(); TQToolTip::remove(button[BtnMax]); TQToolTip::add(button[BtnMax], m ? i18n("Restore") : i18n("Maximize")); @@ -851,21 +851,21 @@ g->activate(); doShape(); - widget()->tqrepaint(false); + widget()->repaint(false); } void B2Client::activeChange() { - widget()->tqrepaint(false); - titlebar->tqrepaint(false); + widget()->repaint(false); + titlebar->repaint(false); - TQColor c = options()->tqcolorGroup( + TQColor c = options()->colorGroup( KDecoration::ColorTitleBar, isActive()).color(TQColorGroup::Button); for (int i = 0; i < BtnCount; i++) if (button[i]) { button[i]->setBg(c); - button[i]->tqrepaint(false); + button[i]->repaint(false); } } @@ -881,7 +881,7 @@ } } -TQSize B2Client::tqminimumSize() const +TQSize B2Client::minimumSize() const { int left, right, top, bottom; borders(left, right, top, bottom); @@ -960,8 +960,8 @@ static void redraw_pixmaps() { int i; - TQColorGroup aGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); - TQColorGroup iGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + TQColorGroup aGrp = options()->colorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup iGrp = options()->colorGroup(KDecoration::ColorButtonBg, false); // close drawB2Rect(PIXMAP_A(P_CLOSE), aGrp.button(), false); @@ -1128,7 +1128,7 @@ // Transparent bound stuff. static TQRect *visible_bound; -static TQPointArray bound_tqshape; +static TQPointArray bound_shape; bool B2Client::drawbound(const TQRect& geom, bool clear) { @@ -1153,7 +1153,7 @@ barLeft += 2; barRight -= 2; - bound_tqshape.putPoints(0, 8, + bound_shape.putPoints(0, 8, g.left(), frameTop, barLeft, frameTop, barLeft, g.top(), @@ -1168,7 +1168,7 @@ TQPainter p(workspaceWidget()); p.setPen(TQPen(Qt::white, 5)); p.setRasterOp(TQt::XorROP); - p.drawPolygon(bound_tqshape); + p.drawPolygon(bound_shape); if (clear) { delete visible_bound; @@ -1222,7 +1222,7 @@ } -TQSize B2Button::tqsizeHint() const +TQSize B2Button::sizeHint() const { return TQSize(buttonSize, buttonSize); } @@ -1273,7 +1273,7 @@ for (int i = 0; i < NumStates; i++) { icon[i] = B2::pixmap[button_id + i]; } - tqrepaint(false); + repaint(false); } void B2Button::mousePressEvent(TQMouseEvent * e) @@ -1297,14 +1297,14 @@ void B2Button::enterEvent(TQEvent *e) { hover = true; - tqrepaint(false); + repaint(false); TQButton::enterEvent(e); } void B2Button::leaveEvent(TQEvent *e) { hover = false; - tqrepaint(false); + repaint(false); TQButton::leaveEvent(e); } @@ -1363,7 +1363,7 @@ // titlebar fill const TQColorGroup cg = - options()->tqcolorGroup(KDecoration::ColorTitleBar, state); + options()->colorGroup(KDecoration::ColorTitleBar, state); TQBrush brush(cg.background()); if (gradient) brush.setPixmap(*gradient); qDrawShadeRect(&p, 1, 1, t.right() - 1, t.height() - 1, @@ -1388,7 +1388,7 @@ void B2Titlebar::resizeEvent(TQResizeEvent *) { recalcBuffer(); - tqrepaint(false); + repaint(false); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/b2/b2client.h v3.5.13-sru/kwin/clients/b2/b2client.h --- /tmp/stable//kdebase/kwin/clients/b2/b2client.h 2011-09-19 16:26:16.000000000 +0200 +++ v3.5.13-sru/kwin/clients/b2/b2client.h 2012-09-08 19:41:29.000000000 +0200 @@ -38,7 +38,7 @@ void setToggle(){setToggleType(Toggle);} void setActive(bool on){setOn(on);} void setUseMiniIcon(){useMiniIcon = true;} - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSizePolicy sizePolicy() const; protected: virtual void drawButton(TQPainter *p); @@ -119,7 +119,7 @@ Position mousePosition( const TQPoint& p ) const; void resize(const TQSize&); void borders(int &, int &, int &, int &) const; - TQSize tqminimumSize() const; + TQSize minimumSize() const; bool eventFilter(TQObject *, TQEvent *); private slots: void menuButtonPressed(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/default/kdedefault.cpp v3.5.13-sru/kwin/clients/default/kdedefault.cpp --- /tmp/stable//kdebase/kwin/clients/default/kdedefault.cpp 2011-03-12 07:58:04.000000000 +0100 +++ v3.5.13-sru/kwin/clients/default/kdedefault.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -240,7 +240,7 @@ || new_useGradients != useGradients || new_titleHeight != normalTitleHeight || new_toolTitleHeight != toolTitleHeight ) - changed |= SettingColors; // just recreate the pixmaps and tqrepaint + changed |= SettingColors; // just recreate the pixmaps and repaint } showGrabBar = new_showGrabBar; @@ -328,7 +328,7 @@ TQPainter p; // Active pins - g = options()->tqcolorGroup( ColorButtonBg, true ); + g = options()->colorGroup( ColorButtonBg, true ); pinUpPix = new KPixmap(); pinUpPix->resize(16, 16); p.begin( pinUpPix ); @@ -346,7 +346,7 @@ pinDownPix->setMask( TQBitmap(16, 16, pindown_mask_bits, true) ); // Inactive pins - g = options()->tqcolorGroup( ColorButtonBg, false ); + g = options()->colorGroup( ColorButtonBg, false ); ipinUpPix = new KPixmap(); ipinUpPix->resize(16, 16); p.begin( ipinUpPix ); @@ -404,25 +404,25 @@ irightBtnDownPix[false]->resize(toolTitleHeight, toolTitleHeight); // Draw the button state pixmaps - g = options()->tqcolorGroup( ColorTitleBar, true ); + g = options()->colorGroup( ColorTitleBar, true ); drawButtonBackground( leftBtnUpPix[true], g, false ); drawButtonBackground( leftBtnDownPix[true], g, true ); drawButtonBackground( leftBtnUpPix[false], g, false ); drawButtonBackground( leftBtnDownPix[false], g, true ); - g = options()->tqcolorGroup( ColorButtonBg, true ); + g = options()->colorGroup( ColorButtonBg, true ); drawButtonBackground( rightBtnUpPix[true], g, false ); drawButtonBackground( rightBtnDownPix[true], g, true ); drawButtonBackground( rightBtnUpPix[false], g, false ); drawButtonBackground( rightBtnDownPix[false], g, true ); - g = options()->tqcolorGroup( ColorTitleBar, false ); + g = options()->colorGroup( ColorTitleBar, false ); drawButtonBackground( ileftBtnUpPix[true], g, false ); drawButtonBackground( ileftBtnDownPix[true], g, true ); drawButtonBackground( ileftBtnUpPix[false], g, false ); drawButtonBackground( ileftBtnDownPix[false], g, true ); - g = options()->tqcolorGroup( ColorButtonBg, false ); + g = options()->colorGroup( ColorButtonBg, false ); drawButtonBackground( irightBtnUpPix[true], g, false ); drawButtonBackground( irightBtnDownPix[true], g, true ); drawButtonBackground( irightBtnUpPix[false], g, false ); @@ -720,7 +720,7 @@ void KDEDefaultButton::enterEvent(TQEvent *e) { isMouseOver=true; - tqrepaint(false); + repaint(false); TQButton::enterEvent(e); } @@ -728,7 +728,7 @@ void KDEDefaultButton::leaveEvent(TQEvent *e) { isMouseOver=false; - tqrepaint(false); + repaint(false); TQButton::leaveEvent(e); } @@ -856,7 +856,7 @@ void KDEDefaultClient::reset( unsigned long changed) { - widget()->tqrepaint(); + widget()->repaint(); KCommonDecoration::reset(changed); } @@ -909,7 +909,7 @@ p.drawRect(x,y,w,h); // Draw part of the frame that is the titlebar color - g = options()->tqcolorGroup(ColorTitleBar, isActive()); + g = options()->colorGroup(ColorTitleBar, isActive()); p.setPen(g.light()); p.drawLine(x+1, y+1, rightOffset-1, y+1); p.drawLine(x+1, y+1, x+1, leftFrameStart+borderWidth-4); @@ -929,7 +929,7 @@ p.drawLine(x+borderWidth-2, y+titleHeight+3, x+borderWidth-2, leftFrameStart-2); // Fill out the border edges - g = options()->tqcolorGroup(ColorFrame, isActive()); + g = options()->colorGroup(ColorFrame, isActive()); p.setPen(g.light()); p.drawLine(rightOffset, y+1, x2-1, y+1); p.drawLine(x+1, leftFrameStart+borderWidth-3, x+1, y2-1); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/keramik/CMakeLists.txt v3.5.13-sru/kwin/clients/keramik/CMakeLists.txt --- /tmp/stable//kdebase/kwin/clients/keramik/CMakeLists.txt 2011-03-26 21:41:57.000000000 +0100 +++ v3.5.13-sru/kwin/clients/keramik/CMakeLists.txt 2012-09-08 19:41:29.000000000 +0200 @@ -42,22 +42,11 @@ ##### tiles.h (header) ########################## -set( pics - pics/caption-large-left.png pics/caption-small-right.png - pics/titlebar-center.png pics/titlebutton-square.png - pics/border-left.png pics/caption-large-right.png - pics/grabbar-center.png pics/titlebar-left.png - pics/border-right.png pics/caption-small-center.png - pics/grabbar-left.png pics/titlebar-right.png - pics/caption-large-center.png pics/caption-small-left.png - pics/grabbar-right.png pics/titlebutton-round.png - pics/bottom-left.png pics/bottom-right.png pics/bottom-center.png - pics/titlebutton-square-large.png pics/titlebutton-square-huge.png - pics/titlebutton-round-large.png pics/titlebutton-round-huge.png ) +file(GLOB _pics "${CMAKE_CURRENT_SOURCE_DIR}/pics/*.png" ) add_custom_command( OUTPUT tiles.h - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/embedtool ${pics} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/embedtool ${pics} ) + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/embedtool ${_pics} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/embedtool ${_pics} ) tde_add_executable( embedtool SOURCES embedtool.cpp diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/keramik/embedtool.cpp v3.5.13-sru/kwin/clients/keramik/embedtool.cpp --- /tmp/stable//kdebase/kwin/clients/keramik/embedtool.cpp 2011-08-11 07:25:42.000000000 +0200 +++ v3.5.13-sru/kwin/clients/keramik/embedtool.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -60,7 +60,7 @@ KeramikEmbedder::KeramikEmbedder() { - TQDateTime date( TQDateTime::tqcurrentDateTime() ); + TQDateTime date( TQDateTime::currentDateTime() ); TQString datestring( date.toString() ); file = new TQFile( "tiles.h" ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/keramik/keramik.cpp v3.5.13-sru/kwin/clients/keramik/keramik.cpp --- /tmp/stable//kdebase/kwin/clients/keramik/keramik.cpp 2011-09-19 16:26:16.000000000 +0200 +++ v3.5.13-sru/kwin/clients/keramik/keramik.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -784,7 +784,7 @@ TQButton::enterEvent( e ); hover = true; - tqrepaint( false ); + repaint( false ); } @@ -793,7 +793,7 @@ TQButton::leaveEvent( e ); hover = false; - tqrepaint( false ); + repaint( false ); } @@ -832,14 +832,14 @@ if ( isDown() ) { // Pressed - p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(2*size, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(2*size, 0, size, size), pix->rect() ) ); p->translate( TQApplication::reverseLayout() ? -1 : 1, 1 ); } else if ( hover ) // Mouse over - p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(size, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(size, 0, size, size), pix->rect() ) ); else // Normal - p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(0, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(0, 0, size, size), pix->rect() ) ); // Draw the button deco on the bevel @@ -1014,13 +1014,13 @@ captionBufferDirty = maskDirty = true; - // Only tqrepaint the window if it's visible + // Only repaint the window if it's visible // (i.e. not minimized and on the current desktop) if ( widget()->isVisible() ) { - widget()->tqrepaint( false ); + widget()->repaint( false ); for ( int i = 0; i < NumButtons; i++ ) - if ( button[i] ) button[i]->tqrepaint( false ); + if ( button[i] ) button[i]->repaint( false ); } } @@ -1280,7 +1280,7 @@ ( clientHandler->showAppIcons() ? 16 + iconSpacing : 0 ); int xpos = QMAX( (captionRect.width() - tw) / 3, 8 ); - TQRect tr = TQStyle::tqvisualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10, + TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10, captionRect.height() - 4), captionBuffer.rect() ); //p.setPen( Qt::red ); // debug @@ -1289,7 +1289,7 @@ // Application icon if ( clientHandler->showAppIcons() ) { - TQRect iconRect = TQStyle::tqvisualRect( TQRect(tr.x(), + TQRect iconRect = TQStyle::visualRect( TQRect(tr.x(), 1 + (captionRect.height() - 4 - 16) / 2, 16, 16), tr ); TQRect r( icon->rect() ); r.moveCenter( iconRect.center() ); @@ -1349,7 +1349,7 @@ cw += 16 + 4; // icon width + space cw = QMIN( cw, titlebar->geometry().width() ); - captionRect = TQStyle::tqvisualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY), + captionRect = TQStyle::visualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY), cw, clientHandler->titleBarHeight(largeCaption) ), titlebar->geometry() ); } @@ -1365,7 +1365,7 @@ captionBufferDirty = true; - widget()->tqrepaint( r | captionRect, false ); + widget()->repaint( r | captionRect, false ); } @@ -1381,7 +1381,7 @@ activeIcon = inactiveIcon = NULL; captionBufferDirty = true; - widget()->tqrepaint( captionRect, false ); + widget()->repaint( captionRect, false ); } } @@ -1400,10 +1400,10 @@ captionBufferDirty = true; - widget()->tqrepaint( false ); + widget()->repaint( false ); for ( int i=0; i < NumButtons; i++ ) - if ( button[i] ) button[i]->tqrepaint( false ); + if ( button[i] ) button[i]->repaint( false ); } @@ -1420,7 +1420,7 @@ captionBufferDirty = maskDirty = true; widget()->layout()->activate(); - widget()->tqrepaint( false ); + widget()->repaint( false ); } else if (( maximizeMode() & MaximizeVertical ) == 0 && !largeTitlebar ) { // We've been restored - enlarge the titlebar by 3 pixels topSpacer->changeSize( 10, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); @@ -1430,14 +1430,14 @@ captionBufferDirty = maskDirty = true; widget()->layout()->activate(); - widget()->tqrepaint( false ); + widget()->repaint( false ); } } if ( button[ MaxButton ] ) { TQToolTip::remove( button[ MaxButton ] ); TQToolTip::add( button[ MaxButton ], maximizeMode() == MaximizeFull ? i18n("Restore") : i18n("Maximize") ); - button[ MaxButton ]->tqrepaint(); + button[ MaxButton ]->repaint(); } } @@ -1446,7 +1446,7 @@ { if ( button[ OnAllDesktopsButton ] ) { - button[ OnAllDesktopsButton ]->tqrepaint( true ); + button[ OnAllDesktopsButton ]->repaint( true ); TQToolTip::remove( button[ OnAllDesktopsButton ] ); TQToolTip::add( button[ OnAllDesktopsButton ], isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops") ); } @@ -1457,7 +1457,7 @@ { if ( button[ ShadeButton ] ) { - button[ ShadeButton ]->tqrepaint( true ); + button[ ShadeButton ]->repaint( true ); TQToolTip::remove( button[ ShadeButton ] ); TQToolTip::add( button[ ShadeButton ], isSetShade() ? i18n("Unshade") : i18n("Shade") ); } @@ -1467,14 +1467,14 @@ void KeramikClient::keepAboveChange( bool ) { if ( button[ AboveButton ] ) - button[ AboveButton ]->tqrepaint( true ); + button[ AboveButton ]->repaint( true ); } void KeramikClient::keepBelowChange( bool ) { if ( button[ BelowButton ] ) - button[ BelowButton ]->tqrepaint( true ); + button[ BelowButton ]->repaint( true ); } @@ -1502,21 +1502,21 @@ void KeramikClient::slotAbove() { setKeepAbove( !keepAbove()); - button[ AboveButton ]->tqrepaint( true ); + button[ AboveButton ]->repaint( true ); } void KeramikClient::slotBelow() { setKeepBelow( !keepBelow()); - button[ BelowButton ]->tqrepaint( true ); + button[ BelowButton ]->repaint( true ); } void KeramikClient::slotShade() { setShade( !isSetShade()); - button[ ShadeButton ]->tqrepaint( true ); + button[ ShadeButton ]->repaint( true ); } @@ -1794,9 +1794,9 @@ } -TQSize KeramikClient::tqminimumSize() const +TQSize KeramikClient::minimumSize() const { - return widget()->tqminimumSize(); + return widget()->minimumSize(); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/keramik/keramik.h v3.5.13-sru/kwin/clients/keramik/keramik.h --- /tmp/stable//kdebase/kwin/clients/keramik/keramik.h 2011-09-19 16:26:16.000000000 +0200 +++ v3.5.13-sru/kwin/clients/keramik/keramik.h 2012-09-08 19:41:29.000000000 +0200 @@ -148,7 +148,7 @@ virtual Position mousePosition( const TQPoint& p ) const; virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void resize( const TQSize& s ); - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() const; virtual bool eventFilter( TQObject* o, TQEvent* e ); virtual void activeChange(); virtual void captionChange(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/kwmtheme/cli_installer/main.cpp v3.5.13-sru/kwin/clients/kwmtheme/cli_installer/main.cpp --- /tmp/stable//kdebase/kwin/clients/kwmtheme/cli_installer/main.cpp 2011-03-12 07:58:03.000000000 +0100 +++ v3.5.13-sru/kwin/clients/kwmtheme/cli_installer/main.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -73,36 +73,36 @@ input.setGroup("Window Border"); output->setGroup("General"); - tmpStr = input.readEntry("tqshapePixmapTop"); + tmpStr = input.readEntry("shapePixmapTop"); if(!tmpStr.isEmpty()){ copy(srcStr+tmpStr, localDirStr+tmpStr); } output->writeEntry("wm_top", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapBottom"); + tmpStr = input.readEntry("shapePixmapBottom"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottom", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapLeft"); + tmpStr = input.readEntry("shapePixmapLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_left", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapRight"); + tmpStr = input.readEntry("shapePixmapRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_right", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapTopLeft"); + tmpStr = input.readEntry("shapePixmapTopLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_topleft", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapTopRight"); + tmpStr = input.readEntry("shapePixmapTopRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_topright", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapBottomLeft"); + tmpStr = input.readEntry("shapePixmapBottomLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottomleft", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapBottomRight"); + tmpStr = input.readEntry("shapePixmapBottomRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottomright", tmpStr, true, true); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/kwmtheme/kwmthemeclient.cpp v3.5.13-sru/kwin/clients/kwmtheme/kwmthemeclient.cpp --- /tmp/stable//kdebase/kwin/clients/kwmtheme/kwmthemeclient.cpp 2011-08-11 07:25:42.000000000 +0200 +++ v3.5.13-sru/kwin/clients/kwmtheme/kwmthemeclient.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -231,7 +231,7 @@ int offset = (isDown() && ((pixmap()->width() >= width()) || (pixmap()->height() >= height()))) ? 1 : 0; style().drawItem(p, TQRect( offset, offset, width(), height() ), - AlignCenter, tqcolorGroup(), + AlignCenter, colorGroup(), true, pixmap(), TQString::null); } } @@ -364,7 +364,7 @@ p.begin(&buffer); if(titleSunken){ - qDrawShadeRect(&p, r, options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()), + qDrawShadeRect(&p, r, options()->colorGroup(KDecorationOptions::ColorFrame, isActive()), true, 1, 0); r.setRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2); } @@ -384,7 +384,7 @@ p.drawTiledPixmap(r, *fill); } else{ - p.fillRect(r, options()->tqcolorGroup(KDecorationOptions::ColorTitleBar, isActive()). + p.fillRect(r, options()->colorGroup(KDecorationOptions::ColorTitleBar, isActive()). brush(TQColorGroup::Button)); } p.setFont(options()->font(isActive())); @@ -402,12 +402,12 @@ void KWMThemeClient::resizeEvent( TQResizeEvent* ) { doShape(); - widget()->tqrepaint(); + widget()->repaint(); } void KWMThemeClient::captionChange() { - widget()->tqrepaint( titlebar->geometry(), false ); + widget()->repaint( titlebar->geometry(), false ); } void KWMThemeClient::paintEvent( TQPaintEvent *) @@ -557,7 +557,7 @@ } drawTitle(p); - TQColor c = widget()->tqcolorGroup().background(); + TQColor c = widget()->colorGroup().background(); // KWM evidently had a 1 pixel border around the client window. We // emulate it here, but should be removed at some point in order to @@ -576,10 +576,10 @@ void KWMThemeClient::doShape() { - TQBitmap tqshapemask(width(), height()); - tqshapemask.fill(color0); + TQBitmap shapemask(width(), height()); + shapemask.fill(color0); TQPainter p; - p.begin(&tqshapemask); + p.begin(&shapemask); p.setBrush(color1); p.setPen(color1); int x,y; @@ -740,14 +740,14 @@ } } p.fillRect(maxExtent-1, maxExtent-1, width()-2*maxExtent+2, height()-2*maxExtent+2, color1); - setMask(tqshapemask); + setMask(shapemask); } void KWMThemeClient::showEvent(TQShowEvent *) { doShape(); - widget()->tqrepaint(false); + widget()->repaint(false); } void KWMThemeClient::mouseDoubleClickEvent( TQMouseEvent * e ) @@ -868,9 +868,9 @@ } } -TQSize KWMThemeClient::tqminimumSize() const +TQSize KWMThemeClient::minimumSize() const { - return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 )); + return widget()->minimumSize().expandedTo( TQSize( 100, 50 )); } void KWMThemeClient::resize( const TQSize& s ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/kwmtheme/kwmthemeclient.h v3.5.13-sru/kwin/clients/kwmtheme/kwmthemeclient.h --- /tmp/stable//kdebase/kwin/clients/kwmtheme/kwmthemeclient.h 2011-03-12 07:58:03.000000000 +0100 +++ v3.5.13-sru/kwin/clients/kwmtheme/kwmthemeclient.h 2012-09-08 19:41:29.000000000 +0200 @@ -30,7 +30,7 @@ ~KWMThemeClient(){;} void init(); void resize( const TQSize& s ); - TQSize tqminimumSize() const; + TQSize minimumSize() const; void borders( int& left, int& right, int& top, int& bottom ) const; protected: void doShape(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/laptop/laptopclient.cpp v3.5.13-sru/kwin/clients/laptop/laptopclient.cpp --- /tmp/stable//kdebase/kwin/clients/laptop/laptopclient.cpp 2011-03-12 07:58:03.000000000 +0100 +++ v3.5.13-sru/kwin/clients/laptop/laptopclient.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -157,7 +157,7 @@ KPixmapEffect::VerticalGradient); } // buttons (active/inactive, sunken/unsunken, 2 sizes each) - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true); TQColor c = g.background(); btnPix1 = new KPixmap; btnPix1->resize(btnWidth1, titleHeight); @@ -184,7 +184,7 @@ KPixmapEffect::DiagonalGradient); KPixmapEffect::gradient(*btnDownPix2, c.dark(130), c.light(120), KPixmapEffect::DiagonalGradient); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); KPixmapEffect::gradient(*iBtnPix1, c.light(120), c.dark(130), KPixmapEffect::DiagonalGradient); @@ -200,20 +200,20 @@ btnDownPix1->fill(c.rgb()); btnPix2->fill(c.rgb()); btnDownPix2->fill(c.rgb()); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); iBtnPix1->fill(c.rgb()); iBtnDownPix1->fill(c.rgb()); iBtnPix2->fill(c.rgb()); iBtnDownPix2->fill(c.rgb()); } - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + g = options()->colorGroup(KDecoration::ColorButtonBg, true); c = g.background(); drawButtonFrame(btnPix1, g, false); drawButtonFrame(btnDownPix1, g, true); drawButtonFrame(btnPix2, g, false); drawButtonFrame(btnDownPix2, g, true); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); drawButtonFrame(iBtnPix1, g, false); drawButtonFrame(iBtnDownPix1, g, true); @@ -293,7 +293,7 @@ deco.fill(Qt::color0); } deco.setMask(deco); - tqrepaint(); + repaint(); } void LaptopButton::drawButton(TQPainter *p) @@ -314,7 +314,7 @@ } } else{ - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, decoration()->isActive()); + TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, decoration()->isActive()); int w = width(); int h = height(); p->fillRect(1, 1, w-2, h-2, isDown() ? g.mid() : g.button()); @@ -469,7 +469,7 @@ void LaptopClient::paintEvent( TQPaintEvent* ) { TQPainter p(widget()); - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive()); + TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive()); TQRect r(widget()->rect()); p.setPen(Qt::black); @@ -546,7 +546,7 @@ p.setFont(options()->font(false, isToolWindow() )); TQFontMetrics fm(options()->font(false)); - g = options()->tqcolorGroup(KDecoration::ColorTitleBar, false); + g = options()->colorGroup(KDecoration::ColorTitleBar, false); if(iUpperGradient) p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4, r.y(), fm.width(caption())+8, r.height()-1, @@ -564,7 +564,7 @@ p.setPen(options()->color(KDecoration::ColorFont, false)); p.drawText(r.x(), r.y(), r.width(), r.height()-1, AlignCenter, caption() ); - g = options()->tqcolorGroup(KDecoration::ColorFrame, true); + g = options()->colorGroup(KDecoration::ColorFrame, true); p.setPen(g.background()); p.drawPoint(r.x(), r.y()); p.drawPoint(r.right(), r.y()); @@ -629,7 +629,7 @@ p.setFont(options()->font(true, isToolWindow() )); TQFontMetrics fm(options()->font(true)); - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorTitleBar, true); + TQColorGroup g = options()->colorGroup(KDecoration::ColorTitleBar, true); if(aUpperGradient) p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4, r.y(), fm.width(caption())+8, r.height()-1, @@ -647,7 +647,7 @@ p.setPen(options()->color(KDecoration::ColorFont, true)); p.drawText(r.x(), r.y(), r.width(), r.height()-1, AlignCenter, caption() ); - g = options()->tqcolorGroup(KDecoration::ColorFrame, true); + g = options()->colorGroup(KDecoration::ColorFrame, true); p.setPen(g.background()); p.drawPoint(r.x(), r.y()); p.drawPoint(r.right(), r.y()); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/modernsystem/config/config.cpp v3.5.13-sru/kwin/clients/modernsystem/config/config.cpp --- /tmp/stable//kdebase/kwin/clients/modernsystem/config/config.cpp 2011-03-12 07:58:04.000000000 +0100 +++ v3.5.13-sru/kwin/clients/modernsystem/config/config.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -59,11 +59,11 @@ bool rtl = kapp->reverseLayout(); label1 = new TQLabel(i18n("Small"), hbox); - label1->tqsetAlignment(rtl ? AlignRight : AlignLeft); + label1->setAlignment(rtl ? AlignRight : AlignLeft); label2 = new TQLabel(i18n("Medium"), hbox); - label2->tqsetAlignment(AlignHCenter); + label2->setAlignment(AlignHCenter); label3 = new TQLabel(i18n("Large"), hbox); - label3->tqsetAlignment(rtl ? AlignLeft : AlignRight); + label3->setAlignment(rtl ? AlignLeft : AlignRight); vbox->addWidget(handleBox); vbox->addStretch(1); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/modernsystem/modernsys.cpp v3.5.13-sru/kwin/clients/modernsystem/modernsys.cpp --- /tmp/stable//kdebase/kwin/clients/modernsystem/modernsys.cpp 2011-03-12 07:58:04.000000000 +0100 +++ v3.5.13-sru/kwin/clients/modernsystem/modernsys.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -171,13 +171,13 @@ KPixmapEffect::VerticalGradient); } // buttons - TQColorGroup btnColor(options()->tqcolorGroup(KDecoration::ColorButtonBg, true)); + TQColorGroup btnColor(options()->colorGroup(KDecoration::ColorButtonBg, true)); buttonPix = new TQPixmap(14, 15); make_button_fx(btnColor, buttonPix); buttonPixDown = new TQPixmap(14, 15); make_button_fx(btnColor, buttonPixDown, true); - btnColor = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + btnColor = options()->colorGroup(KDecoration::ColorButtonBg, false); iButtonPix = new TQPixmap(14, 15); make_button_fx(btnColor, iButtonPix); iButtonPixDown = new TQPixmap(14, 15); @@ -515,7 +515,7 @@ p.drawTiledPixmap(0, 0, width(), title_height+2, *aUpperGradient); else p.fillRect(0, 0, width(), title_height+2, - options()->tqcolorGroup(ColorTitleBar, true). + options()->colorGroup(ColorTitleBar, true). brush(TQColorGroup::Button)); TQRect t = titleRect(); // titlebar->geometry(); @@ -554,7 +554,7 @@ void ModernSys::drawRoundFrame(TQPainter &p, int x, int y, int w, int h) { kDrawRoundButton(&p, x, y, w, h, - options()->tqcolorGroup(ColorFrame, isActive()), false); + options()->colorGroup(ColorFrame, isActive()), false); } @@ -570,9 +570,9 @@ TQPainter p( widget() ); TQRect t = titleRect(); // titlebar->geometry(); - TQBrush fillBrush(widget()->tqcolorGroup().tqbrush(TQColorGroup::Background).pixmap() ? - widget()->tqcolorGroup().brush(TQColorGroup::Background) : - options()->tqcolorGroup(ColorFrame, isActive()). + TQBrush fillBrush(widget()->colorGroup().brush(TQColorGroup::Background).pixmap() ? + widget()->colorGroup().brush(TQColorGroup::Background) : + options()->colorGroup(ColorFrame, isActive()). brush(TQColorGroup::Button)); p.fillRect(1, title_height+3, width()-2, height()-(title_height+3), fillBrush); @@ -586,7 +586,7 @@ int h = height() - hw; // titlebar - TQColorGroup g = options()->tqcolorGroup(ColorTitleBar, isActive()); + TQColorGroup g = options()->colorGroup(ColorTitleBar, isActive()); if(isActive()){ p.drawPixmap(1, 1, titleBuffer, 0, 0, w-2, title_height+2); } @@ -609,7 +609,7 @@ p.drawLine(0, title_height+2, w-2, title_height+2); // frame - g = options()->tqcolorGroup(ColorFrame, isActive()); + g = options()->colorGroup(ColorFrame, isActive()); p.setPen(g.light()); p.drawLine(1, title_height+3, 1, h-2); p.setPen(g.dark()); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/plastik/plastikbutton.cpp v3.5.13-sru/kwin/clients/plastik/plastikbutton.cpp --- /tmp/stable//kdebase/kwin/clients/plastik/plastikbutton.cpp 2011-03-12 07:58:04.000000000 +0100 +++ v3.5.13-sru/kwin/clients/plastik/plastikbutton.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -140,7 +140,7 @@ } } - tqrepaint(false); + repaint(false); } void PlastikButton::enterEvent(TQEvent *e) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/plastik/plastikclient.cpp v3.5.13-sru/kwin/clients/plastik/plastikclient.cpp --- /tmp/stable//kdebase/kwin/clients/plastik/plastikclient.cpp 2011-08-11 07:25:42.000000000 +0200 +++ v3.5.13-sru/kwin/clients/plastik/plastikclient.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -435,7 +435,7 @@ { if (changed & SettingColors) { - // tqrepaint the whole thing + // repaint the whole thing clearCaptionPixmaps(); widget()->update(); updateButtons(); @@ -445,7 +445,7 @@ updateLayout(); - // then tqrepaint + // then repaint clearCaptionPixmaps(); widget()->update(); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/plastik/plastik.cpp v3.5.13-sru/kwin/clients/plastik/plastik.cpp --- /tmp/stable//kdebase/kwin/clients/plastik/plastik.cpp 2011-03-12 07:58:04.000000000 +0100 +++ v3.5.13-sru/kwin/clients/plastik/plastik.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -290,7 +290,7 @@ } else { pm = new TQPixmap(1, titleBarTileHeight); painter.begin(pm); - painter.tqdrawPixmap(0, 0, gradient, 0,2); + painter.drawPixmap(0, 0, gradient, 0,2); if (m_coloredBorder) { painter.setPen(getColor(TitleGradient3, active).dark(110) ); } else { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/quartz/quartz.cpp v3.5.13-sru/kwin/clients/quartz/quartz.cpp --- /tmp/stable//kdebase/kwin/clients/quartz/quartz.cpp 2011-08-11 07:25:42.000000000 +0200 +++ v3.5.13-sru/kwin/clients/quartz/quartz.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -291,18 +291,18 @@ void QuartzHandler::createPixmaps() { // Obtain titlebar blend colours, and create the block stuff on pixmaps. - TQColorGroup g2 = options()->tqcolorGroup(ColorTitleBlend, true); + TQColorGroup g2 = options()->colorGroup(ColorTitleBlend, true); TQColor c2 = g2.background(); - g2 = options()->tqcolorGroup(ColorTitleBar, true ); + g2 = options()->colorGroup(ColorTitleBar, true ); TQColor c = g2.background().light(130); titleBlocks = new KPixmap(); titleBlocks->resize( normalTitleHeight*25/18, normalTitleHeight ); drawBlocks( titleBlocks, *titleBlocks, c, c2 ); - g2 = options()->tqcolorGroup(ColorTitleBlend, false); + g2 = options()->colorGroup(ColorTitleBlend, false); c2 = g2.background(); - g2 = options()->tqcolorGroup(ColorTitleBar, false ); + g2 = options()->colorGroup(ColorTitleBar, false ); c = g2.background().light(130); ititleBlocks = new KPixmap(); @@ -313,9 +313,9 @@ TQColorGroup g; TQPainter p; - g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true ); + g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true ); c = onAllDesktopsButtonOnLeft ? TQColor(g.background().light(130)) : g.background(); - g2 = options()->tqcolorGroup( ColorButtonBg, true ); + g2 = options()->colorGroup( ColorButtonBg, true ); pinUpPix = new KPixmap(); pinUpPix->resize(16, 16); @@ -335,9 +335,9 @@ // Inactive pins - g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false ); + g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false ); c = onAllDesktopsButtonOnLeft ? TQColor(g.background().light(130)) : g.background(); - g2 = options()->tqcolorGroup( ColorButtonBg, false ); + g2 = options()->colorGroup( ColorButtonBg, false ); ipinUpPix = new KPixmap(); ipinUpPix->resize(16, 16); @@ -437,7 +437,7 @@ if (bitmap) { deco = new TQBitmap(10, 10, bitmap, true); deco->setMask( *deco ); - tqrepaint( false ); + repaint( false ); } } @@ -643,8 +643,8 @@ { if (changed & SettingColors || changed & SettingFont) { - // tqrepaint the whole thing - widget()->tqrepaint(false); + // repaint the whole thing + widget()->repaint(false); } KCommonDecoration::reset(changed); @@ -675,9 +675,9 @@ // Draw part of the frame that is the title color if( coloredFrame ) - g = options()->tqcolorGroup(ColorTitleBar, isActive()); + g = options()->colorGroup(ColorTitleBar, isActive()); else - g = options()->tqcolorGroup(ColorFrame, isActive()); + g = options()->colorGroup(ColorFrame, isActive()); // Draw outer highlights and lowlights p.setPen( g.light().light(120) ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/redmond/redmond.cpp v3.5.13-sru/kwin/clients/redmond/redmond.cpp --- /tmp/stable//kdebase/kwin/clients/redmond/redmond.cpp 2011-07-30 07:15:31.000000000 +0200 +++ v3.5.13-sru/kwin/clients/redmond/redmond.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -149,7 +149,7 @@ defaultMenuPix = new TQPixmap(kdelogo); // buttons (active/inactive, sunken/unsunken) - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true); TQColor c = g.background(); btnPix1->resize(normalTitleHeight, normalTitleHeight-2); btnDownPix1->resize(normalTitleHeight, normalTitleHeight-2); @@ -172,7 +172,7 @@ KPixmapEffect::gradient(*miniBtnDownPix1, c.dark(130), c.light(130), KPixmapEffect::VerticalGradient); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); KPixmapEffect::gradient(*iBtnPix1, c.light(130), c.dark(130), KPixmapEffect::VerticalGradient); @@ -188,7 +188,7 @@ miniBtnPix1->fill(c.rgb()); miniBtnDownPix1->fill(c.rgb()); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); iBtnPix1->fill(c.rgb()); iBtnDownPix1->fill(c.rgb()); @@ -196,13 +196,13 @@ iMiniBtnDownPix1->fill(c.rgb()); } - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + g = options()->colorGroup(KDecoration::ColorButtonBg, true); drawButtonFrame(btnPix1, g, false); drawButtonFrame(btnDownPix1, g, true); drawButtonFrame(miniBtnPix1, g, false); drawButtonFrame(miniBtnDownPix1, g, true); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); drawButtonFrame(iBtnPix1, g, false); drawButtonFrame(iBtnDownPix1, g, true); drawButtonFrame(iMiniBtnPix1, g, false); @@ -294,7 +294,7 @@ deco.resize(0, 0); pix = p; - tqrepaint(false); + repaint(false); } @@ -491,7 +491,7 @@ // Draw part of the frame that is the frame color // ============================================== - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive()); + TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive()); p.setPen( g.background() ); p.drawLine( x, y, x2-1, y ); p.drawLine( x, y, x, y2-1 ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/test/test.cpp v3.5.13-sru/kwin/clients/test/test.cpp --- /tmp/stable//kdebase/kwin/clients/test/test.cpp 2011-03-12 07:58:03.000000000 +0100 +++ v3.5.13-sru/kwin/clients/test/test.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -93,7 +93,7 @@ widget()->resize( s ); } -TQSize Decoration::tqminimumSize() const +TQSize Decoration::minimumSize() const { return TQSize( 100, 50 ); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/test/test.h v3.5.13-sru/kwin/clients/test/test.h --- /tmp/stable//kdebase/kwin/clients/test/test.h 2011-03-12 07:58:03.000000000 +0100 +++ v3.5.13-sru/kwin/clients/test/test.h 2012-09-08 19:41:29.000000000 +0200 @@ -22,7 +22,7 @@ virtual MousePosition mousePosition( const TQPoint& p ) const; virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void resize( const TQSize& s ); - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() const; virtual void activeChange() {}; virtual void captionChange() {}; virtual void maximizeChange() {}; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/web/WebButton.cpp v3.5.13-sru/kwin/clients/web/WebButton.cpp --- /tmp/stable//kdebase/kwin/clients/web/WebButton.cpp 2011-03-12 07:58:04.000000000 +0100 +++ v3.5.13-sru/kwin/clients/web/WebButton.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -69,10 +69,10 @@ 0xff, 0x81, 0x81, 0xff, 0x81, 0xff, 0x81, 0xff }; -WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape) +WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool shape) : KCommonDecorationButton (type, parent, name), mouseOver_ (false), - tqshape_ (tqshape), + shape_ (shape), deco_ (parent) { setBackgroundMode(NoBackground); @@ -127,7 +127,7 @@ WebButton::enterEvent(TQEvent * e) { mouseOver_ = true; - tqrepaint(); + repaint(); TQButton::enterEvent(e); } @@ -135,7 +135,7 @@ WebButton::leaveEvent(TQEvent * e) { mouseOver_ = false; - tqrepaint(); + repaint(); TQButton::leaveEvent(e); } @@ -145,17 +145,17 @@ TQPen highlightPen; if (isDown() ) - highlightPen = TQPen(tqcolorGroup().light()); + highlightPen = TQPen(colorGroup().light()); else { if (mouseOver_) - highlightPen = TQPen(tqcolorGroup().highlight()); + highlightPen = TQPen(colorGroup().highlight()); else highlightPen = TQPen(NoPen); } - p->fillRect(rect(), tqcolorGroup().background()); + p->fillRect(rect(), colorGroup().background()); Position position_; if (0 == mapToParent(rect().topLeft() ).x() ) @@ -174,7 +174,7 @@ p->drawLine(0, 0, width(), 0); p->drawLine(0, 1, 0, height() - 1); - if (tqshape_) + if (shape_) { p->drawPoint(3, 1); p->drawPoint(4, 1); @@ -187,11 +187,11 @@ p->setBrush(NoBrush); p->setPen(highlightPen); - if (tqshape_) + if (shape_) p->setClipRegion(TQRegion(rect()) - TQRect(0, 0, 6, 6)); p->drawRect(2, 2, width() - 4, height() - 4); - if (tqshape_) + if (shape_) { p->setClipRect(rect()); p->drawPoint(4, 3); @@ -210,7 +210,7 @@ p->setPen(Qt::black); p->drawLine(0, 0, width(), 0); p->drawLine(width() - 1, 1, width() - 1, height() - 1); - if (tqshape_) + if (shape_) { p->drawPoint(width() - 5, 1); p->drawPoint(width() - 4, 1); @@ -223,11 +223,11 @@ p->setBrush(NoBrush); p->setPen(highlightPen); - if (tqshape_) + if (shape_) p->setClipRegion(TQRegion(rect()) - TQRect(width() - 6, 0, 6, 6)); p->drawRect(2, 2, width() - 4, height() - 4); - if (tqshape_) + if (shape_) { p->setClipRect(rect()); p->drawPoint(width() - 5, 3); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/web/WebButton.h v3.5.13-sru/kwin/clients/web/WebButton.h --- /tmp/stable//kdebase/kwin/clients/web/WebButton.h 2011-03-12 07:58:04.000000000 +0100 +++ v3.5.13-sru/kwin/clients/web/WebButton.h 2012-09-08 19:41:29.000000000 +0200 @@ -41,7 +41,7 @@ Left, Mid, Right }; - WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape); + WebButton(ButtonType type, WebClient *parent, const char *name, bool shape); virtual ~WebButton(); @@ -59,7 +59,7 @@ bool mouseOver_; - bool tqshape_; + bool shape_; WebClient* deco_; }; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/web/Web.cpp v3.5.13-sru/kwin/clients/web/Web.cpp --- /tmp/stable//kdebase/kwin/clients/web/Web.cpp 2011-03-12 07:58:04.000000000 +0100 +++ v3.5.13-sru/kwin/clients/web/Web.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -120,31 +120,31 @@ { switch (type) { case MenuButton: - return new WebButton(MenuButton, this, "menu", tqshape_); + return new WebButton(MenuButton, this, "menu", shape_); case OnAllDesktopsButton: - return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", tqshape_); + return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", shape_); case HelpButton: - return new WebButton(HelpButton, this, "help", tqshape_); + return new WebButton(HelpButton, this, "help", shape_); case MinButton: - return new WebButton(MinButton, this, "minimize", tqshape_); + return new WebButton(MinButton, this, "minimize", shape_); case MaxButton: - return new WebButton(MaxButton, this, "maximize", tqshape_); + return new WebButton(MaxButton, this, "maximize", shape_); case CloseButton: - return new WebButton(CloseButton, this, "close", tqshape_); + return new WebButton(CloseButton, this, "close", shape_); case AboveButton: - return new WebButton(AboveButton, this, "above", tqshape_); + return new WebButton(AboveButton, this, "above", shape_); case BelowButton: - return new WebButton(BelowButton, this, "below", tqshape_); + return new WebButton(BelowButton, this, "below", shape_); case ShadeButton: - return new WebButton(ShadeButton, this, "shade", tqshape_); + return new WebButton(ShadeButton, this, "shade", shape_); default: return 0; @@ -185,7 +185,7 @@ KConfig c("kwinwebrc"); c.setGroup("General"); - tqshape_ = c.readBoolEntry("Shape", true); + shape_ = c.readBoolEntry("Shape", true); KCommonDecoration::init(); } @@ -195,8 +195,8 @@ { if (changed & SettingColors) { - // tqrepaint the whole thing - widget()->tqrepaint(false); + // repaint the whole thing + widget()->repaint(false); } else if (changed & SettingFont) { // font has changed -- update title height // title height @@ -206,7 +206,7 @@ if (0 != titleHeight_ % 2) titleHeight_ += 1; - widget()->tqrepaint(false); + widget()->repaint(false); } KCommonDecoration::reset(changed); @@ -231,7 +231,7 @@ TQPainter p(widget()); p.setPen(Qt::black); - p.setBrush(options()->tqcolorGroup(ColorFrame, isActive()).background()); + p.setBrush(options()->colorGroup(ColorFrame, isActive()).background()); p.setClipRegion(pe->region() - titleRect); @@ -241,7 +241,7 @@ p.fillRect(titleRect, options()->color(ColorTitleBar, isActive())); - if (tqshape_) + if (shape_) { int r(width()); int b(height()); @@ -288,7 +288,7 @@ void WebClient::updateWindowShape() { - if (!tqshape_) + if (!shape_) return; TQRegion mask(0, 0, width(), height()); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/clients/web/Web.h v3.5.13-sru/kwin/clients/web/Web.h --- /tmp/stable//kdebase/kwin/clients/web/Web.h 2011-03-12 07:58:04.000000000 +0100 +++ v3.5.13-sru/kwin/clients/web/Web.h 2012-09-08 19:41:29.000000000 +0200 @@ -62,7 +62,7 @@ int titleHeight_, borderSize_; - bool tqshape_; + bool shape_; TQBitmap _buttonBitmap(ButtonType t) const; }; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/events.cpp v3.5.13-sru/kwin/events.cpp --- /tmp/stable//kdebase/kwin/events.cpp 2011-08-11 07:25:43.000000000 +0200 +++ v3.5.13-sru/kwin/events.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -626,9 +626,9 @@ default: if( e->xany.window == window()) { - if( e->type == Shape::tqshapeEvent() ) + if( e->type == Shape::shapeEvent() ) { - is_tqshape = Shape::hasShape( window()); // workaround for #19644 + is_shape = Shape::hasShape( window()); // workaround for #19644 updateShape(); } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/geometry.cpp v3.5.13-sru/kwin/geometry.cpp --- /tmp/stable//kdebase/kwin/geometry.cpp 2011-09-14 07:31:14.000000000 +0200 +++ v3.5.13-sru/kwin/geometry.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -1120,7 +1120,7 @@ TQSize max_size = maxSize(); if( decoration != NULL ) { - TQSize decominsize = decoration->tqminimumSize(); + TQSize decominsize = decoration->minimumSize(); TQSize border_size( border_left + border_right, border_top + border_bottom ); if( border_size.width() > decominsize.width()) // just in case decominsize.setWidth( border_size.width()); @@ -2637,7 +2637,7 @@ ( isResize() ? options->resizeMode : options->moveMode ) == Options::Transparent ) { clearbound(); // it's necessary to move the geometry tip when there's no outline - positionGeometryTip(); // shown, otherwise it would cause tqrepaint problems in case + positionGeometryTip(); // shown, otherwise it would cause repaint problems in case drawbound( moveResizeGeom ); // they overlap; the paint event will come after this, } // so the geometry tip will be painted above the outline } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/geometrytip.cpp v3.5.13-sru/kwin/geometrytip.cpp --- /tmp/stable//kdebase/kwin/geometrytip.cpp 2011-07-18 08:45:48.000000000 +0200 +++ v3.5.13-sru/kwin/geometrytip.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -20,7 +20,7 @@ setIndent(0); setLineWidth(1); setFrameStyle( TQFrame::Raised | TQFrame::StyledPanel ); - tqsetAlignment( AlignCenter | AlignTop ); + setAlignment( AlignCenter | AlignTop ); sizeHints = xSizeHints; if( save_under ) { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/kcmkwin/kwindecoration/buttons.cpp v3.5.13-sru/kwin/kcmkwin/kwindecoration/buttons.cpp --- /tmp/stable//kdebase/kwin/kcmkwin/kwindecoration/buttons.cpp 2011-08-11 07:25:42.000000000 +0200 +++ v3.5.13-sru/kwin/kcmkwin/kwindecoration/buttons.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -54,7 +54,7 @@ TQDataStream stream(data, IO_WriteOnly); stream << btn.name; stream << btn.icon; - stream << btn.type.tqunicode(); + stream << btn.type.unicode(); stream << (int) btn.duplicate; stream << (int) btn.supported; setEncodedData( data ); @@ -123,7 +123,7 @@ ButtonSource::ButtonSource(TQWidget *parent, const char* name) : KListView(parent, name) { - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); setResizeMode(TQListView::AllColumns); setDragEnabled(true); @@ -140,19 +140,19 @@ { } -TQSize ButtonSource::tqsizeHint() const +TQSize ButtonSource::sizeHint() const { - // make the tqsizeHint height a bit smaller than the one of TQListView... + // make the sizeHint height a bit smaller than the one of TQListView... if ( cachedSizeHint().isValid() ) return cachedSizeHint(); constPolish(); - TQSize s( header()->tqsizeHint() ); + TQSize s( header()->sizeHint() ); if ( verticalScrollBar()->isVisible() ) - s.setWidth( s.width() + tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) ); + s.setWidth( s.width() + style().pixelMetric(TQStyle::PM_ScrollBarExtent) ); s += TQSize(frameWidth()*2,frameWidth()*2); // size hint: 4 lines of text... @@ -167,7 +167,7 @@ { TQListViewItemIterator it(this); while (it.current() ) { - it.current()->tqsetVisible(false); + it.current()->setVisible(false); ++it; } } @@ -176,7 +176,7 @@ { TQListViewItemIterator it(this); while (it.current() ) { - it.current()->tqsetVisible(true); + it.current()->setVisible(true); ++it; } } @@ -187,7 +187,7 @@ while (it.current() ) { ButtonSourceItem *item = dynamic_cast(it.current() ); if (item && item->button().type == btn) { - it.current()->tqsetVisible(true); + it.current()->setVisible(true); return; } ++it; @@ -200,7 +200,7 @@ while (it.current() ) { ButtonSourceItem *item = dynamic_cast(it.current() ); if (item && item->button().type == btn && !item->button().duplicate) { - it.current()->tqsetVisible(false); + it.current()->setVisible(false); return; } ++it; @@ -218,7 +218,7 @@ if (i) { ButtonDrag *bd = new ButtonDrag(i->button(), viewport(), "button_drag"); - bd->setPixmap(bitmapPixmap(i->button().icon, tqcolorGroup().foreground() )); + bd->setPixmap(bitmapPixmap(i->button().icon, colorGroup().foreground() )); return bd; } @@ -487,7 +487,7 @@ m_selected = buttonAt(e->pos() ); if (m_selected) { ButtonDrag *bd = new ButtonDrag(m_selected->button(), this); - bd->setPixmap(bitmapPixmap(m_selected->button().icon, tqcolorGroup().foreground() ) ); + bd->setPixmap(bitmapPixmap(m_selected->button().icon, colorGroup().foreground() ) ); bd->dragMove(); } } @@ -572,7 +572,7 @@ delete m_selected; m_selected = 0; recalcItemGeometry(); - update(); // tqrepaint... + update(); // repaint... } return succ; @@ -581,9 +581,9 @@ void ButtonDropSite::drawButtonList(TQPainter *p, const ButtonList& btns, int offset) { for (ButtonList::const_iterator it = btns.begin(); it != btns.end(); ++it) { - TQRect tqitemRect = (*it)->rect; - if (tqitemRect.isValid() ) { - (*it)->draw(p, tqcolorGroup(), tqitemRect); + TQRect itemRect = (*it)->rect; + if (itemRect.isValid() ) { + (*it)->draw(p, colorGroup(), itemRect); } offset += (*it)->width(); } @@ -675,11 +675,11 @@ m_factory(0) { TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); TQLabel* label = new TQLabel( this ); m_dropSite = new ButtonDropSite( this ); - label->tqsetAlignment( int( TQLabel::WordBreak ) ); + label->setAlignment( int( TQLabel::WordBreak ) ); label->setText( i18n( "To add or remove titlebar buttons, simply drag items " "between the available item list and the titlebar preview. Similarly, " "drag items within the titlebar preview to re-position them.") ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/kcmkwin/kwindecoration/buttons.h v3.5.13-sru/kwin/kcmkwin/kwindecoration/buttons.h --- /tmp/stable//kdebase/kwin/kcmkwin/kwindecoration/buttons.h 2011-03-12 07:58:04.000000000 +0100 +++ v3.5.13-sru/kwin/kcmkwin/kwindecoration/buttons.h 2012-09-08 19:41:29.000000000 +0200 @@ -117,7 +117,7 @@ ButtonSource(TQWidget *parent = 0, const char* name = 0); virtual ~ButtonSource(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void hideAllButtons(); void showAllButtons(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/kcmkwin/kwindecoration/kwindecoration.cpp v3.5.13-sru/kwin/kcmkwin/kwindecoration/kwindecoration.cpp --- /tmp/stable//kdebase/kwin/kcmkwin/kwindecoration/kwindecoration.cpp 2011-03-12 07:58:04.000000000 +0100 +++ v3.5.13-sru/kwin/kcmkwin/kwindecoration/kwindecoration.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -112,13 +112,13 @@ TQWhatsThis::add( cBorder, i18n( "Use this combobox to change the border size of the decoration." )); lBorder->hide(); cBorder->hide(); - TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->tqlayout() ); + TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->layout() ); borderSizeLayout->addWidget(lBorder); borderSizeLayout->addWidget(cBorder); borderSizeLayout->addStretch(); pluginConfigWidget = new TQVBox(pluginSettingsGrp); - pluginSettingsGrp->tqlayout()->add( pluginConfigWidget ); + pluginSettingsGrp->layout()->add( pluginConfigWidget ); // Page 2 (Button Selector) TQWidget* buttonPage = new TQWidget( tabWidget ); @@ -154,8 +154,8 @@ preview = new KDecorationPreview( this ); previewLayout->addWidget(preview); - preview->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); - tabWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); + preview->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + tabWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); // Page 3 (Window Shadows) TQHBox *inactiveShadowColourHBox, *shadowColourHBox; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/kcmkwin/kwindecoration/preview.cpp v3.5.13-sru/kwin/kcmkwin/kwindecoration/preview.cpp --- /tmp/stable//kdebase/kwin/kcmkwin/kwindecoration/preview.cpp 2011-03-12 07:58:04.000000000 +0100 +++ v3.5.13-sru/kwin/kcmkwin/kwindecoration/preview.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -49,7 +49,7 @@ "Most probably there\n" "was a problem loading the plugin." ), this ); - no_preview->tqsetAlignment( AlignCenter ); + no_preview->setAlignment( AlignCenter ); setMinimumSize( 100, 100 ); no_preview->resize( size()); @@ -127,15 +127,15 @@ // Resize the active window size = TQSize( width() - xoffset, height() - titleBarHeight ) - .expandedTo( deco[Active]->tqminimumSize() ); + .expandedTo( deco[Active]->minimumSize() ); geometry = TQRect( TQPoint( 0, titleBarHeight ), size ); - deco[Active]->widget()->setGeometry( TQStyle::tqvisualRect( geometry, this ) ); + deco[Active]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) ); // Resize the inactive window size = TQSize( width() - xoffset, height() - titleBarHeight ) - .expandedTo( deco[Inactive]->tqminimumSize() ); + .expandedTo( deco[Inactive]->minimumSize() ); geometry = TQRect( TQPoint( xoffset, 0 ), size ); - deco[Inactive]->widget()->setGeometry( TQStyle::tqvisualRect( geometry, this ) ); + deco[Inactive]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) ); } void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool active ) @@ -150,7 +150,7 @@ } else { - TQMemArray< TQRect > rects = reg.tqrects(); + TQMemArray< TQRect > rects = reg.rects(); XRectangle* xrects = new XRectangle[ rects.count() ]; for( unsigned int i = 0; i < rects.count(); @@ -166,7 +166,7 @@ delete[] xrects; } if( active ) - mask = reg; // keep tqshape of the active window for unobscuredRegion() + mask = reg; // keep shape of the active window for unobscuredRegion() } TQRect KDecorationPreview::windowGeometry( bool active ) const diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/kcmkwin/kwinoptions/mouse.cpp v3.5.13-sru/kwin/kcmkwin/kwinoptions/mouse.cpp --- /tmp/stable//kdebase/kwin/kcmkwin/kwinoptions/mouse.cpp 2011-03-12 07:58:05.000000000 +0100 +++ v3.5.13-sru/kwin/kcmkwin/kwinoptions/mouse.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -163,7 +163,7 @@ combo->insertItem(i18n("Lower")); combo->insertItem(i18n("On All Desktops")); combo->insertItem(i18n("Nothing")); - combo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); hlayout->addWidget(combo); coTiDbl = combo; @@ -188,7 +188,7 @@ comboW->insertItem(i18n("Move to Previous/Next Desktop")); comboW->insertItem(i18n("Change Opacity")); comboW->insertItem(i18n("Nothing")); - comboW->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); hlayoutW->addWidget(comboW); coTiAct4 = comboW; @@ -235,7 +235,7 @@ label = new TQLabel(i18n("Active"), grid); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" " or the frame of an active window.") ); @@ -292,7 +292,7 @@ if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3); label = new TQLabel(i18n("Inactive"), grid); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" " or the frame of an inactive window.") ); @@ -356,14 +356,14 @@ TQLabel * label = new TQLabel(strMouseButton[b], box); TQWhatsThis::add( label, txtButton[b] ); - label ->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); + label ->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); coMax[b] = new ToolTipComboBox(box, tbl_Max); for (int t = 0; t < 3; ++t) coMax[b]->insertItem(maxButtonPixmaps[t]); connect(coMax[b], TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); connect(coMax[b], TQT_SIGNAL(activated(int)), coMax[b], TQT_SLOT(changed())); TQWhatsThis::add( coMax[b], txtButton[b] ); - coMax[b]->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); + coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); } connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/kcmkwin/kwinoptions/windows.cpp v3.5.13-sru/kwin/kcmkwin/kwinoptions/windows.cpp --- /tmp/stable//kdebase/kwin/kcmkwin/kwinoptions/windows.cpp 2011-08-26 01:00:16.000000000 +0200 +++ v3.5.13-sru/kwin/kcmkwin/kwinoptions/windows.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -110,7 +110,7 @@ //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); - //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); + //iTLabel->setAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); @@ -124,7 +124,7 @@ fcsBox = new TQButtonGroup(i18n("Focus"),this); fcsBox->setColumnLayout( 0, Qt::Horizontal ); - TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->tqlayout(), + TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(), KDialog::spacingHint()); TQBoxLayout *cLay = new TQHBoxLayout(fLay); @@ -192,8 +192,8 @@ connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool))); fLay->addWidget(clickRaiseOn); -// fLay->addColSpacing(0,QMAX(autoRaiseOn->tqsizeHint().width(), -// clickRaiseOn->tqsizeHint().width()) + 15); +// fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(), +// clickRaiseOn->sizeHint().width()) + 15); TQWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically" " come to the front when the mouse pointer has been over it for some time.") ); @@ -236,7 +236,7 @@ kbdBox = new TQButtonGroup(i18n("Navigation"), this); kbdBox->setColumnLayout( 0, Qt::Horizontal ); - TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->tqlayout(), KDialog::spacingHint()); + TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), KDialog::spacingHint()); altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox ); kLay->addWidget( altTabPopup ); @@ -573,7 +573,7 @@ //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); - //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); + //iTLabel->setAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); @@ -831,7 +831,7 @@ windowsBox = new TQButtonGroup(i18n("Windows"), this); windowsBox->setColumnLayout( 0, Qt::Horizontal ); - TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->tqlayout(), KDialog::spacingHint()); + TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint()); TQBoxLayout *bLay = new TQVBoxLayout; wLay->addLayout(bLay); @@ -877,11 +877,11 @@ connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int))); minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox); - minimizeAnimSlowLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignLeft); + minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft); rLay->addWidget(minimizeAnimSlowLabel,1,1); minimizeAnimFastLabel= new TQLabel(i18n("Fast"),windowsBox); - minimizeAnimFastLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignRight); + minimizeAnimFastLabel->setAlignment(Qt::AlignTop|Qt::AlignRight); rLay->addWidget(minimizeAnimFastLabel,1,2); wtstr = i18n("Here you can set the speed of the animation shown when windows are" @@ -940,7 +940,7 @@ //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); - //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); + //iTLabel->setAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/kcmkwin/kwinrules/detectwidgetbase.ui v3.5.13-sru/kwin/kcmkwin/kwinrules/detectwidgetbase.ui --- /tmp/stable//kdebase/kwin/kcmkwin/kwinrules/detectwidgetbase.ui 2011-03-12 07:58:05.000000000 +0100 +++ v3.5.13-sru/kwin/kcmkwin/kwinrules/detectwidgetbase.ui 2012-09-08 19:41:29.000000000 +0200 @@ -29,7 +29,7 @@ Expanding - + 20 40 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/kcmkwin/kwinrules/editshortcutbase.ui v3.5.13-sru/kwin/kcmkwin/kwinrules/editshortcutbase.ui --- /tmp/stable//kdebase/kwin/kcmkwin/kwinrules/editshortcutbase.ui 2011-03-12 07:58:05.000000000 +0100 +++ v3.5.13-sru/kwin/kcmkwin/kwinrules/editshortcutbase.ui 2012-09-08 19:41:29.000000000 +0200 @@ -66,7 +66,7 @@ Expanding - + 40 20 @@ -91,7 +91,7 @@ Expanding - + 40 20 @@ -116,7 +116,7 @@ Expanding - + 40 20 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/kcmkwin/kwinrules/main.cpp v3.5.13-sru/kwin/kcmkwin/kwinrules/main.cpp --- /tmp/stable//kdebase/kwin/kcmkwin/kwinrules/main.cpp 2011-08-11 07:25:43.000000000 +0200 +++ v3.5.13-sru/kwin/kcmkwin/kwinrules/main.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -151,7 +151,7 @@ Rules* ret = new Rules; if( whole_app ) { - ret->description = i18n( "Application settings for %1" ).tqarg( static_cast(wmclass_class) ); + ret->description = i18n( "Application settings for %1" ).arg( static_cast(wmclass_class) ); // TODO maybe exclude some types? If yes, then also exclude them above // when searching. ret->types = NET::AllTypesMask; @@ -175,7 +175,7 @@ } return ret; } - ret->description = i18n( "Window settings for %1" ).tqarg( static_cast(wmclass_class) ); + ret->description = i18n( "Window settings for %1" ).arg( static_cast(wmclass_class) ); if( type == NET::Unknown ) ret->types = NET::NormalMask; else diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/kcmkwin/kwinrules/ruleslistbase.ui v3.5.13-sru/kwin/kcmkwin/kwinrules/ruleslistbase.ui --- /tmp/stable//kdebase/kwin/kcmkwin/kwinrules/ruleslistbase.ui 2011-03-12 07:58:05.000000000 +0100 +++ v3.5.13-sru/kwin/kcmkwin/kwinrules/ruleslistbase.ui 2012-09-08 19:41:29.000000000 +0200 @@ -77,7 +77,7 @@ Expanding - + 20 294 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui v3.5.13-sru/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui --- /tmp/stable//kdebase/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui 2011-03-12 07:58:05.000000000 +0100 +++ v3.5.13-sru/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui 2012-09-08 19:41:29.000000000 +0200 @@ -87,7 +87,7 @@ Expanding - + 20 40 @@ -129,7 +129,7 @@ Expanding - + 212 20 @@ -157,7 +157,7 @@ Expanding - + 211 20 @@ -199,7 +199,7 @@ Expanding - + 212 20 @@ -230,7 +230,7 @@ Expanding - + 211 20 @@ -271,7 +271,7 @@ Expanding - + 270 20 @@ -296,7 +296,7 @@ Expanding - + 269 20 @@ -470,7 +470,7 @@ Expanding - + 199 20 @@ -501,7 +501,7 @@ Expanding - + 199 20 @@ -543,7 +543,7 @@ Expanding - + 199 20 @@ -574,7 +574,7 @@ Expanding - + 199 20 @@ -616,7 +616,7 @@ Expanding - + 199 20 @@ -647,7 +647,7 @@ Expanding - + 199 20 @@ -1181,7 +1181,7 @@ Expanding - + 20 16 @@ -1347,7 +1347,7 @@ Expanding - + 171 20 @@ -1364,7 +1364,7 @@ Expanding - + 290 20 @@ -1381,7 +1381,7 @@ Expanding - + 290 20 @@ -1398,7 +1398,7 @@ Expanding - + 290 20 @@ -1415,7 +1415,7 @@ Expanding - + 290 20 @@ -1432,7 +1432,7 @@ Expanding - + 290 20 @@ -1449,7 +1449,7 @@ Expanding - + 290 20 @@ -1466,7 +1466,7 @@ Expanding - + 290 20 @@ -1796,7 +1796,7 @@ Expanding - + 20 80 @@ -1847,7 +1847,7 @@ Expanding - + 181 20 @@ -2278,7 +2278,7 @@ Expanding - + 20 160 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/kcmkwin/kwinrules/ruleswidget.cpp v3.5.13-sru/kwin/kcmkwin/kwinrules/ruleswidget.cpp --- /tmp/stable//kdebase/kwin/kcmkwin/kwinrules/ruleswidget.cpp 2011-03-12 07:58:05.000000000 +0100 +++ v3.5.13-sru/kwin/kcmkwin/kwinrules/ruleswidget.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -661,7 +661,7 @@ all_types = false; if( wmclass_match->currentItem() == Rules::UnimportantMatch && all_types ) { - if( KMessageBox::warningContinueCancel( tqtopLevelWidget(), + if( KMessageBox::warningContinueCancel( topLevelWidget(), i18n( "You have specified the window class as unimportant.\n" "This means the settings will possibly apply to windows from all applications. " "If you really want to create a generic setting, it is recommended you at least " @@ -680,7 +680,7 @@ void RulesWidget::shortcutEditClicked() { - EditShortcutDialog dlg( tqtopLevelWidget()); + EditShortcutDialog dlg( topLevelWidget()); dlg.setShortcut( shortcut->text()); if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut()); @@ -735,7 +735,7 @@ void EditShortcut::editShortcut() { - ShortcutDialog dlg( KShortcut( shortcut->text()), tqtopLevelWidget()); + ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget()); if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut().toString()); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/killer/killer.cpp v3.5.13-sru/kwin/killer/killer.cpp --- /tmp/stable//kdebase/kwin/killer/killer.cpp 2011-03-12 07:58:03.000000000 +0100 +++ v3.5.13-sru/kwin/killer/killer.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -55,7 +55,7 @@ bool pid_ok = false; pid_t pid = args->getOption( "pid" ).toULong( &pid_ok ); TQString caption = TQString::fromUtf8( args->getOption( "windowname" )); - TQString appname = TQString::tqfromLatin1( args->getOption( "applicationname" )); + TQString appname = TQString::fromLatin1( args->getOption( "applicationname" )); bool id_ok = false; Window id = args->getOption( "wid" ).toULong( &id_ok ); bool time_ok = false; @@ -71,7 +71,7 @@ "Window with title \"%2\" is not responding. " "This window belongs to application %1 (PID=%3, hostname=%4).

    " "Do you wish to terminate this application? (All unsaved data in this application will be lost.)" ) - .tqarg( appname ).tqarg( caption ).tqarg( pid ).tqarg( static_cast(hostname) ); + .arg( appname ).arg( caption ).arg( pid ).arg( static_cast(hostname) ); app.updateUserTimestamp( timestamp ); if( KMessageBox::warningYesNoWId( id, question, TQString::null, i18n("Terminate"), i18n("Keep Running") ) == KMessageBox::Yes ) { diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/kompmgr/kompmgr.c v3.5.13-sru/kwin/kompmgr/kompmgr.c --- /tmp/stable//kdebase/kwin/kompmgr/kompmgr.c 2011-10-24 03:36:55.000000000 +0200 +++ v3.5.13-sru/kwin/kompmgr/kompmgr.c 2012-09-08 19:41:29.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: kompmgr.c 1260431 2011-10-24 01:12:32Z tpearson $ + * $Id$ * * Copyright © 2003 Keith Packard * @@ -60,6 +60,7 @@ #include #include #include +#include #include #include #include @@ -397,7 +398,7 @@ int chars = readlink("/proc/self/exe", me, sizeof(me)); me[chars] = 0; me[2047] = 0; - execl(me, NULL); + execl(me, basename(me), (char*)NULL); } #endif } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/layers.cpp v3.5.13-sru/kwin/layers.cpp --- /tmp/stable//kdebase/kwin/layers.cpp 2011-08-11 07:25:43.000000000 +0200 +++ v3.5.13-sru/kwin/layers.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -87,7 +87,7 @@ if( c->layer() == c->belongsToLayer()) return; StackingUpdatesBlocker blocker( this ); - c->invalidateLayer(); // tqinvalidate, will be updated when doing restacking + c->invalidateLayer(); // invalidate, will be updated when doing restacking for( ClientList::ConstIterator it = c->transients().begin(); it != c->transients().end(); ++it ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/lib/kcommondecoration.cpp v3.5.13-sru/kwin/lib/kcommondecoration.cpp --- /tmp/stable//kdebase/kwin/lib/kcommondecoration.cpp 2011-09-11 06:57:55.000000000 +0200 +++ v3.5.13-sru/kwin/lib/kcommondecoration.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -522,7 +522,7 @@ widget()->resize( s ); } -TQSize KCommonDecoration::tqminimumSize() const +TQSize KCommonDecoration::minimumSize() const { const int minWidth = QMAX(layoutMetric(LM_TitleEdgeLeft), layoutMetric(LM_BorderLeft)) +QMAX(layoutMetric(LM_TitleEdgeRight), layoutMetric(LM_BorderRight)) @@ -684,7 +684,7 @@ updateWindowShape(); // FIXME: don't update() here! this would result in two paintEvent()s - // because there is already "something" else triggering the tqrepaint... + // because there is already "something" else triggering the repaint... // widget()->update(); } @@ -946,7 +946,7 @@ } } -TQSize KCommonDecorationButton::tqsizeHint() const +TQSize KCommonDecorationButton::sizeHint() const { return m_size; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/lib/kcommondecoration.h v3.5.13-sru/kwin/lib/kcommondecoration.h --- /tmp/stable//kdebase/kwin/lib/kcommondecoration.h 2011-09-11 06:57:55.000000000 +0200 +++ v3.5.13-sru/kwin/lib/kcommondecoration.h 2012-09-08 19:41:29.000000000 +0200 @@ -178,7 +178,7 @@ /** * This updates the window mask using the information provided by * cornerShape(). Edges which are aligned to screen corners are not - * tqshaped for better usability (remember to paint these areas in paintEvent(), too). + * shaped for better usability (remember to paint these areas in paintEvent(), too). * You normally don't want/need to reimplement updateWindowShape(). * @see cornerShape() */ @@ -234,7 +234,7 @@ virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void show(); virtual void resize(const TQSize& s); - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() const; virtual void maximizeChange(); virtual void desktopChange(); virtual void shadeChange(); @@ -348,7 +348,7 @@ */ ButtonState lastMousePress() const { return m_lastMouse; } - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: void setToggleButton(bool toggle); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/lib/kdecoration.cpp v3.5.13-sru/kwin/lib/kdecoration.cpp --- /tmp/stable//kdebase/kwin/lib/kdecoration.cpp 2011-04-11 20:53:01.000000000 +0200 +++ v3.5.13-sru/kwin/lib/kdecoration.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -388,14 +388,14 @@ return(active ? d->activeFont : d->inactiveFont); } -const TQColorGroup& KDecorationOptions::tqcolorGroup(ColorType type, bool active) const +const TQColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active) const { int idx = type + (active ? 0 : NUM_COLORS); if(d->cg[idx]) return(*d->cg[idx]); d->cg[idx] = new TQColorGroup(Qt::black, d->colors[idx], d->colors[idx].light(150), d->colors[idx].dark(), d->colors[idx].dark(120), - Qt::black, TQApplication::tqpalette().active(). + Qt::black, TQApplication::palette().active(). base()); return(*d->cg[idx]); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/lib/kdecorationfactory.h v3.5.13-sru/kwin/lib/kdecorationfactory.h --- /tmp/stable//kdebase/kwin/lib/kdecorationfactory.h 2011-03-12 07:58:05.000000000 +0100 +++ v3.5.13-sru/kwin/lib/kdecorationfactory.h 2012-09-08 19:41:29.000000000 +0200 @@ -56,7 +56,7 @@ * The argument specifies what has changed, using the SettingXXX masks. * It should be determined whether the decorations need to be completely * remade, in which case true should be returned, or whether only e.g. - * a tqrepaint will be sufficient, in which case false should be returned, + * a repaint will be sufficient, in which case false should be returned, * and resetDecorations() can be called to reset all decoration objects. * Note that true should be returned only when really necessary. */ diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/lib/kdecoration.h v3.5.13-sru/kwin/lib/kdecoration.h --- /tmp/stable//kdebase/kwin/lib/kdecoration.h 2011-07-08 00:00:31.000000000 +0200 +++ v3.5.13-sru/kwin/lib/kdecoration.h 2012-09-08 19:41:29.000000000 +0200 @@ -97,10 +97,10 @@ LowerOp, FullScreenOp, NoBorderOp, - ShadowOp, NoOp, SetupWindowShortcutOp, - ApplicationRulesOp ///< @since 3.5 + ApplicationRulesOp, ///< @since 3.5 + ShadowOp ///< @since 3.5.12 }; /** * Basic color types that should be recognized by all decoration styles. @@ -205,7 +205,7 @@ * @param type The requested color type. * @param active Whether to return the color for active or inactive windows. */ - const TQColorGroup& tqcolorGroup(ColorType type, bool active=true) const; + const TQColorGroup& colorGroup(ColorType type, bool active=true) const; /** * Returns the active or inactive decoration font. * The changed flags for this setting is SettingFont. @@ -481,15 +481,15 @@ void performWindowOperation( WindowOperation op ); /** * If the decoration is non-rectangular, this function needs to be called - * to set the tqshape of the decoration. + * to set the shape of the decoration. * - * @param reg The tqshape of the decoration. + * @param reg The shape of the decoration. * @param mode The X11 values Unsorted, YSorted, YXSorted and YXBanded that specify * the sorting of the rectangles, default value is Unsorted. */ void setMask( const TQRegion& reg, int mode = 0 ); /** - * This convenience function resets the tqshape mask. + * This convenience function resets the shape mask. */ void clearMask(); // convenience /** @@ -594,7 +594,7 @@ * Note that the returned size shouldn't be too large, because it will be * used to keep the decorated window at least as large. */ - virtual TQSize tqminimumSize() const = 0; + virtual TQSize minimumSize() const = 0; /** * This function is called whenever the window either becomes or stops being active. * Use isActive() to find out the current state. diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/manage.cpp v3.5.13-sru/kwin/manage.cpp --- /tmp/stable//kdebase/kwin/manage.cpp 2011-08-11 07:25:43.000000000 +0200 +++ v3.5.13-sru/kwin/manage.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -264,7 +264,7 @@ usePosition = true; if( !rules()->checkIgnoreGeometry( !usePosition )) { - bool ignorePPosition = ( options->ignorePositionClasses.contains(TQString::tqfromLatin1(resourceClass()))); + bool ignorePPosition = ( options->ignorePositionClasses.contains(TQString::fromLatin1(resourceClass()))); if ( ( (xSizeHint.flags & PPosition) && !ignorePPosition ) || (xSizeHint.flags & USPosition) ) @@ -319,7 +319,7 @@ keepInArea( area, partial_keep_in_area ); XShapeSelectInput( qt_xdisplay(), window(), ShapeNotifyMask ); - is_tqshape = Shape::hasShape( window()); + is_shape = Shape::hasShape( window()); updateShape(); //CT extra check for stupid jdk 1.3.1. But should make sense in general diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/options.cpp v3.5.13-sru/kwin/options.cpp --- /tmp/stable//kdebase/kwin/options.cpp 2011-08-12 02:05:41.000000000 +0200 +++ v3.5.13-sru/kwin/options.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -383,7 +383,7 @@ bool Options::checkIgnoreFocusStealing( const Client* c ) { - return ignoreFocusStealingClasses.contains(TQString::tqfromLatin1(c->resourceClass())); + return ignoreFocusStealingClasses.contains(TQString::fromLatin1(c->resourceClass())); } Options::MouseCommand Options::wheelToMouseCommand( MouseWheelCommand com, int delta ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/popupinfo.cpp v3.5.13-sru/kwin/popupinfo.cpp --- /tmp/stable//kdebase/kwin/popupinfo.cpp 2011-03-12 07:58:06.000000000 +0100 +++ v3.5.13-sru/kwin/popupinfo.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -75,8 +75,8 @@ void PopupInfo::paintEvent( TQPaintEvent* ) { TQPainter p( this ); - tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), - tqcolorGroup(), TQStyle::Style_Default ); + style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), + colorGroup(), TQStyle::Style_Default ); paintContents(); } @@ -90,7 +90,7 @@ TQPainter p( this ); TQRect r( 6, 6, width()-12, height()-12 ); - p.fillRect( r, tqcolorGroup().brush( TQColorGroup::Background ) ); + p.fillRect( r, colorGroup().brush( TQColorGroup::Background ) ); /* p.setPen(Qt::white); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/sm.cpp v3.5.13-sru/kwin/sm.cpp --- /tmp/stable//kdebase/kwin/sm.cpp 2011-08-11 07:25:43.000000000 +0200 +++ v3.5.13-sru/kwin/sm.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -27,7 +27,7 @@ namespace KWinInternal { -bool SessionManaged::saveState( QSessionManager& sm ) +bool SessionManaged::saveState( TQSessionManager& sm ) { // If the session manager is ksmserver, save stacking // order, active window, active desktop etc. in phase 1, @@ -53,7 +53,7 @@ } // I bet this is broken, just like everywhere else in KDE -bool SessionManaged::commitData( QSessionManager& sm ) +bool SessionManaged::commitData( TQSessionManager& sm ) { if ( !sm.isPhase2() ) Workspace::self()->sessionSaveStarted(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/sm.h v3.5.13-sru/kwin/sm.h --- /tmp/stable//kdebase/kwin/sm.h 2011-03-12 07:58:06.000000000 +0100 +++ v3.5.13-sru/kwin/sm.h 2012-09-08 19:41:29.000000000 +0200 @@ -80,8 +80,8 @@ : public KSessionManaged { public: - virtual bool saveState( QSessionManager& sm ); - virtual bool commitData( QSessionManager& sm ); + virtual bool saveState( TQSessionManager& sm ); + virtual bool commitData( TQSessionManager& sm ); }; } // namespace diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/tabbox.cpp v3.5.13-sru/kwin/tabbox.cpp --- /tmp/stable//kdebase/kwin/tabbox.cpp 2011-08-11 07:25:43.000000000 +0200 +++ v3.5.13-sru/kwin/tabbox.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -373,7 +373,7 @@ pix.fill(this, 0, 0); TQPainter p; - p.tqbegin(&pix, this); + p.begin(&pix, this); TQPixmap* menu_pix = kwin_get_menu_pix_hack(); @@ -400,7 +400,7 @@ { // draw highlight background if ( (*it) == current_client ) - p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight()); + p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight()); // draw icon TQPixmap icon; @@ -437,11 +437,11 @@ // draw text if ( (*it) == current_client ) - p.setPen(tqcolorGroup().highlightedText()); + p.setPen(colorGroup().highlightedText()); else if( (*it)->isMinimized()) { - TQColor c1 = tqcolorGroup().text(); - TQColor c2 = tqcolorGroup().background(); + TQColor c1 = colorGroup().text(); + TQColor c2 = colorGroup().background(); // from kicker's TaskContainer::blendColors() int r1, g1, b1; int r2, g2, b2; @@ -456,7 +456,7 @@ p.setPen(TQColor( r1, g1, b1 )); } else - p.setPen(tqcolorGroup().text()); + p.setPen(colorGroup().text()); p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight, Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine, s); @@ -494,13 +494,13 @@ { // draw highlight background if ( iDesktop == desk ) // current desktop - p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight()); + p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight()); p.save(); // draw "icon" (here: number of desktop) - p.fillRect(x+5, y+2, iconWidth, iconHeight, tqcolorGroup().base()); - p.setPen(tqcolorGroup().text()); + p.fillRect(x+5, y+2, iconWidth, iconHeight, colorGroup().base()); + p.setPen(colorGroup().text()); p.drawRect(x+5, y+2, iconWidth, iconHeight); // draw desktop-number @@ -512,9 +512,9 @@ // draw desktop name text if ( iDesktop == desk ) - p.setPen(tqcolorGroup().highlightedText()); + p.setPen(colorGroup().highlightedText()); else - p.setPen(tqcolorGroup().text()); + p.setPen(colorGroup().text()); p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight, Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine, @@ -696,7 +696,7 @@ if( e->type != ButtonPress ) return; TQPoint pos( e->xbutton.x_root, e->xbutton.y_root ); - if( !tqgeometry().contains( pos )) + if( !geometry().contains( pos )) { workspace()->closeTabBox(); // click outside closes tab return; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/tools/decobenchmark/main.cpp v3.5.13-sru/kwin/tools/decobenchmark/main.cpp --- /tmp/stable//kdebase/kwin/tools/decobenchmark/main.cpp 2011-03-12 07:58:03.000000000 +0100 +++ v3.5.13-sru/kwin/tools/decobenchmark/main.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -40,7 +40,7 @@ static KCmdLineOptions options[] = { { "+decoration", "Decoration library to use, such as kwin3_plastik.", 0 }, - { "+tests", "Which test should be executed ('all', 'tqrepaint', 'caption', 'resize', 'recreation')", 0 }, + { "+tests", "Which test should be executed ('all', 'repaint', 'caption', 'resize', 'recreation')", 0 }, { "+repetitions", "Number of test repetitions.", 0 }, { 0, 0, 0 } }; @@ -117,7 +117,7 @@ Tests test; if (t == "all") test = AllTests; - else if (t == "tqrepaint") + else if (t == "repaint") test = RepaintTest; else if (t == "caption") test = CaptionTest; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/tools/decobenchmark/preview.cpp v3.5.13-sru/kwin/tools/decobenchmark/preview.cpp --- /tmp/stable//kdebase/kwin/tools/decobenchmark/preview.cpp 2011-07-08 00:00:31.000000000 +0200 +++ v3.5.13-sru/kwin/tools/decobenchmark/preview.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -66,7 +66,7 @@ deco->captionChange(); positionPreviews(0); for (int i = 0; i < n; ++i) { - deco->widget()->tqrepaint(); + deco->widget()->repaint(); kapp->processEvents(); } } @@ -79,7 +79,7 @@ for (int i = 0; i < n; ++i) { bridge->setCaption(caption.arg(i) ); deco->captionChange(); - deco->widget()->tqrepaint(); + deco->widget()->repaint(); kapp->processEvents(); } } @@ -127,7 +127,7 @@ if ( !deco ) return; - TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->tqminimumSize()*/; + TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->minimumSize()*/; TQRect geometry(TQPoint(10, 10), size); deco->widget()->setGeometry(geometry); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/useractions.cpp v3.5.13-sru/kwin/useractions.cpp --- /tmp/stable//kdebase/kwin/useractions.cpp 2011-09-16 04:01:45.000000000 +0200 +++ v3.5.13-sru/kwin/useractions.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -293,7 +293,7 @@ client_keys_client = c; connect( client_keys_dialog, TQT_SIGNAL( dialogDone( bool )), TQT_SLOT( setupWindowShortcutDone( bool ))); TQRect r = clientArea( ScreenArea, c ); - TQSize size = client_keys_dialog->tqsizeHint(); + TQSize size = client_keys_dialog->sizeHint(); TQPoint pos = c->pos() + c->clientPos(); if( pos.x() + size.width() >= r.right()) pos.setX( r.right() - size.width()); @@ -1045,8 +1045,8 @@ else { TQRect area = clientArea(ScreenArea, TQPoint(x, y), currentDesktop()); - clientPopupAboutToShow(); // needed for tqsizeHint() to be correct :-/ - int popupHeight = p->tqsizeHint().height(); + clientPopupAboutToShow(); // needed for sizeHint() to be correct :-/ + int popupHeight = p->sizeHint().height(); if (y + popupHeight < area.height()) p->exec( TQPoint( x, y ) ); else diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/utils.cpp v3.5.13-sru/kwin/utils.cpp --- /tmp/stable//kdebase/kwin/utils.cpp 2011-08-16 01:07:51.000000000 +0200 +++ v3.5.13-sru/kwin/utils.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -18,6 +18,8 @@ #include "utils.h" #include +#include +#include #ifndef KCMRULES @@ -46,11 +48,11 @@ // used to store the return values of // XShapeQueryExtension. -// Necessary since tqshaped window are an extension to X -int Shape::kwin_tqshape_version = 0; -int Shape::kwin_tqshape_event = 0; +// Necessary since shaped window are an extension to X +int Shape::kwin_shape_version = 0; +int Shape::kwin_shape_event = 0; -// does the window w need a tqshape combine mask around it? +// does the window w need a shape combine mask around it? bool Shape::hasShape( WId w) { int xws, yws, xbs, ybs; @@ -64,21 +66,21 @@ return boundingShaped != 0; } -int Shape::tqshapeEvent() +int Shape::shapeEvent() { - return kwin_tqshape_event; + return kwin_shape_event; } void Shape::init() { - kwin_tqshape_version = 0; + kwin_shape_version = 0; int dummy; - if( !XShapeQueryExtension(qt_xdisplay(), &kwin_tqshape_event, &dummy)) + if( !XShapeQueryExtension(qt_xdisplay(), &kwin_shape_event, &dummy)) return; int major, minor; if( !XShapeQueryVersion( qt_xdisplay(), &major, &minor )) return; - kwin_tqshape_version = major * 0x10 + minor; + kwin_shape_version = major * 0x10 + minor; } void Motif::readFlags( WId w, bool& noborder, bool& resize, bool& move, @@ -323,6 +325,27 @@ if( host == hostnamebuf ) return true; } + else + { // e.g. LibreOffice likes to give FQDN, even if gethostname() doesn't include domain + struct addrinfo hints, *res, *addr; + bool is_local = false; + + memset (&hints, 0, sizeof (hints)); + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags |= AI_CANONNAME; + + if( getaddrinfo( host, NULL, &hints, &res ) != 0) + return false; + for(addr = res; !is_local && addr; addr = addr->ai_next) + { + if( res->ai_canonname && + host == TQCString( res->ai_canonname )) + is_local = true; + } + freeaddrinfo(res); + return is_local; + } } return false; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/utils.h v3.5.13-sru/kwin/utils.h --- /tmp/stable//kdebase/kwin/utils.h 2011-03-12 07:58:06.000000000 +0100 +++ v3.5.13-sru/kwin/utils.h 2012-09-08 19:41:29.000000000 +0200 @@ -111,14 +111,14 @@ class Shape { public: - static bool available() { return kwin_tqshape_version > 0; } - static int version() { return kwin_tqshape_version; } // as 16*major+minor, i.e. two hex digits + static bool available() { return kwin_shape_version > 0; } + static int version() { return kwin_shape_version; } // as 16*major+minor, i.e. two hex digits static bool hasShape( WId w); - static int tqshapeEvent(); + static int shapeEvent(); static void init(); private: - static int kwin_tqshape_version; - static int kwin_tqshape_event; + static int kwin_shape_version; + static int kwin_shape_event; }; // compile with XShape older than 1.0 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kwin/wm-spec/x351.html v3.5.13-sru/kwin/wm-spec/x351.html --- /tmp/stable//kdebase/kwin/wm-spec/x351.html 2011-03-12 07:58:05.000000000 +0100 +++ v3.5.13-sru/kwin/wm-spec/x351.html 2012-09-08 19:41:29.000000000 +0200 @@ -97,10 +97,10 @@ >

    This spec suggests implementing the file manager desktop by mapping a -desktop-sized window (no tqshape) to all desktops, with +desktop-sized window (no shape) to all desktops, with _NET_WM_WINDOW_TYPE_DESKTOP. This makes the desktop focusable and greatly simplifies implementation of the file manager. It is also faster than -managing lots of small tqshaped windows. The file manager draws the background +managing lots of small shaped windows. The file manager draws the background on this window. There should be a root property with a window handle for use in applications that want to draw the background (xearth).

    release(); lostTopMenuSelection(); } - topmenu_height = 0; // tqinvalidate used menu height + topmenu_height = 0; // invalidate used menu height if( managingTopMenus()) { updateTopMenuGeometry(); @@ -1938,7 +1938,7 @@ int count, order; XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), active_client->frameId(), ShapeBounding, &count, &order); - //The ShapeBounding region is the outermost tqshape of the window; + //The ShapeBounding region is the outermost shape of the window; //ShapeBounding - ShapeClipping is defined to be the border. //Since the border area is part of the window, we use bounding // to limit our work region @@ -1956,7 +1956,7 @@ //Get the masked away area. TQRegion maskedAway = bbox - contents; - TQMemArray maskedAwayRects = maskedAway.tqrects(); + TQMemArray maskedAwayRects = maskedAway.rects(); //Construct a bitmap mask from the rectangles TQBitmap mask( snapshot.width(), snapshot.height()); @@ -1969,7 +1969,7 @@ } } - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setPixmap( snapshot ); } else @@ -1982,7 +1982,7 @@ void Workspace::slotGrabDesktop() { TQPixmap p = TQPixmap::grabWindow( qt_xrootwin() ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setPixmap( p ); } @@ -2606,7 +2606,7 @@ { // simply create a dummy menubar and use its preffered height as the menu height KMenuBar tmpmenu; tmpmenu.insertItem( "dummy" ); - topmenu_height = tmpmenu.tqsizeHint().height(); + topmenu_height = tmpmenu.sizeHint().height(); } return topmenu_height; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kxkb/CMakeLists.txt v3.5.13-sru/kxkb/CMakeLists.txt --- /tmp/stable//kdebase/kxkb/CMakeLists.txt 2011-03-12 07:58:02.000000000 +0100 +++ v3.5.13-sru/kxkb/CMakeLists.txt 2012-09-08 19:41:29.000000000 +0200 @@ -22,6 +22,7 @@ link_directories( ${TQT_LIBRARY_DIRS} + ${XTEST_LIBDIR} ) @@ -39,7 +40,7 @@ extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp pixmap.cpp kcmlayout.cpp kcmlayoutwidget.ui kcmmisc.cpp kcmmiscwidget.ui - LINK kio-shared xkbfile + LINK kio-shared xkbfile ${XTEST_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kxkb/kcmlayoutwidget.ui v3.5.13-sru/kxkb/kcmlayoutwidget.ui --- /tmp/stable//kdebase/kxkb/kcmlayoutwidget.ui 2011-03-12 07:58:02.000000000 +0100 +++ v3.5.13-sru/kxkb/kcmlayoutwidget.ui 2012-09-08 19:41:29.000000000 +0200 @@ -20,7 +20,7 @@ 0 - + 600 510 @@ -34,7 +34,7 @@ tabWidget - + 600 500 @@ -303,7 +303,7 @@ listLayoutsSrc - + 260 0 @@ -393,7 +393,7 @@ Expanding - + 210 20 @@ -410,7 +410,7 @@ Expanding - + 210 20 @@ -442,7 +442,7 @@ Expanding - + 20 40 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/kxkb/kcmmisc.cpp v3.5.13-sru/kxkb/kcmmisc.cpp --- /tmp/stable//kdebase/kxkb/kcmmisc.cpp 2011-10-27 17:55:41.000000000 +0200 +++ v3.5.13-sru/kxkb/kcmmisc.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -235,7 +235,7 @@ NumLockX - $Id: kcmmisc.cpp 1261045 2011-10-27 15:39:53Z tpearson $ + $Id$ Copyright (C) 2000-2001 Lubos Lunak Copyright (C) 2001 Oswald Buddenhagen @@ -344,6 +344,21 @@ return 1; } +int xkb_state() + { + unsigned int mask; + unsigned int numlockState; + XkbStateRec xkbState; + if( !xkb_init()) + return 0; + mask = xkb_numlock_mask(); + if( mask == 0 ) + return 0; + XkbGetState( dpy, XkbUseCoreKbd, &xkbState); + numlockState = xkbState.locked_mods & mask; + return numlockState; + } + int xkb_toggle() { unsigned int mask; @@ -443,7 +458,14 @@ return; #endif #ifdef HAVE_XTEST +#ifdef HAVE_XKB + if (xkb_state()) + xtest_set_on(); + else + xtest_set_off(); +#else // HAVE_XKB xtest_toggle(); +#endif // HAVE_XKB #endif } // This code is taken from xset utility from XFree 4.3 (http://www.xfree86.org/) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/knewmenu.cc v3.5.13-sru/libkonq/knewmenu.cc --- /tmp/stable//kdebase/libkonq/knewmenu.cc 2011-08-11 07:25:41.000000000 +0200 +++ v3.5.13-sru/libkonq/knewmenu.cc 2012-09-08 19:41:29.000000000 +0200 @@ -233,7 +233,7 @@ if ( !bSkip ) { - Entry entry = *(s_templatesList->tqat( i-1 )); + Entry entry = *(s_templatesList->at( i-1 )); // The best way to identify the "Create Directory", "Link to Location", "Link to Application" was the template if ( (*templ).templatePath.endsWith( "emptydir" ) ) @@ -378,7 +378,7 @@ emit activated(); // for KDIconView::slotNewMenuActivated() - Entry entry = *(s_templatesList->tqat( id - 1 )); + Entry entry = *(s_templatesList->at( id - 1 )); //kdDebug(1203) << TQString("sFile = %1").arg(sFile) << endl; if ( !TQFile::exists( entry.templatePath ) ) { @@ -545,7 +545,7 @@ TQLabel * label = new TQLabel( textFileName, fileNameBox ); m_leFileName = new KLineEdit( fileNameBox, 0L ); - m_leFileName->setMinimumWidth(m_leFileName->tqsizeHint().width() * 3); + m_leFileName->setMinimumWidth(m_leFileName->sizeHint().width() * 3); label->setBuddy(m_leFileName); // please "scheck" style m_leFileName->setText( defaultName ); m_leFileName->setSelection(0, m_leFileName->text().length()); // autoselect @@ -559,7 +559,7 @@ m_urlRequester = new KURLRequester( defaultUrl, urlBox, "urlRequester" ); m_urlRequester->setMode( KFile::File | KFile::Directory ); - m_urlRequester->setMinimumWidth( m_urlRequester->tqsizeHint().width() * 3 ); + m_urlRequester->setMinimumWidth( m_urlRequester->sizeHint().width() * 3 ); connect( m_urlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotURLTextChanged(const TQString&)) ); label->setBuddy(m_urlRequester); // please "scheck" style diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_bgnddlg.cc v3.5.13-sru/libkonq/konq_bgnddlg.cc --- /tmp/stable//kdebase/libkonq/konq_bgnddlg.cc 2011-03-12 07:58:01.000000000 +0100 +++ v3.5.13-sru/libkonq/konq_bgnddlg.cc 2012-09-08 19:41:29.000000000 +0200 @@ -48,10 +48,10 @@ m_buttonGroup = new TQButtonGroup( i18n("Background"), page ); m_buttonGroup->setColumnLayout( 0, Qt::Vertical ); - m_buttonGroup->tqlayout()->setMargin( KDialog::marginHint() ); - m_buttonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); - TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->tqlayout() ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + m_buttonGroup->layout()->setMargin( KDialog::marginHint() ); + m_buttonGroup->layout()->setSpacing( KDialog::spacingHint() ); + TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->layout() ); + groupLayout->setAlignment( Qt::AlignTop ); mainLayout->addWidget( m_buttonGroup ); connect( m_buttonGroup, TQT_SIGNAL( clicked(int) ), @@ -61,7 +61,7 @@ m_radioColor = new TQRadioButton( i18n("Co&lor:"), m_buttonGroup ); groupLayout->addWidget( m_radioColor, 0, 0 ); m_buttonColor = new KColorButton( theColor, defaultColor, m_buttonGroup ); - m_buttonColor->tqsetSizePolicy( TQSizePolicy::Preferred, + m_buttonColor->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ); groupLayout->addWidget( m_buttonColor, 0, 1 ); @@ -90,14 +90,14 @@ TQLabel* lbl = new TQLabel( i18n("Preview"), page ); hlay->addWidget( lbl ); TQFrame* frame = new TQFrame( page ); - frame->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + frame->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); frame->setFrameShape( TQFrame::HLine ); frame->setFrameShadow( TQFrame::Sunken ); hlay->addWidget( frame ); // preview frame m_preview = new TQFrame( page ); - m_preview->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + m_preview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); m_preview->setMinimumSize( 370, 180 ); m_preview->setFrameShape( TQFrame::Panel ); m_preview->setFrameShadow( TQFrame::Raised ); @@ -142,7 +142,7 @@ TQStringList::ConstIterator it; for ( it = list.begin(); it != list.end(); it++ ) m_comboPicture->comboBox()->insertItem( - ( (*it).tqat(0) == '/' ) ? // if absolute path + ( (*it).at(0) == '/' ) ? // if absolute path KURL( *it ).fileName() : // then only fileName *it ); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konqbookmarkmanager.h v3.5.13-sru/libkonq/konqbookmarkmanager.h --- /tmp/stable//kdebase/libkonq/konqbookmarkmanager.h 2011-03-12 07:58:01.000000000 +0100 +++ v3.5.13-sru/libkonq/konqbookmarkmanager.h 2012-09-08 19:41:29.000000000 +0200 @@ -11,7 +11,7 @@ static KBookmarkManager * self() { if ( !s_bookmarkManager ) { - TQString bookmarksFile = locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml")); + TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile ); } return s_bookmarkManager; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_dirpart.cc v3.5.13-sru/libkonq/konq_dirpart.cc --- /tmp/stable//kdebase/libkonq/konq_dirpart.cc 2011-07-08 00:00:31.000000000 +0200 +++ v3.5.13-sru/libkonq/konq_dirpart.cc 2012-09-08 19:41:29.000000000 +0200 @@ -133,7 +133,7 @@ resetCount(); //m_bMultipleItemsSelected = false; - connect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); + connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); actionCollection()->setHighlightingEnabled( true ); @@ -301,7 +301,7 @@ m_pProps->setBgPixmapFile( dlg->pixmapFile() ); } m_pProps->applyColors( scrollWidget()->viewport() ); - scrollWidget()->viewport()->tqrepaint(); + scrollWidget()->viewport()->repaint(); } delete dlg; @@ -418,7 +418,7 @@ // This is very related to KDIconView::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 ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_drag.cc v3.5.13-sru/libkonq/konq_drag.cc --- /tmp/stable//kdebase/libkonq/konq_drag.cc 2011-03-12 07:58:01.000000000 +0100 +++ v3.5.13-sru/libkonq/konq_drag.cc 2012-09-08 19:41:29.000000000 +0200 @@ -47,12 +47,12 @@ else return 0; } -TQByteArray KonqIconDrag::tqencodedData( const char* mime ) const +TQByteArray KonqIconDrag::encodedData( const char* mime ) const { TQByteArray a; TQCString mimetype( mime ); if ( mimetype == "application/x-qiconlist" ) - a = TQIconDrag::tqencodedData( mime ); + a = TQIconDrag::encodedData( mime ); else if ( mimetype == "text/uri-list" ) { TQCString s = urls.join( "\r\n" ).latin1(); if( urls.count() > 0 ) @@ -145,7 +145,7 @@ return KonqIconDrag::format( i ); } -TQByteArray KonqIconDrag2::tqencodedData( const char* mime ) const +TQByteArray KonqIconDrag2::encodedData( const char* mime ) const { TQCString mimetype( mime ); if ( mimetype == "application/x-kde-urilist" ) @@ -164,7 +164,7 @@ a[c] = 0; return a; } - return KonqIconDrag::tqencodedData( mime ); + return KonqIconDrag::encodedData( mime ); } // @@ -223,7 +223,7 @@ else return 0; } -TQByteArray KonqDrag::tqencodedData( const char* mime ) const +TQByteArray KonqDrag::encodedData( const char* mime ) const { TQByteArray a; TQCString mimetype( mime ); @@ -243,7 +243,7 @@ } else if ( mimetype == "application/x-kde-urilist" ) { - return TQUriDrag::tqencodedData( "text/uri-list" ); + return TQUriDrag::encodedData( "text/uri-list" ); } else if ( mimetype == "application/x-kde-cutselection" ) { @@ -271,13 +271,13 @@ bool KonqDrag::decodeIsCutSelection( const TQMimeSource *e ) { - TQByteArray a = e->tqencodedData( "application/x-kde-cutselection" ); + TQByteArray a = e->encodedData( "application/x-kde-cutselection" ); if ( a.isEmpty() ) return false; else { kdDebug(1203) << "KonqDrag::decodeIsCutSelection : a=" << TQCString(a.data(), a.size() + 1) << endl; - return (a.tqat(0) == '1'); // true if 1 + return (a.at(0) == '1'); // true if 1 } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_drag.h v3.5.13-sru/libkonq/konq_drag.h --- /tmp/stable//kdebase/libkonq/konq_drag.h 2011-03-12 07:58:01.000000000 +0100 +++ v3.5.13-sru/libkonq/konq_drag.h 2012-09-08 19:41:29.000000000 +0200 @@ -44,7 +44,7 @@ virtual ~KonqIconDrag() {} const char* format( int i ) const; - TQByteArray tqencodedData( const char* mime ) const; + TQByteArray encodedData( const char* mime ) const; void append( const TQIconDragItem &item, const TQRect &pr, const TQRect &tr, const TQString &url ); @@ -72,7 +72,7 @@ virtual ~KonqIconDrag2() {} virtual const char* format( int i ) const; - virtual TQByteArray tqencodedData( const char* mime ) const; + virtual TQByteArray encodedData( const char* mime ) const; void append( const TQIconDragItem &item, const TQRect &pr, const TQRect &tr, const TQString &url, const KURL &mostLocalURL ); @@ -107,7 +107,7 @@ virtual ~KonqDrag() {} virtual const char* format( int i ) const; - virtual TQByteArray tqencodedData( const char* mime ) const; + virtual TQByteArray encodedData( const char* mime ) const; void setMoveSelection( bool move ) { m_bCutSelection = move; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_filetip.cc v3.5.13-sru/libkonq/konq_filetip.cc --- /tmp/stable//kdebase/libkonq/konq_filetip.cc 2011-03-12 07:58:01.000000000 +0100 +++ v3.5.13-sru/libkonq/konq_filetip.cc 2012-09-08 19:41:29.000000000 +0200 @@ -49,7 +49,7 @@ { m_iconLabel = new TQLabel(this); m_textLabel = new TQLabel(this); - m_textLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignTop); + m_textLabel->setAlignment(TQt::AlignAuto | TQt::AlignTop); TQGridLayout* layout = new TQGridLayout(this, 1, 2, 8, 0); layout->addWidget(m_iconLabel, 0, 0); @@ -189,7 +189,7 @@ } if ( m_corners[m_corner].isNull()) - m_corners[m_corner].load( locate( "data", TQString::tqfromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) ); + m_corners[m_corner].load( locate( "data", TQString::fromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) ); TQPixmap &pix = m_corners[m_corner]; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_historymgr.cc v3.5.13-sru/libkonq/konq_historymgr.cc --- /tmp/stable//kdebase/libkonq/konq_historymgr.cc 2011-08-11 07:25:41.000000000 +0200 +++ v3.5.13-sru/libkonq/konq_historymgr.cc 2012-09-08 19:41:29.000000000 +0200 @@ -48,7 +48,7 @@ m_history.setAutoDelete( true ); m_filename = locateLocal( "data", - TQString::tqfromLatin1("konqueror/konq_history" )); + TQString::fromLatin1("konqueror/konq_history" )); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); @@ -295,7 +295,7 @@ // konqueror's window caption). if ( !pending && u != title ) entry.title = title; - entry.firstVisited = TQDateTime::tqcurrentDateTime(); + entry.firstVisited = TQDateTime::currentDateTime(); entry.lastVisited = entry.firstVisited; // always remove from pending if available, otherwise the else branch leaks @@ -342,7 +342,7 @@ // Local URL -> add to history KonqHistoryEntry entry; entry.url = u; - entry.firstVisited = TQDateTime::tqcurrentDateTime(); + entry.firstVisited = TQDateTime::currentDateTime(); entry.lastVisited = entry.firstVisited; emitAddToHistory( entry ); } @@ -589,7 +589,7 @@ // compatibility fallback, try to load the old completion history bool KonqHistoryManager::loadFallback() { - TQString file = locateLocal( "config", TQString::tqfromLatin1("konq_history")); + TQString file = locateLocal( "config", TQString::fromLatin1("konq_history")); if ( file.isEmpty() ) return false; @@ -646,7 +646,7 @@ entry->url = u; entry->numberOfTimesVisited = weight; // to make it not expire immediately... - entry->lastVisited = TQDateTime::tqcurrentDateTime(); + entry->lastVisited = TQDateTime::currentDateTime(); } return entry; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_historymgr.h v3.5.13-sru/libkonq/konq_historymgr.h --- /tmp/stable//kdebase/libkonq/konq_historymgr.h 2011-03-12 07:58:01.000000000 +0100 +++ v3.5.13-sru/libkonq/konq_historymgr.h 2012-09-08 19:41:29.000000000 +0200 @@ -327,7 +327,7 @@ private slots: /** * Called by the updateTimer to emit the KParts::HistoryProvider::updated() - * signal so that khtml can tqrepaint the updated links. + * signal so that khtml can repaint the updated links. */ void slotEmitUpdated(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_iconviewwidget.cc v3.5.13-sru/libkonq/konq_iconviewwidget.cc --- /tmp/stable//kdebase/libkonq/konq_iconviewwidget.cc 2011-08-11 07:25:41.000000000 +0200 +++ v3.5.13-sru/libkonq/konq_iconviewwidget.cc 2012-09-08 19:41:29.000000000 +0200 @@ -151,7 +151,7 @@ m_LineupMode = LineupBoth; // emit our signals slotSelectionChanged(); - m_iconPositionGroupPrefix = TQString::tqfromLatin1( "IconPosition::" ); + m_iconPositionGroupPrefix = TQString::fromLatin1( "IconPosition::" ); KonqUndoManager::incRef(); } @@ -308,7 +308,7 @@ if (!hasPixmap && backgroundMode() != NoBackground) d->m_movie->setBackgroundColor( viewport()->backgroundColor() ); d->m_movie->connectUpdate( this, TQT_SLOT( slotMovieUpdate(const TQRect &) ) ); - d->m_movie->connectqStatus( TQT_TQOBJECT(this), TQT_SLOT( slotMovieStatus(int) ) ); + d->m_movie->connectStatus( TQT_TQOBJECT(this), TQT_SLOT( slotMovieStatus(int) ) ); d->movieFileName = d->pActiveItem->mouseOverAnimation(); d->pActiveItem->setAnimated( true ); } @@ -331,7 +331,7 @@ else // No change in current item { // No effect. If we want to underline on hover, we should - // force the IVI to tqrepaint here, though! + // force the IVI to repaint here, though! d->pActiveItem = 0L; d->pFileTip->setItem( 0L ); } @@ -349,7 +349,7 @@ d->pSoundPlayer->mimeTypes().contains( item->item()->mimetype()) && KGlobalSettings::showFilePreview(item->item()->url()) - && tqtopLevelWidget() == kapp->activeWindow()) + && topLevelWidget() == kapp->activeWindow()) { d->pSoundItem = item; d->bSoundItemClicked = false; @@ -650,10 +650,10 @@ // Disable repaints that can be triggered by ivi->setIcon(). Since icons are // resized in-place, if the icon size is increasing it can happens that the right - // or bottom icons exceed the size of the viewport.. here we prevent the tqrepaint + // or bottom icons exceed the size of the viewport.. here we prevent the repaint // event that will be triggered in that case. bool prevUpdatesState = viewport()->isUpdatesEnabled(); - viewport()->tqsetUpdatesEnabled( false ); + viewport()->setUpdatesEnabled( false ); // Do this even if size didn't change, since this is used by refreshMimeTypes... for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) { @@ -673,11 +673,11 @@ } // Restore viewport update to previous state - viewport()->tqsetUpdatesEnabled( prevUpdatesState ); + viewport()->setUpdatesEnabled( prevUpdatesState ); if ( ( sizeChanged || previewSizeChanged || oldGridX != gridX() || !stopImagePreviewFor.isEmpty() ) && autoArrange() ) - arrangeItemsInGrid( true ); // take new grid into account and tqrepaint + arrangeItemsInGrid( true ); // take new grid into account and repaint else viewport()->update(); //Repaint later.. } @@ -995,7 +995,7 @@ { if ( e->provides( "text/uri-list" ) ) { - TQByteArray payload = e->tqencodedData( "text/uri-list" ); + TQByteArray payload = e->encodedData( "text/uri-list" ); if ( !payload.size() ) kdError() << "Empty data !" << endl; // Cache the URLs, since we need them every time we move over a file @@ -1147,14 +1147,14 @@ kdDebug(1203) << " -- KonqIconViewWidget::cutSelection() -- " << endl; KonqIconDrag * obj = konqDragObject( /* no parent ! */ ); obj->setMoveSelection( true ); - TQApplication::tqclipboard()->setData( obj ); + TQApplication::clipboard()->setData( obj ); } void KonqIconViewWidget::copySelection() { kdDebug(1203) << " -- KonqIconViewWidget::copySelection() -- " << endl; KonqIconDrag * obj = konqDragObject( /* no parent ! */ ); - TQApplication::tqclipboard()->setData( obj ); + TQApplication::clipboard()->setData( obj ); } void KonqIconViewWidget::pasteSelection() @@ -1221,7 +1221,7 @@ // The following call is SO expensive (the ::widgetAt call eats up to 80% // of the mouse move cpucycles!), so it's mandatory to place that function // under strict checks, such as d->pSoundPlayer->isPlaying() - if ( TQApplication::widgetAt( TQCursor::pos() ) != tqtopLevelWidget() ) + if ( TQApplication::widgetAt( TQCursor::pos() ) != topLevelWidget() ) { if (d->pSoundPlayer) d->pSoundPlayer->stop(); @@ -1249,7 +1249,7 @@ if ( !i && (ev->action() == TQDropEvent::Copy || ev->action() == TQDropEvent::Link) && ev->source() && ev->source() == viewport()) { - // First we need to call TQIconView though, to clear the drag tqshape + // First we need to call TQIconView though, to clear the drag shape bool bMovable = itemsMovable(); setItemsMovable(false); // hack ? call it what you want :-) KIconView::contentsDropEvent( ev ); @@ -1488,7 +1488,7 @@ y = QMAX(y, i->y() + i->height()); } - TQMemArray rects = r.tqrects(); + TQMemArray rects = r.rects(); TQMemArray::Iterator it = rects.begin(); bool foundPlace = FALSE; for (; it != rects.end(); ++it) @@ -1730,12 +1730,12 @@ } } - // tqrepaint + // repaint if ( newItemWidth ) updateContents(); else { // Repaint only repaintRegion... - TQMemArray rects = repaintRegion.tqrects(); + TQMemArray rects = repaintRegion.rects(); for ( uint l = 0; l < rects.count(); l++ ) { kdDebug( 1203 ) << "Repainting (" << rects[l].x() << "," << rects[l].y() << ")\n"; @@ -1794,7 +1794,7 @@ } // Repaint only repaintRegion... - TQMemArray rects = repaintRegion.tqrects(); + TQMemArray rects = repaintRegion.rects(); for ( uint l = 0; l < rects.count(); l++ ) { kdDebug( 1203 ) << "Repainting (" << rects[l].x() << "," << rects[l].y() << ")\n"; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_operations.cc v3.5.13-sru/libkonq/konq_operations.cc --- /tmp/stable//kdebase/libkonq/konq_operations.cc 2011-07-09 08:16:54.000000000 +0200 +++ v3.5.13-sru/libkonq/konq_operations.cc 2012-09-08 19:41:29.000000000 +0200 @@ -76,7 +76,7 @@ void KonqOperations::editMimeType( const TQString & mimeType ) { - TQString keditfiletype = TQString::tqfromLatin1("keditfiletype"); + TQString keditfiletype = TQString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype + " " + KProcess::quote(mimeType), keditfiletype, keditfiletype /*unused*/); } @@ -124,7 +124,7 @@ { // move or not move ? bool move = false; - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); if ( data->provides( "application/x-kde-cutselection" ) ) { move = KonqDrag::decodeIsCutSelection( data ); kdDebug(1203) << "move (from clipboard data) = " << move << endl; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_pixmapprovider.cc v3.5.13-sru/libkonq/konq_pixmapprovider.cc --- /tmp/stable//kdebase/libkonq/konq_pixmapprovider.cc 2011-08-11 07:25:41.000000000 +0200 +++ v3.5.13-sru/libkonq/konq_pixmapprovider.cc 2012-09-08 19:41:29.000000000 +0200 @@ -70,9 +70,9 @@ else { KURL u; - if ( url.tqat(0) == '~' ) + if ( url.at(0) == '~' ) u.setPath( KShell::tildeExpand( url ) ); - else if ( url.tqat(0) == '/' ) + else if ( url.at(0) == '/' ) u.setPath( url ); else u = url; @@ -166,7 +166,7 @@ return SmallIcon( icon, size ); KURL u; - if ( url.tqat(0) == '/' ) + if ( url.at(0) == '/' ) u.setPath( url ); else u = url; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_popupmenu.cc v3.5.13-sru/libkonq/konq_popupmenu.cc --- /tmp/stable//kdebase/libkonq/konq_popupmenu.cc 2011-08-11 07:25:41.000000000 +0200 +++ v3.5.13-sru/libkonq/konq_popupmenu.cc 2012-09-08 19:41:29.000000000 +0200 @@ -291,7 +291,7 @@ act->setIconSet( pix ); } - tqaddAction( act, menu ); // Add to toplevel menu + addAction( act, menu ); // Add to toplevel menu m_mapPopupServices[ id++ ] = *it; ++count; @@ -355,7 +355,7 @@ m_pluginList.setAutoDelete( true ); m_ownActions.setHighlightingEnabled( true ); - attrName = TQString::tqfromLatin1( "name" ); + attrName = TQString::fromLatin1( "name" ); prepareXMLGUIStuff(); m_builder = new KonqPopupMenuGUIBuilder( this ); @@ -497,7 +497,7 @@ m_pMenuNew->slotCheckUpToDate(); m_pMenuNew->setPopupFiles( m_lstPopupURLs ); - tqaddAction( m_pMenuNew ); + addAction( m_pMenuNew ); addSeparator(); } @@ -506,31 +506,31 @@ if (d->m_itemFlags & KParts::BrowserExtension::ShowCreateDirectory) { KAction *actNewDir = new KAction( i18n( "Create &Folder..." ), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" ); - tqaddAction( actNewDir ); + addAction( actNewDir ); addSeparator(); } } } else if ( isIntoTrash ) { // Trashed item, offer restoring act = new KAction( i18n( "&Restore" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" ); - tqaddAction( act ); + addAction( act ); } if (d->m_itemFlags & KParts::BrowserExtension::ShowNavigationItems) { if (d->m_itemFlags & KParts::BrowserExtension::ShowUp) - tqaddAction( "up" ); - tqaddAction( "back" ); - tqaddAction( "forward" ); + addAction( "up" ); + addAction( "back" ); + addAction( "forward" ); if (d->m_itemFlags & KParts::BrowserExtension::ShowReload) - tqaddAction( "reload" ); + addAction( "reload" ); addSeparator(); } // "open in new window" is either provided by us, or by the tabhandling group if (actNewWindow) { - tqaddAction( actNewWindow ); + addAction( actNewWindow ); addSeparator(); } addGroup( "tabhandling" ); // includes a separator @@ -539,21 +539,21 @@ { if ( !currentDir && sReading ) { if ( sDeleting ) { - tqaddAction( "cut" ); + addAction( "cut" ); } - tqaddAction( "copy" ); + addAction( "copy" ); } if ( S_ISDIR(mode) && sWriting ) { if ( currentDir ) - tqaddAction( "paste" ); + addAction( "paste" ); else - tqaddAction( "pasteto" ); + addAction( "pasteto" ); } if ( !currentDir ) { if ( m_lstItems.count() == 1 && sMoving ) - tqaddAction( "rename" ); + addAction( "rename" ); bool addTrash = false; bool addDel = false; @@ -576,9 +576,9 @@ } if ( addTrash ) - tqaddAction( "trash" ); + addAction( "trash" ); if ( addDel ) - tqaddAction( "del" ); + addAction( "del" ); } } if ( isCurrentTrash ) @@ -587,7 +587,7 @@ KSimpleConfig trashConfig( "trashrc", true ); trashConfig.setGroup( "Status" ); act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) ); - tqaddAction( act ); + addAction( act ); } addGroup( "editactions" ); @@ -620,7 +620,7 @@ if (m_lstItems.count() > 1) act->setEnabled(false); if (kapp->authorizeKAction("bookmarks")) - tqaddAction( act ); + addAction( act ); if (bIsLink) addGroup( "linkactions" ); } @@ -903,7 +903,7 @@ act = new KAction( actionName, (*it)->pixmap( KIcon::Small ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ), &m_ownActions, nam.prepend( "appservice_" ) ); - tqaddAction( act, menu ); + addAction( act, menu ); m_mapPopup[ id++ ] = *it; } @@ -919,12 +919,12 @@ openWithActionName = i18n( "&Open With..." ); } KAction *openWithAct = new KAction( openWithActionName, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); - tqaddAction( openWithAct, menu ); + addAction( openWithAct, menu ); } else // no app offers -> Open With... { act = new KAction( i18n( "&Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); - tqaddAction( act ); + addAction( act ); } } @@ -979,7 +979,7 @@ { act = new KAction( i18n( "&Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupProperties() ), &m_ownActions, "properties" ); - tqaddAction( act ); + addAction( act ); } while ( !m_menuElement.lastChild().isNull() && @@ -993,7 +993,7 @@ addSeparator(); act = new KAction( i18n("Share"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenShareFileDialog() ), &m_ownActions, "sharefile" ); - tqaddAction( act ); + addAction( act ); } } @@ -1157,7 +1157,7 @@ //search for a plugin with the right protocol KTrader::OfferList plugin_offers; unsigned int pluginCount = 0; - plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::tqfromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes"); + plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes"); if ( plugin_offers.isEmpty() ) return; // no plugins installed do not bother about it @@ -1176,7 +1176,7 @@ if ( !plugin ) continue; // This make the kuick plugin insert its stuff above "Properties" - TQString pluginClientName = TQString::tqfromLatin1( "Plugin%1" ).arg( pluginCount ); + TQString pluginClientName = TQString::fromLatin1( "Plugin%1" ).arg( pluginCount ); addMerge( pluginClientName ); plugin->domDocument().documentElement().setAttribute( "name", pluginClientName ); m_pluginList.append( plugin ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_popupmenu.h v3.5.13-sru/libkonq/konq_popupmenu.h --- /tmp/stable//kdebase/libkonq/konq_popupmenu.h 2011-07-09 08:16:54.000000000 +0200 +++ v3.5.13-sru/libkonq/konq_popupmenu.h 2012-09-08 19:41:29.000000000 +0200 @@ -210,7 +210,7 @@ * Constructor * If you want to insert a dynamic item or menu to konqpopupmenu * this class is the right choice. - * Create a KAction and use _popup->tqaddAction(new KAction ); + * Create a KAction and use _popup->addAction(new KAction ); * If you want to create a submenu use _popup->addGroup( ); */ KonqPopupMenuPlugin( KonqPopupMenu *_popup, const char *name ); // this should also be the parent diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_propsview.cc v3.5.13-sru/libkonq/konq_propsview.cc --- /tmp/stable//kdebase/libkonq/konq_propsview.cc 2011-08-11 07:25:41.000000000 +0200 +++ v3.5.13-sru/libkonq/konq_propsview.cc 2012-09-08 19:41:29.000000000 +0200 @@ -474,7 +474,7 @@ const TQColor & KonqPropsView::bgColor( TQWidget * widget ) const { if ( !m_bgColor.isValid() ) - return widget->tqcolorGroup().base(); + return widget->colorGroup().base(); else return m_bgColor; } @@ -501,7 +501,7 @@ const TQColor & KonqPropsView::textColor( TQWidget * widget ) const { if ( !m_textColor.isValid() ) - return widget->tqcolorGroup().text(); + return widget->colorGroup().text(); else return m_textColor; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_propsview.h v3.5.13-sru/libkonq/konq_propsview.h --- /tmp/stable//kdebase/libkonq/konq_propsview.h 2011-08-11 07:25:41.000000000 +0200 +++ v3.5.13-sru/libkonq/konq_propsview.h 2012-09-08 19:41:29.000000000 +0200 @@ -133,7 +133,7 @@ TQString currentGroup() const { return isDefaultProperties() ? - TQString::tqfromLatin1("Settings") : TQString::tqfromLatin1("URL properties"); + TQString::fromLatin1("Settings") : TQString::fromLatin1("URL properties"); } private: diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_settings.cc v3.5.13-sru/libkonq/konq_settings.cc --- /tmp/stable//kdebase/libkonq/konq_settings.cc 2011-08-11 07:25:41.000000000 +0200 +++ v3.5.13-sru/libkonq/konq_settings.cc 2012-09-08 19:41:29.000000000 +0200 @@ -146,10 +146,10 @@ kdDebug(1203) << "KonqFMSettings::shouldEmbed : serviceTypeGroup=" << serviceTypeGroup << endl; if ( serviceTypeGroup == "inode" || serviceTypeGroup == "Browser" || serviceTypeGroup == "Konqueror" ) return true; //always embed mimetype inode/*, Browser/* and Konqueror/* - TQMap::ConstIterator it = m_embedMap.find( TQString::tqfromLatin1("embed-")+serviceTypeGroup ); + TQMap::ConstIterator it = m_embedMap.find( TQString::fromLatin1("embed-")+serviceTypeGroup ); if ( it != m_embedMap.end() ) { kdDebug(1203) << "KonqFMSettings::shouldEmbed: " << it.data() << endl; - return it.data() == TQString::tqfromLatin1("true"); + return it.data() == TQString::fromLatin1("true"); } // 3 - if no config found, use default. // Note: if you change those defaults, also change kcontrol/filetypes/typeslistitem.cpp ! diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_xmlguiclient.cc v3.5.13-sru/libkonq/konq_xmlguiclient.cc --- /tmp/stable//kdebase/libkonq/konq_xmlguiclient.cc 2011-03-12 07:58:01.000000000 +0100 +++ v3.5.13-sru/libkonq/konq_xmlguiclient.cc 2012-09-08 19:41:29.000000000 +0200 @@ -70,12 +70,12 @@ return m_doc; } -void KonqXMLGUIClient::tqaddAction( KAction *act, const TQDomElement &menu ) +void KonqXMLGUIClient::addAction( KAction *act, const TQDomElement &menu ) { - tqaddAction( act->name(), menu ); + addAction( act->name(), menu ); } -void KonqXMLGUIClient::tqaddAction( const char *name, const TQDomElement &menu ) +void KonqXMLGUIClient::addAction( const char *name, const TQDomElement &menu ) { static const TQString& tagAction = KGlobal::staticQString( "action" ); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/libkonq/konq_xmlguiclient.h v3.5.13-sru/libkonq/konq_xmlguiclient.h --- /tmp/stable//kdebase/libkonq/konq_xmlguiclient.h 2011-03-12 07:58:01.000000000 +0100 +++ v3.5.13-sru/libkonq/konq_xmlguiclient.h 2012-09-08 19:41:29.000000000 +0200 @@ -45,8 +45,8 @@ TQDomElement DomElement( ) const; // KDE4: s/D/d/ protected: - void tqaddAction( KAction *action, const TQDomElement &menu = TQDomElement() ); - void tqaddAction( const char *name, const TQDomElement &menu = TQDomElement() ); + void addAction( KAction *action, const TQDomElement &menu = TQDomElement() ); + void addAction( const char *name, const TQDomElement &menu = TQDomElement() ); void addSeparator( const TQDomElement &menu = TQDomElement() ); /// only add a separator if an action is added afterwards void addPendingSeparator(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/nsplugins/nspluginloader.cpp v3.5.13-sru/nsplugins/nspluginloader.cpp --- /tmp/stable//kdebase/nsplugins/nspluginloader.cpp 2011-08-11 07:25:38.000000000 +0200 +++ v3.5.13-sru/nsplugins/nspluginloader.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -130,7 +130,7 @@ setBackgroundMode(w == 0 ? TQWidget::PaletteBackground : TQWidget::NoBackground); if (w == 0) { // FIXME: Put a notice here to tell the user that it crashed. - tqrepaint(); + repaint(); } } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/nsplugins/plugin_part.cpp v3.5.13-sru/nsplugins/plugin_part.cpp --- /tmp/stable//kdebase/nsplugins/plugin_part.cpp 2011-08-11 07:25:38.000000000 +0200 +++ v3.5.13-sru/nsplugins/plugin_part.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -307,7 +307,7 @@ _widget = inst; } else { TQLabel *label = new TQLabel( i18n("Unable to load Netscape plugin for %1").arg(url.url()), _canvas ); - label->tqsetAlignment( AlignCenter | WordBreak ); + label->setAlignment( AlignCenter | WordBreak ); _widget = label; } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/nsplugins/pluginscan.cpp v3.5.13-sru/nsplugins/pluginscan.cpp --- /tmp/stable//kdebase/nsplugins/pluginscan.cpp 2011-08-11 07:25:38.000000000 +0200 +++ v3.5.13-sru/nsplugins/pluginscan.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -251,14 +251,14 @@ NPError err = func_GetValue( 0, NPPVpluginNameString, (void*)&buf ); if ( err==NPERR_NO_ERROR ) - name = TQString::tqfromLatin1( buf ); + name = TQString::fromLatin1( buf ); kdDebug() << "name = " << name << endl; // get name NPError nperr = func_GetValue( 0, NPPVpluginDescriptionString, (void*)&buf ); if ( nperr==NPERR_NO_ERROR ) - description = TQString::tqfromLatin1( buf ); + description = TQString::fromLatin1( buf ); kdDebug() << "description = " << description << endl; } else @@ -346,7 +346,7 @@ // open the library and ask for the mimetype kdDebug(1433) << " - opening " << absFile << endl; - cache.tqdevice()->flush(); + cache.device()->flush(); // fork, so that a crash in the plugin won't stop the scanning of other plugins int pipes[2]; if (pipe(pipes) != 0) continue; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/nsplugins/sdk/jni.h v3.5.13-sru/nsplugins/sdk/jni.h --- /tmp/stable//kdebase/nsplugins/sdk/jni.h 2011-03-12 07:57:57.000000000 +0100 +++ v3.5.13-sru/nsplugins/sdk/jni.h 2012-09-08 19:41:29.000000000 +0200 @@ -580,7 +580,7 @@ (JNIEnv *env, jclass clazz, jfieldID fieldID, jdouble value); jstring (JNICALL *NewString) - (JNIEnv *env, const jchar *tqunicode, jsize len); + (JNIEnv *env, const jchar *unicode, jsize len); jsize (JNICALL *GetStringLength) (JNIEnv *env, jstring str); const jchar *(JNICALL *GetStringChars) @@ -1508,8 +1508,8 @@ functions->SetStaticDoubleField(this,clazz,fieldID,value); } - jstring NewString(const jchar *tqunicode, jsize len) { - return functions->NewString(this,tqunicode,len); + jstring NewString(const jchar *unicode, jsize len) { + return functions->NewString(this,unicode,len); } jsize GetStringLength(jstring str) { return functions->GetStringLength(this,str); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/nsplugins/sdk/jri.h v3.5.13-sru/nsplugins/sdk/jri.h --- /tmp/stable//kdebase/nsplugins/sdk/jri.h 2011-03-12 07:57:57.000000000 +0100 +++ v3.5.13-sru/nsplugins/sdk/jri.h 2012-09-08 19:41:29.000000000 +0200 @@ -341,8 +341,8 @@ #define JRI_SetStaticFieldDouble(env, clazz, fieldID, value) \ (((*(env))->SetStaticFieldDouble)(env, JRI_SetStaticFieldDouble_op, clazz, fieldID, value)) -#define JRI_NewString(env, tqunicode, len) \ - (((*(env))->NewString)(env, JRI_NewString_op, tqunicode, len)) +#define JRI_NewString(env, unicode, len) \ + (((*(env))->NewString)(env, JRI_NewString_op, unicode, len)) #define JRI_GetStringLength(env, string) \ (((*(env))->GetStringLength)(env, JRI_GetStringLength_op, string)) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/nsplugins/sdk/npruntime.h v3.5.13-sru/nsplugins/sdk/npruntime.h --- /tmp/stable//kdebase/nsplugins/sdk/npruntime.h 2011-03-12 07:57:57.000000000 +0100 +++ v3.5.13-sru/nsplugins/sdk/npruntime.h 2012-09-08 19:41:29.000000000 +0200 @@ -306,7 +306,7 @@ NPInvalidateFunctionPtr is called by the scripting environment when the native code is shutdown. Any attempt to message a - NPObject instance after the tqinvalidate callback has been + NPObject instance after the invalidate callback has been called will result in undefined behavior, even if the native code is still retaining those NPObject instances. (The runtime will typically return immediately, with 0 or NULL, from an attempt @@ -318,7 +318,7 @@ uint32_t structVersion; NPAllocateFunctionPtr allocate; NPDeallocateFunctionPtr deallocate; - NPInvalidateFunctionPtr tqinvalidate; + NPInvalidateFunctionPtr invalidate; NPHasMethodFunctionPtr hasMethod; NPInvokeFunctionPtr invoke; NPInvokeDefaultFunctionPtr invokeDefault; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/nsplugins/viewer/kxt.cpp v3.5.13-sru/nsplugins/viewer/kxt.cpp --- /tmp/stable//kdebase/nsplugins/viewer/kxt.cpp 2011-03-12 07:57:57.000000000 +0100 +++ v3.5.13-sru/nsplugins/viewer/kxt.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -567,7 +567,7 @@ TQWidget *w = find( (WId)win ); if ( w ) { // We know that window - return w->tqtopLevelWidget() == tqtopLevelWidget(); + return w->topLevelWidget() == topLevelWidget(); } else { // Window still may be a parent (if top-level is foreign window) Window root, parent; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/nsplugins/viewer/nsplugin.cpp v3.5.13-sru/nsplugins/viewer/nsplugin.cpp --- /tmp/stable//kdebase/nsplugins/viewer/nsplugin.cpp 2011-09-27 00:37:49.000000000 +0200 +++ v3.5.13-sru/nsplugins/viewer/nsplugin.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -138,7 +138,7 @@ } -// tqinvalidate rect +// invalidate rect void g_NPN_InvalidateRect(NPP /*instance*/, NPRect* /*invalidRect*/) { // http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api7.html#999503 @@ -147,7 +147,7 @@ } -// tqinvalidate region +// invalidate region void g_NPN_InvalidateRegion(NPP /*instance*/, NPRegion /*invalidRegion*/) { // http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api8.html#999528 @@ -252,8 +252,8 @@ NSPluginInstance *inst = static_cast(instance->ndata); if (inst) { - inst->requestURL( TQString::tqfromLatin1(url), TQString::null, - TQString::tqfromLatin1(target), 0 ); + inst->requestURL( TQString::fromLatin1(url), TQString::null, + TQString::fromLatin1(target), 0 ); } return NPERR_NO_ERROR; @@ -267,8 +267,8 @@ NSPluginInstance *inst = static_cast(instance->ndata); if (inst) { kdDebug(1431) << "g_NPN_GetURLNotify: ndata=" << (void*)inst << endl; - inst->requestURL( TQString::tqfromLatin1(url), TQString::null, - TQString::tqfromLatin1(target), notifyData, true ); + inst->requestURL( TQString::fromLatin1(url), TQString::null, + TQString::fromLatin1(target), notifyData, true ); } return NPERR_NO_ERROR; @@ -318,7 +318,7 @@ break; } - TQString thisLine = TQString::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); + TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); previousStart = &buf[l]; previousCR = true; @@ -360,9 +360,9 @@ } NSPluginInstance *inst = static_cast(instance->ndata); - if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) { - inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(), - TQString::tqfromLatin1(target), notifyData, args, true ); + if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) { + inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(), + TQString::fromLatin1(target), notifyData, args, true ); } else { // Unsupported / insecure return NPERR_INVALID_URL; @@ -415,7 +415,7 @@ break; } - TQString thisLine = TQString::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); + TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); previousStart = &buf[l]; previousCR = true; @@ -457,9 +457,9 @@ } NSPluginInstance *inst = static_cast(instance->ndata); - if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) { - inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(), - TQString::tqfromLatin1(target), 0L, args, false ); + if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) { + inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(), + TQString::fromLatin1(target), 0L, args, false ); } else { // Unsupported / insecure return NPERR_INVALID_URL; diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/nsplugins/viewer/viewer.cpp v3.5.13-sru/nsplugins/viewer/viewer.cpp --- /tmp/stable//kdebase/nsplugins/viewer/viewer.cpp 2011-03-12 07:57:57.000000000 +0100 +++ v3.5.13-sru/nsplugins/viewer/viewer.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -190,7 +190,7 @@ } #endif if ( p ) - _notifiers[type].insert( _notifiers[type].tqat(), sn ); + _notifiers[type].insert( _notifiers[type].at(), sn ); else _notifiers[type].append( sn ); } diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/pics/crystalsvg/cr16-app-package_games_kids.png v3.5.13-sru/pics/crystalsvg/cr16-app-package_games_kids.png --- /tmp/stable//kdebase/pics/crystalsvg/cr16-app-package_games_kids.png 1970-01-01 01:00:00.000000000 +0100 +++ v3.5.13-sru/pics/crystalsvg/cr16-app-package_games_kids.png 2012-09-08 19:41:29.000000000 +0200 @@ -0,0 +1,6 @@ +PNG + + IHDRh6 IDAT(-n@ +[Y`hina;T T21 DIMn~uA<ͼffH<=T %!"_TS*h4 +U |فG"b!tHJ!"iށa_ZU;gV꺎_^^%'-U+zL&`8|ENl_aևI#舫+gS -:2<= @&C.aIyffJf`krC:ssSWG,) ܦCC<>2=]kvVY+ `/l*Ux/SAPҤY: A0|I(OK$*miܔajEnBIENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/pics/crystalsvg/cr48-app-package_games_kids.png v3.5.13-sru/pics/crystalsvg/cr48-app-package_games_kids.png --- /tmp/stable//kdebase/pics/crystalsvg/cr48-app-package_games_kids.png 1970-01-01 01:00:00.000000000 +0100 +++ v3.5.13-sru/pics/crystalsvg/cr48-app-package_games_kids.png 2012-09-08 19:41:29.000000000 +0200 @@ -0,0 +1,7 @@ +PNG + + IHDR00`nIDATX]HTiYYrlץ%qJdURW\@ [/ҩ$q/ qA"I]B0 +AFjbTl$t|L:v9?o<3JB&%: b2ҧ{{{uuuQ^$fyccC7KܬM}essH,hkkҡ S ['{q]"jbd U΂?U؊e?6@ P[[;<< doM$؇f$Vn@e( ?.s8;[+rn>%%Ep,>>WR^N4W03Bˬ)(`t#q(NͥIƍ9 Pvvp? <z H_\\nmE*+EN΃l˓'UBYYYS/nEߒҒ\؏Ojӧ10)(04dMl<`w7x~iHj4B~.\'7jz>|{=YFU!?FXR׮l- +^.ב+4߿Ӊ0>? !hztP|ar|H>N'6':@{{zPRsXXSS 544G1Loeׯ!ޖCM֕$I.wbnO SNdvv<{ݺdbcĄ?z +$>m].WN=88MTUUc5>>xkjj򎍍Ť zt$uuuf٩F#w%+`,v[׋emz}}}7X-hHO_HۋsVIENDB` \ Pas de fin de ligne à la fin du fichier diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/pics/crystalsvg/crsc-app-package_games_kids.svgz v3.5.13-sru/pics/crystalsvg/crsc-app-package_games_kids.svgz --- /tmp/stable//kdebase/pics/crystalsvg/crsc-app-package_games_kids.svgz 1970-01-01 01:00:00.000000000 +0100 +++ v3.5.13-sru/pics/crystalsvg/crsc-app-package_games_kids.svgz 2012-09-08 19:41:29.000000000 +0200 @@ -0,0 +1,17 @@ +Te-Ppackage_games_kids-color.svgZێF}W.vE8p`q6hgF$ +jRlJr֎6k6u9]EΓ߯WŻ-DbRԛyXnn&e}YTfS_M6<ٽ( +LfnΦ}*vOU7Tr:]=of㙛ݷp9H?<<dq*TKH\7x*t<7U !$?MjUwrܷrS/~}qbȖYnնڃպmy8Ͽwa~~/OK\MWnwS_]mz&rq5f*uC&ECpfպS~\.ͪi*֭ov9oz׬z\Lz\N?vs~-\~)FIzS풗byϫɷ74n!ǟPFa\"}IEp5QǃfӔ6H-.WFiOrRx<`."'zu}G>"t'ݷ-rU=m%TW]WzA_LՋf78~~h]E2x~JߍaM.MsL 9_W qMj_8o6f{dc_gr43-gF9'S^%jQrK7̆Lݿ`@m.d*=j9L2!9Lium߬=0XgWaaOp^?9^ٜUs;M6nsVgiA-QT KOC%e'KvB N2( \ߩ.'4s"8G[lݶ4gj\~Jz;٧|ő7qPTn!Np"4=%} + +ﾢ~QgcB'> +:yq 2Ѣ(yS>Vz?j +O\;\3;i- ++ZMX|۷z֕LTSB)1^-75Yo9{܌QnW3sؾ;ѫ]O(Kv", K +߂Px~(M1g <ʖ`'T!(:je/)I)?PSQI +u`69afBSԔ.8-дN1c-Fj"PjE`e"`)‚^•"Dʰk&zF,u)Ghk4+N]d&f%*]t킽0Bkހ~N:1j1Qb\}(rPfQSʣ%맧yz~N֎*e-Z?epOdg(Rϼΐ]e2̒v w/Hsv~PJ|a Ms[2h%^et#)sƌm< W*2+{ΖslI7_ؖ24.V%nVD&G*x[ncbA^];α"&vPbCl`Q}р%v R3Thճ}l:C>==ŐZא}1Y( rМh/q'ܺ'Ez 1XҎy.3eRM`L0c;Sگd2J09}t5*yXFs܀33ԠQNsp@ 44ȠtNsƕUYinrМ2t>4i=G!==+JYN2Pk]FSt]JX؀M #E + UF1un3Y\U1_'5Sl4MCx!DL9d45uPE@/u1TQ.:*5W(ԾXv"'?1arK㍊6ۇ9A +3Fݭ3" +u"ɰF:h#*'(22nr8/!窚-^Z ^A ʀ l-( m-]m& Q TNRYaȘ"yhK\a&dJƜ0 0(l8@z~qaI4rgb,()u7h9:A;4 +.e̢L{k#ɡV[R(]ӹQ6.B1z71*|g( +ZZG/Z ͘u}ama7ghP%QI$LHZK6.3&b4$;coiȒ*J4l'KENdT_YA50$!P 0\m}|+Pk,,^t~QaaiR'J)R$!$8S>vNlOEm!_浴@&`+:P@&%/!h6m'E1X%#:fNQc,>1i0[bOZu) lAiIؘ&O`I#c!9)"cXtVð(`9Ou` ~PB*]*'ҽ7/յFER/ǘ' 1b7dlDMQAI:'7y0i5V58)ڻkn/-pjȄ,1&1fy6(LMDjN&2 +echo "[startkde] This script is $0" 1>&2 + +# Avoid any possible conflict with KDE4. Therefore within this script +# use full path names to all binaries used. + +# The binaries for TDE are located in the same place as this script. +# To determine that location use the following method rather than presuming +# the existence of $KDEDIR. That environment variable might not be +# defined or defined to point to KDE4 binaries. +BIN_DIR="`dirname \`readlink -f $0\``" +# Do not use kde-config to determine the version. That command creates a +# profile directory in the root of the file system. Refer to Bug Report 293. +if [ -x $BIN_DIR/konqueror ]; then + KDE_VERSION="`$BIN_DIR/konqueror --version | grep KDE | awk '{print $2}'`" + echo "[startkde] TDE version is $KDE_VERSION" 1>&2 + export KDEDIR=${BIN_DIR%/bin} + echo "[startkde] TDE base directory is $KDEDIR" 1>&2 +else + echo "[startkde] Unable to determine TDE base directory." + echo "[startkde] This script should be installed in the same directory." + echo "[startkde] Exiting." + exit 1 +fi +unset BIN_DIR # When the X server dies we get a HUP signal from xinit. We must ignore it # because we still need to do some cleanup. trap '[startkde] echo GOT SIGHUP' HUP -# Check if a KDE session is already running. +# Check if a TDE session is already running. if kcheckrunning >/dev/null 2>&1; then - echo "[startkde] KDE seems to be already running on this display." - xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null - exit 1 + echo "[startkde] TDE seems to be already running on this display." + xmessage -center -geometry 500x100 "TDE seems to be already running on this display." > /dev/null 2>/dev/null + exit 1 fi # Set the background color. # The standard X background is nasty, causing moire effects and exploding -# people's heads. We use colours from the standard KDE palette for those with +# people's heads. We use colours from the standard TDE palette for those with # palettised displays. if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then xsetroot -solid "#618DCC" # sky blue fi -# Unset this for Darwin since it will screw up KDE's dynamic-loading +# Unset this for Darwin since it will screw up TDE's dynamic-loading unset DYLD_FORCE_FLAT_NAMESPACE # Check whether prelinking is enabled. If so, exporting KDE_IS_PRELINKED improves -# loading KDE. The $KDE_IS_PRELINKED variable might already be set on some systems +# loading TDE. The $KDE_IS_PRELINKED variable might already be set on some systems # through /etc/profile.d, so first check whether the variable exists. -if [ -z $KDE_IS_PRELINKED ]; then +if [ "$KDE_IS_PRELINKED" = "" ]; then if [ -r /etc/default/prelink ]; then . /etc/default/prelink - if [ "$PRELINKING" == "yes" ]; then + if [ "$PRELINKING" = "yes" ]; then export KDE_IS_PRELINKED=1 fi fi fi -# In case we have been started with full pathname spec without being in PATH. -bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` -if [ -n "$bindir" ]; then - case $PATH in - $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; - *) PATH=$bindir:$PATH; export PATH;; - esac -fi - # Boot sequence: # # kdeinit is used to fork off processes which improves memory usage @@ -62,29 +89,25 @@ # # * Then ksmserver is started which takes control of the rest of the startup sequence -# The user's personal KDE directory usually is $HOME/.kde or $HOME/.trinity. -# This setting may be overridden by setting $KDEHOME. -# Must be careful here because $HOME/.kde was used commonly in the pre-KDE4 -# days for the user's KDE3 profile, but now with KDE4 common on systems, -# $HOME/.kde might point to KDE4 profile settings. Further, the existence -# of KDE4 does not mean all people have KDE4 installed and might want to keep -# $HOME/.kde as their preferred profile location for Trinity KDE. +# The user's personal TDE directory usually is $HOME/.trinity. +# This setting may be overridden by setting $KDEHOME. When migrating profiles +# must be careful here because $HOME/.kde was used commonly in the pre-KDE4 +# days for the user's TDE profile, but now with KDE4 common on systems, +# $HOME/.kde might point to KDE4 profile settings. The existence of KDE4 +# does not mean all people are using KDE4. -if [ -n "$KDEHOME" ]; then +if [ "$KDEHOME" != "" ]; then echo "[startkde] KDEHOME is preset to $KDEHOME." 1>&2 export KDEHOME=$KDEHOME else # $KDEHOME is NOT already preset in the environment. Try to help. # This might be overkill but does provide flexibility. + # This script and kstandardirs.h and kstandardirs.cpp must match. + # The latter two must be edited/patched before compiling. echo "[startkde] KDEHOME is not set." 1>&2 if [ -d $HOME/.trinity ]; then # OK, this one is obvious. export KDEHOME=$HOME/.trinity - elif [ -d $HOME/.trinity ]; then - # Looks like the user had an old version of Trinity installed at last login - echo "[startkde] Migrating old ~/.trinity directory to new ~/.trinity name." 1>&2 - mv $HOME/.trinity $HOME/.trinity - export KDEHOME=$HOME/.trinity elif [ -f /usr/bin/kde4-config ]; then # Looks like KDE4 is installed. if [ -d $HOME/.kde ] && [ ! -d $HOME/.trinity ]; then @@ -95,13 +118,10 @@ export KDEHOME=$HOME/.trinity fi elif [ -f /opt/trinity/bin/kde-config ]; then - # Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4. - export KDEHOME=$HOME/.trinity - elif [ -f /opt/trinity/bin/kde-config ]; then - # Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4. + # Looks like Trinity is installed. export KDEHOME=$HOME/.trinity elif [ -f /usr/bin/kde-config ] && [ -d $HOME/.kde ]; then - # Looks like KDE3 or Trinity is installed and not playing second fiddle to KDE4. + # Looks like Trinity is installed and not playing second fiddle to KDE4. export KDEHOME=$HOME/.kde else # Resort to this and hope for the best! @@ -110,70 +130,146 @@ echo "[startkde] Set KDEHOME to $KDEHOME." 1>&2 fi -# Run a quick test for root. -if [ -z "$KDEROOTHOME" ] && [ "$UID" = "0" ]; then - echo "[startkde] User ID is $UID. Setting KDEROOTHOME to $KDEHOME." - export KDEROOTHOME=$KDEHOME +# Do we want to run this script from here in such an automated manner? +# Or leave the script to be run only at the user's discretion? +# The migratekde3 script as written (in draft) requires user intervention, +# which to succeed in TDE needs something like KDialog. Refer to the +# commentary in migratekde3 for more details. +# if [ -x $KDEDIR/migratekde3 ]; then +# sh $KDEDIR/migratekde3 +# fi + +# kdesu needs something to find root's TDE profile. Set the KDEROOTHOME variable +# here as last resort. /root/.trinity is a safe presumption. If an admin wants +# a different location then set the KDEROOTHOME variable elsewhere. +if [ "$KDEROOTHOME" = "" ]; then + export KDEROOTHOME=/root/.trinity + echo "[startkde] Setting KDEROOTHOME to $KDEROOTHOME." fi # Modify the following environment variables only as necessary. -if [ -d /opt/trinity/games ]; then - export PATH=/opt/trinity/games:$PATH -fi -if [ -d /opt/trinity/bin ]; then - export PATH=/opt/trinity/bin:$PATH -fi -if [ -d /opt/trinity/games ]; then - export PATH=/opt/trinity/games:$PATH -fi -if [ -d /opt/trinity/bin ]; then - export PATH=/opt/trinity/bin:$PATH -fi -if [ -d /opt/trinity/share ]; then - export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/:/usr/share/ -fi -if [ -d /opt/trinity/share ]; then - export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/:/usr/share/ +if [ -d $KDEDIR/games ]; then + if [ "`echo $PATH | grep \"$KDEDIR/games\"`" = "" ]; then + # Respect the traditional path order. Don't blindly place $KDEDIR/games + # first in the path. Only place $KDEDIR/games before /usr/games. If packagers + # are adding $KDEDIR/games elsewhere, then they need to ensure the traditional + # search patch is respected. + # Is there a way we can check that $KDEDIR/games is always placed only just before + # /usr/games in the search path? + if [ "`echo $PATH | grep \"^\\(.*:\\)\\?/usr/games\\(:.*\\)\\?$\"`" != "" ]; then + export PATH="`echo $PATH | sed \"s|^\\(.*:\\)\\?/usr/games\\(:.*\\)\\?$|\\1$KDEDIR/games:/usr/games\\2|\"`" + else + export PATH=$KDEDIR/games:$PATH + fi + fi fi -if [ -d /opt/trinity/etc/xdg ]; then - export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/:/etc/xdg/ +if [ -d $KDEDIR/bin ]; then + if [ "`echo $PATH | grep \"$KDEDIR/bin\"`" = "" ]; then + # Respect the traditional path order. Don't blindly place $KDEDIR/bin + # first in the path. Only place $KDEDIR/bin before /usr/bin. This order is + # consistent with kdelibs/kdesu/stub.cpp. If packagers are adding $KDEDIR/bin + # elsewhere, then they need to ensure the traditional search patch is respected. + # Is there a way we can check that $KDEDIR/bin is always placed only just before + # /usr/bin in the search path? + if [ "`echo $PATH | grep \"^\\(.*:\\)\\?/usr/bin\\(:.*\\)\\?$\"`" != "" ]; then + export PATH="`echo $PATH | sed \"s|^\\(.*:\\)\\?/usr/bin\\(:.*\\)\\?$|\\1$KDEDIR/bin:/usr/bin\\2|\"`" + else + export PATH=$KDEDIR/bin:$PATH + fi + fi fi -if [ -d /opt/trinity/etc/xdg ]; then - export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/:/etc/xdg/ +if [ -d $KDEDIR/share/man ]; then + if [ -x /usr/bin/manpath ]; then + if [ "`manpath 2>/dev/null | grep \"$KDEDIR/share/man\"`" = "" ]; then + export MANPATH=$KDEDIR/share/man:$MANPATH + fi + else + if [ "`echo $MANPATH | grep \"$KDEDIR/share/man\"`" = "" ]; then + export MANPATH=$KDEDIR/share/man:$MANPATH + fi + fi fi -if [ -d /opt/trinity/share/man ]; then - export MANPATH=/opt/trinity/share/man:$MANPATH + +if [ "$XDG_CONFIG_DIRS" = "" ]; then + if [ -d /etc/xdg ]; then + XDG_CONFIG_DIRS=/etc/xdg + fi +fi +if [ -d /etc/trinity/xdg ]; then + TDE_XDG_DIR="/etc/trinity/xdg" +elif [ -d /etc/tde/xdg ]; then + TDE_XDG_DIR="/etc/tde/xdg" +elif [ -d $KDEDIR/xdg ]; then + TDE_XDG_DIR="$KDEDIR/xdg" +elif [ -d $KDEDIR/etc/xdg ]; then + TDE_XDG_DIR="$KDEDIR/etc/xdg" +elif [ -d $KDEDIR/etc/trinity/xdg ]; then + TDE_XDG_DIR="$KDEDIR/etc/trinity/xdg" +elif [ -d $KDEDIR/etc/tde/xdg ]; then + TDE_XDG_DIR="$KDEDIR/etc/tde/xdg" +elif [ -d $KDEDIR/trinity/xdg ]; then + TDE_XDG_DIR="$KDEDIR/trinity/xdg" +elif [ -d $KDEDIR/tde/xdg ]; then + TDE_XDG_DIR="$KDEDIR/tde/xdg" +fi +if [ -d $TDE_XDG_DIR ]; then + if [ "`echo $XDG_CONFIG_DIRS | grep \"$TDE_XDG_DIR\"`" = "" ]; then + if [ "$XDG_CONFIG_DIRS" = "" ]; then + XDG_CONFIG_DIRS=$TDE_XDG_DIR + else + XDG_CONFIG_DIRS=$TDE_XDG_DIR:$XDG_CONFIG_DIRS + fi + fi fi -if [ -d /opt/trinity/share/man ]; then - export MANPATH=/opt/trinity/share/man:$MANPATH +if [ "$XDG_CONFIG_DIRS" != "" ]; then + export XDG_CONFIG_DIRS fi -if [ -d /opt/trinity ]; then - if [ -n "$KDEDIRS" ]; then - export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/ + +# Explicitly set $XDG_DATA_DIRS only when Trinity is not installed in /usr. +# Explicitly declaring $XDG_DATA_DIRS will override the default search path of /usr/share. +# Explicitly declaring $XDG_DATA_DIRS will override $KDEDIRS, which must then be +# explicitly identified in the $XDG_DATA_DIRS string to remain useful. +# The $KDEDIR variable is intended to be singular and $KDEDIRS plural. When $KDEDIRS +# exists in the environment then parse that variable into separate directories. +# $KDEDIRS should contain whatever is set in $KDEDIR. Therefore any additional directories +# set in $KDEDIRS are intended to override data files found in $KDEDIR. Those additional +# directories should be placed before $KDEDIR and before /usr/share. +if [ "$KDEDIR" != "/usr" ] && [ -d $KDEDIR/share ]; then + if [ "$XDG_DATA_DIRS" = "" ]; then + # Ensure the standard location of /usr/share is included. + XDG_DATA_DIRS=/usr/share else - export KDEDIRS=/opt/trinity/:/usr/ + if [ "`echo $XDG_DATA_DIRS | grep \"/usr/share\"`" = "" ]; then + XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share + fi fi -fi -if [ -d /opt/trinity ]; then - if [ -n "$KDEDIRS" ]; then - export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/ - else - export KDEDIRS=/opt/trinity/:/usr/ + if [ "`echo $XDG_DATA_DIRS | grep \"$KDEDIR/share\"`" = "" ]; then + XDG_DATA_DIRS=$KDEDIR/share:$XDG_DATA_DIRS + fi + if [ "$KDEDIRS" != "" ]; then + for i in `seq \`echo $KDEDIRS | awk -F : '{print NF}'\` -1 1`; do + if [ "`echo $XDG_DATA_DIRS | grep \"\`echo $KDEDIRS | cut -d: -f${i}\`\"`" = "" ]; then + XDG_DATA_DIRS=`echo $KDEDIRS | cut -d: -f${i}`/share:$XDG_DATA_DIRS + fi + done fi + export XDG_DATA_DIRS fi test -n "$KDEHOME" && kdehome=`echo "$KDEHOME" | sed "s,^~/,$HOME/,"` -echo "[startkde] kdehome: $kdehome" 1>&2 # Allow interested applications, such as the Plasma control wrapper, -# to know that this is a Trinity desktop and not a KDE one. +# to know that this is a Trinity desktop and not a TDE one. export DESKTOP_SESSION=trinity # Please see kstartupconfig source for usage. -mkdir -m 700 -p $kdehome -mkdir -m 700 -p $kdehome/share -mkdir -m 700 -p $kdehome/share/config -cat >$kdehome/share/config/startupconfigkeys <&2 +fi +mkdir -m 700 -p "$kdehome" +mkdir -m 700 -p "$kdehome/share" +mkdir -m 700 -p "$kdehome/share/config" +cat >"$kdehome/share/config/startupconfigkeys" <$kdehome/share/config/kdesktoprc <"$kdehome/share/config/kdesktoprc" </env/*.sh and /env/*.sh -# (where is $KDEHOME or ~/.trinity, and is where KDE is installed) +# (where is $KDEHOME or ~/.trinity, and is where TDE is installed) # # This is where you can define environment variables that will be available to -# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` +# all TDE programs, so this is where you can run agents using e.g. eval `ssh-agent` # or eval `gpg-agent --daemon`. # Note: if you do that, you should also put "ssh-agent -k" as a shutdown script # @@ -340,9 +435,9 @@ done done -# Activate the kde font directories. +# Activate the TDE font directories. # -# There are 4 directories that may be used for supplying fonts for KDE. +# There are 4 directories that may be used for supplying fonts for TDE. # # There are two system directories. These belong to the administrator. # There are two user directories, where the user may add her own fonts. @@ -365,33 +460,29 @@ do_usr_fdir=1 do_usr_odir=1 if test -r "$kde_fontpaths" ; then - savifs=$IFS - IFS=" + savifs=$IFS + IFS=" " - for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do - rfpath=`echo $fpath | sed "s:^~:$HOME:g"` - if test -s "$rfpath"/fonts.dir; then - xset fp+ "$rfpath" - if test "$rfpath" = "$usr_fdir"; then - do_usr_fdir=0 - fi - if test "$rfpath" = "$usr_odir"; then - do_usr_odir=0 - fi - fi - done - IFS=$savifs -fi - -if [ ! -n "$KDEDIR" ]; then - export KDEDIR=`echo "$KDEDIRS" | sed -e 's/:.*//'` + for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do + rfpath=`echo $fpath | sed "s:^~:$HOME:g"` + if test -s "$rfpath"/fonts.dir; then + xset fp+ "$rfpath" + if test "$rfpath" = "$usr_fdir"; then + do_usr_fdir=0 + fi + if test "$rfpath" = "$usr_odir"; then + do_usr_odir=0 + fi + fi + done + IFS=$savifs fi echo "[startkde] KDEDIR: $KDEDIR" 1>&2 echo "[startkde] KDEDIRS: $KDEDIRS" 1>&2 if test -n "$KDEDIRS"; then - kdedirs_first=`echo "$KDEDIRS" | sed -e 's/:.*//'` + kdedirs_first=${KDEDIRS%%:*} sys_odir=$kdedirs_first/share/fonts/override sys_fdir=$kdedirs_first/share/fonts else @@ -400,7 +491,7 @@ fi if test -n "$KDEDIRS"; then - kdedirs_first=`echo "$KDEDIRS" | sed -e 's/:.*//'` + kdedirs_first=${KDEDIRS%%:*} echo "[startkde] kdedirs_first: $kdedirs_first" if [ -r $kdedirs_first/share/kgtk/preload ]; then echo "[startkde] Reading from $kdedirs_first/share/kgtk/preload" @@ -412,8 +503,10 @@ fi fi -if [ -n $KGTK_PRELOAD ]; then - if [ -e /usr/lib/libnspr4.so ]; then +if [ "$KGTK_PRELOAD" != "" ]; then + if [ -e /usr/lib64/libnspr4.so ]; then + KGTK_NSPR_PRELOAD="/usr/lib64/libnspr4.so:" + elif [ -e /usr/lib/libnspr4.so ]; then KGTK_NSPR_PRELOAD="/usr/lib/libnspr4.so:" fi export LD_PRELOAD=$KGTK_PRELOAD:$KGTK_NSPR_PRELOAD$LD_PRELOAD @@ -438,7 +531,7 @@ # Set a left cursor instead of the standard X11 "X" cursor, since I've heard # from some users that they're confused and don't know what to do. This is -# especially necessary on slow machines, where starting KDE takes one or two +# especially necessary on slow machines, where starting TDE takes one or two # minutes until anything appears on the screen. # # If the user has overwritten fonts, the cursor font may be different now @@ -446,7 +539,7 @@ # xsetroot -cursor_name left_ptr -# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap +# Get Ghostscript to look into user's TDE fonts dir for additional Fontmap if test -n "$GS_LIB" ; then GS_LIB=$usr_fdir:$GS_LIB export GS_LIB @@ -455,23 +548,23 @@ export GS_LIB fi -# Link "tmp" "socket" and "cache" resources to directory in /tmp +# Link "tmp" "socket" and "cache" resources to directory in $TMP # Creates: -# - a directory /tmp/kde-$USER and links $KDEHOME/tmp-$HOSTNAME to it. -# - a directory /tmp/ksocket-$USER and links $KDEHOME/socket-$HOSTNAME to it. -# - a directory /var/tmp/kdecache-$USER and links $KDEHOME/cache-$HOSTNAME to it. -# Note: temporary locations can be overriden through the KDETMP and KDEVARTMP +# - a directory $TMP/kde-$USER and is linked from $KDEHOME/tmp-$HOSTNAME to it. +# - a directory $TMP/ksocket-$USER and is linked from $KDEHOME/socket-$HOSTNAME to it. +# - a directory /var/tmp/kdecache-$USER and is linked from $KDEHOME/cache-$HOSTNAME to it. +# Note: temporary locations can be overridden through the KDETMP and KDEVARTMP # environment variables. for resource in tmp cache socket; do if ! lnusertemp $resource >/dev/null; then echo "[startkde] Call to lnusertemp failed (temporary directories full?). Check your installation." 1>&2 - xmessage -geometry 600x100 "Call to lnusertemp failed (temporary directories full?). Check your installation." + xmessage -center -geometry 600x100 "Call to lnusertemp failed (temporary directories full?). Check your installation." exit 1 fi done # In case of dcop sockets left by a previous session, cleanup. -dcopserver_shutdown +$KDEDIR/bin/dcopserver_shutdown echo '[startkde] Starting Trinity...' 1>&2 @@ -481,26 +574,26 @@ # Run KPersonalizer before the session if this is the first login. if test "$kpersonalizerrc_general_firstlogin" = "true"; then if [ ! -x $KDEDIR/bin/kpersonalizer ]; then - echo "[startkde] kpersonalizer not found! Please install it in order to properly configure your user profile." 1>&2 + echo "[startkde] kpersonalizer not found! Please install in order to properly configure your user profile." 1>&2 else # start only dcopserver, don't start whole kdeinit (takes too long) echo "[startkde] Running kpersonalizer..." 1>&2 - dcopserver - kwin --lock & - kpersonalizer --before-session + $KDEDIR/bin/dcopserver + $KDEDIR/bin/kwin --lock & + $KDEDIR/bin/kpersonalizer --before-session # handle kpersonalizer restarts (language change) while test $? -eq 1; do - kpersonalizer --r --before-session + $KDEDIR/bin/kpersonalizer --r --before-session done - dcopquit kwin - dcopserver_shutdown --wait + $KDEDIR/bin/dcopquit kwin + $KDEDIR/bin/dcopserver_shutdown --wait fi fi # Remove moodin cache if we have a new wallpaper installed, jriddell. Distro-specific. -if [ -d $kdehome/share/apps/ksplash/cache/Moodin/kubuntu ]; then - if [ /usr/share/wallpapers/kubuntu-wallpaper.png -nt $kdehome/share/apps/ksplash/cache/Moodin/kubuntu/ ]; then - rm -rf $kdehome/share/apps/ksplash/cache/Moodin/kubuntu/ +if [ -d "$kdehome/share/apps/ksplash/cache/Moodin/kubuntu" ]; then + if [ /usr/share/wallpapers/kubuntu-wallpaper.png -nt "$kdehome/share/apps/ksplash/cache/Moodin/kubuntu/" ]; then + rm -rf "$kdehome/share/apps/ksplash/cache/Moodin/kubuntu/" fi fi @@ -508,25 +601,24 @@ # the splashscreen and progress indicator case "$ksplashrc_ksplash_theme" in None) - ;; # nothing + ;; # nothing Simple) - if test "$kpersonalizerrc_general_firstlogin" = "true"; then - ksplashsimple - fi # otherwise started earlier - ;; + if test "$kpersonalizerrc_general_firstlogin" = "true"; then + $KDEDIR/bin/ksplashsimple + fi # otherwise started earlier + ;; *) - ksplash --nodcop - ;; + $KDEDIR/bin/ksplash --nodcop + ;; esac fi -# Mark that full KDE session is running (e.g. Konqueror preloading works only -# with full KDE running). The TDE_FULL_SESSION property can be detected by +# Mark that full TDE session is running (e.g. Konqueror preloading works only +# with full TDE running). The TDE_FULL_SESSION property can be detected by # any X client connected to the same X session, even if not launched -# directly from the KDE session but e.g. using "ssh -X", kdesu. $TDE_FULL_SESSION +# directly from the TDE session but e.g. using "ssh -X", kdesu. $TDE_FULL_SESSION # however guarantees that the application is launched in the same environment -# like the KDE session and that e.g. KDE utilities/libraries are available. -# TDE_FULL_SESSION property is also only available since KDE 3.5.5. +# like the TDE session and that e.g. TDE utilities/libraries are available. # The matching tests are: # For $TDE_FULL_SESSION: # if test -n "$TDE_FULL_SESSION"; then ... whatever @@ -534,32 +626,35 @@ # xprop -root | grep "^TDE_FULL_SESSION" >/dev/null 2>/dev/null # if test $? -eq 0; then ... whatever # -# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid -# of the user running the KDE session. It should be rarely needed (e.g. +# Additionally there is $KDE_SESSION_UID with the uid of the user +# running the TDE session. It should be rarely needed (for example, # after sudo to prevent desktop-wide functionality in the new user's kded). # TDE_FULL_SESSION=true export TDE_FULL_SESSION xprop -root -f TDE_FULL_SESSION 8t -set TDE_FULL_SESSION true echo "[startkde] TDE_FULL_SESSION: $TDE_FULL_SESSION" 1>&2 -KDE_SESSION_UID=$UID +KDE_SESSION_UID=`id -u` export KDE_SESSION_UID echo "[startkde] KDE_SESSION_UID: $KDE_SESSION_UID" 1>&2 # We set LD_BIND_NOW to increase the efficiency of kdeinit. # kdeinit unsets this variable before loading applications. -LD_BIND_NOW=true start_kdeinit_wrapper --new-startup +kcminit_startup +LD_BIND_NOW=true $KDEDIR/bin/start_kdeinit_wrapper --new-startup +kcminit_startup if test $? -ne 0; then # Startup error echo '[startkde] Could not start kdeinit. Check your installation.' 1>&2 - xmessage -geometry 500x100 "Could not start kdeinit. Check your installation." + xmessage -center -geometry 500x100 "Could not start kdeinit. Check your installation." fi echo "[startkde] kdeinit started successfully." 1>&2 # If the session should be locked from the start (locked autologin), -# lock now and do the rest of the KDE startup underneath the locker. +# lock now and do the rest of the TDE startup underneath the locker. +# FIXME +# kdesktop needs to be notified of this locker process somehow so that +# it does not attempt to launch its own locker process on startup! if test -n "$dl"; then - kwrapper kdesktop_lock --forcelock & + $KDEDIR/bin/kwrapper kdesktop_lock --forcelock & # Give it some time for starting up. This is somewhat unclean; some # notification would be better. sleep 1 @@ -576,27 +671,27 @@ # started, any problems thereafter, e.g. ksmserver failing to initialize, # will remain undetected. test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" -kwrapper ksmserver $KDEWM +$KDEDIR/bin/kwrapper ksmserver $KDEWM if test $? -eq 255; then # Startup error echo '[startkde] Could not start ksmserver. Check your installation.' 1>&2 - xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." + xmessage -center -geometry 500x100 "Could not start ksmserver. Check your installation." fi # wait if there's any crashhandler shown -while dcop | grep -q ^drkonqi- ; do - sleep 5 +while $KDEDIR/bin/dcop | grep -q ^drkonqi- ; do + sleep 5 done echo '[startkde] Shutting down Trinity...' 1>&2 # Clean up -kdeinit_shutdown -dcopserver_shutdown --wait -artsshell -q terminate +$KDEDIR/bin/kdeinit_shutdown +$KDEDIR/bin/dcopserver_shutdown --wait +$KDEDIR/bin/artsshell -q terminate # KDE4 support if [ -f /usr/bin/kdeinit4_shutdown ]; then - kde4 kdeinit4_shutdown 2>/dev/null + /usr/bin/kde4 kdeinit4_shutdown 2>/dev/null fi echo '[startkde] Running Trinity shutdown scripts...' 1>&2 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/tqt3integration/module/module.cpp v3.5.13-sru/tqt3integration/module/module.cpp --- /tmp/stable//kdebase/tqt3integration/module/module.cpp 2011-10-23 21:47:03.000000000 +0200 +++ v3.5.13-sru/tqt3integration/module/module.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -57,8 +57,8 @@ KWin::setState( w->winId(), NET::Modal ); KWin::WindowInfo info = KWin::windowInfo( parent, (unsigned long)NET::WMGeometry ); if( info.valid()) - w->move( info.tqgeometry().x() + ( info.tqgeometry().width() - w->width())/2, - info.tqgeometry().y() + ( info.tqgeometry().height()- w->height())/2 ); + w->move( info.geometry().x() + ( info.geometry().width() - w->width())/2, + info.geometry().y() + ( info.geometry().height()- w->height())/2 ); } // duped in qtkde diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp v3.5.13-sru/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp --- /tmp/stable//kdebase/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp 2011-10-23 21:47:03.000000000 +0200 +++ v3.5.13-sru/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -56,7 +56,7 @@ static long parentToWinId( const TQWidget* w ) { if( w != NULL ) - return w->tqtopLevelWidget()->winId(); + return w->topLevelWidget()->winId(); // try to find some usable parent if( tqApp->activeWindow() && w != tqApp->activeWindow()) return tqApp->activeWindow()->winId(); diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/TRINITY.RELEASE v3.5.13-sru/TRINITY.RELEASE --- /tmp/stable//kdebase/TRINITY.RELEASE 2011-10-30 08:44:27.000000000 +0100 +++ v3.5.13-sru/TRINITY.RELEASE 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.5.13 diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/tsak/CMakeLists.txt v3.5.13-sru/tsak/CMakeLists.txt --- /tmp/stable//kdebase/tsak/CMakeLists.txt 2011-09-16 04:01:43.000000000 +0200 +++ v3.5.13-sru/tsak/CMakeLists.txt 2012-09-08 19:41:29.000000000 +0200 @@ -23,5 +23,6 @@ tde_add_executable( tsak SOURCES main.cpp + LINK udev DESTINATION ${BIN_INSTALL_DIR} ) diff -Nuar '--exclude=admin' '--exclude=cmake' '--exclude=libltdl' /tmp/stable//kdebase/tsak/main.cpp v3.5.13-sru/tsak/main.cpp --- /tmp/stable//kdebase/tsak/main.cpp 2011-09-27 00:37:49.000000000 +0200 +++ v3.5.13-sru/tsak/main.cpp 2012-09-08 19:41:29.000000000 +0200 @@ -1,8 +1,8 @@ /* Copyright 2010 Adam Marchetti -Copyright 2011 Timothy Pearson +Copyright 2011-2012 Timothy Pearson -This file is part of tsak. +This file is part of tsak, the TDE Secure Attention Key daemon tsak is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -35,9 +36,19 @@ #include #include #include +extern "C" { +#include +} +#include + +using namespace std; #define FIFO_DIR "/tmp/ksocket-global" #define FIFO_FILE_OUT "/tmp/ksocket-global/tsak" +#define FIFO_LOCKFILE_OUT "/tmp/ksocket-global/tsak.lock" + +#define MAX_KEYBOARDS 64 +#define MAX_INPUT_NODE 128 #define TestBit(bit, array) (array[(bit) / 8] & (1 << ((bit) % 8))) @@ -46,9 +57,18 @@ bool mPipeOpen_out = false; int mPipe_fd_out = -1; +int mPipe_lockfd_out = -1; + +char filename[32]; +char key_bitmask[(KEY_MAX + 7) / 8]; + struct sigaction usr_action; sigset_t block_mask; +int keyboard_fd_num; +int keyboard_fds[MAX_KEYBOARDS]; +int child_pids[MAX_KEYBOARDS]; + const char *keycode[256] = { "", "", "1", "2", "3", "4", "5", "6", "7", "8", @@ -79,6 +99,57 @@ return a[i/CHAR_BIT] & (1 << i%CHAR_BIT); } +/* exception handling */ +struct exit_exception { + int c; + exit_exception(int c):c(c) { } +}; + +/* signal handler */ +void signal_callback_handler(int signum) +{ + // Terminate program + throw exit_exception(signum); +} + +/* termination handler */ +void tsak_friendly_termination() { + int i; + + // Close down all child processes + for (i=0; i str_len) + return 0; + + return 0 == strncmp( str + str_len - suffix_len, suffix, suffix_len ); +} +// -------------------------------------------------------------------------------------- + /* Assign features (supported axes and keys) of the physical input device (devin) * to the virtual input device (devout) */ static void copy_features(int devin, int devout) @@ -91,46 +162,61 @@ for(i=0;i= 0) { + for(code=0;code -1) { @@ -189,10 +281,10 @@ /* Create the FIFOs if they do not exist */ umask(0); mkdir(FIFO_DIR,0644); - + mknod(FIFO_FILE_OUT, S_IFIFO|0600, 0); chmod(FIFO_FILE_OUT, 0600); - + mPipe_fd_out = open(FIFO_FILE_OUT, O_RDWR | O_NONBLOCK); if (mPipe_fd_out > -1) { mPipeOpen_out = true; @@ -202,182 +294,426 @@ return setFileLock(mPipe_fd_out, true); } +bool setupLockingPipe(bool writepid) +{ + /* Create the FIFOs if they do not exist */ + umask(0); + mkdir(FIFO_DIR,0644); + + mknod(FIFO_LOCKFILE_OUT, 0600, 0); + chmod(FIFO_LOCKFILE_OUT, 0600); + + mPipe_lockfd_out = open(FIFO_LOCKFILE_OUT, O_RDWR | O_NONBLOCK); + if (mPipe_lockfd_out > -1) { + if (writepid) { + // Write my PID to the file + pid_t tsakpid = getpid(); + char pidstring[1024]; + sprintf(pidstring, "%d", tsakpid); + write(mPipe_lockfd_out, pidstring, strlen(pidstring)); + } + // Set the exclusive file lock + return setFileLock(mPipe_lockfd_out, true); + } + + return false; +} + +void broadcast_sak() +{ + // Let anyone listening to our interface know that an SAK keypress was received + // I highly doubt there are more than 255 VTs active at once... + int i; + for (i=0;i<255;i++) { + if (write(mPipe_fd_out, "SAK\n\r", 6) < 0) { + fprintf(stderr, "Unable to send SAK signal to clients\n"); + } + } +} + +void restart_tsak() +{ + int i; + + fprintf(stderr, "Forcibly terminating...\n"); + + // Close down all child processes + for (i=0; i0) { + return 4; + } + sleep(1); + restart_tsak(); + } } else { - if(ioctl(fd, EVIOCGRAB, 2) < 0) { - close(fd); - fprintf(stderr, "Failed to grab exclusive input device lock"); - if (established) - sleep(1); - else - return 1; - } - else { - ioctl(fd, EVIOCGNAME(UINPUT_MAX_NAME_SIZE), devinfo.name); - strncat(devinfo.name, "+tsak", UINPUT_MAX_NAME_SIZE-1); - fprintf(stderr, "%s\n", devinfo.name); - ioctl(fd, EVIOCGID, &devinfo.id); - - copy_features(fd, devout); - write(devout,&devinfo,sizeof(devinfo)); - if (ioctl(devout,UI_DEV_CREATE)<0) { - fprintf(stderr,"Unable to create input device with UI_DEV_CREATE\n"); + fprintf(stderr, "Found %d keyboard(s)\n", keyboard_fd_num); + + can_proceed = true; + for (current_keyboard=0;current_keyboard0) { - // close parent process - close(mPipe_fd_out); - return 0; - } - setupPipe(); + if (can_proceed == true) { + for (current_keyboard=0;current_keyboard0) { + child_pids[current_keyboard] = i; + continue; + } + setupLockingPipe(false); + } - if (testrun == true) { - return 0; - } - - while (1) { - if ((rd = read (fd, ev, size * 2)) < size) { - fprintf(stderr,"Read failed.\n"); - break; - } - - value = ev[0].value; - - if (value != ' ' && ev[1].value == 0 && ev[1].type == 1){ // Read the key release event - if (keycode[(ev[1].code)]) { - if (strcmp(keycode[(ev[1].code)], "") == 0) ctrl_down = false; - if (strcmp(keycode[(ev[1].code)], "") == 0) alt_down = false; + established = true; + + if (testrun == true) { + return 0; } - } - if (value != ' ' && ev[1].value == 1 && ev[1].type == 1){ // Read the key press event - if (keycode[(ev[1].code)]) { - if (strcmp(keycode[(ev[1].code)], "") == 0) ctrl_down = true; - if (strcmp(keycode[(ev[1].code)], "") == 0) alt_down = true; + + while (1) { + if ((rd = read (keyboard_fds[current_keyboard], ev, size)) < size) { + fprintf(stderr, "Read failed.\n"); + break; + } + + // Replicate LED events from the virtual keyboard to the physical keyboard + int rrd = read(devout[current_keyboard], &revev, size); + if (rrd >= size) { + if (revev.type == EV_LED) { + if (write(keyboard_fds[current_keyboard], &revev, sizeof(revev)) < 0) { + fprintf(stderr, "Unable to replicate LED event\n"); + } + } + } + + if (ev[0].value == 0 && ev[0].type == 1) { // Read the key release event + if (keycode[(ev[0].code)]) { + if (strcmp(keycode[(ev[0].code)], "") == 0) ctrl_down = false; + if (strcmp(keycode[(ev[0].code)], "") == 0) alt_down = false; + } + } + if (ev[0].value == 1 && ev[0].type == 1) { // Read the key press event + if (keycode[(ev[0].code)]) { + if (strcmp(keycode[(ev[0].code)], "") == 0) ctrl_down = true; + if (strcmp(keycode[(ev[0].code)], "") == 0) alt_down = true; + } + } + + hide_event = false; + if (ev[0].value == 1 && ev[0].type == 1) { // Read the key press event + if (keycode[(ev[0].code)]) { + if (alt_down && ctrl_down && (strcmp(keycode[(ev[0].code)], "") == 0)) { + hide_event = true; + } + } + } + + if ((hide_event == false) && (ev[0].type != EV_LED) && (ev[1].type != EV_LED)) { + // Pass the event on... + event = ev[0]; + if (write(devout[current_keyboard], &event, sizeof event) < 0) { + fprintf(stderr, "Unable to replicate keyboard event!\n"); + } + } + if (hide_event == true) { + // Let anyone listening to our interface know that an SAK keypress was received + broadcast_sak(); + } } } - - hide_event = false; - if (keycode[(ev[1].code)]) { - if (alt_down && ctrl_down && (strcmp(keycode[(ev[1].code)], "") == 0)) { - hide_event = true; + } + } + + // fork udev monitor process + int i=fork(); + if (i<0) { + return 10; // fork failed + } + if (i>0) { + // Terminate parent + controlpipe.active = false; + return 0; + } + + // Prevent multiple process instances from starting + setupLockingPipe(true); + + // Wait a little bit so that udev hotplug can stabilize before we start monitoring + sleep(1); + + fprintf(stderr, "Hotplug monitoring process started\n"); + + // Monitor for hotplugged keyboards + int j; + int hotplug_fd; + bool is_new_keyboard; + struct udev *udev; + struct udev_device *dev; + struct udev_monitor *mon; + + // Create the udev object + udev = udev_new(); + if (!udev) { + fprintf(stderr, "Cannot connect to udev interface\n"); + return 11; + } + + // Set up a udev monitor to monitor input devices + mon = udev_monitor_new_from_netlink(udev, "udev"); + udev_monitor_filter_add_match_subsystem_devtype(mon, "input", NULL); + udev_monitor_enable_receiving(mon); + + while (1) { + // Watch for input from the monitoring process + dev = udev_monitor_receive_device(mon); + if (dev) { + // If a keyboard was removed we need to restart... + if (strcmp(udev_device_get_action(dev), "remove") == 0) { + udev_device_unref(dev); + udev_unref(udev); + restart_tsak(); + } + + is_new_keyboard = false; + snprintf(filename,sizeof(filename), "%s", udev_device_get_devnode(dev)); + udev_device_unref(dev); + + // Print name of keyboard + hotplug_fd = open(filename, O_RDWR|O_SYNC); + ioctl(hotplug_fd, EVIOCGBIT(EV_KEY, sizeof(key_bitmask)), key_bitmask); + + /* We assume that anything that has an alphabetic key in the + QWERTYUIOP range in it is the main keyboard. */ + for (j = KEY_Q; j <= KEY_P; j++) { + if (TestBit(j, key_bitmask)) { + is_new_keyboard = true; } } - - if (hide_event == false) { - // Pass the event on... - event = ev[0]; - write(devout, &event, sizeof event); - event = ev[1]; - write(devout, &event, sizeof event); + ioctl (hotplug_fd, EVIOCGNAME (sizeof (name)), name); + close(hotplug_fd); + + // Ensure that we do not detect our own tsak faked keyboards + if (str_ends_with(name, "+tsak") == 1) { + is_new_keyboard = false; } - if (hide_event == true) { - // Let anyone listening to our interface know that an SAK keypress was received - // I highly doubt there are more than 255 VTs active at once... - int i; - for (i=0;i<255;i++) { - write(mPipe_fd_out, "SAK\n\r", 6); - } + + // If a keyboard was added we need to restart... + if (is_new_keyboard == true) { + fprintf(stderr, "Hotplugged new keyboard: (%s)\n", name); + udev_unref(udev); + restart_tsak(); } } + else { + fprintf(stderr, "No Device from receive_device(). A udev error has occurred; terminating hotplug monitoring process.\n"); + return 11; + } } + + udev_unref(udev); + + fprintf(stderr, "Hotplug monitoring process terminated\n"); } } } } + catch(exit_exception& e) { + tsak_friendly_termination(); + } return 6; }