diff -Nru konversation-trinity-3.5.13/acinclude.m4 konversation-trinity-3.5.13.2/acinclude.m4 --- konversation-trinity-3.5.13/acinclude.m4 2011-08-21 22:37:17.000000000 -0500 +++ konversation-trinity-3.5.13.2/acinclude.m4 2012-09-08 12:26:57.000000000 -0500 @@ -428,7 +428,7 @@ if test "$1" = "default"; then if test -z "$kde_htmldir"; then - kde_htmldir='\${datadir}/doc/HTML' + kde_htmldir='\${datadir}/doc/tde/HTML' fi if test -z "$kde_appsdir"; then kde_appsdir='\${datadir}/applnk' diff -Nru konversation-trinity-3.5.13/admin/acinclude.m4.in konversation-trinity-3.5.13.2/admin/acinclude.m4.in --- konversation-trinity-3.5.13/admin/acinclude.m4.in 2011-10-15 19:34:22.000000000 -0500 +++ konversation-trinity-3.5.13.2/admin/acinclude.m4.in 2013-03-30 13:03:37.000000000 -0500 @@ -468,7 +468,7 @@ if test "$1" = "default"; then if test -z "$kde_htmldir"; then - kde_htmldir='\${datadir}/doc/HTML' + kde_htmldir='\${datadir}/doc/tde/HTML' fi if test -z "$kde_appsdir"; then kde_appsdir='\${datadir}/applnk' @@ -4881,7 +4881,8 @@ PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_multiarch_libdirs="`find /usr/lib/ -maxdepth 1 -type d | xargs echo`" +python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $python_multiarch_libdirs $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -5726,12 +5727,6 @@ dnl not needed for gcj compile - if test "x$kde_java_libgcjdir" = "x"; then - if test ! -r "$kde_java_libhpidir/libhpi.so"; then - AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.]) - fi - fi - if test -n "$jni_includes"; then dnl Check for JNI version AC_LANG_SAVE @@ -5768,8 +5763,12 @@ JAVAH=$kde_java_bindir/javah JAR=$kde_java_bindir/jar AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) - if test "x$kde_java_libgcjdir" = "x"; then - JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi" + if test "x$kde_java_libgcjdir" = "x"; then + if test ! -r "$kde_java_libhpidir/libhpi.so"; then + JVMLIBS="-L$kde_java_libjvmdir -ljvm" + else + JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi" + fi else JVMLIBS="-L$kde_java_libgcjdir -lgcj" fi diff -Nru konversation-trinity-3.5.13/admin/am_edit konversation-trinity-3.5.13.2/admin/am_edit --- konversation-trinity-3.5.13/admin/am_edit 2011-06-27 11:46:11.000000000 -0500 +++ konversation-trinity-3.5.13.2/admin/am_edit 2012-11-27 05:57:08.000000000 -0600 @@ -1980,7 +1980,7 @@ { opendir (THISDIR, "."); foreach $entry (readdir(THISDIR)) { - next if ($entry eq "CVS" || $entry =~ /^\./ || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^\#.*\#$/ || $entry eq "core" || $entry eq "index.cache.bz2"); + next if ($entry eq "CVS" || $entry =~ /^\./ || $entry =~ /^Makefile/ || $entry eq "CMakeLists.txt" || $entry eq "ConfigureChecks.cmake" || $entry =~ /~$/ || $entry =~ /^\#.*\#$/ || $entry eq "core" || $entry eq "index.cache.bz2"); next if (! -f $entry); $files .= "$entry "; } @@ -2354,7 +2354,7 @@ $MakefileData =~ s/\034/\\\n/g; # Restore continuation lines # Append our $progId line, _below_ the "generated by automake" line # because automake-1.6 relies on the first line to be his own. - my $progIdLine = "\# $progId - " . '$Revision: 1232319 $ '."\n"; + my $progIdLine = "\# $progId - " . '$Revision$ '."\n"; if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) { warn "automake line not found in $makefile\n"; # Fallback: first line diff -Nru konversation-trinity-3.5.13/admin/configure.in.min konversation-trinity-3.5.13.2/admin/configure.in.min --- konversation-trinity-3.5.13/admin/configure.in.min 2011-06-27 11:46:11.000000000 -0500 +++ konversation-trinity-3.5.13.2/admin/configure.in.min 2013-05-23 19:00:36.000000000 -0500 @@ -41,7 +41,7 @@ KDE_SET_PREFIX dnl generate the config header -AM_CONFIG_HEADER(config.h) dnl at the distribution this done +AC_CONFIG_HEADER(config.h) dnl at the distribution this done dnl Checks for programs. AC_PROG_CC diff -Nru konversation-trinity-3.5.13/admin/cvs.sh konversation-trinity-3.5.13.2/admin/cvs.sh --- konversation-trinity-3.5.13/admin/cvs.sh 2011-08-21 22:37:19.000000000 -0500 +++ konversation-trinity-3.5.13.2/admin/cvs.sh 2013-05-23 19:00:36.000000000 -0500 @@ -35,12 +35,12 @@ Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;; "" ) echo "*** AUTOCONF NOT FOUND!." - echo "*** KDE requires autoconf $required_autoconf_version" + echo "*** TDE requires autoconf $required_autoconf_version" exit 1 ;; * ) echo "*** YOU'RE USING $AUTOCONF_VERSION." - echo "*** KDE requires autoconf $required_autoconf_version" + echo "*** TDE requires autoconf $required_autoconf_version" exit 1 ;; esac @@ -50,12 +50,12 @@ Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;; "" ) echo "*** AUTOHEADER NOT FOUND!." - echo "*** KDE requires autoheader $required_autoconf_version" + echo "*** TDE requires autoheader $required_autoconf_version" exit 1 ;; * ) echo "*** YOU'RE USING $AUTOHEADER_VERSION." - echo "*** KDE requires autoheader $required_autoconf_version" + echo "*** TDE requires autoheader $required_autoconf_version" exit 1 ;; esac @@ -63,18 +63,13 @@ AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1` required_automake_version="1.6.1 or newer" case $AUTOMAKE_STRING in - automake*1.5d* | automake*1.5* | automake*1.5-* ) - echo "*** YOU'RE USING $AUTOMAKE_STRING." - echo "*** KDE requires automake $required_automake_version" - exit 1 - ;; - automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12*) + automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12* | automake*1.13* ) echo "*** $AUTOMAKE_STRING found." UNSERMAKE=no ;; "" ) echo "*** AUTOMAKE NOT FOUND!." - echo "*** KDE requires automake $required_automake_version" + echo "*** TDE requires automake $required_automake_version" exit 1 ;; *unsermake* ) : @@ -84,7 +79,7 @@ ;; * ) echo "*** YOU'RE USING $AUTOMAKE_STRING." - echo "*** KDE requires automake $required_automake_version" + echo "*** TDE requires automake $required_automake_version" exit 1 ;; esac @@ -128,7 +123,7 @@ echo "*** Creating configure" call_and_fix_autoconf -if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then +if egrep "^A[MC]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then echo "*** Creating config.h template" $AUTOHEADER || exit 1 touch config.h.in @@ -184,7 +179,7 @@ fi fi $ACLOCAL $ACLOCALFLAGS -if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then +if egrep "^A[MC]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then echo "*** Creating config.h template" $AUTOHEADER || exit 1 touch config.h.in @@ -359,7 +354,7 @@ sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"`" done else - list=`find . -follow -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \ + list=`find . -path "./.pc" -prune -o -follow -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \ sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"` fi for i in $list; do if test -f $i && test `dirname $i` != "." ; then diff -Nru konversation-trinity-3.5.13/admin/debianrules konversation-trinity-3.5.13.2/admin/debianrules --- konversation-trinity-3.5.13/admin/debianrules 2011-08-21 22:37:19.000000000 -0500 +++ konversation-trinity-3.5.13.2/admin/debianrules 2012-09-08 12:27:02.000000000 -0500 @@ -16,7 +16,7 @@ $kde_cgidir = "$kde_prefix/lib/cgi-bin"; $kde_confdir = "$sysconfdir/trinity"; -$kde_htmldir = "$kde_prefix/share/doc/kde/HTML"; +$kde_htmldir = "$kde_prefix/share/doc/tde/HTML"; if (defined $ENV{DEB_BUILD_OPTIONS} && $ENV{DEB_BUILD_OPTIONS} =~ /\bnostrip\b/) { diff -Nru konversation-trinity-3.5.13/cmake/generate_apidox konversation-trinity-3.5.13.2/cmake/generate_apidox --- konversation-trinity-3.5.13/cmake/generate_apidox 1969-12-31 18:00:00.000000000 -0600 +++ konversation-trinity-3.5.13.2/cmake/generate_apidox 2012-06-05 13:33:45.000000000 -0500 @@ -0,0 +1,17 @@ +#!/bin/bash + +top_srcdir=${1} +top_builddir=${2} +kde_libs_htmldir=${3} +export QTDOCDIR=${4} + +if [[ ! -d "${top_srcdir}/doc/common/" ]]; then + export DOXDATA=${kde_libs_htmldir}/en/common +fi + +abs_top_srcdir=$(cd ${top_srcdir} && pwd) + +rm -rf ${top_builddir}/${kde_libs_htmldir}/en +mkdir -p ${top_builddir}/${kde_libs_htmldir}/en +cd ${top_builddir}/${kde_libs_htmldir}/en +${abs_top_srcdir}/admin/doxygen.sh --modulename --installdir=${top_builddir}/${kde_libs_htmldir}/en ${abs_top_srcdir} diff -Nru konversation-trinity-3.5.13/cmake/install_apidox konversation-trinity-3.5.13.2/cmake/install_apidox --- konversation-trinity-3.5.13/cmake/install_apidox 1969-12-31 18:00:00.000000000 -0600 +++ konversation-trinity-3.5.13.2/cmake/install_apidox 2012-06-05 13:33:45.000000000 -0500 @@ -0,0 +1,12 @@ +#!/bin/bash + +top_srcdir=${1} +top_builddir=${2} +kde_libs_htmldir=${3} +installdir=${DESTDIR} + +abs_top_srcdir=$(cd ${top_srcdir} && pwd) + +cd ${top_builddir} +mkdir -p ${installdir}/${kde_libs_htmldir}/en +cp -Rp ${top_builddir}/${kde_libs_htmldir}/en ${installdir}/${kde_libs_htmldir}/ diff -Nru konversation-trinity-3.5.13/cmake/modules/FindTDE.cmake konversation-trinity-3.5.13.2/cmake/modules/FindTDE.cmake --- konversation-trinity-3.5.13/cmake/modules/FindTDE.cmake 1969-12-31 18:00:00.000000000 -0600 +++ konversation-trinity-3.5.13.2/cmake/modules/FindTDE.cmake 2012-12-09 08:21:54.000000000 -0600 @@ -0,0 +1,93 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +if( NOT TDE_FOUND ) + + message( STATUS "checking for 'TDE'") + + pkg_search_module( TDE tqt ) + + if( NOT TDE_FOUND ) + tde_message_fatal( "Unable to find kdelibs!\n Try adding the directory in which the kdelibs.pc file is located\nto the PKG_CONFIG_PATH variable." ) + endif( ) + + # if the path is not already defined by user, + # find kde-config executable + if( NOT DEFINED KDECONFIG_EXECUTABLE ) + find_program( KDECONFIG_EXECUTABLE + NAMES kde-config + HINTS "${TDE_PREFIX}/bin" ${BIN_INSTALL_DIR} ) + if( NOT KDECONFIG_EXECUTABLE ) + tde_message_fatal( "kde-config are NOT found." ) + endif( NOT KDECONFIG_EXECUTABLE ) + endif( NOT DEFINED KDECONFIG_EXECUTABLE ) + + set( ENV{LD_LIBRARY_PATH} "${TDE_LIBDIR}:$ENV{LD_LIBRARY_PATH}" ) + # check for installed trinity version + tde_execute_process( + COMMAND ${KDECONFIG_EXECUTABLE} --version + OUTPUT_VARIABLE _version + RESULT_VARIABLE _result + OUTPUT_STRIP_TRAILING_WHITESPACE + MESSAGE "Unable to run kde-config!\n KDELIBS are correctly installed?\n Path to kde-config are corect?" ) + + # parse kde-config output, to extract TDE version + string( REGEX MATCH "KDE: ([0-9\\.]+)" __dummy "${_version}" ) + set( TDE_VERSION "${CMAKE_MATCH_1}" ) + + # ask kde-config for few paths + macro( __internal_get_path __type __var ) + tde_execute_process( + COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install ${__type} + OUTPUT_VARIABLE ${__var} + CACHE INTERNAL "TDE ${__type} path" FORCE + OUTPUT_STRIP_TRAILING_WHITESPACE ) + endmacro( __internal_get_path ) + + __internal_get_path( include TDE_INCLUDE_DIR ) + __internal_get_path( lib TDE_LIB_DIR ) + __internal_get_path( exe TDE_BIN_DIR ) + __internal_get_path( data TDE_DATA_DIR ) + __internal_get_path( config TDE_CONFIG_DIR ) + __internal_get_path( html TDE_HTML_DIR ) + __internal_get_path( cmake TDE_CMAKE_DIR ) + __internal_get_path( qtplugins TDE_QTPLUGINS_DIR ) + + # find kde tools + macro( __internal_find_program __prog __var ) + find_program( ${__var} + NAMES ${__prog} + HINTS "${TDE_PREFIX}/bin" ${BIN_INSTALL_DIR} + OUTPUT_STRIP_TRAILING_WHITESPACE ) + if( NOT ${__var} ) + tde_message_fatal( "${__prog} are NOT found.\n KDELIBS are correctly installed?" ) + endif( NOT ${__var} ) + set( ${__var} ${${__var}} CACHE INTERNAL "${__prog} executable" FORCE ) + endmacro( __internal_find_program ) + + __internal_find_program( dcopidl KDE3_DCOPIDL_EXECUTABLE ) + __internal_find_program( dcopidlng KDE3_DCOPIDLNG_EXECUTABLE ) + __internal_find_program( dcopidl2cpp KDE3_DCOPIDL2CPP_EXECUTABLE ) + __internal_find_program( meinproc KDE3_MEINPROC_EXECUTABLE ) + __internal_find_program( kconfig_compiler KDE3_KCFGC_EXECUTABLE ) + __internal_find_program( makekdewidgets KDE3_MAKEKDEWIDGETS_EXECUTABLE ) + + # dcopidlng is a bash script which using kde-config; + # if PATH to kde-config is not set, dcopidlng will fail; + # for this reason we set KDECONFIG environment variable before running dcopidlng + set( KDE3_DCOPIDLNG_EXECUTABLE env KDECONFIG=${KDECONFIG_EXECUTABLE} ${KDE3_DCOPIDLNG_EXECUTABLE} + CACHE INTERNAL "dcopidlng executable" FORCE ) + + message( STATUS " found 'TDE', version ${TDE_VERSION}" ) + +endif( NOT TDE_FOUND ) + +include( "${TDE_CMAKE_DIR}/kdelibs.cmake" ) diff -Nru konversation-trinity-3.5.13/cmake/modules/FindTQt.cmake konversation-trinity-3.5.13.2/cmake/modules/FindTQt.cmake --- konversation-trinity-3.5.13/cmake/modules/FindTQt.cmake 1969-12-31 18:00:00.000000000 -0600 +++ konversation-trinity-3.5.13.2/cmake/modules/FindTQt.cmake 2013-02-16 12:21:00.000000000 -0600 @@ -0,0 +1,95 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +macro( tqt_message ) + message( STATUS "${ARGN}" ) +endmacro( ) + +pkg_search_module( TQT tqt ) + +if( NOT TQT_FOUND ) + tde_message_fatal( "Unable to find tqt!\n Try adding the directory in which the tqt.pc file is located\nto the PKG_CONFIG_PATH variable." ) +endif( ) + +# tmoc_executable +tde_execute_process( + COMMAND pkg-config tqt --variable=tmoc_executable + OUTPUT_VARIABLE TMOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE ) + +if( NOT EXISTS ${TMOC_EXECUTABLE} ) + tde_message_fatal( "tmoc is not found!\n tqt is correctly installed?" ) +endif( ) + +tqt_message( " tmoc path: ${TMOC_EXECUTABLE}" ) + + +# moc_executable +tde_execute_process( + COMMAND pkg-config tqt --variable=moc_executable + OUTPUT_VARIABLE MOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE ) + +if( NOT EXISTS ${MOC_EXECUTABLE} ) + tde_message_fatal( "Path to moc is not set.\n tqt is correctly installed?" ) +endif( ) + +tqt_message( " moc path: ${MOC_EXECUTABLE}" ) + + +# uic_executable +tde_execute_process( + COMMAND pkg-config tqt --variable=uic_executable + OUTPUT_VARIABLE UIC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE ) + +if( NOT EXISTS ${UIC_EXECUTABLE} ) + tde_message_fatal( "uic not found!\n tqt is correctly installed?" ) +endif( ) + +tqt_message( " uic path: ${UIC_EXECUTABLE}" ) + + +# tqt-replace script +set( TQT_REPLACE_SCRIPT "${TQT_PREFIX}/bin/tqt-replace" ) + +if( NOT EXISTS ${TQT_REPLACE_SCRIPT} ) + tde_message_fatal( "tqt-replace not found!\n Check tqt installation." ) +endif( ) + +tqt_message( " tqt-replace path: ${TQT_REPLACE_SCRIPT}" ) + + +# check if tqt is usable +tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) +set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} ) +foreach( _dirs ${TQT_LIBRARY_DIRS} ) + list( APPEND CMAKE_REQUIRED_LIBRARIES "-L${_dirs}" ) +endforeach() +list( APPEND CMAKE_REQUIRED_LIBRARIES ${TQT_LIBRARIES} ) + +check_cxx_source_compiles(" + #include + int main(int argc, char **argv) { TQApplication app(argc, argv); return 0; } " + HAVE_USABLE_TQT ) + +if( NOT HAVE_USABLE_TQT ) + tde_message_fatal( "Unable to build a simple tqt test." ) +endif( ) + +tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) + + +# TQT_CXX_FLAGS +foreach( _flag ${TQT_CFLAGS} ${TQT_CFLAGS_OTHER} ) + set( TQT_CXX_FLAGS "${TQT_CXX_FLAGS} ${_flag}" ) +endforeach() + +# Set compiler flags according to build type +set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DNDEBUG" ) +set( CMAKE_C_FLAGS_RELWITHDEBINFO "-DNDEBUG" ) diff -Nru konversation-trinity-3.5.13/cmake/modules/TDEMacros.cmake konversation-trinity-3.5.13.2/cmake/modules/TDEMacros.cmake --- konversation-trinity-3.5.13/cmake/modules/TDEMacros.cmake 1969-12-31 18:00:00.000000000 -0600 +++ konversation-trinity-3.5.13.2/cmake/modules/TDEMacros.cmake 2013-02-16 12:21:00.000000000 -0600 @@ -0,0 +1,1323 @@ +################################################# +# +# (C) 2010-2012 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# (C) 2011-2012 Timothy Pearson +# kb9vqf (AT) pearsoncomputing.net +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include( KDE3Macros ) # we will need this module for a while + + +################################################# +##### +##### tde_message_fatal + +macro( tde_message_fatal ) + message( FATAL_ERROR + "#################################################\n" + " ${ARGV}\n" + "#################################################" ) +endmacro( tde_message_fatal ) + + +################################################# +##### +##### tde_get_arg( ) +##### ARG_NAME(string): name of an argument to find in ARGS +##### COUNT(number): argument dimension, a number of items returned in RETURN +##### RETURN(list ref): items returned for argument as they found in ARGS +##### REST(list ref): rest of items except argument name and items returned in RETURN +##### ARGS(list): source list of arguments + +macro( tde_get_arg ARG_NAME COUNT RETURN REST ) + unset( ${RETURN} ) + unset( ${REST} ) + list( APPEND ${REST} ${ARGN} ) + list( FIND ${REST} ${ARG_NAME} _arg_idx) + if( NOT ${_arg_idx} EQUAL -1 ) + list( REMOVE_AT ${REST} ${_arg_idx} ) + set( _i 0 ) + while( ${_i} LESS ${COUNT} ) + list( GET ${REST} ${_arg_idx} _arg ) + list( REMOVE_AT ${REST} ${_arg_idx} ) + list( APPEND ${RETURN} ${_arg} ) + math( EXPR _i "${_i} + 1" ) + endwhile() + endif() +endmacro( tde_get_arg ) + + +################################################ +##### +##### tde_execute_process( [MESSAGE ] ) +##### MSG: fatal error message (standard message will be written if not supplied) +##### ARGS: execute_process arguments + +macro( tde_execute_process ) + tde_get_arg( MESSAGE 1 _message _rest_args ${ARGV} ) + tde_get_arg( RESULT_VARIABLE 1 _result_variable _tmp ${_rest_args} ) + tde_get_arg( COMMAND 1 _command _tmp ${_rest_args} ) + tde_get_arg( OUTPUT_VARIABLE 1 _output_variable _tmp ${_rest_args} ) + tde_get_arg( CACHE 3 _cache _rest_args2 ${_rest_args} ) + + # handle optional FORCE parameter + if( DEFINED _cache ) + list( GET _cache 2 _tmp ) + if( _tmp STREQUAL FORCE ) + set( _rest_args ${_rest_args2} ) + else() + tde_get_arg( CACHE 2 _cache _rest_args ${_rest_args} ) + endif() + endif() + + if( NOT DEFINED _result_variable ) + list( APPEND _rest_args RESULT_VARIABLE _exec_result ) + set( _result_variable _exec_result ) + endif() + + execute_process( ${_rest_args} ) + + if( DEFINED _output_variable AND DEFINED _cache ) + set( ${_output_variable} ${${_output_variable}} CACHE ${_cache} ) + endif() + + if( ${_result_variable} ) + if( DEFINED _message ) + tde_message_fatal( ${_message} ) + else() + if( ${${_result_variable}} MATCHES "^[0-9]+$" ) + set( ${_result_variable} "status ${${_result_variable}} returned!" ) + endif() + tde_message_fatal( "Error executing '${_command}': ${${_result_variable}}" ) + endif() + endif() +endmacro( tde_execute_process ) + + +if( DEFINED MASTER_SOURCE_DIR ) + return( ) +endif( ) +########### slave part ends here ############### + + +################################################ +##### +##### tde_install_icons( THEME DESTINATION ) +##### default theme: hicolor +##### default destination: ${SHARE_INSTALL_DIR}/icons + +macro( tde_install_icons ) + tde_get_arg( DESTINATION 1 _dest _args ${ARGV} ) + tde_get_arg( THEME 1 _req_theme _icons ${_args} ) + + #defaults + if( NOT _icons ) + set( _icons "*" ) + endif( NOT _icons ) + if( NOT _dest ) + set( _dest "${ICON_INSTALL_DIR}" ) + endif( NOT _dest ) + + foreach( _icon ${_icons} ) + unset( _theme ) # clearing + + file(GLOB _icon_files *-${_icon}.png *-${_icon}.mng _icon_files *-${_icon}.svg* ) + foreach( _icon_file ${_icon_files} ) + # FIXME need a review + string( REGEX MATCH "^.*/([a-zA-Z][a-zA-Z])([0-9a-zA-Z]+)\\-([a-z]+)\\-([^/]+)$" _dummy "${_icon_file}" ) + set( _type "${CMAKE_MATCH_1}" ) + set( _size "${CMAKE_MATCH_2}" ) + set( _group "${CMAKE_MATCH_3}" ) + set( _name "${CMAKE_MATCH_4}" ) + + # we must ignore invalid icon names + if( _type AND _size AND _group AND _name ) + + # autodetect theme + if( NOT _req_theme ) + unset( _theme ) + if( "${_type}" STREQUAL "cr" ) + set( _theme crystalsvg ) + elseif( "${_type}" STREQUAL "lo" ) + set( _theme locolor ) + endif( "${_type}" STREQUAL "cr" ) + # defaulting + if( NOT _theme ) + set( _theme hicolor ) + endif( NOT _theme ) + else( NOT _req_theme ) + set( _theme ${_req_theme} ) + endif( NOT _req_theme ) + + # fix "group" name + if( "${_group}" STREQUAL "mime" ) + set( _group "mimetypes" ) + endif( "${_group}" STREQUAL "mime" ) + if( "${_group}" STREQUAL "filesys" ) + set( _group "filesystems" ) + endif( "${_group}" STREQUAL "filesys" ) + if( "${_group}" STREQUAL "device" ) + set( _group "devices" ) + endif( "${_group}" STREQUAL "device" ) + if( "${_group}" STREQUAL "app" ) + set( _group "apps" ) + endif( "${_group}" STREQUAL "app" ) + if( "${_group}" STREQUAL "action" ) + set( _group "actions" ) + endif( "${_group}" STREQUAL "action" ) + + if( "${_size}" STREQUAL "sc" ) + install( FILES ${_icon_file} DESTINATION ${_dest}/${_theme}/scalable/${_group}/ RENAME ${_name} ) + else( "${_size}" STREQUAL "sc" ) + install( FILES ${_icon_file} DESTINATION ${_dest}/${_theme}/${_size}x${_size}/${_group}/ RENAME ${_name} ) + endif( "${_size}" STREQUAL "sc" ) + + endif( _type AND _size AND _group AND _name ) + + endforeach( _icon_file ) + endforeach( _icon ) + +endmacro( tde_install_icons ) + + +################################################# +##### +##### tde_add_lut( [depends] ) +##### default depends: source + +macro( tde_add_lut _src _lut _dep ) + set( create_hash_table ${CMAKE_SOURCE_DIR}/kjs/create_hash_table ) + if( NOT _dep ) + set( _dep ${_src} ) + endif( NOT _dep ) + add_custom_command( OUTPUT ${_lut} + COMMAND perl ARGS ${create_hash_table} ${CMAKE_CURRENT_SOURCE_DIR}/${_src} -i > ${_lut} + DEPENDS ${_src} ) + set_source_files_properties( ${_dep} PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_lut} ) + unset( _dep ) +endmacro( tde_add_lut ) + + +################################################# +##### +##### tde_add_luts( ) + +macro( tde_add_luts ) + foreach( _src ${ARGV} ) + get_filename_component( _lut ${_src} NAME_WE ) + set( _lut "${_lut}.lut.h" ) + tde_add_lut( ${_src} ${_lut} ${_src} ) + endforeach( _src ) +endmacro( tde_add_luts ) + + +################################################# +##### +##### tde_file_to_cpp( ) + +macro( tde_file_to_cpp _src _dst _var ) + if( IS_ABSOLUTE ${_dst} ) + set( dst ${_dst} ) + else( ) + set( dst "${CMAKE_CURRENT_BINARY_DIR}/${_dst}" ) + endif( ) + file( READ ${_src} text ) + string( REGEX REPLACE "\n" "\\\\n\"\n\"" text "${text}" ) + set( text "/* Generated by CMake */\n\nconst char *${_var} = \n\n\"${text}\";\n" ) + string( REGEX REPLACE "\n\"\";\n$" ";\n" text "${text}" ) + file( WRITE ${dst} "${text}" ) +endmacro( ) + + +################################################# +##### +##### tde_install_la_file( ) + +macro( tde_install_la_file _target _destination ) + + get_target_property( _target_location ${_target} LOCATION ) + get_filename_component( _laname ${_target_location} NAME_WE ) + get_filename_component( _soname ${_target_location} NAME ) + set( _laname ${CMAKE_CURRENT_BINARY_DIR}/${_laname}.la ) + + file( WRITE ${_laname} +"# ${_laname} - a libtool library file, generated by cmake +# The name that we can dlopen(3). +dlname='${_soname}' +# Names of this library +library_names='${_soname} ${_soname} ${_soname}' +# The name of the static archive +old_library='' +# Libraries that this one depends upon. +dependency_libs='' +# Version information.\ncurrent=0\nage=0\nrevision=0 +# Is this an already installed library?\ninstalled=yes +# Should we warn about portability when linking against -modules?\nshouldnotlink=yes +# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen='' +# Directory that this library needs to be installed in: +libdir='${_destination}' +" ) + + install( FILES ${_laname} DESTINATION ${_destination} ) + +endmacro( tde_install_la_file ) + + +################################################# +##### +##### tde_add_ui_files + +macro( tde_add_ui_files _sources ) + foreach( _ui_file ${ARGN} ) + + get_filename_component( _ui_basename ${_ui_file} NAME_WE ) + get_filename_component( _ui_absolute_path ${_ui_file} ABSOLUTE ) + + list( APPEND ${_sources} ${_ui_basename}.cpp ) + + add_custom_command( OUTPUT ${_ui_basename}.h ${_ui_basename}.cpp + COMMAND ${CMAKE_COMMAND} + -DUIC_EXECUTABLE:FILEPATH=${UIC_EXECUTABLE} + -DTQT_REPLACE_SCRIPT:FILEPATH=${TQT_REPLACE_SCRIPT} + -DTDE_QTPLUGINS_DIR:FILEPATH=${TDE_QTPLUGINS_DIR} + -DUI_FILE:FILEPATH=${_ui_absolute_path} + -DMASTER_SOURCE_DIR:FILEPATH=${CMAKE_SOURCE_DIR} + -DMASTER_BINARY_DIR:FILEPATH=${CMAKE_BINARY_DIR} + -P ${CMAKE_MODULE_PATH}/tde_uic.cmake + COMMAND ${MOC_EXECUTABLE} ${_ui_basename}.h >> ${_ui_basename}.cpp + DEPENDS ${_ui_absolute_path} ) + + endforeach( _ui_file ) +endmacro( tde_add_ui_files ) + + +################################################# +##### +##### tde_moc + +macro( tde_moc _sources ) + foreach( _input_file ${ARGN} ) + + get_filename_component( _input_file "${_input_file}" ABSOLUTE ) + get_filename_component( _basename ${_input_file} NAME_WE ) + set( _output_file "${_basename}.moc.cpp" ) + add_custom_command( OUTPUT ${_output_file} + COMMAND + ${TMOC_EXECUTABLE} ${_input_file} -o ${_output_file} + DEPENDS + ${_input_file} ) + list( APPEND ${_sources} ${_output_file} ) + + endforeach( ) +endmacro( ) + + +################################################# +##### +##### tde_automoc + +macro( tde_automoc ) + foreach( _src_file ${ARGN} ) + + get_filename_component( _src_file "${_src_file}" ABSOLUTE ) + + if( EXISTS "${_src_file}" ) + + # read source file and check if have moc include + file( READ "${_src_file}" _src_content ) + string( REGEX MATCHALL "#include +[^ ]+\\.moc[\">]" _moc_includes "${_src_content}" ) + + # found included moc(s)? + if( _moc_includes ) + foreach( _moc_file ${_moc_includes} ) + + # extracting moc filename + string( REGEX MATCH "[^ <\"]+\\.moc" _moc_file "${_moc_file}" ) + set( _moc_file "${CMAKE_CURRENT_BINARY_DIR}/${_moc_file}" ) + + # create header filename + get_filename_component( _src_path "${_src_file}" ABSOLUTE ) + get_filename_component( _src_path "${_src_path}" PATH ) + get_filename_component( _src_header "${_moc_file}" NAME_WE ) + set( _header_file "${_src_path}/${_src_header}.h" ) + + # if header doesn't exists, check in META_INCLUDES + if( NOT EXISTS "${_header_file}" ) + unset( _found ) + foreach( _src_path ${_meta_includes} ) + set( _header_file "${_src_path}/${_src_header}.h" ) + if( EXISTS "${_header_file}" ) + set( _found 1 ) + break( ) + endif( ) + endforeach( ) + if( NOT _found ) + get_filename_component( _moc_file "${_moc_file}" NAME ) + tde_message_fatal( "AUTOMOC error: '${_moc_file}' cannot be generated.\n Reason: '${_src_file}.h' not found." ) + endif( ) + endif( ) + + # moc-ing header + add_custom_command( OUTPUT ${_moc_file} + COMMAND ${TMOC_EXECUTABLE} ${_header_file} -o ${_moc_file} + DEPENDS ${_header_file} ) + + # create dependency between source file and moc file + set_property( SOURCE ${_src_file} APPEND PROPERTY OBJECT_DEPENDS ${_moc_file} ) + + endforeach( _moc_file ) + + endif( _moc_includes ) + + endif( EXISTS "${_src_file}" ) + + endforeach( _src_file ) +endmacro( tde_automoc ) + + +################################################# +##### +##### __tde_internal_process_sources + +macro( __tde_internal_process_sources _sources ) + + unset( ${_sources} ) + + foreach( _arg ${ARGN} ) + get_filename_component( _ext ${_arg} EXT ) + get_filename_component( _name ${_arg} NAME_WE ) + get_filename_component( _path ${_arg} PATH ) + + # if not path, set it to "." + if( NOT _path ) + set( _path "./" ) + endif( NOT _path ) + + # handle .ui files + if( ${_ext} STREQUAL ".ui" ) + tde_add_ui_files( ${_sources} ${_arg} ) + + # handle .skel files + elseif( ${_ext} STREQUAL ".skel" ) + kde3_add_dcop_skels( ${_sources} ${_path}/${_name}.h ) + + # handle .stub files + elseif( ${_ext} STREQUAL ".stub" ) + kde3_add_dcop_stubs( ${_sources} ${_path}/${_name}.h ) + + # handle .kcfgc files + elseif( ${_ext} STREQUAL ".kcfgc" ) + kde3_add_kcfg_files( ${_sources} ${_arg} ) + + # handle any other files + else( ${_ext} STREQUAL ".ui" ) + list(APPEND ${_sources} ${_arg} ) + endif( ${_ext} STREQUAL ".ui" ) + endforeach( _arg ) + +endmacro( __tde_internal_process_sources ) + + +################################################# +##### +##### tde_install_libtool_file + +macro( tde_install_libtool_file _target _destination ) + + get_target_property( _target_location ${_target} LOCATION ) + + # get name of target + get_filename_component( _name ${_target_location} NAME_WE ) + + # get .la name + set( _laname ${_name}.la ) + + # get .so name + get_filename_component( _soname ${_target_location} NAME ) + + # get version of target + get_target_property( _target_version ${_target} VERSION ) + get_target_property( _target_soversion ${_target} SOVERSION ) + + # we have so version + if( _target_version ) + set( _library_name_1 "${_soname}.${_target_version}" ) + set( _library_name_2 "${_soname}.${_target_soversion}" ) + set( _library_name_3 "${_soname}" ) + + string( REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$" _dummy "${_target_version}" ) + set( _version_current "${CMAKE_MATCH_1}" ) + set( _version_age "${CMAKE_MATCH_2}" ) + set( _version_revision "${CMAKE_MATCH_3}" ) + + # we have no so version (module?) + else( _target_version ) + set( _library_name_1 "${_soname}" ) + set( _library_name_2 "${_soname}" ) + set( _library_name_3 "${_soname}" ) + set( _version_current "0" ) + set( _version_age "0" ) + set( _version_revision "0" ) + endif( _target_version ) + + if( IS_ABSOLUTE ${_destination} ) + set( _libdir "${_destination}" ) + else( IS_ABSOLUTE ${_destination} ) + set( _libdir "${CMAKE_INSTALL_PREFIX}/${_destination}" ) + endif( IS_ABSOLUTE ${_destination} ) + + configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_libtool_file.cmake "${_laname}" @ONLY ) + + install( FILES "${CMAKE_CURRENT_BINARY_DIR}/${_laname}" DESTINATION ${_destination} ) + +endmacro( tde_install_libtool_file ) + + +################################################# +##### +##### tde_install_export / tde_import + +function( tde_install_export ) + file( GLOB export_files ${CMAKE_CURRENT_BINARY_DIR}/export-*.cmake ) + + set( mode "WRITE" ) + foreach( filename ${export_files} ) + file( READ ${filename} content ) + file( ${mode} "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.cmake" "${content}" ) + set( mode "APPEND" ) + endforeach( ) + + install( FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.cmake" DESTINATION ${CMAKE_INSTALL_DIR} ) +endfunction( ) + + +macro( tde_import _library ) + message( STATUS "checking for '${_library}'" ) + string( TOUPPER "BUILD_${_library}" _build ) + if( ${_build} ) + message( STATUS " ok, activated for build" ) + else() + if( EXISTS "${TDE_CMAKE_DIR}/${_library}.cmake" ) + include( "${TDE_CMAKE_DIR}/${_library}.cmake" ) + message( STATUS " ok, found import file" ) + else() + tde_message_fatal( "'${_library}' are required,\n but is not installed nor selected for build" ) + endif() + endif() +endmacro() + + +################################################# +##### +##### tde_add_library + +macro( tde_add_library _arg_target ) + + unset( _target ) + unset( _type ) + unset( _static_pic ) + unset( _automoc ) + unset( _meta_includes ) + unset( _no_libtool_file ) + unset( _no_export ) + unset( _version ) + unset( _sources ) + unset( _destination ) + unset( _embed ) + unset( _link ) + unset( _dependencies ) + unset( _storage ) + + set( _shouldnotlink no ) + + foreach( _arg ${ARGV} ) + + # this variable help us to skip + # storing unapropriate values (i.e. directives) + unset( _skip_store ) + + # found one of directives: "SHARED", "STATIC", "MODULE" + if( "${_arg}" STREQUAL "SHARED" OR "${_arg}" STREQUAL "STATIC" OR "${_arg}" STREQUAL "MODULE" ) + set( _skip_store 1 ) + set( _type "${_arg}" ) + endif( "${_arg}" STREQUAL "SHARED" OR "${_arg}" STREQUAL "STATIC" OR "${_arg}" STREQUAL "MODULE" ) + + # found directive "STATIC_PIC" + if( "${_arg}" STREQUAL "STATIC_PIC" ) + set( _skip_store 1 ) + set( _type "STATIC" ) + set( _static_pic 1 ) + endif( "${_arg}" STREQUAL "STATIC_PIC" ) + + # found directive "AUTOMOC" + if( "${_arg}" STREQUAL "AUTOMOC" ) + set( _skip_store 1 ) + set( _automoc 1 ) + endif( "${_arg}" STREQUAL "AUTOMOC" ) + + # found directive "META_INCLUDES" + if( "${_arg}" STREQUAL "META_INCLUDES" ) + set( _skip_store 1 ) + set( _storage "_meta_includes" ) + endif( ) + + # found directive "NO_LIBTOOL_FILE" + if( "${_arg}" STREQUAL "NO_LIBTOOL_FILE" ) + set( _skip_store 1 ) + set( _no_libtool_file 1 ) + endif( "${_arg}" STREQUAL "NO_LIBTOOL_FILE" ) + + # found directive "NO_EXPORT" + if( "${_arg}" STREQUAL "NO_EXPORT" ) + set( _skip_store 1 ) + set( _no_export 1 ) + endif( "${_arg}" STREQUAL "NO_EXPORT" ) + + # found directive "VERSION" + if( "${_arg}" STREQUAL "VERSION" ) + set( _skip_store 1 ) + set( _storage "_version" ) + endif( "${_arg}" STREQUAL "VERSION" ) + + # found directive "SOURCES" + if( "${_arg}" STREQUAL "SOURCES" ) + set( _skip_store 1 ) + set( _storage "_sources" ) + endif( "${_arg}" STREQUAL "SOURCES" ) + + # found directive "EMBED" + if( "${_arg}" STREQUAL "EMBED" ) + set( _skip_store 1 ) + set( _storage "_embed" ) + endif( "${_arg}" STREQUAL "EMBED" ) + + # found directive "LINK" + if( "${_arg}" STREQUAL "LINK" ) + set( _skip_store 1 ) + set( _storage "_link" ) + endif( "${_arg}" STREQUAL "LINK" ) + + # found directive "DEPENDENCIES" + if( "${_arg}" STREQUAL "DEPENDENCIES" ) + set( _skip_store 1 ) + set( _storage "_dependencies" ) + endif( "${_arg}" STREQUAL "DEPENDENCIES" ) + + # found directive "DESTINATION" + if( "${_arg}" STREQUAL "DESTINATION" ) + set( _skip_store 1 ) + set( _storage "_destination" ) + unset( ${_storage} ) + endif( "${_arg}" STREQUAL "DESTINATION" ) + + # storing value + if( _storage AND NOT _skip_store ) + list( APPEND ${_storage} ${_arg} ) + list( REMOVE_DUPLICATES ${_storage} ) + endif( _storage AND NOT _skip_store ) + + endforeach( _arg ) + + # if no type is set, we choose one + # based on BUILD_SHARED_LIBS + if( NOT _type ) + if( BUILD_SHARED_LIBS ) + set( _type "SHARED" ) + else( BUILD_SHARED_LIBS ) + set( _type "STATIC" ) + endif( BUILD_SHARED_LIBS ) + endif( NOT _type ) + + # change target name, based on type + string( TOLOWER "${_type}" _type_lower ) + set( _target "${_arg_target}-${_type_lower}" ) + + # create variables like "LIB_xxx" for convenience + if( ${_type} STREQUAL "SHARED" ) + string( TOUPPER "${_arg_target}" _tmp ) + set( LIB_${_tmp} ${_target} CACHE INTERNAL LIB_${tmp} FORCE ) + endif( ${_type} STREQUAL "SHARED" ) + + # disallow target without sources + if( NOT _sources ) + message( FATAL_ERROR "\nTarget [$_target] have no sources." ) + endif( NOT _sources ) + + # processing different types of sources + __tde_internal_process_sources( _sources ${_sources} ) + + # set automoc + if( _automoc ) + tde_automoc( ${_sources} ) + endif( _automoc ) + + # add target + add_library( ${_target} ${_type} ${_sources} ) + + # we assume that modules have no prefix and no version + # also, should not link + if( ${_type} STREQUAL "MODULE" ) + set_target_properties( ${_target} PROPERTIES PREFIX "" ) + unset( _version ) + set( _shouldnotlink yes ) + endif( ${_type} STREQUAL "MODULE" ) + + # set real name of target + set_target_properties( ${_target} PROPERTIES OUTPUT_NAME ${_arg_target} ) + + # set -fPIC flag for static libraries + if( _static_pic ) + set_target_properties( ${_target} PROPERTIES COMPILE_FLAGS -fPIC ) + endif( _static_pic ) + + # set version + if( _version ) + string( REGEX MATCH "^[0-9]+" _soversion ${_version} ) + set_target_properties( ${_target} PROPERTIES VERSION ${_version} SOVERSION ${_soversion} ) + endif( _version ) + + # set interface libraries (only for shared) + unset( _shared_libs ) + foreach( _lib ${_link} ) + #get_target_property( _lib_type ${_lib} TYPE ) + #if( NOT "STATIC_LIBRARY" STREQUAL "${_lib_type}" ) + if( NOT ${_lib} MATCHES ".+-static" ) + list( APPEND _shared_libs ${_lib} ) + endif( NOT ${_lib} MATCHES ".+-static" ) + #endif( NOT "STATIC_LIBRARY" STREQUAL "${_lib_type}" ) + endforeach( _lib ) + target_link_libraries( ${_target} LINK_INTERFACE_LIBRARIES ${_shared_libs} ) + + # set embedded archives + if( _embed ) + list( INSERT _link 0 -Wl,-whole-archive ${_embed} -Wl,-no-whole-archive ) + endif( _embed ) + + # set link libraries + if( _link ) + target_link_libraries( ${_target} ${_link} ) + endif( ) + + # set dependencies + if( _dependencies ) + add_dependencies( ${_target} ${_dependencies} ) + endif( _dependencies ) + + # if destination directory is set + if( _destination ) + + # we export only shared libs (no static, no modules); + # also, do not export targets marked as "NO_EXPORT" (usually for kdeinit) + if( "SHARED" STREQUAL ${_type} AND NOT _no_export ) + + # get target properties: output name, version, soversion + get_target_property( _output ${_target} LOCATION ) + get_filename_component( _output ${_output} NAME ) + get_target_property( _version ${_target} VERSION ) + get_target_property( _soversion ${_target} SOVERSION ) + + if( _version ) + set( _location "${_destination}/${_output}.${_version}" ) + set( _soname "${_output}.${_soversion}" ) + else( ) + set( _location "${_destination}/${_output}" ) + set( _soname "${_output}" ) + endif( ) + + configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_export_library.cmake "${PROJECT_BINARY_DIR}/export-${_target}.cmake" @ONLY ) + endif( ) + + # install target + install( TARGETS ${_target} DESTINATION ${_destination} ) + + # install .la files for dynamic libraries + if( NOT "STATIC" STREQUAL ${_type} AND NOT _no_libtool_file ) + tde_install_libtool_file( ${_target} ${_destination} ) + endif( ) + + endif( _destination ) + +endmacro( tde_add_library ) + + +################################################# +##### +##### tde_add_kpart + +macro( tde_add_kpart _target ) + tde_add_library( ${_target} ${ARGN} MODULE ) +endmacro( tde_add_kpart ) + + +################################################# +##### +##### tde_add_executable + +macro( tde_add_executable _arg_target ) + + unset( _target ) + unset( _automoc ) + unset( _meta_includes ) + unset( _setuid ) + unset( _sources ) + unset( _destination ) + unset( _link ) + unset( _dependencies ) + unset( _storage ) + + foreach( _arg ${ARGV} ) + + # this variable help us to skip + # storing unapropriate values (i.e. directives) + unset( _skip_store ) + + # found directive "AUTOMOC" + if( "${_arg}" STREQUAL "AUTOMOC" ) + set( _skip_store 1 ) + set( _automoc 1 ) + endif( "${_arg}" STREQUAL "AUTOMOC" ) + + # found directive "META_INCLUDES" + if( "${_arg}" STREQUAL "META_INCLUDES" ) + set( _skip_store 1 ) + set( _storage "_meta_includes" ) + endif( ) + + # found directive "SETUID" + if( "${_arg}" STREQUAL "SETUID" ) + set( _skip_store 1 ) + set( _setuid 1 ) + endif( "${_arg}" STREQUAL "SETUID" ) + + # found directive "SOURCES" + if( "${_arg}" STREQUAL "SOURCES" ) + set( _skip_store 1 ) + set( _storage "_sources" ) + endif( "${_arg}" STREQUAL "SOURCES" ) + + # found directive "LINK" + if( "${_arg}" STREQUAL "LINK" ) + set( _skip_store 1 ) + set( _storage "_link" ) + endif( "${_arg}" STREQUAL "LINK" ) + + # found directive "DEPENDENCIES" + if( "${_arg}" STREQUAL "DEPENDENCIES" ) + set( _skip_store 1 ) + set( _storage "_dependencies" ) + endif( "${_arg}" STREQUAL "DEPENDENCIES" ) + + # found directive "DESTINATION" + if( "${_arg}" STREQUAL "DESTINATION" ) + set( _skip_store 1 ) + set( _storage "_destination" ) + unset( ${_storage} ) + endif( "${_arg}" STREQUAL "DESTINATION" ) + + # storing value + if( _storage AND NOT _skip_store ) + #set( ${_storage} "${${_storage}} ${_arg}" ) + list( APPEND ${_storage} ${_arg} ) + endif( _storage AND NOT _skip_store ) + + endforeach( _arg ) + + set( _target "${_arg_target}" ) + + # disallow target without sources + if( NOT _sources ) + message( FATAL_ERROR "\nTarget [$_target] have no sources." ) + endif( NOT _sources ) + + # processing different types of sources + __tde_internal_process_sources( _sources ${_sources} ) + + # set automoc + if( _automoc ) + tde_automoc( ${_sources} ) + endif( _automoc ) + + # add target + add_executable( ${_target} ${_sources} ) + + # set link libraries + if( _link ) + target_link_libraries( ${_target} ${_link} ) + endif( _link ) + + # set dependencies + if( _dependencies ) + add_dependencies( ${_target} ${_dependencies} ) + endif( _dependencies ) + + # set destination directory + if( _destination ) + if( _setuid ) + install( TARGETS ${_target} DESTINATION ${_destination} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE SETUID ) + else( _setuid ) + install( TARGETS ${_target} DESTINATION ${_destination} ) + endif( _setuid ) + endif( _destination ) + +endmacro( tde_add_executable ) + + +################################################# +##### +##### tde_add_kdeinit_executable + +macro( tde_add_kdeinit_executable _target ) + + configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_kdeinit_executable.cmake ${_target}_kdeinit_executable.cpp COPYONLY ) + configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_kdeinit_module.cmake ${_target}_kdeinit_module.cpp COPYONLY ) + + unset( _sources ) + unset( _runtime_destination ) + unset( _library_destination ) + unset( _plugin_destination ) + + # default storage is _sources + set( _storage _sources ) + + # set default export to NO_EXPORT + set( _export "NO_EXPORT" ) + + foreach( _arg ${ARGN} ) + + # this variable help us to skip + # storing unapropriate values (i.e. directives) + unset( _skip_store ) + + # found directive "EXPORT" + if( "${_arg}" STREQUAL "EXPORT" ) + set( _skip_store 1 ) + unset( _export ) + endif( "${_arg}" STREQUAL "EXPORT" ) + + # found directive "RUNTIME_DESTINATION" + if( "${_arg}" STREQUAL "RUNTIME_DESTINATION" ) + set( _skip_store 1 ) + set( _storage "_runtime_destination" ) + unset( ${_storage} ) + endif( "${_arg}" STREQUAL "RUNTIME_DESTINATION" ) + + # found directive "LIBRARY_DESTINATION" + if( "${_arg}" STREQUAL "LIBRARY_DESTINATION" ) + set( _skip_store 1 ) + set( _storage "_library_destination" ) + unset( ${_storage} ) + endif( "${_arg}" STREQUAL "LIBRARY_DESTINATION" ) + + # found directive "PLUGIN_DESTINATION" + if( "${_arg}" STREQUAL "PLUGIN_DESTINATION" ) + set( _skip_store 1 ) + set( _storage "_plugin_destination" ) + unset( ${_storage} ) + endif( "${_arg}" STREQUAL "PLUGIN_DESTINATION" ) + + # storing value + if( _storage AND NOT _skip_store ) + list( APPEND ${_storage} ${_arg} ) + set( _storage "_sources" ) + endif( _storage AND NOT _skip_store ) + + endforeach( _arg ) + + # if destinations are not set, we using some defaults + # we assume that kdeinit executable MUST be installed + # (otherwise why we build it?) + if( NOT _runtime_destination ) + set( _runtime_destination ${BIN_INSTALL_DIR} ) + endif( NOT _runtime_destination ) + if( NOT _library_destination ) + set( _library_destination ${LIB_INSTALL_DIR} ) + endif( NOT _library_destination ) + if( NOT _plugin_destination ) + set( _plugin_destination ${PLUGIN_INSTALL_DIR} ) + endif( NOT _plugin_destination ) + + # create the library + tde_add_library( kdeinit_${_target} ${_sources} SHARED ${_export} + DESTINATION ${_library_destination} + ) + + # create the executable + tde_add_executable( ${_target} + SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${_target}_kdeinit_executable.cpp + LINK kdeinit_${_target}-shared + DESTINATION ${_runtime_destination} + ) + + # create the plugin + tde_add_kpart( ${_target} + SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${_target}_kdeinit_module.cpp + LINK kdeinit_${_target}-shared + DESTINATION ${_plugin_destination} + ) + +endmacro( tde_add_kdeinit_executable ) + + +################################################# +##### +##### tde_create_translation + +macro( tde_create_translation ) + + unset( _srcs ) + unset( _lang ) + unset( _dest ) + unset( _directive ) + unset( _var ) + + foreach( _arg ${ARGN} ) + + # found directive "FILES" + if( "${_arg}" STREQUAL "FILES" ) + unset( _srcs ) + set( _var _srcs ) + set( _directive 1 ) + endif( ) + + # found directive "LANG" + if( "${_arg}" STREQUAL "LANG" ) + unset( _lang ) + set( _var _lang ) + set( _directive 1 ) + endif( ) + + # found directive "DESTINATION" + if( "${_arg}" STREQUAL "DESTINATION" ) + unset( _dest ) + set( _var _dest ) + set( _directive 1 ) + endif( ) + + # collect data + if( _directive ) + unset( _directive ) + elseif( _var ) + list( APPEND ${_var} ${_arg} ) + endif() + + endforeach( ) + + if( NOT MSGFMT_EXECUTABLE ) + tde_message_fatal( "MSGFMT_EXECUTABLE variable is not defined" ) + elseif( NOT _lang ) + tde_message_fatal( "missing LANG directive" ) + elseif( NOT _dest ) + set( _dest "${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES" ) + endif( ) + + # if no file specified, include all *.po files + if( NOT _srcs ) + file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po ) + endif() + if( NOT _srcs ) + tde_message_fatal( "no source files" ) + endif() + + # generate *.mo files + foreach( _src ${_srcs} ) + get_filename_component( _src ${_src} ABSOLUTE ) + get_filename_component( _out ${_src} NAME_WE ) + set( _out_name "${_out}-${_lang}.mo" ) + set( _out_real_name "${_out}.mo" ) + add_custom_command( + OUTPUT ${_out_name} + COMMAND ${MSGFMT_EXECUTABLE} ${_src} -o ${_out_name} + DEPENDS ${_src} ) + add_custom_target( "${_out}-${_lang}-translation" ALL DEPENDS ${_out_name} ) + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_out_name} RENAME ${_out_real_name} DESTINATION ${_dest} ) + endforeach( ) + +endmacro( ) + + +################################################# +##### +##### tde_create_handbook + +macro( tde_create_handbook ) + + unset( _target ) + unset( _dest ) + unset( _noindex ) + unset( _srcs ) + unset( _extra ) + unset( _srcdir ) + + set( _lang en ) + set( _first_arg 1 ) + set( _var _target ) + + foreach( _arg ${ARGN} ) + + # found directive "NOINDEX" + if( "${_arg}" STREQUAL "NOINDEX" ) + set( _noindex 1 ) + set( _directive 1 ) + endif() + + # found directive "FILES" + if( "${_arg}" STREQUAL "FILES" ) + unset( _srcs ) + set( _var _srcs ) + set( _directive 1 ) + endif() + + # found directive "EXTRA" + if( "${_arg}" STREQUAL "EXTRA" ) + unset( _extra ) + set( _var _extra ) + set( _directive 1 ) + endif() + + # found directive "SRCDIR" + if( "${_arg}" STREQUAL "SRCDIR" ) + unset( _srcdir ) + set( _var _srcdir ) + set( _directive 1 ) + endif() + + # found directive DESTINATION + if( _arg STREQUAL "DESTINATION" ) + unset( _dest ) + set( _var _dest ) + set( _directive 1 ) + endif() + + # found directive "LANG" + if( "${_arg}" STREQUAL "LANG" ) + unset( _lang ) + set( _var _lang ) + set( _directive 1 ) + endif() + + # collect data + if( _directive ) + unset( _directive ) + elseif( _var ) + if( _first_arg ) + set( _target "${_arg}" ) + else() + list( APPEND ${_var} ${_arg} ) + endif() + endif() + + unset( _first_arg ) + + endforeach() + + # if no target specified, try to guess it from DESTINATION + if( NOT _target ) + if( NOT _dest ) + tde_message_fatal( "target name cannot be determined because DESTINATION is not set" ) + endif() + string( REPLACE "/" "-" _target "${_dest}" ) + endif() + + set( _target "${_target}-${_lang}-handbook" ) + + # if no file specified, include all docbooks, stylesheets and images + if( NOT _srcs ) + file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.docbook *.css *.png ) + endif() + + # if no destination specified, defaulting to HTML_INSTALL_DIR + if( NOT _dest ) + set( _dest "${HTML_INSTALL_DIR}/${_lang}" ) + # if destination is NOT absolute path, + # we assume that is relative to HTML_INSTALL_DIR + elseif( NOT IS_ABSOLUTE ${_dest} ) + set( _dest "${HTML_INSTALL_DIR}/${_lang}/${_dest}" ) + endif() + + if( NOT _srcs ) + tde_message_fatal( "no source files" ) + endif() + + if( NOT _noindex ) + + # check for index.docbook + list( FIND _srcs "index.docbook" _find_index ) + if( -1 EQUAL _find_index ) + tde_message_fatal( "missing index.docbook file" ) + endif() + + # check for srcdir + if( _srcdir ) + set( _srcdir "--srcdir=${_srcdir}" ) + endif() + + add_custom_command( + OUTPUT index.cache.bz2 + COMMAND ${KDE3_MEINPROC_EXECUTABLE} ${_srcdir} --check --cache index.cache.bz2 ${CMAKE_CURRENT_SOURCE_DIR}/index.docbook + DEPENDS ${_srcs} ) + + add_custom_target( ${_target} ALL DEPENDS index.cache.bz2 ) + + list( APPEND _srcs ${CMAKE_CURRENT_BINARY_DIR}/index.cache.bz2 ) + + if( NOT TDE_HTML_DIR ) + set( TDE_HTML_DIR ${HTML_INSTALL_DIR} ) + endif( ) + + tde_install_empty_directory( ${_dest} ) + tde_install_symlink( ${TDE_HTML_DIR}/${_lang}/common ${_dest} ) + + endif() + + install( FILES ${_srcs} ${_extra} DESTINATION ${_dest} ) + +endmacro( ) + + +################################################# +##### +##### tde_include_tqt + +macro( tde_include_tqt ) + foreach( _cpp ${ARGN} ) + set_source_files_properties( ${_cpp} PROPERTIES COMPILE_FLAGS "-include tqt.h" ) + endforeach() +endmacro( ) + + +################################################# +##### +##### tde_install_symlink + +macro( tde_install_symlink _target _link ) + + # if path is relative, we must to prefix it with CMAKE_INSTALL_PREFIX + if( IS_ABSOLUTE "${_link}" ) + set( _destination "${_link}" ) + else( IS_ABSOLUTE "${_link}" ) + set( _destination "${CMAKE_INSTALL_PREFIX}/${_link}" ) + endif( IS_ABSOLUTE "${_link}" ) + + get_filename_component( _path "${_destination}" PATH ) + if( NOT IS_DIRECTORY "\$ENV{DESTDIR}${_path}" ) + install( CODE "file( MAKE_DIRECTORY \"\$ENV{DESTDIR}${_path}\" )" ) + endif( NOT IS_DIRECTORY "\$ENV{DESTDIR}${_path}" ) + + install( CODE "execute_process( COMMAND ln -s ${_target} \$ENV{DESTDIR}${_destination} )" ) + +endmacro( tde_install_symlink ) + + +################################################# +##### +##### tde_install_empty_directory + +macro( tde_install_empty_directory _path ) + + # if path is relative, we must to prefix it with CMAKE_INSTALL_PREFIX + if( IS_ABSOLUTE "${_path}" ) + set( _destination "${_path}" ) + else( IS_ABSOLUTE "${_path}" ) + set( _destination "${CMAKE_INSTALL_PREFIX}/${_path}" ) + endif( IS_ABSOLUTE "${_path}" ) + + install( CODE "file( MAKE_DIRECTORY \"\$ENV{DESTDIR}${_destination}\" )" ) + +endmacro( tde_install_empty_directory ) + + +################################################# +##### +##### tde_conditional_add_subdirectory + +macro( tde_conditional_add_subdirectory _cond _path ) + + if( ${_cond} ) + add_subdirectory( "${_path}" ) + endif( ${_cond} ) + +endmacro( tde_conditional_add_subdirectory ) + + +################################################# +##### +##### tde_auto_add_subdirectories + +macro( tde_auto_add_subdirectories ) + file( GLOB _dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} * ) + foreach( _dir ${_dirs} ) + if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} ) + if( NOT ${_dir} STREQUAL ".svn" AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_dir}/CMakeLists.txt ) + add_subdirectory( ${_dir} ) + endif() + endif() + endforeach() +endmacro() + + +################################################# +##### +##### tde_save / tde_restore + +macro( tde_save ) + foreach( _var ${ARGN} ) + set( __bak_${_var} ${${_var}} ) + endforeach() +endmacro() + +macro( tde_save_and_set _var ) + set( __bak_${_var} ${${_var}} ) + set( ${_var} ${ARGN} ) +endmacro( ) + +macro( tde_restore ) + foreach( _var ${ARGN} ) + set( ${_var} ${__bak_${_var}} ) + unset( __bak_${_var} ) + endforeach() +endmacro() + + +################################################# +##### +##### tde_setup_install_path + +macro( tde_setup_install_path _path _default ) + if( DEFINED ${_path} ) + set( ${_path} "${${_path}}" CACHE INTERNAL "" FORCE ) + else( ) + set( ${_path} "${_default}" ) + endif( ) +endmacro( ) + + +################################################## + +if( ${CMAKE_SOURCE_DIR} MATCHES ${CMAKE_BINARY_DIR} ) + tde_message_fatal( "Please use out-of-source building, like this: + \n rm ${CMAKE_SOURCE_DIR}/CMakeCache.txt + mkdir /tmp/${PROJECT_NAME}.build + cd /tmp/${PROJECT_NAME}.build + cmake ${CMAKE_SOURCE_DIR} [arguments...]" ) +endif( ) + +################################################# +##### +##### tde_setup_architecture_flags + +macro( tde_setup_architecture_flags ) + message( STATUS "Detected ${CMAKE_SYSTEM_PROCESSOR} CPU architecture" ) + ## Immediate symbol binding is not available on ARM architectures + if(${CMAKE_SYSTEM_PROCESSOR} MATCHES arm*) + set( LINKER_IMMEDIATE_BINDING_FLAGS "" CACHE INTERNAL "" FORCE ) + else( ) + set( LINKER_IMMEDIATE_BINDING_FLAGS "-z\ now" CACHE INTERNAL "" FORCE ) + endif( ) +endmacro( ) diff -Nru konversation-trinity-3.5.13/cmake/modules/TDESetupPaths.cmake konversation-trinity-3.5.13.2/cmake/modules/TDESetupPaths.cmake --- konversation-trinity-3.5.13/cmake/modules/TDESetupPaths.cmake 1969-12-31 18:00:00.000000000 -0600 +++ konversation-trinity-3.5.13.2/cmake/modules/TDESetupPaths.cmake 2012-12-09 08:21:54.000000000 -0600 @@ -0,0 +1,68 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +################################################# +##### +##### tde_internal_setup_path + +macro( _tde_internal_setup_path _path _default _comment ) + if( DEFINED ${_path} ) + set( ${_path} "${${_path}}" CACHE PATH "${_comment}" ) + else( DEFINED ${_path} ) + set( ${_path} "${_default}" ) + endif( DEFINED ${_path} ) +endmacro( _tde_internal_setup_path ) + + +################################################# +##### +##### tde_setup_paths + +macro( tde_setup_paths ) + + # install paths + _tde_internal_setup_path( EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" "Base directory for executables and libraries" ) + _tde_internal_setup_path( SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share" "Base directory for files which go to share/" ) + _tde_internal_setup_path( BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)" ) + _tde_internal_setup_path( SBIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/sbin" "The install dir for system executables (default ${EXEC_INSTALL_PREFIX}/sbin)" ) + _tde_internal_setup_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" "The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})" ) + _tde_internal_setup_path( LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/trinity/libexec" "The subdirectory relative to the install prefix where libraries will be installed (default is ${LIB_INSTALL_DIR}/trinity/libexec)" ) + _tde_internal_setup_path( PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" "The install dir for pkg-config metadata files" ) + _tde_internal_setup_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" "The subdirectory to the header prefix" ) + + _tde_internal_setup_path( CMAKE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/cmake" "The install dir for cmake import modules" ) + _tde_internal_setup_path( PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/trinity" "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/trinity)" ) + _tde_internal_setup_path( CONFIG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config" "The config file install dir" ) + _tde_internal_setup_path( DATA_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/apps" "The parent directory where applications can install their data" ) + _tde_internal_setup_path( HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/tde/HTML" "The HTML install dir for documentation" ) + _tde_internal_setup_path( ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons" "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)" ) + _tde_internal_setup_path( KCFG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config.kcfg" "The install dir for kconfig files" ) + _tde_internal_setup_path( LOCALE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/locale" "The install dir for translations" ) + _tde_internal_setup_path( APPS_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/applnk" "The install dir for the application desktop files" ) + _tde_internal_setup_path( MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mimelnk" "The install dir for the mimetype desktop files" ) + _tde_internal_setup_path( SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/services" "The install dir for service (desktop, protocol, ...) files" ) + _tde_internal_setup_path( SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/servicetypes" "The install dir for servicestypes desktop files" ) + _tde_internal_setup_path( SOUND_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/sounds" "The install dir for sound files" ) + _tde_internal_setup_path( TEMPLATES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/templates" "The install dir for templates (Create new file...)" ) + _tde_internal_setup_path( WALLPAPER_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/wallpapers" "The install dir for wallpapers" ) + _tde_internal_setup_path( KCONF_UPDATE_INSTALL_DIR "${DATA_INSTALL_DIR}/kconf_update" "The kconf_update install dir" ) + _tde_internal_setup_path( AUTOSTART_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/autostart" "The install dir for autostart files" ) + + _tde_internal_setup_path( SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc" "The sysconfig install dir (default ${CMAKE_INSTALL_PREFIX}/etc)" ) + _tde_internal_setup_path( MAN_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/man" "The man install dir (default ${SHARE_INSTALL_PREFIX}/man/)" ) + _tde_internal_setup_path( INFO_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/info" "The info install dir (default ${SHARE_INSTALL_PREFIX}/info)" ) + + _tde_internal_setup_path( XDG_MENU_INSTALL_DIR "${SYSCONF_INSTALL_DIR}/xdg/menus" "The XDG menus dir" ) + _tde_internal_setup_path( XDG_APPS_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/applications/kde" "The XDG apps dir" ) + _tde_internal_setup_path( XDG_DIRECTORY_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/desktop-directories" "The XDG directory" ) + _tde_internal_setup_path( XDG_MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mime/packages" "The install dir for the xdg mimetypes" ) + +endmacro( tde_setup_paths ) diff -Nru konversation-trinity-3.5.13/cmake/modules/tde_uic.cmake konversation-trinity-3.5.13.2/cmake/modules/tde_uic.cmake --- konversation-trinity-3.5.13/cmake/modules/tde_uic.cmake 1969-12-31 18:00:00.000000000 -0600 +++ konversation-trinity-3.5.13.2/cmake/modules/tde_uic.cmake 2012-12-09 08:21:54.000000000 -0600 @@ -0,0 +1,55 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +set( CMAKE_MODULE_PATH "${MASTER_SOURCE_DIR}/cmake/modules" ) +include( TDEMacros ) + +get_filename_component( _ui_basename ${UI_FILE} NAME_WE ) + +# FIXME this will working only on out-of-source mode +set( local_ui_file ${_ui_basename}.ui ) +configure_file( ${UI_FILE} ${local_ui_file} COPYONLY ) +tde_execute_process( COMMAND ${TQT_REPLACE_SCRIPT} ${local_ui_file} ) + +# ui.h extension file, if exists +if( EXISTS "${UI_FILE}.h" ) + configure_file( ${UI_FILE}.h ${local_ui_file}.h COPYONLY ) + tde_execute_process( COMMAND ${TQT_REPLACE_SCRIPT} ${local_ui_file}.h ) +endif( ) + +if( TDE_QTPLUGINS_DIR ) + set( L -L ${TDE_QTPLUGINS_DIR} ) +endif( ) + +tde_execute_process( COMMAND ${UIC_EXECUTABLE} + -nounload -tr tr2i18n + ${L} + ${local_ui_file} + OUTPUT_VARIABLE _ui_h_content ) + +if( _ui_h_content ) + string( REGEX REPLACE "#ifndef " "#ifndef UI_" _ui_h_content "${_ui_h_content}" ) + string( REGEX REPLACE "#define " "#define UI_" _ui_h_content "${_ui_h_content}" ) + file( WRITE ${_ui_basename}.h "${_ui_h_content}" ) +endif( ) + +tde_execute_process( COMMAND ${UIC_EXECUTABLE} + -nounload -tr tr2i18n + ${L} + -impl ${_ui_basename}.h + ${local_ui_file} + OUTPUT_VARIABLE _ui_cpp_content ) + +if( _ui_cpp_content ) + string( REGEX REPLACE "tr2i18n\\(\"\"\\)" "QString::null" _ui_cpp_content "${_ui_cpp_content}" ) + string( REGEX REPLACE "tr2i18n\\(\"\", \"\"\\)" "QString::null" _ui_cpp_content "${_ui_cpp_content}" ) + file( WRITE ${_ui_basename}.cpp "#include \n#include \n\n${_ui_cpp_content}" ) +endif( ) diff -Nru konversation-trinity-3.5.13/cmake/modules/template_dummy_cpp.cmake konversation-trinity-3.5.13.2/cmake/modules/template_dummy_cpp.cmake --- konversation-trinity-3.5.13/cmake/modules/template_dummy_cpp.cmake 1969-12-31 18:00:00.000000000 -0600 +++ konversation-trinity-3.5.13.2/cmake/modules/template_dummy_cpp.cmake 2012-06-05 13:33:45.000000000 -0500 @@ -0,0 +1,5 @@ +#ifdef _AIX + namespace { + void *not_empty_file; + } +#endif diff -Nru konversation-trinity-3.5.13/cmake/modules/template_export_library.cmake konversation-trinity-3.5.13.2/cmake/modules/template_export_library.cmake --- konversation-trinity-3.5.13/cmake/modules/template_export_library.cmake 1969-12-31 18:00:00.000000000 -0600 +++ konversation-trinity-3.5.13.2/cmake/modules/template_export_library.cmake 2012-06-05 13:33:45.000000000 -0500 @@ -0,0 +1,7 @@ +add_library( @_target@ @_type@ IMPORTED ) + +set_target_properties( @_target@ PROPERTIES + IMPORTED_LINK_INTERFACE_LIBRARIES "@_shared_libs@" + IMPORTED_LOCATION "@_location@" + IMPORTED_SONAME "@_soname@" ) + diff -Nru konversation-trinity-3.5.13/cmake/modules/template_kdeinit_executable.cmake konversation-trinity-3.5.13.2/cmake/modules/template_kdeinit_executable.cmake --- konversation-trinity-3.5.13/cmake/modules/template_kdeinit_executable.cmake 1969-12-31 18:00:00.000000000 -0600 +++ konversation-trinity-3.5.13.2/cmake/modules/template_kdeinit_executable.cmake 2012-09-08 05:12:39.000000000 -0500 @@ -0,0 +1,2 @@ +extern "C" int kdemain(int argc, char* argv[]); +int main(int argc, char* argv[]) { return kdemain(argc,argv); } diff -Nru konversation-trinity-3.5.13/cmake/modules/template_kdeinit_module.cmake konversation-trinity-3.5.13.2/cmake/modules/template_kdeinit_module.cmake --- konversation-trinity-3.5.13/cmake/modules/template_kdeinit_module.cmake 1969-12-31 18:00:00.000000000 -0600 +++ konversation-trinity-3.5.13.2/cmake/modules/template_kdeinit_module.cmake 2012-09-08 05:12:39.000000000 -0500 @@ -0,0 +1,3 @@ +#include +extern "C" int kdemain(int argc, char* argv[]); +extern "C" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); } diff -Nru konversation-trinity-3.5.13/cmake/modules/template_libtool_file.cmake konversation-trinity-3.5.13.2/cmake/modules/template_libtool_file.cmake --- konversation-trinity-3.5.13/cmake/modules/template_libtool_file.cmake 1969-12-31 18:00:00.000000000 -0600 +++ konversation-trinity-3.5.13.2/cmake/modules/template_libtool_file.cmake 2012-06-05 13:33:45.000000000 -0500 @@ -0,0 +1,35 @@ +# @_laname@ - a libtool library file +# Generated by CMake - GNU libtool +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='@_library_name_2@' + +# Names of this library. +library_names='@_library_name_1@ @_library_name_2@ @_library_name_3@' + +# The name of the static archive. +old_library='' + +# Libraries that this one depends upon. +dependency_libs='' + +# Version information for @_name@. +current=@_version_current@ +age=@_version_age@ +revision=@_version_revision@ + +# Is this an already installed library? +installed=yes + +# Should we warn about portability when linking against -modules? +shouldnotlink=@_shouldnotlink@ + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='@_libdir@' diff -Nru konversation-trinity-3.5.13/debian/cdbs/versions.pl konversation-trinity-3.5.13.2/debian/cdbs/versions.pl --- konversation-trinity-3.5.13/debian/cdbs/versions.pl 2012-07-07 12:25:28.000000000 -0500 +++ konversation-trinity-3.5.13.2/debian/cdbs/versions.pl 2013-04-21 13:10:23.000000000 -0500 @@ -7,7 +7,7 @@ my ($version3, $version3_next); my ($version2, $version2_next); -($version3 = $version) =~ s/-[^-]+$//; +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; ($version2 = $version3) =~ s/\.[^.]+$//; ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; diff -Nru konversation-trinity-3.5.13/debian/changelog konversation-trinity-3.5.13.2/debian/changelog --- konversation-trinity-3.5.13/debian/changelog 2012-12-31 12:55:02.000000000 -0600 +++ konversation-trinity-3.5.13.2/debian/changelog 2013-06-02 12:13:30.000000000 -0500 @@ -1,40 +1,8 @@ -konversation-trinity (4:3.5.13-2ubuntu0~pre9+2~quantal) quantal; urgency=low +konversation-trinity (4:3.5.13.2-0ubuntu12.10.0+0) quantal; urgency=low - * commit 645e07e2 - Fix inadvertent tqt changes. - * commit 22bc9833 - Remove unnecessary language. - * commit bc5e3681 - Fix references to user profile directory. + * Automated git build for v3.5.13.2 - -- Slávek Banko Mon, 31 Dec 2012 19:08:07 +0100 - -konversation-trinity (4:3.5.13-1ubuntu0+ax1~precise) precise; urgency=low - - * commit 01f5ea83 - Rename old tq methods that no longer need a unique name - * commit efdae4e7 - Remove additional unneeded tq method conversions - * commit c64099e5 - Rename obsolete tq methods to standard names - * commit 440010aa - Fix linear alphabet string errors - * commit 96f2a488 - Fix FTBFS - * commit ca3d6cef - Fix inadvertent "TQ" changes. - * commit bcd3e0ef - Update HTML install path references. - * commit 7d37d2e4 - Update final HTML install path so all modules are consistent. - - -- Slávek Banko Thu, 13 Sep 2012 15:36:36 +0200 - -konversation-trinity (4:3.5.13-0ubuntu9+r1258263+pr3~oneiric) oneiric; urgency=low - - * Automated svn build - - -- root Sat, 15 Oct 2011 19:36:06 -0500 + -- Slávek Banko Sun, 02 Jun 2013 19:11:34 +0200 konversation-trinity (1.1-0ubuntu3) karmic; urgency=low diff -Nru konversation-trinity-3.5.13/debian/patches/bp000-01f5ea83.diff konversation-trinity-3.5.13.2/debian/patches/bp000-01f5ea83.diff --- konversation-trinity-3.5.13/debian/patches/bp000-01f5ea83.diff 2012-04-25 06:52:48.000000000 -0500 +++ konversation-trinity-3.5.13.2/debian/patches/bp000-01f5ea83.diff 1969-12-31 18:00:00.000000000 -0600 @@ -1,3130 +0,0 @@ -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 -Nru konversation-trinity-3.5.13/debian/patches/bp001-efdae4e7.diff konversation-trinity-3.5.13.2/debian/patches/bp001-efdae4e7.diff --- konversation-trinity-3.5.13/debian/patches/bp001-efdae4e7.diff 2012-04-25 06:48:23.000000000 -0500 +++ konversation-trinity-3.5.13.2/debian/patches/bp001-efdae4e7.diff 1969-12-31 18:00:00.000000000 -0600 @@ -1,4114 +0,0 @@ -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