From 9750a057f2f36c5b88a5bc53c0a051b605dac061 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Mon, 7 May 2012 01:06:08 +0200 Subject: [PATCH] RHEL/Fedora: massive updates for Fedora 17 (TDE 3.5.13 entire build) --- .../abakus/trinity-abakus-3.5.13.spec | 2 +- .../amarok-3.5.13-adds_ruby_1.9_support.patch | 155 +- .../applications/amarok/trinity-amarok.spec | 4 - .../applications/k3b/trinity-k3b-3.5.13.spec | 2 +- .../trinity-kde-systemsettings.spec | 2 +- .../applications/kdiff3/bp000-c7e29c46.diff | 662 + .../applications/kdiff3/bp001-9b57232f.diff | 627 + .../applications/kdiff3/bp002-d654b107.diff | 328 + .../applications/kdiff3/bp003-3f02b2be.diff | 19 + .../kdiff3/trinity-kdiff3-3.5.13.spec | 12 + ...-locate-3.5.13-fix_gcc47_compilation.patch | 24 +- .../kio-locate/trinity-kio-locate.spec | 7 +- .../applications/koffice/trinity-koffice.spec | 6 +- .../applications/konversation/96f2a488.diff | 84 + .../konversation/bp000-01f5ea83.diff | 3130 + .../konversation/bp001-efdae4e7.diff | 4114 + .../konversation/bp002-c64099e5.diff | 697 + .../konversation/bp003-440010aa.diff | 36 + .../konversation/bp004-ca3d6cef.diff | 200 + .../trinity-konversation-3.5.13.spec | 39 +- .../applications/kradio/trinity-kradio.spec | 3 +- .../ktechlab/trinity-ktechlab.spec | 11 +- .../applications/ktorrent/bp000-a90eb215.diff | 3901 + .../applications/ktorrent/bp001-bb37c405.diff | 3511 + .../applications/ktorrent/bp002-0d48fca8.diff | 1585 + .../applications/ktorrent/bp003-c3480dfe.diff | 19 + .../applications/ktorrent/bp004-445a5152.diff | 123 + .../applications/ktorrent/bp005-03d0c794.diff | 35 + .../applications/ktorrent/bp006-5af9907f.diff | 139176 +++++++++++++++ .../applications/ktorrent/bp007-355c6b69.diff | 122 + .../ktorrent-3.5.13-5dcbbbba-partial.diff | 156 + .../ktorrent/trinity-ktorrent.spec | 51 +- .../kuickshow/bp000-8712ab46.diff | 182 + .../kuickshow/bp001-28d9c774.diff | 226 + .../kuickshow/bp002-bdeb8b3a.diff | 166 + .../kuickshow/bp003-d97e403f.diff | 23 + .../kuickshow/trinity-kuickshow-3.5.13.spec | 135 + redhat/applications/kvirc/bp000-32a249ba.diff | 4337 + redhat/applications/kvirc/bp001-f9114981.diff | 3358 + redhat/applications/kvirc/bp002-2dd6d32b.diff | 4391 + redhat/applications/kvirc/bp003-1c00d6ff.diff | 19 + redhat/applications/kvirc/bp004-ff96f491.diff | 19 + redhat/applications/kvirc/bp005-2285efe5.diff | 49 + redhat/applications/kvirc/bp006-51bbe9e5.diff | 32 + redhat/applications/kvirc/bp007-a24a8595.diff | 1956 + .../kvirc/kvirc-3.5.13-fix_acinclude_m4.patch | 66 + redhat/applications/kvirc/trinity-kvirc.spec | 69 +- redhat/applications/kvkbd/trinity-kvkbd.spec | 12 +- .../trinity-kwin-style-crystal-3.5.13.spec | 17 +- .../piklab-3.5.13-fix_gcc47_compilation.patch | 33 + .../applications/piklab/trinity-piklab.spec | 27 +- .../potracegui/trinity-potracegui.spec | 10 +- ...egarden-3.5.13-fix_gcc47_compilation.patch | 334 + ...arden-3.5.13-fix_gcc47_compilation_2.patch | 20 + .../rosegarden/trinity-rosegarden.spec | 41 +- .../smartcardauth/trinity-smartcardauth.spec | 6 +- .../smb4k-3.5.13-fix_gcc47_compilation.patch | 18 + redhat/applications/smb4k/trinity-smb4k.spec | 26 +- .../trinity-soundkonverter.spec | 10 +- ...tellico-3.5.13-fix_gcc47_compilation.patch | 10 + .../applications/tellico/trinity-tellico.spec | 29 +- .../wlassistant/trinity-wlassistant.spec | 6 +- .../yakuake/trinity-yakuake-3.5.13.spec | 13 +- redhat/components-3.5.13.txt | 173 +- .../arts/trinity-arts-3.5.13.spec | 17 +- .../dbus-1-tqt/dbus-1-tqt-3.5.13.spec | 26 +- .../dbus-tqt/dbus-tqt-3.5.13.spec | 32 +- .../qt3/{qt3.spec => qt3-3.3.8.d.spec} | 7 +- .../tqtinterface/tqtinterface-3.5.13.spec | 23 +- redhat/extras/akode/trinity-akode.spec | 79 +- .../extras/kasablanca/trinity-kasablanca.spec | 15 +- .../kdebluetooth-fix_gcc_46_compilation.patch | 67 + .../kdebluetooth/kdebluetooth-trinity.patch | 33 +- .../kdebluetooth/trinity-kdebluetooth.spec | 54 +- .../{libkarma.spec => trinity-libkarma.spec} | 21 +- redhat/genrpm.sh | 17 +- .../trinity-kdeaccessibility-3.5.13.spec | 23 +- .../kdeaddons/trinity-kdeaddons-3.5.13.spec | 14 +- redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec | 12 +- .../kdeartwork/trinity-kdeartwork-3.5.13.spec | 16 +- .../kdebase-3.5.13-add_usbstorage_panel.patch | 1284 + redhat/kdebase/trinity-kdebase-3.5.13.spec | 23 +- .../trinity-kdebindings-3.5.13.spec | 32 +- redhat/kdeedu/trinity-kdeedu-3.5.13.spec | 25 +- redhat/kdegames/trinity-kdegames-3.5.13.spec | 20 +- .../kdebase-3.5.13-poppler_tqt_ftbfs.patch | 13 - ...egraphics-3.5.13-fix_poppler_support.patch | 27 + .../trinity-kdegraphics-3.5.13.spec | 42 +- redhat/kdelibs/trinity-kdelibs-3.5.13.spec | 14 +- .../trinity-kdemultimedia-3.5.13.spec | 16 +- .../kdenetwork/trinity-kdenetwork-3.5.13.spec | 14 +- redhat/kdepim/trinity-kdepim-3.5.13.spec | 10 +- redhat/kdesdk/trinity-kdesdk-3.5.13.spec | 29 +- redhat/kdetoys/trinity-kdetoys-3.5.13.spec | 25 +- redhat/kdeutils/trinity-kdeutils-3.5.13.spec | 14 +- .../c_cpp_reference-2.0.2-config.patch | 4 +- .../kdevelop-3.5.13-kdevdesigner-ftbfs.patch | 2 +- redhat/kdevelop/trinity-kdevelop-3.5.13.spec | 39 +- .../kdewebdev/trinity-kdewebdev-3.5.13.spec | 26 +- 99 files changed, 176050 insertions(+), 721 deletions(-) create mode 100644 redhat/applications/kdiff3/bp000-c7e29c46.diff create mode 100644 redhat/applications/kdiff3/bp001-9b57232f.diff create mode 100644 redhat/applications/kdiff3/bp002-d654b107.diff create mode 100644 redhat/applications/kdiff3/bp003-3f02b2be.diff create mode 100644 redhat/applications/konversation/96f2a488.diff create mode 100644 redhat/applications/konversation/bp000-01f5ea83.diff create mode 100644 redhat/applications/konversation/bp001-efdae4e7.diff create mode 100644 redhat/applications/konversation/bp002-c64099e5.diff create mode 100644 redhat/applications/konversation/bp003-440010aa.diff create mode 100644 redhat/applications/konversation/bp004-ca3d6cef.diff create mode 100644 redhat/applications/ktorrent/bp000-a90eb215.diff create mode 100644 redhat/applications/ktorrent/bp001-bb37c405.diff create mode 100644 redhat/applications/ktorrent/bp002-0d48fca8.diff create mode 100644 redhat/applications/ktorrent/bp003-c3480dfe.diff create mode 100644 redhat/applications/ktorrent/bp004-445a5152.diff create mode 100644 redhat/applications/ktorrent/bp005-03d0c794.diff create mode 100644 redhat/applications/ktorrent/bp006-5af9907f.diff create mode 100644 redhat/applications/ktorrent/bp007-355c6b69.diff create mode 100644 redhat/applications/ktorrent/ktorrent-3.5.13-5dcbbbba-partial.diff create mode 100644 redhat/applications/kuickshow/bp000-8712ab46.diff create mode 100644 redhat/applications/kuickshow/bp001-28d9c774.diff create mode 100644 redhat/applications/kuickshow/bp002-bdeb8b3a.diff create mode 100644 redhat/applications/kuickshow/bp003-d97e403f.diff create mode 100644 redhat/applications/kuickshow/trinity-kuickshow-3.5.13.spec create mode 100644 redhat/applications/kvirc/bp000-32a249ba.diff create mode 100644 redhat/applications/kvirc/bp001-f9114981.diff create mode 100644 redhat/applications/kvirc/bp002-2dd6d32b.diff create mode 100644 redhat/applications/kvirc/bp003-1c00d6ff.diff create mode 100644 redhat/applications/kvirc/bp004-ff96f491.diff create mode 100644 redhat/applications/kvirc/bp005-2285efe5.diff create mode 100644 redhat/applications/kvirc/bp006-51bbe9e5.diff create mode 100644 redhat/applications/kvirc/bp007-a24a8595.diff create mode 100644 redhat/applications/kvirc/kvirc-3.5.13-fix_acinclude_m4.patch create mode 100644 redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch create mode 100644 redhat/applications/rosegarden/rosegarden-3.5.13-fix_gcc47_compilation.patch create mode 100644 redhat/applications/rosegarden/rosegarden-3.5.13-fix_gcc47_compilation_2.patch create mode 100644 redhat/applications/smb4k/smb4k-3.5.13-fix_gcc47_compilation.patch create mode 100644 redhat/applications/tellico/tellico-3.5.13-fix_gcc47_compilation.patch rename redhat/dependencies/qt3/{qt3.spec => qt3-3.3.8.d.spec} (99%) create mode 100644 redhat/extras/kdebluetooth/kdebluetooth-fix_gcc_46_compilation.patch rename redhat/extras/libkarma/{libkarma.spec => trinity-libkarma.spec} (89%) create mode 100644 redhat/kdebase/kdebase-3.5.13-add_usbstorage_panel.patch delete mode 100644 redhat/kdegraphics/kdebase-3.5.13-poppler_tqt_ftbfs.patch create mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-fix_poppler_support.patch diff --git a/redhat/applications/abakus/trinity-abakus-3.5.13.spec b/redhat/applications/abakus/trinity-abakus-3.5.13.spec index c47b06adc..f10531769 100644 --- a/redhat/applications/abakus/trinity-abakus-3.5.13.spec +++ b/redhat/applications/abakus/trinity-abakus-3.5.13.spec @@ -6,7 +6,7 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables diff --git a/redhat/applications/amarok/amarok-3.5.13-adds_ruby_1.9_support.patch b/redhat/applications/amarok/amarok-3.5.13-adds_ruby_1.9_support.patch index c18b57d57..b7fec06cc 100644 --- a/redhat/applications/amarok/amarok-3.5.13-adds_ruby_1.9_support.patch +++ b/redhat/applications/amarok/amarok-3.5.13-adds_ruby_1.9_support.patch @@ -1,69 +1,88 @@ ---- amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt.ORI 2012-05-01 11:32:31.604163233 +0200 -+++ amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt 2012-05-01 11:32:39.764016446 +0200 -@@ -16,6 +16,7 @@ - - include_directories( - ${RUBY_INCLUDE_DIR} -+ ${RUBY_ARCH_INCLUDE_DIR} - ) +diff -urN amarok/amarok/src/mediadevice/daap/ConfigureChecks.cmake amarok.new/amarok/src/mediadevice/daap/ConfigureChecks.cmake +--- amarok/amarok/src/mediadevice/daap/ConfigureChecks.cmake 2012-04-13 01:59:24.000000000 -0500 ++++ amarok.new/amarok/src/mediadevice/daap/ConfigureChecks.cmake 2012-05-06 15:18:36.000000000 -0500 +@@ -14,15 +14,51 @@ + tde_message_fatal( "ruby is required, but was not found on your system" ) + endif( ) - ##### other data ################################ ---- amarok/amarok/src/mediadevice/daap/ConfigureChecks.cmake.ruby 2011-05-03 07:45:53.000000000 +0200 -+++ amarok/amarok/src/mediadevice/daap/ConfigureChecks.cmake 2012-05-01 17:12:11.980323997 +0200 -@@ -32,8 +32,33 @@ ++# In ruby 1.9.x, ruby.h is located in a different location than previous releases. + execute_process( +- COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['archdir'] )" +- OUTPUT_VARIABLE RUBY_INCLUDE_DIR ++ COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )" ++ OUTPUT_VARIABLE RUBY_VERSION_MAJOR + RESULT_VARIABLE _result + OUTPUT_STRIP_TRAILING_WHITESPACE ) + if( _result ) tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" ) endif( ) - +- +execute_process( -+ COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )" -+ OUTPUT_VARIABLE RUBY_MAJOR_VERSION ++ COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MINOR'] )" ++ OUTPUT_VARIABLE RUBY_VERSION_MINOR + RESULT_VARIABLE _result -+ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ OUTPUT_STRIP_TRAILING_WHITESPACE ) +if( _result ) + tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" ) +endif( ) -+ ++set( RUBY_VERSION ${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR} ) ++if ( "${RUBY_VERSION}" GREATER "18" ) ++ execute_process( ++ COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['rubyhdrdir'] )" ++ OUTPUT_VARIABLE RUBY_INCLUDE_DIR ++ RESULT_VARIABLE _result ++ OUTPUT_STRIP_TRAILING_WHITESPACE ) ++ if( _result ) ++ tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" ) ++ endif( ) ++else( ) ++ execute_process( ++ COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['archdir'] )" ++ OUTPUT_VARIABLE RUBY_INCLUDE_DIR ++ RESULT_VARIABLE _result ++ OUTPUT_STRIP_TRAILING_WHITESPACE ) ++ if( _result ) ++ tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" ) ++ endif( ) ++endif( ) +execute_process( -+ COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MINOR'] )" -+ OUTPUT_VARIABLE RUBY_MINOR_VERSION ++ COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['arch'] )" ++ OUTPUT_VARIABLE RUBY_ARCH + RESULT_VARIABLE _result -+ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ OUTPUT_STRIP_TRAILING_WHITESPACE ) +if( _result ) + tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" ) +endif( ) -+ - if( RUBY_INCLUDE_DIR AND RUBY_LDFLAGS ) + execute_process( + COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['LIBRUBYARG_SHARED'] )" + OUTPUT_VARIABLE RUBY_LDFLAGS +@@ -36,4 +72,11 @@ message( STATUS "Found RUBY: ${RUBY_EXECUTABLE}" ) message( STATUS " RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}" ) message( STATUS " RUBY_LDFLAGS: ${RUBY_LDFLAGS}" ) -+ message( STATUS " RUBY_MAJOR_VERSION: ${RUBY_MAJOR_VERSION}") -+ message( STATUS " RUBY_MINOR_VERSION: ${RUBY_MINOR_VERSION}") - endif( ) -+ -+if ( "${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" VERSION_LESS "1.9" ) ++ message( STATUS " RUBY_VERSION_MAJOR: ${RUBY_VERSION_MAJOR}") ++ message( STATUS " RUBY_VERSION_MINOR: ${RUBY_VERSION_MINOR}") ++ message( STATUS " RUBY_ARCH: ${RUBY_ARCH}") ++endif( ) ++if ( "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}" VERSION_LESS "19" ) + message( STATUS " You have an old version of Ruby ! (<1.9)") + set ( HAVE_OLD_RUBY 1 CACHE INTERNAL "" ) -+endif( ) ---- amarok/config.h.cmake.ORI 2012-05-01 17:12:53.044914450 +0200 -+++ amarok/config.h.cmake 2012-05-01 17:13:08.307133030 +0200 -@@ -16,3 +16,5 @@ - - #cmakedefine TAGLIB_15 1 - #cmakedefine HAVE_QGLWIDGET 1 -+ -+#cmakedefine HAVE_OLD_RUBY @HAVE_OLD_RUBY@ ---- amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt.ORI 2012-05-01 18:34:12.577433198 +0200 -+++ amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt 2012-05-01 18:34:23.840269058 +0200 -@@ -15,6 +15,7 @@ + endif( ) +diff -urN amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt amarok.new/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt +--- amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt 2012-04-13 01:59:24.000000000 -0500 ++++ amarok.new/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt 2012-05-06 15:19:57.000000000 -0500 +@@ -15,6 +15,8 @@ ) include_directories( + ${CMAKE_BINARY_DIR} ++ ${RUBY_INCLUDE_DIR}/${RUBY_ARCH} ${RUBY_INCLUDE_DIR} - ${RUBY_ARCH_INCLUDE_DIR} ) ---- amarok/amarok/src/mediadevice/daap/mongrel/http11/http11.c.ruby 2011-09-19 06:40:11.000000000 +0200 -+++ amarok/amarok/src/mediadevice/daap/mongrel/http11/http11.c 2012-05-01 16:25:32.486067476 +0200 + +diff -urN amarok/amarok/src/mediadevice/daap/mongrel/http11/http11.c amarok.new/amarok/src/mediadevice/daap/mongrel/http11/http11.c +--- amarok/amarok/src/mediadevice/daap/mongrel/http11/http11.c 2012-04-13 03:04:44.000000000 -0500 ++++ amarok.new/amarok/src/mediadevice/daap/mongrel/http11/http11.c 2012-05-06 15:13:20.000000000 -0500 @@ -2,6 +2,7 @@ * Copyright (c) 2005 Zed A. Shaw * You can redistribute it and/or modify it under the same terms as Ruby. @@ -76,8 +95,9 @@ f = rb_str_dup(global_http_prefix); f = rb_str_buf_cat(f, field, flen); +- for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) { +#ifdef HAVE_OLD_RUBY - for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) { ++ for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) { +#else + for(ch = RSTRING_PTR(f), end = ch + RSTRING_LEN(f); ch < end; ch++) { +#endif @@ -88,21 +108,25 @@ rb_hash_aset(req, global_gateway_interface, global_gateway_interface_value); if((temp = rb_hash_aref(req, global_http_host)) != Qnil) { +- colon = strchr(RSTRING(temp)->ptr, ':'); +#ifdef HAVE_OLD_RUBY - colon = strchr(RSTRING(temp)->ptr, ':'); ++ colon = strchr(RSTRING(temp)->ptr, ':'); +#else + colon = strchr(RSTRING_PTR(temp), ':'); +#endif if(colon != NULL) { +- rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr)); +#ifdef HAVE_OLD_RUBY - rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr)); ++ rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr)); +#else + rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING_PTR(temp))); +#endif rb_hash_aset(req, global_server_port, +- rb_str_substr(temp, colon - RSTRING(temp)->ptr+1, +- RSTRING(temp)->len)); +#ifdef HAVE_OLD_RUBY - rb_str_substr(temp, colon - RSTRING(temp)->ptr+1, - RSTRING(temp)->len)); ++ rb_str_substr(temp, colon - RSTRING(temp)->ptr+1, ++ RSTRING(temp)->len)); +#else + rb_str_substr(temp, colon - RSTRING_PTR(temp)+1, + RSTRING_LEN(temp))); @@ -114,9 +138,11 @@ DATA_GET(self, http_parser, http); from = FIX2INT(start); +- dptr = RSTRING(data)->ptr; +- dlen = RSTRING(data)->len; +#ifdef HAVE_OLD_RUBY - dptr = RSTRING(data)->ptr; - dlen = RSTRING(data)->len; ++ dptr = RSTRING(data)->ptr; ++ dlen = RSTRING(data)->len; +#else + dptr = RSTRING_PTR(data); + dlen = RSTRING_LEN(data); @@ -128,11 +154,40 @@ if(pref_len == 1 && uri_str[0] == '/') { rb_ary_push(result, uri); } else { +- rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len)); +#ifdef HAVE_OLD_RUBY - rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len)); ++ rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len)); +#else + rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING_LEN(uri))); +#endif } rb_ary_push(result, (VALUE)handler); +diff -urN amarok/config.h.cmake amarok.new/config.h.cmake +--- amarok/config.h.cmake 2012-04-13 01:59:26.000000000 -0500 ++++ amarok.new/config.h.cmake 2012-05-06 15:02:40.000000000 -0500 +@@ -16,3 +16,4 @@ + + #cmakedefine TAGLIB_15 1 + #cmakedefine HAVE_QGLWIDGET 1 ++#cmakedefine HAVE_OLD_RUBY @HAVE_OLD_RUBY@ +\ No newline at end of file +diff -urN amarok/configure.in amarok.new/configure.in +--- amarok/configure.in 2012-04-13 01:59:26.000000000 -0500 ++++ amarok.new/configure.in 2012-05-06 14:53:40.000000000 -0500 +@@ -1162,7 +1162,14 @@ + + AC_PATH_PROG(RUBY, ruby, no) + +-ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`] ++if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then ++ # Ruby 1.9 ++ ruby_includes=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'` ++else ++ # not Ruby 1.9 ++ ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`] ++fi ++ + ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'`] + + AC_SUBST(ruby_includes) diff --git a/redhat/applications/amarok/trinity-amarok.spec b/redhat/applications/amarok/trinity-amarok.spec index c70828000..4ebe7ed1e 100644 --- a/redhat/applications/amarok/trinity-amarok.spec +++ b/redhat/applications/amarok/trinity-amarok.spec @@ -15,9 +15,6 @@ BuildRequires: cmake >= 2.8 %define tde_includedir %{_includedir}/kde %define tde_libdir %{_libdir}/trinity -# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file) -%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') - Name: trinity-%{kdecomp} Summary: Media player @@ -186,7 +183,6 @@ cd build -DWITH_DAAP=ON \ -DBUILD_ALL=ON \ -DQT_LIBRARY_DIRS="${QTLIB}" \ - -DRUBY_ARCH_INCLUDE_DIR="%{_usr}/include/%{_normalized_cpu}-%{_target_os}" \ .. %__make %{?_smp_mflags} diff --git a/redhat/applications/k3b/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec index a0569181a..4fd7f7221 100644 --- a/redhat/applications/k3b/trinity-k3b-3.5.13.spec +++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec @@ -56,7 +56,7 @@ BuildRequires: trinity-kdelibs-devel BuildRequires: desktop-file-utils BuildRequires: alsa-lib-devel BuildRequires: audiofile-devel -BuildRequires: dbus-qt-devel hal-devel +BuildRequires: dbus-tqt-devel hal-devel BuildRequires: flac-devel BuildRequires: gettext BuildRequires: libdvdread-devel diff --git a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec index bd19f7746..bbe54c7e9 100644 --- a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec +++ b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec @@ -17,7 +17,7 @@ BuildRequires: autoconf automake libtool m4 %define tde_libdir %{_libdir}/trinity -Name: trinity-%{kdecomp} +Name: trinity-systemsettings Summary: easy to use control centre for TDE Version: %{?version} Release: %{?release}%{?dist}%{?_variant} diff --git a/redhat/applications/kdiff3/bp000-c7e29c46.diff b/redhat/applications/kdiff3/bp000-c7e29c46.diff new file mode 100644 index 000000000..821fe6fe1 --- /dev/null +++ b/redhat/applications/kdiff3/bp000-c7e29c46.diff @@ -0,0 +1,662 @@ +commit c7e29c4606e72cf1d3d0052eec08805c8cf3fce7 +Author: Timothy Pearson +Date: 1324253375 -0600 + + Rename old tq methods that no longer need a unique name + +diff --git a/src/diff.h b/src/diff.h +index ee3076e..a4015d1 100644 +--- a/src/diff.h ++++ b/src/diff.h +@@ -169,10 +169,10 @@ public: + typedef std::vector Diff3WrapLineVector; + + +-class TotalDifftqStatus ++class TotalDiffStatus + { + public: +- TotalDifftqStatus(){ reset(); } ++ TotalDiffStatus(){ reset(); } + void reset() {bBinaryAEqC=false; bBinaryBEqC=false; bBinaryAEqB=false; + bTextAEqC=false; bTextBEqC=false; bTextAEqB=false; + nofUnsolvedConflicts=0; nofSolvedConflicts=0; +diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp +index 3c570e4..361eb73 100644 +--- a/src/difftextwindow.cpp ++++ b/src/difftextwindow.cpp +@@ -860,9 +860,9 @@ void DiffTextWindowData::writeLine( + else + { + p.fillRect( xOffset + fontWidth*outPos, yOffset, +- fontWidth*(spaces), fontHeight, m_pDiffTextWindow->tqcolorGroup().highlight() ); ++ fontWidth*(spaces), fontHeight, m_pDiffTextWindow->colorGroup().highlight() ); + +- p.setPen( m_pDiffTextWindow->tqcolorGroup().highlightedText() ); ++ p.setPen( m_pDiffTextWindow->colorGroup().highlightedText() ); + p.drawText( xOffset + fontWidth*outPos, yOffset + fontAscent, s ); + + m_selection.bSelectionContainsData = true; +@@ -875,7 +875,7 @@ void DiffTextWindowData::writeLine( + if( m_selection.lineWithin( line ) && m_selection.lineWithin( line+1 ) ) + { + p.fillRect( xOffset + fontWidth*outPos, yOffset, +- deviceWidth, fontHeight, m_pDiffTextWindow->tqcolorGroup().highlight() ); ++ deviceWidth, fontHeight, m_pDiffTextWindow->colorGroup().highlight() ); + } + } + +diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp +index 7565e20..0520af3 100644 +--- a/src/directorymergewindow.cpp ++++ b/src/directorymergewindow.cpp +@@ -387,7 +387,7 @@ static TQPixmap pixCombiner2( const TQPixmap* pm1, const TQPixmap* pm2 ) + return pix; + } + +-static void calcDirtqStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles, ++static void calcDirStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles, + int& nofDirs, int& nofEqualFiles, int& nofManualMerges ) + { + if ( i->m_pMFI->m_bDirA || i->m_pMFI->m_bDirB || i->m_pMFI->m_bDirC ) +@@ -408,7 +408,7 @@ static void calcDirtqStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles, + } + } + for( TQListViewItem* p = i->firstChild(); p!=0; p = p->nextSibling() ) +- calcDirtqStatus( bThreeDirs, static_cast(p), nofFiles, nofDirs, nofEqualFiles, nofManualMerges ); ++ calcDirStatus( bThreeDirs, static_cast(p), nofFiles, nofDirs, nofEqualFiles, nofManualMerges ); + } + + static TQString sortString(const TQString& s, bool bCaseSensitive) +@@ -698,7 +698,7 @@ bool DirectoryMergeWindow::init + int nofEqualFiles=0; + int nofManualMerges=0; + for( TQListViewItem* p = firstChild(); p!=0; p = p->nextSibling() ) +- calcDirtqStatus( m_dirC.isValid(), static_cast(p), ++ calcDirStatus( m_dirC.isValid(), static_cast(p), + nofFiles, nofDirs, nofEqualFiles, nofManualMerges ); + + TQString s; +@@ -915,10 +915,10 @@ void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi ) + mfi.m_bExistsInB ? mfi.m_fileInfoB.absFilePath() : TQString(""), + mfi.m_bExistsInC ? mfi.m_fileInfoC.absFilePath() : TQString(""), + "", +- "","","",&mfi.m_totalDifftqStatus ++ "","","",&mfi.m_totalDiffStatus + ); +- int nofNonwhiteConflicts = mfi.m_totalDifftqStatus.nofUnsolvedConflicts + +- mfi.m_totalDifftqStatus.nofSolvedConflicts - mfi.m_totalDifftqStatus.nofWhitespaceConflicts; ++ int nofNonwhiteConflicts = mfi.m_totalDiffStatus.nofUnsolvedConflicts + ++ mfi.m_totalDiffStatus.nofSolvedConflicts - mfi.m_totalDiffStatus.nofWhitespaceConflicts; + + if (m_pOptions->m_bDmWhiteSpaceEqual && nofNonwhiteConflicts == 0) + { +@@ -928,25 +928,25 @@ void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi ) + } + else + { +- mfi.m_bEqualAB = mfi.m_totalDifftqStatus.bBinaryAEqB; +- mfi.m_bEqualBC = mfi.m_totalDifftqStatus.bBinaryBEqC; +- mfi.m_bEqualAC = mfi.m_totalDifftqStatus.bBinaryAEqC; ++ mfi.m_bEqualAB = mfi.m_totalDiffStatus.bBinaryAEqB; ++ mfi.m_bEqualBC = mfi.m_totalDiffStatus.bBinaryBEqC; ++ mfi.m_bEqualAC = mfi.m_totalDiffStatus.bBinaryAEqC; + } + } + } + else + { + bool bError; +- TQString eqtqStatus; ++ TQString eqStatus; + if( mfi.m_bExistsInA && mfi.m_bExistsInB ) + { + if( mfi.m_bDirA ) mfi.m_bEqualAB=true; +- else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoB, mfi.m_bEqualAB, bError, eqtqStatus ); ++ else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoB, mfi.m_bEqualAB, bError, eqStatus ); + } + if( mfi.m_bExistsInA && mfi.m_bExistsInC ) + { + if( mfi.m_bDirA ) mfi.m_bEqualAC=true; +- else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoC, mfi.m_bEqualAC, bError, eqtqStatus ); ++ else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoC, mfi.m_bEqualAC, bError, eqStatus ); + } + if( mfi.m_bExistsInB && mfi.m_bExistsInC ) + { +@@ -955,7 +955,7 @@ void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi ) + else + { + if( mfi.m_bDirB ) mfi.m_bEqualBC=true; +- else fastFileComparison( mfi.m_fileInfoB, mfi.m_fileInfoC, mfi.m_bEqualBC, bError, eqtqStatus ); ++ else fastFileComparison( mfi.m_fileInfoB, mfi.m_fileInfoC, mfi.m_bEqualBC, bError, eqStatus ); + } + } + } +@@ -1723,7 +1723,7 @@ void DirMergeItem::init(MergeFileInfos* pMFI) + { + pMFI->m_pDMI = this; + m_pMFI = pMFI; +- TotalDifftqStatus& tds = pMFI->m_totalDifftqStatus; ++ TotalDiffStatus& tds = pMFI->m_totalDiffStatus; + if ( m_pMFI->m_bDirA || m_pMFI->m_bDirB || m_pMFI->m_bDirC ) + { + } +@@ -2820,7 +2820,7 @@ TQTextStream& operator<<( TQTextStream& ts, MergeFileInfos& mfi ) + //FileAccess m_fileInfoB; + //FileAccess m_fileInfoC; + +- //TotalDifftqStatus m_totalDifftqStatus; ++ //TotalDiffStatus m_totalDiffStatus; + + vm.save(ts); + +diff --git a/src/directorymergewindow.h b/src/directorymergewindow.h +index 25a66f7..99c0405 100644 +--- a/src/directorymergewindow.h ++++ b/src/directorymergewindow.h +@@ -26,7 +26,7 @@ + #include + #include "common.h" + #include "fileaccess.h" +-#include "diff.h" //TotalDifftqStatus ++#include "diff.h" //TotalDiffStatus + + class OptionDialog; + class KIconLoader; +@@ -37,7 +37,7 @@ class TQLabel; + class KAction; + class KToggleAction; + class KActionCollection; +-class TotalDifftqStatus; ++class TotalDiffStatus; + + enum e_MergeOperation + { +@@ -99,7 +99,7 @@ public: + FileAccess m_fileInfoB; + FileAccess m_fileInfoC; + +- TotalDifftqStatus m_totalDifftqStatus; ++ TotalDiffStatus m_totalDiffStatus; + }; + + class DirMergeItem : public TQListViewItem +@@ -319,7 +319,7 @@ protected: + KAction* m_pDirSaveMergeState; + KAction* m_pDirLoadMergeState; + signals: +- void startDiffMerge(TQString fn1,TQString fn2, TQString fn3, TQString ofn, TQString,TQString,TQString,TotalDifftqStatus*); ++ void startDiffMerge(TQString fn1,TQString fn2, TQString fn3, TQString ofn, TQString,TQString,TQString,TotalDiffStatus*); + void checkIfCanContinue( bool* pbContinue ); + void updateAvailabilities(); + void statusBarMessage( const TQString& msg ); +diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp +index c2be1dc..01b8d48 100644 +--- a/src/fileaccess.cpp ++++ b/src/fileaccess.cpp +@@ -407,11 +407,11 @@ bool FileAccess::writeFile( const void* pSrcBuffer, unsigned long length ) + if ( isExecutable() ) // value is true if the old file was executable + { + // Preserve attributes +- struct stat srcFiletqStatus; +- int statResult = ::stat( filePath().ascii(), &srcFiletqStatus ); ++ struct stat srcFileStatus; ++ int statResult = ::stat( filePath().ascii(), &srcFileStatus ); + if (statResult==0) + { +- ::chmod ( filePath().ascii(), srcFiletqStatus.st_mode | S_IXUSR ); ++ ::chmod ( filePath().ascii(), srcFileStatus.st_mode | S_IXUSR ); + } + } + #endif +@@ -938,28 +938,28 @@ bool FileAccessJobHandler::copyFile( const TQString& dest ) + + // Update the times of the destFile + #ifdef _WIN32 +- struct _stat srcFiletqStatus; +- int statResult = ::_stat( srcName.ascii(), &srcFiletqStatus ); ++ struct _stat srcFileStatus; ++ int statResult = ::_stat( srcName.ascii(), &srcFileStatus ); + if (statResult==0) + { + _utimbuf destTimes; +- destTimes.actime = srcFiletqStatus.st_atime;/* time of last access */ +- destTimes.modtime = srcFiletqStatus.st_mtime;/* time of last modification */ ++ destTimes.actime = srcFileStatus.st_atime;/* time of last access */ ++ destTimes.modtime = srcFileStatus.st_mtime;/* time of last modification */ + + _utime ( destName.ascii(), &destTimes ); +- _chmod ( destName.ascii(), srcFiletqStatus.st_mode ); ++ _chmod ( destName.ascii(), srcFileStatus.st_mode ); + } + #else +- struct stat srcFiletqStatus; +- int statResult = ::stat( srcName.ascii(), &srcFiletqStatus ); ++ struct stat srcFileStatus; ++ int statResult = ::stat( srcName.ascii(), &srcFileStatus ); + if (statResult==0) + { + utimbuf destTimes; +- destTimes.actime = srcFiletqStatus.st_atime;/* time of last access */ +- destTimes.modtime = srcFiletqStatus.st_mtime;/* time of last modification */ ++ destTimes.actime = srcFileStatus.st_atime;/* time of last access */ ++ destTimes.modtime = srcFileStatus.st_mtime;/* time of last modification */ + + utime ( destName.ascii(), &destTimes ); +- chmod ( destName.ascii(), srcFiletqStatus.st_mode ); ++ chmod ( destName.ascii(), srcFileStatus.st_mode ); + } + #endif + return true; +@@ -1010,7 +1010,7 @@ void CvsIgnoreList::init( FileAccess& dir, bool bUseLocalCvsIgnore ) + ".nse_depinfo #* .#* cvslog.* ,* CVS CVS.adm .del-* *.a *.olb *.o *.obj " + "*.so *.Z *~ *.old *.elc *.ln *.bak *.BAK *.orig *.rej *.exe _$* *$"; + +- addEntriesFromString(TQString::tqfromLatin1(ignorestr)); ++ addEntriesFromString(TQString::fromLatin1(ignorestr)); + addEntriesFromFile(TQDir::homeDirPath() + "/.cvsignore"); + addEntriesFromString(TQString::fromLocal8Bit(::getenv("CVSIGNORE"))); + +@@ -1032,7 +1032,7 @@ void CvsIgnoreList::init( FileAccess& dir, bool bUseLocalCvsIgnore ) + { + if (pos>pos1) + { +- addEntry( TQString::tqfromLatin1( &buf[pos1], pos-pos1 ) ); ++ addEntry( TQString::fromLatin1( &buf[pos1], pos-pos1 ) ); + } + ++pos1; + } +diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp +index c3541ec..e6b3f40 100644 +--- a/src/kdiff3.cpp ++++ b/src/kdiff3.cpp +@@ -280,8 +280,8 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par + KApplication::kApplication()->iconLoader() ); + m_pDirectoryMergeInfo = new DirectoryMergeInfo( m_pDirectoryMergeSplitter ); + m_pDirectoryMergeWindow->setDirectoryMergeInfo( m_pDirectoryMergeInfo ); +- connect( m_pDirectoryMergeWindow, TQT_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDifftqStatus*)), +- TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen2(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDifftqStatus*))); ++ connect( m_pDirectoryMergeWindow, TQT_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)), ++ TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen2(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*))); + connect( m_pDirectoryMergeWindow, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAvailabilities())); + connect( m_pDirectoryMergeWindow, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAvailabilities())); + connect( m_pDirectoryMergeWindow, TQT_SIGNAL(checkIfCanContinue(bool*)), TQT_TQOBJECT(this), TQT_SLOT(slotCheckIfCanContinue(bool*))); +@@ -341,13 +341,13 @@ void KDiff3App::completeInit( const TQString& fn1, const TQString& fn2, const TQ + SourceData* pSD=0; + if ( m_sd3.isEmpty() ) + { +- if ( m_totalDifftqStatus.bBinaryAEqB ){ pSD = &m_sd1; } ++ if ( m_totalDiffStatus.bBinaryAEqB ){ pSD = &m_sd1; } + } + else + { +- if ( m_totalDifftqStatus.bBinaryBEqC ){ pSD = &m_sd3; } // B==C (assume A is old) +- else if ( m_totalDifftqStatus.bBinaryAEqB ){ pSD = &m_sd3; } // assuming C has changed +- else if ( m_totalDifftqStatus.bBinaryAEqC ){ pSD = &m_sd2; } // assuming B has changed ++ if ( m_totalDiffStatus.bBinaryBEqC ){ pSD = &m_sd3; } // B==C (assume A is old) ++ else if ( m_totalDiffStatus.bBinaryAEqB ){ pSD = &m_sd3; } // assuming C has changed ++ else if ( m_totalDiffStatus.bBinaryAEqC ){ pSD = &m_sd2; } // assuming B has changed + } + + if ( pSD!=0 ) +diff --git a/src/kdiff3.h b/src/kdiff3.h +index f5e240f..c81ae71 100644 +--- a/src/kdiff3.h ++++ b/src/kdiff3.h +@@ -144,7 +144,7 @@ class KDiff3App : public TQSplitter + /** open a file and load it into the document*/ + void slotFileOpen(); + void slotFileOpen2( TQString fn1, TQString fn2, TQString fn3, TQString ofn, +- TQString an1, TQString an2, TQString an3, TotalDifftqStatus* pTotalDifftqStatus ); ++ TQString an1, TQString an2, TQString an3, TotalDiffStatus* pTotalDiffStatus ); + + void slotFileNameChanged(const TQString& fileName, int winIdx); + +@@ -281,7 +281,7 @@ class KDiff3App : public TQSplitter + + TQWidget* m_pCornerWidget; + +- TotalDifftqStatus m_totalDifftqStatus; ++ TotalDiffStatus m_totalDiffStatus; + + SourceData m_sd1; + SourceData m_sd2; +@@ -310,7 +310,7 @@ class KDiff3App : public TQSplitter + OptionDialog* m_pOptionDialog; + FindDialog* m_pFindDialog; + +- void init( bool bAuto=false, TotalDifftqStatus* pTotalDifftqStatus=0, bool bLoadFiles=true ); ++ void init( bool bAuto=false, TotalDiffStatus* pTotalDiffStatus=0, bool bLoadFiles=true ); + + virtual bool eventFilter( TQObject* o, TQEvent* e ); + virtual void resizeEvent(TQResizeEvent*); +diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp +index 119294f..a222a14 100644 +--- a/src/mergeresultwindow.cpp ++++ b/src/mergeresultwindow.cpp +@@ -72,7 +72,7 @@ MergeResultWindow::MergeResultWindow( + m_sizeC = 0; + + m_pDiff3LineList = 0; +- m_pTotalDifftqStatus = 0; ++ m_pTotalDiffStatus = 0; + m_pStatusBar = pStatusBar; + + m_pOptionDialog = pOptionDialog; +@@ -97,7 +97,7 @@ void MergeResultWindow::init( + const LineData* pLineDataB, int sizeB, + const LineData* pLineDataC, int sizeC, + const Diff3LineList* pDiff3LineList, +- TotalDifftqStatus* pTotalDifftqStatus ++ TotalDiffStatus* pTotalDiffStatus + ) + { + m_firstLine = 0; +@@ -118,7 +118,7 @@ void MergeResultWindow::init( + m_sizeC = sizeC; + + m_pDiff3LineList = pDiff3LineList; +- m_pTotalDifftqStatus = pTotalDifftqStatus; ++ m_pTotalDiffStatus = pTotalDiffStatus; + + m_selection.reset(); + m_cursorXPos=0; +@@ -140,7 +140,7 @@ void MergeResultWindow::init( + void MergeResultWindow::reset() + { + m_pDiff3LineList = 0; +- m_pTotalDifftqStatus = 0; ++ m_pTotalDiffStatus = 0; + m_pldA = 0; + m_pldB = 0; + m_pldC = 0; +@@ -467,9 +467,9 @@ void MergeResultWindow::merge(bool bAutoSolve, int defaultSelector, bool bConfli + ++nrOfWhiteSpaceConflicts; + } + +- m_pTotalDifftqStatus->nofUnsolvedConflicts = nrOfUnsolvedConflicts; +- m_pTotalDifftqStatus->nofSolvedConflicts = nrOfSolvedConflicts; +- m_pTotalDifftqStatus->nofWhitespaceConflicts = nrOfWhiteSpaceConflicts; ++ m_pTotalDiffStatus->nofUnsolvedConflicts = nrOfUnsolvedConflicts; ++ m_pTotalDiffStatus->nofSolvedConflicts = nrOfSolvedConflicts; ++ m_pTotalDiffStatus->nofWhitespaceConflicts = nrOfWhiteSpaceConflicts; + + + m_cursorXPos=0; +@@ -804,17 +804,17 @@ void MergeResultWindow::showNrOfConflicts() + ++nrOfConflicts; + } + TQString totalInfo; +- if ( m_pTotalDifftqStatus->bBinaryAEqB && m_pTotalDifftqStatus->bBinaryAEqC ) ++ if ( m_pTotalDiffStatus->bBinaryAEqB && m_pTotalDiffStatus->bBinaryAEqC ) + totalInfo += i18n("All input files are binary equal."); +- else if ( m_pTotalDifftqStatus->bTextAEqB && m_pTotalDifftqStatus->bTextAEqC ) ++ else if ( m_pTotalDiffStatus->bTextAEqB && m_pTotalDiffStatus->bTextAEqC ) + totalInfo += i18n("All input files contain the same text."); + else { +- if ( m_pTotalDifftqStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("B"); +- else if ( m_pTotalDifftqStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("B"); +- if ( m_pTotalDifftqStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("C"); +- else if ( m_pTotalDifftqStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("C"); +- if ( m_pTotalDifftqStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("B").tqarg("C"); +- else if ( m_pTotalDifftqStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("B").tqarg("C"); ++ if ( m_pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("B"); ++ else if ( m_pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("B"); ++ if ( m_pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("C"); ++ else if ( m_pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("C"); ++ if ( m_pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("B").tqarg("C"); ++ else if ( m_pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("B").tqarg("C"); + } + + int nrOfUnsolvedConflicts = getNrOfUnsolvedConflicts(); +@@ -1661,12 +1661,12 @@ void MergeResultWindow::writeLine( + + if( m_selection.lineWithin( line+1 ) ) + p.fillRect( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset, +- width(), fontHeight, tqcolorGroup().highlight() ); ++ width(), fontHeight, colorGroup().highlight() ); + else if ( lengthInLine2>0 ) + p.fillRect( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset, +- fontWidth*lengthInLine2, fontHeight, tqcolorGroup().highlight() ); ++ fontWidth*lengthInLine2, fontHeight, colorGroup().highlight() ); + +- p.setPen( tqcolorGroup().highlightedText() ); ++ p.setPen( colorGroup().highlightedText() ); + p.drawText( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset+fontAscent, + s.mid(firstPosInLine2,lengthInLine2), true ); + } +@@ -3072,7 +3072,7 @@ WindowTitleWidget::WindowTitleWidget(OptionDialog* pOptionDialog, TQWidget* pPar + + m_pModifiedLabel = new TQLabel(i18n("[Modified]"),this); + pHLayout->addWidget( m_pModifiedLabel ); +- m_pModifiedLabel->setMinimumSize( m_pModifiedLabel->tqsizeHint() ); ++ m_pModifiedLabel->setMinimumSize( m_pModifiedLabel->sizeHint() ); + m_pModifiedLabel->setText(""); + + pHLayout->addStretch(1); +@@ -3137,7 +3137,7 @@ void WindowTitleWidget::setEncodings( TQTextCodec* pCodecForA, TQTextCodec* pCod + m_codecMap[i]=it->second; + ++i; + } +- m_pEncodingSelector->setMinimumSize( m_pEncodingSelector->tqsizeHint() ); ++ m_pEncodingSelector->setMinimumSize( m_pEncodingSelector->sizeHint() ); + + if ( pCodecForC && pCodecForB && pCodecForA ) + { +diff --git a/src/mergeresultwindow.h b/src/mergeresultwindow.h +index ed524a5..2b61e6f 100644 +--- a/src/mergeresultwindow.h ++++ b/src/mergeresultwindow.h +@@ -110,7 +110,7 @@ public: + const LineData* pLineDataB, int sizeB, + const LineData* pLineDataC, int sizeC, + const Diff3LineList* pDiff3LineList, +- TotalDifftqStatus* pTotalDifftqStatus ++ TotalDiffStatus* pTotalDiffStatus + ); + + void reset(); +@@ -187,7 +187,7 @@ private: + int m_sizeC; + + const Diff3LineList* m_pDiff3LineList; +- TotalDifftqStatus* m_pTotalDifftqStatus; ++ TotalDiffStatus* m_pTotalDiffStatus; + + bool m_bPaintingAllowed; + int m_delayedDrawTimer; +diff --git a/src/pdiff.cpp b/src/pdiff.cpp +index 033fd31..1452eca 100644 +--- a/src/pdiff.cpp ++++ b/src/pdiff.cpp +@@ -235,14 +235,14 @@ bool KDiff3App::runDiff( const LineData* p1, int size1, const LineData* p2, int + return true; + } + +-void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bLoadFiles ) ++void KDiff3App::init( bool bAuto, TotalDiffStatus* pTotalDiffStatus, bool bLoadFiles ) + { + ProgressProxy pp; + // When doing a full analysis in the directory-comparison, then the statistics-results +- // will be stored in the given TotalDifftqStatus. Otherwise it will be 0. +- bool bGUI = pTotalDifftqStatus == 0; +- if (pTotalDifftqStatus==0) +- pTotalDifftqStatus = &m_totalDifftqStatus; ++ // will be stored in the given TotalDiffStatus. Otherwise it will be 0. ++ bool bGUI = pTotalDiffStatus == 0; ++ if (pTotalDiffStatus==0) ++ pTotalDiffStatus = &m_totalDiffStatus; + + bool bPreserveCarriageReturn = m_pOptionDialog->m_bPreserveCarriageReturn; + +@@ -310,11 +310,11 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL + pp.setMaxNofSteps( 6 ); // 3 comparisons, 3 finediffs + } + +- pTotalDifftqStatus->reset(); ++ pTotalDiffStatus->reset(); + // Run the diff. + if ( m_sd3.isEmpty() ) + { +- pTotalDifftqStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 ); ++ pTotalDiffStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 ); + pp.setInformation(i18n("Diff: A <-> B")); + + runDiff( m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), m_diffList12,1,2 ); +@@ -323,8 +323,8 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL + + pp.setInformation(i18n("Linediff: A <-> B")); + calcDiff3LineListUsingAB( &m_diffList12, m_diff3LineList ); +- fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDifftqStatus->bTextAEqB ); +- if ( m_sd1.getSizeBytes()==0 ) pTotalDifftqStatus->bTextAEqB=false; ++ fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqB ); ++ if ( m_sd1.getSizeBytes()==0 ) pTotalDiffStatus->bTextAEqB=false; + + pp.step(); + } +@@ -337,9 +337,9 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL + pp.step(); + } + +- pTotalDifftqStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 ); +- pTotalDifftqStatus->bBinaryAEqC = m_sd1.isBinaryEqualWith( m_sd3 ); +- pTotalDifftqStatus->bBinaryBEqC = m_sd3.isBinaryEqualWith( m_sd2 ); ++ pTotalDiffStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 ); ++ pTotalDiffStatus->bBinaryAEqC = m_sd1.isBinaryEqualWith( m_sd3 ); ++ pTotalDiffStatus->bBinaryBEqC = m_sd3.isBinaryEqualWith( m_sd2 ); + + pp.setInformation(i18n("Diff: A <-> B")); + runDiff( m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), m_diffList12,1,2 ); +@@ -364,16 +364,16 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL + debugLineCheck( m_diff3LineList, m_sd3.getSizeLines(), 3 ); + + pp.setInformation(i18n("Linediff: A <-> B")); +- fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDifftqStatus->bTextAEqB ); ++ fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqB ); + pp.step(); + pp.setInformation(i18n("Linediff: B <-> C")); +- fineDiff( m_diff3LineList, 2, m_sd2.getLineDataForDisplay(), m_sd3.getLineDataForDisplay(), pTotalDifftqStatus->bTextBEqC ); ++ fineDiff( m_diff3LineList, 2, m_sd2.getLineDataForDisplay(), m_sd3.getLineDataForDisplay(), pTotalDiffStatus->bTextBEqC ); + pp.step(); + pp.setInformation(i18n("Linediff: A <-> C")); +- fineDiff( m_diff3LineList, 3, m_sd3.getLineDataForDisplay(), m_sd1.getLineDataForDisplay(), pTotalDifftqStatus->bTextAEqC ); ++ fineDiff( m_diff3LineList, 3, m_sd3.getLineDataForDisplay(), m_sd1.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqC ); + pp.step(); +- if ( m_sd1.getSizeBytes()==0 ) { pTotalDifftqStatus->bTextAEqB=false; pTotalDifftqStatus->bTextAEqC=false; } +- if ( m_sd2.getSizeBytes()==0 ) { pTotalDifftqStatus->bTextAEqB=false; pTotalDifftqStatus->bTextBEqC=false; } ++ if ( m_sd1.getSizeBytes()==0 ) { pTotalDiffStatus->bTextAEqB=false; pTotalDiffStatus->bTextAEqC=false; } ++ if ( m_sd2.getSizeBytes()==0 ) { pTotalDiffStatus->bTextAEqB=false; pTotalDiffStatus->bTextBEqC=false; } + } + m_diffBufferInfo.init( &m_diff3LineList, &m_diff3LineVector, + m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), +@@ -420,7 +420,7 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL + m_sd2.getLineDataForDisplay(), m_sd2.getSizeLines(), + m_bTripleDiff ? m_sd3.getLineDataForDisplay() : 0, m_sd3.getSizeLines(), + &m_diff3LineList, +- pTotalDifftqStatus ++ pTotalDiffStatus + ); + m_pMergeResultWindowTitle->setFileName( m_outputFilename.isEmpty() ? TQString("unnamed.txt") : m_outputFilename ); + +@@ -507,17 +507,17 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL + ) + { + TQString totalInfo; +- if ( pTotalDifftqStatus->bBinaryAEqB && pTotalDifftqStatus->bBinaryAEqC ) ++ if ( pTotalDiffStatus->bBinaryAEqB && pTotalDiffStatus->bBinaryAEqC ) + totalInfo += i18n("All input files are binary equal."); +- else if ( pTotalDifftqStatus->bTextAEqB && pTotalDifftqStatus->bTextAEqC ) ++ else if ( pTotalDiffStatus->bTextAEqB && pTotalDiffStatus->bTextAEqC ) + totalInfo += i18n("All input files contain the same text, but are not binary equal."); + else { +- if ( pTotalDifftqStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("A").tqarg("B"); +- else if ( pTotalDifftqStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("B"); +- if ( pTotalDifftqStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("A").tqarg("C"); +- else if ( pTotalDifftqStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("C"); +- if ( pTotalDifftqStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("B").tqarg("C"); +- else if ( pTotalDifftqStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("B").tqarg("C"); ++ if ( pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("A").tqarg("B"); ++ else if ( pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("B"); ++ if ( pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("A").tqarg("C"); ++ else if ( pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("C"); ++ if ( pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("B").tqarg("C"); ++ else if ( pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("B").tqarg("C"); + } + + if ( !totalInfo.isEmpty() ) +@@ -609,12 +609,12 @@ void KDiff3App::sourceMask( int srcMask, int enabledMask ) + + + +-// Function uses setMinSize( tqsizeHint ) before adding the widget. ++// Function uses setMinSize( sizeHint ) before adding the widget. + // void addWidget(TQBoxLayout* tqlayout, TQWidget* widget); + template + void addWidget( L* tqlayout, W* widget) + { +- TQSize s = widget->tqsizeHint(); ++ TQSize s = widget->sizeHint(); + widget->setMinimumSize( TQSize(max2(s.width(),0),max2(s.height(),0) ) ); + tqlayout->addWidget( widget ); + } +@@ -1071,7 +1071,7 @@ void KDiff3App::slotFileOpen() + } + + void KDiff3App::slotFileOpen2(TQString fn1, TQString fn2, TQString fn3, TQString ofn, +- TQString an1, TQString an2, TQString an3, TotalDifftqStatus* pTotalDifftqStatus ) ++ TQString an1, TQString an2, TQString an3, TotalDiffStatus* pTotalDiffStatus ) + { + if ( !canContinue() ) return; + +@@ -1111,9 +1111,9 @@ void KDiff3App::slotFileOpen2(TQString fn1, TQString fn2, TQString fn3, TQString + else + { + m_bDirCompare = bDirCompare; // Don't allow this to change here. +- init( false, pTotalDifftqStatus ); ++ init( false, pTotalDiffStatus ); + +- if ( pTotalDifftqStatus!=0 ) ++ if ( pTotalDiffStatus!=0 ) + return; + + if ( ! m_sd1.isEmpty() && ! m_sd1.hasData() || +@@ -1969,7 +1969,7 @@ void KDiff3App::slotMergeCurrentFile() + + void KDiff3App::slotWinFocusNext() + { +- TQWidget* focus = tqApp->tqfocusWidget(); ++ TQWidget* focus = tqApp->focusWidget(); + if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() ) + { + slotDirViewToggle(); +@@ -1999,7 +1999,7 @@ void KDiff3App::slotWinFocusNext() + + void KDiff3App::slotWinFocusPrev() + { +- TQWidget* focus = tqApp->tqfocusWidget(); ++ TQWidget* focus = tqApp->focusWidget(); + if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() ) + { + slotDirViewToggle(); +diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp +index 7dc6340..5ed0c26 100644 +--- a/src/smalldialogs.cpp ++++ b/src/smalldialogs.cpp +@@ -170,7 +170,7 @@ OpenDialog::OpenDialog( + connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( reject() ) ); + l->addWidget( button,1 ); + +- TQSize sh = tqsizeHint(); ++ TQSize sh = sizeHint(); + setFixedHeight( sh.height() ); + m_bInputFileNameChanged = false; + +@@ -498,7 +498,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo + pGrid->addWidget(pButton,line,1); + connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + +- resize( 800, tqsizeHint().height() ); ++ resize( 800, sizeHint().height() ); + } + + void RegExpTester::init( const TQString& autoMergeRegExp, const TQString& historyStartRegExp, const TQString& historyEntryStartRegExp, const TQString historySortKeyOrder ) diff --git a/redhat/applications/kdiff3/bp001-9b57232f.diff b/redhat/applications/kdiff3/bp001-9b57232f.diff new file mode 100644 index 000000000..6b0808574 --- /dev/null +++ b/redhat/applications/kdiff3/bp001-9b57232f.diff @@ -0,0 +1,627 @@ +commit 9b57232f1beb774a8a4bab4ae1f85999e193d037 +Author: Timothy Pearson +Date: 1324316180 -0600 + + Remove additional unneeded tq method conversions + +diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp +index 53360b6..ec008f1 100755 +--- a/kdiff3plugin/kdiff3plugin.cpp ++++ b/kdiff3plugin/kdiff3plugin.cpp +@@ -101,17 +101,17 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T + if(m_list.count() == 1) + { + int historyCount = s_pHistory ? s_pHistory->count() : 0; +- s = i18n("Compare with %1").tqarg( historyCount>0 ? s_pHistory->front() : TQString() ); ++ s = i18n("Compare with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() ); + pAction = new KAction ( s,0, this, TQT_SLOT(slotCompareWith()), actionCollection()); + pAction->setEnabled( m_list.count()>0 && historyCount>0 ); + pActionMenu->insert (pAction); + +- s = i18n("Merge with %1").tqarg( historyCount>0 ? s_pHistory->front() : TQString() ); ++ s = i18n("Merge with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() ); + pAction = new KAction( s, 0, this, TQT_SLOT(slotMergeWith()), actionCollection()); + pAction->setEnabled( m_list.count()>0 && historyCount>0 ); + pActionMenu->insert (pAction); + +- s = i18n("Save '%1' for later").tqarg( ( m_list.front() ) ); ++ s = i18n("Save '%1' for later").arg( ( m_list.front() ) ); + pAction = new KAction ( s, 0, this, TQT_SLOT(slotSaveForLater()), actionCollection()); + pAction->setEnabled( m_list.count()>0 ); + pActionMenu->insert(pAction); +diff --git a/src/diff.cpp b/src/diff.cpp +index 136275c..722950f 100644 +--- a/src/diff.cpp ++++ b/src/diff.cpp +@@ -492,7 +492,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic + KMessageBox::error(m_pOptionDialog, + i18n("Preprocessing possibly failed. Check this command:\n\n %1" + "\n\nThe preprocessing command will be disabled now." +- ).tqarg(cmd) ); ++ ).arg(cmd) ); + m_pOptionDialog->m_PreProcessorCmd = ""; + m_normalData.readFile( fileNameIn1 ); + pEncoding1 = m_pEncoding; +@@ -527,7 +527,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic + KMessageBox::error(m_pOptionDialog, + i18n("The line-matching-preprocessing possibly failed. Check this command:\n\n %1" + "\n\nThe line-matching-preprocessing command will be disabled now." +- ).tqarg(cmd) ); ++ ).arg(cmd) ); + m_pOptionDialog->m_LineMatchingPreProcessorCmd = ""; + m_lmppData.readFile( fileNameIn2 ); + } +@@ -1190,7 +1190,7 @@ void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManua + if ( pManualDiffHelpList->empty() ) + return; + +- // If a line appears unaligned in comparison to the manual tqalignment, correct this. ++ // If a line appears unaligned in comparison to the manual alignment, correct this. + + ManualDiffHelpList::iterator iMDHL; + for( iMDHL = pManualDiffHelpList->begin(); iMDHL != pManualDiffHelpList->end(); ++iMDHL ) +@@ -1228,7 +1228,7 @@ void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManua + + if (wi>=1 && wi <= 3) + { +- // Found manual tqalignment for one source ++ // Found manual alignment for one source + Diff3LineList::iterator iDest = i3; + + // Move lines up until the next firstLine is found. Omit wi from move and search. +diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp +index 361eb73..e8124fa 100644 +--- a/src/difftextwindow.cpp ++++ b/src/difftextwindow.cpp +@@ -1656,7 +1656,7 @@ void DiffTextWindowFrame::setFirstLine( int firstLine ) + s += " " + TQString::number( l+1 ); + + d->m_pTopLine->setText( s ); +- d->m_pTopLine->tqrepaint(); ++ d->m_pTopLine->repaint(); + } + } + +diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp +index 0520af3..b4f6b20 100644 +--- a/src/directorymergewindow.cpp ++++ b/src/directorymergewindow.cpp +@@ -187,13 +187,13 @@ void DirectoryMergeWindow::fastFileComparison( + TempRemover tr1( fileName1, fi1 ); + if ( !tr1.success() ) + { +- status = i18n("Creating temp copy of %1 failed.").tqarg(fileName1); ++ status = i18n("Creating temp copy of %1 failed.").arg(fileName1); + return; + } + TempRemover tr2( fileName2, fi2 ); + if ( !tr2.success() ) + { +- status = i18n("Creating temp copy of %1 failed.").tqarg(fileName2); ++ status = i18n("Creating temp copy of %1 failed.").arg(fileName2); + return; + } + +@@ -204,7 +204,7 @@ void DirectoryMergeWindow::fastFileComparison( + + if ( ! file1.open(IO_ReadOnly) ) + { +- status = i18n("Opening %1 failed.").tqarg(fileName1); ++ status = i18n("Opening %1 failed.").arg(fileName1); + return; + } + +@@ -212,7 +212,7 @@ void DirectoryMergeWindow::fastFileComparison( + + if ( ! file2.open(IO_ReadOnly) ) + { +- status = i18n("Opening %1 failed.").tqarg(fileName2); ++ status = i18n("Opening %1 failed.").arg(fileName2); + return; + } + +@@ -230,13 +230,13 @@ void DirectoryMergeWindow::fastFileComparison( + int len = min2( sizeLeft, (t_FileSize)buf1.size() ); + if( len != file1.readBlock( &buf1[0], len ) ) + { +- status = i18n("Error reading from %1").tqarg(fileName1); ++ status = i18n("Error reading from %1").arg(fileName1); + return; + } + + if( len != file2.readBlock( &buf2[0], len ) ) + { +- status = i18n("Error reading from %1").tqarg(fileName2); ++ status = i18n("Error reading from %1").arg(fileName2); + return; + } + +@@ -507,13 +507,13 @@ bool DirectoryMergeWindow::init + TQString text( i18n("Opening of directories failed:") ); + text += "\n\n"; + if ( !dirA.isDir() ) +- { text += i18n("Dir A \"%1\" does not exist or is not a directory.\n").tqarg(m_dirA.prettyAbsPath()); } ++ { text += i18n("Dir A \"%1\" does not exist or is not a directory.\n").arg(m_dirA.prettyAbsPath()); } + + if ( !dirB.isDir() ) +- { text += i18n("Dir B \"%1\" does not exist or is not a directory.\n").tqarg(m_dirB.prettyAbsPath()); } ++ { text += i18n("Dir B \"%1\" does not exist or is not a directory.\n").arg(m_dirB.prettyAbsPath()); } + + if ( m_dirC.isValid() && !m_dirC.isDir() ) +- { text += i18n("Dir C \"%1\" does not exist or is not a directory.\n").tqarg(m_dirC.prettyAbsPath()); } ++ { text += i18n("Dir C \"%1\" does not exist or is not a directory.\n").arg(m_dirC.prettyAbsPath()); } + + KMessageBox::sorry( this, text, i18n("Directory Open Error") ); + return false; +@@ -2138,7 +2138,7 @@ void DirectoryMergeWindow::slotRunOperationForCurrentItem() + if ( m_mergeItemList.empty() ) + { + TQListViewItem* pBegin = currentItem(); +- TQListViewItem* pEnd = treeIterator(pBegin,false,false); // find next visible sibling (no tqchildren) ++ TQListViewItem* pEnd = treeIterator(pBegin,false,false); // find next visible sibling (no children) + + prepareMergeStart( pBegin, pEnd, bVerbose ); + mergeContinue(true, bVerbose); +@@ -2411,16 +2411,16 @@ bool DirectoryMergeWindow::deleteFLD( const TQString& name, bool bCreateBackup ) + bool bSuccess = renameFLD( name, name+".orig" ); + if (!bSuccess) + { +- m_pStatusInfo->addText( i18n("Error: While deleting %1: Creating backup failed.").tqarg(name) ); ++ m_pStatusInfo->addText( i18n("Error: While deleting %1: Creating backup failed.").arg(name) ); + return false; + } + } + else + { + if ( fi.isDir() && !fi.isSymLink() ) +- m_pStatusInfo->addText(i18n("delete directory recursively( %1 )").tqarg(name)); ++ m_pStatusInfo->addText(i18n("delete directory recursively( %1 )").arg(name)); + else +- m_pStatusInfo->addText(i18n("delete( %1 )").tqarg(name)); ++ m_pStatusInfo->addText(i18n("delete( %1 )").arg(name)); + + if ( m_bSimulatedMergeStarted ) + { +@@ -2454,7 +2454,7 @@ bool DirectoryMergeWindow::deleteFLD( const TQString& name, bool bCreateBackup ) + bSuccess = FileAccess::removeDir( name ); + if ( !bSuccess ) + { +- m_pStatusInfo->addText( i18n("Error: rmdir( %1 ) operation failed.").tqarg(name)); ++ m_pStatusInfo->addText( i18n("Error: rmdir( %1 ) operation failed.").arg(name)); + return false; + } + } +@@ -2490,7 +2490,7 @@ bool DirectoryMergeWindow::mergeFLD( const TQString& nameA,const TQString& nameB + return false; + } + +- m_pStatusInfo->addText(i18n("manual merge( %1, %2, %3 -> %4)").tqarg(nameA).tqarg(nameB).tqarg(nameC).tqarg(nameDest)); ++ m_pStatusInfo->addText(i18n("manual merge( %1, %2, %3 -> %4)").arg(nameA).arg(nameB).arg(nameC).arg(nameDest)); + if ( m_bSimulatedMergeStarted ) + { + m_pStatusInfo->addText(i18n(" Note: After a manual merge the user should continue by pressing F7.") ); +@@ -2517,7 +2517,7 @@ bool DirectoryMergeWindow::copyFLD( const TQString& srcName, const TQString& des + if ( !bSuccess ) + { + m_pStatusInfo->addText(i18n("Error: copy( %1 -> %2 ) failed." +- "Deleting existing destination failed.").tqarg(srcName).tqarg(destName)); ++ "Deleting existing destination failed.").arg(srcName).arg(destName)); + return false; + } + } +@@ -2526,7 +2526,7 @@ bool DirectoryMergeWindow::copyFLD( const TQString& srcName, const TQString& des + + if ( fi.isSymLink() && (fi.isDir() && !m_bFollowDirLinks || !fi.isDir() && !m_bFollowFileLinks) ) + { +- m_pStatusInfo->addText(i18n("copyLink( %1 -> %2 )").tqarg(srcName).tqarg(destName)); ++ m_pStatusInfo->addText(i18n("copyLink( %1 -> %2 )").arg(srcName).arg(destName)); + #ifdef _WIN32 + // What are links? + #else +@@ -2563,7 +2563,7 @@ bool DirectoryMergeWindow::copyFLD( const TQString& srcName, const TQString& des + return false; + } + +- m_pStatusInfo->addText(i18n("copy( %1 -> %2 )").tqarg(srcName).tqarg(destName)); ++ m_pStatusInfo->addText(i18n("copy( %1 -> %2 )").arg(srcName).arg(destName)); + + if ( m_bSimulatedMergeStarted ) + { +@@ -2590,12 +2590,12 @@ bool DirectoryMergeWindow::renameFLD( const TQString& srcName, const TQString& d + if (!bSuccess) + { + m_pStatusInfo->addText( i18n("Error during rename( %1 -> %2 ): " +- "Cannot delete existing destination." ).tqarg(srcName).tqarg(destName)); ++ "Cannot delete existing destination." ).arg(srcName).arg(destName)); + return false; + } + } + +- m_pStatusInfo->addText(i18n("rename( %1 -> %2 )").tqarg(srcName).tqarg(destName)); ++ m_pStatusInfo->addText(i18n("rename( %1 -> %2 )").arg(srcName).arg(destName)); + if ( m_bSimulatedMergeStarted ) + { + return true; +@@ -2623,7 +2623,7 @@ bool DirectoryMergeWindow::makeDir( const TQString& name, bool bQuiet ) + if (!bSuccess) + { + m_pStatusInfo->addText( i18n("Error during makeDir of %1. " +- "Cannot delete existing file." ).tqarg(name)); ++ "Cannot delete existing file." ).arg(name)); + return false; + } + } +@@ -2638,7 +2638,7 @@ bool DirectoryMergeWindow::makeDir( const TQString& name, bool bQuiet ) + } + + if ( ! bQuiet ) +- m_pStatusInfo->addText(i18n("makeDir( %1 )").tqarg(name)); ++ m_pStatusInfo->addText(i18n("makeDir( %1 )").arg(name)); + + if ( m_bSimulatedMergeStarted ) + { +diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp +index 01b8d48..1f90d5d 100644 +--- a/src/fileaccess.cpp ++++ b/src/fileaccess.cpp +@@ -625,7 +625,7 @@ bool FileAccessJobHandler::stat( int detail, bool bWantToWrite ) + + connect( pStatJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotStatResult(KIO::Job*))); + +- g_pProgressDialog->enterEventLoop( pStatJob, i18n("Getting file status: %1").tqarg(m_pFileAccess->prettyAbsPath()) ); ++ g_pProgressDialog->enterEventLoop( pStatJob, i18n("Getting file status: %1").arg(m_pFileAccess->prettyAbsPath()) ); + + return m_bSuccess; + } +@@ -668,7 +668,7 @@ bool FileAccessJobHandler::get(void* pDestBuffer, long maxLength ) + connect( pJob, TQT_SIGNAL(data(KIO::Job*,const TQByteArray &)), this, TQT_SLOT(slotGetData(KIO::Job*, const TQByteArray&))); + connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long))); + +- g_pProgressDialog->enterEventLoop( pJob, i18n("Reading file: %1").tqarg(m_pFileAccess->prettyAbsPath()) ); ++ g_pProgressDialog->enterEventLoop( pJob, i18n("Reading file: %1").arg(m_pFileAccess->prettyAbsPath()) ); + return m_bSuccess; + } + else +@@ -704,7 +704,7 @@ bool FileAccessJobHandler::put(const void* pSrcBuffer, long maxLength, bool bOve + connect( pJob, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray&)), this, TQT_SLOT(slotPutData(KIO::Job*, TQByteArray&))); + connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long))); + +- g_pProgressDialog->enterEventLoop( pJob, i18n("Writing file: %1").tqarg(m_pFileAccess->prettyAbsPath()) ); ++ g_pProgressDialog->enterEventLoop( pJob, i18n("Writing file: %1").arg(m_pFileAccess->prettyAbsPath()) ); + return m_bSuccess; + } + else +@@ -721,7 +721,7 @@ void FileAccessJobHandler::slotPutData( KIO::Job* pJob, TQByteArray& data ) + { + long maxChunkSize = 100000; + long length = min2( maxChunkSize, m_maxLength - m_transferredBytes ); +- bool bSuccess = data.tqresize( length ); ++ bool bSuccess = data.resize( length ); + if ( bSuccess ) + { + if ( length>0 ) +@@ -767,7 +767,7 @@ bool FileAccessJobHandler::mkDir( const TQString& dirName ) + KIO::SimpleJob* pJob = KIO::mkdir( dirURL ); + connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); + +- g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1").tqarg(dirName) ); ++ g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1").arg(dirName) ); + return m_bSuccess; + } + } +@@ -787,7 +787,7 @@ bool FileAccessJobHandler::rmDir( const TQString& dirName ) + KIO::SimpleJob* pJob = KIO::rmdir( dirURL ); + connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); + +- g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1").tqarg(dirName)); ++ g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1").arg(dirName)); + return m_bSuccess; + } + } +@@ -802,7 +802,7 @@ bool FileAccessJobHandler::removeFile( const TQString& fileName ) + KIO::SimpleJob* pJob = KIO::file_delete( KURL::fromPathOrURL(fileName), false ); + connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); + +- g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1").tqarg(fileName) ); ++ g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1").arg(fileName) ); + return m_bSuccess; + } + } +@@ -818,7 +818,7 @@ bool FileAccessJobHandler::symLink( const TQString& linkTarget, const TQString& + connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); + + g_pProgressDialog->enterEventLoop( pJob, +- i18n("Creating symbolic link: %1 -> %2").tqarg(linkLocation).tqarg(linkTarget) ); ++ i18n("Creating symbolic link: %1 -> %2").arg(linkLocation).arg(linkTarget) ); + return m_bSuccess; + } + } +@@ -848,7 +848,7 @@ bool FileAccessJobHandler::rename( const TQString& dest ) + connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long))); + + g_pProgressDialog->enterEventLoop( pJob, +- i18n("Renaming file: %1 -> %2").tqarg(m_pFileAccess->prettyAbsPath()).tqarg(dest) ); ++ i18n("Renaming file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) ); + return m_bSuccess; + } + } +@@ -884,7 +884,7 @@ bool FileAccessJobHandler::copyFile( const TQString& dest ) + connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); + connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long))); + g_pProgressDialog->enterEventLoop( pJob, +- i18n("Copying file: %1 -> %2").tqarg(m_pFileAccess->prettyAbsPath()).tqarg(dest) ); ++ i18n("Copying file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) ); + + return m_bSuccess; + // Note that the KIO-slave preserves the original date, if this is supported. +@@ -898,13 +898,13 @@ bool FileAccessJobHandler::copyFile( const TQString& dest ) + bool bReadSuccess = srcFile.open( IO_ReadOnly ); + if ( bReadSuccess == false ) + { +- m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for reading failed. Filename: %1").tqarg(srcName); ++ m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for reading failed. Filename: %1").arg(srcName); + return false; + } + bool bWriteSuccess = destFile.open( IO_WriteOnly ); + if ( bWriteSuccess == false ) + { +- m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for writing failed. Filename: %1").tqarg(destName); ++ m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for writing failed. Filename: %1").arg(destName); + return false; + } + +@@ -916,7 +916,7 @@ bool FileAccessJobHandler::copyFile( const TQString& dest ) + TQ_LONG readSize = srcFile.readBlock( &buffer[0], min2( srcSize, bufSize ) ); + if ( readSize==-1 || readSize==0 ) + { +- m_pFileAccess->m_statusText = i18n("Error during file copy operation: Reading failed. Filename: %1").tqarg(srcName); ++ m_pFileAccess->m_statusText = i18n("Error during file copy operation: Reading failed. Filename: %1").arg(srcName); + return false; + } + srcSize -= readSize; +@@ -925,7 +925,7 @@ bool FileAccessJobHandler::copyFile( const TQString& dest ) + TQ_LONG writeSize = destFile.writeBlock( &buffer[0], readSize ); + if ( writeSize==-1 || writeSize==0 ) + { +- m_pFileAccess->m_statusText = i18n("Error during file copy operation: Writing failed. Filename: %1").tqarg(destName); ++ m_pFileAccess->m_statusText = i18n("Error during file copy operation: Writing failed. Filename: %1").arg(destName); + return false; + } + readSize -= writeSize; +@@ -1344,7 +1344,7 @@ bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive, + //connect( pListJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long))); + + g_pProgressDialog->enterEventLoop( pListJob, +- i18n("Listing directory: %1").tqarg(m_pFileAccess->prettyAbsPath()) ); ++ i18n("Listing directory: %1").arg(m_pFileAccess->prettyAbsPath()) ); + } + } + +diff --git a/src/gnudiff_diff.h b/src/gnudiff_diff.h +index 7bc8b92..482435c 100644 +--- a/src/gnudiff_diff.h ++++ b/src/gnudiff_diff.h +@@ -110,7 +110,7 @@ bool brief; + bool expand_tabs; + + /* Use a tab in the output, rather than a space, before the text of an +- input line, so as to keep the proper tqalignment in the input line ++ input line, so as to keep the proper alignment in the input line + without changing the characters in it (-T). */ + bool initial_tab; + +diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp +index e6b3f40..ef1a843 100644 +--- a/src/kdiff3.cpp ++++ b/src/kdiff3.cpp +@@ -259,7 +259,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par + slotViewStatusBar(); + if( toolBar("mainToolBar")!=0 ) + toolBar("mainToolBar")->setBarPos( (KToolBar::BarPosition) m_pOptionDialog->m_toolBarPos ); +-/* TQSize size = m_pOptionDialog->m_tqgeometry; ++/* TQSize size = m_pOptionDialog->m_geometry; + TQPoint pos = m_pOptionDialog->m_position; + if(!size.isEmpty()) + { +@@ -303,7 +303,7 @@ void KDiff3App::completeInit( const TQString& fn1, const TQString& fn2, const TQ + { + if (m_pKDiff3Shell!=0) + { +- TQSize size=m_pOptionDialog->m_tqgeometry; ++ TQSize size=m_pOptionDialog->m_geometry; + TQPoint pos=m_pOptionDialog->m_position; + if(!size.isEmpty()) + { +@@ -577,7 +577,7 @@ void KDiff3App::saveOptions( KConfig* config ) + m_pOptionDialog->m_bMaximised = m_pKDiff3Shell->isMaximized(); + if( ! m_pKDiff3Shell->isMaximized() && m_pKDiff3Shell->isVisible() ) + { +- m_pOptionDialog->m_tqgeometry = m_pKDiff3Shell->size(); ++ m_pOptionDialog->m_geometry = m_pKDiff3Shell->size(); + m_pOptionDialog->m_position = m_pKDiff3Shell->pos(); + } + if ( toolBar("mainToolBar")!=0 ) +diff --git a/src/kdiff3.h b/src/kdiff3.h +index c81ae71..46c0d3c 100644 +--- a/src/kdiff3.h ++++ b/src/kdiff3.h +@@ -110,7 +110,7 @@ class KDiff3App : public TQSplitter + /** initializes the KActions of the application */ + void initActions( KActionCollection* ); + +- /** save general Options like all bar positions and status as well as the tqgeometry ++ /** save general Options like all bar positions and status as well as the geometry + and the recent file list to the configuration file */ + void saveOptions( KConfig* ); + +diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp +index 75894a1..c49adaf 100644 +--- a/src/kreplacements/kreplacements.cpp ++++ b/src/kreplacements/kreplacements.cpp +@@ -676,7 +676,7 @@ KToggleAction* KStdAction::showStatusbar( TQWidget* parent, const char* slot, KA + KAction* KStdAction::preferences( TQWidget* parent, const char* slot, KActionCollection* actionCollection) + { + KMainWindow* p = actionCollection->m_pMainWindow; +- KAction* a = new KAction( i18n("&Configure %1...").tqarg("KDiff3"), 0, parent, slot, actionCollection, "settings", false, false ); ++ KAction* a = new KAction( i18n("&Configure %1...").arg("KDiff3"), 0, parent, slot, actionCollection, "settings", false, false ); + if(p) a->addTo( p->settingsMenu ); + return a; + } +diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp +index a222a14..dea1407 100644 +--- a/src/mergeresultwindow.cpp ++++ b/src/mergeresultwindow.cpp +@@ -134,7 +134,7 @@ void MergeResultWindow::init( + int nofUnsolved = getNrOfUnsolvedConflicts(&wsc); + if (m_pStatusBar) + m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)") +- .tqarg(nofUnsolved).tqarg(wsc) ); ++ .arg(nofUnsolved).arg(wsc) ); + } + + void MergeResultWindow::reset() +@@ -809,12 +809,12 @@ void MergeResultWindow::showNrOfConflicts() + else if ( m_pTotalDiffStatus->bTextAEqB && m_pTotalDiffStatus->bTextAEqC ) + totalInfo += i18n("All input files contain the same text."); + else { +- if ( m_pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("B"); +- else if ( m_pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("B"); +- if ( m_pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("C"); +- else if ( m_pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("C"); +- if ( m_pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("B").tqarg("C"); +- else if ( m_pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("B").tqarg("C"); ++ if ( m_pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").arg("A").arg("B"); ++ else if ( m_pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n").arg("A").arg("B"); ++ if ( m_pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").arg("A").arg("C"); ++ else if ( m_pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").arg("A").arg("C"); ++ if ( m_pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").arg("B").arg("C"); ++ else if ( m_pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").arg("B").arg("C"); + } + + int nrOfUnsolvedConflicts = getNrOfUnsolvedConflicts(); +@@ -948,7 +948,7 @@ void MergeResultWindow::choose( int selector ) + int wsc; + int nofUnsolved = getNrOfUnsolvedConflicts(&wsc); + m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)") +- .tqarg(nofUnsolved).tqarg(wsc) ); ++ .arg(nofUnsolved).arg(wsc) ); + } + + // bConflictsOnly: automatically choose for conflicts only (true) or for everywhere (false) +@@ -962,7 +962,7 @@ void MergeResultWindow::chooseGlobal(int selector, bool bConflictsOnly, bool bWh + int wsc; + int nofUnsolved = getNrOfUnsolvedConflicts(&wsc); + m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)") +- .tqarg(nofUnsolved).tqarg(wsc) ); ++ .arg(nofUnsolved).arg(wsc) ); + } + + void MergeResultWindow::slotAutoSolve() +@@ -974,7 +974,7 @@ void MergeResultWindow::slotAutoSolve() + int wsc; + int nofUnsolved = getNrOfUnsolvedConflicts(&wsc); + m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)") +- .tqarg(nofUnsolved).tqarg(wsc) ); ++ .arg(nofUnsolved).arg(wsc) ); + } + + void MergeResultWindow::slotUnsolve() +@@ -986,7 +986,7 @@ void MergeResultWindow::slotUnsolve() + int wsc; + int nofUnsolved = getNrOfUnsolvedConflicts(&wsc); + m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)") +- .tqarg(nofUnsolved).tqarg(wsc) ); ++ .arg(nofUnsolved).arg(wsc) ); + } + + static TQString calcHistoryLead(const TQString& s ) +@@ -2105,9 +2105,9 @@ void MergeResultWindow::slotCursorUpdate() + int xCursor = ( m_cursorXPos - m_firstColumn ) * fontWidth + xOffset; + + if (!m_pOptionDialog->m_bRightToLeftLanguage) +- tqrepaint( xCursor-2, yOffset, 5, fm.ascent()+2 ); ++ repaint( xCursor-2, yOffset, 5, fm.ascent()+2 ); + else +- tqrepaint( width()-1-4-(xCursor-2), yOffset, 5, fm.ascent()+2 ); ++ repaint( width()-1-4-(xCursor-2), yOffset, 5, fm.ascent()+2 ); + + m_bCursorUpdate=false; + } +diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp +index 9b46a6d..8b15dc8 100644 +--- a/src/optiondialog.cpp ++++ b/src/optiondialog.cpp +@@ -495,7 +495,7 @@ void OptionDialog::setupOtherOptions() + new OptionToggleAction( true, "Show Statusbar", &m_bShowStatusBar, this ); + + new OptionNum( (int)KToolBar::Top, "ToolBarPos", &m_toolBarPos, this ); +- new OptionSize( TQSize(600,400),"Geometry", &m_tqgeometry, this ); ++ new OptionSize( TQSize(600,400),"Geometry", &m_geometry, this ); + new OptionPoint( TQPoint(0,22), "Position", &m_position, this ); + new OptionToggleAction( false, "WindowStateMaximised", &m_bMaximised, this ); + +diff --git a/src/optiondialog.h b/src/optiondialog.h +index 697dfe3..b7a27e6 100644 +--- a/src/optiondialog.h ++++ b/src/optiondialog.h +@@ -59,7 +59,7 @@ public: + TQString calcOptionHelp(); + + // Some settings are not available in the option dialog: +- TQSize m_tqgeometry; ++ TQSize m_geometry; + TQPoint m_position; + bool m_bMaximised; + bool m_bShowToolBar; +diff --git a/src/pdiff.cpp b/src/pdiff.cpp +index 1452eca..3986596 100644 +--- a/src/pdiff.cpp ++++ b/src/pdiff.cpp +@@ -512,12 +512,12 @@ void KDiff3App::init( bool bAuto, TotalDiffStatus* pTotalDiffStatus, bool bLoadF + else if ( pTotalDiffStatus->bTextAEqB && pTotalDiffStatus->bTextAEqC ) + totalInfo += i18n("All input files contain the same text, but are not binary equal."); + else { +- if ( pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("A").tqarg("B"); +- else if ( pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("B"); +- if ( pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("A").tqarg("C"); +- else if ( pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("C"); +- if ( pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).tqarg("B").tqarg("C"); +- else if ( pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("B").tqarg("C"); ++ if ( pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).arg("A").arg("B"); ++ else if ( pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").arg("A").arg("B"); ++ if ( pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).arg("A").arg("C"); ++ else if ( pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").arg("A").arg("C"); ++ if ( pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n" ).arg("B").arg("C"); ++ else if ( pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").arg("B").arg("C"); + } + + if ( !totalInfo.isEmpty() ) +diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp +index 5ed0c26..ff7ca56 100644 +--- a/src/smalldialogs.cpp ++++ b/src/smalldialogs.cpp +@@ -111,15 +111,15 @@ OpenDialog::OpenDialog( + + TQPopupMenu* m = new TQPopupMenu(this); + int id=0; +- m->insertItem( i18n("Swap %1<->%2").tqarg("A").tqarg("B"), id++ ); +- m->insertItem( i18n("Swap %1<->%2").tqarg("B").tqarg("C"), id++ ); +- m->insertItem( i18n("Swap %1<->%2").tqarg("C").tqarg("A"), id++ ); +- m->insertItem( i18n("Copy %1->Output").tqarg("A"), id++ ); +- m->insertItem( i18n("Copy %1->Output").tqarg("B"), id++ ); +- m->insertItem( i18n("Copy %1->Output").tqarg("C"), id++ ); +- m->insertItem( i18n("Swap %1<->Output").tqarg("A"), id++ ); +- m->insertItem( i18n("Swap %1<->Output").tqarg("B"), id++ ); +- m->insertItem( i18n("Swap %1<->Output").tqarg("C"), id++ ); ++ m->insertItem( i18n("Swap %1<->%2").arg("A").arg("B"), id++ ); ++ m->insertItem( i18n("Swap %1<->%2").arg("B").arg("C"), id++ ); ++ m->insertItem( i18n("Swap %1<->%2").arg("C").arg("A"), id++ ); ++ m->insertItem( i18n("Copy %1->Output").arg("A"), id++ ); ++ m->insertItem( i18n("Copy %1->Output").arg("B"), id++ ); ++ m->insertItem( i18n("Copy %1->Output").arg("C"), id++ ); ++ m->insertItem( i18n("Swap %1<->Output").arg("A"), id++ ); ++ m->insertItem( i18n("Swap %1<->Output").arg("B"), id++ ); ++ m->insertItem( i18n("Swap %1<->Output").arg("C"), id++ ); + connect( m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSwapCopyNames(int))); + button->setPopup(m); + diff --git a/redhat/applications/kdiff3/bp002-d654b107.diff b/redhat/applications/kdiff3/bp002-d654b107.diff new file mode 100644 index 000000000..dc4a95c9e --- /dev/null +++ b/redhat/applications/kdiff3/bp002-d654b107.diff @@ -0,0 +1,328 @@ +commit d654b1079f7801b0a65c8de8936d0d174656702b +Author: Timothy Pearson +Date: 1324497860 -0600 + + Rename obsolete tq methods to standard names + +diff --git a/src/diff.cpp b/src/diff.cpp +index 722950f..feb1373 100644 +--- a/src/diff.cpp ++++ b/src/diff.cpp +@@ -557,7 +557,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic + m_lmppData.m_v.resize( m_normalData.m_vSize ); + for(int i=m_lmppData.m_vSize; im_bIgnoreCase ) + { + int i; +- TQChar* pBuf = const_cast(m_lmppData.m_tqunicodeBuf.tqunicode()); +- int ucSize = m_lmppData.m_tqunicodeBuf.length(); ++ TQChar* pBuf = const_cast(m_lmppData.m_unicodeBuf.unicode()); ++ int ucSize = m_lmppData.m_unicodeBuf.length(); + for(i=0; i(m_tqunicodeBuf.tqunicode()); ++ TQChar* p = const_cast(m_unicodeBuf.unicode()); + bool bWithinComment=false; +- int size = m_tqunicodeBuf.length(); ++ int size = m_unicodeBuf.length(); + for(int i=0; i m_v; + bool m_bIsText; + bool readFile( const TQString& filename ); +diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp +index 1f90d5d..5584c50 100644 +--- a/src/fileaccess.cpp ++++ b/src/fileaccess.cpp +@@ -1088,7 +1088,7 @@ void CvsIgnoreList::addEntry(const TQString& pattern) + unsigned int nofMetaCharacters = 0; + + const TQChar* pos; +- pos = pattern.tqunicode(); ++ pos = pattern.unicode(); + const TQChar* posEnd; + posEnd=pos + pattern.length(); + while (pos < posEnd) +@@ -1454,27 +1454,27 @@ ProgressDialog::ProgressDialog( TQWidget* pParent ) + : TQDialog( pParent, 0, true ) + { + m_bStayHidden = false; +- TQVBoxLayout* tqlayout = new TQVBoxLayout(this); ++ TQVBoxLayout* layout = new TQVBoxLayout(this); + + m_pInformation = new TQLabel( " ", this ); +- tqlayout->addWidget( m_pInformation ); ++ layout->addWidget( m_pInformation ); + + m_pProgressBar = new KProgress(1000, this); +- tqlayout->addWidget( m_pProgressBar ); ++ layout->addWidget( m_pProgressBar ); + + m_pSubInformation = new TQLabel( " ", this); +- tqlayout->addWidget( m_pSubInformation ); ++ layout->addWidget( m_pSubInformation ); + + m_pSubProgressBar = new KProgress(1000, this); +- tqlayout->addWidget( m_pSubProgressBar ); ++ layout->addWidget( m_pSubProgressBar ); + + m_pSlowJobInfo = new TQLabel( " ", this); +- tqlayout->addWidget( m_pSlowJobInfo ); ++ layout->addWidget( m_pSlowJobInfo ); + +- TQHBoxLayout* htqlayout = new TQHBoxLayout( tqlayout ); +- htqlayout->addStretch(1); ++ TQHBoxLayout* hlayout = new TQHBoxLayout( layout ); ++ hlayout->addStretch(1); + m_pAbortButton = new TQPushButton( i18n("&Cancel"), this); +- htqlayout->addWidget( m_pAbortButton ); ++ hlayout->addWidget( m_pAbortButton ); + connect( m_pAbortButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAbort()) ); + + m_progressDelayTimer = 0; +diff --git a/src/gnudiff_io.cpp b/src/gnudiff_io.cpp +index f29fd31..aab645f 100644 +--- a/src/gnudiff_io.cpp ++++ b/src/gnudiff_io.cpp +@@ -169,7 +169,7 @@ void GnuDiff::find_and_hash_each_line (struct file_data *current) + while ( pgetString( this ); + int x = convertToPosInText( str, m_cursorXPos, m_pOptionDialog->m_tabSize ); + +- if ( !TQApplication::tqclipboard()->supportsSelection() ) ++ if ( !TQApplication::clipboard()->supportsSelection() ) + bFromSelection = false; + +- TQString clipBoard = TQApplication::tqclipboard()->text( bFromSelection ? TQClipboard::Selection : TQClipboard::Clipboard ); ++ TQString clipBoard = TQApplication::clipboard()->text( bFromSelection ? TQClipboard::Selection : TQClipboard::Clipboard ); + + TQString currentLine = str.left(x); + TQString endOfLine = str.mid(x); +diff --git a/src/pdiff.cpp b/src/pdiff.cpp +index 3986596..0a10b00 100644 +--- a/src/pdiff.cpp ++++ b/src/pdiff.cpp +@@ -610,13 +610,13 @@ void KDiff3App::sourceMask( int srcMask, int enabledMask ) + + + // Function uses setMinSize( sizeHint ) before adding the widget. +-// void addWidget(TQBoxLayout* tqlayout, TQWidget* widget); ++// void addWidget(TQBoxLayout* layout, TQWidget* widget); + template +-void addWidget( L* tqlayout, W* widget) ++void addWidget( L* layout, W* widget) + { + TQSize s = widget->sizeHint(); + widget->setMinimumSize( TQSize(max2(s.width(),0),max2(s.height(),0) ) ); +- tqlayout->addWidget( widget ); ++ layout->addWidget( widget ); + } + + void KDiff3App::initView() +@@ -1174,7 +1174,7 @@ void KDiff3App::slotEditCut() + + if ( !s.isNull() ) + { +- TQApplication::tqclipboard()->setText( s, TQClipboard::Clipboard ); ++ TQApplication::clipboard()->setText( s, TQClipboard::Clipboard ); + } + + slotStatusMsg(i18n("Ready.")); +@@ -1190,7 +1190,7 @@ void KDiff3App::slotEditCopy() + if ( s.isNull() && m_pMergeResultWindow!=0 ) s = m_pMergeResultWindow->getSelection(); + if ( !s.isNull() ) + { +- TQApplication::tqclipboard()->setText( s, TQClipboard::Clipboard ); ++ TQApplication::clipboard()->setText( s, TQClipboard::Clipboard ); + } + + slotStatusMsg(i18n("Ready.")); +@@ -1208,17 +1208,17 @@ void KDiff3App::slotEditPaste() + { + if ( m_pDiffTextWindow1->hasFocus() ) + { +- m_sd1.setData( TQApplication::tqclipboard()->text(TQClipboard::Clipboard) ); ++ m_sd1.setData( TQApplication::clipboard()->text(TQClipboard::Clipboard) ); + init(); + } + else if ( m_pDiffTextWindow2->hasFocus() ) + { +- m_sd2.setData( TQApplication::tqclipboard()->text(TQClipboard::Clipboard) ); ++ m_sd2.setData( TQApplication::clipboard()->text(TQClipboard::Clipboard) ); + init(); + } + else if ( m_pDiffTextWindow3->hasFocus() ) + { +- m_sd3.setData( TQApplication::tqclipboard()->text(TQClipboard::Clipboard) ); ++ m_sd3.setData( TQApplication::clipboard()->text(TQClipboard::Clipboard) ); + init(); + } + } +@@ -1465,7 +1465,7 @@ void KDiff3App::slotSelectionEnd() + } + else + { +- TQClipboard *clipBoard = TQApplication::tqclipboard(); ++ TQClipboard *clipBoard = TQApplication::clipboard(); + + if (clipBoard->supportsSelection ()) + { +@@ -1484,7 +1484,7 @@ void KDiff3App::slotSelectionEnd() + + void KDiff3App::slotClipboardChanged() + { +- TQString s = TQApplication::tqclipboard()->text(); ++ TQString s = TQApplication::clipboard()->text(); + //editPaste->setEnabled(!s.isEmpty()); + } + +diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp +index ff7ca56..b19b7c2 100644 +--- a/src/smalldialogs.cpp ++++ b/src/smalldialogs.cpp +@@ -339,47 +339,47 @@ void OpenDialog::slotSwapCopyNames( int id ) // id selected in the popup menu + FindDialog::FindDialog(TQWidget* pParent) + : TQDialog( pParent ) + { +- TQGridLayout* tqlayout = new TQGridLayout( this ); +- tqlayout->setMargin(5); +- tqlayout->setSpacing(5); ++ TQGridLayout* layout = new TQGridLayout( this ); ++ layout->setMargin(5); ++ layout->setSpacing(5); + + int line=0; +- tqlayout->addMultiCellWidget( new TQLabel(i18n("Search text:"),this), line,line,0,1 ); ++ layout->addMultiCellWidget( new TQLabel(i18n("Search text:"),this), line,line,0,1 ); + ++line; + + m_pSearchString = new TQLineEdit( this ); +- tqlayout->addMultiCellWidget( m_pSearchString, line,line,0,1 ); ++ layout->addMultiCellWidget( m_pSearchString, line,line,0,1 ); + ++line; + + m_pCaseSensitive = new TQCheckBox(i18n("Case sensitive"),this); +- tqlayout->addWidget( m_pCaseSensitive, line, 1 ); ++ layout->addWidget( m_pCaseSensitive, line, 1 ); + + m_pSearchInA = new TQCheckBox(i18n("Search A"),this); +- tqlayout->addWidget( m_pSearchInA, line, 0 ); ++ layout->addWidget( m_pSearchInA, line, 0 ); + m_pSearchInA->setChecked( true ); + ++line; + + m_pSearchInB = new TQCheckBox(i18n("Search B"),this); +- tqlayout->addWidget( m_pSearchInB, line, 0 ); ++ layout->addWidget( m_pSearchInB, line, 0 ); + m_pSearchInB->setChecked( true ); + ++line; + + m_pSearchInC = new TQCheckBox(i18n("Search C"),this); +- tqlayout->addWidget( m_pSearchInC, line, 0 ); ++ layout->addWidget( m_pSearchInC, line, 0 ); + m_pSearchInC->setChecked( true ); + ++line; + + m_pSearchInOutput = new TQCheckBox(i18n("Search output"),this); +- tqlayout->addWidget( m_pSearchInOutput, line, 0 ); ++ layout->addWidget( m_pSearchInOutput, line, 0 ); + m_pSearchInOutput->setChecked( true ); + ++line; + + TQPushButton* pButton = new TQPushButton( i18n("&Search"), this ); +- tqlayout->addWidget( pButton, line, 0 ); ++ layout->addWidget( pButton, line, 0 ); + connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + + pButton = new TQPushButton( i18n("&Cancel"), this ); +- tqlayout->addWidget( pButton, line, 1 ); ++ layout->addWidget( pButton, line, 1 ); + connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + + hide(); diff --git a/redhat/applications/kdiff3/bp003-3f02b2be.diff b/redhat/applications/kdiff3/bp003-3f02b2be.diff new file mode 100644 index 000000000..f287d6592 --- /dev/null +++ b/redhat/applications/kdiff3/bp003-3f02b2be.diff @@ -0,0 +1,19 @@ +commit 3f02b2be383bb2ab233fe8885f062f75fd902e78 +Author: Darrell Anderson +Date: 1332366465 -0500 + + Change tqaddAction -> addAction. There is no tqaddAction defined in tqt headers. + +diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp +index ec008f1..02fa72d 100755 +--- a/kdiff3plugin/kdiff3plugin.cpp ++++ b/kdiff3plugin/kdiff3plugin.cpp +@@ -150,7 +150,7 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T + pActionMenu->insert (pAction); + + addSeparator(); +- tqaddAction( pActionMenu ); ++ addAction( pActionMenu ); + addSeparator(); + } + diff --git a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec index f98c3d8ff..8e12a9298 100644 --- a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec +++ b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec @@ -34,6 +34,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# [kdiff3] Rename old tq methods that no longer need a unique name [Commit #c7e29c46] +Patch0: bp000-c7e29c46.diff +# [kdiff3] Remove additional unneeded tq method conversions [Commit #9b57232f] +Patch1: bp001-9b57232f.diff +# [kdiff3] Rename obsolete tq methods to standard names [Commit #d654b107] +Patch2: bp002-d654b107.diff BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -50,6 +56,9 @@ Unicode & UTF-8 support %prep %setup -q -n applications/%{kdecomp} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -119,6 +128,9 @@ done - Rebuilt for Fedora 17 - Fix HTML directory location - Fix post and postun +- Rename old tq methods that no longer need a unique name [Commit #c7e29c46] +- Remove additional unneeded tq method conversions [Commit #9b57232f] +- Rename obsolete tq methods to standard names [Commit #d654b107] * Sun Oct 30 2011 Francois Andriot - 0.9.91-3 - Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch index 2f08804da..00ca8561c 100644 --- a/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch +++ b/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch @@ -9,9 +9,27 @@ obj.execute() # Install the protocol files ---- kio-locate/admin/kde.py.ORI 2012-05-02 00:37:55.095993387 +0200 -+++ kio-locate/admin/kde.py 2012-05-02 00:38:34.615142101 +0200 -@@ -781,7 +781,7 @@ +--- kio-locate/admin/kde.py.install 2011-07-07 08:10:05.000000000 +0200 ++++ kio-locate/admin/kde.py 2012-05-06 20:29:48.236024293 +0200 +@@ -337,7 +337,7 @@ + opts.Save(cachefile, env) + + ## set default variables, one can override them in sconscript files +- env.Append(CXXFLAGS = ['-I'+env['KDEINCLUDEPATH'], '-I'+env['QTINCLUDEPATH'], '-I/usr/include/tqt' ], ++ env.Append(CXXFLAGS = ['-I'+env['KDEINCLUDEPATH'], '-I'+env['QTINCLUDEPATH'], '-I/opt/trinity/include/tqt' ], + LIBPATH = [env['KDELIBPATH'], env['QTLIBPATH'] ]) + + env['QT_AUTOSCAN'] = 1 +@@ -773,7 +773,7 @@ + ## Define this to 1 if you are writing documentation else to 0 :) + #if lenv.has_key('i_am_a_documentation_writer'): + for file in docbook_list: +- lenv.Depends( folder+'index.cache.bz2', nodefile ) ++ lenv.Depends( folder+'index.cache.bz2', file ) + + if lenv.has_key('_BUILDDIR_'): folder=lenv.join(lenv['_BUILDDIR_'], folder) + +@@ -781,7 +782,7 @@ lenv.KDEinstall( 'KDEDOC', lenv.join(lang,destination), lenv.join(folder,'index.cache.bz2') ) if env['_INSTALL']: diff --git a/redhat/applications/kio-locate/trinity-kio-locate.spec b/redhat/applications/kio-locate/trinity-kio-locate.spec index 7f43664d0..8c0677730 100644 --- a/redhat/applications/kio-locate/trinity-kio-locate.spec +++ b/redhat/applications/kio-locate/trinity-kio-locate.spec @@ -6,7 +6,7 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables @@ -54,11 +54,11 @@ as a directory. %prep %setup -q -n applications/%{kdecomp} -%patch1 -p1 +%patch1 -p1 -b .install # Ugly hack to modify TQT include directory inside SCONS files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/kde.py \ +%__sed -i "admin/kde.py" \ -e "s|/usr/include/tqt|%{_includedir}/tqt|g" @@ -85,6 +85,7 @@ scons install DESTDIR=%{buildroot} %doc AUTHORS ChangeLog COPYING TODO %{tde_libdir}/kio_locate.la %{tde_libdir}/kio_locate.so +%{tde_docdir}/HTML/en/kio-locate/common %{tde_docdir}/HTML/en/kio-locate/index.cache.bz2 %{tde_docdir}/HTML/en/kio-locate/index.docbook %{tde_docdir}/HTML/en/kio-locate/screenshot.png diff --git a/redhat/applications/koffice/trinity-koffice.spec b/redhat/applications/koffice/trinity-koffice.spec index fe3f44328..63f51b23b 100644 --- a/redhat/applications/koffice/trinity-koffice.spec +++ b/redhat/applications/koffice/trinity-koffice.spec @@ -108,9 +108,13 @@ BuildRequires: libutempter-devel BuildRequires: GraphicsMagick-devel >= 1.1.0 BuildRequires: trinity-wv2-devel -BuildRequires: trinity-poppler-qt3-devel >= 0.1.2 BuildRequires: trinity-libwpd-devel BuildRequires: trinity-libpqxx-devel +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 +BuildRequires: poppler-qt-devel >= 0.1.2 +%else +BuildRequires: trinity-poppler-qt3-devel >= 0.1.2 +%endif %description KOffice is an integrated office suite. diff --git a/redhat/applications/konversation/96f2a488.diff b/redhat/applications/konversation/96f2a488.diff new file mode 100644 index 000000000..45aec3704 --- /dev/null +++ b/redhat/applications/konversation/96f2a488.diff @@ -0,0 +1,84 @@ +commit 96f2a488786e370c355778e00c795e776e09d199 +Author: Timothy Pearson +Date: 1322168535 -0600 + + Fix FTBFS + +diff --git a/konversation/src/alias_preferences.h b/konversation/src/alias_preferences.h +index cf70b4f..aeb3062 100644 +--- a/konversation/src/alias_preferences.h ++++ b/konversation/src/alias_preferences.h +@@ -13,6 +13,8 @@ + #ifndef EXALIASPREFERENCES_H + #define EXALIASPREFERENCES_H + ++#include ++ + #include "alias_preferencesui.h" + #include "konvisettingspage.h" + +diff --git a/konversation/src/autoreplace_preferences.h b/konversation/src/autoreplace_preferences.h +index c73da29..9cab1f0 100644 +--- a/konversation/src/autoreplace_preferences.h ++++ b/konversation/src/autoreplace_preferences.h +@@ -13,6 +13,8 @@ + #ifndef AUTOREPLACECONFIG_H + #define AUTOREPLACECONFIG_H + ++#include ++ + #include "autoreplace_preferencesui.h" + #include "konvisettingspage.h" + +diff --git a/konversation/src/config/konversation.kcfg b/konversation/src/config/konversation.kcfg +index a2a2582..8cf2b82 100644 +--- a/konversation/src/config/konversation.kcfg ++++ b/konversation/src/config/konversation.kcfg +@@ -294,7 +294,7 @@ + + + +- QSize(400, 200) ++ TQSize(400, 200) + + + +diff --git a/konversation/src/highlight_preferences.h b/konversation/src/highlight_preferences.h +index 67863a7..89974ca 100644 +--- a/konversation/src/highlight_preferences.h ++++ b/konversation/src/highlight_preferences.h +@@ -17,7 +17,7 @@ + #include "konvisettingspage.h" + + #include +- ++#include + + class Highlight_Config; + class Highlight; +diff --git a/konversation/src/ignore_preferences.h b/konversation/src/ignore_preferences.h +index e910b78..a19ff03 100644 +--- a/konversation/src/ignore_preferences.h ++++ b/konversation/src/ignore_preferences.h +@@ -17,7 +17,7 @@ + #include "konvisettingspage.h" + + #include +- ++#include + + class Ignore; + class Ignore_Config : public Ignore_ConfigUI, public KonviSettingsPage +diff --git a/konversation/src/quickbuttons_preferences.h b/konversation/src/quickbuttons_preferences.h +index c8cc0e1..ccf26af 100644 +--- a/konversation/src/quickbuttons_preferences.h ++++ b/konversation/src/quickbuttons_preferences.h +@@ -13,6 +13,8 @@ + #ifndef TQUICKBUTTONSCONFIG_H + #define TQUICKBUTTONSCONFIG_H + ++#include ++ + #include "quickbuttons_preferencesui.h" + #include "konvisettingspage.h" + diff --git a/redhat/applications/konversation/bp000-01f5ea83.diff b/redhat/applications/konversation/bp000-01f5ea83.diff new file mode 100644 index 000000000..e55a04f57 --- /dev/null +++ b/redhat/applications/konversation/bp000-01f5ea83.diff @@ -0,0 +1,3130 @@ +commit 01f5ea83754cabfe6ebbcea0601cebaec976f708 +Author: Timothy Pearson +Date: 1324253563 -0600 + + Rename old tq methods that no longer need a unique name + +diff --git a/konversation/src/alias_preferencesui.ui b/konversation/src/alias_preferencesui.ui +index eb53d83..3783955 100644 +--- a/konversation/src/alias_preferencesui.ui ++++ b/konversation/src/alias_preferencesui.ui +@@ -146,7 +146,7 @@ + + Expanding + +- ++ + + 20 + 350 +diff --git a/konversation/src/autoreplace_preferencesui.ui b/konversation/src/autoreplace_preferencesui.ui +index f617836..769ba9b 100644 +--- a/konversation/src/autoreplace_preferencesui.ui ++++ b/konversation/src/autoreplace_preferencesui.ui +@@ -54,7 +54,7 @@ + + Expanding + +- ++ + + 20 + 506 +diff --git a/konversation/src/channel.cpp b/konversation/src/channel.cpp +index 21a507d..13e026e 100644 +--- a/konversation/src/channel.cpp ++++ b/konversation/src/channel.cpp +@@ -139,7 +139,7 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent) + + // The box holding the channel modes + modeBox = new TQHBox(topicWidget); +- modeBox->tqsetSizePolicy(hfixed); ++ modeBox->setSizePolicy(hfixed); + modeT = new ModeButton("T",modeBox,0); + modeN = new ModeButton("N",modeBox,1); + modeS = new ModeButton("S",modeBox,2); +@@ -240,33 +240,33 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent) + channelInput->installEventFilter(this); + + // Set the widgets size policies +- m_topicButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); +- topicLine->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum)); ++ m_topicButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); ++ topicLine->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum)); + +- commandLineBox->tqsetSizePolicy(vfixed); ++ commandLineBox->setSizePolicy(vfixed); + + limit->setMaximumSize(40,100); +- limit->tqsetSizePolicy(hfixed); ++ limit->setSizePolicy(hfixed); + + modeT->setMaximumSize(20,100); +- modeT->tqsetSizePolicy(hfixed); ++ modeT->setSizePolicy(hfixed); + modeN->setMaximumSize(20,100); +- modeN->tqsetSizePolicy(hfixed); ++ modeN->setSizePolicy(hfixed); + modeS->setMaximumSize(20,100); +- modeS->tqsetSizePolicy(hfixed); ++ modeS->setSizePolicy(hfixed); + modeI->setMaximumSize(20,100); +- modeI->tqsetSizePolicy(hfixed); ++ modeI->setSizePolicy(hfixed); + modeP->setMaximumSize(20,100); +- modeP->tqsetSizePolicy(hfixed); ++ modeP->setSizePolicy(hfixed); + modeM->setMaximumSize(20,100); +- modeM->tqsetSizePolicy(hfixed); ++ modeM->setSizePolicy(hfixed); + modeK->setMaximumSize(20,100); +- modeK->tqsetSizePolicy(hfixed); ++ modeK->setSizePolicy(hfixed); + modeL->setMaximumSize(20,100); +- modeL->tqsetSizePolicy(hfixed); ++ modeL->setSizePolicy(hfixed); + +- getTextView()->tqsetSizePolicy(greedy); +- nicknameListView->tqsetSizePolicy(hmodest); ++ getTextView()->setSizePolicy(greedy); ++ nicknameListView->setSizePolicy(hmodest); + + connect(channelInput,TQT_SIGNAL (submit()),this,TQT_SLOT (channelTextEntered()) ); + connect(channelInput,TQT_SIGNAL (envelopeCommand()),this,TQT_SLOT (channelPassthroughCommand()) ); +@@ -568,7 +568,7 @@ void Channel::popupCommand(int id) + break; + case Konversation::Ping: + { +- unsigned int time_t = TQDateTime::tqcurrentDateTime().toTime_t(); ++ unsigned int time_t = TQDateTime::currentDateTime().toTime_t(); + pattern=TQString(cc+"CTCP %u PING %1").tqarg(time_t); + } + break; +@@ -796,7 +796,7 @@ void Channel::completeNick() + { + nick = it.current(); + +- if(nick->getChannelNick()->getNickname().tqstartsWith(pattern, Preferences::nickCompletionCaseSensitive()) && ++ if(nick->getChannelNick()->getNickname().startsWith(pattern, Preferences::nickCompletionCaseSensitive()) && + (nick->getChannelNick()->timeStamp() > timeStamp)) + { + timeStamp = nick->getChannelNick()->timeStamp(); +@@ -822,7 +822,7 @@ void Channel::completeNick() + lookNick = lookNick.section( prefixCharacter,1 ); + } + +- if(lookNick.tqstartsWith(pattern, Preferences::nickCompletionCaseSensitive())) ++ if(lookNick.startsWith(pattern, Preferences::nickCompletionCaseSensitive())) + { + foundNick = lookNick; + } +@@ -1521,7 +1521,7 @@ void Channel::setTopic(const TQString &newTopic) + + if(m_topicHistory.first().section(' ', 2) != newTopic) + { +- m_topicHistory.prepend(TQString("%1 "+i18n("unknown")+" %2").tqarg(TQDateTime::tqcurrentDateTime().toTime_t()).tqarg(newTopic)); ++ m_topicHistory.prepend(TQString("%1 "+i18n("unknown")+" %2").tqarg(TQDateTime::currentDateTime().toTime_t()).tqarg(newTopic)); + emit topicHistoryChanged(); + } + } +@@ -1537,7 +1537,7 @@ void Channel::setTopic(const TQString &nickname, const TQString &newTopic) // Ov + appendCommandMessage(i18n("Topic"), i18n("%1 sets the channel topic to \"%2\".").tqarg(nickname).tqarg(newTopic)); + } + +- m_topicHistory.prepend(TQString("%1 %2 %3").tqarg(TQDateTime::tqcurrentDateTime().toTime_t()).tqarg(nickname).tqarg(newTopic)); ++ m_topicHistory.prepend(TQString("%1 %2 %3").tqarg(TQDateTime::currentDateTime().toTime_t()).tqarg(nickname).tqarg(newTopic)); + TQString topic = Konversation::removeIrcMarkup(newTopic); + topicLine->setText(topic); + +@@ -1557,7 +1557,7 @@ TQString Channel::getTopic() + void Channel::setTopicAuthor(const TQString& newAuthor, TQDateTime time) + { + if (time.isNull() || !time.isValid()) +- time=TQDateTime::tqcurrentDateTime(); ++ time=TQDateTime::currentDateTime(); + + if(topicAuthorUnknown) + { +@@ -2253,8 +2253,8 @@ void Channel::updateAppearance() + } + else + { +- fg=tqcolorGroup().foreground(); +- bg=tqcolorGroup().base(); ++ fg=colorGroup().foreground(); ++ bg=colorGroup().base(); + abg=KGlobalSettings::alternateBackgroundColor(); + } + +@@ -2797,7 +2797,7 @@ void Channel::append(const TQString& nickname, const TQString& message) + Nick* nick = getNickByName(nickname); + + if(nick) { +- nick->getChannelNick()->setTimeStamp(TQDateTime::tqcurrentDateTime().toTime_t()); ++ nick->getChannelNick()->setTimeStamp(TQDateTime::currentDateTime().toTime_t()); + } + } + +@@ -2811,7 +2811,7 @@ void Channel::appendAction(const TQString& nickname, const TQString& message) + Nick* nick = getNickByName(nickname); + + if(nick) { +- nick->getChannelNick()->setTimeStamp(TQDateTime::tqcurrentDateTime().toTime_t()); ++ nick->getChannelNick()->setTimeStamp(TQDateTime::currentDateTime().toTime_t()); + } + } + +diff --git a/konversation/src/channellistpanel.cpp b/konversation/src/channellistpanel.cpp +index 364c34c..79a9168 100644 +--- a/konversation/src/channellistpanel.cpp ++++ b/konversation/src/channellistpanel.cpp +@@ -223,7 +223,7 @@ void ChannelListPanel::saveList() + + TQString header(i18n("Konversation Channel List: %1 - %2\n\n") + .tqarg(m_server->getServerName()) +- .tqarg(TQDateTime::tqcurrentDateTime().toString())); ++ .tqarg(TQDateTime::currentDateTime().toString())); + + // send header to stream + stream << header; +diff --git a/konversation/src/channeloptionsui.ui b/konversation/src/channeloptionsui.ui +index bfdaea8..33bb6ff 100644 +--- a/konversation/src/channeloptionsui.ui ++++ b/konversation/src/channeloptionsui.ui +@@ -267,7 +267,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 211 + 20 +@@ -319,7 +319,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 301 + 31 +@@ -383,7 +383,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 16 +diff --git a/konversation/src/chatwindow.cpp b/konversation/src/chatwindow.cpp +index f7eb651..9e37d92 100644 +--- a/konversation/src/chatwindow.cpp ++++ b/konversation/src/chatwindow.cpp +@@ -219,7 +219,7 @@ void ChatWindow::setLogfileName(const TQString& name) + if(firstLog) + { + // status panels get special treatment here, since they have no server at the beginning +- if (getType() == tqStatus || getType() == DccChat) ++ if (getType() == Status || getType() == DccChat) + { + logName = name + ".log"; + } +@@ -236,7 +236,7 @@ void ChatWindow::setLogfileName(const TQString& name) + cdIntoLogPath(); + // Show last log lines. This idea was stole ... um ... inspired by PMP :) + // Don't do this for the server status windows, though +- if((getType() != tqStatus) && logfile.open(IO_ReadOnly)) ++ if((getType() != Status) && logfile.open(IO_ReadOnly)) + { + unsigned long filePosition; + +@@ -343,13 +343,13 @@ void ChatWindow::logText(const TQString& text) + + if(firstLog) + { +- TQString intro(i18n("\n*** Logfile started\n*** on %1\n\n").tqarg(TQDateTime::tqcurrentDateTime().toString())); ++ TQString intro(i18n("\n*** Logfile started\n*** on %1\n\n").tqarg(TQDateTime::currentDateTime().toString())); + logStream << intro; + firstLog=false; + } + + TQTime time=TQTime::currentTime(); +- TQString logLine(TQString("[%1] [%2] %3\n").tqarg(TQDate::tqcurrentDate(Qt::LocalTime).toString()). ++ TQString logLine(TQString("[%1] [%2] %3\n").tqarg(TQDate::currentDate(Qt::LocalTime).toString()). + tqarg(time.toString("hh:mm:ss")).tqarg(text)); + + logStream << logLine; +diff --git a/konversation/src/chatwindow.h b/konversation/src/chatwindow.h +index 947c789..d77f5d1 100644 +--- a/konversation/src/chatwindow.h ++++ b/konversation/src/chatwindow.h +@@ -35,7 +35,7 @@ class ChatWindow : public TQVBox + + enum WindowType + { +- tqStatus=0, ++ Status=0, + Channel, + Query, + DccChat, +diff --git a/konversation/src/chatwindowappearance_preferences.ui b/konversation/src/chatwindowappearance_preferences.ui +index a332268..c1c152c 100644 +--- a/konversation/src/chatwindowappearance_preferences.ui ++++ b/konversation/src/chatwindowappearance_preferences.ui +@@ -74,7 +74,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 191 + 20 +@@ -129,7 +129,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 251 + 20 +@@ -205,7 +205,7 @@ the Free Software Foundation; either version 2 of the License, or + + Fixed + +- ++ + + 16 + 20 +@@ -233,7 +233,7 @@ the Free Software Foundation; either version 2 of the License, or + + Fixed + +- ++ + + 16 + 20 +@@ -269,7 +269,7 @@ the Free Software Foundation; either version 2 of the License, or + + Fixed + +- ++ + + 16 + 20 +@@ -320,7 +320,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 20 +diff --git a/konversation/src/chatwindowbehaviour_preferences.ui b/konversation/src/chatwindowbehaviour_preferences.ui +index 0e5c779..5968850 100644 +--- a/konversation/src/chatwindowbehaviour_preferences.ui ++++ b/konversation/src/chatwindowbehaviour_preferences.ui +@@ -92,7 +92,7 @@ + + Expanding + +- ++ + + 410 + 20 +@@ -137,7 +137,7 @@ + + Expanding + +- ++ + + 230 + 20 +@@ -200,7 +200,7 @@ + + Fixed + +- ++ + + 16 + 20 +@@ -236,7 +236,7 @@ + + Expanding + +- ++ + + 170 + 20 +@@ -253,7 +253,7 @@ + + Expanding + +- ++ + + 190 + 20 +@@ -331,7 +331,7 @@ + + Expanding + +- ++ + + 41 + 20 +diff --git a/konversation/src/colorsappearance_preferences.ui b/konversation/src/colorsappearance_preferences.ui +index 54f68ac..909e5b3 100644 +--- a/konversation/src/colorsappearance_preferences.ui ++++ b/konversation/src/colorsappearance_preferences.ui +@@ -141,7 +141,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 20 +@@ -158,7 +158,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 20 +@@ -175,7 +175,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 20 +@@ -192,7 +192,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 20 +@@ -209,7 +209,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 20 +@@ -226,7 +226,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 20 +@@ -243,7 +243,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 20 +@@ -260,7 +260,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 20 +@@ -277,7 +277,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 20 +@@ -294,7 +294,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 20 +@@ -536,7 +536,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 40 + 20 +@@ -553,7 +553,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 40 + 20 +@@ -570,7 +570,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 40 + 20 +@@ -587,7 +587,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 40 + 20 +@@ -652,7 +652,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 40 + 20 +@@ -669,7 +669,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 40 + 20 +@@ -761,7 +761,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 271 + 20 +@@ -962,7 +962,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 50 + 20 +@@ -979,7 +979,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 50 + 20 +@@ -996,7 +996,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 50 + 20 +@@ -1013,7 +1013,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 50 + 20 +@@ -1030,7 +1030,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 50 + 20 +@@ -1047,7 +1047,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 50 + 20 +@@ -1064,7 +1064,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 50 + 20 +@@ -1081,7 +1081,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 50 + 20 +@@ -1162,7 +1162,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 50 + 20 +@@ -1179,7 +1179,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 50 + 20 +@@ -1196,7 +1196,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 50 + 20 +@@ -1213,7 +1213,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 50 + 20 +@@ -1296,7 +1296,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 0 +diff --git a/konversation/src/common.cpp b/konversation/src/common.cpp +index 7e1d301..eba7508 100644 +--- a/konversation/src/common.cpp ++++ b/konversation/src/common.cpp +@@ -144,7 +144,7 @@ namespace Konversation + continue; + } + +- if (urlPattern.cap(1).tqstartsWith("www.", false)) ++ if (urlPattern.cap(1).startsWith("www.", false)) + protocol = "http://"; + else if (urlPattern.cap(1).isEmpty()) + protocol = "mailto:"; +diff --git a/konversation/src/connectionbehavior_preferences.ui b/konversation/src/connectionbehavior_preferences.ui +index 8c2f2a1..752c26c 100644 +--- a/konversation/src/connectionbehavior_preferences.ui ++++ b/konversation/src/connectionbehavior_preferences.ui +@@ -60,7 +60,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 278 + 20 +@@ -119,7 +119,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 280 + 20 +@@ -138,7 +138,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 21 + 60 +diff --git a/konversation/src/dcc_preferencesui.ui b/konversation/src/dcc_preferencesui.ui +index 9ae128a..ccff213 100644 +--- a/konversation/src/dcc_preferencesui.ui ++++ b/konversation/src/dcc_preferencesui.ui +@@ -114,7 +114,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 16 +@@ -214,7 +214,7 @@ the Free Software Foundation; either version 2 of the License, or + + Maximum + +- ++ + + 70 + 20 +@@ -231,7 +231,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 70 + 20 +@@ -248,7 +248,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 70 + 20 +@@ -329,7 +329,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 50 + 21 +@@ -396,7 +396,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 50 + 21 +diff --git a/konversation/src/dccchat.cpp b/konversation/src/dccchat.cpp +index 58002f9..f40d1ae 100644 +--- a/konversation/src/dccchat.cpp ++++ b/konversation/src/dccchat.cpp +@@ -418,7 +418,7 @@ void DccChat::showEvent(TQShowEvent* /* event */) + if(m_initialShow) { + m_initialShow = false; + TQValueList sizes; +- sizes << m_sourceLine->tqsizeHint().height() << (height() - m_sourceLine->tqsizeHint().height()); ++ sizes << m_sourceLine->sizeHint().height() << (height() - m_sourceLine->sizeHint().height()); + m_headerSplitter->setSizes(sizes); + } + } +@@ -435,8 +435,8 @@ void DccChat::updateAppearance() + } + else + { +- fg=tqcolorGroup().foreground(); +- bg=tqcolorGroup().base(); ++ fg=colorGroup().foreground(); ++ bg=colorGroup().base(); + } + + m_dccChatInput->unsetPalette(); +diff --git a/konversation/src/dccresumedialog.cpp b/konversation/src/dccresumedialog.cpp +index d2d3c7e..30b687b 100644 +--- a/konversation/src/dccresumedialog.cpp ++++ b/konversation/src/dccresumedialog.cpp +@@ -97,7 +97,7 @@ DccResumeDialog::DccResumeDialog(DccTransferRecv* item, const TQString& caption, + } + + updateDialogButtons(); +- setInitialSize(TQSize(500, tqsizeHint().height())); ++ setInitialSize(TQSize(500, sizeHint().height())); + + } + +diff --git a/konversation/src/dcctransfer.cpp b/konversation/src/dcctransfer.cpp +index cec058c..c12147f 100644 +--- a/konversation/src/dcctransfer.cpp ++++ b/konversation/src/dcctransfer.cpp +@@ -43,7 +43,7 @@ DccTransfer::DccTransfer( DccType dccType, TQObject* parent ) : TQObject(parent) + + connect( &m_loggerTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( logTransfer() ) ); + +- m_timeOffer = TQDateTime::tqcurrentDateTime(); ++ m_timeOffer = TQDateTime::currentDateTime(); + } + + DccTransfer::~DccTransfer() +@@ -60,7 +60,7 @@ DccTransfer::DccTransfer( const DccTransfer& obj ) + m_bufferSize = 0; + m_averageSpeed = obj.getAverageSpeed(); + m_currentSpeed = obj.getCurrentSpeed(); +- m_status = obj.gettqStatus(); ++ m_status = obj.getStatus(); + m_statusDetail = obj.getStatusDetail(); + m_type = obj.getType(); + m_fileName = obj.getFileName(); +@@ -88,20 +88,20 @@ DccTransfer::DccTransfer( const DccTransfer& obj ) + + void DccTransfer::setConnectionId( int id ) + { +- if ( gettqStatus() == Configuring || gettqStatus() == Queued ) ++ if ( getStatus() == Configuring || getStatus() == Queued ) + m_connectionId = id; + } + + void DccTransfer::setPartnerNick( const TQString& nick ) + { +- if ( gettqStatus() == Configuring || gettqStatus() == Queued ) ++ if ( getStatus() == Configuring || getStatus() == Queued ) + m_partnerNick = nick; + } + + bool DccTransfer::queue() + { + kdDebug() << "DccTransfer::queue()" << endl; +- if ( gettqStatus() != Configuring ) ++ if ( getStatus() != Configuring ) + return false; + + if ( m_fileName.isEmpty() ) +@@ -110,13 +110,13 @@ bool DccTransfer::queue() + if ( m_connectionId == -1 || m_partnerNick.isEmpty() ) + return false; + +- settqStatus( Queued ); ++ setStatus( Queued ); + return true; + } + + void DccTransfer::startTransferLogger() + { +- m_timeTransferStarted = TQDateTime::tqcurrentDateTime(); ++ m_timeTransferStarted = TQDateTime::currentDateTime(); + m_loggerBaseTime.start(); + m_loggerTimer.start( 100 ); + } +@@ -124,7 +124,7 @@ void DccTransfer::startTransferLogger() + void DccTransfer::finishTransferLogger() + { + if ( m_timeTransferFinished.isNull() ) +- m_timeTransferFinished = TQDateTime::tqcurrentDateTime(); ++ m_timeTransferFinished = TQDateTime::currentDateTime(); + m_loggerTimer.stop(); + updateTransferMeters(); + } +@@ -137,21 +137,21 @@ void DccTransfer::logTransfer() + updateTransferMeters(); + } + +-void DccTransfer::settqStatus( DcctqStatus status, const TQString& statusDetail ) ++void DccTransfer::setStatus( DccStatus status, const TQString& statusDetail ) + { + bool changed = ( status != m_status ); +- DcctqStatus oldtqStatus = m_status; ++ DccStatus oldStatus = m_status; + m_status = status; + m_statusDetail = statusDetail; + if ( changed ) +- emit statusChanged( this, m_status, oldtqStatus ); ++ emit statusChanged( this, m_status, oldStatus ); + } + + void DccTransfer::updateTransferMeters() + { + const int timeToCalc = 5; + +- if ( gettqStatus() == Transferring ) ++ if ( getStatus() == Transferring ) + { + // update CurrentSpeed + +@@ -174,7 +174,7 @@ void DccTransfer::updateTransferMeters() + if ( m_transferLogTime.count() >= 2 ) + { + // FIXME: precision of average speed is too bad +- m_averageSpeed = (double)( m_transferringPosition - m_transferStartPosition ) / (double)m_timeTransferStarted.secsTo( TQDateTime::tqcurrentDateTime() ); ++ m_averageSpeed = (double)( m_transferringPosition - m_transferStartPosition ) / (double)m_timeTransferStarted.secsTo( TQDateTime::currentDateTime() ); + m_currentSpeed = (double)( m_transferLogPosition.last() - m_transferLogPosition.front() ) / (double)( m_transferLogTime.last() - m_transferLogTime.front() ) * 1000; + } + else // avoid zero devision +@@ -240,7 +240,7 @@ DccTransfer::DccType DccTransfer::getType() const + return m_type; + } + +-DccTransfer::DcctqStatus DccTransfer::gettqStatus() const ++DccTransfer::DccStatus DccTransfer::getStatus() const + { + return m_status; + } +diff --git a/konversation/src/dcctransfer.h b/konversation/src/dcctransfer.h +index 64d3827..5765bdd 100644 +--- a/konversation/src/dcctransfer.h ++++ b/konversation/src/dcctransfer.h +@@ -39,7 +39,7 @@ class DccTransfer : public TQObject + Send + }; + +- enum DcctqStatus ++ enum DccStatus + { + Configuring = 0, // Not queud yet (this means that user can't see the item at this time) + Queued, // Newly added DCC, waiting user's response +@@ -52,7 +52,7 @@ class DccTransfer : public TQObject + Aborted + }; + +- enum UnavailabletqStatus ++ enum UnavailableStatus + { + Calculating = -1, + NotInTransfer = -2, +@@ -66,7 +66,7 @@ class DccTransfer : public TQObject + DccTransfer( const DccTransfer& obj ); + + DccType getType() const; +- DcctqStatus gettqStatus() const; ++ DccStatus getStatus() const; + const TQString& getStatusDetail() const; + TQDateTime getTimeOffer() const; + int getConnectionId() const; +@@ -100,7 +100,7 @@ class DccTransfer : public TQObject + signals: + void transferStarted( DccTransfer* item ); + void done( DccTransfer* item ); +- void statusChanged( DccTransfer* item, int newtqStatus, int oldtqStatus ); ++ void statusChanged( DccTransfer* item, int newStatus, int oldStatus ); + + public slots: + virtual bool queue(); +@@ -108,7 +108,7 @@ class DccTransfer : public TQObject + virtual void abort() {}; + + protected: +- void settqStatus( DcctqStatus status, const TQString& statusDetail = TQString() ); ++ void setStatus( DccStatus status, const TQString& statusDetail = TQString() ); + void startTransferLogger(); + void finishTransferLogger(); + +@@ -122,7 +122,7 @@ class DccTransfer : public TQObject + protected: + // transfer information + DccType m_type; +- DcctqStatus m_status; ++ DccStatus m_status; + TQString m_statusDetail; + bool m_resumed; + bool m_reverse; +diff --git a/konversation/src/dcctransferdetailedinfopanel.cpp b/konversation/src/dcctransferdetailedinfopanel.cpp +index 635faf2..6bd6961 100644 +--- a/konversation/src/dcctransferdetailedinfopanel.cpp ++++ b/konversation/src/dcctransferdetailedinfopanel.cpp +@@ -61,7 +61,7 @@ void DccTransferDetailedInfoPanel::setItem( DccTransferPanelItem* item ) + + // If the file is already being transferred, the timer must be started here, + // otherwise the information will not be updated every 0.5sec +- if (m_item->transfer()->gettqStatus() == DccTransfer::Transferring) ++ if (m_item->transfer()->getStatus() == DccTransfer::Transferring) + m_autoViewUpdateTimer->start(500, false); + connect( m_item->transfer(), TQT_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQT_SLOT( slotTransferStatusChanged( DccTransfer*, int, int ) ) ); + +@@ -83,10 +83,10 @@ void DccTransferDetailedInfoPanel::updateView() + + // Location: + m_urlreqLocation->setURL( transfer->getFileURL().prettyURL() ); +- //m_urlreqLocation->lineEdit()->setFocusPolicy( transfer->gettqStatus() == DccTransfer::Queued ? StrongFocus : ClickFocus ); +- m_urlreqLocation->lineEdit()->setReadOnly( transfer->gettqStatus() != DccTransfer::Queued ); +- m_urlreqLocation->lineEdit()->setFrame( transfer->gettqStatus() == DccTransfer::Queued ); +- m_urlreqLocation->button()->setEnabled( transfer->gettqStatus() == DccTransfer::Queued ); ++ //m_urlreqLocation->lineEdit()->setFocusPolicy( transfer->getStatus() == DccTransfer::Queued ? StrongFocus : ClickFocus ); ++ m_urlreqLocation->lineEdit()->setReadOnly( transfer->getStatus() != DccTransfer::Queued ); ++ m_urlreqLocation->lineEdit()->setFrame( transfer->getStatus() == DccTransfer::Queued ); ++ m_urlreqLocation->button()->setEnabled( transfer->getStatus() == DccTransfer::Queued ); + m_buttonOpenFolder->setEnabled( !m_urlreqLocation->lineEdit()->text().isEmpty() ); + + // Partner: +@@ -110,11 +110,11 @@ void DccTransferDetailedInfoPanel::updateView() + else + m_labelSelf->setText( i18n( "%1 (port %2)" ).tqarg( transfer->getOwnIp() ).tqarg( transfer->getOwnPort() ) ); + +- // tqStatus: +- if ( transfer->gettqStatus() == DccTransfer::Transferring ) +- m_labeltqStatus->setText( m_item->getStatusText() + " ( " + m_item->getCurrentSpeedPrettyText() + " )" ); ++ // Status: ++ if ( transfer->getStatus() == DccTransfer::Transferring ) ++ m_labelStatus->setText( m_item->getStatusText() + " ( " + m_item->getCurrentSpeedPrettyText() + " )" ); + else +- m_labeltqStatus->setText( transfer->getStatusDetail().isEmpty() ? m_item->getStatusText() : m_item->getStatusText() + " (" + transfer->getStatusDetail() + ')' ); ++ m_labelStatus->setText( transfer->getStatusDetail().isEmpty() ? m_item->getStatusText() : m_item->getStatusText() + " (" + transfer->getStatusDetail() + ')' ); + + // Progress: + m_progress->setProgress( transfer->getProgress() ); +@@ -146,7 +146,7 @@ void DccTransferDetailedInfoPanel::updateView() + + // The transfer is still in progress + if ( transfer->getTimeTransferFinished().isNull() ) +- transferringTime = transfer->getTimeTransferStarted().secsTo( TQDateTime::tqcurrentDateTime() ); ++ transferringTime = transfer->getTimeTransferStarted().secsTo( TQDateTime::currentDateTime() ); + // The transfer has finished + else + transferringTime = transfer->getTimeTransferStarted().secsTo( transfer->getTimeTransferFinished() ); +@@ -176,15 +176,15 @@ void DccTransferDetailedInfoPanel::updateView() + m_labelTimeFinished->setText( "" ); + } + +-void DccTransferDetailedInfoPanel::slotTransferStatusChanged( DccTransfer* /* transfer */, int newtqStatus, int oldtqStatus ) ++void DccTransferDetailedInfoPanel::slotTransferStatusChanged( DccTransfer* /* transfer */, int newStatus, int oldStatus ) + { + updateView(); +- if ( newtqStatus == DccTransfer::Transferring ) ++ if ( newStatus == DccTransfer::Transferring ) + { + // start auto view-update timer + m_autoViewUpdateTimer->start( 500, false ); + } +- else if ( oldtqStatus == DccTransfer::Transferring ) ++ else if ( oldStatus == DccTransfer::Transferring ) + { + // stop auto view-update timer + m_autoViewUpdateTimer->stop(); +diff --git a/konversation/src/dcctransferdetailedinfopanel.h b/konversation/src/dcctransferdetailedinfopanel.h +index 7fbcf65..8433822 100644 +--- a/konversation/src/dcctransferdetailedinfopanel.h ++++ b/konversation/src/dcctransferdetailedinfopanel.h +@@ -33,7 +33,7 @@ class DccTransferDetailedInfoPanel : public DccTransferDetailedInfoPanelUI + + private slots: + void updateView(); +- void slotTransferStatusChanged( DccTransfer* transfer, int newtqStatus, int oldtqStatus ); ++ void slotTransferStatusChanged( DccTransfer* transfer, int newStatus, int oldStatus ); + void slotLocationChanged( const TQString& url ); + void slotOpenFolderButtonClicked(); + +diff --git a/konversation/src/dcctransferdetailedinfopanelui.ui b/konversation/src/dcctransferdetailedinfopanelui.ui +index 24f6742..b11b2e1 100644 +--- a/konversation/src/dcctransferdetailedinfopanelui.ui ++++ b/konversation/src/dcctransferdetailedinfopanelui.ui +@@ -71,7 +71,7 @@ + textLabel10 + + +- tqStatus: ++ Status: + + + +@@ -92,7 +92,7 @@ + + + +- m_labeltqStatus ++ m_labelStatus + + + +@@ -188,7 +188,7 @@ + 0 + + +- ++ + + 130 + 0 +@@ -218,7 +218,7 @@ + 0 + + +- ++ + + 130 + 0 +@@ -240,7 +240,7 @@ + 0 + + +- ++ + + 130 + 0 +@@ -278,7 +278,7 @@ + 0 + + +- ++ + + 130 + 0 +@@ -316,7 +316,7 @@ + 0 + + +- ++ + + 130 + 0 +@@ -386,7 +386,7 @@ + 0 + + +- ++ + + 130 + 0 +@@ -424,7 +424,7 @@ + 0 + + +- ++ + + 130 + 0 +@@ -470,7 +470,7 @@ + + Expanding + +- ++ + + 110 + 20 +diff --git a/konversation/src/dcctransfermanager.cpp b/konversation/src/dcctransfermanager.cpp +index 3e4357c..ec36840 100644 +--- a/konversation/src/dcctransfermanager.cpp ++++ b/konversation/src/dcctransfermanager.cpp +@@ -62,7 +62,7 @@ DccTransferRecv* DccTransferManager::resumeDownload( int connectionId, const TQS + TQValueListConstIterator< DccTransferRecv* > it; + for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it ) + { +- if ( ( (*it)->gettqStatus() == DccTransfer::Queued || (*it)->gettqStatus() == DccTransfer::WaitingRemote ) && ++ if ( ( (*it)->getStatus() == DccTransfer::Queued || (*it)->getStatus() == DccTransfer::WaitingRemote ) && + (*it)->getConnectionId() == connectionId && + (*it)->getPartnerNick() == partnerNick && + (*it)->getFileName() == fileName && +@@ -92,7 +92,7 @@ DccTransferSend* DccTransferManager::resumeUpload( int connectionId, const TQStr + TQValueListConstIterator< DccTransferSend* > it; + for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it ) + { +- if ( ( (*it)->gettqStatus() == DccTransfer::Queued || (*it)->gettqStatus() == DccTransfer::WaitingRemote ) && ++ if ( ( (*it)->getStatus() == DccTransfer::Queued || (*it)->getStatus() == DccTransfer::WaitingRemote ) && + (*it)->getConnectionId() == connectionId && + (*it)->getPartnerNick() == partnerNick && + (*it)->getFileName() == fileName && +@@ -124,7 +124,7 @@ DccTransferSend* DccTransferManager::startReverseSending( int connectionId, cons + for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it ) + { + if ( +- (*it)->gettqStatus() == DccTransfer::WaitingRemote && ++ (*it)->getStatus() == DccTransfer::WaitingRemote && + (*it)->getConnectionId() == connectionId && + (*it)->getPartnerNick() == partnerNick && + (*it)->getFileName() == fileName && +@@ -155,8 +155,8 @@ bool DccTransferManager::isLocalFileInWritingProcess( const KURL& url ) const + TQValueListConstIterator< DccTransferRecv* > it; + for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it ) + { +- if ( ( (*it)->gettqStatus() == DccTransfer::Connecting || +- (*it)->gettqStatus() == DccTransfer::Transferring ) && ++ if ( ( (*it)->getStatus() == DccTransfer::Connecting || ++ (*it)->getStatus() == DccTransfer::Transferring ) && + (*it)->getFileURL() == url ) + { + return true; +@@ -175,25 +175,25 @@ bool DccTransferManager::hasActiveTransfers() + TQValueListConstIterator< DccTransferSend* > it; + for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it ) + { +- if ((*it)->gettqStatus() == DccTransfer::Transferring) ++ if ((*it)->getStatus() == DccTransfer::Transferring) + return true; + } + + TQValueListConstIterator< DccTransferRecv* > it2; + for ( it2 = m_recvItems.begin() ; it2 != m_recvItems.end() ; ++it2 ) + { +- if ((*it2)->gettqStatus() == DccTransfer::Transferring) ++ if ((*it2)->getStatus() == DccTransfer::Transferring) + return true; + } + + return false; + } + +-void DccTransferManager::slotTransferStatusChanged( DccTransfer* item, int newtqStatus, int oldtqStatus ) ++void DccTransferManager::slotTransferStatusChanged( DccTransfer* item, int newStatus, int oldStatus ) + { +- kdDebug() << "DccTransferManager::slotTransferStatusChanged(): " << oldtqStatus << " -> " << newtqStatus << " " << item->getFileName() << " (" << item->getType() << ")" << endl; ++ kdDebug() << "DccTransferManager::slotTransferStatusChanged(): " << oldStatus << " -> " << newStatus << " " << item->getFileName() << " (" << item->getType() << ")" << endl; + +- if ( newtqStatus == DccTransfer::Queued ) ++ if ( newStatus == DccTransfer::Queued ) + emit newTransferQueued( item ); + } + +@@ -205,7 +205,7 @@ void DccTransferManager::slotSettingsChanged() + TQValueListConstIterator< DccTransferRecv* > it; + for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it ) + { +- if ( (*it)->gettqStatus() == DccTransfer::Queued && ++ if ( (*it)->getStatus() == DccTransfer::Queued && + (*it)->getFileURL().directory() == m_defaultIncomingFolder ) + { + KURL url; +diff --git a/konversation/src/dcctransfermanager.h b/konversation/src/dcctransfermanager.h +index c5753f7..0a34c3b 100644 +--- a/konversation/src/dcctransfermanager.h ++++ b/konversation/src/dcctransfermanager.h +@@ -79,7 +79,7 @@ class DccTransferManager : public TQObject + void initTransfer( DccTransfer* transfer ); + + private slots: +- void slotTransferStatusChanged( DccTransfer* item, int newtqStatus, int oldtqStatus ); ++ void slotTransferStatusChanged( DccTransfer* item, int newStatus, int oldStatus ); + void removeSendItem( DccTransfer* item ); + void removeRecvItem( DccTransfer* item ); + +diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp +index 385850b..8b89afa 100644 +--- a/konversation/src/dcctransferpanel.cpp ++++ b/konversation/src/dcctransferpanel.cpp +@@ -76,7 +76,7 @@ void DccTransferPanel::initGUI() + + //m_listView->setColumnText(Column::TypeIcon, ""); + m_listView->setColumnText(Column::OfferDate, i18n("Started at")); +- m_listView->setColumnText(Column::tqStatus, i18n("Status")); ++ m_listView->setColumnText(Column::Status, i18n("Status")); + m_listView->setColumnText(Column::FileName, i18n("File")); + m_listView->setColumnText(Column::PartnerNick, i18n("Partner")); + m_listView->setColumnText(Column::Progress, i18n("Progress")); +@@ -201,7 +201,7 @@ void DccTransferPanel::updateButton() + DccTransferPanelItem* item = static_cast( it.current() ); + + DccTransfer::DccType type = item->transfer()->getType(); +- DccTransfer::DcctqStatus status = item->transfer()->gettqStatus(); ++ DccTransfer::DccStatus status = item->transfer()->getStatus(); + + selectAll = true; + selectAllCompleted |= ( status >= DccTransfer::Done ); +@@ -276,7 +276,7 @@ void DccTransferPanel::acceptDcc() + { + DccTransferPanelItem* item=static_cast( it.current() ); + DccTransfer* transfer = item->transfer(); +- if( transfer->getType() == DccTransfer::Receive && transfer->gettqStatus() == DccTransfer::Queued ) ++ if( transfer->getType() == DccTransfer::Receive && transfer->getStatus() == DccTransfer::Queued ) + transfer->start(); + } + ++it; +@@ -292,7 +292,7 @@ void DccTransferPanel::abortDcc() + { + DccTransferPanelItem* item=static_cast( it.current() ); + DccTransfer* transfer = item->transfer(); +- if( transfer->gettqStatus() < DccTransfer::Done ) ++ if( transfer->getStatus() < DccTransfer::Done ) + transfer->abort(); + } + ++it; +@@ -308,7 +308,7 @@ void DccTransferPanel::resendFile() + { + DccTransferPanelItem* item=static_cast( it.current() ); + DccTransfer* transfer = item->transfer(); +- if( transfer->getType() == DccTransfer::Send && transfer->gettqStatus() >= DccTransfer::Done ) ++ if( transfer->getType() == DccTransfer::Send && transfer->getStatus() >= DccTransfer::Done ) + { + DccTransferSend* newTransfer = KonversationApplication::instance()->getDccTransferManager()->newUpload(); + +@@ -335,7 +335,7 @@ void DccTransferPanel::clearDcc() + { + DccTransferPanelItem* item = static_cast( it.current() ); + // should we check that [item] is not null? +- if( it.current()->isSelected() && item->transfer()->gettqStatus() >= DccTransfer::Done ) ++ if( it.current()->isSelected() && item->transfer()->getStatus() >= DccTransfer::Done ) + lst.append( it.current() ); + ++it; + } +@@ -377,7 +377,7 @@ void DccTransferPanel::runDcc() + { + DccTransferPanelItem* item=static_cast( it.current() ); + DccTransfer* transfer = item->transfer(); +- if( transfer->getType() == DccTransfer::Send || transfer->gettqStatus() == DccTransfer::Done ) ++ if( transfer->getType() == DccTransfer::Send || transfer->getStatus() == DccTransfer::Done ) + item->runFile(); + } + ++it; +@@ -392,7 +392,7 @@ void DccTransferPanel::showFileInfo() + if( it.current()->isSelected() ) + { + DccTransferPanelItem* item=static_cast( it.current() ); +- if( item->transfer()->getType() == DccTransfer::Send || item->transfer()->gettqStatus() == DccTransfer::Done ) ++ if( item->transfer()->getType() == DccTransfer::Send || item->transfer()->getStatus() == DccTransfer::Done ) + item->openFileInfoDialog(); + } + ++it; +@@ -416,7 +416,7 @@ void DccTransferPanel::selectAllCompleted() + while ( it.current() ) + { + DccTransferPanelItem* item=static_cast( it.current() ); +- m_listView->setSelected( *it, item->transfer()->gettqStatus() >= DccTransfer::Done ); ++ m_listView->setSelected( *it, item->transfer()->getStatus() >= DccTransfer::Done ); + ++it; + } + updateButton(); +diff --git a/konversation/src/dcctransferpanel.h b/konversation/src/dcctransferpanel.h +index 09afaeb..7b88bcb 100644 +--- a/konversation/src/dcctransferpanel.h ++++ b/konversation/src/dcctransferpanel.h +@@ -39,7 +39,7 @@ class DccTransferPanel : public ChatWindow + { + TypeIcon, + OfferDate, +- tqStatus, ++ Status, + FileName, + PartnerNick, + Progress, +diff --git a/konversation/src/dcctransferpanelitem.cpp b/konversation/src/dcctransferpanelitem.cpp +index 8737a3b..d2cb9ee 100644 +--- a/konversation/src/dcctransferpanelitem.cpp ++++ b/konversation/src/dcctransferpanelitem.cpp +@@ -67,10 +67,10 @@ DccTransferPanelItem::~DccTransferPanelItem() + void DccTransferPanelItem::updateView() + { + setPixmap( DccTransferPanel::Column::TypeIcon, getTypeIcon() ); +- setPixmap( DccTransferPanel::Column::tqStatus, getStatusIcon() ); ++ setPixmap( DccTransferPanel::Column::Status, getStatusIcon() ); + + setText( DccTransferPanel::Column::OfferDate, m_transfer->getTimeOffer().toString( "hh:mm:ss" ) ); +- setText( DccTransferPanel::Column::tqStatus, getStatusText() ); ++ setText( DccTransferPanel::Column::Status, getStatusText() ); + setText( DccTransferPanel::Column::FileName, m_transfer->getFileName() ); + setText( DccTransferPanel::Column::PartnerNick, m_transfer->getPartnerNick() ); + setText( DccTransferPanel::Column::Position, getPositionPrettyText() ); +@@ -104,9 +104,9 @@ int DccTransferPanelItem::compare( TQListViewItem* i, int col, bool ascending ) + if ( m_transfer->getTimeOffer() < item->transfer()->getTimeOffer() ) return -1; + return 0; + break; +- case DccTransferPanel::Column::tqStatus: +- if ( m_transfer->gettqStatus() > item->transfer()->gettqStatus() ) return 1; +- if ( m_transfer->gettqStatus() < item->transfer()->gettqStatus() ) return -1; ++ case DccTransferPanel::Column::Status: ++ if ( m_transfer->getStatus() > item->transfer()->getStatus() ) return 1; ++ if ( m_transfer->getStatus() < item->transfer()->getStatus() ) return -1; + return 0; + break; + case DccTransferPanel::Column::Position: +@@ -130,11 +130,11 @@ int DccTransferPanelItem::compare( TQListViewItem* i, int col, bool ascending ) + return TQListViewItem::compare( i, col, ascending ); + } + +-void DccTransferPanelItem::slotStatusChanged( DccTransfer* /* transfer */, int newtqStatus, int /* oldtqStatus */ ) ++void DccTransferPanelItem::slotStatusChanged( DccTransfer* /* transfer */, int newStatus, int /* oldStatus */ ) + { + updateView(); + +- if ( newtqStatus == DccTransfer::Transferring ) ++ if ( newStatus == DccTransfer::Transferring ) + startAutoViewUpdate(); + } + +@@ -167,7 +167,7 @@ void DccTransferPanelItem::showProgressBar() + { + if ( m_transfer->getFileSize() ) + { +- TQRect rect = listView()->tqitemRect( this ); ++ TQRect rect = listView()->itemRect( this ); + TQHeader *head = listView()->header(); + rect.setLeft( head->sectionPos( DccTransferPanel::Column::Progress ) - head->offset() ); + rect.setWidth( head->sectionSize( DccTransferPanel::Column::Progress ) ); +@@ -178,13 +178,13 @@ void DccTransferPanelItem::showProgressBar() + + void DccTransferPanelItem::runFile() + { +- if ( m_transfer->getType() == DccTransfer::Send || m_transfer->gettqStatus() == DccTransfer::Done ) ++ if ( m_transfer->getType() == DccTransfer::Send || m_transfer->getStatus() == DccTransfer::Done ) + new KRun( m_transfer->getFileURL(), listView() ); + } + + void DccTransferPanelItem::openFileInfoDialog() + { +- if ( m_transfer->getType() == DccTransfer::Send || m_transfer->gettqStatus() == DccTransfer::Done ) ++ if ( m_transfer->getType() == DccTransfer::Send || m_transfer->getStatus() == DccTransfer::Done ) + { + TQStringList infoList; + +@@ -278,7 +278,7 @@ TQPixmap DccTransferPanelItem::getTypeIcon() const + TQPixmap DccTransferPanelItem::getStatusIcon() const + { + TQString icon; +- switch ( m_transfer->gettqStatus() ) ++ switch ( m_transfer->getStatus() ) + { + case DccTransfer::Queued: + icon = "player_stop"; +@@ -306,7 +306,7 @@ TQPixmap DccTransferPanelItem::getStatusIcon() const + + TQString DccTransferPanelItem::getStatusText() const + { +- DccTransfer::DcctqStatus status = m_transfer->gettqStatus(); ++ DccTransfer::DccStatus status = m_transfer->getStatus(); + DccTransfer::DccType type = m_transfer->getType(); + + if ( status == DccTransfer::Queued ) +diff --git a/konversation/src/dcctransferpanelitem.h b/konversation/src/dcctransferpanelitem.h +index 7e1b113..eef6305 100644 +--- a/konversation/src/dcctransferpanelitem.h ++++ b/konversation/src/dcctransferpanelitem.h +@@ -71,7 +71,7 @@ class DccTransferPanelItem : public TQObject, public KListViewItem + static TQString secToHMS( long sec ); + + private slots: +- void slotStatusChanged( DccTransfer* transfer, int newtqStatus, int oldtqStatus ); ++ void slotStatusChanged( DccTransfer* transfer, int newStatus, int oldStatus ); + void updateView(); + + private: +diff --git a/konversation/src/dcctransferrecv.cpp b/konversation/src/dcctransferrecv.cpp +index 6a5820a..9922bbb 100644 +--- a/konversation/src/dcctransferrecv.cpp ++++ b/konversation/src/dcctransferrecv.cpp +@@ -113,44 +113,44 @@ void DccTransferRecv::cleanUp() + // just for convenience + void DccTransferRecv::failed( const TQString& errorMessage ) + { +- settqStatus( Failed, errorMessage ); ++ setStatus( Failed, errorMessage ); + cleanUp(); + emit done( this ); + } + + void DccTransferRecv::setPartnerIp( const TQString& ip ) + { +- if ( gettqStatus() == Configuring ) ++ if ( getStatus() == Configuring ) + m_partnerIp = ip; + } + + void DccTransferRecv::setPartnerPort( const TQString& port ) + { +- if ( gettqStatus() == Configuring ) ++ if ( getStatus() == Configuring ) + m_partnerPort = port; + } + + void DccTransferRecv::setFileSize( unsigned long fileSize ) + { +- if ( gettqStatus() == Configuring ) ++ if ( getStatus() == Configuring ) + m_fileSize = fileSize; + } + + void DccTransferRecv::setFileName( const TQString& fileName ) + { +- if ( gettqStatus() == Configuring ) ++ if ( getStatus() == Configuring ) + m_fileName = fileName; + } + + void DccTransferRecv::setFileURL( const KURL& url ) + { +- if ( gettqStatus() == Configuring || gettqStatus() == Queued ) ++ if ( getStatus() == Configuring || getStatus() == Queued ) + m_fileURL = url; + } + + void DccTransferRecv::setReverse( bool reverse, const TQString& reverseToken ) + { +- if ( gettqStatus() == Configuring ) ++ if ( getStatus() == Configuring ) + { + m_reverse = reverse; + if ( reverse ) +@@ -165,7 +165,7 @@ bool DccTransferRecv::queue() + { + kdDebug() << "DccTransferRecv::queue()" << endl; + +- if ( gettqStatus() != Configuring ) ++ if ( getStatus() != Configuring ) + return false; + + if ( m_partnerIp.isEmpty() || m_partnerPort.isEmpty() ) +@@ -237,7 +237,7 @@ void DccTransferRecv::abort() // public slot + m_writeCacheHandler->write( true ); // flush + } + +- settqStatus( Aborted ); ++ setStatus( Aborted ); + cleanUp(); + emit done( this ); + } +@@ -246,10 +246,10 @@ void DccTransferRecv::start() // public slot + { + kdDebug() << "DccTransferRecv::start() [BEGIN]" << endl; + +- if ( gettqStatus() != Queued ) ++ if ( getStatus() != Queued ) + return; + +- settqStatus( Preparing ); ++ setStatus( Preparing ); + + prepareLocalKio( false, false ); + +@@ -305,7 +305,7 @@ void DccTransferRecv::askAndPrepareLocalKio( const TQString& message, int enable + break; + case DccResumeDialog::RA_Cancel: + default: +- settqStatus( Queued ); ++ setStatus( Queued ); + } + } + +@@ -444,7 +444,7 @@ void DccTransferRecv::connectWithSender() + m_ownIp = DccCommon::getOwnIp( server ); + m_ownPort = TQString::number( DccCommon::getServerSocketPort( m_serverSocket ) ); + +- settqStatus( WaitingRemote, i18n( "Waiting for connection" ) ); ++ setStatus( WaitingRemote, i18n( "Waiting for connection" ) ); + + server->dccReverseSendAck( m_partnerNick, m_fileName, DccCommon::textIpToNumericalIp( m_ownIp ), m_ownPort, m_fileSize, m_reverseToken ); + +@@ -460,7 +460,7 @@ void DccTransferRecv::requestResume() + { + kdDebug() << "DccTransferRecv::requestResume()" << endl; + +- settqStatus( WaitingRemote, i18n( "Waiting for remote host's acceptance" ) ); ++ setStatus( WaitingRemote, i18n( "Waiting for remote host's acceptance" ) ); + + startConnectionTimer( 30 ); + +@@ -503,7 +503,7 @@ void DccTransferRecv::connectToSendServer() + + // connect to sender + +- settqStatus( Connecting ); ++ setStatus( Connecting ); + + m_recvSocket = new KNetwork::KStreamSocket( m_partnerIp, m_partnerPort, this); + +@@ -577,7 +577,7 @@ void DccTransferRecv::startReceiving() + connect( m_recvSocket, TQT_SIGNAL( readyWrite() ), this, TQT_SLOT( sendAck() ) ); + connect( m_recvSocket, TQT_SIGNAL( closed() ), this, TQT_SLOT( slotSocketClosed() ) ); + +- settqStatus( Transferring ); ++ setStatus( Transferring ); + + m_transferStartPosition = m_transferringPosition; + +@@ -633,7 +633,7 @@ void DccTransferRecv::sendAck() // slot + void DccTransferRecv::slotLocalWriteDone() // <-WriteCacheHandler::done() + { + kdDebug() << "DccTransferRecv::slotLocalWriteDone()" << endl; +- settqStatus( Done ); ++ setStatus( Done ); + cleanUp(); + emit done( this ); + } +@@ -670,7 +670,7 @@ void DccTransferRecv::connectionTimeout() // slot + void DccTransferRecv::slotSocketClosed() + { + finishTransferLogger(); +- if ( gettqStatus() == Transferring ) ++ if ( getStatus() == Transferring ) + failed( i18n( "Remote user disconnected" ) ); + } + +diff --git a/konversation/src/dcctransfersend.cpp b/konversation/src/dcctransfersend.cpp +index 295a12b..db0bad2 100644 +--- a/konversation/src/dcctransfersend.cpp ++++ b/konversation/src/dcctransfersend.cpp +@@ -91,38 +91,38 @@ void DccTransferSend::cleanUp() + // just for convenience + void DccTransferSend::failed( const TQString& errorMessage ) + { +- settqStatus( Failed, errorMessage ); ++ setStatus( Failed, errorMessage ); + cleanUp(); + emit done( this ); + } + + void DccTransferSend::setFileURL( const KURL& url ) + { +- if ( gettqStatus() == Configuring ) ++ if ( getStatus() == Configuring ) + m_fileURL = url; + } + + void DccTransferSend::setFileName( const TQString& fileName ) + { +- if ( gettqStatus() == Configuring ) ++ if ( getStatus() == Configuring ) + m_fileName = fileName; + } + + void DccTransferSend::setOwnIp( const TQString& ownIp ) + { +- if ( gettqStatus() == Configuring ) ++ if ( getStatus() == Configuring ) + m_ownIp = ownIp; + } + + void DccTransferSend::setFileSize( KIO::filesize_t fileSize ) + { +- if ( gettqStatus() == Configuring ) ++ if ( getStatus() == Configuring ) + m_fileSize = fileSize; + } + + void DccTransferSend::setReverse( bool reverse ) + { +- if ( gettqStatus() == Configuring ) ++ if ( getStatus() == Configuring ) + m_reverse = reverse; + } + +@@ -130,7 +130,7 @@ bool DccTransferSend::queue() + { + kdDebug() << "DccTransferSend::queue()" << endl; + +- if ( gettqStatus() != Configuring ) ++ if ( getStatus() != Configuring ) + return false; + + if ( m_ownIp.isEmpty() ) +@@ -217,7 +217,7 @@ void DccTransferSend::abort() // public slot + { + kdDebug() << "DccTransferSend::abort()" << endl; + +- settqStatus( Aborted ); ++ setStatus( Aborted ); + cleanUp(); + emit done( this ); + } +@@ -226,7 +226,7 @@ void DccTransferSend::start() // public slot + { + kdDebug() << "DccTransferSend::start()" << endl; + +- if ( gettqStatus() != Queued ) ++ if ( getStatus() != Queued ) + return; + + // common procedure +@@ -283,7 +283,7 @@ void DccTransferSend::start() // public slot + server->dccPassiveSendRequest( m_partnerNick, m_fileName, getNumericalIpText( m_ownIp ), m_fileSize, m_reverseToken ); + } + +- settqStatus( WaitingRemote, i18n( "Waiting remote user's acceptance" ) ); ++ setStatus( WaitingRemote, i18n( "Waiting remote user's acceptance" ) ); + } + + void DccTransferSend::connectToReceiver( const TQString& partnerHost, const TQString& partnerPort ) +@@ -300,7 +300,7 @@ void DccTransferSend::connectToReceiver( const TQString& partnerHost, const TQSt + connect( m_sendSocket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( startSending() ) ); + connect( m_sendSocket, TQT_SIGNAL( gotError( int ) ), this, TQT_SLOT( slotConnectionFailed( int ) ) ); + +- settqStatus( Connecting ); ++ setStatus( Connecting ); + + m_sendSocket->connect(); + } +@@ -309,7 +309,7 @@ bool DccTransferSend::setResume( unsigned long position ) + { + kdDebug() << "DccTransferSend::setResume(): position=" << position << endl; + +- if ( gettqStatus() > WaitingRemote ) ++ if ( getStatus() > WaitingRemote ) + return false; + + if ( position >= m_fileSize ) +@@ -359,7 +359,7 @@ void DccTransferSend::startSending() + m_file.at( m_transferringPosition ); + m_transferStartPosition = m_transferringPosition; + +- settqStatus( Transferring ); ++ setStatus( Transferring ); + m_sendSocket->enableWrite( true ); + m_sendSocket->enableRead( m_fastSend ); + startTransferLogger(); // initialize CPS counter, ETA counter, etc... +@@ -407,7 +407,7 @@ void DccTransferSend::getAck() // slot + { + kdDebug() << "DccTransferSend::getAck(): Received final ACK." << endl; + finishTransferLogger(); +- settqStatus( Done ); ++ setStatus( Done ); + cleanUp(); + emit done( this ); + break; // for safe +@@ -457,7 +457,7 @@ void DccTransferSend::slotSendSocketClosed() + { + kdDebug() << "DccTransferSend::slotSendSocketClosed()" << endl; + finishTransferLogger(); +- if ( gettqStatus() == Transferring && m_transferringPosition < (KIO::fileoffset_t)m_fileSize ) ++ if ( getStatus() == Transferring && m_transferringPosition < (KIO::fileoffset_t)m_fileSize ) + failed( i18n( "Remote user disconnected" ) ); + } + +diff --git a/konversation/src/fontappearance_preferences.ui b/konversation/src/fontappearance_preferences.ui +index 389a252..a50b3a0 100644 +--- a/konversation/src/fontappearance_preferences.ui ++++ b/konversation/src/fontappearance_preferences.ui +@@ -54,7 +54,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 161 +diff --git a/konversation/src/generalbehavior_preferences.ui b/konversation/src/generalbehavior_preferences.ui +index 164ca58..0354e67 100644 +--- a/konversation/src/generalbehavior_preferences.ui ++++ b/konversation/src/generalbehavior_preferences.ui +@@ -60,7 +60,7 @@ the Free Software Foundation; either version 2 of the License, or + + Fixed + +- ++ + + 31 + 20 +@@ -88,7 +88,7 @@ the Free Software Foundation; either version 2 of the License, or + + Fixed + +- ++ + + 31 + 20 +@@ -301,7 +301,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 20 +diff --git a/konversation/src/highlight_preferencesui.ui b/konversation/src/highlight_preferencesui.ui +index 65baf8f..3b42a4d 100644 +--- a/konversation/src/highlight_preferencesui.ui ++++ b/konversation/src/highlight_preferencesui.ui +@@ -141,7 +141,7 @@ + + Expanding + +- ++ + + 20 + 250 +@@ -362,7 +362,7 @@ + + Expanding + +- ++ + + 120 + 20 +@@ -379,7 +379,7 @@ + + Expanding + +- ++ + + 50 + 20 +@@ -396,7 +396,7 @@ + + Expanding + +- ++ + + 50 + 21 +diff --git a/konversation/src/ignore_preferencesui.ui b/konversation/src/ignore_preferencesui.ui +index b726d29..88aa423 100644 +--- a/konversation/src/ignore_preferencesui.ui ++++ b/konversation/src/ignore_preferencesui.ui +@@ -185,7 +185,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 40 +diff --git a/konversation/src/inputfilter.cpp b/konversation/src/inputfilter.cpp +index f597812..f2e78ec 100644 +--- a/konversation/src/inputfilter.cpp ++++ b/konversation/src/inputfilter.cpp +@@ -371,7 +371,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + i18n("Received CTCP-%1 request from %2, sending answer.") + .tqarg("TIME").tqarg(sourceNick) + ); +- server->ctcpReply(sourceNick,TQString("TIME ")+TQDateTime::tqcurrentDateTime().toString()); ++ server->ctcpReply(sourceNick,TQString("TIME ")+TQDateTime::currentDateTime().toString()); + } + + // No known CTCP request, give a general message +@@ -431,7 +431,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + // pong reply, calculate turnaround time + if(replyReason.lower()=="ping") + { +- int dateArrived=TQDateTime::tqcurrentDateTime().toTime_t(); ++ int dateArrived=TQDateTime::currentDateTime().toTime_t(); + int dateSent=reply.toInt(); + int time = dateArrived-dateSent; + TQString unit = "seconds"; +diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp +index 568adc9..20d3edf 100644 +--- a/konversation/src/ircinput.cpp ++++ b/konversation/src/ircinput.cpp +@@ -61,7 +61,7 @@ IRCInput::IRCInput(TQWidget* parent) : KTextEdit(parent) + connect(completionBox, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(insertCompletion(const TQString&))); + + // widget may not be resized vertically +- tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed)); ++ setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed)); + + //NoWrap coupled with the size policy constrains the line edit to be one row high + setWordWrap(m_multiRow ? WidgetWidth : NoWrap); +@@ -130,7 +130,7 @@ void IRCInput::updateAppearance() + { + m_multiRow = Preferences::useMultiRowInputBox(); + setWordWrap(m_multiRow ? WidgetWidth : NoWrap); +- m_lastHeight=heightForWidth(tqsizeHint().width()); ++ m_lastHeight=heightForWidth(sizeHint().width()); + ensureCursorVisible(); //appears to trigger updateGeometry + } + +@@ -144,7 +144,7 @@ void IRCInput::resizeContents( int w, int h ) + } + + // widget must be only one line high - luckily QT will enforce this via wrappping policy +-TQSize IRCInput::tqsizeHint() const ++TQSize IRCInput::sizeHint() const + { + constPolish(); + +diff --git a/konversation/src/ircinput.h b/konversation/src/ircinput.h +index f372b24..f4fa095 100644 +--- a/konversation/src/ircinput.h ++++ b/konversation/src/ircinput.h +@@ -38,7 +38,7 @@ class IRCInput : public KTextEdit + int getOldCursorPosition(); + TQString lastCompletion() const { return m_lastCompletion; } + +- virtual TQSize tqsizeHint() const; ++ virtual TQSize sizeHint() const; + TQString text() const; + + signals: +diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp +index 6b3342b..fb57094 100644 +--- a/konversation/src/ircview.cpp ++++ b/konversation/src/ircview.cpp +@@ -532,7 +532,7 @@ bool doHighlight, bool parseURL, bool self) + (whoSent.find(needleReg) != -1)); + + // remember captured patterns for later +- captures=needleReg.tqcapturedTexts(); ++ captures=needleReg.capturedTexts(); + + } + else +@@ -1709,7 +1709,7 @@ TQString IRCView::timeStamp() + } + else + { +- TQDate date = TQDate::tqcurrentDate(); ++ TQDate date = TQDate::currentDate(); + timeString = TQString("[%1 %2] ") + .tqarg(KGlobal::locale()->formatDate(date, true /*short format*/), +diff --git a/konversation/src/ircviewbox.cpp b/konversation/src/ircviewbox.cpp +index 9318cbf..24401dd 100644 +--- a/konversation/src/ircviewbox.cpp ++++ b/konversation/src/ircviewbox.cpp +@@ -84,14 +84,14 @@ void IRCViewBox::searchNext(bool reversed) + if (match) + { + m_searchBar->setHasMatch(true); +- m_searchBar->settqStatus(TQPixmap(), ""); ++ m_searchBar->setStatus(TQPixmap(), ""); + return; + } + + if (!m_matchedOnce) + { + m_searchBar->setHasMatch(false); +- m_searchBar->settqStatus(getIcon("messagebox_warning"), ++ m_searchBar->setStatus(getIcon("messagebox_warning"), + i18n("Phrase not found")); + return; + } +@@ -105,13 +105,13 @@ void IRCViewBox::searchNext(bool reversed) + if (!match) + { + m_searchBar->setHasMatch(false); +- m_searchBar->settqStatus(getIcon("messagebox_warning"), ++ m_searchBar->setStatus(getIcon("messagebox_warning"), + i18n("Phrase not found")); + return; + } + + m_searchBar->setHasMatch(true); +- m_searchBar->settqStatus(getIcon("messagebox_info"), ++ m_searchBar->setStatus(getIcon("messagebox_info"), + i18n("Wrapped search")); + } + +@@ -126,12 +126,12 @@ void IRCViewBox::slotSearchChanged(const TQString& pattern) + if (match) + { + m_searchBar->setHasMatch(true); +- m_searchBar->settqStatus(TQPixmap(), ""); ++ m_searchBar->setStatus(TQPixmap(), ""); + } + else + { + m_searchBar->setHasMatch(false); +- m_searchBar->settqStatus(getIcon("messagebox_warning"), ++ m_searchBar->setStatus(getIcon("messagebox_warning"), + i18n("Phrase not found")); + } + +diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp +index d8f5891..083a1ee 100644 +--- a/konversation/src/konversationapplication.cpp ++++ b/konversation/src/konversationapplication.cpp +@@ -343,7 +343,7 @@ void KonversationApplication::readOptions() + osd->setShadow(Preferences::oSDDrawShadow()); + + osd->setOffset(Preferences::oSDOffsetX(), Preferences::oSDOffsetY()); +- osd->tqsetAlignment((OSDWidget::Alignment)Preferences::oSDAlignment()); ++ osd->setAlignment((OSDWidget::Alignment)Preferences::oSDAlignment()); + + if(Preferences::oSDUseCustomColors()) + { +@@ -856,7 +856,7 @@ TQString KonversationApplication::doAutoreplace(const TQString& text,bool output + if(index != -1) + { + // remember captured patterns +- TQStringList captures = needleReg.tqcapturedTexts(); ++ TQStringList captures = needleReg.capturedTexts(); + + // replace %0 - %9 in regex groups + for(unsigned int capture=0;capturestatusBar(),"mainLabel"); + setMainLabelText(i18n("Ready.")); +- m_mainLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); ++ m_mainLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); + m_mainLabel->setMinimumWidth(0); + + // KSqueezedLabel calculates the wrong height. Popular workaround. +diff --git a/konversation/src/konvibookmarkhandler.cpp b/konversation/src/konvibookmarkhandler.cpp +index 79cf12a..5a76682 100644 +--- a/konversation/src/konvibookmarkhandler.cpp ++++ b/konversation/src/konvibookmarkhandler.cpp +@@ -63,7 +63,7 @@ KonviBookmarkHandler::~KonviBookmarkHandler() + void KonviBookmarkHandler::slotEditBookmarks() + { + KProcess proc; +- proc << TQString::tqfromLatin1("keditbookmarks"); ++ proc << TQString::fromLatin1("keditbookmarks"); + proc << "--nobrowser"; + proc << "--caption" << i18n("Konversation Bookmarks Editor"); + proc << m_file; +diff --git a/konversation/src/linkaddressbook/addressbook.cpp b/konversation/src/linkaddressbook/addressbook.cpp +index 6a050af..7d09c49 100644 +--- a/konversation/src/linkaddressbook/addressbook.cpp ++++ b/konversation/src/linkaddressbook/addressbook.cpp +@@ -98,7 +98,7 @@ namespace Konversation + kdDebug() << "Addressbook::presenceString() called with an empty uid" << endl; + return TQString("Error"); + } +- switch( presencetqStatus(uid)) ++ switch( presenceStatus(uid)) + { + case 0: + return ""; +@@ -113,7 +113,7 @@ namespace Konversation + } + return TQString("Error"); + } +- int Addressbook::presencetqStatus(const TQString &uid) ++ int Addressbook::presenceStatus(const TQString &uid) + { + return presenceStatusByAddressee(addressBook->findByUid(uid)); + } +@@ -125,7 +125,7 @@ namespace Konversation + kdDebug() << "Addressbook::canReceiveFiles() called with empty uid" << endl; + return false; + } +- int presence = presencetqStatus(uid); ++ int presence = presenceStatus(uid); + + return (presence == 4) || (presence == 3); + } +@@ -137,7 +137,7 @@ namespace Konversation + return false; + } + //this should return false if they are offline. +- int result = presencetqStatus(uid); ++ int result = presenceStatus(uid); + if(result == 3 || result == 4) return true; + return false; + } +@@ -161,7 +161,7 @@ namespace Konversation + if(!isPresent(uid)) + return TQPixmap(); + +- switch(presencetqStatus(uid)) ++ switch(presenceStatus(uid)) + { + case 0: //Unknown + case 1: //Offline +@@ -331,7 +331,7 @@ void Addressbook::emitContactPresenceChanged(const TQString &uid) + return; + }; + +- emitContactPresenceChanged(uid, presencetqStatus(uid)); ++ emitContactPresenceChanged(uid, presenceStatus(uid)); + } + + } //NAMESPACE +diff --git a/konversation/src/linkaddressbook/addressbook.h b/konversation/src/linkaddressbook/addressbook.h +index 222a05f..95fc6c5 100644 +--- a/konversation/src/linkaddressbook/addressbook.h ++++ b/konversation/src/linkaddressbook/addressbook.h +@@ -52,7 +52,7 @@ namespace Konversation + // metadata + TQPixmap icon( const TQString &uid ); + TQString context( const TQString &uid ); +- virtual int presencetqStatus(const TQString &uid); ++ virtual int presenceStatus(const TQString &uid); + // App capabilities + TQStringList protocols(); + +diff --git a/konversation/src/linkaddressbook/kimiface.h b/konversation/src/linkaddressbook/kimiface.h +index bd6ab85..257bb42 100644 +--- a/konversation/src/linkaddressbook/kimiface.h ++++ b/konversation/src/linkaddressbook/kimiface.h +@@ -88,7 +88,7 @@ class KIMIface : virtual public DCOPObject + * @param uid the KABC uid you want the presence for. + * @return a numeric representation of presence - currently one of 0 (Unknown), 1 (Offline), 2 (Connecting), 3 (Away), 4 (Online) + */ +- virtual int presencetqStatus( const TQString & uid ) = 0; ++ virtual int presenceStatus( const TQString & uid ) = 0; + /** + * Indicate if a given uid can receive files + * @param uid the KABC uid you are interested in. +@@ -175,7 +175,7 @@ class KIMIface : virtual public DCOPObject + * Indicates that a contact's presence has changed + * @param uid the contact whose presence changed. + * @param appId the dcop application id of the program the signal originates from. +- * @param presence the new numeric presence @ref presencetqStatus ++ * @param presence the new numeric presence @ref presenceStatus + */ + void contactPresenceChanged( TQString uid, TQCString appId, int presence ); + }; +diff --git a/konversation/src/linkaddressbook/linkaddressbookui_base.ui b/konversation/src/linkaddressbook/linkaddressbookui_base.ui +index 5d630c4..e67d306 100644 +--- a/konversation/src/linkaddressbook/linkaddressbookui_base.ui ++++ b/konversation/src/linkaddressbook/linkaddressbookui_base.ui +@@ -37,7 +37,7 @@ + + Expanding + +- ++ + + 405 + 20 +diff --git a/konversation/src/linkaddressbook/nicklisttooltip.cpp b/konversation/src/linkaddressbook/nicklisttooltip.cpp +index f49d7a0..732b32e 100644 +--- a/konversation/src/linkaddressbook/nicklisttooltip.cpp ++++ b/konversation/src/linkaddressbook/nicklisttooltip.cpp +@@ -52,17 +52,17 @@ namespace Konversation + return; + + TQString toolTip; +- TQRect tqitemRect = m_listView->tqitemRect( item ); ++ TQRect itemRect = m_listView->itemRect( item ); + + uint leftMargin = m_listView->treeStepSize() * + ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) + + m_listView->itemMargin(); +- uint xAdjust = tqitemRect.left() + leftMargin; +- uint yAdjust = tqitemRect.top(); ++ uint xAdjust = itemRect.left() + leftMargin; ++ uint yAdjust = itemRect.top(); + TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust ); + toolTip = Konversation::removeIrcMarkup(nick->getChannelNick()->tooltip()); + if(!toolTip.isEmpty()) +- tip(tqitemRect, toolTip); ++ tip(itemRect, toolTip); + } + + } // namespace Konversation +diff --git a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp +index 6315e10..9c4df71 100644 +--- a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp ++++ b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp +@@ -51,17 +51,17 @@ namespace Konversation + if(!nickInfo ) + return; + TQString toolTip; +- TQRect tqitemRect = m_listView->tqitemRect( item ); ++ TQRect itemRect = m_listView->itemRect( item ); + + uint leftMargin = m_listView->treeStepSize() * + ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) + + m_listView->itemMargin(); +- uint xAdjust = tqitemRect.left() + leftMargin; +- uint yAdjust = tqitemRect.top(); ++ uint xAdjust = itemRect.left() + leftMargin; ++ uint yAdjust = itemRect.top(); + TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust ); + toolTip = nickInfo->tooltip(); + if(!toolTip.isEmpty()) +- tip(tqitemRect, toolTip); ++ tip(itemRect, toolTip); + } + + } // namespace Konversation +diff --git a/konversation/src/log_preferences.ui b/konversation/src/log_preferences.ui +index 0ffdfc7..13326e6 100644 +--- a/konversation/src/log_preferences.ui ++++ b/konversation/src/log_preferences.ui +@@ -92,7 +92,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 21 + 10 +diff --git a/konversation/src/multilinetextedit.cpp b/konversation/src/multilinetextedit.cpp +index 880d0d1..be42a1f 100644 +--- a/konversation/src/multilinetextedit.cpp ++++ b/konversation/src/multilinetextedit.cpp +@@ -44,7 +44,7 @@ void MultilineTextEdit::drawWhitespaces() + TQPainter pa(viewport()); + + // get a sane color +- TQColor col=tqcolorGroup().link(); ++ TQColor col=colorGroup().link(); + // and a brush of the same color + TQBrush fillBrush(col); + // use it for line drawing +diff --git a/konversation/src/nickinfo.cpp b/konversation/src/nickinfo.cpp +index fb2cde4..17765ca 100644 +--- a/konversation/src/nickinfo.cpp ++++ b/konversation/src/nickinfo.cpp +@@ -99,7 +99,7 @@ bool NickInfo::isIdentified() const { return m_identified; } + TQString NickInfo::getPrettyOnlineSince() const + { + TQString prettyOnlineSince; +- int daysto = m_onlineSince.date().daysTo( TQDate::tqcurrentDate()); ++ int daysto = m_onlineSince.date().daysTo( TQDate::currentDate()); + if(daysto == 0) prettyOnlineSince = i18n("Today"); + else if(daysto == 1) prettyOnlineSince = i18n("Yesterday"); + else prettyOnlineSince = m_onlineSince.toString("ddd d MMMM yyyy"); +diff --git a/konversation/src/nicklistbehavior_preferencesui.ui b/konversation/src/nicklistbehavior_preferencesui.ui +index 3df61f0..53b06ae 100644 +--- a/konversation/src/nicklistbehavior_preferencesui.ui ++++ b/konversation/src/nicklistbehavior_preferencesui.ui +@@ -54,7 +54,7 @@ the Free Software Foundation; either version 2 of the License, or + + + +- kcfg_SortBytqStatus ++ kcfg_SortByStatus + + + +@@ -133,13 +133,13 @@ the Free Software Foundation; either version 2 of the License, or + + + +- kcfg_SortBytqStatus ++ kcfg_SortByStatus + toggled(bool) + sortOrder + setEnabled(bool) + + +- kcfg_SortBytqStatus ++ kcfg_SortByStatus + toggled(bool) + orderHintLabel + setEnabled(bool) +@@ -148,7 +148,7 @@ the Free Software Foundation; either version 2 of the License, or + + kcfg_ChannelDoubleClickAction + kcfg_SortCaseInsensitive +- kcfg_SortBytqStatus ++ kcfg_SortByStatus + sortOrder + + +diff --git a/konversation/src/nicklistview.cpp b/konversation/src/nicklistview.cpp +index ab98437..26e6bdd 100644 +--- a/konversation/src/nicklistview.cpp ++++ b/konversation/src/nicklistview.cpp +@@ -86,14 +86,14 @@ KListView(parent) + + int newitem; + newitem = popup->insertItem(i18n("Open &Query"),Konversation::OpenQuery); +- popup->tqsetWhatsThis(newitem, "Start a private chat between you and this person.

Technical note:
The conversation between you and this person will be sent via the server. This means that the conversation will be affected by server lag, server stability, and will be terminated when you disconnect from the server."); ++ popup->setWhatsThis(newitem, "Start a private chat between you and this person.

Technical note:
The conversation between you and this person will be sent via the server. This means that the conversation will be affected by server lag, server stability, and will be terminated when you disconnect from the server."); + newitem = popup->insertItem(i18n("Open DCC &Chat"),Konversation::StartDccChat); +- popup->tqsetWhatsThis(newitem, "Start a private Direct Client Connection chat between you and this person.

Technical note:
The conversation between you and this person will be sent directly. This means it is independent from the server - so if the server connection fails, or use disconnect, your DCC Chat will be unaffected. It also means that no irc server admin can view or spy on this chat."); ++ popup->setWhatsThis(newitem, "Start a private Direct Client Connection chat between you and this person.

Technical note:
The conversation between you and this person will be sent directly. This means it is independent from the server - so if the server connection fails, or use disconnect, your DCC Chat will be unaffected. It also means that no irc server admin can view or spy on this chat."); + + if (kapp->authorize("allow_downloading")) + { + newitem = popup->insertItem(SmallIcon("2rightarrow"),i18n("Send &File..."),Konversation::DccSend); +- popup->tqsetWhatsThis(newitem, "Send a file to this person. If you are having problem sending files, or they are sending slowly, see the Konversation Handbook and DCC preferences page."); ++ popup->setWhatsThis(newitem, "Send a file to this person. If you are having problem sending files, or they are sending slowly, see the Konversation Handbook and DCC preferences page."); + } + popup->insertItem(SmallIconSet("mail_generic"),i18n("&Send Email..."), Konversation::SendEmail); + +diff --git a/konversation/src/nicksonline.cpp b/konversation/src/nicksonline.cpp +index 5cc7bf1..1dd88f2 100644 +--- a/konversation/src/nicksonline.cpp ++++ b/konversation/src/nicksonline.cpp +@@ -102,7 +102,7 @@ NicksOnline::NicksOnline(TQWidget* parent): ChatWindow(parent) + "When you select a nickname in the list above, the buttons here are used " + "to associate the nickname with an entry in KAddressBook."); + TQWhatsThis::add(addressbookLabel, addressbookLabelWT); +- addressbookLabel->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); ++ addressbookLabel->setAlignment(TQt::AlignRight | TQt::AlignVCenter); + m_editContactButton = new TQPushButton(i18n("Edit C&ontact..."), + buttonBox, "nicksonline_editcontact_button"); + TQString editContactButtonWT = i18n( +diff --git a/konversation/src/osd.cpp b/konversation/src/osd.cpp +index b228a73..8bd1745 100644 +--- a/konversation/src/osd.cpp ++++ b/konversation/src/osd.cpp +@@ -206,7 +206,7 @@ void OSDWidget::setOffset( int /*x*/, int y ) + reposition(); + } + +-void OSDWidget::tqsetAlignment( Alignment a ) ++void OSDWidget::setAlignment( Alignment a ) + { + m_tqalignment = a; + reposition(); +@@ -402,7 +402,7 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e ) + + // the code was taken from pilotDaemon.cc in KPilot + // static +-OSDWidget::KDesktopLocktqStatus OSDWidget::isKDesktopLockRunning() ++OSDWidget::KDesktopLockStatus OSDWidget::isKDesktopLockRunning() + { + if (!Preferences::oSDCheckDesktopLock()) + return NotLocked; +diff --git a/konversation/src/osd.h b/konversation/src/osd.h +index 68bf408..f71f1d7 100644 +--- a/konversation/src/osd.h ++++ b/konversation/src/osd.h +@@ -41,7 +41,7 @@ class OSDWidget : public TQWidget + void setTextColor(const TQColor &newcolor); + void setBackgroundColor(const TQColor &newColor); + void setOffset( int x, int y ); +- void tqsetAlignment(Alignment); ++ void setAlignment(Alignment); + void setScreen(uint screen); + void setText(const TQString &text) { m_currentText = text; refresh(); } + +@@ -79,8 +79,8 @@ class OSDWidget : public TQWidget + /* called after most set*() calls to update the OSD */ + void refresh(); + +- enum KDesktopLocktqStatus { NotLocked=0, Locked=1, DCOPError=2 }; +- static KDesktopLocktqStatus isKDesktopLockRunning(); ++ enum KDesktopLockStatus { NotLocked=0, Locked=1, DCOPError=2 }; ++ static KDesktopLockStatus isKDesktopLockRunning(); + + static const int MARGIN = 15; + +diff --git a/konversation/src/osd_preferences.cpp b/konversation/src/osd_preferences.cpp +index aa68f83..7a765ef 100644 +--- a/konversation/src/osd_preferences.cpp ++++ b/konversation/src/osd_preferences.cpp +@@ -108,7 +108,7 @@ void OSD_Config::saveSettings() + + //x is ignored anyway, but leave incase we use in future + konvApp->osd->setOffset(kcfg_OSDOffsetX->value(), kcfg_OSDOffsetY->value()); +- konvApp->osd->tqsetAlignment((OSDWidget::Alignment)kcfg_OSDAlignment->value()); ++ konvApp->osd->setAlignment((OSDWidget::Alignment)kcfg_OSDAlignment->value()); + } + + } +@@ -116,7 +116,7 @@ void OSD_Config::saveSettings() + void OSD_Config::showEvent(TQShowEvent*) + { + //Update the preview +- m_pOSDPreview->tqsetAlignment((OSDWidget::Alignment)( kcfg_OSDAlignment->value() ) ); ++ m_pOSDPreview->setAlignment((OSDWidget::Alignment)( kcfg_OSDAlignment->value() ) ); + m_pOSDPreview->setOffset(kcfg_OSDOffsetX->value(),kcfg_OSDOffsetY->value()); + + m_pOSDPreview->setShown(kcfg_UseOSD->isChecked()); +diff --git a/konversation/src/osd_preferencesui.ui b/konversation/src/osd_preferencesui.ui +index f854584..2837552 100644 +--- a/konversation/src/osd_preferencesui.ui ++++ b/konversation/src/osd_preferencesui.ui +@@ -29,7 +29,7 @@ + + Expanding + +- ++ + + 21 + 10 +@@ -263,7 +263,7 @@ + + Expanding + +- ++ + + 50 + 31 +@@ -340,7 +340,7 @@ + + Expanding + +- ++ + + 50 + 21 +diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp +index 47800f3..749e278 100644 +--- a/konversation/src/outputfilter.cpp ++++ b/konversation/src/outputfilter.cpp +@@ -181,8 +181,8 @@ namespace Konversation + // someone didn't notice leading spaces + { + TQString testNickServ( inputLine.stripWhiteSpace() ); +- if(testNickServ.tqstartsWith(commandChar+"nickserv", false) +- || testNickServ.tqstartsWith(commandChar+"ns", false)) ++ if(testNickServ.startsWith(commandChar+"nickserv", false) ++ || testNickServ.startsWith(commandChar+"ns", false)) + { + inputLine = testNickServ; + } +@@ -762,7 +762,7 @@ namespace Konversation + + if (request == "PING") + { +- unsigned int time_t = TQDateTime::tqcurrentDateTime().toTime_t(); ++ unsigned int time_t = TQDateTime::currentDateTime().toTime_t(); + result.toServer = TQString("PRIVMSG %1 :\x01PING %2\x01").tqarg(recipient).tqarg(time_t); + result.output = i18n("Sending CTCP-%1 request to %2.").tqarg("PING").tqarg(recipient); + } +diff --git a/konversation/src/query.cpp b/konversation/src/query.cpp +index c4e1fb5..b04c703 100644 +--- a/konversation/src/query.cpp ++++ b/konversation/src/query.cpp +@@ -57,10 +57,10 @@ Query::Query(TQWidget* parent, TQString _name) : ChatWindow(parent) + awayState=false; + TQHBox *box = new TQHBox(m_headerSplitter); + addresseeimage = new TQLabel(box, "query_image"); +- addresseeimage->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); ++ addresseeimage->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + addresseeimage->hide(); + addresseelogoimage = new TQLabel(box, "query_logo_image"); +- addresseelogoimage->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); ++ addresseelogoimage->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + addresseelogoimage->hide(); + + queryHostmask=new Konversation::TopicLabel(box, "query_hostmask"); +@@ -284,8 +284,8 @@ void Query::updateAppearance() + } + else + { +- fg=tqcolorGroup().foreground(); +- bg=tqcolorGroup().base(); ++ fg=colorGroup().foreground(); ++ bg=colorGroup().base(); + } + + queryInput->unsetPalette(); +@@ -365,7 +365,7 @@ void Query::showEvent(TQShowEvent*) + if(m_initialShow) { + m_initialShow = false; + TQValueList sizes; +- sizes << queryHostmask->tqsizeHint().height() << (height() - queryHostmask->tqsizeHint().height()); ++ sizes << queryHostmask->sizeHint().height() << (height() - queryHostmask->sizeHint().height()); + m_headerSplitter->setSizes(sizes); + } + } +diff --git a/konversation/src/queuetunerbase.ui b/konversation/src/queuetunerbase.ui +index e81effd..6bb1c7a 100644 +--- a/konversation/src/queuetunerbase.ui ++++ b/konversation/src/queuetunerbase.ui +@@ -54,7 +54,7 @@ + + Expanding + +- ++ + + 16 + 34 +@@ -96,7 +96,7 @@ + + Expanding + +- ++ + + 16 + 33 +diff --git a/konversation/src/quickbuttons_preferencesui.ui b/konversation/src/quickbuttons_preferencesui.ui +index 91d66a4..4e22b30 100644 +--- a/konversation/src/quickbuttons_preferencesui.ui ++++ b/konversation/src/quickbuttons_preferencesui.ui +@@ -193,7 +193,7 @@ + + Expanding + +- ++ + + 20 + 230 +diff --git a/konversation/src/searchbar.cpp b/konversation/src/searchbar.cpp +index 38946c0..913e435 100644 +--- a/konversation/src/searchbar.cpp ++++ b/konversation/src/searchbar.cpp +@@ -126,7 +126,7 @@ void SearchBar::slotFind() + m_searchEdit->unsetPalette(); + m_findNextButton->setEnabled(false); + m_findPreviousButton->setEnabled(false); +- settqStatus(TQPixmap(), ""); ++ setStatus(TQPixmap(), ""); + return; + } + +@@ -140,7 +140,7 @@ void SearchBar::slotFindNext() + m_searchEdit->unsetPalette(); + m_findNextButton->setEnabled(false); + m_findPreviousButton->setEnabled(false); +- settqStatus(TQPixmap(), ""); ++ setStatus(TQPixmap(), ""); + return; + } + +@@ -154,7 +154,7 @@ void SearchBar::slotFindPrevious() + m_searchEdit->unsetPalette(); + m_findNextButton->setEnabled(false); + m_findPreviousButton->setEnabled(false); +- settqStatus(TQPixmap(), ""); ++ setStatus(TQPixmap(), ""); + return; + } + +@@ -170,7 +170,7 @@ void SearchBar::setHasMatch(bool value) + m_findPreviousButton->setEnabled(value); + } + +-void SearchBar::settqStatus(const TQPixmap& pix, const TQString& text) ++void SearchBar::setStatus(const TQPixmap& pix, const TQString& text) + { + if(!text.isEmpty()) { + m_statusPixLabel->show(); +diff --git a/konversation/src/searchbar.h b/konversation/src/searchbar.h +index 8c3204c..6fa113f 100644 +--- a/konversation/src/searchbar.h ++++ b/konversation/src/searchbar.h +@@ -34,7 +34,7 @@ class SearchBar : public SearchBarBase + ~SearchBar(); + + void setHasMatch(bool value); +- void settqStatus(const TQPixmap& pix, const TQString& text); ++ void setStatus(const TQPixmap& pix, const TQString& text); + + TQString pattern() const; + +diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp +index eb9c625..f6cf5ad 100644 +--- a/konversation/src/server.cpp ++++ b/konversation/src/server.cpp +@@ -324,7 +324,7 @@ void Server::connectSignals() + connect(&m_inputFilter, TQT_SIGNAL(addToChannelList(const TQString&, int, const TQString& )), + this, TQT_SLOT(addToChannelList(const TQString&, int, const TQString& ))); + +- // tqStatus View ++ // Status View + connect(this, TQT_SIGNAL(serverOnline(bool)), getStatusView(), TQT_SLOT(serverOnline(bool))); + + // Scripts +@@ -1882,10 +1882,10 @@ void Server::dccGetDone(DccTransfer* item) + if(showfile.startsWith("\"") && showfile.endsWith("\"")) + showfile = showfile.mid(1, showfile.length() - 2); + +- if(item->gettqStatus()==DccTransfer::Done) ++ if(item->getStatus()==DccTransfer::Done) + appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender", + "Download of \"%1\" from %2 finished.").tqarg(showfile, item->getPartnerNick())); +- else if(item->gettqStatus()==DccTransfer::Failed) ++ else if(item->getStatus()==DccTransfer::Failed) + appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender", + "Download of \"%1\" from %2 failed. Reason: %3.").tqarg(showfile, + item->getPartnerNick(), item->getStatusDetail())); +@@ -1901,16 +1901,16 @@ void Server::dccSendDone(DccTransfer* item) + if(showfile.startsWith("\"") && showfile.endsWith("\"")) + showfile = showfile.mid(1, showfile.length() - 2); + +- if(item->gettqStatus()==DccTransfer::Done) ++ if(item->getStatus()==DccTransfer::Done) + appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient", + "Upload of \"%1\" to %2 finished.").tqarg(showfile, item->getPartnerNick())); +- else if(item->gettqStatus()==DccTransfer::Failed) ++ else if(item->getStatus()==DccTransfer::Failed) + appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient", + "Upload of \"%1\" to %2 failed. Reason: %3.").tqarg(showfile, item->getPartnerNick(), + item->getStatusDetail())); + } + +-void Server::dccStatusChanged(DccTransfer *item, int newtqStatus, int oldtqStatus) ++void Server::dccStatusChanged(DccTransfer *item, int newStatus, int oldStatus) + { + if(!item) + return; +@@ -1923,13 +1923,13 @@ void Server::dccStatusChanged(DccTransfer *item, int newtqStatus, int oldtqStatu + if ( item->getType() == DccTransfer::Send ) + { + // when resuming, a message about the receiver's acceptance has been shown already, so suppress this message +- if ( newtqStatus == DccTransfer::Transferring && oldtqStatus == DccTransfer::WaitingRemote && !item->isResumed() ) ++ if ( newStatus == DccTransfer::Transferring && oldStatus == DccTransfer::WaitingRemote && !item->isResumed() ) + appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 = file name, %2 nickname of recipient", + "Sending \"%1\" to %2...").tqarg( showfile, item->getPartnerNick() ) ); + } + else // type == Receive + { +- if ( newtqStatus == DccTransfer::Transferring && !item->isResumed() ) ++ if ( newStatus == DccTransfer::Transferring && !item->isResumed() ) + { + appendMessageToFrontmost( i18n( "DCC" ), + i18n( "%1 = file name, %2 = file size, %3 = nickname of sender", "Downloading \"%1\" (%2) from %3...") +@@ -2068,7 +2068,7 @@ void Server::updateChannelMode(const TQString &updater, const TQString &channelN + if (plus) + { + TQDateTime when; +- addBan(channelName, TQString("%1 %2 %3").tqarg(parameter).tqarg(updater).tqarg(TQDateTime::tqcurrentDateTime().toTime_t())); ++ addBan(channelName, TQString("%1 %2 %3").tqarg(parameter).tqarg(updater).tqarg(TQDateTime::currentDateTime().toTime_t())); + } else { + removeBan(channelName, parameter); + } +@@ -3226,7 +3226,7 @@ TQString Server::awayTime() const + + if (m_away) + { +- int diff = TQDateTime::tqcurrentDateTime().toTime_t() - m_awayTime; ++ int diff = TQDateTime::currentDateTime().toTime_t() - m_awayTime; + int num = diff / 3600; + + if (num < 10) +@@ -3254,7 +3254,7 @@ TQString Server::awayTime() const + + void Server::startAwayTimer() + { +- m_awayTime = TQDateTime::tqcurrentDateTime().toTime_t(); ++ m_awayTime = TQDateTime::currentDateTime().toTime_t(); + } + + KABC::Addressee Server::getOfflineNickAddressee(TQString& nickname) +diff --git a/konversation/src/server.h b/konversation/src/server.h +index 959319c..ff8b0d7 100644 +--- a/konversation/src/server.h ++++ b/konversation/src/server.h +@@ -502,7 +502,7 @@ void resetNickSelection(); + void resumeDccSendTransfer(const TQString& sourceNick,const TQStringList& dccArguments); + void dccGetDone(DccTransfer* item); + void dccSendDone(DccTransfer* item); +- void dccStatusChanged(DccTransfer* item, int newtqStatus, int oldtqStatus); ++ void dccStatusChanged(DccTransfer* item, int newStatus, int oldStatus); + void scriptNotFound(const TQString& name); + void scriptExecutionError(const TQString& name); + void userhost(const TQString& nick,const TQString& hostmask,bool away,bool ircOp); +diff --git a/konversation/src/servergroupdialogui.ui b/konversation/src/servergroupdialogui.ui +index 4ef4866..933e019 100644 +--- a/konversation/src/servergroupdialogui.ui ++++ b/konversation/src/servergroupdialogui.ui +@@ -185,7 +185,7 @@ + + Expanding + +- ++ + + 0 + 20 +@@ -264,7 +264,7 @@ + + Expanding + +- ++ + + 255 + 20 +diff --git a/konversation/src/serverlistview.cpp b/konversation/src/serverlistview.cpp +index 0035c53..be33e43 100644 +--- a/konversation/src/serverlistview.cpp ++++ b/konversation/src/serverlistview.cpp +@@ -66,7 +66,7 @@ void ServerListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQLis + else + { + // Get the closest item before us ('atpos' or the one above, if any) +- if (p.y() - tqitemRect(atpos).topLeft().y() < (atpos->height()/2)) ++ if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2)) + above = atpos->itemAbove(); + else + above = atpos; +diff --git a/konversation/src/statuspanel.cpp b/konversation/src/statuspanel.cpp +index 9615c1d..e2ff9f1 100644 +--- a/konversation/src/statuspanel.cpp ++++ b/konversation/src/statuspanel.cpp +@@ -32,7 +32,7 @@ + + StatusPanel::StatusPanel(TQWidget* parent) : ChatWindow(parent) + { +- setType(ChatWindow::tqStatus); ++ setType(ChatWindow::Status); + + setChannelEncodingSupported(true); + +@@ -164,8 +164,8 @@ void StatusPanel::updateAppearance() + } + else + { +- fg=tqcolorGroup().foreground(); +- bg=tqcolorGroup().base(); ++ fg=colorGroup().foreground(); ++ bg=colorGroup().base(); + } + + statusInput->unsetPalette(); +diff --git a/konversation/src/tabnotifications_preferences.ui b/konversation/src/tabnotifications_preferences.ui +index aaf68ac..3b62feb 100644 +--- a/konversation/src/tabnotifications_preferences.ui ++++ b/konversation/src/tabnotifications_preferences.ui +@@ -73,7 +73,7 @@ + true + + +- Application events occur in Konsole tabs, the DCC tqStatus tab and other application tabs not used directly for chatting. ++ Application events occur in Konsole tabs, the DCC Status tab and other application tabs not used directly for chatting. + + + +@@ -86,7 +86,7 @@ + + Expanding + +- ++ + + 50 + 21 +@@ -122,7 +122,7 @@ + + Expanding + +- ++ + + 50 + 21 +@@ -154,7 +154,7 @@ + + Expanding + +- ++ + + 60 + 21 +@@ -208,7 +208,7 @@ + + Expanding + +- ++ + + 50 + 20 +@@ -225,7 +225,7 @@ + + Expanding + +- ++ + + 50 + 21 +@@ -283,7 +283,7 @@ + + Expanding + +- ++ + + 50 + 20 +@@ -337,7 +337,7 @@ + + Expanding + +- ++ + + 21 + 60 +diff --git a/konversation/src/tabs_preferencesui.ui b/konversation/src/tabs_preferencesui.ui +index 9e8dbbe..73b914c 100644 +--- a/konversation/src/tabs_preferencesui.ui ++++ b/konversation/src/tabs_preferencesui.ui +@@ -83,7 +83,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 111 + 20 +@@ -178,7 +178,7 @@ the Free Software Foundation; either version 2 of the License, or + + Expanding + +- ++ + + 20 + 100 +diff --git a/konversation/src/theme_preferencesui.ui b/konversation/src/theme_preferencesui.ui +index bf7d7ab..44c01e8 100644 +--- a/konversation/src/theme_preferencesui.ui ++++ b/konversation/src/theme_preferencesui.ui +@@ -66,7 +66,7 @@ + + Expanding + +- ++ + + 131 + 20 +@@ -77,7 +77,7 @@ + + frame3_2 + +- ++ + + 0 + 0 +diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp +index e04a1d0..0fdbe18 100644 +--- a/konversation/src/topiclabel.cpp ++++ b/konversation/src/topiclabel.cpp +@@ -60,13 +60,13 @@ namespace Konversation + { + } + +- TQSize TopicLabel::tqminimumSizeHint() const ++ TQSize TopicLabel::minimumSizeHint() const + { + int minHeight = fontMetrics().lineSpacing() + fontMetrics().descent(); + return TQSize(0, minHeight); + } + +- TQSize TopicLabel::tqsizeHint() const ++ TQSize TopicLabel::sizeHint() const + { + int minHeight = fontMetrics().lineSpacing() + fontMetrics().descent(); + return TQSize(0, minHeight); +diff --git a/konversation/src/topiclabel.h b/konversation/src/topiclabel.h +index 4e22dbc..0a649b6 100644 +--- a/konversation/src/topiclabel.h ++++ b/konversation/src/topiclabel.h +@@ -33,8 +33,8 @@ namespace Konversation + explicit TopicLabel(TQWidget *parent = 0, const char *name = 0); + ~TopicLabel(); + +- TQSize tqminimumSizeHint() const; +- TQSize tqsizeHint() const; ++ TQSize minimumSizeHint() const; ++ TQSize sizeHint() const; + void setServer(Server* server); + + enum PopupIDs { Copy,CopyUrl,SelectAll,Bookmark }; +diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp +index 89be010..04d6635 100644 +--- a/konversation/src/viewcontainer.cpp ++++ b/konversation/src/viewcontainer.cpp +@@ -157,7 +157,7 @@ void ViewContainer::setupTabWidget() + KPushButton* closeBtn = new KPushButton(m_tabWidget); + closeBtn->setPixmap(KGlobal::iconLoader()->loadIcon("tab_remove", KIcon::Small)); + closeBtn->resize(22, 22); +- closeBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); ++ closeBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_tabWidget->setCornerWidget(closeBtn); + connect(closeBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeCurrentView())); + +@@ -220,7 +220,7 @@ void ViewContainer::setupViewTree() + { + ChatWindow* view = static_cast(m_tabWidget->page(i)); + +- if (view->getType() == ChatWindow::tqStatus) ++ if (view->getType() == ChatWindow::Status) + { + if (view == m_frontView) + m_viewTree->addView(view->getName(), view, m_tabWidget->tabIconSet(view), true); +@@ -233,7 +233,7 @@ void ViewContainer::setupViewTree() + { + ChatWindow* view = static_cast(m_tabWidget->page(i)); + +- if (!view->getType() == ChatWindow::tqStatus) ++ if (!view->getType() == ChatWindow::Status) + { + if (view == m_frontView) + m_viewTree->addView(view->getName(), view, m_tabWidget->tabIconSet(view), true); +@@ -426,7 +426,7 @@ void ViewContainer::updateViewActions(int index) + if (action) action->setEnabled(index < (m_tabWidget->count() - 1)); + } + +- if (server && (viewType == ChatWindow::tqStatus || server == m_frontServer)) ++ if (server && (viewType == ChatWindow::Status || server == m_frontServer)) + { + action = actionCollection()->action("reconnect_server"); + if (action) action->setEnabled(true); +@@ -457,7 +457,7 @@ void ViewContainer::updateViewActions(int index) + if (notifyAction) + { + notifyAction->setEnabled(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || +- viewType == ChatWindow::tqStatus || viewType == ChatWindow::Konsole || ++ viewType == ChatWindow::Status || viewType == ChatWindow::Konsole || + viewType == ChatWindow::DccTransferPanel || viewType == ChatWindow::RawLog); + notifyAction->setChecked(view->notificationsEnabled()); + } +@@ -702,7 +702,7 @@ void ViewContainer::updateFrontView() + { + case ChatWindow::Channel: + case ChatWindow::Query: +- case ChatWindow::tqStatus: ++ case ChatWindow::Status: + case ChatWindow::ChannelList: + case ChatWindow::RawLog: + emit setStatusBarLagLabelShown(true); +@@ -729,7 +729,7 @@ void ViewContainer::updateViews(const Konversation::ServerGroupSettings* serverG + + if (serverGroup) + { +- if (view->getType() == ChatWindow::tqStatus && view->getServer()->getServerGroup() == serverGroup) ++ if (view->getType() == ChatWindow::Status && view->getServer()->getServerGroup() == serverGroup) + { + TQString label = view->getServer()->getDisplayName(); + +@@ -762,7 +762,7 @@ void ViewContainer::updateViews(const Konversation::ServerGroupSettings* serverG + + + if (!Preferences::tabNotificationsText()) +- m_viewTree->setViewColor(view, m_window->tqcolorGroup().foreground()); ++ m_viewTree->setViewColor(view, m_window->colorGroup().foreground()); + } + else if (m_tabWidget) + { +@@ -773,7 +773,7 @@ void ViewContainer::updateViews(const Konversation::ServerGroupSettings* serverG + m_tabWidget->setTabIconSet(view, images->getCloseIcon()); + + if (!Preferences::tabNotificationsText()) +- m_tabWidget->setTabColor(view, m_window->tqcolorGroup().foreground()); ++ m_tabWidget->setTabColor(view, m_window->colorGroup().foreground()); + } + + if (Preferences::tabNotificationsLeds() || Preferences::tabNotificationsText()) +@@ -1040,7 +1040,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view) + m_viewTree->setViewIcon(view, images->getPrivateLed(false)); + break; + +- case ChatWindow::tqStatus: ++ case ChatWindow::Status: + m_viewTree->setViewIcon(view, images->getServerLed(false)); + break; + +@@ -1051,7 +1051,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view) + } + + TQColor textColor = (Preferences::inputFieldsBackgroundColor() +- ? Preferences::color(Preferences::ChannelMessage) : m_window->tqcolorGroup().foreground()); ++ ? Preferences::color(Preferences::ChannelMessage) : m_window->colorGroup().foreground()); + + if (view->getType() == ChatWindow::Channel) + { +@@ -1083,7 +1083,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view) + m_tabWidget->setTabIconSet(view, images->getPrivateLed(false)); + break; + +- case ChatWindow::tqStatus: ++ case ChatWindow::Status: + m_tabWidget->setTabIconSet(view, images->getServerLed(false)); + break; + +@@ -1093,7 +1093,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view) + } + } + +- TQColor textColor = m_window->tqcolorGroup().foreground(); ++ TQColor textColor = m_window->colorGroup().foreground(); + + if (view->getType() == ChatWindow::Channel) + { +@@ -1196,7 +1196,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit + { + tmp_ChatWindow = static_cast(m_tabWidget->page(sindex)); + +- if (tmp_ChatWindow->getType() == ChatWindow::tqStatus && tmp_ChatWindow->getServer() == view->getServer()) ++ if (tmp_ChatWindow->getType() == ChatWindow::Status && tmp_ChatWindow->getServer() == view->getServer()) + { + for (int index = sindex + 1; index < m_tabWidget->count(); index++) + { +@@ -1226,7 +1226,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit + { + tmp_ChatWindow = static_cast(m_tabWidget->page(sindex)); + +- if (tmp_ChatWindow->getType() == ChatWindow::tqStatus && tmp_ChatWindow->getServer() == view->getServer()) ++ if (tmp_ChatWindow->getType() == ChatWindow::Status && tmp_ChatWindow->getServer() == view->getServer()) + { + placement = sindex + 1; + break; +@@ -1245,7 +1245,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit + { + tmp_ChatWindow = static_cast(m_tabWidget->page(sindex)); + +- if (tmp_ChatWindow->getType() == ChatWindow::tqStatus && tmp_ChatWindow->getServer() == view->getServer()) ++ if (tmp_ChatWindow->getType() == ChatWindow::Status && tmp_ChatWindow->getServer() == view->getServer()) + { + for (int index = sindex + 1; index < m_tabWidget->count(); index++) + { +@@ -1276,7 +1276,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit + tmp_ChatWindow = static_cast(m_tabWidget->page(sindex)); + wtype = tmp_ChatWindow->getType(); + +- if (wtype != ChatWindow::tqStatus && wtype != ChatWindow::Channel ++ if (wtype != ChatWindow::Status && wtype != ChatWindow::Channel + && wtype != ChatWindow::RawLog && wtype != ChatWindow::Query + && wtype != ChatWindow::DccChat && wtype != ChatWindow::ChannelList) + { +@@ -1286,7 +1286,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit + } + break; + +- case ChatWindow::tqStatus: ++ case ChatWindow::Status: + if (Preferences::tabNotificationsLeds()) + iconSet = images->getServerLed(false); + else if (Preferences::closeButtons()) +@@ -1299,7 +1299,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit + tmp_ChatWindow = static_cast(m_tabWidget->page(sindex)); + + if (tmp_ChatWindow->getType() != ChatWindow::Channel +- && tmp_ChatWindow->getType() != ChatWindow::tqStatus ++ && tmp_ChatWindow->getType() != ChatWindow::Status + && tmp_ChatWindow->getType() != ChatWindow::RawLog + && tmp_ChatWindow->getType() != ChatWindow::Query + && tmp_ChatWindow->getType() != ChatWindow::DccChat) +@@ -1624,7 +1624,7 @@ void ViewContainer::updateViewEncoding(ChatWindow* view) + + if (codecAction) + { +- if(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || viewType == ChatWindow::tqStatus) ++ if(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || viewType == ChatWindow::Status) + { + codecAction->setEnabled(view->isChannelEncodingSupported()); + TQString encoding = view->getChannelEncoding(); +@@ -1682,7 +1682,7 @@ void ViewContainer::showViewContextMenu(TQWidget* tab, const TQPoint& pos) + } + } + +- if (viewType == ChatWindow::tqStatus) ++ if (viewType == ChatWindow::Status) + { + TQPtrList serverActions; + KAction* action = actionCollection()->action("disconnect_server"); +@@ -1825,7 +1825,7 @@ void ViewContainer::appendToFrontmost(const TQString& type,const TQString& messa + } + + // This might happen if canBeFrontView() is false for active ChatWindow +- // and the view does not belong to any server (e.g. DCC tqStatus View). ++ // and the view does not belong to any server (e.g. DCC Status View). + // Discard message in this case. + if (!serverView) return; + +@@ -1957,7 +1957,7 @@ void ViewContainer::openLogFile() + ChatWindow* view=static_cast(m_frontView); + ChatWindow::WindowType viewType=view->getType(); + if (viewType==ChatWindow::Channel || viewType==ChatWindow::Query || +- viewType==ChatWindow::tqStatus || viewType==ChatWindow::DccChat) ++ viewType==ChatWindow::Status || viewType==ChatWindow::DccChat) + { + openLogFile(view->getName(), view->logFileName()); + } +diff --git a/konversation/src/viewtree.cpp b/konversation/src/viewtree.cpp +index d62bee4..67efaf5 100644 +--- a/konversation/src/viewtree.cpp ++++ b/konversation/src/viewtree.cpp +@@ -56,7 +56,7 @@ void ViewTree::ToolTip::maybeTip (const TQPoint &pos) + + ViewTreeItem* view = static_cast(viewTree->itemAt(pos)); + +- if (view && view->isTruncated()) tip(viewTree->tqitemRect(view), view->getName()); ++ if (view && view->isTruncated()) tip(viewTree->itemRect(view), view->getName()); + } + + +@@ -503,7 +503,7 @@ void ViewTree::enableCloseButton() + + bool ViewTree::isAboveIcon(TQPoint point, ViewTreeItem* item) + { +- TQPoint inItem = point - tqitemRect(item).topLeft(); ++ TQPoint inItem = point - itemRect(item).topLeft(); + + int MARGIN = 2; + int LED_ICON_SIZE = 14; +@@ -748,7 +748,7 @@ void ViewTree::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewI + else + { + // Get the closest item before us ('atpos' or the one above, if any). +- if (p.y() - tqitemRect(atpos).topLeft().y() < (atpos->height()/2)) ++ if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2)) + above = atpos->itemAbove(); + else + above = atpos; +@@ -913,7 +913,7 @@ ViewTreeItem* ViewTree::getParentItemForView(ChatWindow* view) + + while (item) + { +- if (item->getViewType() == ChatWindow::tqStatus ++ if (item->getViewType() == ChatWindow::Status + && item->getView() + && item->getView()->getServer() == server) + { +diff --git a/konversation/src/viewtreeitem.cpp b/konversation/src/viewtreeitem.cpp +index 1d18a8d..f831fbb 100644 +--- a/konversation/src/viewtreeitem.cpp ++++ b/konversation/src/viewtreeitem.cpp +@@ -246,7 +246,7 @@ bool ViewTreeItem::sortLast() const + { + if (!m_isSeparator) + { +- if (getViewType() == ChatWindow::tqStatus ++ if (getViewType() == ChatWindow::Status + || getViewType() == ChatWindow::Channel + || getViewType() == ChatWindow::Query + || getViewType() == ChatWindow::RawLog +diff --git a/konversation/src/watchednicknames_preferencesui.ui b/konversation/src/watchednicknames_preferencesui.ui +index 6fbcc36..6f9860b 100644 +--- a/konversation/src/watchednicknames_preferencesui.ui ++++ b/konversation/src/watchednicknames_preferencesui.ui +@@ -106,7 +106,7 @@ command is placed in the <b>Input Line</b> on the server window.< + + Expanding + +- ++ + + 150 + 20 +@@ -333,7 +333,7 @@ When the nickname watcher is turned on, you will be notified when the nicknames + + Expanding + +- ++ + + 20 + 160 diff --git a/redhat/applications/konversation/bp001-efdae4e7.diff b/redhat/applications/konversation/bp001-efdae4e7.diff new file mode 100644 index 000000000..693709e28 --- /dev/null +++ b/redhat/applications/konversation/bp001-efdae4e7.diff @@ -0,0 +1,4114 @@ +commit efdae4e712984b2932ca4a43942b7a93dcb8dbd3 +Author: Timothy Pearson +Date: 1324316340 -0600 + + Remove additional unneeded tq method conversions + +diff --git a/konversation/scripts/fortunes.dat b/konversation/scripts/fortunes.dat +index 7abf85d..240af34 100644 +--- a/konversation/scripts/fortunes.dat ++++ b/konversation/scripts/fortunes.dat +@@ -419,7 +419,7 @@ Eric Youngdale: Err... is Richard Stallman here? + Linux: The OS people choose without $200,000,000 of persuasion. + -- Mike Coleman + % +-The memory management on the PowerPC can be used to frighten small tqchildren. ++The memory management on the PowerPC can be used to frighten small children. + -- Linus Torvalds + % + ... faster BogoMIPS calculations (yes, it now boots 2 seconds faster than +diff --git a/konversation/src/autoreplace_preferences.cpp b/konversation/src/autoreplace_preferences.cpp +index c77d01a..b66eb25 100644 +--- a/konversation/src/autoreplace_preferences.cpp ++++ b/konversation/src/autoreplace_preferences.cpp +@@ -146,7 +146,7 @@ void Autoreplace_Config::saveSettings() + for(unsigned int index=0;indexwriteEntry(TQString("Autoreplace%1").tqarg(index),newList[index]+'#'); ++ config->writeEntry(TQString("Autoreplace%1").arg(index),newList[index]+'#'); + } // for + } + // if there were no entries at all, write a dummy entry to prevent KConfigXT from "optimizing" +diff --git a/konversation/src/channel.cpp b/konversation/src/channel.cpp +index 13e026e..b7063c0 100644 +--- a/konversation/src/channel.cpp ++++ b/konversation/src/channel.cpp +@@ -569,7 +569,7 @@ void Channel::popupCommand(int id) + case Konversation::Ping: + { + unsigned int time_t = TQDateTime::currentDateTime().toTime_t(); +- pattern=TQString(cc+"CTCP %u PING %1").tqarg(time_t); ++ pattern=TQString(cc+"CTCP %u PING %1").arg(time_t); + } + break; + case Konversation::Kick: +@@ -617,7 +617,7 @@ void Channel::popupCommand(int id) + break; + case Konversation::IgnoreNick: + if (nickList.size() == 1) +- question=i18n("Do you want to ignore %1?").tqarg(nickList.first()); ++ question=i18n("Do you want to ignore %1?").arg(nickList.first()); + else + question = i18n("Do you want to ignore the selected users?"); + if (KMessageBox::warningContinueCancel(this, question, i18n("Ignore"), i18n("Ignore"), "IgnoreNick") == +@@ -635,7 +635,7 @@ void Channel::popupCommand(int id) + } + + if (selectedIgnoredNicks.count() == 1) +- question=i18n("Do you want to stop ignoring %1?").tqarg(selectedIgnoredNicks.first()); ++ question=i18n("Do you want to stop ignoring %1?").arg(selectedIgnoredNicks.first()); + else + question = i18n("Do you want to stop ignoring the selected users?"); + if (KMessageBox::warningContinueCancel(this, question, i18n("Unignore"), i18n("Unignore"), "UnignoreNick") == +@@ -776,7 +776,7 @@ void Channel::completeNick() + if(Preferences::nickCompletionMode() == 1) + { + TQString nicksFound = found.join(" "); +- appendServerMessage(i18n("Completion"), i18n("Possible completions: %1.").tqarg(nicksFound)); ++ appendServerMessage(i18n("Completion"), i18n("Possible completions: %1.").arg(nicksFound)); + } + else + { +@@ -1174,7 +1174,7 @@ void Channel::modeButtonClicked(int id, bool on) + args=limit->text(); + } + // put together the mode command and send it to the server queue +- m_server->queue(command.tqarg(getName()).tqarg((on) ? "+" : "-").tqarg(mode[id]).tqarg(args)); ++ m_server->queue(command.arg(getName()).arg((on) ? "+" : "-").arg(mode[id]).arg(args)); + } + + void Channel::quickButtonClicked(const TQString &buttonText) +@@ -1247,12 +1247,12 @@ void Channel::nickRenamed(const TQString &oldNick, const NickInfo& nickInfo) + if(newNick == m_server->getNickname()) /* Check newNick because m_server->getNickname() is already updated to new nick */ + { + setNickname(newNick); +- appendCommandMessage(i18n("Nick"),i18n("You are now known as %1.").tqarg(newNick), false, true, true); ++ appendCommandMessage(i18n("Nick"),i18n("You are now known as %1.").arg(newNick), false, true, true); + } + else + { + /* No, must've been someone else */ +- appendCommandMessage(i18n("Nick"),i18n("%1 is now known as %2.").tqarg(oldNick).tqarg(newNick),false); ++ appendCommandMessage(i18n("Nick"),i18n("%1 is now known as %2.").arg(oldNick).arg(newNick),false); + } + + nicknameListView->sort(); +@@ -1266,7 +1266,7 @@ void Channel::joinNickname(ChannelNickPtr channelNick) + m_joined = true; + emit joined(this); + appendCommandMessage(i18n("Join"),i18n("%1 is the channel and %2 is our hostmask", +- "You have joined the channel %1 (%2).").tqarg(getName()).tqarg(channelNick->getHostmask()),false, false, true); ++ "You have joined the channel %1 (%2).").arg(getName()).arg(channelNick->getHostmask()),false, false, true); + m_ownChannelNick = channelNick; + connect(m_ownChannelNick, TQT_SIGNAL(channelNickChanged()), TQT_SLOT(refreshModeButtons())); + refreshModeButtons(); +@@ -1283,7 +1283,7 @@ void Channel::joinNickname(ChannelNickPtr channelNick) + TQString nick = channelNick->getNickname(); + TQString hostname = channelNick->getHostmask(); + appendCommandMessage(i18n("Join"), i18n("%1 is the nick joining and %2 the hostmask of that nick", +- "%1 has joined this channel (%2).").tqarg(nick).tqarg(hostname),false, false); ++ "%1 has joined this channel (%2).").arg(nick).arg(hostname),false, false); + addNickname(channelNick); + } + } +@@ -1307,15 +1307,15 @@ void Channel::removeNick(ChannelNickPtr channelNick, const TQString &reason, boo + if (displayReason.isEmpty()) + appendCommandMessage(i18n("Quit"), i18n("You have left this server."), false); + else +- appendCommandMessage(i18n("Quit"), i18n("%1 adds the reason", "You have left this server (%1).").tqarg(displayReason), false); ++ appendCommandMessage(i18n("Quit"), i18n("%1 adds the reason", "You have left this server (%1).").arg(displayReason), false); + } + else + { + if (displayReason.isEmpty()) +- appendCommandMessage(i18n("Part"), i18n("You have left channel %1.").tqarg(getName()), false); ++ appendCommandMessage(i18n("Part"), i18n("You have left channel %1.").arg(getName()), false); + else + appendCommandMessage(i18n("Part"), i18n("%1 adds the channel and %2 the reason", +- "You have left channel %1 (%2).").tqarg(getName()).tqarg(displayReason), false); ++ "You have left channel %1 (%2).").arg(getName()).arg(displayReason), false); + + } + +@@ -1326,18 +1326,18 @@ void Channel::removeNick(ChannelNickPtr channelNick, const TQString &reason, boo + if (quit) + { + if (displayReason.isEmpty()) +- appendCommandMessage(i18n("Quit"), i18n("%1 has left this server.").tqarg(channelNick->getNickname()), false); ++ appendCommandMessage(i18n("Quit"), i18n("%1 has left this server.").arg(channelNick->getNickname()), false); + else + appendCommandMessage(i18n("Quit"), i18n("%1 adds the nick and %2 the reason", +- "%1 has left this server (%2).").tqarg(channelNick->getNickname()).tqarg(displayReason), false); ++ "%1 has left this server (%2).").arg(channelNick->getNickname()).arg(displayReason), false); + } + else + { + if (displayReason.isEmpty()) +- appendCommandMessage(i18n("Part"), i18n("%1 has left this channel.").tqarg(channelNick->getNickname()), false); ++ appendCommandMessage(i18n("Part"), i18n("%1 has left this channel.").arg(channelNick->getNickname()), false); + else + appendCommandMessage(i18n("Part"), i18n("%1 adds the nick and %2 the reason", +- "%1 has left this channel (%2).").tqarg(channelNick->getNickname()).tqarg(displayReason), false); ++ "%1 has left this channel (%2).").arg(channelNick->getNickname()).arg(displayReason), false); + } + + if(channelNick->isAnyTypeOfOp()) +@@ -1375,10 +1375,10 @@ void Channel::kickNick(ChannelNickPtr channelNick, const TQString &kicker, const + if(kicker == m_server->getNickname()) + { + if (displayReason.isEmpty()) +- appendCommandMessage(i18n("Kick"), i18n("You have kicked yourself from channel %1.").tqarg(getName())); ++ appendCommandMessage(i18n("Kick"), i18n("You have kicked yourself from channel %1.").arg(getName())); + else + appendCommandMessage(i18n("Kick"), i18n("%1 adds the channel and %2 the reason", +- "You have kicked yourself from channel %1 (%2).").tqarg(getName()).tqarg(displayReason)); ++ "You have kicked yourself from channel %1 (%2).").arg(getName()).arg(displayReason)); + } + else + { +@@ -1386,13 +1386,13 @@ void Channel::kickNick(ChannelNickPtr channelNick, const TQString &kicker, const + { + appendCommandMessage(i18n("Kick"), i18n("%1 adds the channel, %2 adds the kicker", + "You have been kicked from channel %1 by %2.") +- .tqarg(getName()).tqarg(kicker), true); ++ .arg(getName()).arg(kicker), true); + } + else + { + appendCommandMessage(i18n("Kick"), i18n("%1 adds the channel, %2 the kicker and %3 the reason", + "You have been kicked from channel %1 by %2 (%3).") +- .tqarg(getName()).tqarg(kicker).tqarg(displayReason), true); ++ .arg(getName()).arg(kicker).arg(displayReason), true); + } + + KonversationApplication::instance()->notificationHandler()->kick(this,getName(), kicker); +@@ -1412,10 +1412,10 @@ void Channel::kickNick(ChannelNickPtr channelNick, const TQString &kicker, const + if(kicker == m_server->getNickname()) + { + if (displayReason.isEmpty()) +- appendCommandMessage(i18n("Kick"), i18n("You have kicked %1 from the channel.").tqarg(channelNick->getNickname())); ++ appendCommandMessage(i18n("Kick"), i18n("You have kicked %1 from the channel.").arg(channelNick->getNickname())); + else + appendCommandMessage(i18n("Kick"), i18n("%1 adds the kicked nick and %2 the reason", +- "You have kicked %1 from the channel (%2).").tqarg(channelNick->getNickname()).tqarg(displayReason), true); ++ "You have kicked %1 from the channel (%2).").arg(channelNick->getNickname()).arg(displayReason), true); + } + else + { +@@ -1423,13 +1423,13 @@ void Channel::kickNick(ChannelNickPtr channelNick, const TQString &kicker, const + { + appendCommandMessage(i18n("Kick"), i18n("%1 adds the kicked nick, %2 adds the kicker", + "%1 has been kicked from the channel by %2.") +- .tqarg(channelNick->getNickname()).tqarg(kicker), true); ++ .arg(channelNick->getNickname()).arg(kicker), true); + } + else + { + appendCommandMessage(i18n("Kick"), i18n("%1 adds the kicked nick, %2 the kicker and %3 the reason", + "%1 has been kicked from the channel by %2 (%3).") +- .tqarg(channelNick->getNickname()).tqarg(kicker).tqarg(displayReason), true); ++ .arg(channelNick->getNickname()).arg(kicker).arg(displayReason), true); + } + } + +@@ -1511,7 +1511,7 @@ void Channel::emitUpdateInfo() + + void Channel::setTopic(const TQString &newTopic) + { +- appendCommandMessage(i18n("Topic"), i18n("The channel topic is \"%1\".").tqarg(newTopic)); ++ appendCommandMessage(i18n("Topic"), i18n("The channel topic is \"%1\".").arg(newTopic)); + TQString topic = Konversation::removeIrcMarkup(newTopic); + topicLine->setText(topic); + topicAuthorUnknown=true; // if we only get called with a topic, it was a 332, which usually has a 333 next +@@ -1521,7 +1521,7 @@ void Channel::setTopic(const TQString &newTopic) + + if(m_topicHistory.first().section(' ', 2) != newTopic) + { +- m_topicHistory.prepend(TQString("%1 "+i18n("unknown")+" %2").tqarg(TQDateTime::currentDateTime().toTime_t()).tqarg(newTopic)); ++ m_topicHistory.prepend(TQString("%1 "+i18n("unknown")+" %2").arg(TQDateTime::currentDateTime().toTime_t()).arg(newTopic)); + emit topicHistoryChanged(); + } + } +@@ -1530,14 +1530,14 @@ void Channel::setTopic(const TQString &nickname, const TQString &newTopic) // Ov + { + if(nickname == m_server->getNickname()) + { +- appendCommandMessage(i18n("Topic"), i18n("You set the channel topic to \"%1\".").tqarg(newTopic)); ++ appendCommandMessage(i18n("Topic"), i18n("You set the channel topic to \"%1\".").arg(newTopic)); + } + else + { +- appendCommandMessage(i18n("Topic"), i18n("%1 sets the channel topic to \"%2\".").tqarg(nickname).tqarg(newTopic)); ++ appendCommandMessage(i18n("Topic"), i18n("%1 sets the channel topic to \"%2\".").arg(nickname).arg(newTopic)); + } + +- m_topicHistory.prepend(TQString("%1 %2 %3").tqarg(TQDateTime::currentDateTime().toTime_t()).tqarg(nickname).tqarg(newTopic)); ++ m_topicHistory.prepend(TQString("%1 %2 %3").arg(TQDateTime::currentDateTime().toTime_t()).arg(nickname).arg(newTopic)); + TQString topic = Konversation::removeIrcMarkup(newTopic); + topicLine->setText(topic); + +@@ -1561,7 +1561,7 @@ void Channel::setTopicAuthor(const TQString& newAuthor, TQDateTime time) + + if(topicAuthorUnknown) + { +- m_topicHistory[0] = TQString("%1").tqarg(time.toTime_t()) + ' ' + newAuthor + ' ' + m_topicHistory[0].section(' ', 2); ++ m_topicHistory[0] = TQString("%1").arg(time.toTime_t()) + ' ' + newAuthor + ' ' + m_topicHistory[0].section(' ', 2); + topicAuthorUnknown = false; + + emit topicHistoryChanged(); +@@ -1599,14 +1599,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(toMe) + message=i18n("You give channel owner privileges to yourself."); + else +- message=i18n("You give channel owner privileges to %1.").tqarg(parameter); ++ message=i18n("You give channel owner privileges to %1.").arg(parameter); + } + else + { + if(toMe) +- message=i18n("%1 gives channel owner privileges to you.").tqarg(sourceNick); ++ message=i18n("%1 gives channel owner privileges to you.").arg(sourceNick); + else +- message=i18n("%1 gives channel owner privileges to %2.").tqarg(sourceNick).tqarg(parameter); ++ message=i18n("%1 gives channel owner privileges to %2.").arg(sourceNick).arg(parameter); + } + } + else +@@ -1616,14 +1616,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(toMe) + message=i18n("You take channel owner privileges from yourself."); + else +- message=i18n("You take channel owner privileges from %1.").tqarg(parameter); ++ message=i18n("You take channel owner privileges from %1.").arg(parameter); + } + else + { + if(toMe) +- message=i18n("%1 takes channel owner privileges from you.").tqarg(sourceNick); ++ message=i18n("%1 takes channel owner privileges from you.").arg(sourceNick); + else +- message=i18n("%1 takes channel owner privileges from %2.").tqarg(sourceNick).tqarg(parameter); ++ message=i18n("%1 takes channel owner privileges from %2.").arg(sourceNick).arg(parameter); + } + } + if(parameterChannelNick) +@@ -1642,14 +1642,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(toMe) + message=i18n("You give channel admin privileges to yourself."); + else +- message=i18n("You give channel admin privileges to %1.").tqarg(parameter); ++ message=i18n("You give channel admin privileges to %1.").arg(parameter); + } + else + { + if(toMe) +- message=i18n("%1 gives channel admin privileges to you.").tqarg(sourceNick); ++ message=i18n("%1 gives channel admin privileges to you.").arg(sourceNick); + else +- message=i18n("%1 gives channel admin privileges to %2.").tqarg(sourceNick).tqarg(parameter); ++ message=i18n("%1 gives channel admin privileges to %2.").arg(sourceNick).arg(parameter); + } + } + else +@@ -1659,14 +1659,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(toMe) + message=i18n("You take channel admin privileges from yourself."); + else +- message=i18n("You take channel admin privileges from %1.").tqarg(parameter); ++ message=i18n("You take channel admin privileges from %1.").arg(parameter); + } + else + { + if(toMe) +- message=i18n("%1 takes channel admin privileges from you.").tqarg(sourceNick); ++ message=i18n("%1 takes channel admin privileges from you.").arg(sourceNick); + else +- message=i18n("%1 takes channel admin privileges from %2.").tqarg(sourceNick).tqarg(parameter); ++ message=i18n("%1 takes channel admin privileges from %2.").arg(sourceNick).arg(parameter); + } + } + if(parameterChannelNick) +@@ -1685,14 +1685,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(toMe) + message=i18n("You give channel operator privileges to yourself."); + else +- message=i18n("You give channel operator privileges to %1.").tqarg(parameter); ++ message=i18n("You give channel operator privileges to %1.").arg(parameter); + } + else + { + if(toMe) +- message=i18n("%1 gives channel operator privileges to you.").tqarg(sourceNick); ++ message=i18n("%1 gives channel operator privileges to you.").arg(sourceNick); + else +- message=i18n("%1 gives channel operator privileges to %2.").tqarg(sourceNick).tqarg(parameter); ++ message=i18n("%1 gives channel operator privileges to %2.").arg(sourceNick).arg(parameter); + } + } + else +@@ -1702,14 +1702,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(toMe) + message=i18n("You take channel operator privileges from yourself."); + else +- message=i18n("You take channel operator privileges from %1.").tqarg(parameter); ++ message=i18n("You take channel operator privileges from %1.").arg(parameter); + } + else + { + if(toMe) +- message=i18n("%1 takes channel operator privileges from you.").tqarg(sourceNick); ++ message=i18n("%1 takes channel operator privileges from you.").arg(sourceNick); + else +- message=i18n("%1 takes channel operator privileges from %2.").tqarg(sourceNick).tqarg(parameter); ++ message=i18n("%1 takes channel operator privileges from %2.").arg(sourceNick).arg(parameter); + } + } + if(parameterChannelNick) +@@ -1728,14 +1728,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(toMe) + message=i18n("You give channel halfop privileges to yourself."); + else +- message=i18n("You give channel halfop privileges to %1.").tqarg(parameter); ++ message=i18n("You give channel halfop privileges to %1.").arg(parameter); + } + else + { + if(toMe) +- message=i18n("%1 gives channel halfop privileges to you.").tqarg(sourceNick); ++ message=i18n("%1 gives channel halfop privileges to you.").arg(sourceNick); + else +- message=i18n("%1 gives channel halfop privileges to %2.").tqarg(sourceNick).tqarg(parameter); ++ message=i18n("%1 gives channel halfop privileges to %2.").arg(sourceNick).arg(parameter); + } + } + else +@@ -1745,14 +1745,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(toMe) + message=i18n("You take channel halfop privileges from yourself."); + else +- message=i18n("You take channel halfop privileges from %1.").tqarg(parameter); ++ message=i18n("You take channel halfop privileges from %1.").arg(parameter); + } + else + { + if(toMe) +- message=i18n("%1 takes channel halfop privileges from you.").tqarg(sourceNick); ++ message=i18n("%1 takes channel halfop privileges from you.").arg(sourceNick); + else +- message=i18n("%1 takes channel halfop privileges from %2.").tqarg(sourceNick).tqarg(parameter); ++ message=i18n("%1 takes channel halfop privileges from %2.").arg(sourceNick).arg(parameter); + } + } + if(parameterChannelNick) +@@ -1771,12 +1771,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(fromMe) + { + if(toMe) message=i18n("You give yourself permission to talk."); +- else message=i18n("You give %1 permission to talk.").tqarg(parameter); ++ else message=i18n("You give %1 permission to talk.").arg(parameter); + } + else + { +- if(toMe) message=i18n("%1 gives you permission to talk.").tqarg(sourceNick); +- else message=i18n("%1 gives %2 permission to talk.").tqarg(sourceNick).tqarg(parameter); ++ if(toMe) message=i18n("%1 gives you permission to talk.").arg(sourceNick); ++ else message=i18n("%1 gives %2 permission to talk.").arg(sourceNick).arg(parameter); + } + } + else +@@ -1784,12 +1784,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(fromMe) + { + if(toMe) message=i18n("You take the permission to talk from yourself."); +- else message=i18n("You take the permission to talk from %1.").tqarg(parameter); ++ else message=i18n("You take the permission to talk from %1.").arg(parameter); + } + else + { +- if(toMe) message=i18n("%1 takes the permission to talk from you.").tqarg(sourceNick); +- else message=i18n("%1 takes the permission to talk from %2.").tqarg(sourceNick).tqarg(parameter); ++ if(toMe) message=i18n("%1 takes the permission to talk from you.").arg(sourceNick); ++ else message=i18n("%1 takes the permission to talk from %2.").arg(sourceNick).arg(parameter); + } + } + if(parameterChannelNick) +@@ -1803,12 +1803,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(plus) + { + if(fromMe) message=i18n("You set the channel mode to 'no colors allowed'."); +- else message=i18n("%1 sets the channel mode to 'no colors allowed'.").tqarg(sourceNick); ++ else message=i18n("%1 sets the channel mode to 'no colors allowed'.").arg(sourceNick); + } + else + { + if(fromMe) message=i18n("You set the channel mode to 'allow color codes'."); +- else message=i18n("%1 sets the channel mode to 'allow color codes'.").tqarg(sourceNick); ++ else message=i18n("%1 sets the channel mode to 'allow color codes'.").arg(sourceNick); + } + break; + +@@ -1816,12 +1816,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(plus) + { + if(fromMe) message=i18n("You set the channel mode to 'invite only'."); +- else message=i18n("%1 sets the channel mode to 'invite only'.").tqarg(sourceNick); ++ else message=i18n("%1 sets the channel mode to 'invite only'.").arg(sourceNick); + } + else + { + if(fromMe) message=i18n("You remove the 'invite only' mode from the channel."); +- else message=i18n("%1 removes the 'invite only' mode from the channel.").tqarg(sourceNick); ++ else message=i18n("%1 removes the 'invite only' mode from the channel.").arg(sourceNick); + } + modeI->setDown(plus); + break; +@@ -1830,12 +1830,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(plus) + { + if(fromMe) message=i18n("You set the channel mode to 'moderated'."); +- else message=i18n("%1 sets the channel mode to 'moderated'.").tqarg(sourceNick); ++ else message=i18n("%1 sets the channel mode to 'moderated'.").arg(sourceNick); + } + else + { + if(fromMe) message=i18n("You set the channel mode to 'unmoderated'."); +- else message=i18n("%1 sets the channel mode to 'unmoderated'.").tqarg(sourceNick); ++ else message=i18n("%1 sets the channel mode to 'unmoderated'.").arg(sourceNick); + } + modeM->setDown(plus); + break; +@@ -1844,12 +1844,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(plus) + { + if(fromMe) message=i18n("You set the channel mode to 'no messages from outside'."); +- else message=i18n("%1 sets the channel mode to 'no messages from outside'.").tqarg(sourceNick); ++ else message=i18n("%1 sets the channel mode to 'no messages from outside'.").arg(sourceNick); + } + else + { + if(fromMe) message=i18n("You set the channel mode to 'allow messages from outside'."); +- else message=i18n("%1 sets the channel mode to 'allow messages from outside'.").tqarg(sourceNick); ++ else message=i18n("%1 sets the channel mode to 'allow messages from outside'.").arg(sourceNick); + } + modeN->setDown(plus); + break; +@@ -1858,12 +1858,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(plus) + { + if(fromMe) message=i18n("You set the channel mode to 'private'."); +- else message=i18n("%1 sets the channel mode to 'private'.").tqarg(sourceNick); ++ else message=i18n("%1 sets the channel mode to 'private'.").arg(sourceNick); + } + else + { + if(fromMe) message=i18n("You set the channel mode to 'public'."); +- else message=i18n("%1 sets the channel mode to 'public'.").tqarg(sourceNick); ++ else message=i18n("%1 sets the channel mode to 'public'.").arg(sourceNick); + } + modeP->setDown(plus); + if(plus) modeS->setDown(false); +@@ -1873,12 +1873,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(plus) + { + if(fromMe) message=i18n("You set the channel mode to 'secret'."); +- else message=i18n("%1 sets the channel mode to 'secret'.").tqarg(sourceNick); ++ else message=i18n("%1 sets the channel mode to 'secret'.").arg(sourceNick); + } + else + { + if(fromMe) message=i18n("You set the channel mode to 'visible'."); +- else message=i18n("%1 sets the channel mode to 'visible'.").tqarg(sourceNick); ++ else message=i18n("%1 sets the channel mode to 'visible'.").arg(sourceNick); + } + modeS->setDown(plus); + if(plus) modeP->setDown(false); +@@ -1890,12 +1890,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + if(plus) + { + if(fromMe) message=i18n("You switch on 'topic protection'."); +- else message=i18n("%1 switches on 'topic protection'.").tqarg(sourceNick); ++ else message=i18n("%1 switches on 'topic protection'.").arg(sourceNick); + } + else + { + if(fromMe) message=i18n("You switch off 'topic protection'."); +- else message=i18n("%1 switches off 'topic protection'.").tqarg(sourceNick); ++ else message=i18n("%1 switches off 'topic protection'.").arg(sourceNick); + } + modeT->setDown(plus); + break; +@@ -1903,13 +1903,13 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + case 'k': + if(plus) + { +- if(fromMe) message=i18n("You set the channel key to '%1'.").tqarg(parameter); +- else message=i18n("%1 sets the channel key to '%2'.").tqarg(sourceNick).tqarg(parameter); ++ if(fromMe) message=i18n("You set the channel key to '%1'.").arg(parameter); ++ else message=i18n("%1 sets the channel key to '%2'.").arg(sourceNick).arg(parameter); + } + else + { + if(fromMe) message=i18n("You remove the channel key."); +- else message=i18n("%1 removes the channel key.").tqarg(sourceNick); ++ else message=i18n("%1 removes the channel key.").arg(sourceNick); + } + modeK->setDown(plus); + break; +@@ -1917,13 +1917,13 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + case 'l': + if(plus) + { +- if(fromMe) message=i18n("You set the channel limit to %1 nicks.").tqarg(parameter); +- else message=i18n("%1 sets the channel limit to %2 nicks.").tqarg(sourceNick).tqarg(parameter); ++ if(fromMe) message=i18n("You set the channel limit to %1 nicks.").arg(parameter); ++ else message=i18n("%1 sets the channel limit to %2 nicks.").arg(sourceNick).arg(parameter); + } + else + { + if(fromMe) message=i18n("You remove the channel limit."); +- else message=i18n("%1 removes the channel limit.").tqarg(sourceNick); ++ else message=i18n("%1 removes the channel limit.").arg(sourceNick); + } + modeL->setDown(plus); + if(plus) limit->setText(parameter); +@@ -1933,51 +1933,51 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const + case 'b': + if(plus) + { +- if(fromMe) message=i18n("You set a ban on %1.").tqarg(parameter); +- else message=i18n("%1 sets a ban on %2.").tqarg(sourceNick).tqarg(parameter); ++ if(fromMe) message=i18n("You set a ban on %1.").arg(parameter); ++ else message=i18n("%1 sets a ban on %2.").arg(sourceNick).arg(parameter); + } + else + { +- if(fromMe) message=i18n("You remove the ban on %1.").tqarg(parameter); +- else message=i18n("%1 removes the ban on %2.").tqarg(sourceNick).tqarg(parameter); ++ if(fromMe) message=i18n("You remove the ban on %1.").arg(parameter); ++ else message=i18n("%1 removes the ban on %2.").arg(sourceNick).arg(parameter); + } + break; + + case 'e': + if(plus) + { +- if(fromMe) message=i18n("You set a ban exception on %1.").tqarg(parameter); +- else message=i18n("%1 sets a ban exception on %2.").tqarg(sourceNick).tqarg(parameter); ++ if(fromMe) message=i18n("You set a ban exception on %1.").arg(parameter); ++ else message=i18n("%1 sets a ban exception on %2.").arg(sourceNick).arg(parameter); + } + else + { +- if(fromMe) message=i18n("You remove the ban exception on %1.").tqarg(parameter); +- else message=i18n("%1 removes the ban exception on %2.").tqarg(sourceNick).tqarg(parameter); ++ if(fromMe) message=i18n("You remove the ban exception on %1.").arg(parameter); ++ else message=i18n("%1 removes the ban exception on %2.").arg(sourceNick).arg(parameter); + } + break; + + case 'I': + if(plus) + { +- if(fromMe) message=i18n("You set invitation mask %1.").tqarg(parameter); +- else message=i18n("%1 sets invitation mask %2.").tqarg(sourceNick).tqarg(parameter); ++ if(fromMe) message=i18n("You set invitation mask %1.").arg(parameter); ++ else message=i18n("%1 sets invitation mask %2.").arg(sourceNick).arg(parameter); + } + else + { +- if(fromMe) message=i18n("You remove the invitation mask %1.").tqarg(parameter); +- else message=i18n("%1 removes the invitation mask %2.").tqarg(sourceNick).tqarg(parameter); ++ if(fromMe) message=i18n("You remove the invitation mask %1.").arg(parameter); ++ else message=i18n("%1 removes the invitation mask %2.").arg(sourceNick).arg(parameter); + } + break; + default: + if(plus) + { +- if(fromMe) message=i18n("You set channel mode +%1").tqarg(mode); +- else message=i18n("%1 sets channel mode +%2").tqarg(sourceNick).tqarg(mode); ++ if(fromMe) message=i18n("You set channel mode +%1").arg(mode); ++ else message=i18n("%1 sets channel mode +%2").arg(sourceNick).arg(mode); + } + else + { +- if (fromMe) message=i18n("You set channel mode -%1").tqarg(mode); +- else message= i18n("%1 sets channel mode -%2").tqarg(sourceNick).tqarg(mode); ++ if (fromMe) message=i18n("You set channel mode -%1").arg(mode); ++ else message= i18n("%1 sets channel mode -%2").arg(sourceNick).arg(mode); + } + } + +@@ -2067,7 +2067,7 @@ void Channel::updateModeWidgets(char mode, bool plus, const TQString ¶meter) + } + else + { +- TQStringList removable = m_modeList.grep(TQRegExp(TQString("^%1.*").tqarg(mode))); ++ TQStringList removable = m_modeList.grep(TQRegExp(TQString("^%1.*").arg(mode))); + + for(TQStringList::iterator it = removable.begin(); it != removable.end(); ++it) + { +@@ -2393,12 +2393,12 @@ void Channel::refreshModeButtons() + TQString opOnly; + if(!enable) opOnly = i18n("You have to be an operator to change this."); + +- TQToolTip::add(modeT, i18n("Topic can be changed by channel operator only. %1").tqarg(opOnly)); +- TQToolTip::add(modeN, i18n("No messages to channel from clients on the outside. %1").tqarg(opOnly)); +- TQToolTip::add(modeS, i18n("Secret channel. %1").tqarg(opOnly)); +- TQToolTip::add(modeI, i18n("Invite only channel. %1").tqarg(opOnly)); +- TQToolTip::add(modeP, i18n("Private channel. %1").tqarg(opOnly)); +- TQToolTip::add(modeM, i18n("Moderated channel. %1").tqarg(opOnly)); ++ TQToolTip::add(modeT, i18n("Topic can be changed by channel operator only. %1").arg(opOnly)); ++ TQToolTip::add(modeN, i18n("No messages to channel from clients on the outside. %1").arg(opOnly)); ++ TQToolTip::add(modeS, i18n("Secret channel. %1").arg(opOnly)); ++ TQToolTip::add(modeI, i18n("Invite only channel. %1").arg(opOnly)); ++ TQToolTip::add(modeP, i18n("Private channel. %1").arg(opOnly)); ++ TQToolTip::add(modeM, i18n("Moderated channel. %1").arg(opOnly)); + TQToolTip::add(modeK, i18n("Protect channel with a password.")); + TQToolTip::add(modeL, i18n("Set user limit to channel.")); + +@@ -2538,7 +2538,7 @@ bool Channel::closeYourself(bool confirm) + { + int result=KMessageBox::Continue; + if (confirm) +- result = KMessageBox::warningContinueCancel(this, i18n("Do you want to leave %1?").tqarg(getName()), ++ result = KMessageBox::warningContinueCancel(this, i18n("Do you want to leave %1?").arg(getName()), + i18n("Leave Channel"), i18n("Leave"), "QuitChannelTab"); + + if (result==KMessageBox::Continue) +@@ -2668,7 +2668,7 @@ TQString Channel::getChannelEncoding() // virtual + + TQString Channel::getChannelEncodingDefaultDesc() // virtual + { +- return i18n("Identity Default ( %1 )").tqarg(getServer()->getIdentity()->getCodecName()); ++ return i18n("Identity Default ( %1 )").arg(getServer()->getIdentity()->getCodecName()); + } + + void Channel::showNicknameBox(bool show) +diff --git a/konversation/src/channellistpanel.cpp b/konversation/src/channellistpanel.cpp +index 79a9168..165a177 100644 +--- a/konversation/src/channellistpanel.cpp ++++ b/konversation/src/channellistpanel.cpp +@@ -222,8 +222,8 @@ void ChannelListPanel::saveList() + TQTextStream stream(&listFile); + + TQString header(i18n("Konversation Channel List: %1 - %2\n\n") +- .tqarg(m_server->getServerName()) +- .tqarg(TQDateTime::currentDateTime().toString())); ++ .arg(m_server->getServerName()) ++ .arg(TQDateTime::currentDateTime().toString())); + + // send header to stream + stream << header; +@@ -483,8 +483,8 @@ void ChannelListPanel::applyFilterClicked() + + void ChannelListPanel::updateUsersChannels() + { +- emit updateNumChannels(i18n("Channels: %1 (%2 shown)").tqarg(getNumChannels()).tqarg(getVisibleChannels())); +- emit updateNumUsers(i18n("Non-unique users: %1 (%2 shown)").tqarg(getNumUsers()).tqarg(getVisibleUsers())); ++ emit updateNumChannels(i18n("Channels: %1 (%2 shown)").arg(getNumChannels()).arg(getVisibleChannels())); ++ emit updateNumUsers(i18n("Non-unique users: %1 (%2 shown)").arg(getNumUsers()).arg(getVisibleUsers())); + } + + bool ChannelListPanel::closeYourself() +@@ -585,7 +585,7 @@ void ChannelListPanel::serverOnline(bool online) + void ChannelListPanel::emitUpdateInfo() + { + TQString info; +- info = i18n("Channel List for %1").tqarg(m_server->getDisplayName()); ++ info = i18n("Channel List for %1").arg(m_server->getDisplayName()); + emit updateInfo(info); + } + +diff --git a/konversation/src/channeloptionsdialog.cpp b/konversation/src/channeloptionsdialog.cpp +index 27e5f7f..7cb34cd 100644 +--- a/konversation/src/channeloptionsdialog.cpp ++++ b/konversation/src/channeloptionsdialog.cpp +@@ -35,7 +35,7 @@ namespace Konversation + { + + ChannelOptionsDialog::ChannelOptionsDialog(Channel *channel) +- : KDialogBase(channel, "channelOptions", false, i18n("Channel Settings for %1").tqarg(channel->getName()), Ok|Cancel, Ok) ++ : KDialogBase(channel, "channelOptions", false, i18n("Channel Settings for %1").arg(channel->getName()), Ok|Cancel, Ok) + { + Q_ASSERT(channel); + m_widget = new ChannelOptionsUI(this); +@@ -124,16 +124,16 @@ namespace Konversation + + if(tmp.isEmpty() && plus) + { +- m_channel->getServer()->queue(command.tqarg(m_channel->getName()).tqarg("+").tqarg(modeString[0]).tqarg(modeString.mid(1))); ++ m_channel->getServer()->queue(command.arg(m_channel->getName()).arg("+").arg(modeString[0]).arg(modeString.mid(1))); + } + else if(!tmp.isEmpty() && !plus) + { + //FIXME: Bahamuth requires the key parameter for -k, but ircd breaks on -l with limit number. + //Hence two versions of this. + if (modeString[0] == 'k') +- m_channel->getServer()->queue(command.tqarg(m_channel->getName()).tqarg("-").tqarg(modeString[0]).tqarg(modeString.mid(1))); ++ m_channel->getServer()->queue(command.arg(m_channel->getName()).arg("-").arg(modeString[0]).arg(modeString.mid(1))); + else +- m_channel->getServer()->queue(command.tqarg(m_channel->getName()).tqarg("-").tqarg(modeString[0]).tqarg("")); ++ m_channel->getServer()->queue(command.arg(m_channel->getName()).arg("-").arg(modeString[0]).arg("")); + } + } + hide(); +diff --git a/konversation/src/chatwindow.cpp b/konversation/src/chatwindow.cpp +index 9e37d92..ab7c6ad 100644 +--- a/konversation/src/chatwindow.cpp ++++ b/konversation/src/chatwindow.cpp +@@ -247,9 +247,9 @@ void ChatWindow::setLogfileName(const TQString& name) + TQStringList firstColumns; + TQStringList messages; + int offset = 0; +- unsigned int lastPacketHeadPosition = backlog.tqdevice()->size(); ++ unsigned int lastPacketHeadPosition = backlog.device()->size(); + const unsigned int packetSize = 4096; +- while(messages.count() < (unsigned int)Preferences::backlogLines() && backlog.tqdevice()->size() > packetSize * offset) ++ while(messages.count() < (unsigned int)Preferences::backlogLines() && backlog.device()->size() > packetSize * offset) + { + TQStringList firstColumnsInPacket; + TQStringList messagesInPacket; +@@ -257,30 +257,30 @@ void ChatWindow::setLogfileName(const TQString& name) + // packetSize * offset < size <= packetSize * ( offset + 1 ) + + // Check if the log is bigger than packetSize * ( offset + 1 ) +- if(backlog.tqdevice()->size() > packetSize * ( offset + 1 )) ++ if(backlog.device()->size() > packetSize * ( offset + 1 )) + { + // Set file pointer to the packet size above the offset +- backlog.tqdevice()->at(backlog.tqdevice()->size() - packetSize * ( offset + 1 )); ++ backlog.device()->at(backlog.device()->size() - packetSize * ( offset + 1 )); + // Skip first line, since it may be incomplete + backlog.readLine(); + } + else + { + // Set file pointer to the head +- backlog.tqdevice()->reset(); ++ backlog.device()->reset(); + } + +- unsigned int currentPacketHeadPosition = backlog.tqdevice()->at(); ++ unsigned int currentPacketHeadPosition = backlog.device()->at(); + + // Loop until end of file reached +- while(!backlog.atEnd() && backlog.tqdevice()->at() < lastPacketHeadPosition) ++ while(!backlog.atEnd() && backlog.device()->at() < lastPacketHeadPosition) + { + // remember actual file position to check for deadlocks +- filePosition = backlog.tqdevice()->at(); ++ filePosition = backlog.device()->at(); + backlogLine = backlog.readLine(); + + // check for deadlocks +- if(backlog.tqdevice()->at() == filePosition) backlog.tqdevice()->at(filePosition + 1); ++ if(backlog.device()->at() == filePosition) backlog.device()->at(filePosition + 1); + + // if a tab character is present in the line + if(backlogLine.find('\t') != -1) +@@ -343,14 +343,14 @@ void ChatWindow::logText(const TQString& text) + + if(firstLog) + { +- TQString intro(i18n("\n*** Logfile started\n*** on %1\n\n").tqarg(TQDateTime::currentDateTime().toString())); ++ TQString intro(i18n("\n*** Logfile started\n*** on %1\n\n").arg(TQDateTime::currentDateTime().toString())); + logStream << intro; + firstLog=false; + } + + TQTime time=TQTime::currentTime(); +- TQString logLine(TQString("[%1] [%2] %3\n").tqarg(TQDate::currentDate(Qt::LocalTime).toString()). +- tqarg(time.toString("hh:mm:ss")).tqarg(text)); ++ TQString logLine(TQString("[%1] [%2] %3\n").arg(TQDate::currentDate(Qt::LocalTime).toString()). ++ arg(time.toString("hh:mm:ss")).arg(text)); + + logStream << logLine; + +diff --git a/konversation/src/chatwindow.h b/konversation/src/chatwindow.h +index d77f5d1..840a815 100644 +--- a/konversation/src/chatwindow.h ++++ b/konversation/src/chatwindow.h +@@ -165,7 +165,7 @@ class ChatWindow : public TQVBox + + protected: + +- /** Some tqchildren may handle the name themselves, and not want this public. ++ /** Some children may handle the name themselves, and not want this public. + * Increase the visibility in the subclass if you want outsiders to call this. + * The name is the string that is shown in the tab. + * @param newName The name to show in the tab +diff --git a/konversation/src/common.cpp b/konversation/src/common.cpp +index eba7508..d3449fc 100644 +--- a/konversation/src/common.cpp ++++ b/konversation/src/common.cpp +@@ -78,7 +78,7 @@ namespace Konversation + pos += chanExp.cap(1).length(); + + // HACK:Use space as a placeholder for \ as TQt tries to be clever and does a replace to / in urls in TQTextEdit +- insertText = link.tqarg(TQString(href).replace('\\', " "), href); ++ insertText = link.arg(TQString(href).replace('\\', " "), href); + filteredLine.replace(pos, urlLen, insertText); + pos += insertText.length(); + } +@@ -151,7 +151,7 @@ namespace Konversation + + // Use \x0b as a placeholder for & so we can readd them after changing all & in the normal text to & + // HACK Replace % with \x03 in the url to keep TQt from doing stupid things +- insertText = link.tqarg(protocol, TQString(href).replace('&', "\x0b").replace('%', "\x03"), href) + append; ++ insertText = link.arg(protocol, TQString(href).replace('&', "\x0b").replace('%', "\x03"), href) + append; + filteredLine.replace(pos, urlLen, insertText); + pos += insertText.length(); + KonversationApplication::instance()->storeUrl(fromNick, href); +diff --git a/konversation/src/connectionmanager.cpp b/konversation/src/connectionmanager.cpp +index 763f191..294adec 100644 +--- a/konversation/src/connectionmanager.cpp ++++ b/konversation/src/connectionmanager.cpp +@@ -203,15 +203,15 @@ void ConnectionManager::handleReconnect(Server* server) + + server->getStatusView()->appendServerMessage(i18n("Info"), + i18n("Trying to connect to %1 in %2 seconds.") +- .tqarg(settings.server().host()) +- .tqarg(Preferences::reconnectDelay())); ++ .arg(settings.server().host()) ++ .arg(Preferences::reconnectDelay())); + } + else + { + server->getStatusView()->appendServerMessage(i18n("Info"), + i18n("Trying to reconnect to %1 in %2 seconds.") +- .tqarg(settings.server().host()) +- .tqarg(Preferences::reconnectDelay())); ++ .arg(settings.server().host()) ++ .arg(Preferences::reconnectDelay())); + } + + server->getConnectionSettings().incrementReconnectCount(); +@@ -437,8 +437,8 @@ bool ConnectionManager::reuseExistingConnection(ConnectionSettings& settings, bo + int result = KMessageBox::warningContinueCancel( + mainWindow, + i18n("You are already connected to %1. Do you want to open another connection?") +- .tqarg(dupe->getDisplayName()), +- i18n("Already connected to %1").tqarg(dupe->getDisplayName()), ++ .arg(dupe->getDisplayName()), ++ i18n("Already connected to %1").arg(dupe->getDisplayName()), + i18n("Create connection"), + "ReuseExistingConnection"); + +@@ -453,12 +453,12 @@ bool ConnectionManager::reuseExistingConnection(ConnectionSettings& settings, bo + int result = KMessageBox::warningContinueCancel( + mainWindow, + i18n("You are presently connected to %1 via '%2' (port %3). Do you want to switch to '%4' (port %5) instead?") +- .tqarg(dupe->getDisplayName()) +- .tqarg(dupe->getServerName()) +- .tqarg(dupe->getPort()) +- .tqarg(settings.server().host()) +- .tqarg(settings.server().port()), +- i18n("Already connected to %1").tqarg(dupe->getDisplayName()), ++ .arg(dupe->getDisplayName()) ++ .arg(dupe->getServerName()) ++ .arg(dupe->getPort()) ++ .arg(settings.server().host()) ++ .arg(settings.server().port()), ++ i18n("Already connected to %1").arg(dupe->getDisplayName()), + i18n("Switch Server"), + "ReconnectWithDifferentServer"); + +@@ -513,7 +513,7 @@ bool ConnectionManager::validateIdentity(IdentityPtr identity, bool interactive) + { + int result = KMessageBox::warningContinueCancel(mainWindow, + i18n("Your identity \"%1\" is not set up correctly:
%2") +- .tqarg(identity->getName()).tqarg(errors), ++ .arg(identity->getName()).arg(errors), + i18n("Identity Settings"), + i18n("Edit Identity...")); + +diff --git a/konversation/src/dcc_preferencesui.ui b/konversation/src/dcc_preferencesui.ui +index ccff213..a1a4da2 100644 +--- a/konversation/src/dcc_preferencesui.ui ++++ b/konversation/src/dcc_preferencesui.ui +@@ -360,7 +360,7 @@ the Free Software Foundation; either version 2 of the License, or + + to + +- ++ + AlignCenter + + +@@ -427,7 +427,7 @@ the Free Software Foundation; either version 2 of the License, or + + to + +- ++ + AlignCenter + + +diff --git a/konversation/src/dccchat.cpp b/konversation/src/dccchat.cpp +index f40d1ae..15eb235 100644 +--- a/konversation/src/dccchat.cpp ++++ b/konversation/src/dccchat.cpp +@@ -134,7 +134,7 @@ void DccChat::listenForPartner() + m_listenSocket = DccCommon::createServerSocketAndListen( TQT_TQOBJECT(this), &failedReason ); + if ( !m_listenSocket ) + { +- getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Could not open a socket for listening: %1" ).tqarg( failedReason ) ); ++ getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Could not open a socket for listening: %1" ).arg( failedReason ) ); + return; + } + +@@ -144,8 +144,8 @@ void DccChat::listenForPartner() + m_ownPort = DccCommon::getServerSocketPort( m_listenSocket ); + kdDebug() << "DccChat::listenForPartner(): using port " << m_ownPort << endl; + +- getTextView()->appendServerMessage( i18n("DCC"), i18n("Offering DCC Chat connection to %1 on port %2...").tqarg( m_partnerNick ).tqarg( m_ownPort ) ); +- m_sourceLine->setText(i18n( "DCC chat with %1 on port %2." ).tqarg( m_partnerNick ).tqarg( m_ownPort ) ); ++ getTextView()->appendServerMessage( i18n("DCC"), i18n("Offering DCC Chat connection to %1 on port %2...").arg( m_partnerNick ).arg( m_ownPort ) ); ++ m_sourceLine->setText(i18n( "DCC chat with %1 on port %2." ).arg( m_partnerNick ).arg( m_ownPort ) ); + kdDebug() << "DccChat::listenForPartner() [END]" << endl; + } + +@@ -157,9 +157,9 @@ void DccChat::connectToPartner() + m_partnerHost=ip.toString(); + + getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "%1 = nickname, %2 = IP, %3 = port", +- "Establishing DCC Chat connection to %1 (%2:%3)..." ).tqarg( m_partnerNick ).tqarg( m_partnerHost ).tqarg( m_partnerPort ) ); ++ "Establishing DCC Chat connection to %1 (%2:%3)..." ).arg( m_partnerNick ).arg( m_partnerHost ).arg( m_partnerPort ) ); + +- m_sourceLine->setText( i18n( "%1 = nickname, %2 = IP, %3 = port", "DCC chat with %1 on %2:%3." ).tqarg( m_partnerNick ).tqarg( host ).tqarg( m_partnerPort ) ); ++ m_sourceLine->setText( i18n( "%1 = nickname, %2 = IP, %3 = port", "DCC chat with %1 on %2:%3." ).arg( m_partnerNick ).arg( host ).arg( m_partnerPort ) ); + + m_dccSocket = new KNetwork::KStreamSocket( m_partnerHost, TQString::number( m_partnerPort ), TQT_TQOBJECT(this) ); + +@@ -179,7 +179,7 @@ void DccChat::connectToPartner() + m_dccSocket->connect(); + + #if 0 +- //getTextView()->appendServerMessage(i18n("DCC"),i18n("Looking for host %1...").tqarg(host)); ++ //getTextView()->appendServerMessage(i18n("DCC"),i18n("Looking for host %1...").arg(host)); + #endif + + } +@@ -195,14 +195,14 @@ void DccChat::lookupFinished() + + void DccChat::dccChatConnectionSuccess() + { +- getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Established DCC Chat connection to %1." ).tqarg( m_partnerNick ) ); ++ getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Established DCC Chat connection to %1." ).arg( m_partnerNick ) ); + m_dccSocket->enableRead(true); + m_dccChatInput->setEnabled(true); + } + + void DccChat::dccChatBroken(int error) + { +- getTextView()->appendServerMessage(i18n("Error"),i18n("Connection broken, error code %1.").tqarg(error)); ++ getTextView()->appendServerMessage(i18n("Error"),i18n("Connection broken, error code %1.").arg(error)); + m_dccSocket->enableRead(false); + m_dccSocket->blockSignals(true); + m_dccSocket->close(); +@@ -241,7 +241,7 @@ void DccChat::readData() + if( ctcpCommand.lower() == "action" ) + appendAction( m_partnerNick, ctcpArgument ); + else +- getTextView()->appendServerMessage( i18n( "CTCP" ), i18n( "Received unknown CTCP-%1 request from %2" ).tqarg( ctcp ).tqarg( m_partnerNick ) ); ++ getTextView()->appendServerMessage( i18n( "CTCP" ), i18n( "Received unknown CTCP-%1 request from %2" ).arg( ctcp ).arg( m_partnerNick ) ); + } + else getTextView()->append( m_partnerNick, *itLine ); + } // endfor +@@ -295,7 +295,7 @@ void DccChat::sendDccChatText(const TQString& sendLine) + if (cmd == cc+"me") + { + appendAction( m_ownNick, line.section( " ", 1 ) ); +- line=TQString("\x01%1 %2\x01").tqarg("ACTION").tqarg(line.section(" ",1)); ++ line=TQString("\x01%1 %2\x01").arg("ACTION").arg(line.section(" ",1)); + } + else if (cmd == cc+"close") + { +@@ -336,7 +336,7 @@ void DccChat::heardPartner() + m_dccSocket->enableRead(true); + m_dccChatInput->setEnabled(true); + +- getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Established DCC Chat connection to %1." ).tqarg( m_partnerNick ) ); ++ getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Established DCC Chat connection to %1." ).arg( m_partnerNick ) ); + } + + void DccChat::socketClosed() +@@ -410,7 +410,7 @@ TQString DccChat::getChannelEncoding() // virtual + + TQString DccChat::getChannelEncodingDefaultDesc() // virtual + { +- return i18n("Default ( %1 )").tqarg(Konversation::IRCCharsets::self()->encodingForLocale()); ++ return i18n("Default ( %1 )").arg(Konversation::IRCCharsets::self()->encodingForLocale()); + } + + void DccChat::showEvent(TQShowEvent* /* event */) +diff --git a/konversation/src/dcctransferdetailedinfopanel.cpp b/konversation/src/dcctransferdetailedinfopanel.cpp +index 6bd6961..8aec7d0 100644 +--- a/konversation/src/dcctransferdetailedinfopanel.cpp ++++ b/konversation/src/dcctransferdetailedinfopanel.cpp +@@ -98,17 +98,17 @@ void DccTransferDetailedInfoPanel::updateView() + else + partnerInfoServerName = i18n( "Unknown server" ); + TQString partnerInfo( i18n( "%1 on %2" ) +- .tqarg( transfer->getPartnerNick().isEmpty() ? "?" : transfer->getPartnerNick() ) +- .tqarg( partnerInfoServerName ) ); ++ .arg( transfer->getPartnerNick().isEmpty() ? "?" : transfer->getPartnerNick() ) ++ .arg( partnerInfoServerName ) ); + if ( !transfer->getPartnerIp().isEmpty() ) +- partnerInfo += i18n( ", %1 (port %2)" ).tqarg( transfer->getPartnerIp() ).tqarg( transfer->getPartnerPort() ); ++ partnerInfo += i18n( ", %1 (port %2)" ).arg( transfer->getPartnerIp() ).arg( transfer->getPartnerPort() ); + m_labelPartner->setText( partnerInfo ); + + // Self: + if ( transfer->getOwnIp().isEmpty() ) + m_labelSelf->setText( "" ); + else +- m_labelSelf->setText( i18n( "%1 (port %2)" ).tqarg( transfer->getOwnIp() ).tqarg( transfer->getOwnPort() ) ); ++ m_labelSelf->setText( i18n( "%1 (port %2)" ).arg( transfer->getOwnIp() ).arg( transfer->getOwnPort() ) ); + + // Status: + if ( transfer->getStatus() == DccTransfer::Transferring ) +@@ -133,7 +133,7 @@ void DccTransferDetailedInfoPanel::updateView() + + // Resumed: + if ( transfer->isResumed() ) +- m_labelIsResumed->setText( i18n( "Yes, %1" ).tqarg( KGlobal::locale()->formatNumber( transfer->getTransferStartPosition(), 0 ) ) ); ++ m_labelIsResumed->setText( i18n( "Yes, %1" ).arg( KGlobal::locale()->formatNumber( transfer->getTransferStartPosition(), 0 ) ) ); + else + m_labelIsResumed->setText( i18n( "No" ) ); + +diff --git a/konversation/src/dcctransferdetailedinfopanelui.ui b/konversation/src/dcctransferdetailedinfopanelui.ui +index b11b2e1..967b1ae 100644 +--- a/konversation/src/dcctransferdetailedinfopanelui.ui ++++ b/konversation/src/dcctransferdetailedinfopanelui.ui +@@ -194,7 +194,7 @@ + 0 + + +- ++ + AlignVCenter|AlignRight + + +@@ -224,7 +224,7 @@ + 0 + + +- ++ + AlignVCenter|AlignRight + + +@@ -246,7 +246,7 @@ + 0 + + +- ++ + AlignVCenter|AlignRight + + +@@ -284,7 +284,7 @@ + 0 + + +- ++ + AlignVCenter|AlignRight + + +@@ -322,7 +322,7 @@ + 0 + + +- ++ + AlignVCenter|AlignRight + + +@@ -370,7 +370,7 @@ + + m_labelTimeFinished + +- ++ + AlignVCenter|AlignRight + + +@@ -392,7 +392,7 @@ + 0 + + +- ++ + AlignVCenter|AlignRight + + +@@ -430,7 +430,7 @@ + 0 + + +- ++ + AlignVCenter|AlignRight + + +@@ -438,7 +438,7 @@ + + m_labelTimeOffered + +- ++ + AlignVCenter|AlignRight + + +@@ -454,7 +454,7 @@ + + m_labelTimeStarted + +- ++ + AlignVCenter|AlignRight + + +diff --git a/konversation/src/dcctransferpanelitem.cpp b/konversation/src/dcctransferpanelitem.cpp +index d2cb9ee..e0ebc49 100644 +--- a/konversation/src/dcctransferpanelitem.cpp ++++ b/konversation/src/dcctransferpanelitem.cpp +@@ -156,9 +156,9 @@ void DccTransferPanelItem::stopAutoViewUpdate() + } + } + +-void DccTransferPanelItem::paintCell( TQPainter* painter, const TQColorGroup& colorgroup, int column, int width, int tqalignment ) // virtual public ++void DccTransferPanelItem::paintCell( TQPainter* painter, const TQColorGroup& colorgroup, int column, int width, int alignment ) // virtual public + { +- KListViewItem::paintCell( painter, colorgroup, column, width, tqalignment ); ++ KListViewItem::paintCell( painter, colorgroup, column, width, alignment ); + if ( column == DccTransferPanel::Column::Progress ) + showProgressBar(); + } +@@ -229,7 +229,7 @@ void DccTransferPanelItem::openFileInfoDialog() + #ifdef USE_INFOLIST + KMessageBox::informationList( + listView(), +- i18n("Available information for file %1:").tqarg(path), ++ i18n("Available information for file %1:").arg(path), + infoList, + i18n("File Information") + ); +@@ -372,9 +372,9 @@ TQString DccTransferPanelItem::getCurrentSpeedPrettyText() const + TQString DccTransferPanelItem::getSenderAddressPrettyText() const + { + if ( m_transfer->getType() == DccTransfer::Send ) +- return TQString( "%1:%2" ).tqarg( m_transfer->getOwnIp() ).tqarg( m_transfer->getOwnPort() ); ++ return TQString( "%1:%2" ).arg( m_transfer->getOwnIp() ).arg( m_transfer->getOwnPort() ); + else +- return TQString( "%1:%2" ).tqarg( m_transfer->getPartnerIp() ).tqarg( m_transfer->getPartnerPort() ); ++ return TQString( "%1:%2" ).arg( m_transfer->getPartnerIp() ).arg( m_transfer->getPartnerPort() ); + } + + TQString DccTransferPanelItem::getSpeedPrettyText( transferspeed_t speed ) +@@ -384,7 +384,7 @@ TQString DccTransferPanelItem::getSpeedPrettyText( transferspeed_t speed ) + else if ( speed == DccTransfer::NotInTransfer ) + return TQString(); + else +- return i18n("%1/sec").tqarg( KIO::convertSize( (KIO::fileoffset_t)speed ) ); ++ return i18n("%1/sec").arg( KIO::convertSize( (KIO::fileoffset_t)speed ) ); + } + + TQString DccTransferPanelItem::secToHMS( long sec ) +@@ -395,9 +395,9 @@ TQString DccTransferPanelItem::secToHMS( long sec ) + + // remHour can be more than 25, so we can't use TQTime here. + return TQString( "%1:%2:%3" ) +- .tqarg( TQString::number( remHour ).rightJustify( 2, '0', false ) ) +- .tqarg( TQString::number( remMin ).rightJustify( 2, '0' ) ) +- .tqarg( TQString::number( remSec ).rightJustify( 2, '0' ) ); ++ .arg( TQString::number( remHour ).rightJustify( 2, '0', false ) ) ++ .arg( TQString::number( remMin ).rightJustify( 2, '0' ) ) ++ .arg( TQString::number( remSec ).rightJustify( 2, '0' ) ); + } + + #include "dcctransferpanelitem.moc" +diff --git a/konversation/src/dcctransferpanelitem.h b/konversation/src/dcctransferpanelitem.h +index eef6305..5a50f61 100644 +--- a/konversation/src/dcctransferpanelitem.h ++++ b/konversation/src/dcctransferpanelitem.h +@@ -46,7 +46,7 @@ class DccTransferPanelItem : public TQObject, public KListViewItem + DccTransferPanelItem( DccTransferPanel* panel, DccTransfer* transfer ); + virtual ~DccTransferPanelItem(); + +- virtual void paintCell( TQPainter* painter, const TQColorGroup& colorgroup, int column, int width, int tqalignment ); ++ virtual void paintCell( TQPainter* painter, const TQColorGroup& colorgroup, int column, int width, int alignment ); + + virtual int compare( TQListViewItem* i, int col, bool ascending ) const; + +diff --git a/konversation/src/dcctransferrecv.cpp b/konversation/src/dcctransferrecv.cpp +index 9922bbb..9134a8d 100644 +--- a/konversation/src/dcctransferrecv.cpp ++++ b/konversation/src/dcctransferrecv.cpp +@@ -182,7 +182,7 @@ bool DccTransferRecv::queue() + // check if the sender IP is valid + if ( m_partnerIp == "0.0.0.0" ) + { +- failed( i18n( "Invalid sender address (%1)" ).tqarg( m_partnerIp ) ); ++ failed( i18n( "Invalid sender address (%1)" ).arg( m_partnerIp ) ); + return false; + } + +@@ -270,7 +270,7 @@ void DccTransferRecv::prepareLocalKio( bool overwrite, bool resume, KIO::fileoff + { + askAndPrepareLocalKio( i18n( "Cannot create the folder.
" + "Folder: %1
" ) +- .tqarg( m_fileURL.upURL().prettyURL() ), ++ .arg( m_fileURL.upURL().prettyURL() ), + DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel, + DccResumeDialog::RA_Rename ); + return; +@@ -352,7 +352,7 @@ void DccTransferRecv::slotLocalCanResume( KIO::Job* job, KIO::filesize_t size ) + { + askAndPrepareLocalKio( i18n( "The file is used by another transfer.
" + "%1
" ) +- .tqarg( m_fileURL.prettyURL() ), ++ .arg( m_fileURL.prettyURL() ), + DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel, + DccResumeDialog::RA_Rename ); + } +@@ -365,8 +365,8 @@ void DccTransferRecv::slotLocalCanResume( KIO::Job* job, KIO::filesize_t size ) + askAndPrepareLocalKio( i18n( "A partial file exists.
" + "%1
" + "Size of the partial file: %2 bytes
" ) +- .tqarg( m_fileURL.prettyURL() ) +- .tqarg( KGlobal::locale()->formatNumber( size, 0 ) ), ++ .arg( m_fileURL.prettyURL() ) ++ .arg( KGlobal::locale()->formatNumber( size, 0 ) ), + DccResumeDialog::RA_Resume | DccResumeDialog::RA_Overwrite | DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel, + DccResumeDialog::RA_Resume, + size ); +@@ -392,7 +392,7 @@ void DccTransferRecv::slotLocalGotResult( KIO::Job* job ) + case KIO::ERR_FILE_ALREADY_EXIST: + askAndPrepareLocalKio( i18n( "The file already exists.
" + "%1
" ) +- .tqarg( m_fileURL.prettyURL() ), ++ .arg( m_fileURL.prettyURL() ), + DccResumeDialog::RA_Overwrite | DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel, + DccResumeDialog::RA_Overwrite ); + break; +@@ -400,8 +400,8 @@ void DccTransferRecv::slotLocalGotResult( KIO::Job* job ) + askAndPrepareLocalKio( i18n( "Could not open the file.
" + "Error: %1
" + "%2
" ) +- .tqarg( transferJob->error() ) +- .tqarg( m_fileURL.prettyURL() ), ++ .arg( transferJob->error() ) ++ .arg( m_fileURL.prettyURL() ), + DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel, + DccResumeDialog::RA_Rename ); + } +@@ -564,7 +564,7 @@ void DccTransferRecv::slotServerSocketReadyAccept() + + void DccTransferRecv::slotServerSocketGotError( int /* errorCode*/ ) + { +- failed( i18n( "Socket error: %1" ).tqarg( m_serverSocket->errorString() ) ); ++ failed( i18n( "Socket error: %1" ).arg( m_serverSocket->errorString() ) ); + } + + void DccTransferRecv::startReceiving() +@@ -591,7 +591,7 @@ void DccTransferRecv::startReceiving() + void DccTransferRecv::connectionFailed( int errorCode ) + { + kdDebug() << "DccTransferRecv::connectionFailed(): code = " << errorCode << ", string = " << m_recvSocket->KSocketBase::errorString() << endl; +- failed( i18n( "Connection failure: %1" ).tqarg( m_recvSocket->KSocketBase::errorString() ) ); ++ failed( i18n( "Connection failure: %1" ).arg( m_recvSocket->KSocketBase::errorString() ) ); + } + + void DccTransferRecv::readData() // slot +@@ -642,7 +642,7 @@ void DccTransferRecv::slotLocalWriteDone() // <-WriteCacheHandler::done() + void DccTransferRecv::slotLocalGotWriteError( const TQString& errorString ) + { + kdDebug() << "DccTransferRecv::slotLocalGotWriteError()" << endl; +- failed( i18n( "KIO error: %1" ).tqarg( errorString ) ); ++ failed( i18n( "KIO error: %1" ).arg( errorString ) ); + } + + void DccTransferRecv::startConnectionTimer( int sec ) +diff --git a/konversation/src/dcctransfersend.cpp b/konversation/src/dcctransfersend.cpp +index db0bad2..1ed371f 100644 +--- a/konversation/src/dcctransfersend.cpp ++++ b/konversation/src/dcctransfersend.cpp +@@ -170,7 +170,7 @@ bool DccTransferSend::queue() + //Check the file exists + if ( !KIO::NetAccess::exists( m_fileURL, true, NULL ) ) + { +- failed( i18n( "The url \"%1\" does not exist" ).tqarg( m_fileURL.prettyURL() ) ); ++ failed( i18n( "The url \"%1\" does not exist" ).arg( m_fileURL.prettyURL() ) ); + return false; + } + +@@ -178,7 +178,7 @@ bool DccTransferSend::queue() + //Download the file. Does nothing if it's local (file:/) + if ( !KIO::NetAccess::download( m_fileURL, m_tmpFile, NULL ) ) + { +- failed( i18n( "Could not retrieve \"%1\"" ).tqarg( m_fileURL.prettyURL() ) ); ++ failed( i18n( "Could not retrieve \"%1\"" ).arg( m_fileURL.prettyURL() ) ); + kdDebug() << "DccTransferSend::DccTransferSend(): KIO::NetAccess::download() failed. reason: " << KIO::NetAccess::lastErrorString() << endl; + return false; + } +@@ -187,7 +187,7 @@ bool DccTransferSend::queue() + if ( m_fileName.isEmpty() ) + { + bool pressedOk; +- m_fileName = KInputDialog::getText( i18n( "Enter Filename" ), i18n( "The file that you are sending to %1 does not have a filename.
Please enter a filename to be presented to the receiver, or cancel the dcc transfer" ).tqarg( getPartnerNick() ), "unknown", &pressedOk, NULL ); ++ m_fileName = KInputDialog::getText( i18n( "Enter Filename" ), i18n( "The file that you are sending to %1 does not have a filename.
Please enter a filename to be presented to the receiver, or cancel the dcc transfer" ).arg( getPartnerNick() ), "unknown", &pressedOk, NULL ); + + if ( !pressedOk ) + { +@@ -365,7 +365,7 @@ void DccTransferSend::startSending() + startTransferLogger(); // initialize CPS counter, ETA counter, etc... + } + else +- failed( i18n( "Could not open the file: %1" ).tqarg( getTQFileErrorString( m_file.status() ) ) ); ++ failed( i18n( "Could not open the file: %1" ).arg( getTQFileErrorString( m_file.status() ) ) ); + } + + void DccTransferSend::writeData() // slot +@@ -418,7 +418,7 @@ void DccTransferSend::getAck() // slot + void DccTransferSend::slotGotSocketError( int errorCode ) + { + kdDebug() << "DccTransferSend::slotGotSocketError(): code = " << errorCode << " string = " << m_serverSocket->errorString() << endl; +- failed( i18n( "Socket error: %1" ).tqarg( m_serverSocket->errorString() ) ); ++ failed( i18n( "Socket error: %1" ).arg( m_serverSocket->errorString() ) ); + } + + void DccTransferSend::startConnectionTimer( int sec ) +@@ -445,7 +445,7 @@ void DccTransferSend::slotConnectionTimeout() // slot + + void DccTransferSend::slotConnectionFailed( int /* errorCode */ ) + { +- failed( i18n( "Connection failure: %1" ).tqarg( m_sendSocket->KSocketBase::errorString() ) ); ++ failed( i18n( "Connection failure: %1" ).arg( m_sendSocket->KSocketBase::errorString() ) ); + } + + void DccTransferSend::slotServerSocketClosed() +@@ -472,16 +472,16 @@ TQString DccTransferSend::getTQFileErrorString( int code ) + errorString=i18n("The operation was successful. Should never happen in an error dialog."); + break; + case IO_ReadError: +- errorString=i18n("Could not read from file \"%1\".").tqarg( m_fileName ); ++ errorString=i18n("Could not read from file \"%1\".").arg( m_fileName ); + break; + case IO_WriteError: +- errorString=i18n("Could not write to file \"%1\".").tqarg( m_fileName ); ++ errorString=i18n("Could not write to file \"%1\".").arg( m_fileName ); + break; + case IO_FatalError: + errorString=i18n("A fatal unrecoverable error occurred."); + break; + case IO_OpenError: +- errorString=i18n("Could not open file \"%1\".").tqarg( m_fileName ); ++ errorString=i18n("Could not open file \"%1\".").arg( m_fileName ); + break; + + // Same case value? Damn! +@@ -499,7 +499,7 @@ TQString DccTransferSend::getTQFileErrorString( int code ) + errorString=i18n("An unspecified error happened on close."); + break; + default: +- errorString=i18n("Unknown error. Code %1").tqarg(code); ++ errorString=i18n("Unknown error. Code %1").arg(code); + break; + } + +diff --git a/konversation/src/emoticon.cpp b/konversation/src/emoticon.cpp +index c1fe023..96e967f 100644 +--- a/konversation/src/emoticon.cpp ++++ b/konversation/src/emoticon.cpp +@@ -159,7 +159,7 @@ namespace Konversation + + for(EmotIconMap::iterator it = self()->m_emotIconMap.begin(); it != self()->m_emotIconMap.end(); ++it) + { +- TQRegExp regExp(TQString("(^|\\s)%1($|\\s)").tqarg(it.data())); ++ TQRegExp regExp(TQString("(^|\\s)%1($|\\s)").arg(it.data())); + filteredTxt.replace(regExp, " \"" "); + } +diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp +index 3b72fda..c59a545 100644 +--- a/konversation/src/highlight_preferences.cpp ++++ b/konversation/src/highlight_preferences.cpp +@@ -228,7 +228,7 @@ void Highlight_Config::highlightColorChanged(const TQColor& newColor) + if(!newItemSelected && item) + { + item->setColor(newColor); +- item->tqrepaint(); ++ item->repaint(); + emit modified(); + } + } +@@ -327,7 +327,7 @@ void Highlight_Config::saveSettings() + int i = 0; + for(Highlight* hl = hiList.first(); hl; hl = hiList.next()) + { +- config->setGroup(TQString("Highlight%1").tqarg(i)); ++ config->setGroup(TQString("Highlight%1").arg(i)); + config->writeEntry("Pattern", hl->getPattern()); + config->writeEntry("RegExp", hl->getRegExp()); + config->writeEntry("Color", hl->getColor()); +@@ -339,9 +339,9 @@ void Highlight_Config::saveSettings() + Preferences::setHighlightList(hiList); + + // Remove unused entries... +- while(config->hasGroup(TQString("Highlight%1").tqarg(i))) ++ while(config->hasGroup(TQString("Highlight%1").arg(i))) + { +- config->deleteGroup(TQString("Highlight%1").tqarg(i)); ++ config->deleteGroup(TQString("Highlight%1").arg(i)); + i++; + } + +diff --git a/konversation/src/highlightviewitem.cpp b/konversation/src/highlightviewitem.cpp +index 138ca2f..f6784a6 100644 +--- a/konversation/src/highlightviewitem.cpp ++++ b/konversation/src/highlightviewitem.cpp +@@ -35,12 +35,12 @@ HighlightViewItem::~HighlightViewItem() + { + } + +-void HighlightViewItem::paintCell(TQPainter* p, const TQColorGroup &cg, int column, int width, int tqalignment) ++void HighlightViewItem::paintCell(TQPainter* p, const TQColorGroup &cg, int column, int width, int alignment) + { + // copy all colors from cg and only then change needed colors + itemColorGroup=cg; + itemColorGroup.setColor(TQColorGroup::Text, itemColor); +- TQCheckListItem::paintCell(p, itemColorGroup, column, width, tqalignment); ++ TQCheckListItem::paintCell(p, itemColorGroup, column, width, alignment); + } + + HighlightViewItem* HighlightViewItem::itemBelow() +diff --git a/konversation/src/highlightviewitem.h b/konversation/src/highlightviewitem.h +index 805f806..d2d15dc 100644 +--- a/konversation/src/highlightviewitem.h ++++ b/konversation/src/highlightviewitem.h +@@ -67,6 +67,6 @@ class HighlightViewItem : public TQCheckListItem + bool m_changed; // true if the checkbox has been changed + + void stateChange(bool newState); // reimplemented to store changed value +- 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); + }; + #endif +diff --git a/konversation/src/inputfilter.cpp b/konversation/src/inputfilter.cpp +index f2e78ec..e1fb804 100644 +--- a/konversation/src/inputfilter.cpp ++++ b/konversation/src/inputfilter.cpp +@@ -201,17 +201,17 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("CTCP"), + i18n("Received CTCP-PING request from %1 to channel %2, sending answer.") +- .tqarg(sourceNick).tqarg(parameterList[0]) ++ .arg(sourceNick).arg(parameterList[0]) + ); + } + else + { + server->appendMessageToFrontmost(i18n("CTCP"), + i18n("Received CTCP-%1 request from %2, sending answer.") +- .tqarg("PING").tqarg(sourceNick) ++ .arg("PING").arg(sourceNick) + ); + } +- server->ctcpReply(sourceNick,TQString("PING %1").tqarg(ctcpArgument)); ++ server->ctcpReply(sourceNick,TQString("PING %1").arg(ctcpArgument)); + } + } + +@@ -224,14 +224,14 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("CTCP"), + i18n("Received Version request from %1 to channel %2.") +- .tqarg(sourceNick).tqarg(parameterList[0]) ++ .arg(sourceNick).arg(parameterList[0]) + ); + } + else + { + server->appendMessageToFrontmost(i18n("CTCP"), + i18n("Received Version request from %1.") +- .tqarg(sourceNick) ++ .arg(sourceNick) + ); + } + +@@ -244,7 +244,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + { + // Do not internationalize the below version string + reply = TQString("Konversation %1 (C) 2002-2008 by the Konversation team") +- .tqarg(TQString(KONVI_VERSION)); ++ .arg(TQString(KONVI_VERSION)); + } + server->ctcpReply(sourceNick,"VERSION "+reply); + } +@@ -298,7 +298,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("DCC"), + i18n("Received invalid DCC SEND request from %1.") +- .tqarg(sourceNick) ++ .arg(sourceNick) + ); + } + } +@@ -313,7 +313,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("DCC"), + i18n("Received invalid DCC ACCEPT request from %1.") +- .tqarg(sourceNick) ++ .arg(sourceNick) + ); + } + } +@@ -328,7 +328,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("DCC"), + i18n("Received invalid DCC RESUME request from %1.") +- .tqarg(sourceNick) ++ .arg(sourceNick) + ); + } + } +@@ -344,7 +344,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("DCC"), + i18n("Received invalid DCC CHAT request from %1.") +- .tqarg(sourceNick) ++ .arg(sourceNick) + ); + } + } +@@ -352,7 +352,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("DCC"), + i18n("Unknown DCC command %1 received from %2.") +- .tqarg(ctcpArgument).tqarg(sourceNick) ++ .arg(ctcpArgument).arg(sourceNick) + ); + } + } +@@ -361,7 +361,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("CTCP"), + i18n("Received CTCP-%1 request from %2, sending answer.") +- .tqarg("CLIENTINFO").tqarg(sourceNick) ++ .arg("CLIENTINFO").arg(sourceNick) + ); + server->ctcpReply(sourceNick,TQString("CLIENTINFO ACTION CLIENTINFO DCC PING TIME VERSION")); + } +@@ -369,7 +369,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("CTCP"), + i18n("Received CTCP-%1 request from %2, sending answer.") +- .tqarg("TIME").tqarg(sourceNick) ++ .arg("TIME").arg(sourceNick) + ); + server->ctcpReply(sourceNick,TQString("TIME ")+TQDateTime::currentDateTime().toString()); + } +@@ -384,12 +384,12 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + parameterList[0], + "CTCP", + i18n("Received unknown CTCP-%1 request from %2 to Channel %3.") +- .tqarg(ctcp).tqarg(sourceNick).tqarg(parameterList[0]) ++ .arg(ctcp).arg(sourceNick).arg(parameterList[0]) + ); + else + server->appendMessageToFrontmost(i18n("CTCP"), + i18n("Received unknown CTCP-%1 request from %2.") +- .tqarg(ctcp).tqarg(sourceNick) ++ .arg(ctcp).arg(sourceNick) + ); + } + } +@@ -414,7 +414,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + + server->appendServerMessageToChannel(parameterList[0], i18n("Notice"), + i18n("-%1 to %2- %3") +- .tqarg(sourceNick).tqarg(parameterList[0]).tqarg(trailing) ++ .arg(sourceNick).arg(parameterList[0]).arg(trailing) + ); + } + // Private notice +@@ -441,9 +441,9 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + + server->appendMessageToFrontmost(i18n("CTCP"), + i18n("Received CTCP-PING reply from %1: %2 %3.") +- .tqarg(sourceNick) +- .tqarg(time) +- .tqarg(unit) ++ .arg(sourceNick) ++ .arg(time) ++ .arg(unit) + ); + } + // all other ctcp replies get a general message +@@ -451,7 +451,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("CTCP"), + i18n("Received CTCP-%1 reply from %2: %3.") +- .tqarg(replyReason).tqarg(sourceNick).tqarg(reply) ++ .arg(replyReason).arg(sourceNick).arg(reply) + ); + } + } +@@ -474,7 +474,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + if(nickInfo) + nickInfo->setIdentified(true); + } +- server->appendMessageToFrontmost(i18n("Notice"), i18n("-%1- %2").tqarg(sourceNick).tqarg(trailing)); ++ server->appendMessageToFrontmost(i18n("Notice"), i18n("-%1- %2").arg(sourceNick).arg(trailing)); + } + } + } +@@ -608,7 +608,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com + + server->appendMessageToFrontmost(i18n("Invite"), + i18n("%1 invited you to channel %2.") +- .tqarg(sourceNick).tqarg(channel) ++ .arg(sourceNick).arg(channel) + ); + emit invitation(sourceNick,channel); + } +@@ -668,7 +668,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + } + else if(command=="notice") + { +- server->appendStatusMessage(i18n("Notice"),i18n("-%1- %2").tqarg(prefix).tqarg(trailing)); ++ server->appendStatusMessage(i18n("Notice"),i18n("-%1- %2").arg(prefix).arg(trailing)); + } + else if(command=="kick") + { +@@ -714,10 +714,10 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + { + server->appendStatusMessage(i18n("Welcome"), + i18n("Server %1 (Version %2), User modes: %3, Channel modes: %4") +- .tqarg(parameterList[1]) +- .tqarg(parameterList[2]) +- .tqarg(parameterList[3]) +- .tqarg(parameterList[4]) ++ .arg(parameterList[1]) ++ .arg(parameterList[2]) ++ .arg(parameterList[3]) ++ .arg(parameterList[4]) + ); + server->setAllowedChannelModes(parameterList[4]); + break; +@@ -781,7 +781,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + } + case RPL_UMODEIS: + { +- TQString message=TQString("%1 %2").tqarg(i18n("Your personal modes are:")).tqarg(parameterList.join(" ").section(' ',1) + ' '+trailing); ++ TQString message=TQString("%1 %2").arg(i18n("Your personal modes are:")).arg(parameterList.join(" ").section(' ',1) + ' '+trailing); + server->appendMessageToFrontmost("Info", message); + break; + } +@@ -853,7 +853,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + case RPL_CHANNELURLIS: + {// :niven.freenode.net 328 argonel #channel :http://www.buggeroff.com/ + server->appendCommandMessageToChannel(parameterList[1], i18n("URL"), +- i18n("Channel URL: %1").tqarg(trailing)); ++ i18n("Channel URL: %1").arg(trailing)); + break; + } + case RPL_CHANNELCREATED: +@@ -862,7 +862,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + when.setTime_t(parameterList[2].toUInt()); + server->appendCommandMessageToChannel(parameterList[1],i18n("Created"), + i18n("This channel was created on %1.") +- .tqarg(when.toString(Qt::LocalDate)) ++ .arg(when.toString(Qt::LocalDate)) + ); + + if(Preferences::autoWhoContinuousEnabled()) +@@ -877,7 +877,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + // Display message only if this was not an automatic request. + if(getAutomaticRequest("WHOIS",parameterList[1])==0) + { +- server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is logged in as %2.").tqarg(parameterList[1]).tqarg(parameterList[2])); ++ server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is logged in as %2.").arg(parameterList[1]).arg(parameterList[2])); + } + break; + } +@@ -927,7 +927,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + // Topic set messages + case RPL_NOTOPIC: + { +- server->appendMessageToFrontmost(i18n("TOPIC"),i18n("The channel %1 has no topic set.").tqarg(parameterList[1]) /*.tqarg(parameterList[2])*/); //FIXME ok, whats the second parameter supposed to be? ++ server->appendMessageToFrontmost(i18n("TOPIC"),i18n("The channel %1 has no topic set.").arg(parameterList[1]) /*.arg(parameterList[2])*/); //FIXME ok, whats the second parameter supposed to be? + + break; + } +@@ -946,7 +946,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + } + else + { +- server->appendMessageToFrontmost(i18n("Topic"),i18n("The channel topic for %1 is: \"%2\"").tqarg(parameterList[1]).tqarg(topic)); ++ server->appendMessageToFrontmost(i18n("Topic"),i18n("The channel topic for %1 is: \"%2\"").arg(parameterList[1]).arg(topic)); + } + + break; +@@ -962,15 +962,15 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + { + server->appendCommandMessageToChannel(parameterList[1],i18n("Topic"), + i18n("The topic was set by %1 on %2.") +- .tqarg(parameterList[2]).tqarg(when.toString(Qt::LocalDate)), ++ .arg(parameterList[2]).arg(when.toString(Qt::LocalDate)), + false); + } + else + { + server->appendMessageToFrontmost(i18n("Topic"),i18n("The topic for %1 was set by %2 on %3.") +- .tqarg(parameterList[1]) +- .tqarg(parameterList[2]) +- .tqarg(when.toString(Qt::LocalDate)) ++ .arg(parameterList[1]) ++ .arg(parameterList[2]) ++ .arg(when.toString(Qt::LocalDate)) + ); + setAutomaticRequest("TOPIC",parameterList[1],false); + } +@@ -983,7 +983,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + // Display message only if this was not an automatic request. + if(getAutomaticRequest("WHOIS",parameterList[1])==0) + { +- server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is actually using the host %2.").tqarg(parameterList[1]).tqarg(parameterList[2])); ++ server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is actually using the host %2.").arg(parameterList[1]).arg(parameterList[2])); + } + break; + } +@@ -993,11 +993,11 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + // IP resolve purposes, and clear it from the automaticRequest list + if(getAutomaticRequest("DNS",parameterList[1])==0) + { +- server->appendMessageToFrontmost(i18n("Error"),i18n("%1: No such nick/channel.").tqarg(parameterList[1])); ++ server->appendMessageToFrontmost(i18n("Error"),i18n("%1: No such nick/channel.").arg(parameterList[1])); + } + else if(getAutomaticRequest("WHOIS",parameterList[1])==0) //Display message only if this was not an automatic request. + { +- server->appendMessageToFrontmost(i18n("Error"),i18n("No such nick: %1.").tqarg(parameterList[1])); ++ server->appendMessageToFrontmost(i18n("Error"),i18n("No such nick: %1.").arg(parameterList[1])); + setAutomaticRequest("DNS", parameterList[1], false); + } + +@@ -1008,7 +1008,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + // Display message only if this was not an automatic request. + if(getAutomaticRequest("WHOIS",parameterList[1])==0) + { +- server->appendMessageToFrontmost(i18n("Error"),i18n("%1: No such channel.").tqarg(parameterList[1])); ++ server->appendMessageToFrontmost(i18n("Error"),i18n("%1: No such channel.").arg(parameterList[1])); + } + break; + } +@@ -1036,7 +1036,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + server->obtainNickInfo(server->getNickname()) ; + server->renameNick(server->getNickname(), newNick); + // Show message +- server->appendMessageToFrontmost(i18n("Nick"), i18n("Nickname already in use. Trying %1.").tqarg(newNick)); ++ server->appendMessageToFrontmost(i18n("Nick"), i18n("Nickname already in use. Trying %1.").arg(newNick)); + // Send nickchange request to the server + server->queue("NICK "+newNick); + } +@@ -1062,7 +1062,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + { + server->obtainNickInfo(server->getNickname()) ; + server->renameNick(server->getNickname(), newNick); +- server->appendMessageToFrontmost(i18n("Nick"), i18n("Erroneus nickname. Changing nick to %1." ).tqarg(newNick)) ; ++ server->appendMessageToFrontmost(i18n("Nick"), i18n("Erroneus nickname. Changing nick to %1." ).arg(newNick)) ; + server->queue("NICK "+newNick); + } + } +@@ -1070,7 +1070,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + } + case ERR_NOTONCHANNEL: + { +- server->appendMessageToFrontmost(i18n("Error"),i18n("You are not on %1.").tqarg(parameterList[1])); ++ server->appendMessageToFrontmost(i18n("Error"),i18n("You are not on %1.").arg(parameterList[1])); + + break; + } +@@ -1115,14 +1115,14 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + { + TQString current(trailing.section(' ',3)); + //TQString max(trailing.section(' ',5,5)); +- server->appendStatusMessage(i18n("Users"),i18n("Current users on the network: %1").tqarg(current)); ++ server->appendStatusMessage(i18n("Users"),i18n("Current users on the network: %1").arg(current)); + break; + } + case RPL_LOCALUSERS: // Current local users: 589 Max: 845 + { + TQString current(trailing.section(' ',3)); + //TQString max(trailing.section(' ',5,5)); +- server->appendStatusMessage(i18n("Users"),i18n("Current users on %1: %2.").tqarg(prefix).tqarg(current)); ++ server->appendStatusMessage(i18n("Users"),i18n("Current users on %1: %2.").arg(prefix).arg(current)); + break; + } + case RPL_ISON: +@@ -1145,7 +1145,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + if(getAutomaticRequest("WHOIS",parameterList[1])==0) + { + server->appendMessageToFrontmost(i18n("Away"),i18n("%1 is away: %2") +- .tqarg(parameterList[1]).tqarg(trailing) ++ .arg(parameterList[1]).arg(trailing) + ); + } + +@@ -1155,7 +1155,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("Invite"), + i18n("You invited %1 to channel %2.") +- .tqarg(parameterList[1]).tqarg(parameterList[2]) ++ .arg(parameterList[1]).arg(parameterList[2]) + ); + break; + } +@@ -1173,7 +1173,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + NickInfo* nickInfo = server->getNickInfo(parameterList[1]); + if(nickInfo) + { +- nickInfo->setHostmask(i18n("%1@%2").tqarg(parameterList[2]).tqarg(parameterList[3])); ++ nickInfo->setHostmask(i18n("%1@%2").arg(parameterList[2]).arg(parameterList[3])); + nickInfo->setRealName(trailing); + } + // Display message only if this was not an automatic request. +@@ -1184,10 +1184,10 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + escapedRealName.replace("<","<").replace(">",">"); + server->appendMessageToFrontmost(i18n("Whois"), + i18n("%1 is %2@%3 (%4)") +- .tqarg(parameterList[1]) +- .tqarg(parameterList[2]) +- .tqarg(parameterList[3]) +- .tqarg(escapedRealName), false); // Don't parse any urls ++ .arg(parameterList[1]) ++ .arg(parameterList[2]) ++ .arg(parameterList[3]) ++ .arg(escapedRealName), false); // Don't parse any urls + } + else + { +@@ -1200,17 +1200,17 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + TQString ip = resolved.first().address().nodeName(); + server->appendMessageToFrontmost(i18n("DNS"), + i18n("Resolved %1 (%2) to address: %3") +- .tqarg(parameterList[1]) +- .tqarg(parameterList[3]) +- .tqarg(ip) ++ .arg(parameterList[1]) ++ .arg(parameterList[3]) ++ .arg(ip) + ); + } + else + { + server->appendMessageToFrontmost(i18n("Error"), + i18n("Unable to resolve address for %1 (%2)") +- .tqarg(parameterList[1]) +- .tqarg(parameterList[3]) ++ .arg(parameterList[1]) ++ .arg(parameterList[3]) + ); + } + +@@ -1235,7 +1235,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + // Prints "psn is an identified user" + //server->appendStatusMessage(i18n("Whois"),parameterList.join(" ").section(' ',1)+' '+trailing); + // The above line works fine, but can't be i18n'ised. So use the below instead.. I hope this is okay. +- server->appendMessageToFrontmost(i18n("Whois"), i18n("%1 is an identified user.").tqarg(parameterList[1])); ++ server->appendMessageToFrontmost(i18n("Whois"), i18n("%1 is an identified user.").arg(parameterList[1])); + } + break; + } +@@ -1250,7 +1250,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + bool bAway = parameterList[6].upper().startsWith("G"); + if(nickInfo) + { +- nickInfo->setHostmask(i18n("%1@%2").tqarg(parameterList[2]).tqarg(parameterList[3])); ++ nickInfo->setHostmask(i18n("%1@%2").arg(parameterList[2]).arg(parameterList[3])); + //Strip off the "0 " + nickInfo->setRealName(trailing.section(" ", 1)); + nickInfo->setAway(bAway); +@@ -1265,11 +1265,11 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + if(getAutomaticRequest("WHO",whoRequestList.front())==0) + { + server->appendMessageToFrontmost(i18n("Who"), +- i18n("%1 is %2@%3 (%4)%5").tqarg(parameterList[5]) +- .tqarg(parameterList[2]) +- .tqarg(parameterList[3]) +- .tqarg(trailing.section(" ", 1)) +- .tqarg(bAway?i18n(" (Away)"):TQString()) ++ i18n("%1 is %2@%3 (%4)%5").arg(parameterList[5]) ++ .arg(parameterList[2]) ++ .arg(parameterList[3]) ++ .arg(trailing.section(" ", 1)) ++ .arg(bAway?i18n(" (Away)"):TQString()) + , false); // Don't parse as url + } + } +@@ -1287,7 +1287,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("Who"), + i18n("End of /WHO list for %1") +- .tqarg(parameterList[1])); ++ .arg(parameterList[1])); + } + else + { +@@ -1372,43 +1372,43 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("Whois"), + i18n("%1 is a user on channels: %2") +- .tqarg(parameterList[1]) +- .tqarg(userChannels.join(" ")) ++ .arg(parameterList[1]) ++ .arg(userChannels.join(" ")) + ); + } + if(voiceChannels.count()) + { + server->appendMessageToFrontmost(i18n("Whois"), + i18n("%1 has voice on channels: %2") +- .tqarg(parameterList[1]).tqarg(voiceChannels.join(" ")) ++ .arg(parameterList[1]).arg(voiceChannels.join(" ")) + ); + } + if(halfopChannels.count()) + { + server->appendMessageToFrontmost(i18n("Whois"), + i18n("%1 is a halfop on channels: %2") +- .tqarg(parameterList[1]).tqarg(halfopChannels.join(" ")) ++ .arg(parameterList[1]).arg(halfopChannels.join(" ")) + ); + } + if(opChannels.count()) + { + server->appendMessageToFrontmost(i18n("Whois"), + i18n("%1 is an operator on channels: %2") +- .tqarg(parameterList[1]).tqarg(opChannels.join(" ")) ++ .arg(parameterList[1]).arg(opChannels.join(" ")) + ); + } + if(ownerChannels.count()) + { + server->appendMessageToFrontmost(i18n("Whois"), + i18n("%1 is owner of channels: %2") +- .tqarg(parameterList[1]).tqarg(ownerChannels.join(" ")) ++ .arg(parameterList[1]).arg(ownerChannels.join(" ")) + ); + } + if(adminChannels.count()) + { + server->appendMessageToFrontmost(i18n("Whois"), + i18n("%1 is admin on channels: %2") +- .tqarg(parameterList[1]).tqarg(adminChannels.join(" ")) ++ .arg(parameterList[1]).arg(adminChannels.join(" ")) + ); + } + } +@@ -1430,8 +1430,8 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + if(getAutomaticRequest("WHOIS",parameterList[1])==0) + { + server->appendMessageToFrontmost(i18n("Whois"), +- i18n("%1 is online via %2 (%3).").tqarg(parameterList[1]) +- .tqarg(parameterList[2]).tqarg(trailing) ++ i18n("%1 is online via %2 (%3).").arg(parameterList[1]) ++ .arg(parameterList[2]).arg(trailing) + ); + } + break; +@@ -1443,7 +1443,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("Whois"), + i18n("%1 is available for help.") +- .tqarg(parameterList[1]) ++ .arg(parameterList[1]) + ); + } + break; +@@ -1454,9 +1454,9 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + if(getAutomaticRequest("WHOIS",parameterList[1])==0) + { + if (trailing.lower().simplifyWhiteSpace().startsWith("is an irc operator")) +- server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is an IRC Operator.").tqarg(parameterList[1])); ++ server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is an IRC Operator.").arg(parameterList[1])); + else +- server->appendMessageToFrontmost(i18n("Whois"),TQString("%1 %2").tqarg(parameterList[1]).tqarg(trailing)); ++ server->appendMessageToFrontmost(i18n("Whois"),TQString("%1 %2").arg(parameterList[1]).arg(trailing)); + } + break; + } +@@ -1482,8 +1482,8 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + server->appendMessageToFrontmost(i18n("Whois"), + i18n("%1 = name of person, %2 = (x days), %3 = (x hours), %4 = (x minutes), %5 = (x seconds)", + "%1 has been idle for %2, %3, %4, and %5.") +- .tqarg(parameterList[1]) +- .tqarg(daysString).tqarg(hoursString).tqarg(minutesString).tqarg(secondsString) ++ .arg(parameterList[1]) ++ .arg(daysString).arg(hoursString).arg(minutesString).arg(secondsString) + ); + // or longer than an hour + } +@@ -1495,8 +1495,8 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + server->appendMessageToFrontmost(i18n("Whois"), + i18n("%1 = name of person, %2 = (x hours), %3 = (x minutes), %4 = (x seconds)", + "%1 has been idle for %2, %3, and %4.") +- .tqarg(parameterList[1]) +- .tqarg(hoursString).tqarg(minutesString).tqarg(secondsString) ++ .arg(parameterList[1]) ++ .arg(hoursString).arg(minutesString).arg(secondsString) + ); + // or longer than a minute + } +@@ -1507,8 +1507,8 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + server->appendMessageToFrontmost(i18n("Whois"), + i18n("%1 = name of person, %2 = (x minutes), %3 = (x seconds)", + "%1 has been idle for %2 and %3.") +- .tqarg(parameterList[1]) +- .tqarg(minutesString).tqarg(secondsString) ++ .arg(parameterList[1]) ++ .arg(minutesString).arg(secondsString) + ); + // or just some seconds + } +@@ -1516,7 +1516,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("Whois"), + i18n("%1 has been idle for 1 second.", "%1 has been idle for %n seconds.", seconds) +- .tqarg(parameterList[1]) ++ .arg(parameterList[1]) + ); + } + } +@@ -1535,7 +1535,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("Whois"), + i18n("%1 has been online since %2.") +- .tqarg(parameterList[1]).tqarg(when.toString(Qt::LocalDate)) ++ .arg(parameterList[1]).arg(when.toString(Qt::LocalDate)) + ); + } + } +@@ -1586,10 +1586,10 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + { + server->appendMessageToFrontmost(i18n("Userhost"), + i18n("%1 = nick, %2 = shows if nick is op, %3 = hostmask, %4 = shows away", "%1%2 is %3%4.") +- .tqarg(nick) +- .tqarg((ircOp) ? i18n(" (IRC Operator)") : TQString()) +- .tqarg(mask) +- .tqarg((away) ? i18n(" (away)") : TQString())); ++ .arg(nick) ++ .arg((ircOp) ? i18n(" (IRC Operator)") : TQString()) ++ .arg(mask) ++ .arg((away) ? i18n(" (away)") : TQString())); + } + + // was this an automatic request? +@@ -1614,7 +1614,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + { + TQString message; + message=i18n("%1 (%n user): %2", "%1 (%n users): %2", parameterList[2].toInt()); +- server->appendMessageToFrontmost(i18n("List"),message.tqarg(parameterList[1]).tqarg(trailing)); ++ server->appendMessageToFrontmost(i18n("List"),message.arg(parameterList[1]).arg(trailing)); + } + else // send them to /LIST window + { +@@ -1668,7 +1668,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + TQDateTime when; + when.setTime_t(parameterList[4].toUInt()); + +- server->appendMessageToFrontmost(i18n("BanList:%1").tqarg(parameterList[1]), i18n("BanList message: e.g. *!*@aol.com set by MrGrim on ", "%1 set by %2 on %3").tqarg(parameterList[2]).tqarg(parameterList[3].section('!', 0, 0)).tqarg(when.toString(Qt::LocalDate))); ++ server->appendMessageToFrontmost(i18n("BanList:%1").arg(parameterList[1]), i18n("BanList message: e.g. *!*@aol.com set by MrGrim on ", "%1 set by %2 on %3").arg(parameterList[2]).arg(parameterList[3].section('!', 0, 0)).arg(when.toString(Qt::LocalDate))); + } + break; + } +@@ -1678,7 +1678,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + { + setAutomaticRequest("BANLIST", parameterList[1], false); + } else { +- server->appendMessageToFrontmost(i18n("BanList:%1").tqarg(parameterList[1]), i18n("End of Ban List.")); ++ server->appendMessageToFrontmost(i18n("BanList:%1").arg(parameterList[1]), i18n("End of Ban List.")); + } + break; + } +@@ -1706,7 +1706,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + } + case ERR_UNAVAILRESOURCE: + { +- server->appendMessageToFrontmost(i18n("Error"),i18n("%1 is currently unavailable.").tqarg(parameterList[1])); ++ server->appendMessageToFrontmost(i18n("Error"),i18n("%1 is currently unavailable.").arg(parameterList[1])); + + break; + } +@@ -1722,7 +1722,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + } + case ERR_UNKNOWNCOMMAND: + { +- server->appendMessageToFrontmost(i18n("Error"),i18n("%1: Unknown command.").tqarg(parameterList[1])); ++ server->appendMessageToFrontmost(i18n("Error"),i18n("%1: Unknown command.").arg(parameterList[1])); + + break; + } +@@ -1734,7 +1734,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com + } + case ERR_NEEDMOREPARAMS: + { +- server->appendMessageToFrontmost(i18n("Error"),i18n("%1: This command requires more parameters.").tqarg(parameterList[1])); ++ server->appendMessageToFrontmost(i18n("Error"),i18n("%1: This command requires more parameters.").arg(parameterList[1])); + + break; + } +@@ -1776,7 +1776,7 @@ void InputFilter::parseModes(const TQString &sourceNick, const TQStringList &par + } + else + { //XXX someone might care about the potentially unnecessary plural here +- message = TQString("%1 %2 %3").tqarg(sourceNick).tqarg(i18n("has changed your personal modes:")).tqarg(modestring); ++ message = TQString("%1 %2 %3").arg(sourceNick).arg(i18n("has changed your personal modes:")).arg(modestring); + } + } + if (!message.isEmpty()) +diff --git a/konversation/src/irccolorchooserui.ui b/konversation/src/irccolorchooserui.ui +index 00a3cae..3bfd4f7 100644 +--- a/konversation/src/irccolorchooserui.ui ++++ b/konversation/src/irccolorchooserui.ui +@@ -32,7 +32,7 @@ + + Preview + +- ++ + AlignCenter + + +diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp +index 20d3edf..e76b032 100644 +--- a/konversation/src/ircinput.cpp ++++ b/konversation/src/ircinput.cpp +@@ -476,7 +476,7 @@ bool IRCInput::checkPaste(TQString& text) + (this, + i18n("You are attempting to paste a large portion of text (%1 bytes or %2 lines) into " + "the chat. This can cause connection resets or flood kills. " +- "Do you really want to continue?").tqarg(text.length()).tqarg(lines+1), ++ "Do you really want to continue?").arg(text.length()).arg(lines+1), + i18n("Large Paste Warning"), + i18n("Paste"), + i18n("&Edit..."), +diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp +index fb57094..94a10b5 100644 +--- a/konversation/src/ircview.cpp ++++ b/konversation/src/ircview.cpp +@@ -267,7 +267,7 @@ void IRCView::highlightedSlot(const TQString& _link) + m_currentNick = link.mid(1); + m_nickPopup->changeTitle(m_nickPopupId,m_currentNick); + m_isOnNick = true; +- emit setStatusBarTempText(i18n("Open a query with %1").tqarg(m_currentNick)); ++ emit setStatusBarTempText(i18n("Open a query with %1").arg(m_currentNick)); + } + else + { +@@ -284,7 +284,7 @@ void IRCView::highlightedSlot(const TQString& _link) + + m_channelPopup->changeTitle(m_channelPopupId,prettyId); + m_isOnChannel = true; +- emit setStatusBarTempText(i18n("Join the channel %1").tqarg(m_currentChannel)); ++ emit setStatusBarTempText(i18n("Join the channel %1").arg(m_currentChannel)); + } + } + +@@ -353,7 +353,7 @@ void IRCView::replaceDecoration(TQString& line, char decoration, char replacemen + + while((pos=line.find(decoration))!=-1) + { +- line.replace(pos,1,(decorated) ? TQString("").tqarg(replacement) : TQString("<%1>").tqarg(replacement)); ++ line.replace(pos,1,(decorated) ? TQString("").arg(replacement) : TQString("<%1>").arg(replacement)); + decorated = !decorated; + } + } +@@ -573,7 +573,7 @@ bool doHighlight, bool parseURL, bool self) + // replace %0 - %9 in regex groups + for(unsigned int capture=0;capture%1" + nickLine + " %3

\n"; + } + +- line = line.tqarg(timeStamp(), nick, filter(message, channelColor, nick, true)); ++ line = line.arg(timeStamp(), nick, filter(message, channelColor, nick, true)); + +- emit textToLog(TQString("<%1>\t%2").tqarg(nick).tqarg(message)); ++ emit textToLog(TQString("<%1>\t%2").arg(nick).arg(message)); + + doAppend(line); + } +@@ -874,9 +874,9 @@ void IRCView::appendQuery(const TQString& nick, const TQString& message, bool in + line = "

%1 " + nickLine + " %3

\n"; + } + +- line = line.tqarg(timeStamp(), nick, filter(message, queryColor, nick, true)); ++ line = line.arg(timeStamp(), nick, filter(message, queryColor, nick, true)); + +- emit textToLog(TQString("<%1>\t%2").tqarg(nick).tqarg(message)); ++ emit textToLog(TQString("<%1>\t%2").arg(nick).arg(message)); + + doAppend(line); + } +@@ -917,9 +917,9 @@ void IRCView::appendAction(const TQString& nick,const TQString& message) + line = "

%1 * " + nickLine + " %3

\n"; + } + +- line = line.tqarg(timeStamp(), nick, filter(message, actionColor, nick, true)); ++ line = line.arg(timeStamp(), nick, filter(message, actionColor, nick, true)); + +- emit textToLog(TQString("\t * %1 %2").tqarg(nick).tqarg(message)); ++ emit textToLog(TQString("\t * %1 %2").arg(nick).arg(message)); + + doAppend(line); + } +@@ -951,11 +951,11 @@ void IRCView::appendServerMessage(const TQString& type, const TQString& message, + } + + if(type != i18n("Notify")) +- line = line.tqarg(timeStamp(), type, filter(message, serverColor, 0 , true, parseURL)); ++ line = line.arg(timeStamp(), type, filter(message, serverColor, 0 , true, parseURL)); + else +- line = ""+line.tqarg(timeStamp(), type, message)+""; ++ line = ""+line.arg(timeStamp(), type, message)+""; + +- emit textToLog(TQString("%1\t%2").tqarg(type).tqarg(message)); ++ emit textToLog(TQString("%1\t%2").arg(type).arg(message)); + + doAppend(line); + } +@@ -993,9 +993,9 @@ void IRCView::appendCommandMessage(const TQString& type,const TQString& message, + line = "

%1 %2 %3

\n"; + } + +- line = line.tqarg(timeStamp(), prefix, filter(message, commandColor, 0, true, parseURL, self)); ++ line = line.arg(timeStamp(), prefix, filter(message, commandColor, 0, true, parseURL, self)); + +- emit textToLog(TQString("%1\t%2").tqarg(type).tqarg(message)); ++ emit textToLog(TQString("%1\t%2").arg(type).arg(message)); + + doAppend(line, self); + } +@@ -1031,7 +1031,7 @@ void IRCView::appendBacklogMessage(const TQString& firstColumn,const TQString& r + line = "

%1 %2 %3

\n"; + } + +- line = line.tqarg(time, nick, filter(message, backlogColor, NULL, false, false)); ++ line = line.arg(time, nick, filter(message, backlogColor, NULL, false, false)); + + doAppend(line); + } +@@ -1251,7 +1251,7 @@ void IRCView::contentsMouseMoveEvent(TQMouseEvent* ev) + if (m_server && m_urlToDrag.startsWith("##")) + { + //FIXME consistent IRC URL serialization +- ux = TQString("irc://%1:%2/%3").tqarg(m_server->getServerName()).tqarg(m_server->getPort()).tqarg(m_urlToDrag.mid(2)); ++ ux = TQString("irc://%1:%2/%3").arg(m_server->getServerName()).arg(m_server->getPort()).arg(m_urlToDrag.mid(2)); + } + else if (m_urlToDrag.startsWith("#")) + { +@@ -1545,7 +1545,7 @@ void IRCView::searchAgain() + + if(!find(m_pattern, m_caseSensitive, m_wholeWords, m_forward, &m_findParagraph, &m_findIndex)) + { +- KMessageBox::information(this,i18n("No matches found for \"%1\".").tqarg(m_pattern),i18n("Information")); ++ KMessageBox::information(this,i18n("No matches found for \"%1\".").arg(m_pattern),i18n("Information")); + } + + } +@@ -1705,14 +1705,14 @@ TQString IRCView::timeStamp() + + if(!Preferences::showDate()) + { +- timeString = TQString("[%1] ").tqarg(time.toString(timeFormat)); ++ timeString = TQString("[%1] ").arg(time.toString(timeFormat)); + } + else + { + TQDate date = TQDate::currentDate(); + timeString = TQString("[%1 %2] ") +- .tqarg(KGlobal::locale()->formatDate(date, true /*short format*/), ++ .arg(KGlobal::locale()->formatDate(date, true /*short format*/), + time.toString(timeFormat)); + } + +diff --git a/konversation/src/joinchanneldialog.cpp b/konversation/src/joinchanneldialog.cpp +index 63ad6c3..d50eb8c 100644 +--- a/konversation/src/joinchanneldialog.cpp ++++ b/konversation/src/joinchanneldialog.cpp +@@ -26,7 +26,7 @@ namespace Konversation + { + + JoinChannelDialog::JoinChannelDialog(Server* server, TQWidget *parent, const char *name) +- : KDialogBase(parent, name, true, i18n("Join Channel on %1").tqarg(server->getDisplayName()), Ok|Cancel, Ok) ++ : KDialogBase(parent, name, true, i18n("Join Channel on %1").arg(server->getDisplayName()), Ok|Cancel, Ok) + { + m_server = server; + m_widget = new JoinChannelUI(this); +diff --git a/konversation/src/konvdcop.cpp b/konversation/src/konvdcop.cpp +index b6e4b2a..e0054af 100644 +--- a/konversation/src/konvdcop.cpp ++++ b/konversation/src/konvdcop.cpp +@@ -128,13 +128,13 @@ void KonvDCOP::info(const TQString& string) + void KonvDCOP::debug(const TQString& string) + { + kdDebug() << "KonvDCOP::debug()" << endl; +- emit dcopInfo(TQString("Debug: %1").tqarg(string)); ++ emit dcopInfo(TQString("Debug: %1").arg(string)); + } + + void KonvDCOP::error(const TQString& string) + { + kdDebug() << "KonvDCOP::error()" << endl; +- emit dcopInfo(TQString("Error: %1").tqarg(string)); ++ emit dcopInfo(TQString("Error: %1").arg(string)); + } + + void KonvDCOP::insertMarkerLine() +@@ -153,7 +153,7 @@ TQString KonvDCOP::getNickname(const TQString& serverName) + + if (!server) + { +- error( i18n( "getNickname: Server %1 is not found." ).tqarg( serverName ) ); ++ error( i18n( "getNickname: Server %1 is not found." ).arg( serverName ) ); + return TQString(); + } + +diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp +index 083a1ee..c1a489f 100644 +--- a/konversation/src/konversationapplication.cpp ++++ b/konversation/src/konversationapplication.cpp +@@ -446,9 +446,9 @@ void KonversationApplication::readOptions() + TQStringList buttonList(Preferences::quickButtonList()); + // Read all quick buttons + int index=0; +- while(config->hasKey(TQString("Button%1").tqarg(index))) ++ while(config->hasKey(TQString("Button%1").arg(index))) + { +- buttonList.append(config->readEntry(TQString("Button%1").tqarg(index++))); ++ buttonList.append(config->readEntry(TQString("Button%1").arg(index++))); + } // while + // Put back the changed button list + Preferences::setQuickButtonList(buttonList); +@@ -462,10 +462,10 @@ void KonversationApplication::readOptions() + TQStringList autoreplaceList(Preferences::autoreplaceList()); + // Read all entries + index=0; +- while(config->hasKey(TQString("Autoreplace%1").tqarg(index))) ++ while(config->hasKey(TQString("Autoreplace%1").arg(index))) + { + // read entry and get length of the string +- TQString entry=config->readEntry(TQString("Autoreplace%1").tqarg(index++)); ++ TQString entry=config->readEntry(TQString("Autoreplace%1").arg(index++)); + unsigned int length=entry.length()-1; + // if there's a "#" in the end, strip it (used to preserve blanks at the end of the replacement text) + // there should always be one, but older versions did not do it, so we check first +@@ -494,9 +494,9 @@ void KonversationApplication::readOptions() + { + int i = 0; + +- while(config->hasGroup(TQString("Highlight%1").tqarg(i))) ++ while(config->hasGroup(TQString("Highlight%1").arg(i))) + { +- config->setGroup(TQString("Highlight%1").tqarg(i)); ++ config->setGroup(TQString("Highlight%1").arg(i)); + Preferences::addHighlight(config->readEntry("Pattern"), + config->readBoolEntry("RegExp"), + config->readColorEntry("Color"), +@@ -512,9 +512,9 @@ void KonversationApplication::readOptions() + if(config->hasKey("Ignore0")) Preferences::clearIgnoreList(); + // Read all ignores + index=0; +- while(config->hasKey(TQString("Ignore%1").tqarg(index))) ++ while(config->hasKey(TQString("Ignore%1").arg(index))) + { +- Preferences::addIgnore(config->readEntry(TQString("Ignore%1").tqarg(index++))); ++ Preferences::addIgnore(config->readEntry(TQString("Ignore%1").arg(index++))); + } + + // Aliases +@@ -563,7 +563,7 @@ void KonversationApplication::saveOptions(bool updateGUI) + for(IdentityList::ConstIterator it = identityList.begin(); it != identityList.end(); ++it) + { + IdentityPtr identity = (*it); +- config->setGroup(TQString("Identity %1").tqarg(index)); ++ config->setGroup(TQString("Identity %1").arg(index)); + + config->writeEntry("Name",identity->getName()); + config->writeEntry("Ident",identity->getIdent()); +@@ -643,7 +643,7 @@ void KonversationApplication::saveOptions(bool updateGUI) + + for(it2 = serverlist.begin(); it2 != serverlist.end(); ++it2) + { +- groupName = TQString("Server %1").tqarg(index2); ++ groupName = TQString("Server %1").arg(index2); + servers.append(groupName); + config->setGroup(groupName); + config->writeEntry("Server", (*it2).host()); +@@ -658,7 +658,7 @@ void KonversationApplication::saveOptions(bool updateGUI) + + for(it3 = channelList.begin(); it3 != channelList.end(); ++it3) + { +- groupName = TQString("Channel %1").tqarg(index3); ++ groupName = TQString("Channel %1").arg(index3); + channels.append(groupName); + config->setGroup(groupName); + config->writeEntry("Name", (*it3).name()); +@@ -671,7 +671,7 @@ void KonversationApplication::saveOptions(bool updateGUI) + + for(it3 = channelList.begin(); it3 != channelList.end(); ++it3) + { +- groupName = TQString("Channel %1").tqarg(index3); ++ groupName = TQString("Channel %1").arg(index3); + channelHistory.append(groupName); + config->setGroup(groupName); + config->writeEntry("Name", (*it3).name()); +@@ -680,7 +680,7 @@ void KonversationApplication::saveOptions(bool updateGUI) + index3++; + } + +- config->setGroup(TQString("ServerGroup %1").tqarg(TQString::number(index).rightJustify(width,'0'))); ++ config->setGroup(TQString("ServerGroup %1").arg(TQString::number(index).rightJustify(width,'0'))); + config->writeEntry("Name", (*it)->name()); + config->writeEntry("Identity", (*it)->identity()->getName()); + config->writeEntry("ServerList", servers); +@@ -704,7 +704,7 @@ void KonversationApplication::saveOptions(bool updateGUI) + index=0; + while(item) + { +- config->writeEntry(TQString("Ignore%1").tqarg(index),TQString("%1,%2").tqarg(item->getName()).tqarg(item->getFlags())); ++ config->writeEntry(TQString("Ignore%1").arg(index),TQString("%1,%2").arg(item->getName()).arg(item->getFlags())); + item=ignoreList.next(); + index++; + } +@@ -861,7 +861,7 @@ TQString KonversationApplication::doAutoreplace(const TQString& text,bool output + // replace %0 - %9 in regex groups + for(unsigned int capture=0;capturesetMapping( tabSelectionAction, i-1); + } + +@@ -487,7 +487,7 @@ void KonversationMainWindow::toggleMenubar(bool dontShowWarning) + { + TQString accel = hideMenuBarAction->shortcut().toString(); + KMessageBox::information(this, +- i18n("This will hide the menu bar completely. You can show it again by typing %1.").tqarg(accel), ++ i18n("This will hide the menu bar completely. You can show it again by typing %1.").arg(accel), + "Hide menu bar","HideMenuBarWarning"); + } + menuBar()->hide(); +diff --git a/konversation/src/konversationstatusbar.cpp b/konversation/src/konversationstatusbar.cpp +index bd8e61e..bdfc9ca 100644 +--- a/konversation/src/konversationstatusbar.cpp ++++ b/konversation/src/konversationstatusbar.cpp +@@ -148,9 +148,9 @@ void KonversationStatusBar::updateLagLabel(Server* lagServer, int msec) + if (msec == -1) + lagString += i18n("Lag: Unknown"); + else if (msec < 1000) +- lagString += i18n("Lag: %1 ms").tqarg(msec); ++ lagString += i18n("Lag: %1 ms").arg(msec); + else +- lagString += i18n("Lag: %1 s").tqarg(msec / 1000); ++ lagString += i18n("Lag: %1 s").arg(msec / 1000); + + m_lagLabel->setText(lagString); + +@@ -179,8 +179,8 @@ void KonversationStatusBar::setTooLongLag(Server* lagServer, int msec) + const TQString hoursString = i18n("1 hour", "%n hours", (hours % 24)); + const TQString minutesString = i18n("1 minute", "%n minutes", (minutes % 60)); + const TQString secondsString = i18n("1 second", "%n seconds", (seconds % 60)); +- lagString = i18n("%1 = name of server, %2 = (x days), %3 = (x hours), %4 = (x minutes), %5 = (x seconds)", "No answer from server %1 for more than %2, %3, %4, and %5.").tqarg(lagServer->getServerName()) +- .tqarg(daysString).tqarg(hoursString).tqarg(minutesString).tqarg(secondsString); ++ lagString = i18n("%1 = name of server, %2 = (x days), %3 = (x hours), %4 = (x minutes), %5 = (x seconds)", "No answer from server %1 for more than %2, %3, %4, and %5.").arg(lagServer->getServerName()) ++ .arg(daysString).arg(hoursString).arg(minutesString).arg(secondsString); + // or longer than an hour + } + else if (hours) +@@ -188,21 +188,21 @@ void KonversationStatusBar::setTooLongLag(Server* lagServer, int msec) + const TQString hoursString = i18n("1 hour", "%n hours", hours); + const TQString minutesString = i18n("1 minute", "%n minutes", (minutes % 60)); + const TQString secondsString = i18n("1 second", "%n seconds", (seconds % 60)); +- lagString = i18n("%1 = name of server, %2 = (x hours), %3 = (x minutes), %4 = (x seconds)", "No answer from server %1 for more than %2, %3, and %4.").tqarg(lagServer->getServerName()) +- .tqarg(hoursString).tqarg(minutesString).tqarg(secondsString); ++ lagString = i18n("%1 = name of server, %2 = (x hours), %3 = (x minutes), %4 = (x seconds)", "No answer from server %1 for more than %2, %3, and %4.").arg(lagServer->getServerName()) ++ .arg(hoursString).arg(minutesString).arg(secondsString); + // or longer than a minute + } + else if (minutes) + { + const TQString minutesString = i18n("1 minute", "%n minutes", minutes); + const TQString secondsString = i18n("1 second", "%n seconds", (seconds % 60)); +- lagString = i18n("%1 = name of server, %2 = (x minutes), %3 = (x seconds)", "No answer from server %1 for more than %2 and %3.").tqarg(lagServer->getServerName()) +- .tqarg(minutesString).tqarg(secondsString); ++ lagString = i18n("%1 = name of server, %2 = (x minutes), %3 = (x seconds)", "No answer from server %1 for more than %2 and %3.").arg(lagServer->getServerName()) ++ .arg(minutesString).arg(secondsString); + // or just some seconds + } + else + { +- lagString = i18n("No answer from server %1 for more than 1 second.", "No answer from server %1 for more than %n seconds.", seconds).tqarg(lagServer->getServerName()); ++ lagString = i18n("No answer from server %1 for more than 1 second.", "No answer from server %1 for more than %n seconds.", seconds).arg(lagServer->getServerName()); + } + + setMainLabelText(lagString); +@@ -211,7 +211,7 @@ void KonversationStatusBar::setTooLongLag(Server* lagServer, int msec) + if (lagServer==m_window->getViewContainer()->getFrontServer()) + { + TQString lagString = lagServer->getServerName() + " - "; +- lagString.append(i18n("Lag: %1 s").tqarg(msec/1000)); ++ lagString.append(i18n("Lag: %1 s").arg(msec/1000)); + + if (m_lagLabel->isHidden()) m_lagLabel->show(); + m_lagLabel->setText(lagString); +diff --git a/konversation/src/linkaddressbook/addressbook.cpp b/konversation/src/linkaddressbook/addressbook.cpp +index 7d09c49..1b8f4cb 100644 +--- a/konversation/src/linkaddressbook/addressbook.cpp ++++ b/konversation/src/linkaddressbook/addressbook.cpp +@@ -226,7 +226,7 @@ namespace Konversation + { + TQString user = addressee.fullEmail(); + if(!user.isEmpty()) user = " (" + user + ')'; +- focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation for instant messaging, but the requested user%1 is not online.").tqarg(user)); ++ focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation for instant messaging, but the requested user%1 is not online.").arg(user)); + return; + } + +@@ -286,7 +286,7 @@ void Addressbook::sendFile(const TQString &uid, const KURL &sourceURL, const TQS + { + TQString user = addressee.fullEmail(); + if(!user.isEmpty()) user = " (" + user + ')'; +- focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation to send a file to a contact, but the requested user%1 is not currently online.").tqarg(user)); ++ focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation to send a file to a contact, but the requested user%1 is not currently online.").arg(user)); + return; + } + nickInfo->getServer()->addDccSend(nickInfo->getNickname(), sourceURL, altFileName, fileSize); +diff --git a/konversation/src/linkaddressbook/addressbook_base.cpp b/konversation/src/linkaddressbook/addressbook_base.cpp +index 91cdba2..48f6973 100644 +--- a/konversation/src/linkaddressbook/addressbook_base.cpp ++++ b/konversation/src/linkaddressbook/addressbook_base.cpp +@@ -463,9 +463,9 @@ namespace Konversation + else + { + if(nicksWithoutAddressee.count() > 1) +- message = i18n("Some of the contacts (%1) that you have selected are not associated with addressbook contacts. ").tqarg(nicksWithoutAddressee.join(", ")); ++ message = i18n("Some of the contacts (%1) that you have selected are not associated with addressbook contacts. ").arg(nicksWithoutAddressee.join(", ")); + else +- message = i18n("One of the contacts (%1) that you have selected is not associated with an addressbook contact. ").tqarg(nicksWithoutAddressee.join(", ")); ++ message = i18n("One of the contacts (%1) that you have selected is not associated with an addressbook contact. ").arg(nicksWithoutAddressee.join(", ")); + } + message += i18n("You can right click on a contact, and choose to edit the Addressbook Associations to link them to a contact in your addressbook."); + } +@@ -481,15 +481,15 @@ namespace Konversation + else + { + if(nicksWithoutEmails.count() > 1) +- message = i18n("Some of the contacts (%1) that you have selected do not have an email address associated with them. ").tqarg(nicksWithoutEmails.join(", ")); ++ message = i18n("Some of the contacts (%1) that you have selected do not have an email address associated with them. ").arg(nicksWithoutEmails.join(", ")); + else +- message = i18n("One of the contacts (%1) that you have selected does not have an email address associated with them. ").tqarg(nicksWithoutEmails.join(", ")); ++ message = i18n("One of the contacts (%1) that you have selected does not have an email address associated with them. ").arg(nicksWithoutEmails.join(", ")); + } + message += i18n("You can right click on a contact, and choose to edit the addressbook contact, adding an email for them."); + } + else + { +- message = i18n("Some of the contacts (%1) that you have selected are not associated with addressbook contacts, and some of the contacts (%2) do not have an email address associated with them. ").tqarg(nicksWithoutAddressee.join(", ").tqarg(nicksWithoutEmails.join(", "))); ++ message = i18n("Some of the contacts (%1) that you have selected are not associated with addressbook contacts, and some of the contacts (%2) do not have an email address associated with them. ").arg(nicksWithoutAddressee.join(", ").arg(nicksWithoutEmails.join(", "))); + message += i18n("You can right click on a contact, and choose to edit the Addressbook Associations to link them to a contact in your addressbook, and choose to edit the addressbook contact, adding an email for them."); + } + if(nicksWithEmails.isEmpty()) +diff --git a/konversation/src/linkaddressbook/linkaddressbookui.cpp b/konversation/src/linkaddressbook/linkaddressbookui.cpp +index 6968f4d..e6fe29e 100644 +--- a/konversation/src/linkaddressbook/linkaddressbookui.cpp ++++ b/konversation/src/linkaddressbook/linkaddressbookui.cpp +@@ -115,13 +115,13 @@ void LinkAddressbookUI::slotLoadAddressees() + /*AddresseeItem *item =*/ new AddresseeItem( m_mainWidget->addresseeListView, (*it)); + + if(num_contacts_with_nick == 0) +- m_mainWidget->lblHeader->setText(i18n("Choose the person who '%1' is.").tqarg(m_ircnick)); ++ m_mainWidget->lblHeader->setText(i18n("Choose the person who '%1' is.").arg(m_ircnick)); + else if(num_contacts_with_nick == 1 && realname.isEmpty()) +- m_mainWidget->lblHeader->setText(i18n("Currently '%1' is associated with a contact.").tqarg(m_ircnick)); ++ m_mainWidget->lblHeader->setText(i18n("Currently '%1' is associated with a contact.").arg(m_ircnick)); + else if(num_contacts_with_nick == 1 && !realname.isEmpty()) +- m_mainWidget->lblHeader->setText(i18n("Currently '%1' is associated with contact '%2'.").tqarg(m_ircnick).tqarg(realname)); ++ m_mainWidget->lblHeader->setText(i18n("Currently '%1' is associated with contact '%2'.").arg(m_ircnick).arg(realname)); + else +- m_mainWidget->lblHeader->setText(i18n("Warning: '%1' is currently being listed as belonging to multiple contacts. Please select the correct contact.").tqarg(m_ircnick)); ++ m_mainWidget->lblHeader->setText(i18n("Warning: '%1' is currently being listed as belonging to multiple contacts. Please select the correct contact.").arg(m_ircnick)); + + } + +diff --git a/konversation/src/logfilereader.cpp b/konversation/src/logfilereader.cpp +index 74ea0e8..5e14f64 100644 +--- a/konversation/src/logfilereader.cpp ++++ b/konversation/src/logfilereader.cpp +@@ -111,8 +111,8 @@ void LogfileReader::updateView() + stream.setEncoding(TQTextStream::UnicodeUTF8); + + // Set file pointer to bytes from the end +- if(stream.tqdevice()->size()>pos) +- stream.tqdevice()->at(stream.tqdevice()->size()-pos); ++ if(stream.device()->size()>pos) ++ stream.device()->at(stream.device()->size()-pos); + // Skip first line, since it may be incomplete + stream.readLine(); + TQString str; +diff --git a/konversation/src/nick.cpp b/konversation/src/nick.cpp +index 3226d2e..640003a 100644 +--- a/konversation/src/nick.cpp ++++ b/konversation/src/nick.cpp +@@ -124,7 +124,7 @@ void Nick::refresh() + } + + setText(2, calculateLabel2()); +- tqrepaint(); ++ repaint(); + + if(m_flags != flags) + { +diff --git a/konversation/src/nicksonline.cpp b/konversation/src/nicksonline.cpp +index 1dd88f2..47a79e8 100644 +--- a/konversation/src/nicksonline.cpp ++++ b/konversation/src/nicksonline.cpp +@@ -249,12 +249,12 @@ bool& needWhois) + niInfo += " (" + nickInfo->getRealName() + ')'; + if (!nickInfo->getNetServer().isEmpty()) + { +- niInfo += i18n( " online via %1" ).tqarg( nickInfo->getNetServer() ); ++ niInfo += i18n( " online via %1" ).arg( nickInfo->getNetServer() ); + if (!nickInfo->getNetServerInfo().isEmpty()) + niInfo += " (" + nickInfo->getNetServerInfo() + ')'; + } + if (!nickInfo->getOnlineSince().isNull()) +- niInfo += i18n( " since %1" ).tqarg( nickInfo->getPrettyOnlineSince() ); ++ niInfo += i18n( " since %1" ).arg( nickInfo->getPrettyOnlineSince() ); + } + needWhois = niInfo.isEmpty(); + if (!info.isEmpty() && !needWhois) info += ' '; +diff --git a/konversation/src/notificationhandler.cpp b/konversation/src/notificationhandler.cpp +index ea5c8ef..7b615e0 100644 +--- a/konversation/src/notificationhandler.cpp ++++ b/konversation/src/notificationhandler.cpp +@@ -50,7 +50,7 @@ namespace Konversation + TQString cleanedMessage = TQStyleSheet::escape(Konversation::removeIrcMarkup(message)); + TQString cutup = addLineBreaks(cleanedMessage); + +- KNotifyClient::event(m_mainWindow->winId(), "message", TQString("<%1> %2").tqarg(fromNick).tqarg(cutup)); ++ KNotifyClient::event(m_mainWindow->winId(), "message", TQString("<%1> %2").arg(fromNick).arg(cutup)); + + if(!Preferences::trayNotifyOnlyOwnNick()) + { +@@ -76,7 +76,7 @@ namespace Konversation + TQString cleanedMessage = TQStyleSheet::escape(Konversation::removeIrcMarkup(message)); + TQString cutup = addLineBreaks(cleanedMessage); + +- KNotifyClient::event(m_mainWindow->winId(), "nick", TQString("<%1> %2").tqarg(fromNick).tqarg(cutup)); ++ KNotifyClient::event(m_mainWindow->winId(), "nick", TQString("<%1> %2").arg(fromNick).arg(cutup)); + + startTrayNotification(chatWin); + +@@ -86,7 +86,7 @@ namespace Konversation + (!m_mainWindow->isActiveWindow() || + (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) + { +- konvApp->osd->showOSD(i18n("[HighLight] (%1) <%2> %3").tqarg(chatWin->getName()).tqarg(fromNick).tqarg(cleanedMessage)); ++ konvApp->osd->showOSD(i18n("[HighLight] (%1) <%2> %3").arg(chatWin->getName()).arg(fromNick).arg(cleanedMessage)); + } + } + +@@ -102,7 +102,7 @@ namespace Konversation + TQString cleanedMessage = TQStyleSheet::escape(Konversation::removeIrcMarkup(message)); + TQString cutup = addLineBreaks(cleanedMessage); + +- KNotifyClient::event(m_mainWindow->winId(), "queryMessage", TQString("<%1> %2").tqarg(fromNick).tqarg(cutup)); ++ KNotifyClient::event(m_mainWindow->winId(), "queryMessage", TQString("<%1> %2").arg(fromNick).arg(cutup)); + + startTrayNotification(chatWin); + +@@ -111,7 +111,7 @@ namespace Konversation + if(Preferences::oSDShowQuery() && (!m_mainWindow->isActiveWindow() || + (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) + { +- konvApp->osd->showOSD(i18n("[Query] <%1> %2").tqarg(fromNick).tqarg(cleanedMessage)); ++ konvApp->osd->showOSD(i18n("[Query] <%1> %2").arg(fromNick).arg(cleanedMessage)); + } + } + +@@ -135,14 +135,14 @@ namespace Konversation + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) + return; + +- KNotifyClient::event(m_mainWindow->winId(), "join", i18n("%1 joined %2").tqarg(nick, chatWin->getName())); ++ KNotifyClient::event(m_mainWindow->winId(), "join", i18n("%1 joined %2").arg(nick, chatWin->getName())); + + // OnScreen Message + if(Preferences::oSDShowChannelEvent() && + (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) + { + KonversationApplication* konvApp = static_cast(kapp); +- konvApp->osd->showOSD(i18n("%1 joined %2").tqarg(nick, chatWin->getName())); ++ konvApp->osd->showOSD(i18n("%1 joined %2").arg(nick, chatWin->getName())); + } + } + +@@ -154,14 +154,14 @@ namespace Konversation + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) + return; + +- KNotifyClient::event(m_mainWindow->winId(), "part", i18n("%1 parted %2").tqarg(nick, chatWin->getName())); ++ KNotifyClient::event(m_mainWindow->winId(), "part", i18n("%1 parted %2").arg(nick, chatWin->getName())); + + // OnScreen Message + if(Preferences::oSDShowChannelEvent() && + (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) + { + KonversationApplication* konvApp = static_cast(kapp); +- konvApp->osd->showOSD(i18n("%1 parted %2").tqarg(nick, chatWin->getName())); ++ konvApp->osd->showOSD(i18n("%1 parted %2").arg(nick, chatWin->getName())); + } + } + +@@ -173,7 +173,7 @@ namespace Konversation + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) + return; + +- KNotifyClient::event(m_mainWindow->winId(), "part", i18n("%1 quit %2").tqarg(nick, chatWin->getServer()->getServerName())); ++ KNotifyClient::event(m_mainWindow->winId(), "part", i18n("%1 quit %2").arg(nick, chatWin->getServer()->getServerName())); + } + + void NotificationHandler::nickChange(ChatWindow* chatWin, const TQString& oldNick, const TQString& newNick) +@@ -184,7 +184,7 @@ namespace Konversation + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) + return; + +- KNotifyClient::event(m_mainWindow->winId(), "nickchange", i18n("%1 changed nickname to %2").tqarg(oldNick, newNick)); ++ KNotifyClient::event(m_mainWindow->winId(), "nickchange", i18n("%1 changed nickname to %2").arg(oldNick, newNick)); + } + + void NotificationHandler::dccIncoming(ChatWindow* chatWin, const TQString& fromNick) +@@ -195,7 +195,7 @@ namespace Konversation + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) + return; + +- KNotifyClient::event(m_mainWindow->winId(), "dcc_incoming", i18n("%1 wants to send a file to you").tqarg(fromNick)); ++ KNotifyClient::event(m_mainWindow->winId(), "dcc_incoming", i18n("%1 wants to send a file to you").arg(fromNick)); + } + + void NotificationHandler::mode(ChatWindow* chatWin, const TQString& /*nick*/) +@@ -220,7 +220,7 @@ namespace Konversation + startTrayNotification(chatWin); + + KNotifyClient::event(m_mainWindow->winId(), "query", +- i18n("%1 has started a conversation (query) with you.").tqarg(fromNick)); ++ i18n("%1 has started a conversation (query) with you.").arg(fromNick)); + } + + void NotificationHandler::nickOnline(ChatWindow* chatWin, const TQString& nick) +@@ -232,7 +232,7 @@ namespace Konversation + return; + + KNotifyClient::event(m_mainWindow->winId(), "notify", +- i18n("%1 is online (%2).").tqarg(nick).tqarg(chatWin->getServer()->getServerName())); ++ i18n("%1 is online (%2).").arg(nick).arg(chatWin->getServer()->getServerName())); + } + + void NotificationHandler::nickOffline(ChatWindow* chatWin, const TQString& nick) +@@ -244,7 +244,7 @@ namespace Konversation + return; + + KNotifyClient::event(m_mainWindow->winId(), "notify", +- i18n("%1 went offline (%2).").tqarg(nick).tqarg(chatWin->getServer()->getServerName())); ++ i18n("%1 went offline (%2).").arg(nick).arg(chatWin->getServer()->getServerName())); + } + + void NotificationHandler::kick(ChatWindow* chatWin, const TQString& channel,const TQString& nick) +@@ -256,7 +256,7 @@ namespace Konversation + return; + + KNotifyClient::event(m_mainWindow->winId(), "kick", +- i18n("You are kicked by %1 from %2").tqarg(nick).tqarg(channel)); ++ i18n("You are kicked by %1 from %2").arg(nick).arg(channel)); + } + + void NotificationHandler::dccChat(ChatWindow* chatWin, const TQString& nick) +@@ -268,7 +268,7 @@ namespace Konversation + return; + + KNotifyClient::event(m_mainWindow->winId(), "dccChat", +- i18n("%1 started a dcc chat with you").tqarg(nick)); ++ i18n("%1 started a dcc chat with you").arg(nick)); + } + + void NotificationHandler::highlight(ChatWindow* chatWin, const TQString& fromNick, const TQString& message) +@@ -288,10 +288,10 @@ namespace Konversation + // if there was no nick associated, this must be a command message, so don't try displaying + // an empty nick in <> + if(fromNick.isEmpty()) +- konvApp->osd->showOSD(i18n("[HighLight] (%1) *** %2").tqarg(chatWin->getName()).tqarg(message)); ++ konvApp->osd->showOSD(i18n("[HighLight] (%1) *** %2").arg(chatWin->getName()).arg(message)); + // normal highlight message + else +- konvApp->osd->showOSD(i18n("[HighLight] (%1) <%2> %3").tqarg(chatWin->getName()).tqarg(fromNick).tqarg(message)); ++ konvApp->osd->showOSD(i18n("[HighLight] (%1) <%2> %3").arg(chatWin->getName()).arg(fromNick).arg(message)); + } + } + +@@ -301,7 +301,7 @@ namespace Konversation + return; + + KNotifyClient::event(m_mainWindow->winId(), "connectionFailure", +- i18n("Failed to connect to %1").tqarg(server)); ++ i18n("Failed to connect to %1").arg(server)); + } + + void NotificationHandler::channelJoin(ChatWindow* chatWin, const TQString& channel) +@@ -312,7 +312,7 @@ namespace Konversation + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) + return; + +- KNotifyClient::event(m_mainWindow->winId(), "channelJoin", i18n("You have joined %1.").tqarg(channel)); ++ KNotifyClient::event(m_mainWindow->winId(), "channelJoin", i18n("You have joined %1.").arg(channel)); + } + + TQString NotificationHandler::addLineBreaks(const TQString& string) +diff --git a/konversation/src/osd.cpp b/konversation/src/osd.cpp +index 8bd1745..9935576 100644 +--- a/konversation/src/osd.cpp ++++ b/konversation/src/osd.cpp +@@ -34,7 +34,7 @@ OSDWidget::OSDWidget( const TQString &appName, TQWidget *parent, const char *nam + , m_appName( appName ) + , m_duration( 5000 ) + , m_shadow( true ) +-, m_tqalignment( Middle ) ++, m_alignment( Middle ) + , m_screen( 0 ) + , m_y( MARGIN ) + , m_dirty( false ) +@@ -208,7 +208,7 @@ void OSDWidget::setOffset( int /*x*/, int y ) + + void OSDWidget::setAlignment( Alignment a ) + { +- m_tqalignment = a; ++ m_alignment = a; + reposition(); + } + +@@ -277,7 +277,7 @@ void OSDWidget::reposition( TQSize newSize ) + + //TODO m_y is the middle of the OSD, and don't exceed screen margins + +- switch ( m_tqalignment ) ++ switch ( m_alignment ) + { + case Left: + break; +@@ -371,12 +371,12 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e ) + + if( eGlobalPosX < (hcenter-snapZone) ) + { +- m_tqalignment = Left; ++ m_alignment = Left; + destination.rx() = MARGIN; + } + else if( eGlobalPosX > (hcenter+snapZone) ) + { +- m_tqalignment = Right; ++ m_alignment = Right; + destination.rx() = screen.width() - MARGIN - width(); + } + else +@@ -388,10 +388,10 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e ) + + if( eGlobalPosY >= (vcenter-snapZone) && eGlobalPosY <= (vcenter+snapZone) ) + { +- m_tqalignment = Center; ++ m_alignment = Center; + destination.ry() = vcenter - height()/2; + } +- else m_tqalignment = Middle; ++ else m_alignment = Middle; + } + + destination += screen.topLeft(); +diff --git a/konversation/src/osd.h b/konversation/src/osd.h +index f71f1d7..9dac20a 100644 +--- a/konversation/src/osd.h ++++ b/konversation/src/osd.h +@@ -48,7 +48,7 @@ class OSDWidget : public TQWidget + void unsetColors(); + + int screen() { return m_screen; } +- int tqalignment() { return m_tqalignment; } ++ int alignment() { return m_alignment; } + int y() { return m_y; } + + signals: +@@ -93,7 +93,7 @@ class OSDWidget : public TQWidget + TQString m_currentText; + bool m_shadow; + +- Alignment m_tqalignment; ++ Alignment m_alignment; + int m_screen; + uint m_y; + +diff --git a/konversation/src/osd_preferences.cpp b/konversation/src/osd_preferences.cpp +index 7a765ef..61e8115 100644 +--- a/konversation/src/osd_preferences.cpp ++++ b/konversation/src/osd_preferences.cpp +@@ -143,7 +143,7 @@ void OSD_Config::slotPositionChanged() + { + kcfg_OSDScreen->setCurrentItem(m_pOSDPreview->screen()); + +- kcfg_OSDAlignment->setValue( m_pOSDPreview->tqalignment() ); ++ kcfg_OSDAlignment->setValue( m_pOSDPreview->alignment() ); + kcfg_OSDOffsetX->setValue( m_pOSDPreview->x()); + kcfg_OSDOffsetY->setValue( m_pOSDPreview->y()); + } +diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp +index 749e278..46dee2f 100644 +--- a/konversation/src/outputfilter.cpp ++++ b/konversation/src/outputfilter.cpp +@@ -334,7 +334,7 @@ namespace Konversation + else if(parameter == "off") + konvApp->showQueueTuner(false); + else +- result = usage(i18n("Usage: %1queuetuner [on | off]").tqarg(commandChar)); ++ result = usage(i18n("Usage: %1queuetuner [on | off]").arg(commandChar)); + + return result; + } +@@ -380,7 +380,7 @@ namespace Konversation + if (channelName.isEmpty()) + { + if (destination.isEmpty() || !isAChannel(destination)) +- return usage(i18n("Usage: %1JOIN [password]").tqarg(commandChar)); ++ return usage(i18n("Usage: %1JOIN [password]").arg(commandChar)); + channelName=destination; + } + else if (!isAChannel(channelName)) +@@ -413,7 +413,7 @@ namespace Konversation + + if(victim.isEmpty()) + { +- result = usage(i18n("Usage: %1KICK [reason]").tqarg(commandChar)); ++ result = usage(i18n("Usage: %1KICK [reason]").arg(commandChar)); + } + else + { +@@ -431,7 +431,7 @@ namespace Konversation + } + else + { +- result = error(i18n("%1KICK only works from within channels.").tqarg(commandChar)); ++ result = error(i18n("%1KICK only works from within channels.").arg(commandChar)); + } + + return result; +@@ -451,7 +451,7 @@ namespace Konversation + } + else + { +- result = error(i18n("%1PART without parameters only works from within a channel or a query.").tqarg(commandChar)); ++ result = error(i18n("%1PART without parameters only works from within a channel or a query.").arg(commandChar)); + } + } + else +@@ -481,7 +481,7 @@ namespace Konversation + } + else + { +- result = error(i18n("%1PART without channel name only works from within a channel.").tqarg(commandChar)); ++ result = error(i18n("%1PART without channel name only works from within a channel.").arg(commandChar)); + } + } + } +@@ -503,7 +503,7 @@ namespace Konversation + } + else + { +- result = error(i18n("%1TOPIC without parameters only works from within a channel.").tqarg(commandChar)); ++ result = error(i18n("%1TOPIC without parameters only works from within a channel.").arg(commandChar)); + } + } + else +@@ -545,7 +545,7 @@ namespace Konversation + } + else + { +- result = error(i18n("%1TOPIC without channel name only works from within a channel.").tqarg(commandChar)); ++ result = error(i18n("%1TOPIC without channel name only works from within a channel.").arg(commandChar)); + } + } + } +@@ -572,7 +572,7 @@ namespace Konversation + result.toServer = "NAMES "; + if (parameter.isNull()) + { +- return error(i18n("%1NAMES with no target may disconnect you from the server. Specify '*' if you really want this.").tqarg(commandChar)); ++ return error(i18n("%1NAMES with no target may disconnect you from the server. Specify '*' if you really want this.").arg(commandChar)); + } + else if (parameter != TQChar('*')) + { +@@ -593,7 +593,7 @@ namespace Konversation + else if (parm.isEmpty()) // this can only mean one thing.. we're in the Server tab + m_server->closeYourself(false); + else +- return usage(i18n("Usage: %1close [window] closes the named channel or query tab, or the current tab if none specified.").tqarg(commandChar)); ++ return usage(i18n("Usage: %1close [window] closes the named channel or query tab, or the current tab if none specified.").arg(commandChar)); + return OutputFilterResult(); + } + +@@ -619,13 +619,13 @@ namespace Konversation + + if(parameter.isEmpty() || message.isEmpty()) + { +- result = usage(i18n("Usage: %1NOTICE ").tqarg(commandChar)); ++ result = usage(i18n("Usage: %1NOTICE ").arg(commandChar)); + } + else + { + result.typeString = i18n("Notice"); + result.toServer = "NOTICE " + recipient + " :" + message; +- result.output=i18n("%1 is the message, %2 the recipient nickname","Sending notice \"%2\" to %1.").tqarg(recipient).tqarg(message); ++ result.output=i18n("%1 is the message, %2 the recipient nickname","Sending notice \"%2\" to %1.").arg(recipient).arg(message); + result.type = Program; + } + +@@ -644,7 +644,7 @@ namespace Konversation + } + else + { +- result = usage(i18n("Usage: %1ME text").tqarg(commandChar)); ++ result = usage(i18n("Usage: %1ME text").arg(commandChar)); + } + + return result; +@@ -681,7 +681,7 @@ namespace Konversation + else if (message.startsWith(commandChar+"me")) + { + result.toServer = "PRIVMSG " + recipient + " :" + '\x01' + "ACTION " + message.mid(4) + '\x01'; +- output = TQString("* %1 %2").tqarg(myNick).tqarg(message.mid(4)); ++ output = TQString("* %1 %2").arg(myNick).arg(message.mid(4)); + } + else + { +@@ -763,13 +763,13 @@ namespace Konversation + if (request == "PING") + { + unsigned int time_t = TQDateTime::currentDateTime().toTime_t(); +- result.toServer = TQString("PRIVMSG %1 :\x01PING %2\x01").tqarg(recipient).tqarg(time_t); +- result.output = i18n("Sending CTCP-%1 request to %2.").tqarg("PING").tqarg(recipient); ++ result.toServer = TQString("PRIVMSG %1 :\x01PING %2\x01").arg(recipient).arg(time_t); ++ result.output = i18n("Sending CTCP-%1 request to %2.").arg("PING").arg(recipient); + } + else + { + result.toServer = "PRIVMSG " + recipient + " :" + '\x01' + out + '\x01'; +- result.output = i18n("Sending CTCP-%1 request to %2.").tqarg(out).tqarg(recipient); ++ result.output = i18n("Sending CTCP-%1 request to %2.").arg(out).arg(recipient); + } + + result.typeString = i18n("CTCP"); +@@ -863,7 +863,7 @@ namespace Konversation + else if(parameterList.count()>2) + { + // TODO: make sure this will work: +- //output=i18n("Usage: %1DCC SEND nickname [fi6lename] [filename] ...").tqarg(commandChar); ++ //output=i18n("Usage: %1DCC SEND nickname [fi6lename] [filename] ...").arg(commandChar); + KURL fileURL(parameterList[2]); + + //We could easily check if the remote file exists, but then we might +@@ -874,12 +874,12 @@ namespace Konversation + } + else + { +- result = error(i18n("File \"%1\" does not exist.").tqarg(parameterList[2])); ++ result = error(i18n("File \"%1\" does not exist.").arg(parameterList[2])); + } + } + else // Don't know how this should happen, but ... + { +- result = usage(i18n("Usage: %1DCC [SEND nickname filename]").tqarg(commandChar)); ++ result = usage(i18n("Usage: %1DCC [SEND nickname filename]").arg(commandChar)); + } + } + // TODO: DCC Chat etc. comes here +@@ -891,12 +891,12 @@ namespace Konversation + } + else + { +- result = usage(i18n("Usage: %1DCC [CHAT nickname]").tqarg(commandChar)); ++ result = usage(i18n("Usage: %1DCC [CHAT nickname]").arg(commandChar)); + } + } + else + { +- result = error(i18n("Unrecognized command %1DCC %2. Possible commands are SEND, CHAT, CLOSE.").tqarg(commandChar).tqarg(parameterList[0])); ++ result = error(i18n("Unrecognized command %1DCC %2. Possible commands are SEND, CHAT, CLOSE.").arg(commandChar).arg(parameterList[0])); + } + } + +@@ -993,7 +993,7 @@ namespace Konversation + + if(parameter.isEmpty()) + { +- result = usage(i18n("Usage: %1INVITE [channel]").tqarg(commandChar)); ++ result = usage(i18n("Usage: %1INVITE [channel]").arg(commandChar)); + } + else + { +@@ -1008,7 +1008,7 @@ namespace Konversation + } + else + { +- result = error(i18n("%1INVITE without channel name works only from within channels.").tqarg(commandChar)); ++ result = error(i18n("%1INVITE without channel name works only from within channels.").arg(commandChar)); + } + } + +@@ -1020,7 +1020,7 @@ namespace Konversation + } + else + { +- result = error(i18n("%1 is not a channel.").tqarg(channel)); ++ result = error(i18n("%1 is not a channel.").arg(channel)); + } + } + } +@@ -1034,7 +1034,7 @@ namespace Konversation + + if(parameter.isEmpty()) + { +- result = usage(i18n("Usage: %1EXEC